Merge pull request #7 from mkromberg/getDRC

Fix Mantis 18885
Dyalog · Feb 27, 2021 · 1cfd016 · 1cfd016
2 parents 38bcac4 + cdeba20
commit 1cfd016
Showing 1 changed file with 17 additions and 8 deletions.
diff --git a/Source/ynys/getDRC.dyalog b/Source/ynys/getDRC.dyalog
@@ -1,8 +1,17 @@
- getDRC←{⍺←⊢
-     ⍵≠#:⍵                          ⍝ if not # it must exist
-     9=#.⎕NC'DRC':#.DRC             ⍝ in # already?
-     ws←addWSpath'conga.dws'        ⍝ dyalog WS
-     0::⊢#.DRC                      ⍝ this is result
-     z←{}'DRC'#.⎕CY ws              ⍝ ⎕CY no result
-⍝
- }
+ r←getDRC ref;ws
+ :If ref≠# ⋄ r←ref                 ⍝ Not set, so we must create it
+ :ElseIf 9=#.⎕NC'DRC' ⋄ r←#.DRC    ⍝ in # already?
+ :Else
+     ws←'conga.dws'
+     :Trap 0
+         'DRC'#.⎕CY ws              ⍝ See if the interpreter can find it
+     :Else
+         ws←addWSpath'conga.dws'     ⍝ Actually adds [DYALOG]/ws
+         :Trap 0
+             'DRC'#.⎕CY ws
+         :Else
+             'Unable to locate conga.dws'⎕SIGNAL 11
+         :EndTrap
+     :EndTrap
+     r←#.DRC
+ :EndIf