Skip to content

Remove jtshapex #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 5, 2021
Merged

Remove jtshapex #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jlibrary/system/main/stdlib.ijs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion jsrc/je.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion jsrc/t.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 0 additions & 2 deletions jsrc/verbs/v.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);} // *@#@,
Expand Down
18 changes: 9 additions & 9 deletions learning/REFACTORINGS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<TYPE, copy_shape_0>(jt, x, y)` |

1. There could be exceptions where this doesn't work
Expand Down
4 changes: 2 additions & 2 deletions test/g210.ijs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -----------------------------------------------------------------
Expand Down