X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=src%2Fforth.jl;h=97dcc57dd4328cded9b96d176ced9b86df5e4c55;hb=213140aac1ad3c08a74dd5eea06464c474d54cd2;hp=c2019d45a025bae66aaf3879d042b312d1bf7fb4;hpb=231a3650050eba3a478b814b149963eb3e0625e7;p=forth.jl.git

diff --git a/src/forth.jl b/src/forth.jl
index c2019d4..97dcc57 100644
--- a/src/forth.jl
+++ b/src/forth.jl
@@ -970,10 +970,12 @@ NUMFIB, NUMFIB_CFA = defNewVar("#FIB", 0)
 
 IB_CFA = defPrimWord("IB", () -> begin
     pushPS(mem[SOURCE_ID] == 0 ? TIB : FIB)
+    return NEXT
 end)
 
 NUMIB_CFA = defPrimWord("#IB", () -> begin
     pushPS(mem[SOURCE_ID] == 0 ? NUMTIB : NUMFIB)
+    return NEXT
 end)
 
 TOIN, TOIN_CFA = defNewVar(">IN", 0)
@@ -998,11 +1000,12 @@ QUERY_CFA = defWord("QUERY",
     EXIT_CFA])
 
 # ( fid -- flag )
-# Flag is false when EOF is reached.
+# flag set to true if EOF is reached
 QUERY_FILE_CFA = defWord("QUERY-FILE",
     [FIB_CFA, LIT_CFA, 160, ROT_CFA, READ_LINE_CFA,
     DROP_CFA, SWAP_CFA,
     NUMFIB_CFA, STORE_CFA,
+    LIT_CFA, 0, TOIN_CFA, STORE_CFA,
     EXIT_CFA])
 
 WORD_CFA = defPrimWord("WORD", () -> begin
@@ -1038,7 +1041,7 @@ WORD_CFA = defPrimWord("WORD", () -> begin
     mem[countAddr] = count
     pushPS(countAddr)
 
-    #println("Processing word: '$(getString(countAddr+1,mem[countAddr]))'")
+    println("Processing word: '$(getString(countAddr+1,mem[countAddr]))' (state $(mem[STATE]))")
 
     return NEXT
 end)
@@ -1233,18 +1236,24 @@ QUIT_CFA = defWord("QUIT",
     BRANCH_CFA,-4])                         # Loop
 
 INCLUDED_CFA = defWord("INCLUDED",
-    [LIT_CFA, 0, STATE_CFA, STORE_CFA,      # Set mode to interpret
-    SOURCE_ID_CFA, FETCH_CFA, TOR_CFA,      # Store current source on return stack
-    FAM_RO_CFA, OPEN_FILE_CFA, DROP_CFA,    # Open the file
-    DUP_CFA, SOURCE_ID_CFA, STORE_CFA,      # Mark this as the current source
-    DUP_CFA, QUERY_FILE_CFA,                # Read line from file
-    INTERPRET_CFA,                          # Interpret line
-    ZBRANCH_CFA, -4,                        # Loop if not EOF
-    CLOSE_FILE_CFA, DROP_CFA,               # Close file
-    FROMR_CFA, SOURCE_ID_CFA, STORE_CFA,    # Restore input source
+    [LIT_CFA, 0, STATE_CFA, STORE_CFA,          # Set mode to interpret
+    FAM_RO_CFA, OPEN_FILE_CFA, DROP_CFA,        # Open the file
+    SOURCE_ID_CFA, FETCH_CFA, SWAP_CFA,         # Store current source on stack
+    SOURCE_ID_CFA, STORE_CFA,                   # Mark this as the current source
+    SOURCE_ID_CFA, FETCH_CFA, QUERY_FILE_CFA,   # Read line from file
+    NUMFIB_CFA, FETCH_CFA, ZE_CFA, AND_CFA,     # Test for EOF and empty line
+    INVERT_CFA, ZBRANCH_CFA, 4,                 # Break out if EOF
+    INTERPRET_CFA,                              # Interpret line
+    BRANCH_CFA, -12,                            # Loop
+    SOURCE_ID_CFA, FETCH_CFA,
+    CLOSE_FILE_CFA, DROP_CFA,                   # Close file
+    SOURCE_ID_CFA, STORE_CFA,                   # Restore input source
     EXIT_CFA])
 
-INCLUDE_CFA = defWord("INCLUDE", [LIT_CFA, 32, WORD_CFA, INCLUDED_CFA, EXIT_CFA]);
+INCLUDE_CFA = defWord("INCLUDE", [LIT_CFA, 32, WORD_CFA,
+    DUP_CFA, INCR_CFA,
+    SWAP_CFA, FETCH_CFA,
+    INCLUDED_CFA, EXIT_CFA]);
 
 
 ABORT_CFA = defWord("ABORT",