diff --git a/jlibrary/system/main/stdlib.ijs b/jlibrary/system/main/stdlib.ijs index d080c4e7f..913f275ca 100644 --- a/jlibrary/system/main/stdlib.ijs +++ b/jlibrary/system/main/stdlib.ijs @@ -529,11 +529,10 @@ memu=: '' 1 : 'try. 15!:15 m catch. a: { ] return. end. 15!:15' cdf=: 15!:5 cder=: 15!:10 cderx=: 15!:11 -symget=: 15!:6 symset=: 15!:7 symdad=: 15!:14 symdat=: 15!:14 -symhad=: 15!:12 +memhad=: 15!:12 cdcb=: 15!:13 JB01=: 1 JCHAR=: 2 diff --git a/test/g000.ijs b/test/g000.ijs index 699152f2a..fe566bb01 100644 --- a/test/g000.ijs +++ b/test/g000.ijs @@ -3,7 +3,7 @@ prolog './g000.ijs' NB. Early in the testing, verify that local assignments relocate the symbol table correctly 3 : 0 '' st =. 0 -st =. 15!:_1 <'st' +st =. 15!:12 <'st' for_l1. 'abcdefghijklmnopqrstuvwxyz' do. for_l2. 'abcdefghijklmnopqrstuvwxyz' do. (l1,l2) =. 26 #: l1_index,l2_index @@ -14,7 +14,7 @@ for_l1. 'abcdefghijklmnopqrstuvwxyz' do. assert (l1,l2)~ = 26 #: l1_index,l2_index end. end. -est =. 15!:_1 <'st' +est =. 15!:12 <'st' NB. This relocates when run early if. st ~: est do. smoutput 'symbols relocated' end. 1 ) diff --git a/test/g15x.ijs b/test/g15x.ijs index 69e576ddf..24e11dd85 100644 --- a/test/g15x.ijs +++ b/test/g15x.ijs @@ -17,14 +17,14 @@ t=: 100 4 1?@$ 0 t -: ($t)$15!:1 (15!:14 <'t'),0,(*/$t),3!:0 t (15!:14 <'t') = (15!:12 <'t') +10*SZI -'domain error' -: 15!:_1 etx <'test' -'domain error' -: 15!:_1 etx ;:'t test' -'domain error' -: 15!:_1 etx ;:'t test' -'domain error' -: 15!:_1 etx <10&u:'test' -'domain error' -: 15!:_1 etx 10&u:&.> ;:'t test' -'domain error' -: 15!:_1 etx s:@<"0&.> <'test' -'domain error' -: 15!:_1 etx <"0@s: <'test' +'domain error' -: 15!:12 etx <'test' +'domain error' -: 15!:12 etx ;:'t test' +'domain error' -: 15!:12 etx ;:'t test' +'domain error' -: 15!:12 etx <10&u:'test' +'domain error' -: 15!:12 etx 10&u:&.> ;:'t test' +'domain error' -: 15!:12 etx s:@<"0&.> <'test' +'domain error' -: 15!:12 etx <"0@s: <'test' 'domain error' -: 15!:14 etx <'test' 'domain error' -: 15!:14 etx ;:'t test' 'domain error' -: 15!:14 etx <'test' 'domain error' -: 15!:14 etx <"0@s: <'test' -'value error' -: 15!:_1 etx <'undefinedname' -'value error' -: 15!:_1 etx ;:'t undefinedname' +'value error' -: 15!:12 etx <'undefinedname' +'value error' -: 15!:12 etx ;:'t undefinedname' 'value error' -: 15!:14 etx <'undefinedname' 'value error' -: 15!:14 etx ;:'t undefinedname' diff --git a/test/g3x6.ijs b/test/g3x6.ijs index 7535cd18d..dab376521 100644 --- a/test/g3x6.ijs +++ b/test/g3x6.ijs @@ -31,7 +31,7 @@ m1=: mean f. m1=: 'mean' f. (5!:5 <'m1') -: 'mean' -'domain error' -: 15!:_1 etx <'mean' +'domain error' -: 15!:12 etx <'mean' 1!:55 f @@ -55,7 +55,7 @@ m1=: mean f. m1=: 'mean' f. (5!:5 <'m1') -: 'mean' -'domain error' -: 15!:_1 etx <'mean' +'domain error' -: 15!:12 etx <'mean'