g.k

1 files changed, 41 insertions, 30 deletions

diff --git a/g.h b/g.h
index 3ef138c4..2b952a8f 100644
--- a/g.h
+++ b/g.h
@@ -53,12 +53,12 @@
 #define xtw _tw(x)
 #define xte _te(x)
 #define xtF _tF(x)
-#define xtR _tR(x)
 #define xtP _tP(x)
-#define xtz _tz(x)
-#define xtZ _tZ(x)
+#define xtR _tR(x)
 #define xtt _tt(x)
 #define xtT _tT(x)
+#define xtz _tz(x)
+#define xtZ _tZ(x)
 #define xtcC _tcC(x)
 #define xtlL _tlL(x)
 #define xtdD _tdD(x)
@@ -67,12 +67,12 @@
 #define xtmM _tmM(x)
 #define xtmt _tmt(x)
 #define xtMT _tMT(x)
-#define xtmMA _tmMA(x)
 #define xtzd _tzd(x)
 #define xtZD _tZD(x)
 #define xtzc _tzc(x)
 #define xtZC _tZC(x)
 #define xtZDC _tZDC(x)
+#define xtmMA _tmMA(x)
 #define yk _k(y)
 #define yK _K(y)
 #define yn _n(y)
@@ -126,12 +126,12 @@
 #define ytw _tw(y)
 #define yte _te(y)
 #define ytF _tF(y)
-#define ytR _tR(y)
 #define ytP _tP(y)
-#define ytz _tz(y)
-#define ytZ _tZ(y)
+#define ytR _tR(y)
 #define ytt _tt(y)
 #define ytT _tT(y)
+#define ytz _tz(y)
+#define ytZ _tZ(y)
 #define ytcC _tcC(y)
 #define ytlL _tlL(y)
 #define ytdD _tdD(y)
@@ -140,12 +140,12 @@
 #define ytmM _tmM(y)
 #define ytmt _tmt(y)
 #define ytMT _tMT(y)
-#define ytmMA _tmMA(y)
 #define ytzd _tzd(y)
 #define ytZD _tZD(y)
 #define ytzc _tzc(y)
 #define ytZC _tZC(y)
 #define ytZDC _tZDC(y)
+#define ytmMA _tmMA(y)
 #define zk _k(z)
 #define zK _K(z)
 #define zn _n(z)
@@ -199,12 +199,12 @@
 #define ztw _tw(z)
 #define zte _te(z)
 #define ztF _tF(z)
-#define ztR _tR(z)
 #define ztP _tP(z)
-#define ztz _tz(z)
-#define ztZ _tZ(z)
+#define ztR _tR(z)
 #define ztt _tt(z)
 #define ztT _tT(z)
+#define ztz _tz(z)
+#define ztZ _tZ(z)
 #define ztcC _tcC(z)
 #define ztlL _tlL(z)
 #define ztdD _tdD(z)
@@ -213,12 +213,12 @@
 #define ztmM _tmM(z)
 #define ztmt _tmt(z)
 #define ztMT _tMT(z)
-#define ztmMA _tmMA(z)
 #define ztzd _tzd(z)
 #define ztZD _tZD(z)
 #define ztzc _tzc(z)
 #define ztZC _tZC(z)
 #define ztZDC _tZDC(z)
+#define ztmMA _tmMA(z)
 #define uk _k(u)
 #define uK _K(u)
 #define un _n(u)
@@ -272,12 +272,12 @@
 #define utw _tw(u)
 #define ute _te(u)
 #define utF _tF(u)
-#define utR _tR(u)
 #define utP _tP(u)
-#define utz _tz(u)
-#define utZ _tZ(u)
+#define utR _tR(u)
 #define utt _tt(u)
 #define utT _tT(u)
+#define utz _tz(u)
+#define utZ _tZ(u)
 #define utcC _tcC(u)
 #define utlL _tlL(u)
 #define utdD _tdD(u)
@@ -286,12 +286,12 @@
 #define utmM _tmM(u)
 #define utmt _tmt(u)
 #define utMT _tMT(u)
-#define utmMA _tmMA(u)
 #define utzd _tzd(u)
 #define utZD _tZD(u)
 #define utzc _tzc(u)
 #define utZC _tZC(u)
 #define utZDC _tZDC(u)
+#define utmMA _tmMA(u)
 #define XA(a...) P(xtA,a)
 #define XB(a...) P(xtB,a)
 #define XH(a...) P(xtH,a)
@@ -316,12 +316,12 @@
 #define Xw(a...) P(xtw,a)
 #define Xe(a...) P(xte,a)
 #define XF(a...) P(xtF,a)
-#define XR(a...) P(xtR,a)
 #define XP(a...) P(xtP,a)
-#define Xz(a...) P(xtz,a)
-#define XZ(a...) P(xtZ,a)
+#define XR(a...) P(xtR,a)
 #define Xt(a...) P(xtt,a)
 #define XT(a...) P(xtT,a)
+#define Xz(a...) P(xtz,a)
+#define XZ(a...) P(xtZ,a)
 #define XcC(a...) P(xtcC,a)
 #define XlL(a...) P(xtlL,a)
 #define XdD(a...) P(xtdD,a)
@@ -330,12 +330,12 @@
 #define XmM(a...) P(xtmM,a)
 #define Xmt(a...) P(xtmt,a)
 #define XMT(a...) P(xtMT,a)
-#define XmMA(a...) P(xtmMA,a)
 #define Xzd(a...) P(xtzd,a)
 #define XZD(a...) P(xtZD,a)
 #define Xzc(a...) P(xtzc,a)
 #define XZC(a...) P(xtZC,a)
 #define XZDC(a...) P(xtZDC,a)
+#define XmMA(a...) P(xtmMA,a)
 #define YA(a...) P(ytA,a)
 #define YB(a...) P(ytB,a)
 #define YH(a...) P(ytH,a)
@@ -360,12 +360,12 @@
 #define Yw(a...) P(ytw,a)
 #define Ye(a...) P(yte,a)
 #define YF(a...) P(ytF,a)
-#define YR(a...) P(ytR,a)
 #define YP(a...) P(ytP,a)
-#define Yz(a...) P(ytz,a)
-#define YZ(a...) P(ytZ,a)
+#define YR(a...) P(ytR,a)
 #define Yt(a...) P(ytt,a)
 #define YT(a...) P(ytT,a)
+#define Yz(a...) P(ytz,a)
+#define YZ(a...) P(ytZ,a)
 #define YcC(a...) P(ytcC,a)
 #define YlL(a...) P(ytlL,a)
 #define YdD(a...) P(ytdD,a)
@@ -374,12 +374,12 @@
 #define YmM(a...) P(ytmM,a)
 #define Ymt(a...) P(ytmt,a)
 #define YMT(a...) P(ytMT,a)
-#define YmMA(a...) P(ytmMA,a)
 #define Yzd(a...) P(ytzd,a)
 #define YZD(a...) P(ytZD,a)
 #define Yzc(a...) P(ytzc,a)
 #define YZC(a...) P(ytZC,a)
 #define YZDC(a...) P(ytZDC,a)
+#define YmMA(a...) P(ytmMA,a)
 #define x(a) dex(x,a)
 #define y(a) dex(y,a)
 #define z(a) dex(z,a)
@@ -429,12 +429,6 @@
 #define _tv(x) (_t(x)==tv)
 #define _tw(x) (_t(x)==tw)
 #define _te(x) (_t(x)==te)
-#define _tlL(x) (_tl(x)||_tL(x))
-#define _tdD(x) (_td(x)||_tD(x))
-#define _tcC(x) (_tc(x)||_tC(x))
-#define _tsS(x) (_ts(x)||_tS(x))
-#define _tmM(x) (_tm(x)||_tM(x))
-#define _tzZ(x) (_tz(x)||_tZ(x))
 #define Nx(r) N1(x,r)
 #define Ny(r) N1(y,r)
 #define Nz(r) N1(z,r)
@@ -492,6 +486,23 @@
 #define Qs Q s
 #define Qp Q p
 #define Qq Q q
+#define _x(x) ((A*)_V(x))[0]
+#define _y(x) ((A*)_V(x))[1]
+#define _z(x) ((A*)_V(x))[2]
+#define _tcC(x) (_tc(x)||_tC(x))
+#define _tlL(x) (_tl(x)||_tL(x))
+#define _tdD(x) (_td(x)||_tD(x))
+#define _tsS(x) (_ts(x)||_tS(x))
+#define _tzZ(x) (_tz(x)||_tZ(x))
+#define _tmM(x) (_tm(x)||_tM(x))
+#define _tmt(x) (_tm(x)||_tt(x))
+#define _tMT(x) (_tM(x)||_tT(x))
+#define _tzd(x) (_tz(x)||_td(x))
+#define _tZD(x) (_tZ(x)||_tD(x))
+#define _tzc(x) (_tz(x)||_tc(x))
+#define _tZC(x) (_tZ(x)||_tC(x))
+#define _tZDC(x) (_tZD(x)||_tC(x))
+#define _tmMA(x) (_tmM(x)||_tA(x))
 #ifdef DEBUG
  #define  DBG(a...) a
  #define NDBG(a...)