From b5b1ebbab42738be258e9b52ead3594a639ad838 Mon Sep 17 00:00:00 2001 From: Conor Hoekstra Date: Thu, 4 Feb 2021 21:22:24 -0500 Subject: [PATCH] Remove `jtshapex` --- jlibrary/system/main/stdlib.ijs | 2 +- jsrc/je.h | 1 - jsrc/t.c | 2 +- jsrc/verbs/v.c | 2 -- learning/REFACTORINGS.md | 18 +++++++++--------- test/g210.ijs | 4 ++-- 6 files changed, 13 insertions(+), 16 deletions(-) diff --git a/jlibrary/system/main/stdlib.ijs b/jlibrary/system/main/stdlib.ijs index 07efad1a..cf6ed5e9 100644 --- a/jlibrary/system/main/stdlib.ijs +++ b/jlibrary/system/main/stdlib.ijs @@ -9,7 +9,7 @@ jpathsep=: '/'&(('\' I.@:= ])}) winpathsep=: '\'&(('/' I.@:= ])}) PATHJSEP_j_=: '/' IFDEF=: 3 : '0=4!:0<''DEF'',y,''_z_''' -IF64=: 16={:$3!:3[2 +IF64=: 1 IFBE=: 'a'~:{.2 (3!:4) a.i.'a' 'IFUNIX IFWIN IFWINCE'=: 5 6 7 = 9!:12'' IFJHS=: 0 diff --git a/jsrc/je.h b/jsrc/je.h index 198bb3d9..035971a4 100644 --- a/jsrc/je.h +++ b/jsrc/je.h @@ -304,7 +304,6 @@ extern A jtseclevq(J jt, A w); extern A jtseclevs(J jt, A w); extern A jtself1(J jt, A w); extern A jtshape(J jt, A w); -extern A jtshapex(J jt, A w); extern A jtshift1(J jt, A w); extern A jtsignum(J jt, A w); extern A jtsiinfo(J jt, A w); diff --git a/jsrc/t.c b/jsrc/t.c index 12a1dffc..74ae3486 100644 --- a/jsrc/t.c +++ b/jsrc/t.c @@ -102,7 +102,7 @@ PRIM primtab[256] = { /* ^ */ PRIMATOMIC12(CEXP, VERB, jtatomic1, jtexpn2, 0, 0, 0 ,VISATOMIC1|VFUSEDOK2|VIRS2|VASGSAFE|VJTFLGOK1|VJTFLGOK2,VF2NONE), /* ^. */ PRIMATOMIC1(CLOG, VERB, jtatomic1, jtlogar2, 0, 0, 0 ,VISATOMIC1|VASGSAFE|VJTFLGOK1,VF2NONE), /* ^: */ PRIMACV(CPOWOP, CONJ, jtdomainerr1, jtpowop, 0, 0, 0 ,VFLAGNONE,VF2NONE), - /* $ */ PRIMACV(CDOLLAR, VERB, jtshapex, jtreitem, RMAX,1, RMAX,VASGSAFE|VIRS2|VJTFLGOK2,VF2NONE), + /* $ */ PRIMACV(CDOLLAR, VERB, jtshape, jtreitem, RMAX,1, RMAX,VASGSAFE|VIRS2|VJTFLGOK2,VF2NONE), /* $. */ PRIMACV(CSPARSE, VERB, jtsparse1, jtsparse2,RMAX,RMAX,RMAX,VASGSAFE,VF2NONE), /* $: */ PRIMACV(CSELF, VERB, jtself1, jtself2, RMAX,RMAX,RMAX,VFLAGNONE,VF2NONE), /* ~ */ PRIMACV(CTILDE, ADV, jtswap, jtdomainerr2, 0, 0, 0 ,VFLAGNONE,VF2NONE), diff --git a/jsrc/verbs/v.c b/jsrc/verbs/v.c index 318e576b..dcc75880 100644 --- a/jsrc/verbs/v.c +++ b/jsrc/verbs/v.c @@ -5,8 +5,6 @@ #include "j.h" - - A jtshapex (J jt, A w) {A z; z=vec(INT,AR(w),AS(w)); return AT(w)&XNUM+RAT?xco1(z):z;} A jtshape (J jt, A w) { return vec(INT,AR(w),AS(w));} // $ y A jtisempty (J jt, A w) { if((AT(w)&SPARSE)!=0)return eps(zeroionei(0),shape(w)); return num(AN(w)==0);} // 0 e. $ A jtisnotempty(J jt, A w) { if((AT(w)&SPARSE)!=0)return __not(eps(zeroionei(0),shape(w))); return num(AN(w)!=0);} // *@#@, diff --git a/learning/REFACTORINGS.md b/learning/REFACTORINGS.md index d31402ed..711c4134 100644 --- a/learning/REFACTORINGS.md +++ b/learning/REFACTORINGS.md @@ -18,15 +18,15 @@ ### Refactoring Translations -| From | To | -| :-------------------: | :----------------------------------------: | -| `A` | `array` | -| `SETIC` 1 | `item_count()` | -| `REPSGN` | `replicate_sign` 2 | -| `AV` | `pointer_to_values` | -| `IAV` | `pointer_to_values` | -| `IAV(w)[i] = k` | `set_value_at(w, i, k)` | -| `k & ~1` | `!zero_or_one(k)` | +| From | To | +| :-------------------: | :--------------------------------------------: | +| `A` | `array` | +| `SETIC` 1 | `item_count()` | +| `REPSGN` | `replicate_sign` 2 | +| `AV` | `pointer_to_values` | +| `IAV` | `pointer_to_values` | +| `IAV(w)[i] = k` | `set_value_at(w, i, k)` | +| `k & ~1` | `!zero_or_one(k)` | | `GAT0(z, TYPE, x, y)` | `z = make_array(jt, x, y)` | 1. There could be exceptions where this doesn't work diff --git a/test/g210.ijs b/test/g210.ijs index f9cd3354..1b0376ec 100644 --- a/test/g210.ijs +++ b/test/g210.ijs @@ -85,8 +85,8 @@ s -: $ s $ 0j1;'abc' [ s =. ?(?7)$5 (,1) -: $ ,s:@<"0&.> <'ergo' (,1) -: $ ,<"0@s: <'ergo' -(3!:0 ]10x) -: 3!:0 $ 10 20 30x -(3!:0 ]10x) -: 3!:0 $ 5 % 10 20 30x +(3!:0 ]10) -: 3!:0 $ 10 20 30 +(3!:0 ]10) -: 3!:0 $ 5 % 10 20 30 NB. x$y -----------------------------------------------------------------