Added open-file and 2 FAMs

[forth.jl.git] / src / forth.jl

diff --git a/src/forth.jl b/src/forth.jl
index 51714f4..e8c5dbd 100644 (file)
--- a/src/forth.jl
+++ b/src/forth.jl
@@ -600,24 +600,47 @@ end)
 
 # I/O
 
-sources = Array{Any,1}()
-currentSource() = sources[length(sources)]
+openFiles = Dict{Int64,IOStream}()
+nextFileID = 1
+SOURCE_ID, SOURCE_ID_CFA = defNewVar("SOURCE-ID", 0)
 
-CLOSEFILES_CFA = defPrimWord("CLOSEFILES", () -> begin
-    while currentSource() != STDIN
-        close(pop!(sources))
-    end
 
-    return NEXT
-end)
+## File access modes
+FAM_RO = 0
+FAM_WO = 1
+FAM_RO_CFA = defConst("R/O", FAM_RO)
+FAM_WO_CFA = defConst("W/O", FAM_WO)
 
-EOF_CFA = defPrimWord("\x04", () -> begin
-    if currentSource() != STDIN
-        close(pop!(sources))
+OPEN_FILE_CFA = defPrimWord("OPEN-FILE", () -> begin
+    fnameLen = popPS()
+    fnameAddr = popPS()
+    fam = popPS()
+
+    fname = getString(fnameAddr, fnameLen)
+
+    if (!isfile(fname))
+        pushPS(0)
+        pushPS(-1) # error
         return NEXT
+    end
+
+    if (fam == FAM_RO)
+        mode = "r"
     else
-        return 0
+        mode = "w"
     end
+
+    openFiles[nextFileID] = open(fname, mode)
+    pushPS(nextFileID)
+    pushPS(0)
+    
+    nextFileID += 1
+
+    return NEXT
+end);
+
+CREATE_FILE_CFA = defPrimWord("CREATE-FILE", () -> begin
+    return NEXT
 end)
 
 EMIT_CFA = defPrimWord("EMIT", () -> begin
@@ -726,15 +749,7 @@ EXPECT_CFA = defPrimWord("EXPECT", () -> begin
     maxLen = popPS()
     addr = popPS()
 
-    if currentSource() == STDIN
-        line = getLineFromSTDIN()
-    else
-        if !eof(currentSource())
-            line = chomp(readline(currentSource()))
-        else
-            line = "\x04" # eof
-        end
-    end
+    line = getLineFromSTDIN()
 
     mem[SPAN] = min(length(line), maxLen)
     putString(line, addr, maxLen)
@@ -1038,8 +1053,10 @@ CODE_CFA = defPrimWord("CODE", () -> begin
     exprString = "() -> begin\n"
     while true
         if mem[TOIN] >= mem[NUMTIB]
-            println()
             exprString = string(exprString, "\n")
+            if currentSource() == STDIN
+                println()
+            end
 
             pushPS(TIB)
             pushPS(160)
@@ -1107,12 +1124,10 @@ INTERPRET_CFA = defWord("INTERPRET",
     EXIT_CFA])
 
 PROMPT_CFA = defPrimWord("PROMPT", () -> begin
-    if currentSource() == STDIN
-        if mem[STATE] == 0
-            print(" ok")
-        end
-        println()
+    if mem[STATE] == 0
+        print(" ok")
     end
+    println()
 
     return NEXT
 end)