picolisp

commit 841df294161b013ff3b5adecb59bc160dc1f91c9
parent c51f8fd7706e042829699a22f51e61af46ea7e61
Author: Alexander Burger <abu@software-lab.de>
Date:   Mon, 17 Oct 2011 18:47:09 +0200

'*Prompt' should hold a 'prg' body
Diffstat:
M
doc/refP.html
 | 
9
+++++----
M
ersatz/picolisp.jar
 | 
0

M
ersatz/sys.src
 | 
4
++--
M
lib/debug.l
 | 
6
+++---
M
src64/io.l
 | 
4
++--

5 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/doc/refP.html b/doc/refP.html
@@ -38,12 +38,13 @@ NIL 5286
 </code></pre>
 
 <dt><a name="*Prompt"><code>*Prompt</code></a>
-<dd>A global variable holding a (possibly empty) expression, to be evaluated and
-<code><a href="refP.html#prin">prin</a></code>ted every time before a prompt is
-output to the console in the "read-eval-print-loop" (REPL).
+<dd>Global variable holding a (possibly empty) <code>prg</code> body, which is
+executed - and the result <code><a href="refP.html#prin">prin</a></code>ted -
+every time before a prompt is output to the console in the
+"read-eval-print-loop" (REPL).
 
 <pre><code>
-: (setq *Prompt '(pack "[" (stamp) "]"))
+: (setq *Prompt '(list (pack "[" (stamp) "]")))
 -> (pack "[" (stamp) "]")
 [2011-10-11 16:50:05]: (+ 1 2 3)
 -> 6
diff --git a/ersatz/picolisp.jar b/ersatz/picolisp.jar
Binary files differ.
diff --git a/ersatz/sys.src b/ersatz/sys.src
@@ -1,4 +1,4 @@
-// 11oct11abu
+// 17oct11abu
 // (c) Software Lab. Alexander Burger
 
 import java.util.*;
@@ -468,7 +468,7 @@ public class PicoLisp {
             y = InFile.read('\0');
          else {
             if (pr != '\0'  &&  InFile.Chr == 0) {
-               OutFile.Wr.print(Prompt.Car.eval().name() + pr);
+               OutFile.Wr.print(Prompt.Car.run().name() + pr);
                OutFile.space();
                OutFile.Wr.flush();
             }
diff --git a/lib/debug.l b/lib/debug.l
@@ -1,10 +1,10 @@
-# 11oct11abu
+# 17oct11abu
 # (c) Software Lab. Alexander Burger
 
 # Prompt
 (when (== 64 64)
-   (setq *Prompt
-      '(unless (== (symbols) 'pico) (symbols)) ) )
+   (de *Prompt
+      (unless (== (symbols) 'pico) (symbols)) ) )
 
 # Browsing
 (de doc (Sym Browser)
diff --git a/src64/io.l b/src64/io.l
@@ -1,4 +1,4 @@
-# 11oct11abu
+# 17oct11abu
 # (c) Software Lab. Alexander Burger
 
 # Close file descriptor
@@ -4111,7 +4111,7 @@
             null (Chr)
             if z
                ld E (Prompt)  # Output prompt prefix
-               eval
+               call runE_E  # Execute
                call prinE_E
                ld A (L -I)  # Output prompt
                call (PutB)