01

1 files changed, 50 insertions, 4 deletions

diff --git a/g.h b/g.h
index 29b33d6a..41ae0177 100644
--- a/g.h
+++ b/g.h
@@ -432,10 +432,56 @@
 #define YZDC(a...) P(ytZDC,a)
 #define YmMA(a...) P(ytmMA,a)
 #define YsSA(a...) P(ytsSA,a)
-#define x(a) dex(x,a)
-#define y(a) dex(y,a)
-#define z(a) dex(z,a)
-#define u(a) dex(u,a)
+#define ZA(a...) P(ztA,a)
+#define ZB(a...) P(ztB,a)
+#define ZH(a...) P(ztH,a)
+#define ZI(a...) P(ztI,a)
+#define ZL(a...) P(ztL,a)
+#define ZD(a...) P(ztD,a)
+#define ZC(a...) P(ztC,a)
+#define ZS(a...) P(ztS,a)
+#define ZM(a...) P(ztM,a)
+#define Zm(a...) P(ztm,a)
+#define Zi(a...) P(zti,a)
+#define Zl(a...) P(ztl,a)
+#define Zd(a...) P(ztd,a)
+#define Zs(a...) P(zts,a)
+#define Zc(a...) P(ztc,a)
+#define Zo(a...) P(zto,a)
+#define Zp(a...) P(ztp,a)
+#define Zq(a...) P(ztq,a)
+#define Zr(a...) P(ztr,a)
+#define Zu(a...) P(ztu,a)
+#define Zv(a...) P(ztv,a)
+#define Zw(a...) P(ztw,a)
+#define Ze(a...) P(zte,a)
+#define ZF(a...) P(ztF,a)
+#define ZP(a...) P(ztP,a)
+#define ZR(a...) P(ztR,a)
+#define Zt(a...) P(ztt,a)
+#define ZT(a...) P(ztT,a)
+#define Zz(a...) P(ztz,a)
+#define ZZ(a...) P(ztZ,a)
+#define ZcC(a...) P(ztcC,a)
+#define ZlL(a...) P(ztlL,a)
+#define ZdD(a...) P(ztdD,a)
+#define ZsS(a...) P(ztsS,a)
+#define ZzZ(a...) P(ztzZ,a)
+#define ZmM(a...) P(ztmM,a)
+#define Zmt(a...) P(ztmt,a)
+#define ZMT(a...) P(ztMT,a)
+#define Zzd(a...) P(ztzd,a)
+#define ZZD(a...) P(ztZD,a)
+#define Zzc(a...) P(ztzc,a)
+#define ZZC(a...) P(ztZC,a)
+#define Zzdc(a...) P(ztzdc,a)
+#define ZZDC(a...) P(ztZDC,a)
+#define ZmMA(a...) P(ztmMA,a)
+#define ZsSA(a...) P(ztsSA,a)
+#define x(a) ({A r_=(a);mr(x);r_;})
+#define y(a) ({A r_=(a);mr(y);r_;})
+#define z(a) ({A r_=(a);mr(z);r_;})
+#define u(a) ({A r_=(a);mr(u);r_;})
 #define _A(x) ((A*)_V(x))
 #define _B(x) ((B*)_V(x))
 #define _H(x) ((H*)_V(x))