Replace simple jt-macro calls with function calls

Author: juntuu

jsrc/adverbs/a.c

@@ -65,7 +65,7 @@ jtbdot2(J jt, A a, A w, A self) {
 
 static A
 jtbdot1(J jt, A w, A self) {
-    return bdot2(num(0), w, self);
+    return jtbdot2(jt, num(0), w, self);
 }
 
 static A
@@ -258,7 +258,7 @@ jtmemo1(J jt, A w, A self) {
     x = IMIN;
     y = jtint0(jt, w);
     if (y == IMIN) return CALL1(f1, w, fs);
-    return (z = memoget(x, y, self)) ? z : memoput(x, y, self, CALL1(f1, w, fs));
+    return (z = jtmemoget(jt, x, y, self)) ? z : jtmemoput(jt, x, y, self, CALL1(f1, w, fs));
 }
 
 static A
@@ -269,9 +269,9 @@ jtmemo2(J jt, A a, A w, A self) {
     x = jtint0(jt, a);
     y = jtint0(jt, w);
     if (MIN(x, y) == IMIN) return CALL2(f2, a, w, fs);  // IMIN is unmemoable, run fn
-    return (z = memoget(x, y, self))
+    return (z = jtmemoget(jt, x, y, self))
              ? z
-             : memoput(x,
+             : jtmemoput(jt, x,
                        y,
                        self,
                        CALL2(f2, a, w, fs));  // if memo lookup returns empty, run the function and remember the result

jsrc/adverbs/af.c

@@ -147,7 +147,7 @@ jtfixa(J jt, A a, A w) {
                 }
                 f = REFIXA(0, f);
                 h = REFIXA(0, h);
-                return xop2(f, h, g);
+                return jtxop2(jt, f, h, g);
             } else {
                 f = REFIXA(1, f);
                 g = REFIXA(2, g);
@@ -165,11 +165,11 @@ jtfixa(J jt, A a, A w) {
             f = REFIXA(na, f);
             g = REFIXA(ID(f) == CCAP ? 1 : 2, g);
             h = REFIXA(na, h);
-            return folk(f, g, h);  // f first in case it's [:
+            return jtfolk(jt, f, g, h);  // f first in case it's [:
         case CATDOT:
         case CGRCO:
             IAV0(aa)[0] = (aif | na);
-            RZ(f = jtevery(jt, every2(aa, h, (A)&arofixaself), (A)&arofixaself));  // full A block required for call
+            RZ(f = jtevery(jt, jtevery2(jt, aa, h, (A)&arofixaself), (A)&arofixaself));  // full A block required for call
             RZ(g = REFIXA(na, g));
             return df2(z, f, g, wf);
         case CIBEAM:

jsrc/adverbs/ai.c

@@ -35,8 +35,8 @@ jtfong(J jt, A a, A w) {
     c = v->id;
     f = v->fgh[0];
     return c == CRIGHT                                     ? w
-           : c == CFORK && (NOUN & AT(f) || CCAP == ID(f)) ? folk(f, v->fgh[1], jtfong(jt, v->fgh[2], w))
-                                                           : folk(ds(CCAP), a, w);
+           : c == CFORK && (NOUN & AT(f) || CCAP == ID(f)) ? jtfolk(jt, f, v->fgh[1], jtfong(jt, v->fgh[2], w))
+                                                           : jtfolk(jt, ds(CCAP), a, w);
 }  // [: f g  with simplifications: [: ] w -> w;  [: (N/[: x y) w -> N/[: x [: y w   and y omittrd if ]
 
 static A
@@ -58,9 +58,9 @@ jtinvfork(J jt, A w) {
     if (CAMP == ID(gi)) {
         v = FAV(gi);
         if (NOUN & AT(v->fgh[0]))
-            RZ(gi = folk(v->fgh[0], v->fgh[1], ds(CRIGHT)))
+            RZ(gi = jtfolk(jt, v->fgh[0], v->fgh[1], ds(CRIGHT)))
         else if (NOUN & AT(v->fgh[1]))
-            RZ(gi = folk(v->fgh[1], jtswap(jt, v->fgh[0]), ds(CRIGHT)));
+            RZ(gi = jtfolk(jt, v->fgh[1], jtswap(jt, v->fgh[0]), ds(CRIGHT)));
     }
     return jtfong(jt, fi, gi);
 }
@@ -280,7 +280,7 @@ jtinvamp(J jt, A w) {
         case CBASE:
             if (!nf) break;
             return AR(x) ? jtamp(jt, x, ds(CABASE))
-                         : jtobverse(jt, evc(x, mag(x), "$&u@>:@(v&(<.@^.))@(1&>.)@(>./)@:|@, #: ]"), w);
+                         : jtobverse(jt, jtevc(jt, x, mag(x), "$&u@>:@(v&(<.@^.))@(1&>.)@(>./)@:|@, #: ]"), w);
         case CATOMIC:
             if (ng) {
                 ASSERT(jtequ(jt, x, jtnub(jt, x)), EVDOMAIN);
@@ -440,7 +440,7 @@ jtinv(J jt, A w, I recur) {
         case CPOWOP:
             if (vf && ng) {
                 RE(p = jti0(jt, g));
-                return -1 == p ? f : 1 == p ? invrecur(f) : powop(0 > p ? f : invrecur(f), jtsc(jt, ABS(p)), 0);
+                return -1 == p ? f : 1 == p ? invrecur(f) : jtpowop(jt, 0 > p ? f : invrecur(f), jtsc(jt, ABS(p)), 0);
             }
             if (VGERL & v->flag) return *(1 + AAV(v->fgh[2]));
             break;
@@ -604,7 +604,7 @@ jtiden(J jt, A w) {
             break;
     }
     ASSERT(x != 0, EVDOMAIN);
-    return folk(x, jtswap(jt, ds(CDOLLAR)), jtatop(jt, ds(CBEHEAD), ds(CDOLLAR)));
+    return jtfolk(jt, x, jtswap(jt, ds(CDOLLAR)), jtatop(jt, ds(CBEHEAD), ds(CDOLLAR)));
 }
 
 A
@@ -628,5 +628,5 @@ jtidensb(J jt, A w) {
             break;
     }
     ASSERT(x != 0, EVDOMAIN);
-    return folk(x, jtswap(jt, ds(CDOLLAR)), jtatop(jt, ds(CBEHEAD), ds(CDOLLAR)));
+    return jtfolk(jt, x, jtswap(jt, ds(CDOLLAR)), jtatop(jt, ds(CBEHEAD), ds(CDOLLAR)));
 }

jsrc/adverbs/am.c

@@ -167,7 +167,7 @@ jtcasev(J jt, A w) {
     // have to make sure abc is locally defined
     if (p = q && 0 <= c && ACUC1 >= AC(u[c])) {  // passes quick check
         p = (AN(jt->locsyms) == 1) || CAV(AAV(v[m + 2])[1])[0] != CASGN ||
-            probe(
+            jtprobe(jt, 
               NAV(AAV(v[m + 2])[0])->m,
               NAV(AAV(v[m + 2])[0])->s,
               NAV(AAV(v[m + 2])[0])->hash,
@@ -436,7 +436,7 @@ jtjstd(J jt, A w, A ind, I *cellframelen) {
         return x;
     }                                // if w is an atom, the best you can get is indexes of 0.  No axes are used
     if ((b & -AR(ind)) < 0) {        // array of boxed indexes
-        RE(aindex(ind, w, 0L, &j));  // see if the boxes are homogeneous
+        RE(jtaindex(jt, ind, w, 0L, &j));  // see if the boxes are homogeneous
         if (!j) {                    // if not...
             RZ(x = MODIFIABLE(jtfrom(jt, ind, jtincrem(jt, jtiota(jt, shape(jt, w))))));
             u = AV(x);  // go back to the original indexes, select from table of all possible incremented indexes; since
@@ -507,7 +507,7 @@ jtamendn2(J jt, A a, A w, A self) {
     AD *RESTRICT ind = VAV(self)->fgh[0];
     if (!((AT(w) | AT(ind)) & SPARSE)) {
         I cellframelen;
-        ind = jstd(w, ind, &cellframelen);  // convert indexes to cell indexes; remember how many were converted
+        ind = jtjstd(jt, w, ind, &cellframelen);  // convert indexes to cell indexes; remember how many were converted
         z   = jtmerge2(
           jtinplace, AT(a) & SPARSE ? jtdenseit(jt, a) : a, w, ind, cellframelen);  //  dense a if needed; dense amend
         // We modified w which is now not pristine.
@@ -552,7 +552,7 @@ jtamendn2(J jt, A a, A w, A self) {
              : AT(a) & SPARSE ? jtam1sp
                               : jtam1a)(jt, a, z, AT(ind) & NUMERIC ? jtbox(jt, ind) : jtope(jt, ind), ip);
     else {
-        RE(aindex(ind, z, 0L, (A *)&ind));
+        RE(jtaindex(jt, ind, z, 0L, (A *)&ind));
         ASSERT(ind != 0, EVNONCE);
         z = (b ? jtamne : AT(a) & SPARSE ? jtamnsp : jtamna)(jt, a, z, ind, ip);
     }               // A* for the #$&^% type-checking

jsrc/adverbs/am1.c

@@ -119,7 +119,7 @@ jtipart(J jt, A z, A ind, A *i1, A *i2) {
     n  = AN(ind);
     iv = AAV(ind);
     zp = PAV(z);
-    RZ(b = bfi(AR(z), SPA(zp, a), 1));
+    RZ(b = jtbfi(jt, AR(z), SPA(zp, a), 1));
     c = 0;
     DO(n, if (b[i])++ c;);
     d = n - c;
@@ -190,7 +190,7 @@ jtscubb(J jt, A z, A i1) {
     A a, q, x, y;
     I c, d, h, j, *s, *v, *xv;
     P *zp;
-    RZ(q = scuba(z, i1, 1));
+    RZ(q = jtscuba(jt, z, i1, 1));
     if (!*AS(q)) return mtm;
     s  = AS(z);
     zp = PAV(z);
@@ -206,7 +206,7 @@ jtscubb(J jt, A z, A i1) {
     xv = AV(x);
     j  = c;
     DO(h, xv[i] = s[v[j++]];);
-    RZ(x = odom(2L, h, xv));
+    RZ(x = jtodom(jt, 2L, h, xv));
     c = *AS(q);
     d = *AS(x);
     return jtstitch(jt, jtrepeat(jt, jtsc(jt, d), q), jtreitem(jt, jtsc(jt, c * d), x));
@@ -247,7 +247,7 @@ jtscubc(J jt, A z, A i1, A p) {
     RZ(y1 = jtrepeat(jt, q, y1));
     c = *AS(y1);
     if (!c) return mtm;
-    return jtless(jt, jtstitch(jt, jtrepeat(jt, jtsc(jt, d), y1), jtreitem(jt, jtsc(jt, c * d), odom(2L, h, sv))), y);
+    return jtless(jt, jtstitch(jt, jtrepeat(jt, jtsc(jt, d), y1), jtreitem(jt, jtsc(jt, c * d), jtodom(jt, 2L, h, sv))), y);
 } /* new rows for the index matrix of z for existing cells */
 
 static A
@@ -257,7 +257,7 @@ jtscube(J jt, A z, A i1, A p) {
     zp = PAV(z);
     a  = SPA(zp, a);
     y  = SPA(zp, i);
-    return !AN(a) && !*AS(y) ? jttake(jt, num(1), mtm) : jtover(jt, jtscubb(jt, z, i1), scubc(z, i1, p));
+    return !AN(a) && !*AS(y) ? jttake(jt, num(1), mtm) : jtover(jt, jtscubb(jt, z, i1), jtscubc(jt, z, i1, p));
 } /* new rows for the index matrix of z */
 
 static A
@@ -268,10 +268,10 @@ jtiindx(J jt, A z, A i1) {
     c  = AN(i1);
     zp = PAV(z);
     y  = SPA(zp, i);
-    if (c == *(1 + AS(y))) return jtindexof(jt, y, scuba(z, i1, 0));
+    if (c == *(1 + AS(y))) return jtindexof(jt, y, jtscuba(jt, z, i1, 0));
     /* when y has excess columns, do progressive indexing */
     RZ(y = jttaker(jt, c, y));
-    RZ(j = jtindexof(jt, y, scuba(z, i1, 0))); /* j: group indices           */
+    RZ(j = jtindexof(jt, y, jtscuba(jt, z, i1, 0))); /* j: group indices           */
     n  = AN(j);
     jv = AV(j);
     m  = *AS(y);
@@ -347,7 +347,7 @@ jtam1e(J jt, A a, A z, A ind, B ip) {
     e  = SPA(zp, e);
     RZ(p = jtssel(jt, z, ind));
     pv = BAV(p);
-    RZ(ipart(z, ind, &i1, &i2));
+    RZ(jtipart(jt, z, ind, &i1, &i2));
     m  = AN(p);
     n  = AN(i2);
     u  = CAV(e);
@@ -375,10 +375,10 @@ jtam1a(J jt, A a, A z, A ind, B ip) {
     I ar, c, *iv, *jv, k, m, n, r, *s, uk, vk, xk;
     P *zp;
     RZ(a && (ind = jtistd1(jt, z, ind)));
-    RZ(a = astd1(a, z, ind));
+    RZ(a = jtastd1(jt, a, z, ind));
     if (mtind(ind)) return z;
-    RZ(ipart(z, ind, &i1, &i2));
-    RZ(z = zpad1(z, scube(z, i1, jtssel(jt, z, ind)), ip));
+    RZ(jtipart(jt, z, ind, &i1, &i2));
+    RZ(z = jtzpad1(jt, z, jtscube(jt, z, i1, jtssel(jt, z, ind)), ip));
     zp = PAV(z);
     x  = SPA(zp, x);
     y  = SPA(zp, i);
@@ -398,7 +398,7 @@ jtam1a(J jt, A a, A z, A ind, B ip) {
     m  = AN(t);
     if (!n && !m) {
         a1 = SPA(zp, a);
-        return ar ? sparseit(a0, a1, e) : sparseit(jtreshape(jt, shape(jt, z), a), a1, a);
+        return ar ? jtsparseit(jt, a0, a1, e) : jtsparseit(jt, jtreshape(jt, shape(jt, z), a), a1, a);
     }
     if (n) {
         RZ(t = jtdcube(jt, z, i2));
@@ -417,6 +417,6 @@ jtam1a(J jt, A a, A z, A ind, B ip) {
 
 A
 jtam1sp(J jt, A a, A z, A ind, B ip) {
-    return amnsp(a, z, jtope(jt, jtcatalog(jt, jtistd1(jt, z, ind))), ip);
+    return jtamnsp(jt, a, z, jtope(jt, jtcatalog(jt, jtistd1(jt, z, ind))), ip);
 }
 /* a (<ind)}z; sparse z; ind is index list; arbitrary sparse array a replacement */

jsrc/adverbs/amn.c

@@ -17,7 +17,7 @@ jtcsize(J jt, A z, A ind) {
     r  = AR(z);
     s  = AS(z);
     zp = PAV(z);
-    RZ(b = bfi(r, SPA(zp, a), 0));
+    RZ(b = jtbfi(jt, r, SPA(zp, a), 0));
     m = 1;
     j = h = *(AR(ind) + AS(ind) - 1);
     DQ(r - h, if (b[j]) m *= s[j]; ++j;);
@@ -48,7 +48,7 @@ jtiaddr(J jt, A z, A ind, A* i1, A* i2) {
     e = 0;
     d = 1;
     DO(n, if (h > u[i]) v[e++] = s[i]; else d *= s[i];);
-    RZ(*i2 = jj = tymes(jtsc(jt, d), jtbase2(jt, vec(INT, e, v), jtrepeatr(jt, jteps(jt, ai, as), ind))));
+    RZ(*i2 = jj = tymes(jtsc(jt, d), jtbase2(jt, jtvec(jt, INT, e, v), jtrepeatr(jt, jteps(jt, ai, as), ind))));
     c = *(1 + AS(y));
     if (!c) {
         n = AN(jj);
@@ -106,7 +106,7 @@ jtzpadn(J jt, A z, A ind, B ip) {
     RZ(p = jtnub(jt, jtless(jt, i1, y1)));
     if (c = AN(a) - d) {
         RZ(t = jtfrom(jt, jtless(jt, a, ai), shape(jt, z)));
-        RZ(p1 = odom(2L, c, AV(t)));
+        RZ(p1 = jtodom(jt, 2L, c, AV(t)));
         n = *AS(p1);
         if (m = *AS(p)) RZ(p = jtstitch(jt, jtrepeat(jt, jtsc(jt, n), p), jtreshape(jt, jtv2(jt, n * m, c), p1)));
         RZ(t = jtnub(jt, jtrepeat(jt, jteps(jt, y1, i1), y1)));
@@ -171,7 +171,7 @@ jtastdn(J jt, A a, A z, A ind) {
     v    = AV(r);
     *v++ = ar - (zr - n);
     DQ(zr - n, *v++ = 1;);
-    RZ(q = jtdgrade1(jt, jtrepeat(jt, r, vec(B01, zr - n1, b + n1))));
+    RZ(q = jtdgrade1(jt, jtrepeat(jt, r, jtvec(jt, B01, zr - n1, b + n1))));
     return jtequ(jt, q, IX(ar)) ? a : jtcant2(jt, q, a);
 } /* convert replacement array a into standard form relative to index array ind */
 
@@ -182,7 +182,7 @@ jtamne(J jt, A a, A z, A ind, B ip) {
     I *iv, *jv, k, m, n, vk, xk;
     P* zp;
     RZ(a && z && ind);
-    RZ(iaddr(z, ind, &i1, &i2));
+    RZ(jtiaddr(jt, z, ind, &i1, &i2));
     zp = PAV(z);
     x  = SPA(zp, x);
     y  = SPA(zp, i);
@@ -206,9 +206,9 @@ jtamna(J jt, A a, A z, A ind, B ip) {
     I *iv, *jv, k, n, vk, xk;
     P* zp;
     RZ(a && z && ind);
-    RZ(z = zpadn(z, ind, ip));
-    RZ(a = astdn(a, z, ind));
-    RZ(iaddr(z, ind, &i1, &i2));
+    RZ(z = jtzpadn(jt, z, ind, ip));
+    RZ(a = jtastdn(jt, a, z, ind));
+    RZ(jtiaddr(jt, z, ind, &i1, &i2));
     zp = PAV(z);
     x  = SPA(zp, x);
     n  = AN(i1);
@@ -237,11 +237,11 @@ jtamnsp(J jt, A a, A z, A ind, B ip) {
     ap = PAV(a);
     t  = SPA(ap, a);
     if (r > AN(t)) RZ(a = jtreaxis(jt, IX(r), a));
-    RZ(a = astdn(a, z, ind));
+    RZ(a = jtastdn(jt, a, z, ind));
     ap = PAV(a);
-    RZ(z = zpadn(z, ind, ip));
+    RZ(z = jtzpadn(jt, z, ind, ip));
     zp = PAV(z);
-    RZ(iaddr(z, ind, &i1, &i2));
+    RZ(jtiaddr(jt, z, ind, &i1, &i2));
     s  = AS(a);
     n  = AN(i1);
     c  = jtcsize(jt, z, ind);