X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=forth.jl.git;a=blobdiff_plain;f=src%2Fforth.jl;h=3526960f1425e797a2a95b89b0b2a5b4f6036486;hp=4fdb0af788ba2bb008e23f103ae67cbd0bffb48d;hb=3e8e7d92da6a3231816f97d30c2222a4ff19ddda;hpb=b3d4b64d4ededd05309089235561731e65e6be6e

diff --git a/src/forth.jl b/src/forth.jl
index 4fdb0af..3526960 100644
--- a/src/forth.jl
+++ b/src/forth.jl
@@ -683,6 +683,8 @@ READ_LINE_CFA = defPrimWord("READ-LINE", () -> begin
     eofFlag = endswith(line, '\n') ? 0 : -1
     line = chomp(line)
 
+    println("Reading: $line");
+
     putString(line, addr, maxSize)
 
     pushPS(length(line))
@@ -966,6 +968,16 @@ NUMTIB, NUMTIB_CFA = defNewVar("#TIB", 0)
 FIB_CFA = defConst("FIB", FIB)
 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)
 
 SOURCE_ID, SOURCE_ID_CFA = defNewVar("SOURCE-ID", 0)
@@ -993,6 +1005,7 @@ 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
@@ -1028,6 +1041,8 @@ WORD_CFA = defPrimWord("WORD", () -> begin
     mem[countAddr] = count
     pushPS(countAddr)
 
+    println("Processing word: '$(getString(countAddr+1,mem[countAddr]))' (state $(mem[STATE]))")
+
     return NEXT
 end)
 
@@ -1212,26 +1227,30 @@ PROMPT_CFA = defPrimWord("PROMPT", () -> begin
 end)
 
 QUIT_CFA = defWord("QUIT",
-    [LIT_CFA, 0, STATE_CFA, STORE_CFA,
-    LIT_CFA, 0, SOURCE_ID_CFA, STORE_CFA,
-    LIT_CFA, 0, NUMTIB_CFA, STORE_CFA,
-    RSP0_CFA, RSPSTORE_CFA,
-    QUERY_CFA,
-    INTERPRET_CFA, PROMPT_CFA,
-    BRANCH_CFA,-4])
+    [LIT_CFA, 0, STATE_CFA, STORE_CFA,      # Set mode to interpret
+    LIT_CFA, 0, SOURCE_ID_CFA, STORE_CFA,   # Set terminal as input stream
+    LIT_CFA, 0, NUMTIB_CFA, STORE_CFA,      # Clear the input buffer
+    RSP0_CFA, RSPSTORE_CFA,                 # Clear the return stack
+    QUERY_CFA,                              # Read line of input
+    INTERPRET_CFA, PROMPT_CFA,              # Interpret line
+    BRANCH_CFA,-4])                         # Loop
 
 INCLUDED_CFA = defWord("INCLUDED",
-    [SOURCE_ID_CFA, FETCH_CFA, TOR_CFA, # Store current source on return stack
-    FAM_RO_CFA, OPEN_FILE_CFA, DROP_CFA, # Open the file named by this word.
-    DUP_CFA, SOURCE_ID_CFA, STORE_CFA, # Mark this as the current source
-    DUP_CFA, QUERY_FILE_CFA, # Read line from file
-    INTERPRET_CFA,
-    INVERT_CFA, ZBRANCH_CFA, -5,
-    CLOSE_FILE_CFA, DROP_CFA,
-    FROMR_CFA, SOURCE_ID_CFA, STORE_CFA,
+    [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
     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",