Skip to content

Commit

Permalink
Merge branch 'adam'
Browse files Browse the repository at this point in the history
  • Loading branch information
PhilLast committed Jan 13, 2020
2 parents 1ab0401 + ee36df3 commit 6eaf15a
Show file tree
Hide file tree
Showing 76 changed files with 132 additions and 125 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
T.PassesIf'.charlist'1⎕SE.acre.Nameclass'#.TEMP.Foo'

#.TEMP.Foo1 2 3 'abc' 'def'
T.PassesIf'.array'1⎕SE.acre.Nameclass'#.TEMP.Foo'
T.PassesIf'.apla'1⎕SE.acre.Nameclass'#.TEMP.Foo'

#.TEMP.Foo2'abc'
T.PassesIf'.array' '.charstring'⎕SE.acre.Nameclass'#.TEMP.Foo' '#.TEMP.Foo2'
T.PassesIf'.apla' '.charstring'⎕SE.acre.Nameclass'#.TEMP.Foo' '#.TEMP.Foo2'

#.TEMP.⎕EX'Foo' #.TEMP.Foo{+/}
T.PassesIf'.aplf'1⎕SE.acre.Nameclass'#.TEMP.Foo'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
path{_F.DeleteFile ¯4}F.GetTempFilename''
result∆RunUcmd'CreateProject "',path,'" #.TEMP'
Assert'#.TEMP'result
∆RunUcmd'Close #.TEMP'
∆RunUcmd'CloseProject #.TEMP'
result∆RunUcmd'OpenProject "',path,'"'
Assert'#.TEMP'result

Expand All @@ -31,5 +31,5 @@

∆TidyUp:
F.RmDir path
∆RunUcmd'Close #.TEMP'
∆RunUcmd'CloseProject #.TEMP'
Done
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@

∆TidyUp:
:Trap 0 {}F.RmDir path :EndTrap
∆RunUcmd'Close #.TEMP'
∆RunUcmd'CloseProject #.TEMP'
Done
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@

∆TidyUp:
:Trap 0 {}F.RmDir path :EndTrap
∆RunUcmd'Close #.TEMP'
∆RunUcmd'CloseProject #.TEMP'
Done
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@

∆TidyUp:
:Trap 0 {}F.RmDir path :EndTrap
∆RunUcmd'Close #.TEMP'
∆RunUcmd'CloseProject #.TEMP'
Done
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@

∆TidyUp:
:Trap 0 {}F.RmDir path :EndTrap
∆RunUcmd'Close #.TEMP'
∆RunUcmd'CloseProject #.TEMP'
Done
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
RTest_API_015(stopFlag batchFlag);⎕TRAP;path;result;buff;openList
Exercise the API function `Close`.
Exercise the API function `CloseProject`.
⎕TRAP(999 'C' '. ⍝ Deliberate error')(0 'N')

RT._Failed
Expand All @@ -16,11 +16,11 @@
result∆RunUcmd'CreateProject "',path,'" #.TEMP'

T.GoToTidyUp({[;1]}⎕SE.acre.Projects'')openList[;1],result
T.GoToTidyUp(openList)⎕SE.acre.Close result
T.GoToTidyUp(openList)⎕SE.acre.CloseProject result
T.GoToTidyUp({[;1]}⎕SE.acre.Projects'')openList[;1]

RT._OK

∆TidyUp:
∆RunUcmd'Close #.TEMP'
∆RunUcmd'CloseProject #.TEMP'
Done
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@

∆TidyUp:
F.RmDir projectPath
∆RunUcmd'Close #.',projectName
∆RunUcmd'CloseProject #.',projectName
Done
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@

∆TidyUp:
F.RmDir projectPath
∆RunUcmd'Close #.',projectName
∆RunUcmd'CloseProject #.',projectName
Done
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@

∆TidyUp:
F.RmDir projectPath
∆RunUcmd'Close #.',projectName
∆RunUcmd'CloseProject #.',projectName
Done
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@

∆TidyUp:
F.RmDir projectPath
∆RunUcmd'Close #.',projectName
∆RunUcmd'CloseProject #.',projectName
Done
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@

∆TidyUp:
F.RmDir projectPath
∆RunUcmd'Close #.',projectName
∆RunUcmd'CloseProject #.',projectName
Done
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
result⎕SE.acre.SetChanged('#.',projectName)('recursive' 1)
T.GoToTidyUp 6listF.ListFiles projectPath,'\.acre\changes\'

∆RunUcmd'Close #.',projectName
∆RunUcmd'CloseProject #.',projectName
F.RmDir projectPath
#.⎕EX projectName

Expand All @@ -50,7 +50,7 @@
result⎕SE.acre.SetChanged('#.',projectName)('recursive' 1)
T.GoToTidyUp 3listF.ListFiles projectPath,'\.acre\changes\' Because QuadVars is added due to the recursive option

∆RunUcmd'Close #.',projectName
∆RunUcmd'CloseProject #.',projectName
F.RmDir projectPath
#.⎕EX projectName

Expand All @@ -69,6 +69,6 @@

∆TidyUp:
:Trap 0 ⎕FUNTIE tno :EndTrap
∆RunUcmd'Close #.',projectName
∆RunUcmd'CloseProject #.',projectName
F.RmDir projectPath
Done
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
∆TidyUp:
:Trap 0 ⎕FUNTIE tno :EndTrap
F.RmDir projectPath
∆RunUcmd'Close #.',projectName
∆RunUcmd'CloseProject #.',projectName
Done
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@

∆TidyUp:
:Trap 0 {}F.RmDir path :EndTrap
∆RunUcmd'Close #.TEMP'
∆RunUcmd'CloseProject #.TEMP'
Done
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
result∆RunUcmd'CreateProject "',path,'" #.TEMP -keephistory=on'
T.GoToTidyUp'#.TEMP'result

result⎕SE.acre.Close'#.TEMP'
result⎕SE.acre.CloseProject'#.TEMP'
T.GoToTidyUp 1result
#.⎕EX'TEMP'

Expand All @@ -27,5 +27,5 @@

∆TidyUp:
:Trap 0 {}F.RmDir path :EndTrap
∆RunUcmd'Close #.TEMP'
∆RunUcmd'CloseProject #.TEMP'
Done
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@

∆TidyUp:
:Trap 0 {}F.RmDir path :EndTrap
∆RunUcmd'Close #.TEMP'
∆RunUcmd'CloseProject #.TEMP'
Done
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@

∆TidyUp:
F.RmDir projectPath
∆RunUcmd'Close #.',projectName
∆RunUcmd'CloseProject #.',projectName
Done
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@

∆TidyUp:
F.RmDir projectPath
∆RunUcmd'Close #.',projectName
∆RunUcmd'CloseProject #.',projectName
Done
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
T.GoToTidyUp result'#.',projectName
T.GoToTidyUp 1F.IsFile projectPath,'\APLSource\Hello-1.aplf'
F.RmDir projectPath
∆RunUcmd'Close #.',projectName
∆RunUcmd'CloseProject #.',projectName


:Trap (~stopFlag)/0
Expand All @@ -30,7 +30,7 @@
T.GoToTidyUp result'#.',projectName
T.GoToTidyUp 1F.IsFile projectPath,'\APLSource\Hello.aplf'
F.RmDir projectPath
∆RunUcmd'Close #.',projectName
∆RunUcmd'CloseProject #.',projectName

:Trap (~stopFlag)/0
result∆RunUcmd'Createproject ',projectPath,' #.',projectName Default is "off"
Expand All @@ -46,5 +46,5 @@
∆TidyUp:
F.RmDir projectPath
∆ClearLog
∆RunUcmd'Close #.',projectName
∆RunUcmd'CloseProject #.',projectName
Done
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
T.GoToTidyUp 1F.ListFiles projectPath,'\.acre\changes\'
T.GoToTidyUp 1listF.ListFiles projectPath,'\.acre\changes\'
F.DeleteFile list
∆RunUcmd'Close #.',projectName
∆RunUcmd'CloseProject #.',projectName

F.RmDir projectPath
result∆RunUcmd'Createproject ',projectPath,' #.',projectName
Expand All @@ -38,5 +38,5 @@
∆TidyUp:
F.RmDir projectPath
∆ClearLog
∆RunUcmd'Close #.',projectName
∆RunUcmd'CloseProject #.',projectName
Done
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@
∆TidyUp:
F.RmDir projectPath
∆ClearLog
∆RunUcmd'Close #.',projectName
∆RunUcmd'CloseProject #.',projectName
Done
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@
∆TidyUp:
F.RmDir projectPath
∆ClearLog
∆RunUcmd'Close #.',projectName
∆RunUcmd'CloseProject #.',projectName
Done
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@
∆TidyUp:
F.RmDir projectPath
∆ClearLog
∆RunUcmd'Close #.',projectName
∆RunUcmd'CloseProject #.',projectName
Done
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@
∆TidyUp:
F.RmDir projectPath
∆ClearLog
∆RunUcmd'Close #.',projectName
∆RunUcmd'CloseProject #.',projectName
Done
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,6 @@
:Trap 0 F.RmDir projectPath :EndTrap
:Trap 0 F.RmDir projectPath2 :EndTrap
∆ClearLog
∆RunUcmd'Close #.',projectName
∆RunUcmd'Close #.',projectName2
∆RunUcmd'CloseProject #.',projectName
∆RunUcmd'CloseProject #.',projectName2
Done
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,6 @@
:Trap 0 F.RmDir projectPath :EndTrap
:Trap 0 F.RmDir projectPath2 :EndTrap
∆ClearLog
∆RunUcmd'Close #.',projectName
∆RunUcmd'Close #.',projectName2
∆RunUcmd'CloseProject #.',projectName
∆RunUcmd'CloseProject #.',projectName2
Done
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,6 @@
:Trap 0 F.RmDir projectPath :EndTrap
:Trap 0 F.RmDir projectPath2 :EndTrap
∆ClearLog
∆RunUcmd'Close #.',projectName
∆RunUcmd'Close #.',projectName2
∆RunUcmd'CloseProject #.',projectName
∆RunUcmd'CloseProject #.',projectName2
Done
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
:Trap 0 F.RmDir projectPath2 :EndTrap
:Trap 0 F.RmDir projectPath3 :EndTrap
∆ClearLog
:Trap 0 ∆RunUcmd'Close #.',projectName :EndTrap
:Trap 0 ∆RunUcmd'Close #.',projectName2 :EndTrap
:Trap 0 ∆RunUcmd'Close #.',projectName3 :EndTrap
:Trap 0 ∆RunUcmd'CloseProject #.',projectName :EndTrap
:Trap 0 ∆RunUcmd'CloseProject #.',projectName2 :EndTrap
:Trap 0 ∆RunUcmd'CloseProject #.',projectName3 :EndTrap
Done
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
T.GoToTidyUp 1
:EndTrap

∆RunUcmd'Close #.TEMP'
∆RunUcmd'CloseProject #.TEMP'
#.⎕EX'TEMP'

configFilename2∆ReadConfigFile projectPath
Expand All @@ -43,5 +43,5 @@
∆TidyUp:
:Trap 0 F.RmDir projectPath :EndTrap
∆ClearLog
∆RunUcmd'Close #.TEMP'
∆RunUcmd'CloseProject #.TEMP'
Done
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@
∆TidyUp:
:Trap 0 F.RmDir projectPath :EndTrap
∆ClearLog
∆RunUcmd'Close #.',projectName
∆RunUcmd'CloseProject #.',projectName
Done
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
:EndTrap
T.GoToTidyUp 1messages∆GetLog

∆RunUcmd'Close #.TEMP'
∆RunUcmd'CloseProject #.TEMP'
#.⎕EX'TEMP'

(bin configFilename)∆ReadConfigFile projectPath
Expand Down Expand Up @@ -54,5 +54,5 @@
∆TidyUp:
:Trap 0 F.RmDir projectPath :EndTrap
∆ClearLog
∆RunUcmd'Close #.TEMP'
∆RunUcmd'CloseProject #.TEMP'
Done
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
:EndTrap

{}projectPath ∆RunGitCommand'init'
∆RunUcmd'Close #.TEMP'
∆RunUcmd'CloseProject #.TEMP'
#.⎕EX'TEMP'

(bin configFilename)∆ReadConfigFile projectPath
Expand Down Expand Up @@ -59,5 +59,5 @@
∆TidyUp:
:Trap 0 {}⎕CMD'rd /s /q ',projectPath :EndTrap At this point RmDir fails with "ACCESS DENIED": Git is the culprit! However, rd works. Reported as <01651>
∆ClearLog
∆RunUcmd'Close #.TEMP'
∆RunUcmd'CloseProject #.TEMP'
Done
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
T.GoToTidyUp 1
:EndTrap

∆RunUcmd'Close #.TEMP'
∆RunUcmd'CloseProject #.TEMP'
#.⎕EX'TEMP'

(bin configFilename)∆ReadConfigFile projectPath
Expand All @@ -49,5 +49,5 @@
∆TidyUp:
:Trap 0 F.RmDir projectPath :EndTrap
∆ClearLog
∆RunUcmd'Close #.TEMP'
∆RunUcmd'CloseProject #.TEMP'
Done
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
T.GoToTidyUp 1
:EndTrap

∆RunUcmd'Close #.TEMP'
∆RunUcmd'CloseProject #.TEMP'
#.⎕EX'TEMP'

(bin configFilename)∆ReadConfigFile projectPath
Expand All @@ -50,5 +50,5 @@
∆TidyUp:
:Trap 0 F.RmDir projectPath :EndTrap
∆ClearLog
∆RunUcmd'Close #.TEMP'
∆RunUcmd'CloseProject #.TEMP'
Done
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
T.GoToTidyUp 1
:EndTrap

∆RunUcmd'Close #.TEMP'
∆RunUcmd'CloseProject #.TEMP'
#.⎕EX'TEMP'

(bin configFilename)∆ReadConfigFile projectPath
Expand Down Expand Up @@ -51,5 +51,5 @@
∆TidyUp:
:Trap 0 F.RmDir projectPath :EndTrap
∆ClearLog
∆RunUcmd'Close #.TEMP'
∆RunUcmd'CloseProject #.TEMP'
Done
Loading

0 comments on commit 6eaf15a

Please sign in to comment.