Implemented COUNT, renamed TELL to TYPE

[forth.jl.git] / src / forth.jl

diff --git a/src/forth.jl b/src/forth.jl
index 98999a3..bf2c8fe 100644 (file)
--- a/src/forth.jl
+++ b/src/forth.jl
@@ -626,24 +626,10 @@ WORD = defPrimWord("WORD", () -> begin
     eof_char = Char(EOF)
     c = eof_char
 
-    skip_to_end = false
     while true
-
         callPrim(mem[KEY])
         c = Char(popPS())
 
-        if c == '\\'
-            skip_to_end = true
-            continue
-        end
-
-        if skip_to_end
-            if c == '\n' || c == eof_char
-                skip_to_end = false
-            end
-            continue
-        end
-
         if c == ' ' || c == '\t'
             continue
         end
@@ -810,11 +796,6 @@ HIDE = defWord("HIDE",
     HIDDEN,
     EXIT])
 
-CREATE = defWord("CREATE",
-    [WORD,
-    HEADER,
-    LIT, DOVAR, COMMA, EXIT]);
-
 COLON = defWord(":",
     [WORD,
     HEADER,
@@ -841,6 +822,28 @@ TICK = defWord("'",
 BTICK = defWord("[']",
     [FROMR, DUP, INCR, TOR, FETCH, EXIT])
 
+# CREATE and DOES>
+
+CREATE = defWord("CREATE",
+    [WORD,
+    HEADER,
+    LIT, DOVAR, COMMA, EXIT]);
+
+DODOES = defPrim(() -> begin
+    pushRS(reg.IP)
+    reg.IP = reg.W + 1
+    return NEXT
+end, name="DOCOL")
+
+defConst("DODOES", DODOES)
+
+FROMDOES_PAREN = defWord("(DOES>)",
+    [DODOES, LATEST, FETCH, TOCFA, STORE, EXIT])
+
+FROMDOES = defWord("DOES>",
+    [BTICK, FROMDOES_PAREN, COMMA, BTICK, EXIT, COMMA,
+    BTICK, LIT, COMMA, LATEST, FETCH, TODFA, COMMA], flags=F_IMMED)
+    
 
 # Strings
 
@@ -854,7 +857,7 @@ LITSTRING = defPrimWord("LITSTRING", () -> begin
     return NEXT
 end)
 
-TELL = defPrimWord("TELL", () -> begin
+TYPE = defPrimWord("TYPE", () -> begin
     len = popPS()
     addr = popPS()
     str = getString(addr, len)
@@ -983,17 +986,7 @@ EOF_WORD = defPrimWord("\x04", () -> begin
     end
 end, flags=F_IMMED)
 
-# Odds and Ends
-
-CHAR = defPrimWord("CHAR", () -> begin
-    callPrim(mem[WORD])
-    wordLen = popPS()
-    wordAddr = popPS()
-    word = getString(wordAddr, wordLen)
-    pushPS(Int64(word[1]))
-
-    return NEXT
-end)
+#### VM loop ####
 
 initialized = false
 initFileName = nothing
@@ -1003,8 +996,6 @@ elseif isfile(Pkg.dir("forth/src/lib.4th"))
     initFileName = Pkg.dir("forth/src/lib.4th")
 end
 
-
-#### VM loop ####
 function run(;initialize=true)
     # Begin with STDIN as source
     push!(sources, STDIN)