From af39b37dd158bc5f92546c212413c2f35d1d7074 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Fri, 24 Apr 2020 12:10:07 -0400
Subject: [PATCH] Replace the "> " prompt with the more traditional "ok" one

This is more than cosmetic, it's also highly usable. The presence
or absence of the "ok" message allows us to know whether the command
aborted. Previously, the "> " prompt appeared when the system expected
a prompt in the INTERPRET context, whether the previous command aborted
or not.

Also, this allows us to get rid of that ugly FLAGS global variable.
---
 blk/061             |   2 +-
 blk/081             |   6 +++---
 blk/082             |  10 +++++-----
 blk/083             |  12 ++++++------
 blk/084             |  14 +++++++-------
 blk/393             |   6 +-----
 blk/398             |   3 ++-
 blk/403             |   9 ++-------
 blk/405             |   4 +++-
 emul/forth/run.fs   |   1 +
 emul/forth/z80c.bin | Bin 2187 -> 2212 bytes
 forth/core.fs       |   2 +-
 forth/print.fs      |   1 +
 forth/readln.fs     |  12 ++++++------
 14 files changed, 39 insertions(+), 43 deletions(-)

diff --git a/blk/061 b/blk/061
index 3968fee..01b0c4e 100644
--- a/blk/061
+++ b/blk/061
@@ -1,6 +1,6 @@
-(cont.)
 ." xxx" --     *I* Compiles string literal xxx followed by a
                call to (print).
+C<?     -- f   Returns whether there's a char waiting in buf.
 C<      -- c   Read one char from buffered input.
 DUMP    n a -- Prints n bytes at addr a in a hexdump format.
                Prints in chunks of 8 bytes. Doesn't do partial
diff --git a/blk/081 b/blk/081
index 13fee0c..8d000fa 100644
--- a/blk/081
+++ b/blk/081
@@ -2,10 +2,10 @@
 RAMSTART  INITIAL_SP    +53       readln's variables
 +02       CURRENT       +55       adev's variables
 +04       HERE          +57       blk's variables
-+06       FUTURE USES   +59       z80a's variables
-+08       FLAGS         +5b       FUTURE USES
++06       C<?*          +59       z80a's variables
++08       FUTURE USES   +5b       FUTURE USES
 +0a       PARSEPTR      +70       DRIVERS
-+0c       CINPTR        +80       RAMEND
++0c       C<*           +80       RAMEND
 +0e       WORDBUF
 +2e       BOOT C< PTR
 +4e       INTJUMP
diff --git a/blk/082 b/blk/082
index be63d77..f55ef93 100644
--- a/blk/082
+++ b/blk/082
@@ -1,4 +1,4 @@
-(cont.) INITIAL_SP holds the initial Stack Pointer value so
+INITIAL_SP holds the initial Stack Pointer value so
 that we know where to reset it on ABORT
 
 CURRENT points to the last dict entry.
@@ -7,10 +7,10 @@ HERE points to current write offset.
 
 IP is the Interpreter Pointer
 
-FLAGS holds global flags. Only used for prompt output control
-for now.
-
 PARSEPTR holds routine address called on (parse)
 
-CINPTR holds routine address called on C<
+C<* holds routine address called on C<
+
+
+
                                                         (cont.)
diff --git a/blk/083 b/blk/083
index ec10721..881a691 100644
--- a/blk/083
+++ b/blk/083
@@ -1,4 +1,7 @@
-(cont.) WORDBUF is the buffer used by WORD
+C<?* is a pointer to a word being called by C<?. If 0 or 1,
+will return that value as-is.
+
+WORDBUF is the buffer used by WORD
 
 BOOT C< PTR is used when Forth boots from in-memory
 source. See "Initialization sequence" below.
@@ -9,8 +12,5 @@ jump to this address. If you use one of those slots for an
 interrupt, write a jump to the appropriate offset in that RAM
 location.
 
-CURRENTPTR points to current CURRENT. The Forth CURRENT word
-doesn't return RAM+2 directly, but rather the value at this
-address. Most of the time, it points to RAM+2, but sometimes,
-when maintaining alternative dicts (during cross compilation
-for example), it can point elsewhere.                   (cont.)
+
+                                                        (cont.)
diff --git a/blk/084 b/blk/084
index c645d05..19f6d46 100644
--- a/blk/084
+++ b/blk/084
@@ -1,4 +1,10 @@
-(cont.) FUTURE USES section is unused for now.          
+CURRENTPTR points to current CURRENT. The Forth CURRENT word
+doesn't return RAM+2 directly, but rather the value at this
+address. Most of the time, it points to RAM+2, but sometimes,
+when maintaining alternative dicts (during cross compilation
+for example), it can point elsewhere.
+
+FUTURE USES section is unused for now.          
 
 DRIVERS section is reserved for recipe-specific
 drivers. Here is a list of known usages:
@@ -8,9 +14,3 @@ drivers. Here is a list of known usages:
 
 
 
-
-
-
-
-
-
diff --git a/blk/393 b/blk/393
index 47e5c9c..0e211ef 100644
--- a/blk/393
+++ b/blk/393
@@ -1,5 +1,4 @@
 : RAM+ [ RAMSTART LITN ] + ;
-: FLAGS 0x08 RAM+ ;
 : (parse*) 0x0a RAM+ ;
 : HERE 0x04 RAM+ ;
 : CURRENT* 0x51 RAM+ ;
@@ -8,8 +7,5 @@
 ( w -- a f )
 : (find) CURRENT @ SWAP _find ;
 
-: QUIT
-    0 FLAGS ! (resRS)
-    LIT< INTERPRET (find) DROP EXECUTE
-;
+: QUIT (resRS) LIT< INTERPRET (find) DROP EXECUTE ;
 394 407 LOADR
diff --git a/blk/398 b/blk/398
index 2e3f926..d4f296c 100644
--- a/blk/398
+++ b/blk/398
@@ -2,7 +2,8 @@
   for an abort message )
 : (parse) (parsed) NOT IF ABORT THEN ;
 
-: C< 0x0c RAM+ @ EXECUTE ( 0c == CINPTR ) ;
+: C<? 0x06 RAM+ @ DUP 2 > IF EXECUTE THEN ( 06 == C<?* ) ;
+: C< 0x0c RAM+ @ EXECUTE ( 0c == C<* ) ;
 
 : , HERE @ ! HERE @ 2+ HERE ! ;
 
diff --git a/blk/403 b/blk/403
index 22e5558..bffaf5c 100644
--- a/blk/403
+++ b/blk/403
@@ -2,13 +2,8 @@
     BEGIN
     WORD
     (find)
-    IF
-        1 FLAGS !
-        EXECUTE
-        0 FLAGS !
-    ELSE
-        (parse*) @ EXECUTE
-    THEN
+    NOT IF (parse*) @ THEN EXECUTE
+    C<? NOT IF LIT< (ok) (find) IF EXECUTE THEN THEN
     AGAIN
 ;
 
diff --git a/blk/405 b/blk/405
index 58b9632..a577231 100644
--- a/blk/405
+++ b/blk/405
@@ -3,8 +3,10 @@
     LIT< (parse) (find) DROP (parse*) !
     ( 2e == SYSTEM SCRATCHPAD )
     CURRENT @ 0x2e RAM+ !
-    ( 0c == CINPTR )
+    ( 0c == C<* )
     LIT< (boot<) (find) DROP 0x0c RAM+ !
+    ( boot< always has a char waiting. 06 == C<?* )
+    1 0x06 RAM+ !
     LIT< INIT (find)
     IF EXECUTE
     ELSE DROP INTERPRET THEN
diff --git a/emul/forth/run.fs b/emul/forth/run.fs
index 8666b17..82ff697 100644
--- a/emul/forth/run.fs
+++ b/emul/forth/run.fs
@@ -19,5 +19,6 @@
     ['] EFS! BLK!* !
     RDLN$
     LIT< _sys [entry]
+    ." Collapse OS" CRLF
     INTERPRET
 ;
diff --git a/emul/forth/z80c.bin b/emul/forth/z80c.bin
index b09fe80800b1f0904dba6abc97e02b80391ea659..954c7841d164ba7401bdb6ed12877d50f028d4c2 100644
GIT binary patch
delta 735
zcmYLHziSg=7=FL+-usd^=F$kdq}4MxBv5S;MbXpJi=m|2sL7eZ<)~>JL~M@O#VjXX
z8W6hNWHv>zWa%P@lS>xe0ujN@&B6bm$oamPic2ov^ZtCE=Y5m?kUjc@!B;H#zc8cO
zP}q64yH!ksGLGpTig~o*(c_Af0W`*19x7F*Tzgn6JCM?cqAP4zwI9@+dC-l|+JbJw
z?IZ}}kG3yuu%>^TxJLM$*%)uck7X+b(l8<NT?)D0)@JicGeblB!h{P@(_4^)p=i)>
z6P95h`{Kn3)+CIxX21<b`ciI<@Y9s*;aFeC12K>xEwzrJ@B>5Td|&U27W|HQ@PQao
ztl({SUTznkK*AX7`?3WH7Hv_oR^~vXr4$?yb)F%?rS1q!vt;Gsl~2V{MivcXG@;Z;
z^6w!|Fe28a#WR%1h^b9b&uAV_f<u+pUDX%wf{*HaI#gdoBt4uWKh=Wh1(7=Eb5STF
z#a|!$f*Xd!h~I3-KzgbdM~~xCh3(zF&a2`LV)9L0OxXY3nS&XEQZYRRBdYC+RmEhp
zkcUG1d6E2^Qme!Fh(vkXZsVR+ycWDoT%ucuB&AJ-ik%)2!Yi0?nFNTVR6zxC)C86#
zk`0{7$MH(F!bieRc14|39f}UEc)#LQcj%Z*a@JFxqNO)B%6C_?<i3wfG~hJ^x030S
sr`~I9*G-n$O_*RnPcf$!oTUr6m;BcmsZSkdPgq`0*5L;ca<78;3yIF9-2eap

delta 693
zcmYLHKWNlo6n|gxeP6Einpjc0oHgEbC*@kiLF7=Ia!Nuu^%Ad8q_tjauMTafrQj`h
zh;W185-6Ba<dz_I3l1WV4h{}o9NZ2nxJw6#?<FlRN#4KT`@P>U@5Wz^?|<aR?fKa|
zt`0&sAqV?Bh<VL9;)ZHL>B+|CYIzK#o)?B1vjVr^{sY@Hfa?zb!V~4YS_Hf9)f)F2
zH4h3RVjX6|taZ2H6%p~XS_y86iRO~9;KnF0{jb{O6wFjlfr1N@?k+~l{_0ArW#FEW
znQ#d<#5z)mSQGb|FarZ6WG|0%EzD8Z2<!&$#dLQG^JlQv=ZC`KeKt^HWZ>|a?TL^P
z&V=INOvGaB3E8yT$FHpRJ0UiG7U4w6U)g@PR$c^6KNK&Nb>QG4wYjR163wGBhDygx
z>3GKwgG9k+L4D1KC<Jy+ox@Hlm?}MeJ`DC`Q7p)iy$L?ai(?<;SC%L~&oaN{1=b5R
zZL&+<G5aIw-9?Io7vmumlkfwjEqiG-FKAO~ZF6V)dHEVr{U!^V_1}ThFhVJm<SaB(
zgE}lT%0(d#5U;~r_?aNa<E^coYPo_KL8M)Nbc8#LCnBUq9$<#Hn^3{q(`q)8R!ty9
zC~Mbka-NhXaEVGkMNad!SAU5AiHQ!jWjnZ;E6%m$Ta~oFP7*F?Cg{+U8Q=40>XqCH
V2*(i@Mvoa!=3MxJoR_Zx`v;I1poahe

diff --git a/forth/core.fs b/forth/core.fs
index 0bfab65..981338f 100644
--- a/forth/core.fs
+++ b/forth/core.fs
@@ -3,7 +3,7 @@
     CURRENT @ 1-
     DUP C@ 128 OR SWAP C!
 ;
-: [ INTERPRET 1 FLAGS ! ; IMMEDIATE
+: [ INTERPRET ; IMMEDIATE
 : ] R> DROP ;
 : LITS 34 , SCPY ;
 : LIT< WORD LITS ; IMMEDIATE
diff --git a/forth/print.fs b/forth/print.fs
index 7f55ca4..c6f74a0 100644
--- a/forth/print.fs
+++ b/forth/print.fs
@@ -34,3 +34,4 @@
 : SPC 32 EMIT ;
 
 : (wnf) (print) SPC ABORT" word not found" ;
+: (ok) SPC ." ok" CRLF ;
diff --git a/forth/readln.fs b/forth/readln.fs
index 8566a62..3822b57 100644
--- a/forth/readln.fs
+++ b/forth/readln.fs
@@ -54,17 +54,16 @@
 
 ( Read one line in input buffer and make IN> point to it )
 : (rdln)
-    ( Should we prompt? if we're executing a word, FLAGS bit
-      0, then we shouldn't. )
-    FLAGS @ 0x1 AND NOT IF '>' EMIT SPC THEN
     (infl)
     BEGIN (rdlnc) NOT UNTIL
     LF IN( IN> !
 ;
 
+: RDLN<? IN> @ C@ ;
+
 ( And finally, implement a replacement for the (c<) routine )
-: (rdln<)
-    IN> @ C@                    ( c )
+: RDLN<
+    RDLN<?                      ( c )
     ( not EOL? good, inc and return )
     DUP IF 1 IN> +! EXIT THEN   ( c )
     ( EOL ? readline. we still return typed char though )
@@ -79,6 +78,7 @@
       the last typed 0x0a and one for the following NULL. )
     INBUFSZ 4 + ALLOT
     (infl)
-    ['] (rdln<) 0x0c RAM+ !
+    ['] RDLN<? 0x06 RAM+ !
+    ['] RDLN< 0x0c RAM+ !
 ;