commit b693b830bec4d88cebb907f4e1fc70b3c98f9740
parent f1cf6b1316da0f5c749f99068f31db31843acb87
Author: Alexander Burger <abu@software-lab.de>
Date: Wed, 11 Jul 2012 08:34:44 +0200
'load': Restore namespace also in REPL
Diffstat:
| M | lib/map | | | 42 | +++++++++++++++++++++--------------------- |
| M | src64/io.l | | | 7 | ++----- |
| M | src64/tags | | | 74 | +++++++++++++++++++++++++++++++++++++------------------------------------- |
3 files changed, 60 insertions(+), 63 deletions(-)
diff --git a/lib/map b/lib/map
@@ -87,7 +87,7 @@ chop (1219 . "@src64/sym.l")
circ (816 . "@src64/subr.l")
circ? (2402 . "@src64/subr.l")
clip (1799 . "@src64/subr.l")
-close (4381 . "@src64/io.l")
+close (4378 . "@src64/io.l")
cmd (2967 . "@src64/main.l")
cnt (1413 . "@src64/apply.l")
co (2537 . "@src64/flow.l")
@@ -98,7 +98,7 @@ cond (1908 . "@src64/flow.l")
connect (224 . "@src64/net.l")
cons (747 . "@src64/subr.l")
copy (1225 . "@src64/subr.l")
-ctl (4254 . "@src64/io.l")
+ctl (4251 . "@src64/io.l")
ctty (2765 . "@src64/main.l")
cut (1922 . "@src64/sym.l")
date (2479 . "@src64/main.l")
@@ -115,14 +115,14 @@ dir (2898 . "@src64/main.l")
dm (545 . "@src64/flow.l")
do (2130 . "@src64/flow.l")
e (2911 . "@src64/flow.l")
-echo (4412 . "@src64/io.l")
+echo (4409 . "@src64/io.l")
env (597 . "@src64/main.l")
eof (3524 . "@src64/io.l")
eol (3515 . "@src64/io.l")
-err (4234 . "@src64/io.l")
+err (4231 . "@src64/io.l")
errno (1368 . "@src64/main.l")
eval (175 . "@src64/flow.l")
-ext (5146 . "@src64/io.l")
+ext (5143 . "@src64/io.l")
ext? (1157 . "@src64/sym.l")
extern (1023 . "@src64/sym.l")
extra (1258 . "@src64/flow.l")
@@ -137,7 +137,7 @@ find (1322 . "@src64/apply.l")
fish (1613 . "@src64/apply.l")
flg? (2445 . "@src64/subr.l")
flip (1699 . "@src64/subr.l")
-flush (5121 . "@src64/io.l")
+flush (5118 . "@src64/io.l")
fold (3512 . "@src64/sym.l")
for (2219 . "@src64/flow.l")
fork (3253 . "@src64/flow.l")
@@ -163,7 +163,7 @@ idx (2162 . "@src64/sym.l")
if (1794 . "@src64/flow.l")
if2 (1813 . "@src64/flow.l")
ifn (1854 . "@src64/flow.l")
-in (4194 . "@src64/io.l")
+in (4191 . "@src64/io.l")
inc (2256 . "@src64/big.l")
index (2637 . "@src64/subr.l")
info (2802 . "@src64/main.l")
@@ -187,7 +187,7 @@ lisp (2037 . "@src64/main.l")
list (887 . "@src64/subr.l")
listen (157 . "@src64/net.l")
lit (150 . "@src64/flow.l")
-load (4171 . "@src64/io.l")
+load (4168 . "@src64/io.l")
lock (1185 . "@src64/db.l")
loop (2162 . "@src64/flow.l")
low? (3378 . "@src64/sym.l")
@@ -237,11 +237,11 @@ offset (2677 . "@src64/subr.l")
on (1708 . "@src64/sym.l")
onOff (1738 . "@src64/sym.l")
one (1771 . "@src64/sym.l")
-open (4338 . "@src64/io.l")
+open (4335 . "@src64/io.l")
opid (3214 . "@src64/flow.l")
opt (3088 . "@src64/main.l")
or (1629 . "@src64/flow.l")
-out (4214 . "@src64/io.l")
+out (4211 . "@src64/io.l")
pack (1270 . "@src64/sym.l")
pair (2394 . "@src64/subr.l")
pass (754 . "@src64/apply.l")
@@ -249,18 +249,18 @@ pat? (736 . "@src64/sym.l")
path (1244 . "@src64/io.l")
peek (3431 . "@src64/io.l")
pick (1369 . "@src64/apply.l")
-pipe (4275 . "@src64/io.l")
+pipe (4272 . "@src64/io.l")
poll (3320 . "@src64/io.l")
pool (651 . "@src64/db.l")
pop (1898 . "@src64/sym.l")
port (5 . "@src64/net.l")
-pr (5229 . "@src64/io.l")
+pr (5226 . "@src64/io.l")
pre? (1536 . "@src64/sym.l")
-prin (5045 . "@src64/io.l")
-prinl (5059 . "@src64/io.l")
-print (5085 . "@src64/io.l")
-println (5116 . "@src64/io.l")
-printsp (5101 . "@src64/io.l")
+prin (5042 . "@src64/io.l")
+prinl (5056 . "@src64/io.l")
+print (5082 . "@src64/io.l")
+println (5113 . "@src64/io.l")
+printsp (5098 . "@src64/io.l")
prior (2713 . "@src64/subr.l")
prog (1749 . "@src64/flow.l")
prog1 (1757 . "@src64/flow.l")
@@ -280,12 +280,12 @@ rand (3003 . "@src64/big.l")
range (997 . "@src64/subr.l")
rank (3036 . "@src64/subr.l")
raw (449 . "@src64/main.l")
-rd (5163 . "@src64/io.l")
+rd (5160 . "@src64/io.l")
read (2656 . "@src64/io.l")
replace (1499 . "@src64/subr.l")
rest (2394 . "@src64/main.l")
reverse (1678 . "@src64/subr.l")
-rewind (5129 . "@src64/io.l")
+rewind (5126 . "@src64/io.l")
rollback (1898 . "@src64/db.l")
rot (848 . "@src64/subr.l")
run (306 . "@src64/flow.l")
@@ -301,7 +301,7 @@ size (2809 . "@src64/subr.l")
skip (3501 . "@src64/io.l")
sort (3965 . "@src64/subr.l")
sp? (727 . "@src64/sym.l")
-space (5063 . "@src64/io.l")
+space (5060 . "@src64/io.l")
split (1592 . "@src64/subr.l")
stack (546 . "@src64/main.l")
state (1998 . "@src64/flow.l")
@@ -346,7 +346,7 @@ when (1873 . "@src64/flow.l")
while (2050 . "@src64/flow.l")
wipe (3253 . "@src64/sym.l")
with (1321 . "@src64/flow.l")
-wr (5246 . "@src64/io.l")
+wr (5243 . "@src64/io.l")
xchg (1663 . "@src64/sym.l")
xor (1690 . "@src64/flow.l")
x| (2887 . "@src64/big.l")
diff --git a/src64/io.l b/src64/io.l
@@ -1,4 +1,4 @@
-# 07jun12abu
+# 11jul12abu
# (c) Software Lab. Alexander Burger
# Close file descriptor
@@ -4155,10 +4155,7 @@
end
ld (L I) E # Save result
loop
- null ((InFile) VI) # File?
- if nz # Yes
- ld (EnvIntern) (L III) # Restore namespace
- end
+ ld (EnvIntern) (L III) # Restore namespace
call popInFiles
ld E Nil # Close transient scope
call doHide
diff --git a/src64/tags b/src64/tags
@@ -622,7 +622,7 @@ doChop sym.l 1219
doCirc subr.l 816
doCircQ subr.l 2402
doClip subr.l 1799
-doClose io.l 4381
+doClose io.l 4378
doCmd main.l 2967
doCnt apply.l 1413
doCo flow.l 2537
@@ -634,7 +634,7 @@ doCond flow.l 1908
doConnect net.l 224
doCons subr.l 747
doCopy subr.l 1225
-doCtl io.l 4254
+doCtl io.l 4251
doCtty main.l 2765
doCut sym.l 1922
doDate main.l 2479
@@ -652,7 +652,7 @@ doDiv big.l 2513
doDm flow.l 545
doDo flow.l 2130
doE flow.l 2911
-doEcho io.l 4412
+doEcho io.l 4409
doEnv main.l 597
doEof io.l 3524
doEol io.l 3515
@@ -660,10 +660,10 @@ doEq subr.l 2059
doEq0 subr.l 2173
doEqT subr.l 2181
doEqual subr.l 2115
-doErr io.l 4234
+doErr io.l 4231
doErrno main.l 1368
doEval flow.l 175
-doExt io.l 5146
+doExt io.l 5143
doExtQ sym.l 1157
doExtern sym.l 1023
doExtra flow.l 1258
@@ -678,7 +678,7 @@ doFind apply.l 1322
doFish apply.l 1613
doFlgQ subr.l 2445
doFlip subr.l 1699
-doFlush io.l 5121
+doFlush io.l 5118
doFold sym.l 3512
doFor flow.l 2219
doFork flow.l 3253
@@ -707,7 +707,7 @@ doIdx sym.l 2162
doIf flow.l 1794
doIf2 flow.l 1813
doIfn flow.l 1854
-doIn io.l 4194
+doIn io.l 4191
doInc big.l 2256
doIndex subr.l 2637
doInfo main.l 2802
@@ -732,7 +732,7 @@ doLisp main.l 2037
doList subr.l 887
doListen net.l 157
doLit flow.l 150
-doLoad io.l 4171
+doLoad io.l 4168
doLock db.l 1185
doLoop flow.l 2162
doLowQ sym.l 3378
@@ -786,11 +786,11 @@ doOffset subr.l 2677
doOn sym.l 1708
doOnOff sym.l 1738
doOne sym.l 1771
-doOpen io.l 4338
+doOpen io.l 4335
doOpid flow.l 3214
doOpt main.l 3088
doOr flow.l 1629
-doOut io.l 4214
+doOut io.l 4211
doPack sym.l 1270
doPair subr.l 2394
doPass apply.l 754
@@ -798,18 +798,18 @@ doPatQ sym.l 736
doPath io.l 1244
doPeek io.l 3431
doPick apply.l 1369
-doPipe io.l 4275
+doPipe io.l 4272
doPoll io.l 3320
doPool db.l 651
doPop sym.l 1898
doPort net.l 5
-doPr io.l 5229
+doPr io.l 5226
doPreQ sym.l 1536
-doPrin io.l 5045
-doPrinl io.l 5059
-doPrint io.l 5085
-doPrintln io.l 5116
-doPrintsp io.l 5101
+doPrin io.l 5042
+doPrinl io.l 5056
+doPrint io.l 5082
+doPrintln io.l 5113
+doPrintsp io.l 5098
doPrior subr.l 2713
doProg flow.l 1749
doProg1 flow.l 1757
@@ -830,13 +830,13 @@ doRand big.l 3003
doRange subr.l 997
doRank subr.l 3036
doRaw main.l 449
-doRd io.l 5163
+doRd io.l 5160
doRead io.l 2656
doRem big.l 2572
doReplace subr.l 1499
doRest main.l 2394
doReverse subr.l 1678
-doRewind io.l 5129
+doRewind io.l 5126
doRollback db.l 1898
doRot subr.l 848
doRun flow.l 306
@@ -855,7 +855,7 @@ doSize subr.l 2809
doSkip io.l 3501
doSort subr.l 3965
doSpQ sym.l 727
-doSpace io.l 5063
+doSpace io.l 5060
doSplit subr.l 1592
doStack main.l 546
doState flow.l 1998
@@ -902,7 +902,7 @@ doWhen flow.l 1873
doWhile flow.l 2050
doWipe sym.l 3253
doWith flow.l 1321
-doWr io.l 5246
+doWr io.l 5243
doXchg sym.l 1663
doXor flow.l 1690
doYield flow.l 2706
@@ -1038,7 +1038,7 @@ needVarAX err.l 346
needVarEX err.l 356
newBlock_X db.l 449
newIdEX_X db.l 492
-newline io.l 4668
+newline io.l 4665
noFdErrX err.l 529
nonblockingA_A io.l 51
numErrAX err.l 412
@@ -1046,13 +1046,13 @@ numErrEX err.l 414
oct3C_CA db.l 180
openErrEX err.l 500
oruAE_A big.l 394
-outAoA io.l 4717
-outNameE io.l 4741
-outNumE io.l 4677
-outOctA io.l 4704
-outStringC io.l 4731
-outStringS io.l 4729
-outWordA io.l 4684
+outAoA io.l 4714
+outNameE io.l 4738
+outNumE io.l 4674
+outOctA io.l 4701
+outStringC io.l 4728
+outStringS io.l 4726
+outWordA io.l 4681
packAoACX_CX db.l 108
packECX_CX sym.l 1303
packExtNmX_E db.l 87
@@ -1070,14 +1070,14 @@ popOutFiles io.l 1914
prByteCEXY io.l 680
prCntCE io.l 703
prE io.l 728
-prExtNmX io.l 4696
-prNameX io.l 4749
+prExtNmX io.l 4693
+prNameX io.l 4746
prTellEZ io.l 722
preCEXY_F sym.l 1470
-prinE io.l 4990
-prinE_E io.l 4981
-printE io.l 4768
-printE_E io.l 4759
+prinE io.l 4987
+prinE_E io.l 4978
+printE io.l 4765
+printE_E io.l 4756
propEC_E sym.l 2745
protErrEX err.l 386
pushCtlFilesY io.l 1858
@@ -1087,7 +1087,7 @@ pushOutFilesY io.l 1842
putACE sym.l 2491
putBlockBZ db.l 612
putSrcEC_E flow.l 25
-putStdoutB io.l 4625
+putStdoutB io.l 4622
putStringB main.l 2291
putTellBZ io.l 996
putUdpBZ net.l 377
@@ -1150,7 +1150,7 @@ sizeCE_C subr.l 2929
skipC_A io.l 2007
slowNbC_FA io.l 207
slowZ_F io.l 185
-space io.l 4672
+space io.l 4669
stdinByte_A io.l 425
stkErr err.l 395
stkErrE err.l 397
