Breaking change: 18.0

aplteam · Sep 20, 2020 · 01e6620 · 01e6620
1 parent 47fad5c
commit 01e6620
Show file tree

Hide file tree

Showing 26 changed files with 274 additions and 60 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .acre/
 aplcore
 Dist/
+change_history/
 .gitignore
diff --git a/APLSource/Initialize.aplf b/APLSource/Initialize.aplf
@@ -0,0 +1,6 @@
+ {r}←Initialize;⎕TRAP
+ ⎕TRAP←0 'S'
+ r←⍬
+ {}⎕SE.UCMD'cd ',AcreConfig.ProjectFolder
+ ⎕SE.aplteam.InitializeAPLTreeProject ⎕THIS
+⍝Done
diff --git a/APLSource/TestCases/Cleanup.aplf b/APLSource/TestCases/Cleanup.aplf
@@ -0,0 +1,2 @@
+ Cleanup
+ #.⎕EX'INI'
diff --git a/APLSource/TestCases/Initial.aplf b/APLSource/TestCases/Initial.aplf
@@ -1,5 +1,5 @@
  Initial;home
- ⎕IO←0 ⋄ ⎕ML←3
+ ⎕IO←0 ⋄ ⎕ML←1
  ##.FilesAndDirs.PolishCurrentDir
  #.INI←'flat'(⎕NEW ##.IniFiles(,⊂GetFileRoot,'Tests\INIs\TestCases_',##.WinSys.GetComputerName,'.ini')).Convert ⎕NS''
  home←GetTestCasesHome

diff --git a/APLSource/TestCases/Prepare.aplf b/APLSource/TestCases/Prepare.aplf
@@ -1,2 +1,7 @@
  Prepare
+ ⎕IO←1 ⋄ ⎕ML←1
  T←⎕NEW ##.Tester2 ⎕THIS
+ T.codeCoverage←⎕NEW ##.CodeCoverage(,⊂'#.',{⍵,'.',⍵}2↓⍕⎕THIS.##)
+ T.codeCoverage.filename←(⊃1 ⎕NPARTS''),'TestResults/CodeCoverage'
+ a←1
+ ⍝Done
diff --git a/APLSource/TestCases/QuadVariables.apln b/APLSource/TestCases/QuadVariables.apln
@@ -1,6 +1,6 @@
 :Namespace QuadVariables
   ##.⎕IO←0
-  ##.⎕ML←3
+  ##.⎕ML←1
   ##.⎕WX←3
 :EndNamespace
 
diff --git a/APLSource/TestCases/RunTests.aplf b/APLSource/TestCases/RunTests.aplf
@@ -0,0 +1,12 @@
+ RunTests;dcfFilename;htmlFilename;tno
+ Prepare
+ dcfFilename←(⊃,/¯1↓⎕NPARTS T.codeCoverage.filename),'.dcf'
+ :If ##.FilesAndDirs.IsFile dcfFilename
+ :AndIf ∆YesOrNo'CodeCovarge data file already exists; override?'
+     tno←dcfFilename ⎕FTIE 0
+     dcfFilename ⎕FERASE tno
+ :EndIf
+ T.Run 1
+ htmlFilename←##.CodeCoverage.ProcessDataAndCreateReport T.codeCoverage.filename
+ ##.APLTreeUtils2.GoToWebPage'file://',htmlFilename
+⍝Done
diff --git a/APLSource/TestCases/Test_002.aplf b/APLSource/TestCases/Test_002.aplf
@@ -7,6 +7,6 @@
  →T.FailsIf~0∊⍴v
  v←##.WinSys.ExpandEnv i←'%WinDir%\MyDir'
  →T.FailsIf v≡i
- →T.FailsIf'MyDir'≢1⊃##.APLTreeUtils.SplitPath v
+ →T.FailsIf'MyDir'≢1⊃##.APLTreeUtils2.SplitPath v
 
  R←T._OK
diff --git a/APLSource/TestCases/Test_004.aplf b/APLSource/TestCases/Test_004.aplf
@@ -4,9 +4,9 @@
  ⎕TRAP←(999 'C' '. ⍝ Deliberate error')(0 'N')
 
  v←##.WinSys.GetWindowsDirectory
- set←⊃⎕CMD'set'                                          ⍝ All env variables
- r←'windir'{(##.APLTreeUtils.Lowercase(⍴⍺)↑[1]⍵)∧.=⍺}set  ⍝ Row
- windir←{⍵↓⍨-+/∧\' '=⌽⍵}'windir='{(⍴⍺)↓⍵}set[r⍳1;]
+ set←↑⎕CMD'set'                                          ⍝ All env variables
+ r←'windir'{(##.APLTreeUtils2.Lowercase(≢⍺)↑[1]⍵)∧.=⍺}set  ⍝ Row
+ windir←{⍵↓⍨-+/∧\' '=⌽⍵}'windir='{(≢⍺)↓⍵}set[r⍳1;]
  →T.FailsIf windir≢v
 
  R←T._OK
diff --git a/APLSource/TestCases/Test_007.aplf b/APLSource/TestCases/Test_007.aplf
@@ -4,6 +4,6 @@
  ⎕TRAP←(999 'C' '. ⍝ Deliberate error')(0 'N')
 
  ms←##.WinSys.GetMsgFrom¨⍳1000   ⍝ Get messages for 1000 return codes
- →T.FailsIf 400>0+.≠↑∘⍴¨ms        ⍝ There are at least 400 error messages defined...
+ →T.FailsIf 400>0+.≠≢¨ms         ⍝ There are at least 400 error messages defined...
 
  R←T._OK
diff --git a/APLSource/TestCases/Test_014.aplf b/APLSource/TestCases/Test_014.aplf
@@ -3,7 +3,7 @@
  ⎕TRAP←(999 'C' '. ⍝ Deliberate error')(0 'N')
  R←T._Failed
 
- dllName←↑↑##.FilesAndDirs.Dir(⎕IO⊃##.APLTreeUtils.SplitPath ⎕IO ⎕IO⊃#.GetCommandLineArgs'Dyalog'),'\dyalog*.dll'
+ dllName←⊃⊃##.FilesAndDirs.Dir(⎕IO⊃##.APLTreeUtils2.SplitPath ⎕IO ⎕IO⊃#.GetCommandLineArgs'Dyalog'),'\dyalog*.dll'
  r←##.WinSys.GetModuleFileName dllName
  →T.PassesIf 0<⍴r
 

diff --git a/APLSource/TestCases/Test_016.aplf b/APLSource/TestCases/Test_016.aplf
@@ -10,7 +10,7 @@
      :EndIf
      (rc path)←##.WinSys.FindExecutable ##.FilesAndDirs.PWD,'\',filename
      →T.FailsIf 0≠rc
-     →T.FailsIf'dyalog.exe'≢##.APLTreeUtils.Lowercase 1⊃##.APLTreeUtils.SplitPath path
+     →T.FailsIf'dyalog.exe'≢##.APLTreeUtils2.Lowercase 1⊃##.APLTreeUtils2.SplitPath path
  :EndIf
 
  R←T._OK
diff --git a/APLSource/TestCases/Test_026.aplf b/APLSource/TestCases/Test_026.aplf
@@ -7,9 +7,9 @@
 ⍝ Tests...
  list←##.WinSys.GetAllDrives
  →T.FailsIf~0<⍴list
- →T.FailsIf~∧/(↑¨list)∊⎕A
+ →T.FailsIf~∧/(⊃¨list)∊⎕A
  →T.FailsIf(,':')≢,∪1⊃¨list
  →T.FailsIf(,'\')≢,∪2⊃¨list
- →T.FailsIf(,3)≢∪↑∘⍴¨list
+ →T.FailsIf(,3)≢∪≢¨list
 
  R←T._OK
diff --git a/APLSource/TestCases/Test_027.aplf b/APLSource/TestCases/Test_027.aplf
@@ -9,21 +9,21 @@
  list←##.WinSys.GetDriveAndType
 
  →T.FailsIf~0<⍴list[;0]
- →T.FailsIf~∧/(↑¨list[;0])∊⎕A
+ →T.FailsIf~∧/(⊃¨list[;0])∊⎕A
  →T.FailsIf(,':')≢,∪1⊃¨list[;0]
  →T.FailsIf(,'\')≢,∪2⊃¨list[;0]
- →T.FailsIf(,3)≢∪↑∘⍴¨list[;0]
+ →T.FailsIf(,3)≢∪≢¨list[;0]
  →T.FailsIf~∧/(∪list[;1])∊⍳9
 
  ⍝ The following tests depend on local specialties - see "Initial"
  :If 0≠≢#.INI.FixedDrives
-     →T.PassesIf(,#.INI.FixedDrives)Match↑¨(list[;2]≡¨⊂'Fixed')/list[;0]
+     →T.PassesIf(,#.INI.FixedDrives)Match⊃¨(list[;2]≡¨⊂'Fixed')/list[;0]
  :EndIf
  :If 0≠≢#.INI.NetworkDrives
-     →T.PassesIf(,#.INI.NetworkDrives)Match↑¨(list[;2]≡¨⊂'Remote')/list[;0]
+     →T.PassesIf(,#.INI.NetworkDrives)Match⊃¨(list[;2]≡¨⊂'Remote')/list[;0]
  :EndIf
  :If 0≠≢#.INI.CDRomDrives
-     →T.PassesIf(,#.INI.CDRomDrives)Match↑¨(list[;2]≡¨⊂'CD-ROM')/list[;0]
+     →T.PassesIf(,#.INI.CDRomDrives)Match⊃¨(list[;2]≡¨⊂'CD-ROM')/list[;0]
  :EndIf
 
  types←'Invalid Path' 'Removable' 'Fixed' 'Remote' 'CD-ROM' 'Ram-Disk'

diff --git a/APLSource/TestCases/Test_030.aplf b/APLSource/TestCases/Test_030.aplf
@@ -0,0 +1,12 @@
+ R←Test_030(stopFlag batchFlag);⎕TRAP;info
+ ⍝ Exercise `##.WinSys.GetDiskFreeSpace`
+ R←T._Failed
+ ⎕TRAP←(999 'C' '. ⍝ Deliberate error')(0 'N')
+
+ info←##.WinSys.GetDiskFreeSpace'C'
+ →T.PassesIf 0∧.<info
+
+ info←##.WinSys.GetDiskFreeSpace'C:'
+ →T.PassesIf 0∧.<info
+
+ R←T._OK
diff --git a/APLSource/TestCases/Test_ZZZ_998.aplf b/APLSource/TestCases/Test_ZZZ_998.aplf
@@ -1,17 +1,17 @@
  R←Test_ZZZ_998(stopFlag batchFlag);⎕IO;⎕ML;⎕TRAP;report;buff
 ⍝ Checks on two text vectors: "⍝TODO⍝" and "⍝CHECK⍝"; never fails, just reports.
- ⎕IO←0 ⋄ ⎕ML←3
+ ⎕IO←1 ⋄ ⎕ML←1
  ⎕TRAP←(999 'C' '. ⍝ Deliberate error')(0 'N')
  R←T._OK
  report←''
 
  buff←T.FindSpecialString'⍝CHECK⍝'
- buff←(buff[;0]≢¨⎕XSI[0])⌿buff ⍝ remove caller
+ buff←(buff[;1]≢¨⎕XSI[1])⌿buff ⍝ remove caller
  :If 0≠≢buff
      report,←↓(⊂' ⍝CHECK⍝ found:'),(⊂'   '),¨buff
  :EndIf
  buff←T.FindSpecialString'⍝TODO⍝'
- buff←(buff[;0]≢¨⎕XSI[0])⌿buff ⍝ remove caller
+ buff←(buff[;1]≢¨⎕XSI[1])⌿buff ⍝ remove caller
  :If 0≠≢buff
      report,←↓(⊂' ⍝TODO⍝ found:'),(⊂'   '),¨buff
  :EndIf

diff --git a/APLSource/TestCases/Test_ZZZ_999.aplf b/APLSource/TestCases/Test_ZZZ_999.aplf
@@ -7,6 +7,7 @@
 
 ⍝ First we check whether "Version" returns a valid result:
  (n v d)←rf.Version
+ d←{⍵/⍨3>+\'-'=⍵}d      ⍝ Remove trailing stuff like "-beta"
  v←{⍵/⍨3>+\'.'=⍵}v      ⍝ Remove build ID
  f1←~5≤⍴v
  f1∨←2≠'.'+.=v
@@ -17,7 +18,7 @@
  f1∨←~∧/⎕D∊⍨d~'-'
 
 ⍝ publish.config must be in line with what "Version" returns of course:
- xml←⎕XML'flat'##.APLTreeUtils.ReadUtf8File'publish.config'
+ xml←⎕XML⊃⎕NGET'publish.config'
  f2←v≢(2+⎕IO)⊃xml[xml[;1+⎕IO]⍳⊂'version';]
  f2∨←d≢(2+⎕IO)⊃xml[xml[;1+⎕IO]⍳⊂'date';]
 

diff --git a/APLSource/TestCases/∆YesOrNo.aplf b/APLSource/TestCases/∆YesOrNo.aplf
@@ -0,0 +1,51 @@
+ yesOrNo←{default}∆YesOrNo question;isOkay;answer;add;dtb;answer2
+⍝ Ask a simple question and allows just "Yes" or "No" as answers.
+⍝ You may specify a default via the optional left argument which when specified
+⍝ rules what happens when the user just presses <enter>.
+⍝ `default` must be either 1 (yes) or 0 (no).
+⍝ Note that this function does not work as expected when traced!
+ isOkay←0
+ default←{0<⎕NC ⍵:⍎⍵ ⋄ ''}'default'
+ isOkay←0
+ :If ~0∊⍴default
+     'Left argument must be a scalar'⎕SIGNAL 11/⍨1≠⍴,default
+ :AndIf ~default∊0 1
+     'The left argument. if specified, must be a Boolean or empty'⎕SIGNAL 11
+ :EndIf
+ :If 0=≢default
+     add←' (y/n) '
+ :Else
+     :If default
+         add←' (Y/n) '
+     :Else
+         add←' (y/N) '
+     :EndIf
+ :EndIf
+ :If 1<≡question
+     ((⍴question)⊃question)←((⍴question)⊃question),add
+     question←⍪question
+ :Else
+     question←question,add
+ :EndIf
+ :Repeat
+     ⍞←question
+     answer←⍞
+     :If answer≡question                        ⍝ Did...  (since version 18.0 trailing blanks are not removed anynmore)
+     :OrIf (≢answer)=¯1+≢question               ⍝ ..the ...
+     :OrIf 0=≢answer                            ⍝ ...user just...
+         dtb←{⍵↓⍨-+/∧\' '=⌽⍵}
+         answer2←dtb answer
+     :OrIf answer2≡((-≢answer2)↑(⎕UCS 10){~⍺∊⍵:⍵ ⋄ ' ',dtb ⍺{⌽⍵↑⍨1+⍵⍳⍺}⌽⍵}question)   ⍝ ...press <enter>?
+         :If 0≠≢default
+             yesOrNo←default
+             isOkay←1
+         :EndIf
+     :Else
+         answer←¯1↑{⍵↓⍨-+/∧\' '=⌽⍵}answer
+         :If answer∊'YyNn'
+             isOkay←1
+             yesOrNo←answer∊'Yy'
+         :EndIf
+     :EndIf
+ :Until isOkay
+⍝Done
diff --git a/APLSource/WinSys.aplc b/APLSource/WinSys.aplc
@@ -8,31 +8,23 @@
 ⍝ Homepage: <http://aplwiki.com/WinSys>\\
 ⍝ Kai Jaeger ⋄ APL Team Ltd.
 
-    :Include APLTreeUtils
-
     ⎕IO←0
-    ⎕ML←3
+    ⎕ML←1
 
     ∇ r←Version
       :Access Public shared
-      r←({⍵↑⍨-'.'⍳⍨⌽⍵}⍕⎕THIS)'4.0.0.11' '2020-05-11'
+      r←'WinSys' '5.0.0.13' '2020-09-20'
     ∇
 
     ∇ History
       :Access Public shared
-      ⍝ * 4.0.0
-      ⍝   * BREAKING CHANGE: deprecated methods removed
-      ⍝   * New method `GetFileVersionInfo` added.
-      ⍝   * Outdated ".C32" removed from all `⎕NA` calls.
-      ⍝ * 3.0.0
-      ⍝   * BREAKING CHANGE: file extension is now .aplc rather than .dyalog
+      ⍝ * 5.0.0
+      ⍝   * Requires Dyalog 18.0 or better now
+      ⍝   * Internal changes:
+      ⍝     * Uses `⎕ML←1` now
+      ⍝     * Does not `:Include APLTreeUtils` anymore
       ⍝\\
       ⍝ For information regarding older versions see <https://github.com/aplteam/WinSys/releases>
-
-      ⍝ Note that a couple of functions are deprecated now. Search for `⍝Deprecated⍝`. \\
-      ⍝ These functions are not mantained any more and will be removed from `WinSys`
-      ⍝ in a future release. See the `OS` class which offers platform-independent
-      ⍝ alternatives for these functions.
     ∇
 
     :Field Public Shared ReadOnly SM_CXSCREEN←0                 ⍝ Screen size
@@ -163,14 +155,14 @@
           'Info'⎕NA'U4 version∣GetFileVersionInfo* <0T U4 U4 P'
           'Valu'⎕NA'U4 version∣VerQueryValue* P <0T >U4 >U4'
           'copy'⎕NA'P msvcrt∣memcpy >U4[] P U4'
-          :If ×size←↑Size filename 0                        ⍝ Size of info.
+          :If ×size←⊃Size filename 0                        ⍝ Size of info.
           :AndIf ×hndl←Aloc 0 size                          ⍝ Alloc memory.
               :If ×addr←Lock hndl                           ⍝ Lock memory.
                   :If ×Info filename 0 size addr            ⍝ Version info.
                       (ok buff size)←Valu addr'\' 0 0       ⍝ Version value.
                       :If ok
                           (retn buff)←copy(size÷4)buff size ⍝ Copy info.
-                          version←3↑,⍉(2/2*16)⊤⊃2↓buff      ⍝ Encode version.
+                          version←3↑,⍉(2/2*16)⊤↑2↓buff      ⍝ Encode version.
                       :Else
                           ('Call to "VerQueryValue" failed, rc=',⍕ok)⎕SIGNAL 11
                       :EndIf
@@ -204,6 +196,8 @@
     ⍝ | r[2] | Capacity of disk in KB
     ⍝ | r[3] | How many KB are available in total
     ⍝ In case of an error `r ←→ (¯1 ¯1 ¯1)`
+    ⍝ `drive` may be something like `C` or `C:`
+      drive←2↑drive,':'
       'GetDiskFreeSpaceEx'⎕NA'I KERNEL32|GetDiskFreeSpaceEx* <0T >U[2] >U[2] >U[2]'
       (rc freeForCaller capacity freeInTotal)←GetDiskFreeSpaceEx drive 2 2 2
       :If 0≠rc
@@ -221,7 +215,7 @@
       '∆GetComputerName'⎕NA'P KERNEL32|GetComputerName* >0T =P'
       multiByte←1+80=⎕DR' '           ⍝ Unicode version? (used to double the buffer size)
       (rc buffer size)←∆GetComputerName multiByte×2⍴32
-      R←(0=↑rc)⊃buffer''
+      R←(0=⊃rc)⊃buffer''
     ∇
 
     ∇ r←GetDefaultBrowser;regKey1;progID;regKey2;wsh
@@ -299,32 +293,30 @@
       :EndIf
     ∇
 
-    ∇ R←GetAllDrives;Values;Drives;∆GetLogicalDriveStrings;⎕IO;⎕ML
+    ∇ R←GetAllDrives;Values;Drives;∆GetLogicalDriveStrings
     ⍝ Returns a vector of text vectors with the names of all drives, for example:  "C:\"
       :Access Public Shared
-      ⎕IO←1 ⋄ ⎕ML←3
       '∆GetLogicalDriveStrings'⎕NA'U4 KERNEL32|GetLogicalDriveStrings* U4 >T[]'
       Values←∆GetLogicalDriveStrings 255 255
-      Drives←⊂(↑Values)↑(⎕IO+1)⊃Values
-      R←((~(⎕UCS 0)=∊Drives)⊂∊Drives)
+      Drives←⊂(⊃Values)↑(⎕IO+1)⊃Values
+      R←{⎕ML←3 ⋄ ((~(⎕UCS 0)=∊⍵)⊂∊⍵)}Drives
     ∇
 
-    ∇ R←GetDriveAndType;AllDrives;Txt;Types;∆GetDriveType;⎕IO;⎕ML
+    ∇ R←GetDriveAndType;AllDrives;Txt;Types;∆GetDriveType
      ⍝ Returns a matrix with the names and the types of all drives.\\
      ⍝ The number of rows is defined by the number of drives found.\\
      ⍝ "Types" may be something like "Fixed", "CD-ROM", "Removable", "Remote".
       :Access Public Shared
-      ⎕IO←1 ⋄ ⎕ML←3
       '∆GetDriveType'⎕NA'U4 KERNEL32|GetDriveType* <0T'
       Types←∆GetDriveType∘⊂¨AllDrives←GetAllDrives
       Txt←'Invalid Path' 'Removable' 'Fixed' 'Remote' 'CD-ROM' 'Ram-Disk'
-      R←AllDrives,Types,[1.5](Txt,⊂'Unknown')[(0,⍨⍳⍴Txt)⍳Types]
+      R←AllDrives,Types,[0.5](Txt,⊂'Unknown')[¯1+(0,⍨⍳⍴Txt)⍳Types]
     ∇
 
     ∇ R←List_SM
       :Access Public Shared
     ⍝ Lists all fields with names that start with "SM\_"
-      R←⊃⎕NL-2
+      R←↑⎕NL-2
       R←(R[;⍳3]∧.='SM_')⌿R
       R←(↓R)~¨' '
     ∇
@@ -337,7 +329,7 @@
       FORMAT_MESSAGE_FROM_SYSTEM←4096
       LangID←0
       'FormatMsg'⎕NA'I KERNEL32|FormatMessage* I4 I4 I4 I4 >T[] I4 I4'
-      :If 0>mid←↑mid
+      :If 0>mid←⊃mid
       :AndIf ¯16777216≤mid
           mid←-mid
       :EndIf
@@ -355,7 +347,7 @@
                   :EndIf
                   r←⊃↑/FormatMsg(FORMAT_MESSAGE_FROM_HMODULE+FORMAT_MESSAGE_IGNORE_INSERTS)hModule mid LangID size size 0
                   {}FreeLibrary hModule
-                  :If ×↑⍴r
+                  :If ×≢r
                       :Leave
                   :EndIf
               :EndIf
@@ -458,15 +450,10 @@
 
     ∇
 
-    ∇ R←GetLastError;∆GetLastError;⎕ML;⎕IO
+    ∇ R←GetLastError;∆GetLastError
       :Access Public Shared
-      ⎕IO←1 ⋄ ⎕ML←3
       '∆GetLastError'⎕NA'I4 kernel32|GetLastError'
       R←∆GetLastError
     ∇
 
-    ∇ r←Is64Bit
-      r←'-64'≡¯3↑⎕IO⊃'#'⎕WG'APLVersion'
-    ∇
-
 :EndClass
diff --git a/Make/Make.bat b/Make/Make.bat
diff --git a/TestResults/CodeCoverage.dcf b/TestResults/CodeCoverage.dcf