Merge pull request #165 from juntuu/removal

Removing unused functions and dead code

Author: codereport

jsrc/conjunctions/cg.c

@@ -659,26 +659,3 @@ jtgadv(J jt, A w, C id) {
              atoplr(AAV(hs)[0]);
     return fdef(0, id, VERB, jtgav1, jtgav2, w, 0L, hs, flag, RMAX, RMAX, RMAX);  // create the derived verb
 }
-
-static A
-jtgf1(J jt, A w, A self) {
-    A z, h = FAV(self)->fgh[2];
-    return df1(z, w, AAV(h)[0]);
-}
-static A
-jtgf2(J jt, A a, A w, A self) {
-    A z, h = FAV(self)->fgh[2];
-    return df2(z, a, w, AAV(h)[0]);
-}
-
-A
-jtvger2(J jt, C id, A a, A w) {
-    A h, *hv, x;
-    V *v;
-    RZ(x = a ? a : w);
-    ASSERT(2 == AN(x), EVLENGTH);
-    RZ(h = jtfxeachv(jt, 1L, x));
-    hv = AAV(h);
-    v  = VAV(*hv);
-    return fdef(0, id, VERB, jtgf1, jtgf2, x, a ? w : 0L, h, VGERL, (I)v->mr, lrv(v), rrv(v));
-} /* verify and define 2-element gerund */

jsrc/conjunctions/cr.c

@@ -16,7 +16,6 @@
 #define STATEANOTEMPTYX 17  // set if a arg has atoms
 #define STATEANOTEMPTY ((I)1 << STATEANOTEMPTYX)
 #define STATEAWNOTEMPTYX 18  // set if a and w args both have atoms
-#define STATEAWNOTEMPTY ((I)1 << STATEAWNOTEMPTYX)
 // These bits start where they do to avoid overlap with AFPRISTINE.  Also, they are above where rank significance is
 #define STATEOUTERREPEATAX 22
 #define STATEOUTERREPEATA (((I)1) << STATEOUTERREPEATAX)
@@ -64,7 +63,7 @@ jtrank1ex(J jt, AD *RESTRICT w, A fs, I rr, AF f1) {
     // multiple cells.  Loop through them.
     // Get size of each argument cell in atoms.  If this overflows, there must be a 0 in the frame, & we will have
     // gone through the fill path (& caught the overflow)
-    CPROD(AN(w), mn, wf, AS(w));
+    CPROD(mn, wf, AS(w));
     PROD(wcn, rr, AS(w) + wf);  // number of cells, number of atoms in a cell
     // ?cn=number of atoms in a cell, ?k=#bytes in a cell
     wk = wcn << bplg(AT(w));
@@ -389,9 +388,8 @@ jtrank2ex(J jt, AD *RESTRICT a, AD *RESTRICT w, A fs, UI lrrrlcrrcr, AF f2) {
         los = aof - wof < 0 ? AS(w) : los;
         state |= (aof - wof) & STATEOUTERREPEATA;
         ASSERTAGREE(AS(a), AS(w), sof)  // prefixes must agree
-        CPROD(state & STATEAWNOTEMPTY, outerframect, sof, los);
-        CPROD(
-          state & STATEAWNOTEMPTY, outerrptct, lof - sof, los + sof);  // get # cells in frame, and in unmatched frame
+        CPROD(outerframect, sof, los);
+        CPROD(outerrptct, lof - sof, los + sof);  // get # cells in frame, and in unmatched frame
     }
 
     // Now work on inner frames.  Compare frame lengths after discarding outer frames
@@ -410,8 +408,8 @@ jtrank2ex(J jt, AD *RESTRICT a, AD *RESTRICT w, A fs, UI lrrrlcrrcr, AF f2) {
         state |=
           (ew - ea) & STATEINNERREPEATW;  // make lis the shape pointer for longer; if a is longer, indicate repeating w
     }
-    CPROD(state & STATEAWNOTEMPTY, innerrptct, lif - sif, lis + sif);  // number of repetitions per matched-frame cell
-    CPROD(state & STATEAWNOTEMPTY, innerframect, sif, lis);            // number of cells in matched frame
+    CPROD(innerrptct, lif - sif, lis + sif);  // number of repetitions per matched-frame cell
+    CPROD(innerframect, sif, lis);            // number of cells in matched frame
 
     // Migrate loops with count=1 toward the inner to reduce overhead.  We choose not to promote the outer to the inner
     // if both innerframect & innerrptct are 1, on grounds of rarity

jsrc/j.h

@@ -877,7 +877,7 @@
     }
 // CPROD is to be used to create a test testing #atoms.  Because empty arrays can have cells that have too many atoms,
 // we can't use PROD if we don't know that the array isn't empty or will be checked later
-#define CPROD(t, z, x, a) PRODX(z, x, a, 1)
+#define CPROD(z, x, a) PRODX(z, x, a, 1)
 // PROLOG/EPILOG are the main means of memory allocation/free.  jt->tstack contains a pointer to every block that is
 // allocated by GATV(i. e. all blocks). GA causes a pointer to the block to be pushed onto tstack.  PROLOG saves a copy
 // of the stack pointer in _ttop, a local variable in its function.  Later, jttpop(jt,_ttop) can be executed to free

jsrc/ja.h

@@ -188,9 +188,6 @@
 #define fdef(x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11) \
     jtfdef(jt, (x0), (x1), (x2), (x3), (x4), (x5), (x6), (x7), (x8), (x9), (x10), (x11))
 #define fillv(x, y, z) jtfillv(jt, (x), (y), (z))
-// x is locale number, result is address of symbol table, or 0 if nonexistent locale
-// only for non-reuse #define findnlz(x,z)                {if((UI)(n)>=jt->numlocsize)z=0; else
-// {z=(A)(jt->numloctbl[n]); z=((UI)((I*)z-jt->numloctbl)<jt->numlocsize)?0:z;}}
 #define fitct(x, y, n) jtfitct(jt, (x), (y), (n))
 #define floor1(x) jtatomic1(jt, (x), ds(CFLOOR))
 #define fmfill(x0, x1, x2, x3, x4, x5, x6, x7) jtfmfill(jt, (x0), (x1), (x2), (x3), (x4), (x5), (x6), (x7))

jsrc/jdlllic.c

@@ -17,19 +17,6 @@
 #define SERIALNUMSIZE 32
 #define lobyte(w) ((UC)(w))
 
-int
-swapint(int n) {
-    C *p, c;
-    p    = (C*)&n;
-    c    = p[3];
-    p[3] = p[0];
-    p[0] = c;
-    c    = p[2];
-    p[2] = p[1];
-    p[1] = c;
-    return n;
-}
-
 A
 jtlock1(J jt, A w) {
     A z;
@@ -76,11 +63,6 @@ jtlock1(J jt, A w) {
     return z;
 }
 
-A
-jtlock2(J jt, A a, A w) {
-    ASSERT(0, EVDOMAIN);
-}
-
 A
 jtunlock2(J jt, A a, A w) {
     int i, j, len, tlen;

jsrc/je.h

@@ -19,7 +19,6 @@ extern A jtbase1(J jt, A w);
 extern A jtbdot(J jt, A w);
 extern A jtbehead(J jt, A w);
 extern A jtbinrep1(J jt, A w);
-extern A jtbitadv(J jt, A w);
 extern A jtbox(J jt, A w);
 extern A jtboxopen(J jt, A w);
 extern A jtboxq(J jt, A w);
@@ -40,9 +39,7 @@ extern A jtcder(J jt, A w);
 extern A jtcderx(J jt, A w);
 extern A jtcdf(J jt, A w);
 extern A jtcdot1(J jt, A w);
-extern A jtceil1(J jt, A w);
 extern A jtcerrno(J jt, A w);
-extern A jtconjug(J jt, A w);
 extern A jtcork1(J jt, A w, A self);
 extern A jtcrc1(J jt, A w);
 extern A jtcrccompile(J jt, A w);
@@ -91,13 +88,10 @@ extern A jtevms(J jt, A w);
 extern A jtex(J jt, A w);
 extern A jtexec1(J jt, A w);
 extern A jtexg(J jt, A w);
-extern A jtexpn1(J jt, A w);
-extern A jtfact(J jt, A w);
 extern A jtfactor(J jt, A w);
 extern A jtfh15(J jt, A w);
 extern A jtfiller(J jt, A w);
 extern A jtfix(J jt, A w, A self);
-extern A jtfloor1(J jt, A w);
 extern A jtfmt01(J jt, A w);
 extern A jtfmt11(J jt, A w);
 extern A jtfmt21(J jt, A w);
@@ -118,7 +112,6 @@ extern A jtkeyheadtally(J jt, A a, A w, A self);
 extern A jthalve(J jt, A w);
 extern A jthead(J jt, A w);
 extern A jthexrep1(J jt, A w);
-extern A jthgdiff(J jt, A w);
 extern A jthost(J jt, A w);
 extern A jthostio(J jt, A w);
 extern A jthostne(J jt, A w);
@@ -162,11 +155,6 @@ extern A jtjoff(J jt, A w);
 extern A jtjopen(J jt, A w);
 extern A jtjpr(J jt, A w);
 extern A rank(J jt, A w);
-extern A jtjregcomp(J jt, A w);
-extern A jtjregerror(J jt, A w);
-extern A jtjregfree(J jt, A w);
-extern A jtjreghandles(J jt, A w);
-extern A jtjreginfo(J jt, A w);
 extern A jtjunlock(J jt, A w);
 extern A jtjwait(J jt, A w);
 extern A jtlamin1(J jt, A w);
@@ -182,10 +170,8 @@ extern A jtlocpath1(J jt, A w);
 extern A jtlocsizeq(J jt, A w);
 extern A jtlocsizes(J jt, A w);
 extern A jtlocswitch(J jt, A w);
-extern A jtlogar1(J jt, A w);
 extern A jtlrep(J jt, A w);
 extern A jtlrx(J jt, A w);
-extern A jtmag(J jt, A w);
 extern A jtmap(J jt, A w);
 extern A jtmat(J jt, A w);
 extern A jtmema(J jt, A w);
@@ -239,8 +225,6 @@ extern A jtppq(J jt, A w);
 extern A jtpps(J jt, A w);
 extern A jtprep(J jt, A w);
 extern A jtprime(J jt, A w);
-extern A jtprocarch(J jt, A w);
-extern A jtprocfeat(J jt, A w);
 extern A jtprx(J jt, A w);
 extern A jtqpctr(J jt, A w);
 extern A jtqpfreq(J jt, A w);
@@ -251,7 +235,6 @@ extern A jtravel(J jt, A w);
 extern A jtraze(J jt, A w);
 extern A jtrazeh(J jt, A w);
 extern A jtrazein(J jt, A w);
-extern A jtrca(J jt, A w);
 extern A jtrdot1(J jt, A w);
 extern A jtrecip(J jt, A w);
 extern A jtrect(J jt, A w);
@@ -287,7 +270,6 @@ extern A jtseclevs(J jt, A w);
 extern A jtself1(J jt, A w);
 extern A shape(J jt, A w);
 extern A jtshift1(J jt, A w);
-extern A jtsignum(J jt, A w);
 extern A jtslash(J jt, A w);
 extern A jtsldot(J jt, A w);
 extern A jtsnl(J jt, A w);
@@ -298,7 +280,6 @@ extern A jtspfor(J jt, A w);
 extern A jtspforloc(J jt, A w);
 extern A jtsphwmk(J jt, A w);
 extern A jtspit(J jt, A w);
-extern A jtsqroot(J jt, A w);
 extern A jtsquare(J jt, A w);
 extern A jtstr0(J jt, A w);
 extern A jtstype(J jt, A w);
@@ -307,14 +288,10 @@ extern A jtsymbrd(J jt, A w);
 extern A jtsymbrdlock(J jt, A w);
 extern A jtsymbrdlocknovalerr(J jt, A w);
 extern A jtsympool(J jt, A w);
-extern A jtsysparmq(J jt, A w);
-extern A jtsysparms(J jt, A w);
 extern A jtsysq(J jt, A w);
 extern A jttable(J jt, A w);
 extern A jttail(J jt, A w);
 extern A tally(J jt, A w);
-extern A jttco(J jt, A w);
-extern A jttdot(J jt, A w);
 extern A jtthorn1(J jt, A w);
 extern A jtthorn1u(J jt, A w);
 extern A jttlimq(J jt, A w);
@@ -351,8 +328,6 @@ extern A jtxco1(J jt, A w);
 extern A jtabase2(J jt, A a, A w);
 extern A jtadot2(J jt, A a, A w);
 extern A jtadverse(J jt, A a, A w);
-extern A jtaes2(J jt, A a, A w);
-extern A jtagenda(J jt, A a, A w);
 extern A jtagendai(J jt, A a, A w);
 extern A jtamp(J jt, A a, A w);
 extern A jtampco(J jt, A a, A w);
@@ -362,8 +337,6 @@ extern A jtatco(J jt, A a, A w);
 extern A jtatop(J jt, A a, A w);
 extern A jtbase2(J jt, A a, A w);
 extern A jtbinrep2(J jt, A a, A w);
-extern A jtbit(J jt, A a, A w);
-extern A jtbitmatch(J jt, A a, A w);
 extern A jtbitwiserotate(J jt, A a, A w);
 extern A jtbitwiseshift(J jt, A a, A w);
 extern A jtbitwiseshifta(J jt, A a, A w);
@@ -391,7 +364,6 @@ extern A jtebar(J jt, A a, A w);
 extern A jteps(J jt, A a, A w);
 extern A jtetoiso8601(J jt, A a, A w);
 extern A jtiso8601toe(J jt, A a, A w);
-extern A jteven(J jt, A a, A w);
 extern A jtevger(J jt, A a, A w);
 extern A jtexec2(J jt, A a, A w);
 extern A jtexpand(J jt, A a, A w);
@@ -413,7 +385,6 @@ extern A jtfromr(J jt, A a, A w);
 extern A jtfromsd(J jt, A a, A w);
 extern A jtfromss(J jt, A a, A w);
 extern A jtfsm(J jt, A a, A w);
-extern A jtgenbitwiserotate(J jt, A a, A w);
 extern A jtgrade1p(J jt, A a, A w);
 extern A jtgrade2(J jt, A a, A w);
 extern A jthexrep2(J jt, A a, A w);
@@ -439,7 +410,6 @@ extern A jtleft2(J jt, A a, A w);
 extern A jtless(J jt, A a, A w);
 extern A jtlink(J jt, A a, A w, A self);
 extern A jtloccre2(J jt, A a, A w);
-extern A jtlock2(J jt, A a, A w);
 extern A jtlocnl2(J jt, A a, A w);
 extern A jtlocpath2(J jt, A a, A w);
 extern A jtlogar2(J jt, A a, A w);
@@ -452,7 +422,6 @@ extern A jtnl2(J jt, A a, A w);
 extern A jtnotmatch(J jt, A a, A w);
 extern A jtnouninfo2(J jt, A a, A w);
 extern A jtobverse(J jt, A a, A w);
-extern A jtodd(J jt, A a, A w);
 extern A jtordstat(J jt, A a, A w);
 extern A jtordstati(J jt, A a, A w);
 extern A jtoutstr(J jt, A a, A w);
@@ -488,15 +457,12 @@ extern A jtscz2(J jt, A a, A w);
 extern A jtself2(J jt, A a, A w);
 extern A jtsetfv(J jt, A a, A w);
 extern A jtsfrom(J jt, A a, A w);
-extern A jtsmmcar(J jt, A a, A w);
-extern A jtsmmis(J jt, A a, A w);
 extern A jtsparse2(J jt, A a, A w);
 extern A jtspecialatoprestart(J jt, A a, A w, A self);
 extern A jtstitch(J jt, A a, A w);
 extern A jtstitchsp2(J jt, A a, A w);
 extern A jtsumebar(J jt, A a, A w);
 extern A jttake(J jt, A a, A w);
-extern A jttcap(J jt, A a, A w);
 extern A jtthorn2(J jt, A a, A w);
 extern A jttie(J jt, A a, A w);
 extern A jttsit2(J jt, A a, A w);
@@ -568,7 +534,6 @@ extern A jtaslash(J, C, A);
 extern A jtaslash1(J, C, A);
 extern A jtatab(J, C, A, A);
 extern AF jtatcompf(J, A, A, A);
-extern void jtauditmemchains(J);
 extern B jtb0(J, A);
 extern A jtbcvt(J, C, A);
 extern B* jtbfi(J, I, A, B);
@@ -577,14 +542,11 @@ extern B jtbitwisecharamp(J, UC*, I, UC*, UC*);
 extern B jtboxatop(J, A);
 extern A jtcelloffset(J, AD* RESTRICT, AD* RESTRICT);
 extern A jtcharmap(J, A, A, A);
-extern B jtcheckmf(J);
-extern B jtchecksi(J);
 extern A jtclonelocalsyms(J, A);
 extern A jtclonevirtual(J, A);
 extern I jtcompare(J, A, A);
 extern A jtconnum(J, I, C*);
 extern I jtcountnl(J);
-extern A jtcpa(J, B, A);
 extern A jtcreatecycliciterator(J, A, A);
 extern A jtcrelocalsyms(J, A, A, I, I, I);
 extern A jtcstr(J, C*);
@@ -597,8 +559,6 @@ extern DC jtdeba(J, C, void*, void*, A);
 extern void jtdebdisp(J, DC);
 extern void jtdebz(J);
 extern A jtdecorate(J, A, I);
-extern A jtdfss1(J, A, A, A);
-extern A jtdfss2(J, A, A, A, A);
 extern D jtdgamma(J, D);
 extern D jtdgcd(J, D, D);
 extern D jtdlcm(J, D, D);
@@ -607,7 +567,6 @@ extern B jtecvt(J, D, I, int*, int*, C*);
 extern B jtecvtinit(J);
 extern A jtenqueue(J, A, A, I);
 extern B jtequ(J, A, A);
-extern B jtequ0(J, A, A);
 extern A jtev2(J, A, A, C*);
 extern A jteva(J, A, C*);
 extern A jteval(J, C*);
@@ -686,7 +645,6 @@ extern A jtpee(J, A*, CW*, I, I, DC);
 extern A jtpfill(J, I, A);
 extern A jtpind(J, I, A);
 extern B jtpinit(J);
-extern I jtpiplocalerr(J, A);
 extern void jtpmrecord(J, A, A, I, int);
 extern D jtpospow(J, D, D);
 extern B jtpreparse(J, A, A*, A*);
@@ -765,25 +723,20 @@ extern D jttceil(J, D);
 extern D jttfloor(J, D);
 extern I jtthv(J, A, I, C*);
 extern A jttoc1(J, B, A);
-extern void jttoutf8w(J, C*, I, US*);
 extern void jttpop(J, A*);
 extern A* jttpush(J, AD* RESTRICT, I, A*);
-extern B jttrd(J jt, A w);
 extern A* jttg(J, A*);
 extern A jttokens(J, A, I);
 extern A jtunDD(J, A);
-extern B jtunlk(J, I);
 extern A jtunwordil(J, A, A, I);
 extern A jtv2(J, I, I);
-extern A jtva2s(J, A, A, C, VF, I, I, I, I, I);
 extern VA2 jtvar(J, A, I, I);
 extern A jtvasp(J, A, A, C, VF, I, I, I, I, I, I, I, I, I);
 extern B jtvc1(J, I, US*);
 extern A jtvci(J, I);
 extern A jtvec(J, I, I, void*);
 extern A jtvecb01(J, I, I, void*);
 extern F jtvfn(J, F);
-extern A jtvger2(J, C, A, A);
 extern A jtvirtual(J, AD* RESTRICT, I, I);
 extern B jtvnm(J, I, C*);
 extern void jtwri(J, I, C*, I, C*);
@@ -807,11 +760,7 @@ extern void forcetomemory(void*);
 extern UI hic(I, UC*);
 extern UI hic2(I, UC*);
 extern UI hic4(I, UC*);
-extern I hsize(I);
-extern J jinit(void);
 extern void jsto(J, I, C*);
-extern void jstpoll(J);
-extern void jststop(J);
 extern I level(A);
 extern I levelle(A, I);
 extern void mvc(I, void*, I, void*);
@@ -821,13 +770,9 @@ extern A relocate(I, A);
 extern I remii(I, I);
 extern C spellin(I, C*);
 extern void spellit(C, C*);
-extern I smmallosize(A);
-extern void smmfrr(A);
 extern void sortiq1(I*, I);
 extern I strtoI10s(I, C*);
 extern D tod(void);
-extern void va1primsetup(A);
-extern void va2primsetup(A);
 extern B vlocnm(I, C*);
 extern D xdouble(X);
 #define memcmpne(s, t, l) (!!memcmp((s), (t), (l)))