eofFlag = endswith(line, '\n') ? 0 : -1
line = chomp(line)
- println("Reading: $line");
+ #println("Reading: $line");
putString(line, addr, maxSize)
FIB_CFA = defConst("FIB", FIB)
NUMFIB, NUMFIB_CFA = defNewVar("#FIB", 0)
-TOIN, TOIN_CFA = defNewVar(">IN", 0)
-
-SOURCE_ID, SOURCE_ID_CFA = defNewVar("SOURCE-ID", 0)
+IB_CFA = defPrimWord("IB", () -> begin
+ pushPS(mem[SOURCE_ID_VAR] == 0 ? TIB : FIB)
+ return NEXT
+end)
-SOURCE_CFA = defPrimWord("SOURCE", () -> begin
- if mem[SOURCE_ID] == 0
- pushPS(TIB)
- pushPS(NUMTIB)
- else
- pushPS(FIB)
- pushPS(NUMFIB)
- end
+NUMIB_CFA = defPrimWord("#IB", () -> begin
+ pushPS(mem[SOURCE_ID_VAR] == 0 ? NUMTIB : NUMFIB)
return NEXT
end)
+TOIN, TOIN_CFA = defNewVar(">IN", 0)
+
+SOURCE_ID_VAR, SOURCE_ID_VAR_CFA = defNewVar("SOURCE-ID-VAR", 0)
+
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])
-# ( fid -- flag )
-# Flag is false when EOF is reached.
+EOF_FLAG, EOF_FLAG_CFA = defNewVar("EOF-FLAG", 0)
+
+# ( fid -- )
+# EOF-FLAG set to true if EOF is reached
QUERY_FILE_CFA = defWord("QUERY-FILE",
[FIB_CFA, LIT_CFA, 160, ROT_CFA, READ_LINE_CFA,
- DROP_CFA, SWAP_CFA,
+ DROP_CFA, EOF_FLAG_CFA, STORE_CFA,
NUMFIB_CFA, STORE_CFA,
+ LIT_CFA, 0, TOIN_CFA, STORE_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)
mem[countAddr] = count
pushPS(countAddr)
- #println("Processing word: '$(getString(countAddr+1,mem[countAddr]))'")
+ #println("Processing word: '$(getString(countAddr+1,mem[countAddr]))' (state $(mem[STATE]))")
return NEXT
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
BRANCH_CFA,-4]) # Loop
INCLUDED_CFA = defWord("INCLUDED",
- [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
+ [LIT_CFA, 0, STATE_CFA, STORE_CFA, # Set mode to interpret
+ FAM_RO_CFA, OPEN_FILE_CFA, DROP_CFA, # Open the 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_VAR_CFA, FETCH_CFA,
+ CLOSE_FILE_CFA, DROP_CFA, # Close file
+ SOURCE_ID_VAR_CFA, STORE_CFA, # Restore input source
+ LIT_CFA, 0, NUMIB_CFA, STORE_CFA, # Zero #IB
+ LIT_CFA, 0, TOIN_CFA, STORE_CFA, # Zero >IN
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]);
+oldCWD = ""
+SETLIBCWD_CFA = defPrimWord("SETLIBCWD", () -> begin
+ global oldCWD = pwd()
+ if !isfile("lib.4th") # Exception for debugging.
+ cd(Pkg.dir("forth","src"))
+ end
+ return NEXT
+end)
+
+RESTORECWD_CFA = defPrimWord("RESTORECWD", () -> begin
+ cd(oldCWD)
+ return NEXT
+end)
+
+INCLUDED_LIB_CFA = defWord("INCLUDED-LIB",
+ [SETLIBCWD_CFA, INCLUDED_CFA, RESTORECWD_CFA, EXIT_CFA])
+
+INCLUDE_LIB_CFA = defWord("INCLUDE-LIB", [LIT_CFA, 32, WORD_CFA,
+ DUP_CFA, INCR_CFA,
+ SWAP_CFA, FETCH_CFA,
+ INCLUDED_LIB_CFA, EXIT_CFA]);
ABORT_CFA = defWord("ABORT",
[CLOSE_FILES_CFA, DROP_CFA, PSP0_CFA, PSPSTORE_CFA, QUIT_CFA])
#### VM loop ####
initialized = false
-initFileName = nothing
-if isfile("lib.4th")
- initFileName = "lib.4th"
-elseif isfile(Pkg.dir("forth","src", "lib.4th"))
- initFileName = Pkg.dir("forth","src","lib.4th")
-end
+initFileName = "lib.4th"
function run(;initialize=true)
putString(initFileName, mem[H])
pushPS(mem[H])
pushPS(length(initFileName))
- pushRS(INCLUDED_CFA+1)
+ pushRS(INCLUDED_LIB_CFA+1)
initialized = true
else