From 3d908cef3a8e1cecc379dd8e1d36870eaebfd802 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Sat, 2 May 2020 21:21:47 -0400
Subject: [PATCH] Move all parsing words to Inner core

This allows us to get rid of the (parse*) indirection.
---
 blk/060        |   4 ++--
 blk/081        |   2 +-
 blk/089        |   6 +++---
 blk/090        |   8 ++++----
 blk/265        |   2 +-
 blk/393        |   3 +--
 blk/394        |   8 +++++++-
 blk/398        |  21 ++++++++-------------
 blk/399        |  20 +++++++++++---------
 blk/400        |  29 ++++++++++++++---------------
 blk/401        |  14 +++++++-------
 blk/402        |  27 ++++++++++++++-------------
 blk/403        |  15 +++++++--------
 blk/404        |  17 +++++++++--------
 blk/405        |  23 ++++++++++-------------
 blk/406        |  30 ++++++++++++++++--------------
 blk/407        |  26 ++++++++++----------------
 blk/408        |  15 +++++++++++++++
 blk/409        |   9 +++++++++
 blk/410        |  11 +++++++++++
 blk/411        |  14 ++++++++++++++
 blk/412        |  14 ++++++++++++++
 blk/413        |  16 ++++++++++++++++
 blk/436        |   4 ----
 blk/438        |   3 ---
 blk/446        |  11 -----------
 blk/447        |  14 --------------
 blk/448        |  15 ---------------
 blk/449        |  10 ----------
 blk/450        |  16 ----------------
 blk/451        |  10 ----------
 emul/forth.bin | Bin 5705 -> 5642 bytes
 32 files changed, 204 insertions(+), 213 deletions(-)
 create mode 100644 blk/408
 create mode 100644 blk/409
 create mode 100644 blk/410
 create mode 100644 blk/411
 create mode 100644 blk/412
 create mode 100644 blk/413
 delete mode 100644 blk/446
 delete mode 100644 blk/447
 delete mode 100644 blk/448
 delete mode 100644 blk/449
 delete mode 100644 blk/450
 delete mode 100644 blk/451

diff --git a/blk/060 b/blk/060
index 2bbca54..25b341f 100644
--- a/blk/060
+++ b/blk/060
@@ -4,8 +4,6 @@ I/O
                   result in n as well as whether parsing was a
                   success in f (false = failure, true =
                   success)
-(parse*) -- a     Variable holding the current pointer for
-                  system number parsing. By default, (parse).
 (print)  a --     Print string at addr a.
 .        n --     Print n in its decimal form
 .x       n --     Print n's LSB in hex form. Always 2
@@ -13,4 +11,6 @@ I/O
 .X       n --     Print n in hex form. Always 4 characters.
                   Numbers are never considered negative.
                   "-1 .X" --> ffff
+
+
                                                         (cont.)
diff --git a/blk/081 b/blk/081
index c1aa219..4ab6143 100644
--- a/blk/081
+++ b/blk/081
@@ -4,7 +4,7 @@ RAMSTART  INITIAL_SP           +55       (key) override
 +04       HERE                 +59       blk's variables
 +06       C<?                  +5b       z80a's variables
 +08       C<* override         +5d       adev's variables
-+0a       PARSEPTR             +5f       FUTURE USES
++0a       RESERVED             +5f       FUTURE USES
 +0c       C<*                  +70       DRIVERS
 +0e       WORDBUF              +80       RAMEND
 +2e       BOOT C< PTR
diff --git a/blk/089 b/blk/089
index 2560489..0aac0f4 100644
--- a/blk/089
+++ b/blk/089
@@ -10,7 +10,7 @@ very few things.
 
 In a normal system, BOOT is in icore and does a few things:
 
-1. Find "(parse)" and set "(parse*)" to it.
-2. Find "(c<)" a set CINPTR to it (what C< calls).
-3. Write LATEST in SYSTEM SCRATCHPAD ( see below )
+1. Find "(c<)" a set CINPTR to it (what C< calls).
+2. Initialize all overrides to 0.
+3. Write LATEST in BOOT C< PTR ( see below )
 4. Find "INIT". If found, execute. Otherwise, "INTERPRET"(cont)
diff --git a/blk/090 b/blk/090
index 3cb2d91..af74409 100644
--- a/blk/090
+++ b/blk/090
@@ -1,7 +1,7 @@
-(cont.) On a bare system (only boot+icore), this sequence will
-result in "(parse)" reading only decimals and (c<) reading
-characters from memory starting from CURRENT (this is why we
-put CURRENT in SYSTEM SCRATCHPAD, it tracks current pos ).
+On a bare system (only boot+icore), this sequence will result
+in (c<) reading characters from memory starting from CURRENT
+(this is why we put CURRENT in BOOT C< PTR, it tracks current
+pos ).
 
 This means that you can put initialization code in source form
 right into your binary, right after your last compiled dict
diff --git a/blk/265 b/blk/265
index 857f079..98d3d66 100644
--- a/blk/265
+++ b/blk/265
@@ -8,7 +8,7 @@
     ELSE ( w )
         0x02 RAM+ @ SWAP ( cur w ) _find ( a f )
         IF DUP IMMED? NOT IF ABORT THEN EXECUTE
-        ELSE (parse*) @ EXECUTE LITN THEN
+        ELSE (parse) LITN THEN
     THEN
     AGAIN
 ;
diff --git a/blk/393 b/blk/393
index a69f0b1..105dfdf 100644
--- a/blk/393
+++ b/blk/393
@@ -1,6 +1,5 @@
 : RAM+ [ RAMSTART LITN ] + ;
 : BIN+ [ BIN( @ LITN ] + ;
-: (parse*) 0x0a RAM+ ;
 : HERE 0x04 RAM+ ;
 : CURRENT* 0x51 RAM+ ;
 : CURRENT CURRENT* @ ;
@@ -13,4 +12,4 @@
     0 0x08 RAM+ !  ( 08 == C<* override )
     LIT< INTERPRET (find) DROP EXECUTE
 ;
-394 407 LOADR
+394 413 LOADR
diff --git a/blk/394 b/blk/394
index 90be320..196e21d 100644
--- a/blk/394
+++ b/blk/394
@@ -4,5 +4,11 @@
 : < CMP -1 = ;
 : > CMP 1 = ;
 : 0< 32767 > ;
+: >= < NOT ;
+: <= > NOT ;
+: 0>= 0< NOT ;
 
-
+( a -- a+1 c )
+: C@+ DUP C@ SWAP 1+ SWAP ;
+( c a -- a+1 )
+: C!+ SWAP OVER C! 1+ ;
diff --git a/blk/398 b/blk/398
index a544ed8..d7cb9b0 100644
--- a/blk/398
+++ b/blk/398
@@ -1,16 +1,11 @@
-( This is only the "early parser" in earlier stages. No need
-  for an abort message )
-: (parse) (parsed) NOT IF ABORT THEN ;
+( strings being sent to parse routines are always null
+  terminated )
 
-: C<? 0x06 RAM+ @ ;
-: C<
-    0x08 RAM+ @  ( 08 == C<* override )
-    DUP NOT IF DROP 0x0c RAM+ @ THEN  ( 0c == C<* )
-    EXECUTE
+: (parsec)          ( a -- n f )
+    ( apostrophe is ASCII 39 )
+    DUP C@ 39 = OVER 2+ C@ 39 = AND     ( a f )
+    NOT IF 0 EXIT THEN   ( a 0 )
+    ( surrounded by apos, good, return )
+    1+ C@ 1                             ( n 1 )
 ;
 
-: , HERE @ ! HERE @ 2+ HERE ! ;
-
-: C, HERE @ C! HERE @ 1+ HERE ! ;
-
-
diff --git a/blk/399 b/blk/399
index eb8ab2c..bac471c 100644
--- a/blk/399
+++ b/blk/399
@@ -1,12 +1,14 @@
-( The NOT is to normalize the negative/positive numbers to 1
-  or 0. Hadn't we wanted to normalize, we'd have written:
-  32 CMP 1 - )
-: WS? 33 CMP 1+ NOT ;
-
-: TOWORD
-    BEGIN
-        C< DUP WS? NOT IF EXIT THEN DROP
-    AGAIN
+( returns negative value on error )
+: _            ( c -- n )
+    ( '0' is ASCII 48 )
+    48 -
+    DUP 0< ( bad ) OVER 10 < ( good ) OR IF EXIT THEN
+    ( 'a' is ASCII 97. 59 = 97 - 48 )
+    49 -
+    DUP 0< IF EXIT THEN                 ( bad )
+    DUP 6 < IF 10 + EXIT THEN           ( good )
+    ( bad )
+    255 -
 ;
 
 
diff --git a/blk/400 b/blk/400
index 3fcd1e4..e400a39 100644
--- a/blk/400
+++ b/blk/400
@@ -1,16 +1,15 @@
-( Read word from C<, copy to WORDBUF, null-terminate, and
-  return, make HL point to WORDBUF. )
-: WORD
-    0x0e RAM+  ( 0e == WORDBUF )
-    TOWORD     ( a c )
+: (parseh)          ( a -- n f )
+    ( '0': ASCII 0x30 'x': 0x78 0x7830: 30768 )
+    DUP @ 30768 = NOT IF 0 EXIT THEN    ( a 0 )
+    ( We have "0x" prefix )
+    2+
+    0  ( a r )
     BEGIN
-        ( We take advantage of the fact that char MSB is
-          always zero to pre-write our null-termination )
-        OVER ! 1+            ( a+1 )
-        C<                   ( a c )
-        DUP WS?
-    UNTIL
-    ( a this point, PS is: a WS )
-    ( null-termination is already written )
-    2DROP
-    0x0e RAM+ ;
+    SWAP C@+                            ( r a+1 c )
+    DUP NOT IF 2DROP 1 EXIT THEN        ( r, 1 )
+    _                                   ( r a n )
+    DUP 0< IF ROT 2DROP 0 EXIT THEN     ( a 0 )
+    ROT 16 * +                          ( a r*16+n )
+    AGAIN
+;
+
diff --git a/blk/401 b/blk/401
index f6a7134..eb50ae5 100644
--- a/blk/401
+++ b/blk/401
@@ -1,10 +1,10 @@
-: SCPY
-    BEGIN         ( a )
-        DUP C@    ( a c )
-        DUP C,    ( a c )
-        NOT IF DROP EXIT THEN
-        1+        ( a+1 )
-    AGAIN
+( returns negative value on error )
+: _            ( c -- n )
+    ( '0' is ASCII 48 )
+    48 -
+    DUP 0< ( bad ) OVER 2 < ( good ) OR IF EXIT THEN
+    ( bad )
+    255 -
 ;
 
 
diff --git a/blk/402 b/blk/402
index 1fce040..e8788f9 100644
--- a/blk/402
+++ b/blk/402
@@ -1,15 +1,16 @@
-: [entry]
-    HERE @       ( w h )
-    SWAP SCPY    ( h )
-    ( Adjust HERE -1 because SCPY copies the null )
-    HERE @ 1-    ( h h' )
-    DUP HERE !   ( h h' )
-    SWAP -       ( sz )
-    ( write prev value )
-    HERE @ CURRENT @ - ,
-    ( write size )
-    C,
-    HERE @ CURRENT !
+: (parseb)          ( a -- n f )
+    ( '0': ASCII 0x30 'b': 0x62 0x6230: 25136 )
+    DUP @ 25136 = NOT IF 0 EXIT THEN    ( a 0 )
+    ( We have "0b" prefix )
+    2+
+    0  ( a r )
+    BEGIN
+    SWAP C@+                               ( r a+1 c )
+    DUP NOT IF 2DROP 1 EXIT THEN           ( r 1 )
+    _                                      ( r a n )
+    DUP 0< IF ROT 2DROP 0 EXIT THEN        ( a 0 )
+    ROT 2 * +                              ( a r*2+n )
+    AGAIN
 ;
 
-: (entry) WORD [entry] ;
+
diff --git a/blk/403 b/blk/403
index bffaf5c..752f865 100644
--- a/blk/403
+++ b/blk/403
@@ -1,9 +1,8 @@
-: INTERPRET
-    BEGIN
-    WORD
-    (find)
-    NOT IF (parse*) @ THEN EXECUTE
-    C<? NOT IF LIT< (ok) (find) IF EXECUTE THEN THEN
-    AGAIN
+: (parse)           ( a -- n )
+    (parsec) IF EXIT THEN
+    (parseh) IF EXIT THEN
+    (parseb) IF EXIT THEN
+    (parsed) IF EXIT THEN
+    ( nothing works )
+    LIT< (wnf) (find) IF EXECUTE ELSE ABORT THEN
 ;
-
diff --git a/blk/404 b/blk/404
index 865f627..de0f8e1 100644
--- a/blk/404
+++ b/blk/404
@@ -1,11 +1,12 @@
-( system c< simply reads source from binary, starting at
-  LATEST. Convenient way to bootstrap a new system. )
-: (boot<)
-    ( 2e == BOOT C< PTR )
-    0x2e RAM+ @   ( a )
-    DUP C@        ( a c )
-    SWAP 1 +      ( c a+1 )
-    0x2e RAM+ !   ( c )
+: C<? 0x06 RAM+ @ ;
+: C<
+    0x08 RAM+ @  ( 08 == C<* override )
+    DUP NOT IF DROP 0x0c RAM+ @ THEN  ( 0c == C<* )
+    EXECUTE
 ;
 
+: , HERE @ ! HERE @ 2+ HERE ! ;
+
+: C, HERE @ C! HERE @ 1+ HERE ! ;
+
 
diff --git a/blk/405 b/blk/405
index 9886dcc..eb8ab2c 100644
--- a/blk/405
+++ b/blk/405
@@ -1,15 +1,12 @@
-: BOOT
-    0x02 RAM+ CURRENT* !
-    LIT< (parse) (find) DROP (parse*) !
-    CURRENT @ 0x2e RAM+ ! ( 2e == BOOT C< PTR )
-    0 0x08 RAM+ !  ( 08 == C<* override )
-    0 0x53 RAM+ !  ( 53 == (emit) override )
-    0 0x55 RAM+ !  ( 55 == (key) override )
-    ( 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
+( The NOT is to normalize the negative/positive numbers to 1
+  or 0. Hadn't we wanted to normalize, we'd have written:
+  32 CMP 1 - )
+: WS? 33 CMP 1+ NOT ;
+
+: TOWORD
+    BEGIN
+        C< DUP WS? NOT IF EXIT THEN DROP
+    AGAIN
 ;
 
+
diff --git a/blk/406 b/blk/406
index 60f0030..3fcd1e4 100644
--- a/blk/406
+++ b/blk/406
@@ -1,14 +1,16 @@
-( LITN has to be defined after the last immediate usage of
-  it to avoid bootstrapping issues )
-: LITN 32 , , ( 32 == NUMBER ) ;
-
-: IMMED? 1- C@ 0x80 AND ;
-
-( ';' can't have its name right away because, when created, it
-  is not an IMMEDIATE yet and will not be treated properly by
-  xcomp. )
-: _
-    ['] EXIT ,
-    R> DROP     ( exit : )
-; IMMEDIATE
-
+( Read word from C<, copy to WORDBUF, null-terminate, and
+  return, make HL point to WORDBUF. )
+: WORD
+    0x0e RAM+  ( 0e == WORDBUF )
+    TOWORD     ( a c )
+    BEGIN
+        ( We take advantage of the fact that char MSB is
+          always zero to pre-write our null-termination )
+        OVER ! 1+            ( a+1 )
+        C<                   ( a c )
+        DUP WS?
+    UNTIL
+    ( a this point, PS is: a WS )
+    ( null-termination is already written )
+    2DROP
+    0x0e RAM+ ;
diff --git a/blk/407 b/blk/407
index d74dae5..f6a7134 100644
--- a/blk/407
+++ b/blk/407
@@ -1,16 +1,10 @@
-XCURRENT @ ( to PSP )
-: :
-    (entry)
-    ( We cannot use LITN as IMMEDIATE because of bootstrapping
-      issues. Same thing for ",".
-      32 == NUMBER 14 == compiledWord )
-    [ 32 H@ ! 2 ALLOT 14 H@ ! 2 ALLOT ] C,
-    BEGIN
-        WORD
-        (find)
-        ( is word )
-        IF DUP IMMED? IF EXECUTE ELSE , THEN
-        ( maybe number )
-        ELSE (parse*) @ EXECUTE LITN THEN
-    AGAIN ;
-( from PSP ) ';' SWAP 4 - C!
+: SCPY
+    BEGIN         ( a )
+        DUP C@    ( a c )
+        DUP C,    ( a c )
+        NOT IF DROP EXIT THEN
+        1+        ( a+1 )
+    AGAIN
+;
+
+
diff --git a/blk/408 b/blk/408
new file mode 100644
index 0000000..1fce040
--- /dev/null
+++ b/blk/408
@@ -0,0 +1,15 @@
+: [entry]
+    HERE @       ( w h )
+    SWAP SCPY    ( h )
+    ( Adjust HERE -1 because SCPY copies the null )
+    HERE @ 1-    ( h h' )
+    DUP HERE !   ( h h' )
+    SWAP -       ( sz )
+    ( write prev value )
+    HERE @ CURRENT @ - ,
+    ( write size )
+    C,
+    HERE @ CURRENT !
+;
+
+: (entry) WORD [entry] ;
diff --git a/blk/409 b/blk/409
new file mode 100644
index 0000000..f93ab0e
--- /dev/null
+++ b/blk/409
@@ -0,0 +1,9 @@
+: INTERPRET
+    BEGIN
+    WORD
+    (find)
+    NOT IF (parse) ELSE EXECUTE THEN
+    C<? NOT IF LIT< (ok) (find) IF EXECUTE THEN THEN
+    AGAIN
+;
+
diff --git a/blk/410 b/blk/410
new file mode 100644
index 0000000..865f627
--- /dev/null
+++ b/blk/410
@@ -0,0 +1,11 @@
+( system c< simply reads source from binary, starting at
+  LATEST. Convenient way to bootstrap a new system. )
+: (boot<)
+    ( 2e == BOOT C< PTR )
+    0x2e RAM+ @   ( a )
+    DUP C@        ( a c )
+    SWAP 1 +      ( c a+1 )
+    0x2e RAM+ !   ( c )
+;
+
+
diff --git a/blk/411 b/blk/411
new file mode 100644
index 0000000..4dc7f55
--- /dev/null
+++ b/blk/411
@@ -0,0 +1,14 @@
+: BOOT
+    0x02 RAM+ CURRENT* !
+    CURRENT @ 0x2e RAM+ ! ( 2e == BOOT C< PTR )
+    0 0x08 RAM+ !  ( 08 == C<* override )
+    0 0x53 RAM+ !  ( 53 == (emit) override )
+    0 0x55 RAM+ !  ( 55 == (key) override )
+    ( 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/blk/412 b/blk/412
new file mode 100644
index 0000000..60f0030
--- /dev/null
+++ b/blk/412
@@ -0,0 +1,14 @@
+( LITN has to be defined after the last immediate usage of
+  it to avoid bootstrapping issues )
+: LITN 32 , , ( 32 == NUMBER ) ;
+
+: IMMED? 1- C@ 0x80 AND ;
+
+( ';' can't have its name right away because, when created, it
+  is not an IMMEDIATE yet and will not be treated properly by
+  xcomp. )
+: _
+    ['] EXIT ,
+    R> DROP     ( exit : )
+; IMMEDIATE
+
diff --git a/blk/413 b/blk/413
new file mode 100644
index 0000000..e109431
--- /dev/null
+++ b/blk/413
@@ -0,0 +1,16 @@
+XCURRENT @ ( to PSP )
+: :
+    (entry)
+    ( We cannot use LITN as IMMEDIATE because of bootstrapping
+      issues. Same thing for ",".
+      32 == NUMBER 14 == compiledWord )
+    [ 32 H@ ! 2 ALLOT 14 H@ ! 2 ALLOT ] C,
+    BEGIN
+        WORD
+        (find)
+        ( is word )
+        IF DUP IMMED? IF EXECUTE ELSE , THEN
+        ( maybe number )
+        ELSE (parse) LITN THEN
+    AGAIN ;
+( from PSP ) ';' SWAP 4 - C!
diff --git a/blk/436 b/blk/436
index 1bbd442..8ea4b45 100644
--- a/blk/436
+++ b/blk/436
@@ -8,7 +8,3 @@
     DROP
 ;
 
-( a -- a+1 c )
-: C@+ DUP C@ SWAP 1+ SWAP ;
-( c a -- a+1 )
-: C!+ SWAP OVER C! 1+ ;
diff --git a/blk/438 b/blk/438
index ffe20dd..e69de29 100644
--- a/blk/438
+++ b/blk/438
@@ -1,3 +0,0 @@
-: >= < NOT ;
-: <= > NOT ;
-: 0>= 0< NOT ;
diff --git a/blk/446 b/blk/446
deleted file mode 100644
index d7cb9b0..0000000
--- a/blk/446
+++ /dev/null
@@ -1,11 +0,0 @@
-( strings being sent to parse routines are always null
-  terminated )
-
-: (parsec)          ( a -- n f )
-    ( apostrophe is ASCII 39 )
-    DUP C@ 39 = OVER 2+ C@ 39 = AND     ( a f )
-    NOT IF 0 EXIT THEN   ( a 0 )
-    ( surrounded by apos, good, return )
-    1+ C@ 1                             ( n 1 )
-;
-
diff --git a/blk/447 b/blk/447
deleted file mode 100644
index bac471c..0000000
--- a/blk/447
+++ /dev/null
@@ -1,14 +0,0 @@
-( returns negative value on error )
-: _            ( c -- n )
-    ( '0' is ASCII 48 )
-    48 -
-    DUP 0< ( bad ) OVER 10 < ( good ) OR IF EXIT THEN
-    ( 'a' is ASCII 97. 59 = 97 - 48 )
-    49 -
-    DUP 0< IF EXIT THEN                 ( bad )
-    DUP 6 < IF 10 + EXIT THEN           ( good )
-    ( bad )
-    255 -
-;
-
-
diff --git a/blk/448 b/blk/448
deleted file mode 100644
index e400a39..0000000
--- a/blk/448
+++ /dev/null
@@ -1,15 +0,0 @@
-: (parseh)          ( a -- n f )
-    ( '0': ASCII 0x30 'x': 0x78 0x7830: 30768 )
-    DUP @ 30768 = NOT IF 0 EXIT THEN    ( a 0 )
-    ( We have "0x" prefix )
-    2+
-    0  ( a r )
-    BEGIN
-    SWAP C@+                            ( r a+1 c )
-    DUP NOT IF 2DROP 1 EXIT THEN        ( r, 1 )
-    _                                   ( r a n )
-    DUP 0< IF ROT 2DROP 0 EXIT THEN     ( a 0 )
-    ROT 16 * +                          ( a r*16+n )
-    AGAIN
-;
-
diff --git a/blk/449 b/blk/449
deleted file mode 100644
index eb50ae5..0000000
--- a/blk/449
+++ /dev/null
@@ -1,10 +0,0 @@
-( returns negative value on error )
-: _            ( c -- n )
-    ( '0' is ASCII 48 )
-    48 -
-    DUP 0< ( bad ) OVER 2 < ( good ) OR IF EXIT THEN
-    ( bad )
-    255 -
-;
-
-
diff --git a/blk/450 b/blk/450
deleted file mode 100644
index e8788f9..0000000
--- a/blk/450
+++ /dev/null
@@ -1,16 +0,0 @@
-: (parseb)          ( a -- n f )
-    ( '0': ASCII 0x30 'b': 0x62 0x6230: 25136 )
-    DUP @ 25136 = NOT IF 0 EXIT THEN    ( a 0 )
-    ( We have "0b" prefix )
-    2+
-    0  ( a r )
-    BEGIN
-    SWAP C@+                               ( r a+1 c )
-    DUP NOT IF 2DROP 1 EXIT THEN           ( r 1 )
-    _                                      ( r a n )
-    DUP 0< IF ROT 2DROP 0 EXIT THEN        ( a 0 )
-    ROT 2 * +                              ( a r*2+n )
-    AGAIN
-;
-
-
diff --git a/blk/451 b/blk/451
deleted file mode 100644
index 7f308d4..0000000
--- a/blk/451
+++ /dev/null
@@ -1,10 +0,0 @@
-: (parse)           ( a -- n )
-    (parsec) IF EXIT THEN
-    (parseh) IF EXIT THEN
-    (parseb) IF EXIT THEN
-    (parsed) IF EXIT THEN
-    ( nothing works )
-    LIT< (wnf) (find) IF EXECUTE ELSE ABORT THEN
-;
-
-' (parse) (parse*) !
diff --git a/emul/forth.bin b/emul/forth.bin
index 6c12adf3aab7b9abe6073f6494b02c17ca4135ae..fd113c766b6500f8decb09ab0f8f9aee64ba5c50 100644
GIT binary patch
delta 3033
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
C4ux?5

delta 3122
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
E2mbAjzW@LL