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

diff --git a/src/forth.jl b/src/forth.jl
index 90fb3ae..4fdb0af 100644
--- a/src/forth.jl
+++ b/src/forth.jl
@@ -99,6 +99,10 @@ end
 
 getString(addr::Int64, len::Int64) = AbstractString([Char(c) for c in mem[addr:(addr+len-1)]])
 
+function putString(str::AbstractString, addr::Int64)
+    mem[addr:(addr+length(str)-1)] = [Int64(c) for c in str]
+end
+
 function putString(str::AbstractString, addr::Int64, maxLen::Int64)
     len = min(length(str), maxLen)
     mem[addr:(addr+len-1)] = [Int64(c) for c in str]
@@ -613,9 +617,9 @@ FAM_RO_CFA = defConst("R/O", FAM_RO)
 FAM_WO_CFA = defConst("W/O", FAM_WO)
 
 function fileOpener(create::Bool)
+    fam = popPS()
     fnameLen = popPS()
     fnameAddr = popPS()
-    fam = popPS()
 
     fname = getString(fnameAddr, fnameLen)
 
@@ -631,6 +635,7 @@ function fileOpener(create::Bool)
         mode = "w"
     end
 
+    global nextFileID
     openFiles[nextFileID] = open(fname, mode)
     pushPS(nextFileID)
     pushPS(0)
@@ -652,6 +657,8 @@ CLOSE_FILE_CFA = defPrimWord("CLOSE-FILE", () -> begin
     fid = popPS()
     close(openFiles[fid])
     delete!(openFiles, fid)
+
+    pushPS(0) # Result code 0
     return NEXT
 end)
 
@@ -661,6 +668,7 @@ CLOSE_FILES_CFA = defPrimWord("CLOSE-FILES", () -> begin
     end
     empty!(openFiles)
 
+    pushPS(0) # Result code 0
     return NEXT
 end)
 
@@ -955,7 +963,7 @@ end)
 TIB_CFA = defConst("TIB", TIB)
 NUMTIB, NUMTIB_CFA = defNewVar("#TIB", 0)
 
-FIB_CFA = defConst("FIB", TIB)
+FIB_CFA = defConst("FIB", FIB)
 NUMFIB, NUMFIB_CFA = defNewVar("#FIB", 0)
 
 TOIN, TOIN_CFA = defNewVar(">IN", 0)
@@ -979,6 +987,8 @@ QUERY_CFA = defWord("QUERY",
     LIT_CFA, 0, TOIN_CFA, STORE_CFA,
     EXIT_CFA])
 
+# ( fid -- flag )
+# Flag is false when EOF is reached.
 QUERY_FILE_CFA = defWord("QUERY-FILE",
     [FIB_CFA, LIT_CFA, 160, ROT_CFA, READ_LINE_CFA,
     DROP_CFA, SWAP_CFA,
@@ -1203,30 +1213,29 @@ 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])
 
-INTERPRET_CFA = defWord("INTERPRET",
+INCLUDED_CFA = defWord("INCLUDED",
     [SOURCE_ID_CFA, FETCH_CFA, TOR_CFA, # Store current source on return stack
-
-    LIT_CFA, 32, WORD_CFA, # Read next word from current input source
-
-    FAM_RO_CFA, FILE_OPEN, DROP_CFA, # Open the file named by this word.
-
+    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,
+    EXIT_CFA])
 
-    BRANCH_CFA, -4]
+INCLUDE_CFA = defWord("INCLUDE", [LIT_CFA, 32, WORD_CFA, INCLUDED_CFA, EXIT_CFA]);
 
 
 ABORT_CFA = defWord("ABORT",
-    [CLOSE_FILES_CFA, PSP0_CFA, PSPSTORE_CFA, QUIT_CFA])
+    [CLOSE_FILES_CFA, DROP_CFA, PSP0_CFA, PSPSTORE_CFA, QUIT_CFA])
 
 BYE_CFA = defPrimWord("BYE", () -> begin
     println("\nBye!")
@@ -1249,12 +1258,19 @@ end
 
 function run(;initialize=true)
 
+    # Start with IP pointing to first instruction of outer interpreter
+    pushRS(QUIT_CFA+1)
+
+    # Load library files
     global initialized, initFileName
     if !initialized && initialize
         if initFileName != nothing
             print("Including definitions from $initFileName...")
 
-            # TODO
+            putString(initFileName, mem[H])
+            pushPS(mem[H])
+            pushPS(length(initFileName))
+            pushRS(INCLUDED_CFA+1)
 
             initialized = true
         else
@@ -1262,15 +1278,15 @@ function run(;initialize=true)
         end
     end
 
-    # Start with IP pointing to first instruction of outer interpreter
-    reg.IP = QUIT_CFA + 1
 
     # Primitive processing loop.
     # Everyting else is simply a consequence of this loop!
-    jmp = NEXT
+    jmp = mem[EXIT_CFA]
     while jmp != 0
         try
-            #println("Entering prim $(getPrimName(jmp))")
+            #print("Entering prim $(getPrimName(jmp)), PS: ")
+            #printPS()
+
             jmp = callPrim(jmp)
 
         catch ex