X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=forth.jl.git;a=blobdiff_plain;f=src%2Fforth.jl;h=3526960f1425e797a2a95b89b0b2a5b4f6036486;hp=628f3798e70bb78ba74b82d8647eb38504672c43;hb=3e8e7d92da6a3231816f97d30c2222a4ff19ddda;hpb=ab1ea50ecc71a0d472d20eb986d2b49ffb08a37f diff --git a/src/forth.jl b/src/forth.jl index 628f379..3526960 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] @@ -604,7 +608,6 @@ end) openFiles = Dict{Int64,IOStream}() nextFileID = 1 -SOURCE_ID, SOURCE_ID_CFA = defNewVar("SOURCE-ID", 0) ## File access modes @@ -614,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) @@ -632,6 +635,7 @@ function fileOpener(create::Bool) mode = "w" end + global nextFileID openFiles[nextFileID] = open(fname, mode) pushPS(nextFileID) pushPS(0) @@ -653,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) @@ -662,10 +668,29 @@ CLOSE_FILES_CFA = defPrimWord("CLOSE-FILES", () -> begin end empty!(openFiles) + pushPS(0) # Result code 0 return NEXT end) READ_LINE_CFA = defPrimWord("READ-LINE", () -> begin + fid = popPS() + maxSize = popPS() + addr = popPS() + + fh = openFiles[fid] + line = readline(fh) + + eofFlag = endswith(line, '\n') ? 0 : -1 + line = chomp(line) + + println("Reading: $line"); + + putString(line, addr, maxSize) + + pushPS(length(line)) + pushPS(eofFlag) + pushPS(0) + return NEXT end) @@ -940,33 +965,55 @@ 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) +IB_CFA = defPrimWord("IB", () -> begin + pushPS(mem[SOURCE_ID] == 0 ? TIB : FIB) + return NEXT +end) + +NUMIB_CFA = defPrimWord("#IB", () -> begin + pushPS(mem[SOURCE_ID] == 0 ? NUMTIB : NUMFIB) + return NEXT +end) + 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]) +# ( 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, NUMFIB_CFA, STORE_CFA, + LIT_CFA, 0, TOIN_CFA, STORE_CFA, EXIT_CFA]) WORD_CFA = defPrimWord("WORD", () -> begin delim = popPS() - if mem[SOURCE_ID] == 0 - bufferAddr = TIB - sizeAddr = NUMTIB - else - bufferAddr = FIB - sizeAddr = NUMFIB - end + callPrim(mem[SOURCE_CFA]) + sizeAddr = popPS() + bufferAddr = popPS() # 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) @@ -1140,7 +1189,7 @@ INTERPRET_CFA = defWord("INTERPRET", [LIT_CFA, 32, WORD_CFA, # Read next space-delimited word DUP_CFA, FETCH_CFA, ZE_CFA, ZBRANCH_CFA, 3, - DROP_CFA, EXIT_CFA, # Exit if TIB is exhausted + DROP_CFA, EXIT_CFA, # Exit if input buffer is exhausted STATE_CFA, FETCH_CFA, ZBRANCH_CFA, 24, # Compiling @@ -1178,21 +1227,44 @@ 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_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", + [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 + EXIT_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!") return 0 end) +EOF_CFA = defPrimWord("\x04", () -> begin + return 0 +end) + #### VM loop #### initialized = false @@ -1205,12 +1277,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 @@ -1218,15 +1297,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