picolisp

commit f3a1336f312fdcbe1a9b2e32c7f032c737e07257
parent f9517812aa21203e366f8bb32dd6657ba99a66b3
Author: Alexander Burger <abu@software-lab.de>
Date:   Thu, 17 Feb 2011 08:47:38 +0100

Minor cosmetics
Diffstat:
M
lib/tags
 | 
24
++++++++++++------------
M
src64/flow.l
 | 
11
+++++------

2 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/lib/tags b/lib/tags
@@ -1,5 +1,5 @@
-! (2856 . "@src64/flow.l")
-$ (2958 . "@src64/flow.l")
+! (2855 . "@src64/flow.l")
+$ (2957 . "@src64/flow.l")
 % (2570 . "@src64/big.l")
 & (2805 . "@src64/big.l")
 * (2389 . "@src64/big.l")
@@ -46,7 +46,7 @@ bool (1721 . "@src64/flow.l")
 box (822 . "@src64/flow.l")
 box? (999 . "@src64/sym.l")
 by (1669 . "@src64/apply.l")
-bye (3437 . "@src64/flow.l")
+bye (3436 . "@src64/flow.l")
 caaaar (271 . "@src64/subr.l")
 caaadr (288 . "@src64/subr.l")
 caaar (99 . "@src64/subr.l")
@@ -61,7 +61,7 @@ caddar (409 . "@src64/subr.l")
 cadddr (435 . "@src64/subr.l")
 caddr (156 . "@src64/subr.l")
 cadr (45 . "@src64/subr.l")
-call (3089 . "@src64/flow.l")
+call (3088 . "@src64/flow.l")
 car (5 . "@src64/subr.l")
 case (1962 . "@src64/flow.l")
 catch (2462 . "@src64/flow.l")
@@ -114,7 +114,7 @@ diff (2585 . "@src64/subr.l")
 dir (2798 . "@src64/main.l")
 dm (543 . "@src64/flow.l")
 do (2136 . "@src64/flow.l")
-e (2919 . "@src64/flow.l")
+e (2918 . "@src64/flow.l")
 echo (4298 . "@src64/io.l")
 env (615 . "@src64/main.l")
 eof (3438 . "@src64/io.l")
@@ -139,7 +139,7 @@ flip (1695 . "@src64/subr.l")
 flush (5003 . "@src64/io.l")
 fold (3343 . "@src64/sym.l")
 for (2225 . "@src64/flow.l")
-fork (3263 . "@src64/flow.l")
+fork (3262 . "@src64/flow.l")
 format (2089 . "@src64/big.l")
 free (2047 . "@src64/db.l")
 from (3457 . "@src64/io.l")
@@ -166,12 +166,12 @@ inc (2256 . "@src64/big.l")
 index (2633 . "@src64/subr.l")
 info (2702 . "@src64/main.l")
 intern (875 . "@src64/sym.l")
-ipid (3208 . "@src64/flow.l")
+ipid (3207 . "@src64/flow.l")
 isa (959 . "@src64/flow.l")
 job (1426 . "@src64/flow.l")
 journal (970 . "@src64/db.l")
 key (3290 . "@src64/io.l")
-kill (3240 . "@src64/flow.l")
+kill (3239 . "@src64/flow.l")
 last (2040 . "@src64/subr.l")
 le0 (2691 . "@src64/big.l")
 length (2737 . "@src64/subr.l")
@@ -236,7 +236,7 @@ on (1583 . "@src64/sym.l")
 onOff (1613 . "@src64/sym.l")
 one (1646 . "@src64/sym.l")
 open (4229 . "@src64/io.l")
-opid (3224 . "@src64/flow.l")
+opid (3223 . "@src64/flow.l")
 opt (2988 . "@src64/main.l")
 or (1637 . "@src64/flow.l")
 out (4123 . "@src64/io.l")
@@ -314,13 +314,13 @@ super (1218 . "@src64/flow.l")
 sym (3919 . "@src64/io.l")
 sym? (2430 . "@src64/subr.l")
 sync (3102 . "@src64/io.l")
-sys (3060 . "@src64/flow.l")
+sys (3059 . "@src64/flow.l")
 t (1748 . "@src64/flow.l")
 tail (1907 . "@src64/subr.l")
 tell (3174 . "@src64/io.l")
 text (1272 . "@src64/sym.l")
 throw (2488 . "@src64/flow.l")
-tick (3176 . "@src64/flow.l")
+tick (3175 . "@src64/flow.l")
 till (3524 . "@src64/io.l")
 time (2512 . "@src64/main.l")
 touch (1049 . "@src64/sym.l")
@@ -347,7 +347,7 @@ wr (5128 . "@src64/io.l")
 xchg (1538 . "@src64/sym.l")
 xor (1698 . "@src64/flow.l")
 x| (2885 . "@src64/big.l")
-yield (2714 . "@src64/flow.l")
+yield (2713 . "@src64/flow.l")
 yoke (1196 . "@src64/subr.l")
 zap (1063 . "@src64/sym.l")
 zero (1631 . "@src64/sym.l")
diff --git a/src64/flow.l b/src64/flow.l
@@ -1,4 +1,4 @@
-# 16feb11abu
+# 17feb11abu
 # (c) Software Lab. Alexander Burger
 
 (code 'redefMsgEC)
@@ -2637,9 +2637,9 @@
       if z  # Yes
          lea A ((Stack0) 4096)  # Set stack limit
          sub A (StkSize)
-         ld (StkLimit) A
          cmp S A  # Check it
          jlt stkErr
+         ld (StkLimit) A
       end
       do
          sub Y (StkSize)  # Next segment
@@ -2665,13 +2665,12 @@
       sub S "EnvMid-EnvCo"  # Space for 'env'
       ld X (X CDR)  # Run 'prg'
       prog X
-      xor (Stacks) Z  # Not yielded: Mark segment as unused
-      ld S (EnvCo7)  # Restore stack pointer
+      ld S (EnvCo7)  # Not yielded: Restore stack pointer
       load (EnvCo) (EnvMid) (S III)  # Restore environment
       pop (EnvCo7)  # Restore coroutine link
       pop (StkLimit)  # 'lim'
-      null (Stacks)  # Stopped last coroutine?
-      if z  # Yes
+      xor (Stacks) Z  # Mark segment as unused
+      if z  # Last coroutine?
          ld (StkLimit) 0  # Yes: Clear stack limit
       end
       add S (pack I "+(EnvMid-EnvCo)")  # Clean up