X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=src%2Fforth.jl;h=a1a479970a797af829c01f1bc142bbccb3b63a04;hb=492989e5e479cebefe9213a0c350534528d5f819;hp=37c41ecd904585aeb08818976366039ceceaf834;hpb=b45f369dd68575aa774d2122eaf9b6ec4ec49cb5;p=forth.jl.git diff --git a/src/forth.jl b/src/forth.jl index 37c41ec..a1a4799 100644 --- a/src/forth.jl +++ b/src/forth.jl @@ -617,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) @@ -635,6 +635,7 @@ function fileOpener(create::Bool) mode = "w" end + global nextFileID openFiles[nextFileID] = open(fname, mode) pushPS(nextFileID) pushPS(0) @@ -656,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) @@ -665,6 +668,7 @@ CLOSE_FILES_CFA = defPrimWord("CLOSE-FILES", () -> begin end empty!(openFiles) + pushPS(0) # Result code 0 return NEXT end) @@ -679,6 +683,8 @@ READ_LINE_CFA = defPrimWord("READ-LINE", () -> begin eofFlag = endswith(line, '\n') ? 0 : -1 line = chomp(line) + #println("Reading: $line"); + putString(line, addr, maxSize) pushPS(length(line)) @@ -959,44 +965,50 @@ 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) - -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] begin mem[countAddr] = count pushPS(countAddr) + #println("Processing word: '$(getString(countAddr+1,mem[countAddr]))' (state $(mem[STATE]))") + return NEXT end) @@ -1208,27 +1222,40 @@ PROMPT_CFA = defPrimWord("PROMPT", () -> begin end) QUIT_CFA = defWord("QUIT", - [LIT_CFA, 0, STATE_CFA, STORE_CFA, - LIT_CFA, 0, NUMTIB_CFA, STORE_CFA, - RSP0_CFA, RSPSTORE_CFA, - QUERY_CFA, - INTERPRET_CFA, PROMPT_CFA, - BRANCH_CFA,-4]) + [LIT_CFA, 0, STATE_CFA, STORE_CFA, # Set mode to interpret + 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 + INTERPRET_CFA, PROMPT_CFA, # Interpret line + BRANCH_CFA,-4]) # Loop INCLUDED_CFA = defWord("INCLUDED", - [SOURCE_ID_CFA, FETCH_CFA, TOR_CFA, # Store current source on return stack - 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, - DROP_CFA, EXIT_CFA]) + [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]); +INCLUDE_CFA = defWord("INCLUDE", [LIT_CFA, 32, WORD_CFA, + DUP_CFA, INCR_CFA, + SWAP_CFA, FETCH_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!") @@ -1260,7 +1287,10 @@ function run(;initialize=true) 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 @@ -1274,7 +1304,9 @@ function run(;initialize=true) 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