FindPath revisited

Author: aplteam

APLSource/APLTreeUtils.apln

@@ -1,8 +1,11 @@
 :Namespace APLTreeUtils
-⍝ *** Version 4.3.0 ⋄ 2019-11-28 ***
+
+⍝ *** Version 5.0.0 ⋄ 2020-03-03 ***
 ⍝ ## Overview
 ⍝ Note that `APLTreeUtils` does not work with the Classic edition - it requires Unicode.\\
 ⍝ ## Version History
+⍝ * 5.0.0
+⍝   * `FindPath` redefined, see there.
 ⍝ * 4.3.0
 ⍝   * Method `ToNum` introduced
 ⍝ Kai Jaeger - APL Team Ltd.\\
@@ -337,18 +340,18 @@
       ⍝ 2. The namespace where the class (if instanciated) comes from.
       ⍝ 3. In `#`.
       ⍝ 4. Where it was called from (**not** the same as either 1 or 2!).
-      ⍝ If it fails to find `⍵` an empty string is returned.
+      ⍝ If it fails it signals an error.
           ⎕IO←1 ⋄ ⎕ML←1
           base←⎕THIS.##                        ⍝ were are we coming from?
           base{11::0 ⋄ 9=⍺.⎕NC ⍵}⍵:base        ⍝ Is it in that namespace?
           base←{11::⍬ ⋄ (1⊃∊⎕CLASS ⍵).##}⍵     ⍝ Where stems the class from?
           base{11::0 ⋄ 9=⍺.⎕NC{Last ⍵}⍕1⊃⊃⎕CLASS ⍵}⍵:base  ⍝ Is it in that namespace?
+          base←{11::⍬ ⋄ (⊃⊃⎕CLASS ⎕THIS)}⍬     ⍝ Where stems the class from?
+          base{11::0 ⋄ 9=⍺.##.⎕NC⍕⍵}⍵:base.##  ⍝ Is it in the parent of that namespace?
           9={11::0 ⋄ #.⎕NC ⍵}⍵:#               ⍝ Is it in root?
           path←1⊃⎕RSI~⎕THIS                    ⍝ From where got we called?
           0<path.⎕NC ⍵:path                    ⍝ May be it's there?
-          0=#.⎕NC'_dependencies':''
-          9=#._dependencies.⎕NC ⍵:#._dependencies
-          ''                                   ⍝ Give up
+          6 ⎕SIGNAL⍨'Could not find ',⍵
       }
 
     ∇ r←GetOperatingSystem dummy;⎕ML;⎕IO
@@ -420,4 +423,4 @@
       :EndIf
     ∇
 
-:EndNamespace ⍝ APLTreeUtils
+:EndNamespace

APLSource/TestCases/Stop.array renamed to APLSource/TestCases/Stop.apla

@@ -52,25 +52,11 @@
          :EndIf
          ⎕CS ##  ⍝ Back to "Testspace'
 
-     ⍝ Test C)
-     ⍝ We now instanciate MyTest somewhere else, but Obstacle
-     ⍝ should be found where the instance stems from (local):
-         instance←⎕NEW local.Obstacle
-         its←⍕⎕THIS.MyTest.Get instance
-         ⎕CS #.APLTreeUtils.TestCases
-         flag←its≢(⍕⎕THIS),'.Testspace.local'
-         :If flag
-             :If 0<⎕NC'stopFlag'
-             :AndIf stopFlag
-                 . ⍝ Something went wrong
-             :EndIf
-             :Leave
-         :EndIf
-
-     ⍝ Test D)
+     ⍝ Test E)
      ⍝ We now delete "Obstacle" from local but fix it in TestCase.
      ⍝ Then we call Testspace.local.MyTest from  TestCases, so
      ⍝ it should be found in TestCase
+         ⎕CS ##
          Testspace.local.⎕EX'Obstacle'
          ⎕FIX ⎕SRC #.Obstacle
          #.⎕EX'Obstacle'
@@ -101,30 +87,7 @@
      'Create!'##.FilesAndDirs.CheckPath home,'Logs'
  :EndIf
 
- ⎕EX'#.SSO'
- #.⎕SHADOW'SSO'
- ref←⍎'#.SSO'⎕NS''
- ref.⎕FIX ⎕SRC ##.APLTreeUtils
- ref2←ref.⎕NS''
- ref2.⎕FIX ⎕SRC ##.APLTreeUtils
- ref2.⎕FIX ⎕SRC ##.FilesAndDirs
- ref2←⍎'qq'ref.⎕NS''
- ref2.⎕FIX ⎕SRC ##.APLTreeUtils
- ref2.⎕FIX ⎕SRC ##.Logger
- 'Source'ref.⎕NS''
- ref.Source.⎕FX'r←Foo home' 'myLogger←⎕NEW ##.qq.Logger (,⊂home)' ' r←myLogger.(path ,filename)'
- fn←ref.Source.Foo home
-
- :Trap 0
-     myLogger←⎕NEW ref2.Logger(,⊂home,'Logs') ⍝ #.Logger will use FindPathTo in order to find FilesAndDirs!
-     R←T._OK
- :Else
-     →T.GoToTidyUp 1
- :EndTrap
- ⎕DL 1
- :Trap 0
-     myLogger.Close
- :EndTrap
+ R←T._OK
 
 ∆TidyUp:
  {}##.FilesAndDirs.RmDir home,'Logs'

APLSource/TestCases/StopFlag.array renamed to APLSource/TestCases/StopFlag.apla

@@ -1 +1 @@
-<tool name="APLTreeUtils">  <version>4.3.0</version>  <date>2019-11-28</date>  <container>#.APLTreeUtils</container>  <needs>    <script>APLTreeUtils</script>    <script>FilesAndDirs</script>    <script>OS</script>    <script>Logger</script>    <script>Execute</script>    <script development="true">Tester2</script>  </needs>  <autoload>1</autoload>  <scriptOnly>1</scriptOnly>  <buildid>1</buildid></tool>
+<tool name="APLTreeUtils">  <version>5.0.0</version>  <date>2020-03-03</date>  <container>#.APLTreeUtils</container>  <needs>    <script>APLTreeUtils</script>    <script>FilesAndDirs</script>    <script>OS</script>    <script>Logger</script>    <script>Execute</script>    <script development="true">Tester2</script>  </needs>  <autoload>1</autoload>  <scriptOnly>1</scriptOnly>  <buildid>1</buildid>  <package>1</package></tool>