X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=forth.jl.git;a=blobdiff_plain;f=src%2Fforth.jl;h=d911e211b533a57d7268ce5c1f3264550007ba0c;hp=2bd68b9ab1475d5901645ba1fe67bedae223a1d0;hb=0740fc602aa3b2013e43448228a5fecf401848c3;hpb=40ee2b7687b038db08a7337fc1ca36cc70633167

diff --git a/src/forth.jl b/src/forth.jl
index 2bd68b9..d911e21 100644
--- a/src/forth.jl
+++ b/src/forth.jl
@@ -9,6 +9,7 @@ size_mem = 1000000 # 1 mega-int
 size_RS = 1000   # Return stack size
 size_PS = 1000   # Parameter stack size
 size_TIB = 1000  # Terminal input buffer size
+size_FIB = 1000  # File input buffer size
 
 # Memory arrays
 mem = Array{Int64,1}(size_mem)
@@ -25,7 +26,8 @@ CURRENT = nextVarAddr; nextVarAddr += 1        # Current compilation dict
 RSP0 = nextVarAddr                  # bottom of RS
 PSP0 = RSP0 + size_RS               # bottom of PS
 TIB = PSP0 + size_PS                # address of terminal input buffer
-mem[H] = TIB + size_TIB             # location of bottom of dictionary
+FIB = TIB + size_TIB                # address of terminal input buffer
+mem[H] = FIB + size_FIB             # location of bottom of dictionary
 mem[FORTH_LATEST] = 0               # zero FORTH dict latest (no previous def)
 mem[CURRENT] = FORTH_LATEST-1       # Compile words to system dict initially
 
@@ -602,7 +604,6 @@ end)
 
 openFiles = Dict{Int64,IOStream}()
 nextFileID = 1
-SOURCE_ID, SOURCE_ID_CFA = defNewVar("SOURCE-ID", 0)
 
 
 ## File access modes
@@ -662,7 +663,11 @@ CLOSE_FILES_CFA = defPrimWord("CLOSE-FILES", () -> begin
 
     return NEXT
 end)
-                              
+
+READ_LINE_CFA = defPrimWord("READ-LINE", () -> begin
+    return NEXT
+end)
+
 
 EMIT_CFA = defPrimWord("EMIT", () -> begin
     print(Char(popPS()))
@@ -933,19 +938,46 @@ end)
 
 TIB_CFA = defConst("TIB", TIB)
 NUMTIB, NUMTIB_CFA = defNewVar("#TIB", 0)
+
+FIB_CFA = defConst("FIB", TIB)
+NUMFIB, NUMFIB_CFA = defNewVar("#FIB", 0)
+
 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)
+
 QUERY_CFA = defWord("QUERY",
     [TIB_CFA, LIT_CFA, 160, EXPECT_CFA,
     SPAN_CFA, FETCH_CFA, NUMTIB_CFA, STORE_CFA,
     LIT_CFA, 0, TOIN_CFA, STORE_CFA,
     EXIT_CFA])
 
+QUERY_FILE_CFA = defWord("QUERY-FILE",
+    [FIB_CFA, LIT_CFA, 160, ROT_CFA, READ_LINE_CFA,
+    DROP_CFA, SWAP_CFA,
+    NUMFIB_CFA, STORE_CFA,
+    EXIT_CFA])
+
 WORD_CFA = defPrimWord("WORD", () -> begin
     delim = popPS()
 
+    callPrim(mem[SOURCE_CFA])
+    sizeAddr = popPS()
+    bufferAddr = popPS()
+
     # Chew up initial occurrences of delim
-    while (mem[TOIN]<mem[NUMTIB] && mem[TIB+mem[TOIN]] == delim)
+    while (mem[TOIN]<mem[sizeAddr] && mem[bufferAddr+mem[TOIN]] == delim)
         mem[TOIN] += 1
     end
 
@@ -954,8 +986,8 @@ WORD_CFA = defPrimWord("WORD", () -> begin
 
     # Start reading in word
     count = 0
-    while (mem[TOIN]<mem[NUMTIB])
-        mem[addr] = mem[TIB+mem[TOIN]]
+    while (mem[TOIN]<mem[sizeAddr])
+        mem[addr] = mem[bufferAddr+mem[TOIN]]
         mem[TOIN] += 1
 
         if (mem[addr] == delim)