Skip to content

Commit 0db982e

Browse files
juntuujuntuu
committed
Continue converting calls & removing macros
1 parent 5d094bb commit 0db982e

File tree

29 files changed

+73
-95
lines changed

29 files changed

+73
-95
lines changed

‎jsrc/adverbs/a.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jtswap(J jt, A w) {
4040
I flag = FAV(w)->flag & (VIRS2 | VJTFLGOK2);
4141
flag = (FAV(w)->flag & VASGSAFE) + flag +
4242
(flag >> 1); // set ASGSAFE, both inplace/irs bits from dyad; ISATOMIC immaterial, since always dyad
43-
return fdef(0, CTILDE, VERB, (AF)(swap1), (AF)(swap2), w, 0L, 0L, flag, (I)(RMAX), (I)(rr(w)), (I)(lr(w)));
43+
return jtfdef(jt, 0, CTILDE, VERB, (AF)(swap1), (AF)(swap2), w, 0L, 0L, flag, (I)(RMAX), (I)(rr(w)), (I)(lr(w)));
4444
} else {
4545
// evoke. Ii must be LIT and convertible to ASCII.
4646
if ((C2T + C4T) & AT(w)) RZ(w = jtcvt(jt, LIT, w)) else ASSERT(LIT & AT(w), EVDOMAIN);
@@ -116,15 +116,15 @@ jtbdot(J jt, A w) {
116116
memcpy(AV(b), booltab, 64L);
117117
RZ(h = jtrifvs(jt, jtcant2(jt, IX(AR(w)), jtfrom(jt, w, b)))); // h is an array representing b. One cell for
118118
// each atom of b; cell is 4 values
119-
return fdef(0, CBDOT, VERB, jtbdot1, jtbdot2, 0L, w, h, VFLAGNONE, RMAX, 0L, 0L);
119+
return jtfdef(jt, 0, CBDOT, VERB, jtbdot1, jtbdot2, 0L, w, h, VFLAGNONE, RMAX, 0L, 0L);
120120
} else
121121
switch (j) {
122122
case 32:
123-
return fdef(0, CBDOT, VERB, jtbitwise1, jtbitwiserotate, 0L, w, 0L, VASGSAFE | VJTFLGOK2, 0L, 0L, 0L);
123+
return jtfdef(jt, 0, CBDOT, VERB, jtbitwise1, jtbitwiserotate, 0L, w, 0L, VASGSAFE | VJTFLGOK2, 0L, 0L, 0L);
124124
case 33:
125-
return fdef(0, CBDOT, VERB, jtbitwise1, jtbitwiseshift, 0L, w, 0L, VASGSAFE | VJTFLGOK2, 0L, 0L, 0L);
125+
return jtfdef(jt, 0, CBDOT, VERB, jtbitwise1, jtbitwiseshift, 0L, w, 0L, VASGSAFE | VJTFLGOK2, 0L, 0L, 0L);
126126
case 34:
127-
return fdef(0, CBDOT, VERB, jtbitwise1, jtbitwiseshifta, 0L, w, 0L, VASGSAFE | VJTFLGOK2, 0L, 0L, 0L);
127+
return jtfdef(jt, 0, CBDOT, VERB, jtbitwise1, jtbitwiseshifta, 0L, w, 0L, VASGSAFE | VJTFLGOK2, 0L, 0L, 0L);
128128
// The code uses a VERB with id CBDOT to stand for the derived verb of m b. . This is used for spellout and
129129
// for inverses, so we retain it. We copy the other information from the verb that executes the function.
130130
// This contains pointers to the routines, and to the function table
@@ -300,7 +300,7 @@ jtmemo(J jt, A w) {
300300
RZ(hv[1] = jtmkwris(jt, q));
301301
GATV0(q, BOX, m, 1);
302302
hv[2] = q;
303-
EPILOG(fdef(0, CMCAP, VERB, jtmemo1, jtmemo2, w, 0L, h, 0L, v->mr, lrv(v), rrv(v)));
303+
EPILOG(jtfdef(jt, 0, CMCAP, VERB, jtmemo1, jtmemo2, w, 0L, h, 0L, v->mr, lrv(v), rrv(v)));
304304
// Now we have converted the verb result to recursive usecount, and gotten rid of the pending tpops for the
305305
// components of h
306306
}

‎jsrc/adverbs/a.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@
9898
}
9999

100100
#define ADERIV(id, f1, f2, flag, m, l, r) \
101-
fdef(0, id, VERB, (AF)(f1), (AF)(f2), w, 0L, 0L, (flag), (I)(m), (I)(l), (I)(r))
101+
jtfdef(jt, 0, id, VERB, (AF)(f1), (AF)(f2), w, 0L, 0L, (flag), (I)(m), (I)(l), (I)(r))
102102
#define CDERIV(id, f1, f2, flag, m, l, r) \
103-
fdef(0, id, VERB, (AF)(f1), (AF)(f2), a, w, 0L, (flag), (I)(m), (I)(l), (I)(r))
103+
jtfdef(jt, 0, id, VERB, (AF)(f1), (AF)(f2), a, w, 0L, (flag), (I)(m), (I)(l), (I)(r))
104104

105105
#define ASSERTVV(a, w) ASSERT(VERB& AT(a) & AT(w), EVDOMAIN)
106106
#define ASSERTVVn(a, w) ASSERT(VERB& AT(a), EVDOMAIN)

‎jsrc/adverbs/ai.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -262,11 +262,11 @@ jtinvamp(J jt, A w) {
262262
case CFIT:
263263
ASSERT(nf && (CPOUND == ID(FAV(g)->fgh[0])), EVDOMAIN);
264264
ASSERT(1 == AR(x), EVRANK);
265-
return fdef(0, CPOWOP, VERB, jtexpandg, 0L, w, num(-1), 0L, VFLAGNONE, RMAX, 0L, 0L);
265+
return jtfdef(jt, 0, CPOWOP, VERB, jtexpandg, 0L, w, num(-1), 0L, VFLAGNONE, RMAX, 0L, 0L);
266266
case CPOUND:
267267
ASSERT(nf != 0, EVDOMAIN);
268268
ASSERT(1 == AR(x), EVRANK);
269-
return fdef(0, CPOWOP, VERB, jtexpandf, 0L, w, num(-1), 0L, VFLAGNONE, RMAX, 0L, 0L);
269+
return jtfdef(jt, 0, CPOWOP, VERB, jtexpandf, 0L, w, num(-1), 0L, VFLAGNONE, RMAX, 0L, 0L);
270270
break;
271271
case CPOWOP:
272272
if (VGERL & u->flag) {
@@ -409,8 +409,8 @@ jtinv(J jt, A w, I recur) {
409409
case CBANG:
410410
return jteval(jt, "3 : '(-(y -~ !)%0.001&* (0.001%~[:-/[:! 0.001 0 +/ ]) ])^:_<.&170^:(-:+)^.y' :. !");
411411
case CXCO: return jtamp(jt, num(-1), w);
412-
case CSPARSE: return fdef(0, CPOWOP, VERB, jtdenseit, 0L, w, num(-1), 0L, VFLAGNONE, RMAX, RMAX, RMAX);
413-
case CPCO: return fdef(0, CPOWOP, VERB, jtplt, 0L, w, num(-1), 0L, 0L, 0L, 0L, 0L);
412+
case CSPARSE: return jtfdef(jt, 0, CPOWOP, VERB, jtdenseit, 0L, w, num(-1), 0L, VFLAGNONE, RMAX, RMAX, RMAX);
413+
case CPCO: return jtfdef(jt, 0, CPOWOP, VERB, jtplt, 0L, w, num(-1), 0L, 0L, 0L, 0L, 0L);
414414
case CQCO: return jteval(jt, "*/");
415415
case CUCO: return jtamp(jt, num(3), w);
416416
case CUNDER: return jtunder(jt, invrecur(f), g);
@@ -472,7 +472,7 @@ jtinv(J jt, A w, I recur) {
472472
break;
473473
case CCUT:
474474
if (CBOX == ID(f) && ng && (p = jti0(jt, g), 1 == p || 2 == p))
475-
return fdef(0, CPOWOP, VERB, jtbminv, 0L, w, num(-1), 0L, VFLAGNONE, RMAX, RMAX, RMAX);
475+
return jtfdef(jt, 0, CPOWOP, VERB, jtbminv, 0L, w, num(-1), 0L, VFLAGNONE, RMAX, RMAX, RMAX);
476476
break;
477477
case CIBEAM:
478478
p = jti0(jt, f);

‎jsrc/adverbs/ao.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1452,5 +1452,5 @@ jtsldot(J jt, A w) {
14521452
// otherwise (including keymean) fall through to...
14531453
default: f2 = jtkey; flag |= (FAV(w)->flag & VASGSAFE); // pass through ASGSAFE.
14541454
}
1455-
return fdef(0, CSLDOT, VERB, f1, f2, w, 0L, h, flag, RMAX, RMAX, RMAX);
1455+
return jtfdef(jt, 0, CSLDOT, VERB, f1, f2, w, 0L, h, flag, RMAX, RMAX, RMAX);
14561456
}

‎jsrc/adverbs/ap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1449,7 +1449,7 @@ jtbslash(J jt, A w) {
14491449
;
14501450
if (!w) return 0;
14511451
if (NOUN & AT(w))
1452-
return fdef(
1452+
return jtfdef(jt,
14531453
0, CBSLASH, VERB, jtinfixprefix1, jtinfixprefix2, w, 0L, jtfxeachv(jt, 1L, w), VGERL | flag, RMAX, 0L, RMAX);
14541454
v = FAV(w); // v is the u in u\ y
14551455
switch (v->id) {

‎jsrc/adverbs/ar.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1091,7 +1091,7 @@ jtslash(J jt, A w) {
10911091
break; // monad is inplaceable if the dyad for u is
10921092
}
10931093
RZ(h = jtqq(jt, w, jtv2(jt, lr(w), RMAX))); // create the rank compound to use if dyad
1094-
RZ(h = fdef(0, CSLASH, VERB, f1, jtoprod, w, 0L, h, flag | FAV(ds(CSLASH))->flag, RMAX, RMAX, RMAX));
1094+
RZ(h = jtfdef(jt, 0, CSLASH, VERB, f1, jtoprod, w, 0L, h, flag | FAV(ds(CSLASH))->flag, RMAX, RMAX, RMAX));
10951095
// set lvp[1] to point to the VARPSA block for w if w is atomic dyad; otherwise to the null VARPSA block
10961096
FAV(h)->localuse.lvp[1] = v->flag & VISATOMIC2 ? ((VA*)v->localuse.lvp[0])->rps : &rpsnull;
10971097
return h;

‎jsrc/adverbs/as.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ jtbsdot(J jt, A w) {
595595
C id;
596596
V* v; // init flag is IRS1
597597
if (NOUN & AT(w))
598-
return fdef(0,
598+
return jtfdef(jt, 0,
599599
CBSLASH,
600600
VERB,
601601
jtgsuffix,

‎jsrc/adverbs/au.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jtself2(J jt, A a, A w) {
4747

4848
A
4949
jtac2(J jt, AF f) {
50-
return fdef(0, 0, VERB, 0L, f, 0L, 0L, 0L, VFLAGNONE, RMAX, RMAX, RMAX);
50+
return jtfdef(jt, 0, 0, VERB, 0L, f, 0L, 0L, 0L, VFLAGNONE, RMAX, RMAX, RMAX);
5151
}
5252

5353
A

‎jsrc/conjunctions/ca.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -271,14 +271,14 @@ jtatop(J jt, A a, A w) {
271271
AT(w) |= LIT;
272272
}
273273
}
274-
return fdef(0, CAT, VERB, onconst1, onconst2, a, w, h, VFLAGNONE, RMAX, RMAX, RMAX);
274+
return jtfdef(jt, 0, CAT, VERB, onconst1, onconst2, a, w, h, VFLAGNONE, RMAX, RMAX, RMAX);
275275
}
276276
wv = FAV(w);
277277
d = wv->id;
278278
if ((d & ~1) == CLEFT) {
279279
// the very common case u@] and u@[. Take ASGSAFE and inplaceability from u. No IRS. Vector the monad
280280
// straight to u; vector the dyad to our routine that shuffles args and inplace bits
281-
return fdef(0,
281+
return jtfdef(jt, 0,
282282
CAT,
283283
VERB,
284284
onright1,
@@ -471,7 +471,7 @@ jtatop(J jt, A a, A w) {
471471
}
472472
}
473473

474-
return fdef(flag2, CAT, VERB, f1, f2, a, w, h, flag, (I)wv->mr, (I)lrv(wv), rrv(wv));
474+
return jtfdef(jt, flag2, CAT, VERB, f1, f2, a, w, h, flag, (I)wv->mr, (I)lrv(wv), rrv(wv));
475475
}
476476

477477
// u@:v
@@ -493,7 +493,7 @@ jtatco(J jt, A a, A w) {
493493
if ((d & ~1) == CLEFT) {
494494
// the very common case u@:] and u@:[. Take ASGSAFE and inplaceability from u. No IRS. Vector the monad
495495
// straight to u; vector the dyad to our routine that shuffles args and inplace bits
496-
return fdef(0,
496+
return jtfdef(jt, 0,
497497
CATCO,
498498
VERB,
499499
onright1,
@@ -638,7 +638,7 @@ jtatco(J jt, A a, A w) {
638638
flag2 |= wv->flag2 & (VF2WILLOPEN1 | VF2WILLOPEN2W | VF2WILLOPEN2A | VF2USESITEMCOUNT1 | VF2USESITEMCOUNT2W |
639639
VF2USESITEMCOUNT2A);
640640

641-
return fdef(flag2, CATCO, VERB, f1, f2, a, w, 0L, flag, RMAX, RMAX, RMAX);
641+
return jtfdef(jt, flag2, CATCO, VERB, f1, f2, a, w, 0L, flag, RMAX, RMAX, RMAX);
642642
}
643643

644644
// u&:v
@@ -693,7 +693,7 @@ jtampco(J jt, A a, A w) {
693693
flag2 |= (f1 == on1cell) << VF2RANKATOP1X;
694694
flag2 |= VF2RANKATOP2;
695695
A z;
696-
RZ(z = fdef(flag2, CAMPCO, VERB, f1, f2, a, w, 0L, flag, RMAX, RMAX, RMAX));
696+
RZ(z = jtfdef(jt, flag2, CAMPCO, VERB, f1, f2, a, w, 0L, flag, RMAX, RMAX, RMAX));
697697
FAV(z)->localuse.lclr[0] = linktype;
698698
return z;
699699
}
@@ -822,7 +822,7 @@ jtamp(J jt, A a, A w) {
822822
flag &= ~VJTFLGOK1;
823823
}
824824
}
825-
return fdef(0, CAMP, VERB, f1, with2, a, w, h, flag, RMAX, RMAX, RMAX);
825+
return jtfdef(jt, 0, CAMP, VERB, f1, with2, a, w, h, flag, RMAX, RMAX, RMAX);
826826
case VN:
827827
f1 = withr;
828828
v = FAV(a);
@@ -862,7 +862,7 @@ jtamp(J jt, A a, A w) {
862862
flag &= ~VJTFLGOK1;
863863
}
864864
}
865-
return fdef(0, CAMP, VERB, f1, with2, a, w, h, flag, RMAX, RMAX, RMAX);
865+
return jtfdef(jt, 0, CAMP, VERB, f1, with2, a, w, h, flag, RMAX, RMAX, RMAX);
866866
case VV:
867867
// u&v
868868
f1 = on1;
@@ -963,7 +963,7 @@ jtamp(J jt, A a, A w) {
963963
}
964964
}
965965
A z;
966-
RZ(z = fdef(flag2, CAMP, VERB, f1, f2, a, w, 0L, flag, r, r, r));
966+
RZ(z = jtfdef(jt, flag2, CAMP, VERB, f1, f2, a, w, 0L, flag, r, r, r));
967967
FAV(z)->localuse.lclr[0] = linktype;
968968
return z;
969969
}

‎jsrc/conjunctions/cc.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1951,24 +1951,24 @@ jtcut(J jt, A a, A w) {
19511951
switch (k) {
19521952
case 0:
19531953
if (FAV(a)->id == CBOX) { // <;.0
1954-
RZ(z = fdef(0, CCUT, VERB, jtcut01, jtboxcut0, a, w, h, flag | VJTFLGOK2, RMAX, 2L, RMAX));
1954+
RZ(z = jtfdef(jt, 0, CCUT, VERB, jtcut01, jtboxcut0, a, w, h, flag | VJTFLGOK2, RMAX, 2L, RMAX));
19551955
FAV(z)->localuse.lpf.parm = ~0;
19561956
FAV(z)->localuse.lpf.func = jtcut02; // store parms to specify start/len format
19571957
return z;
19581958
}
1959-
z = fdef(0, CCUT, VERB, jtcut01, jtcut02, a, w, h, flag | VJTFLGOK2, RMAX, 2L, RMAX);
1959+
z = jtfdef(jt, 0, CCUT, VERB, jtcut01, jtcut02, a, w, h, flag | VJTFLGOK2, RMAX, 2L, RMAX);
19601960
break;
19611961
case 1:
19621962
case -1:
19631963
case 2:
19641964
case -2:
19651965
if (!(NOUN & AT(a))) flag = VJTFLGOK2 + VJTFLGOK1;
1966-
z = fdef(0, CCUT, VERB, jtcut1, jtcut2, a, w, h, flag, RMAX, 1L, RMAX);
1966+
z = jtfdef(jt, 0, CCUT, VERB, jtcut1, jtcut2, a, w, h, flag, RMAX, 1L, RMAX);
19671967
break;
19681968
case 3:
19691969
case -3:
19701970
case 259:
1971-
case -259: z = fdef(0, CCUT, VERB, jttess1, jttess2, a, w, h, flag, RMAX, 2L, RMAX); break;
1971+
case -259: z = jtfdef(jt, 0, CCUT, VERB, jttess1, jttess2, a, w, h, flag, RMAX, 2L, RMAX); break;
19721972
default: ASSERT(0, EVDOMAIN);
19731973
}
19741974
RZ(z);

0 commit comments

Comments
 (0)