X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=src%2Fforth.jl;h=f10b9637a7247b2904df7926adf56efd0fb21f8d;hb=05df6187b8d42844f2813162e6ba8265b816a287;hp=dd808bb788b47ff28ef0054ae98d53196e7c7c1f;hpb=c564df1ac9c430207bb7f64b8f39f61bdf97e099;p=forth.jl.git diff --git a/src/forth.jl b/src/forth.jl index dd808bb..f10b963 100644 --- a/src/forth.jl +++ b/src/forth.jl @@ -1,5 +1,7 @@ module forth +import Base.REPLCompletions + # VM mem size size_mem = 1000000 # 1 mega-int @@ -11,7 +13,7 @@ size_TIB = 1000 # Terminal input buffer size # Memory arrays mem = Array{Int64,1}(size_mem) primitives = Array{Function,1}() -primNames = Array{ASCIIString,1}() +primNames = Array{AbstractString,1}() # Memory geography and built-in variables @@ -46,13 +48,26 @@ function ensurePSDepth(depth::Int64) end end +function ensurePSCapacity(toAdd::Int64) + if reg.PSP + toAdd >= PSP0 + size_PS + error("Parameter stack overflow.") + end +end + function ensureRSDepth(depth::Int64) if reg.RSP - RSP0 < depth error("Return stack underflow.") end end +function ensureRSCapacity(toAdd::Int64) + if reg.RSP + toAdd >= RSP0 + size_RS + error("Return stack overflow.") + end +end + function pushRS(val::Int64) + ensureRSCapacity(1) mem[reg.RSP+=1] = val end @@ -65,6 +80,8 @@ function popRS() end function pushPS(val::Int64) + ensurePSCapacity(1) + mem[reg.PSP += 1] = val end @@ -78,13 +95,14 @@ end # Handy functions for adding/retrieving strings to/from memory. -getString(addr::Int64, len::Int64) = ASCIIString([Char(c) for c in mem[addr:(addr+len-1)]]) +getString(addr::Int64, len::Int64) = AbstractString([Char(c) for c in mem[addr:(addr+len-1)]]) -function putString(str::ASCIIString, addr::Int64) - mem[addr:(addr+length(str)-1)] = [Int64(c) for c in str] +function putString(str::AbstractString, addr::Int64, maxLen::Int64) + len = min(length(str), maxLen) + mem[addr:(addr+len-1)] = [Int64(c) for c in str] end -stringAsInts(str::ASCIIString) = [Int(c) for c in collect(str)] +stringAsInts(str::AbstractString) = [Int(c) for c in collect(str)] # Primitive creation and calling functions @@ -116,7 +134,7 @@ function dictWrite(ints::Array{Int64,1}) mem[H] += length(ints) end dictWrite(int::Int64) = dictWrite([int]) -dictWriteString(string::ASCIIString) = dictWrite([Int64(c) for c in string]) +dictWriteString(string::AbstractString) = dictWrite([Int64(c) for c in string]) function createHeader(name::AbstractString, flags::Int64) mem[mem[H]] = mem[mem[CURRENT]+1] @@ -582,25 +600,9 @@ end) # I/O -sources = Array{Any,1}() -currentSource() = sources[length(sources)] - -CLOSEFILES_CFA = defPrimWord("CLOSEFILES", () -> begin - while currentSource() != STDIN - close(pop!(sources)) - end - - return NEXT -end) - -EOF_CFA = defPrimWord("\x04", () -> begin - if currentSource() != STDIN - close(pop!(sources)) - return NEXT - else - return 0 - end -end) +openFiles = Dict{Int64,IOStream}() +nextFileID = 1 +SOURCE_ID, SOURCE_ID_CFA = defNewVar("SOURCE-ID", 0) EMIT_CFA = defPrimWord("EMIT", () -> begin print(Char(popPS())) @@ -633,13 +635,31 @@ KEY_CFA = defPrimWord("KEY", () -> begin end) function getLineFromSTDIN() + + function getFrag(s) + chars = collect(s) + slashIdx = findlast(chars, '\\') + + if slashIdx > 0 + return join(chars[slashIdx:length(chars)]) + else + return nothing + end + end + + function backspaceStr(s, bsCount) + oldLen = length(s) + newLen = max(0, oldLen - bsCount) + return join(collect(s)[1:newLen]) + end + line = "" while true key = Char(getKey()) if key == '\n' print(" ") - return ASCIIString(line) + return AbstractString(line) elseif key == '\x04' if isempty(line) @@ -648,13 +668,8 @@ function getLineFromSTDIN() elseif key == '\b' if !isempty(line) - if line[length(line)] == '\t' - print(string("\r\033[K",line[1:length(line)-1])) - else - print("\b\033[K") - end - - line = line[1:length(line)-1] + print("\b\033[K") + line = backspaceStr(line, 1) end elseif key == '\e' @@ -669,6 +684,20 @@ function getLineFromSTDIN() end end + elseif key == '\t' + # Currently do nothing + + frag = getFrag(line) + if frag != nothing + if haskey(REPLCompletions.latex_symbols, frag) + print(repeat("\b", length(frag))) + print("\033[K") + comp = REPLCompletions.latex_symbols[frag] + line = string(backspaceStr(line, length(frag)), comp) + print(comp) + end + end + else print(key) line = string(line, key) @@ -681,18 +710,10 @@ 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[1:mem[SPAN]], addr) + putString(line, addr, maxLen) return NEXT end) @@ -985,6 +1006,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 @@ -1025,12 +1085,10 @@ 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) @@ -1168,7 +1226,7 @@ function dump(startAddr::Int64; count::Int64 = 100, cellsPerLine::Int64 = 10) i += 1 end - println("\t", ASCIIString(chars)) + println("\t", AbstractString(chars)) end end