X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=forth.jl.git;a=blobdiff_plain;f=src%2Fforth.jl;h=4c81dc35b59f305078a7a2a08f4e95927b640b8b;hp=3526960f1425e797a2a95b89b0b2a5b4f6036486;hb=2de79279a0f7157a41c0f32674ba96f56cb1b02f;hpb=3e8e7d92da6a3231816f97d30c2222a4ff19ddda diff --git a/src/forth.jl b/src/forth.jl index 3526960..4c81dc3 100644 --- a/src/forth.jl +++ b/src/forth.jl @@ -1,6 +1,6 @@ module forth -import Base.REPLCompletions +import Base.REPLCompletions, Base.invokelatest # VM mem size size_mem = 1000000 # 1 mega-int @@ -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] @@ -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) @@ -678,13 +678,11 @@ READ_LINE_CFA = defPrimWord("READ-LINE", () -> begin addr = popPS() fh = openFiles[fid] - line = readline(fh) + line = readline(fh, chomp=false) eofFlag = endswith(line, '\n') ? 0 : -1 line = chomp(line) - println("Reading: $line"); - putString(line, addr, maxSize) pushPS(length(line)) @@ -694,6 +692,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())) @@ -708,7 +725,7 @@ end function getKey() raw_mode!(true) - byte = readbytes(STDIN, 1)[1] + byte = read(STDIN, 1)[1] raw_mode!(false) if byte == 0x0d @@ -750,7 +767,7 @@ function getLineFromSTDIN() if key == '\n' print(" ") - return AbstractString(line) + return String(line) elseif key == '\x04' if isempty(line) @@ -969,29 +986,18 @@ FIB_CFA = defConst("FIB", FIB) NUMFIB, NUMFIB_CFA = defNewVar("#FIB", 0) IB_CFA = defPrimWord("IB", () -> begin - pushPS(mem[SOURCE_ID] == 0 ? TIB : FIB) + pushPS(mem[SOURCE_ID_VAR] == 0 ? TIB : FIB) return NEXT end) NUMIB_CFA = defPrimWord("#IB", () -> begin - pushPS(mem[SOURCE_ID] == 0 ? NUMTIB : NUMFIB) + pushPS(mem[SOURCE_ID_VAR] == 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) +SOURCE_ID_VAR, SOURCE_ID_VAR_CFA = defNewVar("SOURCE-ID-VAR", 0) QUERY_CFA = defWord("QUERY", [TIB_CFA, LIT_CFA, 160, EXPECT_CFA, @@ -999,11 +1005,13 @@ QUERY_CFA = defWord("QUERY", 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]) @@ -1011,9 +1019,13 @@ QUERY_FILE_CFA = defWord("QUERY-FILE", 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]))") + #println("Processing word: '$(getString(countAddr+1,mem[countAddr]))' (state $(mem[STATE]))") return NEXT end) @@ -1115,7 +1127,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) @@ -1135,46 +1147,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) @@ -1228,7 +1216,7 @@ 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 @@ -1236,15 +1224,21 @@ QUIT_CFA = defWord("QUIT", 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, @@ -1252,12 +1246,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) @@ -1265,31 +1260,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 @@ -1360,7 +1387,7 @@ function dump(startAddr::Int64; count::Int64 = 100, cellsPerLine::Int64 = 10) i += 1 end - println("\t", AbstractString(chars)) + println("\t", String(chars)) end end