X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=forth.jl.git;a=blobdiff_plain;f=src%2Fforth.jl;h=ead0bbc3a2bb3a0a2f596d6fb866185af5bcdcd2;hp=6afe492e4280322ff0c759209a640b3f063dc020;hb=6a34e447b5d32310f63850a794816e30e350cc5c;hpb=30a093845e2d1097242e948bb577fb71f73bc860 diff --git a/src/forth.jl b/src/forth.jl index 6afe492..ead0bbc 100644 --- a/src/forth.jl +++ b/src/forth.jl @@ -1,6 +1,6 @@ module forth -import Base.REPLCompletions +import REPL.REPLCompletions, Base.invokelatest, Pkg # VM mem size size_mem = 1000000 # 1 mega-int @@ -12,9 +12,9 @@ size_TIB = 1000 # Terminal input buffer size size_FIB = 1000 # File input buffer size # Memory arrays -mem = Array{Int64,1}(size_mem) -primitives = Array{Function,1}() -primNames = Array{AbstractString,1}() +mem = Array{Int64,1}(undef,size_mem) +primitives = Array{Function,1}(undef, 0) +primNames = Array{AbstractString,1}(undef, 0) # Memory geography and built-in variables @@ -34,7 +34,7 @@ mem[CURRENT] = FORTH_LATEST-1 # Compile words to system dict initially DICT = mem[H] # Save bottom of dictionary as constant # VM registers -type Reg +mutable struct Reg RSP::Int64 # Return stack pointer PSP::Int64 # Parameter/data stack pointer IP::Int64 # Instruction pointer @@ -97,7 +97,7 @@ end # Handy functions for adding/retrieving strings to/from memory. -getString(addr::Int64, len::Int64) = AbstractString([Char(c) for c in mem[addr:(addr+len-1)]]) +getString(addr::Int64, len::Int64) = String([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] @@ -114,7 +114,7 @@ stringAsInts(str::AbstractString) = [Int(c) for c in collect(str)] function defPrim(f::Function; name="nameless") push!(primitives, f) - push!(primNames, replace(name, "\004", "EOF")) + push!(primNames, replace(name, "\004" => "EOF")) return -length(primitives) end @@ -123,7 +123,7 @@ function callPrim(addr::Int64) if addr >=0 || -addr>length(primitives) error("Attempted to execute non-existent primitive at address $addr.") else - primitives[-addr]() + invokelatest(primitives[-addr]) end end getPrimName(addr::Int64) = primNames[-addr] @@ -501,7 +501,7 @@ end) XOR_CFA = defPrimWord("XOR", () -> begin b = popPS() a = popPS() - pushPS(a $ b) + pushPS(xor(a, b)) return NEXT end) @@ -677,14 +677,16 @@ READ_LINE_CFA = defPrimWord("READ-LINE", () -> begin maxSize = popPS() addr = popPS() + if !(fid in keys(openFiles)) + error(string("Invalid FID ", fid, ".")) + end + fh = openFiles[fid] - line = readline(fh) + line = readline(fh, keep=true) eofFlag = endswith(line, '\n') ? 0 : -1 line = chomp(line) - #println("Reading: $line"); - putString(line, addr, maxSize) pushPS(length(line)) @@ -694,6 +696,25 @@ READ_LINE_CFA = defPrimWord("READ-LINE", () -> begin return NEXT end) +READ_FILE_CFA = defPrimWord("READ-FILE", () -> begin + fid = popPS() + size = popPS() + addr = popPS() + + fh = openFiles[fid] + + string = join(map(x -> Char(x), read(fh, size)), "") + + eofFlag = length(string) == size ? 0 : -1 ; + + putString(string, addr, length(string)) + + pushPS(length(string)) + pushPS(eofFlag) + + return NEXT +end) + EMIT_CFA = defPrimWord("EMIT", () -> begin print(Char(popPS())) @@ -701,14 +722,14 @@ EMIT_CFA = defPrimWord("EMIT", () -> begin end) function raw_mode!(mode::Bool) - if ccall(:jl_tty_set_mode, Int32, (Ptr{Void}, Int32), STDIN.handle, mode) != 0 + if ccall(:jl_tty_set_mode, Int32, (Ptr{Nothing}, Int32), stdin.handle, mode) != 0 throw("FATAL: Terminal unable to enter raw mode.") end end function getKey() raw_mode!(true) - byte = readbytes(STDIN, 1)[1] + byte = read(stdin, 1)[1] raw_mode!(false) if byte == 0x0d @@ -729,9 +750,9 @@ function getLineFromSTDIN() function getFrag(s) chars = collect(s) - slashIdx = findlast(chars, '\\') + slashIdx = findlast(isequal('\\'), chars) - if slashIdx > 0 + if slashIdx != nothing return join(chars[slashIdx:length(chars)]) else return nothing @@ -750,7 +771,7 @@ function getLineFromSTDIN() if key == '\n' print(" ") - return AbstractString(line) + return String(line) elseif key == '\x04' if isempty(line) @@ -816,7 +837,7 @@ NUMBER_CFA = defPrimWord("NUMBER", () -> begin s = getString(wordAddr, wordLen) - pushPS(parse(Int64, s, mem[BASE])) + pushPS(parse(Int64, s, base=mem[BASE])) return NEXT end) @@ -1110,7 +1131,7 @@ end, flags=F_IMMED) HIDDEN_CFA = defPrimWord("HIDDEN", () -> begin lenAndFlagsAddr = mem[mem[CURRENT]+1] + 1 - mem[lenAndFlagsAddr] = mem[lenAndFlagsAddr] $ F_HIDDEN + mem[lenAndFlagsAddr] = xor(mem[lenAndFlagsAddr], F_HIDDEN) return NEXT end) @@ -1130,46 +1151,22 @@ SEMICOLON_CFA = defWord(";", IMMEDIATE_CFA = defPrimWord("IMMEDIATE", () -> begin lenAndFlagsAddr = mem[mem[CURRENT]+1] + 1 - mem[lenAndFlagsAddr] = mem[lenAndFlagsAddr] $ F_IMMED + mem[lenAndFlagsAddr] = xor(mem[lenAndFlagsAddr], F_IMMED) 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") - +# ( addr n -- primAddr ) +CREATE_PRIM_CFA = defPrimWord("CREATE-PRIM", () -> begin + len = popPS() + addr = popPS() + + exprString = string("() -> begin\n", + getString(addr, len), "\n", + "return NEXT\n", + "end") func = eval(parse(exprString)) - dictWrite(defPrim(func)) + pushPS(defPrim(func)) return NEXT end) @@ -1243,7 +1240,9 @@ INCLUDED_CFA = defWord("INCLUDED", 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 + 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, @@ -1251,12 +1250,13 @@ INCLUDE_CFA = defWord("INCLUDE", [LIT_CFA, 32, WORD_CFA, SWAP_CFA, FETCH_CFA, INCLUDED_CFA, EXIT_CFA]); - ABORT_CFA = defWord("ABORT", [CLOSE_FILES_CFA, DROP_CFA, PSP0_CFA, PSPSTORE_CFA, QUIT_CFA]) BYE_CFA = defPrimWord("BYE", () -> begin - println("\nBye!") + if mem[SOURCE_ID_VAR] == 0 + println("\nBye!") + end return 0 end) @@ -1264,31 +1264,63 @@ EOF_CFA = defPrimWord("\x04", () -> begin return 0 end) +### Library loading ### + +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]); + +SKIP_WELCOME, SKIP_WELCOME_CFA = defNewVar("SKIP-WELCOME", 0) + #### 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 +libFileName = "lib.4th" -function run(;initialize=true) +function run(fileName=nothing; initialize=true) # Start with IP pointing to first instruction of outer interpreter pushRS(QUIT_CFA+1) + # Include optional file + if fileName != nothing + putString(fileName, mem[H]) + pushPS(mem[H]) + mem[H] += length(fileName) + pushPS(length(fileName)) + pushRS(INCLUDED_CFA+1) + + mem[SKIP_WELCOME] = -1 + end + # Load library files - global initialized, initFileName + global initialized, libFileName if !initialized && initialize - if initFileName != nothing - print("Including definitions from $initFileName...") + if libFileName != nothing + #print("Including definitions from $libFileName...") - putString(initFileName, mem[H]) + putString(libFileName, mem[H]) pushPS(mem[H]) - pushPS(length(initFileName)) - pushRS(INCLUDED_CFA+1) + pushPS(length(libFileName)) + pushRS(INCLUDED_LIB_CFA+1) initialized = true else @@ -1308,7 +1340,8 @@ function run(;initialize=true) jmp = callPrim(jmp) catch ex - showerror(STDOUT, ex) + println(string("Error in primitive '", getPrimName(jmp), "' at address ", jmp)) + showerror(stdout, ex) println() # QUIT @@ -1331,7 +1364,7 @@ TRACE_CFA = defPrimWord("TRACE", () -> begin end) function dump(startAddr::Int64; count::Int64 = 100, cellsPerLine::Int64 = 10) - chars = Array{Char,1}(cellsPerLine) + chars = Array{Char,1}(undef, cellsPerLine) lineStartAddr = cellsPerLine*div((startAddr-1),cellsPerLine) + 1 endAddr = startAddr + count - 1 @@ -1359,7 +1392,7 @@ function dump(startAddr::Int64; count::Int64 = 100, cellsPerLine::Int64 = 10) i += 1 end - println("\t", AbstractString(chars)) + println("\t", String(chars)) end end