Broken draft of vocab implementation.

[forth.jl.git] / src / lib_1_basic.4th

diff --git a/src/lib_1_basic.4th b/src/lib_1_basic.4th
index 1764723..dc8c584 100644 (file)
--- a/src/lib_1_basic.4th
+++ b/src/lib_1_basic.4th
@@ -40,10 +40,18 @@
 
 : '\n' 10 ;
 : BL 32 ;
-
-: LITERAL IMMEDIATE ['] LIT , , ;
+: CR '\n' emit ;
+: SPACE BL emit ;
 
 : ' BL WORD FIND DROP ;
+: ['] IMMEDIATE
+     LIT LIT , ' , ;
+
+: [COMPILE] IMMEDIATE ' , ;
+: COMPILE IMMEDIATE
+    LIT LIT , ' , LIT , , ;
+
+: LITERAL IMMEDIATE ['] LIT , , ;
 
 : CHAR BL WORD 1+ @ ;
 : [CHAR] IMMEDIATE
@@ -51,18 +59,12 @@
     ['] LIT , ,
 ;
 
-: CR '\n' emit ;
-: SPACE BL emit ;
-
-: [COMPILE] IMMEDIATE
-        BL WORD         \ get the next word
-        FIND DROP       \ find it in the dictionary
-        ,               \ and compile that
-;
+: LATEST
+    CURRENT @ ;
 
 : RECURSE IMMEDIATE
         LATEST @        \ LATEST points to the word being compiled at the moment
-        >CFA            \ get the codeword
+        LFA>CFA         \ get the codeword
         ,               \ compile it
 ;