commit c1475f5e66662e851319bc87b97ef9d191be4ae1
parent 91428217a42fc990b0a26ae3ac568f72ee8c2825
Author: Alexander Burger <abu@software-lab.de>
Date: Mon, 4 Apr 2011 19:38:41 +0200
Wrong *Dbg information (file + line number) in 'dm'
Diffstat:
M | lib/tags | | | 118 | ++++++++++++++++++++++++++++++++++++++++---------------------------------------- |
M | src64/flow.l | | | 13 | ++++++------- |
2 files changed, 65 insertions(+), 66 deletions(-)
diff --git a/lib/tags b/lib/tags
@@ -1,5 +1,5 @@
-! (2857 . "@src64/flow.l")
-$ (2959 . "@src64/flow.l")
+! (2856 . "@src64/flow.l")
+$ (2958 . "@src64/flow.l")
% (2570 . "@src64/big.l")
& (2805 . "@src64/big.l")
* (2389 . "@src64/big.l")
@@ -28,7 +28,7 @@ accept (139 . "@src64/net.l")
adr (603 . "@src64/main.l")
alarm (480 . "@src64/main.l")
all (770 . "@src64/sym.l")
-and (1621 . "@src64/flow.l")
+and (1620 . "@src64/flow.l")
any (3933 . "@src64/io.l")
append (1338 . "@src64/subr.l")
apply (713 . "@src64/apply.l")
@@ -38,15 +38,15 @@ argv (2891 . "@src64/main.l")
as (146 . "@src64/flow.l")
asoq (3001 . "@src64/subr.l")
assoc (2966 . "@src64/subr.l")
-at (2106 . "@src64/flow.l")
+at (2105 . "@src64/flow.l")
atom (2381 . "@src64/subr.l")
-bind (1359 . "@src64/flow.l")
+bind (1358 . "@src64/flow.l")
bit? (2746 . "@src64/big.l")
-bool (1721 . "@src64/flow.l")
-box (822 . "@src64/flow.l")
+bool (1720 . "@src64/flow.l")
+box (821 . "@src64/flow.l")
box? (997 . "@src64/sym.l")
by (1669 . "@src64/apply.l")
-bye (3438 . "@src64/flow.l")
+bye (3437 . "@src64/flow.l")
caaaar (271 . "@src64/subr.l")
caaadr (288 . "@src64/subr.l")
caaar (99 . "@src64/subr.l")
@@ -61,10 +61,10 @@ caddar (409 . "@src64/subr.l")
cadddr (435 . "@src64/subr.l")
caddr (156 . "@src64/subr.l")
cadr (45 . "@src64/subr.l")
-call (3090 . "@src64/flow.l")
+call (3089 . "@src64/flow.l")
car (5 . "@src64/subr.l")
-case (1962 . "@src64/flow.l")
-catch (2464 . "@src64/flow.l")
+case (1961 . "@src64/flow.l")
+catch (2463 . "@src64/flow.l")
cd (2646 . "@src64/main.l")
cdaaar (464 . "@src64/subr.l")
cdaadr (487 . "@src64/subr.l")
@@ -90,11 +90,11 @@ clip (1795 . "@src64/subr.l")
close (4339 . "@src64/io.l")
cmd (2873 . "@src64/main.l")
cnt (1413 . "@src64/apply.l")
-co (2546 . "@src64/flow.l")
+co (2545 . "@src64/flow.l")
commit (1496 . "@src64/db.l")
con (725 . "@src64/subr.l")
conc (781 . "@src64/subr.l")
-cond (1916 . "@src64/flow.l")
+cond (1915 . "@src64/flow.l")
connect (201 . "@src64/net.l")
cons (747 . "@src64/subr.l")
copy (1225 . "@src64/subr.l")
@@ -113,8 +113,8 @@ delq (1452 . "@src64/subr.l")
diff (2585 . "@src64/subr.l")
dir (2804 . "@src64/main.l")
dm (543 . "@src64/flow.l")
-do (2138 . "@src64/flow.l")
-e (2920 . "@src64/flow.l")
+do (2137 . "@src64/flow.l")
+e (2919 . "@src64/flow.l")
echo (4370 . "@src64/io.l")
env (615 . "@src64/main.l")
eof (3492 . "@src64/io.l")
@@ -125,22 +125,22 @@ eval (182 . "@src64/flow.l")
ext (5100 . "@src64/io.l")
ext? (1032 . "@src64/sym.l")
extern (898 . "@src64/sym.l")
-extra (1263 . "@src64/flow.l")
+extra (1262 . "@src64/flow.l")
extract (1218 . "@src64/apply.l")
fifo (1961 . "@src64/sym.l")
file (2751 . "@src64/main.l")
fill (3236 . "@src64/subr.l")
filter (1161 . "@src64/apply.l")
fin (2029 . "@src64/subr.l")
-finally (2522 . "@src64/flow.l")
+finally (2521 . "@src64/flow.l")
find (1322 . "@src64/apply.l")
fish (1613 . "@src64/apply.l")
flg? (2441 . "@src64/subr.l")
flip (1695 . "@src64/subr.l")
flush (5075 . "@src64/io.l")
fold (3341 . "@src64/sym.l")
-for (2227 . "@src64/flow.l")
-fork (3264 . "@src64/flow.l")
+for (2226 . "@src64/flow.l")
+fork (3263 . "@src64/flow.l")
format (2089 . "@src64/big.l")
free (2047 . "@src64/db.l")
from (3511 . "@src64/io.l")
@@ -159,25 +159,25 @@ hear (3196 . "@src64/io.l")
host (184 . "@src64/net.l")
id (1027 . "@src64/db.l")
idx (2035 . "@src64/sym.l")
-if (1802 . "@src64/flow.l")
-if2 (1821 . "@src64/flow.l")
-ifn (1862 . "@src64/flow.l")
+if (1801 . "@src64/flow.l")
+if2 (1820 . "@src64/flow.l")
+ifn (1861 . "@src64/flow.l")
in (4157 . "@src64/io.l")
inc (2256 . "@src64/big.l")
index (2633 . "@src64/subr.l")
info (2708 . "@src64/main.l")
intern (873 . "@src64/sym.l")
-ipid (3209 . "@src64/flow.l")
-isa (959 . "@src64/flow.l")
-job (1426 . "@src64/flow.l")
+ipid (3208 . "@src64/flow.l")
+isa (958 . "@src64/flow.l")
+job (1425 . "@src64/flow.l")
journal (970 . "@src64/db.l")
key (3344 . "@src64/io.l")
-kill (3241 . "@src64/flow.l")
+kill (3240 . "@src64/flow.l")
last (2040 . "@src64/subr.l")
le0 (2691 . "@src64/big.l")
length (2737 . "@src64/subr.l")
-let (1476 . "@src64/flow.l")
-let? (1537 . "@src64/flow.l")
+let (1475 . "@src64/flow.l")
+let? (1536 . "@src64/flow.l")
lieu (1156 . "@src64/db.l")
line (3667 . "@src64/io.l")
lines (3820 . "@src64/io.l")
@@ -188,7 +188,7 @@ listen (151 . "@src64/net.l")
lit (157 . "@src64/flow.l")
load (4134 . "@src64/io.l")
lock (1184 . "@src64/db.l")
-loop (2170 . "@src64/flow.l")
+loop (2169 . "@src64/flow.l")
low? (3213 . "@src64/sym.l")
lowc (3243 . "@src64/sym.l")
lst? (2411 . "@src64/subr.l")
@@ -210,8 +210,8 @@ maxi (1511 . "@src64/apply.l")
member (2451 . "@src64/subr.l")
memq (2473 . "@src64/subr.l")
meta (3133 . "@src64/sym.l")
-meth (1087 . "@src64/flow.l")
-method (1051 . "@src64/flow.l")
+meth (1086 . "@src64/flow.l")
+method (1050 . "@src64/flow.l")
min (2352 . "@src64/subr.l")
mini (1562 . "@src64/apply.l")
mix (1260 . "@src64/subr.l")
@@ -220,15 +220,15 @@ n0 (2185 . "@src64/subr.l")
n== (2083 . "@src64/subr.l")
nT (2194 . "@src64/subr.l")
name (497 . "@src64/sym.l")
-nand (1656 . "@src64/flow.l")
+nand (1655 . "@src64/flow.l")
native (1389 . "@src64/main.l")
need (919 . "@src64/subr.l")
-new (833 . "@src64/flow.l")
+new (832 . "@src64/flow.l")
next (2253 . "@src64/main.l")
-nil (1739 . "@src64/flow.l")
-nond (1939 . "@src64/flow.l")
-nor (1677 . "@src64/flow.l")
-not (1729 . "@src64/flow.l")
+nil (1738 . "@src64/flow.l")
+nond (1938 . "@src64/flow.l")
+nor (1676 . "@src64/flow.l")
+not (1728 . "@src64/flow.l")
nth (685 . "@src64/subr.l")
num? (2422 . "@src64/subr.l")
off (1596 . "@src64/sym.l")
@@ -237,9 +237,9 @@ on (1581 . "@src64/sym.l")
onOff (1611 . "@src64/sym.l")
one (1644 . "@src64/sym.l")
open (4301 . "@src64/io.l")
-opid (3225 . "@src64/flow.l")
+opid (3224 . "@src64/flow.l")
opt (2994 . "@src64/main.l")
-or (1637 . "@src64/flow.l")
+or (1636 . "@src64/flow.l")
out (4177 . "@src64/io.l")
pack (1142 . "@src64/sym.l")
pair (2390 . "@src64/subr.l")
@@ -261,9 +261,9 @@ print (5039 . "@src64/io.l")
println (5070 . "@src64/io.l")
printsp (5055 . "@src64/io.l")
prior (2709 . "@src64/subr.l")
-prog (1757 . "@src64/flow.l")
-prog1 (1765 . "@src64/flow.l")
-prog2 (1782 . "@src64/flow.l")
+prog (1756 . "@src64/flow.l")
+prog1 (1764 . "@src64/flow.l")
+prog2 (1781 . "@src64/flow.l")
prop (2779 . "@src64/sym.l")
protect (525 . "@src64/main.l")
prove (3523 . "@src64/subr.l")
@@ -291,7 +291,7 @@ run (313 . "@src64/flow.l")
sect (2537 . "@src64/subr.l")
seed (2958 . "@src64/big.l")
seek (1275 . "@src64/apply.l")
-send (1131 . "@src64/flow.l")
+send (1130 . "@src64/flow.l")
seq (1083 . "@src64/db.l")
set (1480 . "@src64/sym.l")
setq (1513 . "@src64/sym.l")
@@ -303,51 +303,51 @@ sp? (709 . "@src64/sym.l")
space (5017 . "@src64/io.l")
split (1588 . "@src64/subr.l")
stack (564 . "@src64/main.l")
-state (2006 . "@src64/flow.l")
+state (2005 . "@src64/flow.l")
stem (1985 . "@src64/subr.l")
str (3987 . "@src64/io.l")
str? (1011 . "@src64/sym.l")
strip (1572 . "@src64/subr.l")
sub? (1442 . "@src64/sym.l")
sum (1460 . "@src64/apply.l")
-super (1218 . "@src64/flow.l")
+super (1217 . "@src64/flow.l")
sym (3973 . "@src64/io.l")
sym? (2430 . "@src64/subr.l")
sync (3156 . "@src64/io.l")
-sys (3061 . "@src64/flow.l")
-t (1748 . "@src64/flow.l")
+sys (3060 . "@src64/flow.l")
+t (1747 . "@src64/flow.l")
tail (1907 . "@src64/subr.l")
tell (3228 . "@src64/io.l")
text (1270 . "@src64/sym.l")
-throw (2490 . "@src64/flow.l")
-tick (3177 . "@src64/flow.l")
+throw (2489 . "@src64/flow.l")
+tick (3176 . "@src64/flow.l")
till (3578 . "@src64/io.l")
time (2518 . "@src64/main.l")
touch (1047 . "@src64/sym.l")
trim (1755 . "@src64/subr.l")
-try (1172 . "@src64/flow.l")
-type (912 . "@src64/flow.l")
+try (1171 . "@src64/flow.l")
+type (911 . "@src64/flow.l")
udp (268 . "@src64/net.l")
unify (3931 . "@src64/subr.l")
-unless (1898 . "@src64/flow.l")
-until (2082 . "@src64/flow.l")
+unless (1897 . "@src64/flow.l")
+until (2081 . "@src64/flow.l")
up (706 . "@src64/main.l")
upp? (3228 . "@src64/sym.l")
uppc (3292 . "@src64/sym.l")
-use (1570 . "@src64/flow.l")
+use (1569 . "@src64/flow.l")
usec (2623 . "@src64/main.l")
val (1461 . "@src64/sym.l")
version (3008 . "@src64/main.l")
wait (3118 . "@src64/io.l")
-when (1881 . "@src64/flow.l")
-while (2058 . "@src64/flow.l")
+when (1880 . "@src64/flow.l")
+while (2057 . "@src64/flow.l")
wipe (3088 . "@src64/sym.l")
-with (1327 . "@src64/flow.l")
+with (1326 . "@src64/flow.l")
wr (5200 . "@src64/io.l")
xchg (1536 . "@src64/sym.l")
-xor (1698 . "@src64/flow.l")
+xor (1697 . "@src64/flow.l")
x| (2885 . "@src64/big.l")
-yield (2715 . "@src64/flow.l")
+yield (2714 . "@src64/flow.l")
yoke (1196 . "@src64/subr.l")
zap (1061 . "@src64/sym.l")
zero (1629 . "@src64/sym.l")
diff --git a/src64/flow.l b/src64/flow.l
@@ -1,4 +1,4 @@
-# 26feb11abu
+# 04apr11abu
# (c) Software Lab. Alexander Burger
(code 'redefMsgEC)
@@ -133,7 +133,7 @@
end
end
ld (E) C # Set definition
- ld C 0 # No class
+ ld C 0 # No key
call putSrcEC_E # Put source information
ret
@@ -490,7 +490,7 @@
end
ld E (L II) # Get symbol
ld (E) (L I) # Set new value
- ld C 0 # No class
+ ld C 0 # No key
call putSrcEC_E # Put source information
else
ld E (Y)
@@ -612,10 +612,7 @@
end
pop E
ld ((X) CDR) (Y CDR) # Set new body
- call putSrcEC_E # Put source information
- pop Y
- pop X
- ret
+ jmp 90
end
ld X (X CDR)
loop
@@ -634,7 +631,9 @@
ld (A CDR) (C)
end
ld (C) A
+90 xchg C E # 'msg' <-> 'cls'
call putSrcEC_E # Put source information
+ ld E C # Return 'msg'
pop Y
pop X
ret