GetAliasFileContent renamed to GetCiderAliasFileContent

aplteam · Dec 17, 2023 · c57e909 · c57e909
1 parent 136b211
commit c57e909
Show file tree

Hide file tree

Showing 24 changed files with 223 additions and 140 deletions.
diff --git a/APLSource/Cider/API/GetAliasFileContent.aplf b/APLSource/Cider/API/GetAliasFileContent.aplf
diff --git a/APLSource/Cider/CreateOpenParms.aplf b/APLSource/Cider/CreateOpenParms.aplf
@@ -1,4 +1,4 @@
- parms←CreateOpenParms y;list;b;l
+ parms←CreateOpenParms dummy;list;b;l
 ⍝ Creates a namespace with all parameters one might pass to `OpenProject`.\\
 ⍝ `y` might be an empty vector or a namespace with some such parameters.
 ⍝ Any parameters passed this way overwrite defaults.

diff --git a/APLSource/Cider/GetAliasFileContent.aplf → ...ource/Cider/GetCiderAliasFileContent.aplf b/APLSource/Cider/GetAliasFileContent.aplf → ...ource/Cider/GetCiderAliasFileContent.aplf
@@ -1,4 +1,4 @@
- r←{filename}GetAliasFileContent dummy;filename;buff
+ r←{filename}GetCiderAliasFileContent dummy;filename;buff
  r←0 2⍴''
  filename←{0<⎕NC ⍵:⍎⍵ ⋄ GetCiderAliasFilename}'filename'
  :If F.Exists filename

diff --git a/APLSource/Cider/History.apla b/APLSource/Cider/History.apla
@@ -1,5 +1,6 @@
 (
- '* 0.38.0 ⋄ 2023-12-15'
+ '* 0.38.0 ⋄ 2023-12-17'
+ '  * BREAKING CHANGE: API function `GetAliasFileContent` renamed: `GetCiderAliasFileContent`'
  '  * Optional property `tatinVars` added to the Cider config file and `InjectTatinVars` changed accordingly'
  '  * `CheckTargetNamespaceAndLinkFolder` improved in terms of error messages and better questions '
  '  * Bug fix in `InjectTatinVars`: TatinVars was injected into the project root rather than the package root'

diff --git a/APLSource/Cider/ListOpenProjects.aplf b/APLSource/Cider/ListOpenProjects.aplf
@@ -14,7 +14,7 @@
          r[;2]←DropTrailingSlash¨r[;2]
          r[;2]←F.EnforceSlash¨r[;2]
          :If verboseFlag
-             :If 0<≢aliases←GetAliasFileContent ⍬
+             :If 0<≢aliases←GetCiderAliasFileContent ⍬
                  aliases[;2]←DropTrailingSlash¨aliases[;2]
              :AndIf 0<≢aliases←(aliases[;2]∊r[;2])⌿aliases
                  r,←⊂''

diff --git a/APLSource/Cider/Public.aplf b/APLSource/Cider/Public.aplf
@@ -6,7 +6,7 @@
  r,←⊂'CloseProject'
  r,←⊂'CreateOpenParms'
  r,←⊂'DropAlias'
- r,←⊂'GetAliasFileContent'
+ r,←⊂'GetCiderAliasFileContent'
  r,←⊂'GetCiderAliasFilename'
  r,←⊂'GetCiderGlobalConfigFileContent'
  r,←⊂'GetCiderGlobalConfigFilename'

diff --git a/APLSource/Cider/RenameInfo_url.aplf b/APLSource/Cider/RenameInfo_url.aplf
@@ -2,8 +2,8 @@
 ⍝ With version 0.80.0 of Tatin the property "info_url" was renamed to "project_url".
 ⍝ Cider was amended accordingly with version 0.22.0.
 ⍝ This function takes a folder and searches for Cider config file in all sub folders.
-⍝ In every file found `info_url` is renamed to `project_url`.
-⍝ The names off all files that got changed are returned as a matrix.
+⍝ In every file found, `info_url` is renamed to `project_url`.
+⍝ The names of all files that got changed are returned as a matrix.
  ('Is not a directory: ',folder)Assert F.IsDir folder
  report←''
  RenameInfo_url_ folder

diff --git a/APLSource/Cider_uc.dyalog b/APLSource/Cider_uc.dyalog
@@ -467,7 +467,7 @@
     ∇ r←OpenProject Args;path;parms;aliasDefs;bool;info;opCode;alias;log;success
       r←0 0⍴''
       Args.projectSpace←{(,0)≡,⍵:'' ⋄ ⍵}Args.projectSpace
-      aliasDefs←P.GetAliasFileContent ⍬
+      aliasDefs←P.GetCiderAliasFileContent ⍬
       :If 0≡Args._1
       :OrIf Args._1≡'[?]'
           :If 0=≢path←SelectFromAliases aliasDefs
@@ -806,7 +806,7 @@
     ∇
 
     ∇ r←ProcessAliases(prune edit batch);bool;flag
-      r←P.GetAliasFileContent ⍬
+      r←P.GetCiderAliasFileContent ⍬
       :If prune
           :If 0<≢r
               bool←⎕NEXISTS¨r[;2]
@@ -1066,7 +1066,7 @@
 
     ∇ r←TranslateAlias alias;aliase;row
       :If IsAlias alias
-          aliase←P.GetAliasFileContent ⍬
+          aliase←P.GetCiderAliasFileContent ⍬
           row←aliase[;1]⍳⊂alias~'[]'
           ('Unknown alias: ',alias)Assert row≤≢aliase
           r←2⊃aliase[row;]
@@ -1131,7 +1131,7 @@
           3 ⎕MKDIR 1⊃⎕NPARTS filename
           (⊂'')⎕NPUT filename
       :EndIf
-      aliases_←P.GetAliasFileContent ⍬
+      aliases_←P.GetCiderAliasFileContent ⍬
       :If 0<≢aliases←⍕aliases_
           aliases_←⊃¨{⍺,'=',⍵}/¨↓aliases_
           :Repeat
@@ -1190,7 +1190,7 @@
       r←⍬
       caption←{0<⎕NC ⍵:⍎⍵ ⋄ ''}'caption'
       :If 0=≢data
-          data←P.GetAliasFileContent ⍬
+          data←P.GetCiderAliasFileContent ⍬
       :EndIf
       :If 0<≢data
           data[;1]←{'[',⍵,']'}¨data[;1]
@@ -1278,7 +1278,7 @@
               path←2⊃list[index;]
           :EndSelect
       :Else
-          aliasDefs←P.GetAliasFileContent ⍬
+          aliasDefs←P.GetCiderAliasFileContent ⍬
           path←y
           :If (⊂,path)∊,¨'[' '[?' '[?]'
               :If 0=≢path←SelectFromAliases aliasDefs

diff --git a/APLSource/TestCases/Test_Alias_002.aplf b/APLSource/TestCases/Test_Alias_002.aplf
@@ -3,7 +3,7 @@
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  R←T._Failed
 
- list←##.Cider.GetAliasFileContent ⍬
+ list←##.Cider.GetCiderAliasFileContent ⍬
  →T.PassesIf 2=2⊃⍴list   ⍝ Alias, folder
  →T.PassesIf 2≤≢list
  →T.PassesIf∧/'test-project-1' 'test-project-2'∊list[;1]

diff --git a/APLSource/TestCases/Test_Alias_003.aplf b/APLSource/TestCases/Test_Alias_003.aplf
@@ -1,9 +1,9 @@
  R←Test_Alias_003(stopFlag batchFlag);⎕TRAP;mat
-⍝ Exercise the user command `GetAliasFileContent ⍬`
+⍝ Exercise the user command `GetCiderAliasFileContent ⍬`
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  R←T._Failed
 
- mat←##.Cider.GetAliasFileContent ⍬
+ mat←##.Cider.GetCiderAliasFileContent ⍬
  →T.PassesIf 2=2⊃⍴mat   ⍝ Alias, folder
  →T.PassesIf 2≤≢mat
  →T.PassesIf∧/'test-project-1' 'test-project-2'∊mat[;1]

diff --git a/APLSource/TestCases/Test_Alias_004.aplf b/APLSource/TestCases/Test_Alias_004.aplf
@@ -3,10 +3,10 @@
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  R←T._Failed
 
- mat1←##.Cider.GetAliasFileContent ⍬
+ mat1←##.Cider.GetCiderAliasFileContent ⍬
  Assert 2=+/⊃∨/∨/¨'test-project-1' 'test-project-2'⍷¨⊂⍕mat1
  ##.Cider.DropAlias'test-project-1'
- mat2←##.Cider.GetAliasFileContent ⍬
+ mat2←##.Cider.GetCiderAliasFileContent ⍬
  →T.PassesIf(¯1+≢mat1)=≢mat2
  →T.PassesIf 1=+/⊃∨/∨/¨'test-project-1' 'test-project-2'⍷¨⊂⍕mat2
 

diff --git a/APLSource/TestCases/Test_Alias_006.aplf b/APLSource/TestCases/Test_Alias_006.aplf
@@ -28,7 +28,7 @@
  →T.GoToTidyUp∨/'ERROR'⍷log
  Assert ⎕SE.Cider.CloseProject'[Firlefanz2]'
 
- aliase←⎕SE.Cider.GetAliasFileContent ⍬
+ aliase←⎕SE.Cider.GetCiderAliasFileContent ⍬
  →T.GoToTidyUp(⊂'firlefanz1')∊aliase[;1]
  →T.GoToTidyUp~(⊂'firlefanz2')∊aliase[;1]
 

diff --git a/APLSource/TestCases/Test_Alias_007.aplf b/APLSource/TestCases/Test_Alias_007.aplf
@@ -19,7 +19,7 @@
  (rc msg res)←∆UCMD'OpenProject [firlefanz1] -parent=#.TEMP -alias=Firlefanz2 -watch=ns -batch -ignoreUserExec'
  msg Assert 0=rc
 
- aliase←⎕SE.Cider.GetAliasFileContent ⍬
+ aliase←⎕SE.Cider.GetCiderAliasFileContent ⍬
 
  (rc msg res)←∆UCMD'CloseProject [firlefanz2]'
  msg Assert 0=rc

diff --git a/APLSource/TestCases/Test_Alias_008.aplf b/APLSource/TestCases/Test_Alias_008.aplf
@@ -22,7 +22,7 @@
  (rc msg res)←∆UCMD'CloseProject [firlefanz1]'
  msg Assert 0=rc
 
- aliase←⎕SE.Cider.GetAliasFileContent ⍬
+ aliase←⎕SE.Cider.GetCiderAliasFileContent ⍬
 
  →T.GoToTidyUp 1≠+/'firlefanz1'∘≡¨aliase[;1]
 

diff --git a/APLSource/TestCases/Test_Misc_009.aplf b/APLSource/TestCases/Test_Misc_009.aplf
@@ -1,10 +1,10 @@
  r←Test_Misc_009(stopFlag batchFlag);⎕TRAP;path;filename;data
-⍝ Exercise GetAliasFileContent
+⍝ Exercise GetCiderAliasFileContent
  ⎕TRAP←(999 'C' '. ⍝ Deliberate error')(0 'N')
  r←T._Failed
 
  filename←##.CiderConfig.HOME,'/TestData/aliase.txt'
- data←filename ##.Cider.GetAliasFileContent ⍬
+ data←filename ##.Cider.GetCiderAliasFileContent ⍬
  →T.PassesIf ∨/'/totally/made/up'⍷⍕data
 
  r←T._OK

diff --git a/APLSource/TestCases/Test_Misc_015.aplf b/APLSource/TestCases/Test_Misc_015.aplf
@@ -2,7 +2,7 @@
 ⍝ Exercise a number of Get* functions
  ⎕TRAP←(999 'C' '. ⍝ Deliberate error')(0 'N')
 
- res←##.Cider.GetAliasFileContent ⍬
+ res←##.Cider.GetCiderAliasFileContent ⍬
  →T.PassesIf 0<≢res
  res←##.Cider.GetCiderAliasFilename
  →T.PassesIf∨/'/aliase.txt'⍷FilesAndDirs.EnforceSlash res

diff --git a/APLSource/TestCases/Test_OpenAndClose_001.aplf b/APLSource/TestCases/Test_OpenAndClose_001.aplf
@@ -18,7 +18,7 @@
  list←FilesAndDirs.ListFiles projectFolder1
  →T.GoToTidyUp 1≠≢list
  →T.GoToTidyUp'cider.config'≢⊃,/1↓⎕NPARTS 1⊃list
- aliase←##.Cider.GetAliasFileContent ⍬
+ aliase←##.Cider.GetCiderAliasFileContent ⍬
  →T.GoToTidyUp~(⊂⎕C'test-case-alias-Foo')∊aliase[;1]
 
  projectFolder2←tempDir,'/Goo'
@@ -32,7 +32,7 @@
  list←FilesAndDirs.ListFiles projectFolder2
  →T.GoToTidyUp 1≠≢list
  →T.GoToTidyUp'cider.config'≢⊃,/1↓⎕NPARTS 1⊃list
- aliase←##.Cider.GetAliasFileContent ⍬
+ aliase←##.Cider.GetCCiderAliasFileContent ⍬
  →T.GoToTidyUp~∧/(⎕C'test-case-alias-Foo' 'test-case-alias-Goo')∊aliase[;1]
 
  →T.GoToTidyUp 1≠##.Cider.CloseProject'#.Foo'

diff --git a/APLSource/TestCases/Test_OpenAndClose_004.aplf b/APLSource/TestCases/Test_OpenAndClose_004.aplf
@@ -18,7 +18,7 @@
  list←FilesAndDirs.ListFiles projectFolder1
  →T.GoToTidyUp 1≠≢list
  →T.GoToTidyUp'cider.config'≢⊃,/1↓⎕NPARTS 1⊃list
- aliase←##.Cider.GetAliasFileContent ⍬
+ aliase←##.Cider.GetCiderAliasFileContent ⍬
  →T.GoToTidyUp~(⊂⎕C'test-case-alias-Foo')∊aliase[;1]
 
  projectFolder2←tempDir,'/Goo'
@@ -32,7 +32,7 @@
  list←FilesAndDirs.ListFiles projectFolder2
  →T.GoToTidyUp 1≠≢list
  →T.GoToTidyUp'cider.config'≢⊃,/1↓⎕NPARTS 1⊃list
- aliase←##.Cider.GetAliasFileContent ⍬
+ aliase←##.Cider.GetCiderAliasFileContent ⍬
  →T.GoToTidyUp~∧/(⎕C'test-case-alias-Foo' 'test-case-alias-Goo')∊aliase[;1]
 
  projectFolder3←tempDir,'/Zoo'

diff --git a/APLSource/TestCases/Test_Open_060.aplf b/APLSource/TestCases/Test_Open_060.aplf
@@ -16,7 +16,7 @@
  (success log)←##.Cider.OpenProject parms
  Assert success
  →T.GoToTidyUp∨/'ERROR'⍷log
- defs←##.Cider.GetAliasFileContent ⍬
+ defs←##.Cider.GetCiderAliasFileContent ⍬
  →T.GoToTidyUp~(⊂⎕C⊃⎕SI)∊defs[;1]
 
  R←T._OK

diff --git a/APLSource/TestCases/Test_Open_061.aplf b/APLSource/TestCases/Test_Open_061.aplf
@@ -16,7 +16,7 @@
  (success log)←##.Cider.OpenProject parms
  Assert success
  →T.GoToTidyUp∨/'ERROR'⍷log
- defs←##.Cider.GetAliasFileContent ⍬
+ defs←##.Cider.GetCiderAliasFileContent ⍬
  →T.GoToTidyUp~(⊂'foo')∊defs[;1]
 
  R←T._OK

diff --git a/APLSource/TestCases/Test_Open_070.aplf b/APLSource/TestCases/Test_Open_070.aplf
@@ -18,7 +18,7 @@
  (success log)←##.Cider.OpenProject parms
  Assert success
  →T.GoToTidyUp∨/'ERROR'⍷log
- defs←##.Cider.GetAliasFileContent ⍬
+ defs←##.Cider.GetCiderAliasFileContent ⍬
  →T.GoToTidyUp~(⊂'foo')∊defs[;1]
 
  R←T._OK

diff --git a/APLSource/TestCases/Test_UC_030.aplf b/APLSource/TestCases/Test_UC_030.aplf
@@ -3,7 +3,7 @@
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  R←T._Failed
 
- mat1←##.Cider.GetAliasFileContent ⍬
+ mat1←##.Cider.GetCiderAliasFileContent ⍬
  Delete_∆ALIAS_TEMP_FOLDER
  (rc msg res)←∆UCMD'ListAliases -prune -batch'
  Assert rc=0