Merge pull request #716 from Dyalog/714-allow-localised-names

Make WSLoaded ignore wslinks if PRELOAD=Y (and fix bug where emptyns was not updated)

Author: mkromberg

StartupSession/Link/Create.aplf

@@ -74,6 +74,7 @@ NOHOLD:
                      onstack←((ns,'.')∘,¨names)∊⎕XSI        ⍝ Name on the stack
                      local←{∨/⊃nsref.⎕STATE ⍵}¨names        ⍝ Localised on the stack
                      names/⍨←onstack⍱local                  ⍝ ... are allowed in target ns
+                     emptyns←0=≢names
                  :EndIf
 
                  :If ~opts.(preloaded∨flatten)

StartupSession/Link/Version.aplf

@@ -1,2 +1,2 @@
  version←Version
- version←'4.1.3'
+ version←'4.1.4'

StartupSession/Link/WSLoaded.aplf

@@ -1,14 +1,18 @@
- {ok}←WSLoaded;keep;links;msg;wslinks;link;diff;allOK;load;IsLoad;broken;isLoadWs
+ {ok}←WSLoaded;keep;links;msg;wslinks;link;diff;allOK;load;IsLoad;broken;isLoadWs;preload
 ⍝ Action to be taken upon )LOAD or )CLEAR
  ok←0
- :Trap 0  ⍝ can't afford to error
-     load←2 ⎕NQ #'GetEnvironment' 'LOAD'
+
+ :Trap 0 ⍝ can't afford to error
+     (load preload)←{2 ⎕NQ #'GetEnvironment' ⍵}¨'LOAD' 'PRELOAD'
      IsLoad←load∘{⍵.dir∊⍥(1 ⎕NPARTS⊆)⍺}
+
      :Hold '⎕SE.Link.Links'
 
          ⍝ retrieve saved workspace links before the GetLinks which may overwrite Store 0
          :If ~U.HASSTORE
          :OrIf ⎕NULL≡wslinks←U.Store 0
+         :OrIf (∨/preload∊'1yY')∧load≡⍥{⎕C ∊¯1↓1 ⎕NPARTS ⍵}⎕WSID
+         ⍝ Above: PRELOAD=Y means application intends to recreate links with preloaded:1
              wslinks←⍬
          :EndIf
 

Test/test_attributes.aplf

@@ -9,7 +9,7 @@
  CleanUp folder name
  ⎕MKDIR Retry folder
  (⊂fn'bar')⎕NPUT aplf←folder,'/',(fn←'foo'),'.aplf'
- (dt←2345 6 7 10 20 30)SetTime aplf
+ (dt←2105 6 7 10 20 30)SetTime aplf
 
 ⍝ Check that we import the special datetime
  z←LinkCreate name folder