X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=forth.jl.git;a=blobdiff_plain;f=src%2Fforth.jl;h=3526960f1425e797a2a95b89b0b2a5b4f6036486;hp=5c09b49ece19da5e0657e30ace595407c9d83a7f;hb=3e8e7d92da6a3231816f97d30c2222a4ff19ddda;hpb=d937593337d4f3a03fcf689b46c977d70a2171ee diff --git a/src/forth.jl b/src/forth.jl index 5c09b49..3526960 100644 --- a/src/forth.jl +++ b/src/forth.jl @@ -9,6 +9,7 @@ size_mem = 1000000 # 1 mega-int size_RS = 1000 # Return stack size size_PS = 1000 # Parameter stack size size_TIB = 1000 # Terminal input buffer size +size_FIB = 1000 # File input buffer size # Memory arrays mem = Array{Int64,1}(size_mem) @@ -25,7 +26,8 @@ CURRENT = nextVarAddr; nextVarAddr += 1 # Current compilation dict RSP0 = nextVarAddr # bottom of RS PSP0 = RSP0 + size_RS # bottom of PS TIB = PSP0 + size_PS # address of terminal input buffer -mem[H] = TIB + size_TIB # location of bottom of dictionary +FIB = TIB + size_TIB # address of terminal input buffer +mem[H] = FIB + size_FIB # location of bottom of dictionary mem[FORTH_LATEST] = 0 # zero FORTH dict latest (no previous def) mem[CURRENT] = FORTH_LATEST-1 # Compile words to system dict initially @@ -97,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] @@ -600,26 +606,95 @@ end) # I/O -sources = Array{Any,1}() -currentSource() = sources[length(sources)] +openFiles = Dict{Int64,IOStream}() +nextFileID = 1 + + +## 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) + +function fileOpener(create::Bool) + fam = popPS() + fnameLen = popPS() + fnameAddr = popPS() + + fname = getString(fnameAddr, fnameLen) + + if create && !isfile(fname) + pushPS(0) + pushPS(-1) # error + return NEXT + end -CLOSEFILES_CFA = defPrimWord("CLOSEFILES", () -> begin - while currentSource() != STDIN - close(pop!(sources)) + if (fam == FAM_RO) + mode = "r" + else + mode = "w" end + global nextFileID + openFiles[nextFileID] = open(fname, mode) + pushPS(nextFileID) + pushPS(0) + + nextFileID += 1 +end + +OPEN_FILE_CFA = defPrimWord("OPEN-FILE", () -> begin + fileOpener(false) + return NEXT +end); + +CREATE_FILE_CFA = defPrimWord("CREATE-FILE", () -> begin + fileOpener(true) + return NEXT +end); + +CLOSE_FILE_CFA = defPrimWord("CLOSE-FILE", () -> begin + fid = popPS() + close(openFiles[fid]) + delete!(openFiles, fid) + + pushPS(0) # Result code 0 return NEXT end) -EOF_CFA = defPrimWord("\x04", () -> begin - if currentSource() != STDIN - close(pop!(sources)) - return NEXT - else - return 0 +CLOSE_FILES_CFA = defPrimWord("CLOSE-FILES", () -> begin + for fh in values(openFiles) + close(fh) 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) + EMIT_CFA = defPrimWord("EMIT", () -> begin print(Char(popPS())) return NEXT @@ -726,15 +801,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) @@ -897,19 +964,59 @@ end) TIB_CFA = defConst("TIB", TIB) NUMTIB, NUMTIB_CFA = defNewVar("#TIB", 0) + +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() + callPrim(mem[SOURCE_CFA]) + sizeAddr = popPS() + bufferAddr = popPS() + # Chew up initial occurrences of delim - while (mem[TOIN] begin # Start reading in word count = 0 - while (mem[TOIN] begin mem[countAddr] = count pushPS(countAddr) + println("Processing word: '$(getString(countAddr+1,mem[countAddr]))' (state $(mem[STATE]))") + return NEXT end) @@ -1030,6 +1139,45 @@ IMMEDIATE_CFA = defPrimWord("IMMEDIATE", () -> begin return NEXT end, flags=F_IMMED) +CODE_CFA = defPrimWord("CODE", () -> begin + pushPS(32) + callPrim(mem[WORD_CFA]) + callPrim(mem[HEADER_CFA]) + + exprString = "() -> begin\n" + while true + if mem[TOIN] >= mem[NUMTIB] + exprString = string(exprString, "\n") + if currentSource() == STDIN + println() + end + + pushPS(TIB) + pushPS(160) + callPrim(mem[EXPECT_CFA]) + mem[NUMTIB] = mem[SPAN] + mem[TOIN] = 0 + end + + pushPS(32) + callPrim(mem[WORD_CFA]) + cAddr = popPS() + thisWord = getString(cAddr+1, mem[cAddr]) + + if uppercase(thisWord) == "END-CODE" + break + end + + exprString = string(exprString, " ", thisWord) + end + exprString = string(exprString, "\nreturn NEXT\nend") + + func = eval(parse(exprString)) + dictWrite(defPrim(func)) + + return NEXT +end) + # Outer Interpreter EXECUTE_CFA = defPrimWord("EXECUTE", () -> begin @@ -1041,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 @@ -1070,57 +1218,53 @@ 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) 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", - [CLOSEFILES_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) -# File I/O - -INCLUDE_CFA = defPrimWord("INCLUDE", () -> begin - pushPS(32) - callPrim(mem[WORD_CFA]) - wordAddr = popPS()+1 - wordLen = mem[wordAddr-1] - word = getString(wordAddr, wordLen) - - fname = word - if !isfile(fname) - fname = Pkg.dir("forth","src",word) - if !isfile(fname) - error("No file named $word found in current directory or package source directory.") - end - end - push!(sources, open(fname, "r")) - - # Clear input buffer - mem[NUMTIB] = 0 - - return NEXT +EOF_CFA = defPrimWord("\x04", () -> begin + return 0 end) - #### VM loop #### initialized = false @@ -1132,39 +1276,42 @@ elseif isfile(Pkg.dir("forth","src", "lib.4th")) end function run(;initialize=true) - # Begin with STDIN as source - push!(sources, STDIN) + # 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...") - push!(sources, open(initFileName, "r")) + + putString(initFileName, mem[H]) + pushPS(mem[H]) + pushPS(length(initFileName)) + pushRS(INCLUDED_CFA+1) + initialized = true else println("No library file found. Only primitive words available.") 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 showerror(STDOUT, ex) println() - while !isempty(sources) && currentSource() != STDIN - close(pop!(sources)) - end - # QUIT reg.IP = ABORT_CFA + 1 jmp = NEXT