From 30a093845e2d1097242e948bb577fb71f73bc860 Mon Sep 17 00:00:00 2001
From: Tim Vaughan <tgvaughan@gmail.com>
Date: Tue, 11 Oct 2016 21:37:54 +1300
Subject: [PATCH] Moved some input stream words to library.

---
 src/forth.jl                                  | 44 +++++++------------
 src/lib.4th                                   | 15 ++++---
 src/{lib_9_misc.4th => lib_10_misc.4th}       |  0
 src/lib_3_input.4th                           | 12 +++++
 ...{lib_3_comments.4th => lib_4_comments.4th} |  0
 ...{lib_4_printnum.4th => lib_5_printnum.4th} |  0
 src/{lib_5_strings.4th => lib_6_strings.4th}  |  0
 ...ib_6_variables.4th => lib_7_variables.4th} |  0
 src/{lib_7_vocab.4th => lib_8_vocab.4th}      |  0
 ..._8_decompiler.4th => lib_9_decompiler.4th} |  0
 10 files changed, 36 insertions(+), 35 deletions(-)
 rename src/{lib_9_misc.4th => lib_10_misc.4th} (100%)
 create mode 100644 src/lib_3_input.4th
 rename src/{lib_3_comments.4th => lib_4_comments.4th} (100%)
 rename src/{lib_4_printnum.4th => lib_5_printnum.4th} (100%)
 rename src/{lib_5_strings.4th => lib_6_strings.4th} (100%)
 rename src/{lib_6_variables.4th => lib_7_variables.4th} (100%)
 rename src/{lib_7_vocab.4th => lib_8_vocab.4th} (100%)
 rename src/{lib_8_decompiler.4th => lib_9_decompiler.4th} (100%)

diff --git a/src/forth.jl b/src/forth.jl
index c540313..6afe492 100644
--- a/src/forth.jl
+++ b/src/forth.jl
@@ -969,29 +969,18 @@ FIB_CFA = defConst("FIB", FIB)
 NUMFIB, NUMFIB_CFA = defNewVar("#FIB", 0)
 
 IB_CFA = defPrimWord("IB", () -> begin
-    pushPS(mem[SOURCE_ID] == 0 ? TIB : FIB)
+    pushPS(mem[SOURCE_ID_VAR] == 0 ? TIB : FIB)
     return NEXT
 end)
 
 NUMIB_CFA = defPrimWord("#IB", () -> begin
-    pushPS(mem[SOURCE_ID] == 0 ? NUMTIB : NUMFIB)
+    pushPS(mem[SOURCE_ID_VAR] == 0 ? NUMTIB : NUMFIB)
     return NEXT
 end)
 
 TOIN, TOIN_CFA = defNewVar(">IN", 0)
 
-SOURCE_ID, SOURCE_ID_CFA = defNewVar("SOURCE-ID", 0)
-
-SOURCE_CFA = defPrimWord("SOURCE", () -> begin
-    if mem[SOURCE_ID] == 0
-        pushPS(TIB)
-        pushPS(NUMTIB)
-    else
-        pushPS(FIB)
-        pushPS(NUMFIB)
-    end
-    return NEXT
-end)
+SOURCE_ID_VAR, SOURCE_ID_VAR_CFA = defNewVar("SOURCE-ID-VAR", 0)
 
 QUERY_CFA = defWord("QUERY",
     [TIB_CFA, LIT_CFA, 160, EXPECT_CFA,
@@ -1010,17 +999,16 @@ QUERY_FILE_CFA = defWord("QUERY-FILE",
     LIT_CFA, 0, TOIN_CFA, STORE_CFA,
     EXIT_CFA])
 
-QUERY_INPUT_CFA = defWord("QUERY-INPUT",
-    [SOURCE_ID_CFA, FETCH_CFA, QDUP_CFA, ZBRANCH_CFA, 3,
-    QUERY_FILE_CFA, EXIT_CFA,
-    QUERY_CFA, EXIT_CFA])
-
 WORD_CFA = defPrimWord("WORD", () -> begin
     delim = popPS()
 
-    callPrim(mem[SOURCE_CFA])
-    sizeAddr = popPS()
-    bufferAddr = popPS()
+    if mem[SOURCE_ID_VAR] == 0
+        bufferAddr = TIB
+        sizeAddr = NUMTIB
+    else
+        bufferAddr = FIB
+        sizeAddr = NUMFIB
+    end
 
     # Chew up initial occurrences of delim
     while (mem[TOIN]<mem[sizeAddr] && mem[bufferAddr+mem[TOIN]] == delim)
@@ -1235,7 +1223,7 @@ end)
 
 QUIT_CFA = defWord("QUIT",
     [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, SOURCE_ID_VAR_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
@@ -1245,17 +1233,17 @@ QUIT_CFA = defWord("QUIT",
 INCLUDED_CFA = defWord("INCLUDED",
     [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
+    SOURCE_ID_VAR_CFA, FETCH_CFA, SWAP_CFA,         # Store current source on stack
+    SOURCE_ID_VAR_CFA, STORE_CFA,                   # Mark this as the current source
+    SOURCE_ID_VAR_CFA, FETCH_CFA, QUERY_FILE_CFA,   # Read line from file
     EOF_FLAG_CFA, FETCH_CFA,
     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, -14,                            # Loop
-    SOURCE_ID_CFA, FETCH_CFA,
+    SOURCE_ID_VAR_CFA, FETCH_CFA,
     CLOSE_FILE_CFA, DROP_CFA,                   # Close file
-    SOURCE_ID_CFA, STORE_CFA,                   # Restore input source
+    SOURCE_ID_VAR_CFA, STORE_CFA,                   # Restore input source
     EXIT_CFA])
 
 INCLUDE_CFA = defWord("INCLUDE", [LIT_CFA, 32, WORD_CFA,
diff --git a/src/lib.4th b/src/lib.4th
index 4f0323d..60d7a56 100644
--- a/src/lib.4th
+++ b/src/lib.4th
@@ -7,10 +7,11 @@
 
 include lib_1_basic.4th
 include lib_2_control.4th
-include lib_3_comments.4th
-include lib_4_printnum.4th
-include lib_5_strings.4th
-include lib_6_variables.4th
-include lib_7_vocab.4th
-include lib_8_decompiler.4th
-include lib_9_misc.4th
+include lib_3_input.4th
+include lib_4_comments.4th
+include lib_5_printnum.4th
+include lib_6_strings.4th
+include lib_7_variables.4th
+include lib_8_vocab.4th
+include lib_9_decompiler.4th
+include lib_10_misc.4th
diff --git a/src/lib_9_misc.4th b/src/lib_10_misc.4th
similarity index 100%
rename from src/lib_9_misc.4th
rename to src/lib_10_misc.4th
diff --git a/src/lib_3_input.4th b/src/lib_3_input.4th
new file mode 100644
index 0000000..735a879
--- /dev/null
+++ b/src/lib_3_input.4th
@@ -0,0 +1,12 @@
+\ Input stream definitions
+
+: SOURCE-ID
+    SOURCE-ID-VAR @ ;
+
+: QUERY-INPUT
+    SOURCE-ID ?DUP 0= IF
+        QUERY
+    ELSE
+        QUERY-FILE
+    THEN
+;
diff --git a/src/lib_3_comments.4th b/src/lib_4_comments.4th
similarity index 100%
rename from src/lib_3_comments.4th
rename to src/lib_4_comments.4th
diff --git a/src/lib_4_printnum.4th b/src/lib_5_printnum.4th
similarity index 100%
rename from src/lib_4_printnum.4th
rename to src/lib_5_printnum.4th
diff --git a/src/lib_5_strings.4th b/src/lib_6_strings.4th
similarity index 100%
rename from src/lib_5_strings.4th
rename to src/lib_6_strings.4th
diff --git a/src/lib_6_variables.4th b/src/lib_7_variables.4th
similarity index 100%
rename from src/lib_6_variables.4th
rename to src/lib_7_variables.4th
diff --git a/src/lib_7_vocab.4th b/src/lib_8_vocab.4th
similarity index 100%
rename from src/lib_7_vocab.4th
rename to src/lib_8_vocab.4th
diff --git a/src/lib_8_decompiler.4th b/src/lib_9_decompiler.4th
similarity index 100%
rename from src/lib_8_decompiler.4th
rename to src/lib_9_decompiler.4th
-- 
2.20.1