Restructure and put everything under LINK

This also removes the need for a BUILD or ROOT variable. Should be more agnostic to platform.
Co-dfns · Aug 18, 2021 · fd72d78 · fd72d78
1 parent e31c499
commit fd72d78
Show file tree

Hide file tree

Showing 101 changed files with 370 additions and 148 deletions.
diff --git a/Script.txt b/Script.txt
@@ -1,5 +1,3 @@
 )RESET
-BUILD ROOT
-)SAVE
 codfns.AF∆LIB←'cpu'
 TEST'ALL'
diff --git a/codfns.dws b/codfns.dws
diff --git a/codfns.dyalog b/codfns.dyalog
diff --git a/src/DISPLAY.aplf b/src/DISPLAY.aplf
@@ -0,0 +1,31 @@
+ DISPLAY←{⎕IO ⎕ML←0                              ⍝ Boxed display of array.
+
+     ⍺←1 ⋄ chars←⍺⊃'..''''|-' '┌┐└┘│─'           ⍝ ⍺: 0-clunky, 1-smooth.
+
+     tl tr bl br vt hz←chars                     ⍝ Top left, top right, ...
+
+     box←{                                       ⍝ Box with type and axes.
+         vrt hrz←(¯1+⍴⍵)⍴¨vt hz                  ⍝ Vert. and horiz. lines.
+         top←(hz,'⊖→')[¯1↑⍺],hrz                 ⍝ Upper border with axis.
+         bot←(⊃⍺),hrz                            ⍝ Lower border with type.
+         rgt←tr,vt,vrt,br                        ⍝ Right side with corners.
+         lax←(vt,'⌽↓')[¯1↓1↓⍺],¨⊂vrt             ⍝ Left side(s) with axes,
+         lft←⍉tl,(↑lax),bl                       ⍝ ... and corners.
+         lft,(top⍪⍵⍪bot),rgt                     ⍝ Fully boxed array.
+     }
+
+     deco←{⍺←type open ⍵ ⋄ ⍺,axes ⍵}             ⍝ Type and axes vector.
+     axes←{(-2⌈⍴⍴⍵)↑1+×⍴⍵}                       ⍝ Array axis types.
+     open←{(1⌈⍴⍵)⍴⍵}                             ⍝ Expose null axes.
+     trim←{(~1 1⍷∧⌿⍵=' ')/⍵}                     ⍝ Remove extra blank cols.
+     type←{{(1=⍴⍵)⊃'+'⍵}∪,char¨⍵}                ⍝ Simple array type.
+     char←{⍬≡⍴⍵:hz ⋄ (⊃⍵∊'¯',⎕D)⊃'#~'}∘⍕         ⍝ Simple scalar type.
+     line←{(6≠10|⎕DR' '⍵)⊃' -'}                  ⍝ underline for atom.
+
+     {                                           ⍝ Recursively box arrays:
+         0=≡⍵:' '⍪(open ⎕FMT ⍵)⍪line ⍵           ⍝ Simple scalar.
+         1 ⍬≡(≡⍵)(⍴⍵):'∇' 0 0 box ⎕FMT ⍵         ⍝ Object rep: ⎕OR.
+         1=≡⍵:(deco ⍵)box open ⎕FMT open ⍵       ⍝ Simple array.
+         ('∊'deco ⍵)box trim ⎕FMT ∇¨open ⍵       ⍝ Nested array.
+     }⍵
+ }
diff --git a/src/INIT.aplf b/src/INIT.aplf
@@ -0,0 +1,3 @@
+ INIT
+ LINK
+ UT.sac←1
diff --git a/src/LINK.aplf b/src/LINK.aplf
@@ -0,0 +1,3 @@
+ LINK;opts;root
+ root←(⊃⎕NPARTS ⎕WSID),'src'
+ '#' root ⎕SE.Link.Create⍨opts⊣opts.(source watch)←⊂'dir'⊣opts←⎕NS ⍬
diff --git a/src/MK∆UCMD.aplf b/src/MK∆UCMD.aplf
@@ -0,0 +1,4 @@
+ MK∆UCMD
+ UNLINK
+ ⎕SE.SALT.Save'codfns ',(⊃⎕NPARTS ⎕WSID),'\codfns.dyalog'
+ LINK
diff --git a/src/PP.aplf b/src/PP.aplf
@@ -0,0 +1 @@
+ PP←{⍵⊣⎕←#.DISPLAY ⍵}
diff --git a/src/TEST.aplf b/src/TEST.aplf
@@ -0,0 +1,2 @@
+ TEST N
+ util.TEST N
diff --git a/src/UNLINK.aplf b/src/UNLINK.aplf
@@ -0,0 +1,2 @@
+ UNLINK
+ ⎕SE.Link.Break'#'
diff --git a/src/codfns/FNS.apln b/src/codfns/FNS.apln
@@ -0,0 +1,24 @@
+:Namespace FNS
+
+ ##.P2D←{z←⍪⍳≢⍵ ⋄ d←⍵≠,z ⋄ _←{p⊣d+←⍵≠p←⍺[z,←⍵]}⍣≡⍨⍵ ⋄ d(⍋(-1+d)↑⍤0 1⊢⌽z)}
+
+ Xml←{⍺←0 ⋄ ast←⍺{d i←P2D⊃⍵ ⋄ i∘{⍵[⍺]}¨(⊂d),1↓⍺↓⍵}⍣(0≠⍺)⊢⍵ ⋄ d t k n←4↑ast
+  cls←N∆[t],¨('-..'[1+×k]),¨⍕¨|k ⋄ fld←{((≢⍵)↑3↓f∆),⍪⍵}¨↓⍉↑3↓ast
+  ⎕XML⍉↑d cls(⊂'')fld}
+ ##.Xml←Xml
+
+ ##.dct←{⍺[(2×2≠/n,0)+(1↑⍨≢m)+m+n←⌽∨\⌽m←' '≠⍺⍺ ⍵]⍵⍵ ⍵}
+ ##.dlk←{((x⌷⍴⍵)↑[x←2|1+⍵⍵]⍺),[⍵⍵]⍺⍺@(⊂0 0)⍣('┌'=⊃⍵)⊢⍵}
+ ##.dwh←{⍵('┬'dlk 1)' │├┌└─'(0⌷⍉)dct,⊃⍪/((≢¨⍺),¨⊂⌈/≢∘⍉¨⍺)↑¨⍺}
+ ##.dwv←{⍵('├'dlk 0)' ─┬┌┐│'(0⌷⊢)dct(⊣⍪1↓⊢)⊃{⍺,' ',⍵}/(1+⌈/≢¨⍺){⍺↑⍵⍪⍨'│'↑⍨≢⍉⍵}¨⍺}
+
+ pp3←{⍺←'○' ⋄ d←(⍳≢⍵)≠⍵ ⋄ _←{z⊣d+←⍵≠z←⍺[⍵]}⍣≡⍨⍵ ⋄ lbl←⍺⍴⍨≢⍵
+  lyr←{i←⍸⍺=d ⋄ k v←↓⍉⍵⍵[i],∘⊂⌸i ⋄ (⍵∘{⍺[⍵]}¨v)⍺⍺¨@k⊢⍵}⍵                  
+  (⍵=⍳≢⍵)⌿⊃⍺⍺ lyr⌿(1+⍳⌈/d),⊂⍉∘⍪∘⍕¨lbl}                                     
+ ##.pp3←pp3
+
+ lb3←{⍺←⍳≢⊃⍵
+  '(',¨')',¨⍨{⍺,';',⍵}⌿⍕¨(N∆{⍺[⍵]}@2⊢(2⊃⍵){⍺[|⍵]}@{0>⍵}@4↑⊃⍵)[⍺;]}
+ ##.lb3←lb3
+
+:EndNamespace
diff --git a/cmp/Fix.aplf → src/codfns/Fix.aplf b/cmp/Fix.aplf → src/codfns/Fix.aplf
diff --git a/cmp/GC.aplf → src/codfns/GC.aplf b/cmp/GC.aplf → src/codfns/GC.aplf
diff --git a/src/codfns/GLOBAL.apln b/src/codfns/GLOBAL.apln
@@ -0,0 +1,5 @@
+:Namespace GLOBAL
+
+ ##.(⎕IO ⎕ML ⎕WX VERSION AF∆PREFIX AF∆LIB)←0 1 3 (3 1 0) '/opt/arrayfire' 'cuda'
+
+:EndNamespace
diff --git a/cmp/Help.aplf → src/codfns/Help.aplf b/cmp/Help.aplf → src/codfns/Help.aplf
diff --git a/cmp/List.aplf → src/codfns/List.aplf b/cmp/List.aplf → src/codfns/List.aplf
diff --git a/cmp/PS.aplf → src/codfns/PS.aplf b/cmp/PS.aplf → src/codfns/PS.aplf
diff --git a/cmp/PS∆READ.aplf → src/codfns/PS∆READ.aplf b/cmp/PS∆READ.aplf → src/codfns/PS∆READ.aplf
diff --git a/cmp/PS∆SPEC.aplf → src/codfns/PS∆SPEC.aplf b/cmp/PS∆SPEC.aplf → src/codfns/PS∆SPEC.aplf
diff --git a/cmp/BUILD.aplf → src/codfns/RTM.apln b/cmp/BUILD.aplf → src/codfns/RTM.apln
@@ -1,24 +1,4 @@
- BUILD ROOT;rtm;initsrc;files;sclsyms
-⍝ Parameters
-⍝  nams  Name codes for each symbol in syms
-⍝  rtn   Runtime code for each symbol in syms
-⍝  rth   Runtime header for every module
-⍝  syms  Runtime instruction set
- ⎕IO ⎕ML ⎕WX VERSION AF∆PREFIX AF∆LIB←0 1 3 (3 1 0) '/opt/arrayfire' 'cuda'
-
- P2D←{z←⍪⍳≢⍵ ⋄ d←⍵≠,z ⋄ _←{p⊣d+←⍵≠p←⍺[z,←⍵]}⍣≡⍨⍵ ⋄ d(⍋(-1+d)↑⍤0 1⊢⌽z)}
- Xml←{⍺←0 ⋄ ast←⍺{d i←P2D⊃⍵ ⋄ i∘{⍵[⍺]}¨(⊂d),1↓⍺↓⍵}⍣(0≠⍺)⊢⍵ ⋄ d t k n←4↑ast
-  cls←N∆[t],¨('-..'[1+×k]),¨⍕¨|k ⋄ fld←{((≢⍵)↑3↓f∆),⍪⍵}¨↓⍉↑3↓ast
-  ⎕XML⍉↑d cls(⊂'')fld}
- dct←{⍺[(2×2≠/n,0)+(1↑⍨≢m)+m+n←⌽∨\⌽m←' '≠⍺⍺ ⍵]⍵⍵ ⍵}
- dlk←{((x⌷⍴⍵)↑[x←2|1+⍵⍵]⍺),[⍵⍵]⍺⍺@(⊂0 0)⍣('┌'=⊃⍵)⊢⍵}
- dwh←{⍵('┬'dlk 1)' │├┌└─'(0⌷⍉)dct,⊃⍪/((≢¨⍺),¨⊂⌈/≢∘⍉¨⍺)↑¨⍺}
- dwv←{⍵('├'dlk 0)' ─┬┌┐│'(0⌷⊢)dct(⊣⍪1↓⊢)⊃{⍺,' ',⍵}/(1+⌈/≢¨⍺){⍺↑⍵⍪⍨'│'↑⍨≢⍉⍵}¨⍺}
- pp3←{⍺←'○' ⋄ d←(⍳≢⍵)≠⍵ ⋄ _←{z⊣d+←⍵≠z←⍺[⍵]}⍣≡⍨⍵ ⋄ lbl←⍺⍴⍨≢⍵
-  lyr←{i←⍸⍺=d ⋄ k v←↓⍉⍵⍵[i],∘⊂⌸i ⋄ (⍵∘{⍺[⍵]}¨v)⍺⍺¨@k⊢⍵}⍵                  
-  (⍵=⍳≢⍵)⌿⊃⍺⍺ lyr⌿(1+⍳⌈/d),⊂⍉∘⍪∘⍕¨lbl}                                     
- lb3←{⍺←⍳≢⊃⍵
-  '(',¨')',¨⍨{⍺,';',⍵}⌿⍕¨(N∆{⍺[⍵]}@2⊢(2⊃⍵){⍺[|⍵]}@{0>⍵}@4↑⊃⍵)[⍺;]}
+:Namespace RTM
 
  syms ←,¨'+'   '-'   '×'   '÷'   '*'   '⍟'   '|'    '○'     '⌊'    '⌈'   '!'
  nams ←  'add' 'sub' 'mul' 'div' 'exp' 'log' 'res'  'cir'   'min'  'max' 'fac'
@@ -41,7 +21,11 @@
  deps[syms⍳,¨'⊆']←,¨¨⊂'⊂⊆'
  deps[syms⍳⊂'∘.']←⊂(,¨'¨' '∘.')
 
- rtm←ROOT,'/rtm/'
+ rtm←(⊃⎕NPARTS ⎕WSID),'src/rtm/'
  initsrc←'0inc' '1mac' '2obj' '3ftp' '4utl' '5dat' '6dwa' '7api'
  rth←∊(⎕UCS 10),⍨⍪⊃,⌿⊃¨⎕NGET¨(⊂¨rtm∘,¨initsrc,¨⊂'.c'),¨1
  rtn←{∊(⊃⍵),¨⎕UCS 10}¨⎕NGET¨(⊂¨rtm∘,¨(nams~'this' 'span' ''),¨⊂'.c'),¨1
+
+ ##.(syms nams deps rth rtn)←syms nams deps rth rtn
+
+:EndNamespace
diff --git a/cmp/Run.aplf → src/codfns/Run.aplf b/cmp/Run.aplf → src/codfns/Run.aplf
diff --git a/cmp/TK.aplf → src/codfns/TK.aplf b/cmp/TK.aplf → src/codfns/TK.aplf
diff --git a/cmp/TK∆READ.aplf → src/codfns/TK∆READ.aplf b/cmp/TK∆READ.aplf → src/codfns/TK∆READ.aplf
diff --git a/cmp/TK∆SPEC.aplf → src/codfns/TK∆SPEC.aplf b/cmp/TK∆SPEC.aplf → src/codfns/TK∆SPEC.aplf
diff --git a/cmp/TT.aplf → src/codfns/TT.aplf b/cmp/TT.aplf → src/codfns/TT.aplf
diff --git a/rtm/0inc.c → src/rtm/0inc.c b/rtm/0inc.c → src/rtm/0inc.c
diff --git a/rtm/1mac.c → src/rtm/1mac.c b/rtm/1mac.c → src/rtm/1mac.c
diff --git a/rtm/2obj.c → src/rtm/2obj.c b/rtm/2obj.c → src/rtm/2obj.c
diff --git a/rtm/3ftp.c → src/rtm/3ftp.c b/rtm/3ftp.c → src/rtm/3ftp.c
diff --git a/rtm/4utl.c → src/rtm/4utl.c b/rtm/4utl.c → src/rtm/4utl.c
diff --git a/rtm/5dat.c → src/rtm/5dat.c b/rtm/5dat.c → src/rtm/5dat.c
diff --git a/rtm/6dwa.c → src/rtm/6dwa.c b/rtm/6dwa.c → src/rtm/6dwa.c
diff --git a/rtm/7api.c → src/rtm/7api.c b/rtm/7api.c → src/rtm/7api.c
diff --git a/rtm/add.c → src/rtm/add.c b/rtm/add.c → src/rtm/add.c
diff --git a/rtm/and.c → src/rtm/and.c b/rtm/and.c → src/rtm/and.c
diff --git a/rtm/brk.c → src/rtm/brk.c b/rtm/brk.c → src/rtm/brk.c
diff --git a/rtm/cat.c → src/rtm/cat.c b/rtm/cat.c → src/rtm/cat.c
diff --git a/rtm/cir.c → src/rtm/cir.c b/rtm/cir.c → src/rtm/cir.c
diff --git a/rtm/com.c → src/rtm/com.c b/rtm/com.c → src/rtm/com.c
diff --git a/rtm/ctf.c → src/rtm/ctf.c b/rtm/ctf.c → src/rtm/ctf.c
diff --git a/rtm/dec.c → src/rtm/dec.c b/rtm/dec.c → src/rtm/dec.c
diff --git a/rtm/dis.c → src/rtm/dis.c b/rtm/dis.c → src/rtm/dis.c
diff --git a/rtm/div.c → src/rtm/div.c b/rtm/div.c → src/rtm/div.c
diff --git a/rtm/dot.c → src/rtm/dot.c b/rtm/dot.c → src/rtm/dot.c
diff --git a/rtm/drp.c → src/rtm/drp.c b/rtm/drp.c → src/rtm/drp.c
diff --git a/rtm/enc.c → src/rtm/enc.c b/rtm/enc.c → src/rtm/enc.c
diff --git a/rtm/eql.c → src/rtm/eql.c b/rtm/eql.c → src/rtm/eql.c
diff --git a/rtm/eqv.c → src/rtm/eqv.c b/rtm/eqv.c → src/rtm/eqv.c
diff --git a/rtm/exp.c → src/rtm/exp.c b/rtm/exp.c → src/rtm/exp.c
diff --git a/rtm/fac.c → src/rtm/fac.c b/rtm/fac.c → src/rtm/fac.c
diff --git a/rtm/fft.c → src/rtm/fft.c b/rtm/fft.c → src/rtm/fft.c
diff --git a/rtm/fnd.c → src/rtm/fnd.c b/rtm/fnd.c → src/rtm/fnd.c
diff --git a/rtm/gdd.c → src/rtm/gdd.c b/rtm/gdd.c → src/rtm/gdd.c
diff --git a/rtm/gdu.c → src/rtm/gdu.c b/rtm/gdu.c → src/rtm/gdu.c
diff --git a/rtm/get.c → src/rtm/get.c b/rtm/get.c → src/rtm/get.c
diff --git a/rtm/gte.c → src/rtm/gte.c b/rtm/gte.c → src/rtm/gte.c
diff --git a/rtm/gth.c → src/rtm/gth.c b/rtm/gth.c → src/rtm/gth.c
diff --git a/rtm/ift.c → src/rtm/ift.c b/rtm/ift.c → src/rtm/ift.c
diff --git a/rtm/int.c → src/rtm/int.c b/rtm/int.c → src/rtm/int.c
diff --git a/rtm/iot.c → src/rtm/iot.c b/rtm/iot.c → src/rtm/iot.c
diff --git a/rtm/jot.c → src/rtm/jot.c b/rtm/jot.c → src/rtm/jot.c
diff --git a/rtm/lft.c → src/rtm/lft.c b/rtm/lft.c → src/rtm/lft.c
diff --git a/rtm/log.c → src/rtm/log.c b/rtm/log.c → src/rtm/log.c
diff --git a/rtm/lor.c → src/rtm/lor.c b/rtm/lor.c → src/rtm/lor.c
diff --git a/rtm/lte.c → src/rtm/lte.c b/rtm/lte.c → src/rtm/lte.c
diff --git a/rtm/lth.c → src/rtm/lth.c b/rtm/lth.c → src/rtm/lth.c
diff --git a/rtm/map.c → src/rtm/map.c b/rtm/map.c → src/rtm/map.c
diff --git a/rtm/max.c → src/rtm/max.c b/rtm/max.c → src/rtm/max.c
diff --git a/rtm/mdv.c → src/rtm/mdv.c b/rtm/mdv.c → src/rtm/mdv.c
diff --git a/rtm/mem.c → src/rtm/mem.c b/rtm/mem.c → src/rtm/mem.c
diff --git a/rtm/min.c → src/rtm/min.c b/rtm/min.c → src/rtm/min.c
diff --git a/rtm/mul.c → src/rtm/mul.c b/rtm/mul.c → src/rtm/mul.c
diff --git a/rtm/nan.c → src/rtm/nan.c b/rtm/nan.c → src/rtm/nan.c
diff --git a/rtm/neq.c → src/rtm/neq.c b/rtm/neq.c → src/rtm/neq.c
diff --git a/rtm/nor.c → src/rtm/nor.c b/rtm/nor.c → src/rtm/nor.c
diff --git a/rtm/not.c → src/rtm/not.c b/rtm/not.c → src/rtm/not.c
diff --git a/rtm/nqv.c → src/rtm/nqv.c b/rtm/nqv.c → src/rtm/nqv.c
diff --git a/rtm/nst.c → src/rtm/nst.c b/rtm/nst.c → src/rtm/nst.c
diff --git a/rtm/oup.c → src/rtm/oup.c b/rtm/oup.c → src/rtm/oup.c
diff --git a/rtm/par.c → src/rtm/par.c b/rtm/par.c → src/rtm/par.c
diff --git a/rtm/pow.c → src/rtm/pow.c b/rtm/pow.c → src/rtm/pow.c
diff --git a/rtm/rdf.c → src/rtm/rdf.c b/rtm/rdf.c → src/rtm/rdf.c
diff --git a/rtm/red.c → src/rtm/red.c b/rtm/red.c → src/rtm/red.c
diff --git a/rtm/res.c → src/rtm/res.c b/rtm/res.c → src/rtm/res.c
diff --git a/rtm/rgt.c → src/rtm/rgt.c b/rtm/rgt.c → src/rtm/rgt.c
diff --git a/rtm/rho.c → src/rtm/rho.c b/rtm/rho.c → src/rtm/rho.c
diff --git a/rtm/rnk.c → src/rtm/rnk.c b/rtm/rnk.c → src/rtm/rnk.c
diff --git a/rtm/rol.c → src/rtm/rol.c b/rtm/rol.c → src/rtm/rol.c
diff --git a/rtm/rot.c → src/rtm/rot.c b/rtm/rot.c → src/rtm/rot.c
diff --git a/rtm/rtf.c → src/rtm/rtf.c b/rtm/rtf.c → src/rtm/rtf.c
diff --git a/rtm/scf.c → src/rtm/scf.c b/rtm/scf.c → src/rtm/scf.c
diff --git a/rtm/scl.c → src/rtm/scl.c b/rtm/scl.c → src/rtm/scl.c
diff --git a/rtm/scn.c → src/rtm/scn.c b/rtm/scn.c → src/rtm/scn.c
diff --git a/rtm/sqd.c → src/rtm/sqd.c b/rtm/sqd.c → src/rtm/sqd.c
diff --git a/rtm/sub.c → src/rtm/sub.c b/rtm/sub.c → src/rtm/sub.c
diff --git a/rtm/tke.c → src/rtm/tke.c b/rtm/tke.c → src/rtm/tke.c
diff --git a/rtm/trn.c → src/rtm/trn.c b/rtm/trn.c → src/rtm/trn.c
diff --git a/rtm/unq.c → src/rtm/unq.c b/rtm/unq.c → src/rtm/unq.c
diff --git a/ut.dyalog → src/ut.apln b/ut.dyalog → src/ut.apln
diff --git a/util.dyalog → src/util.apln b/util.dyalog → src/util.apln
diff --git a/tests/codfns.dws b/tests/codfns.dws