X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=src%2Fforth.jl;h=3d5fbd578f6b50f0f2b634c7a0cd1bf581942f88;hb=bd6a460f93aec59bd995b0133b3e965a584144ae;hp=890cf241e66d5eee8f4fc9913f5345f50bb43480;hpb=ebff3ca5a9b2dd5a6608b696e7862aa7264f6682;p=forth.jl.git diff --git a/src/forth.jl b/src/forth.jl index 890cf24..3d5fbd5 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,9 +13,9 @@ 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}() -# Built-in variables +# Memory geography and built-in variables nextVarAddr = 1 H = nextVarAddr; nextVarAddr += 1 # Next free memory address @@ -78,12 +80,15 @@ 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::AbstractString) = [Int(c) for c in collect(str)] + # Primitive creation and calling functions function defPrim(f::Function; name="nameless") @@ -114,7 +119,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] @@ -583,6 +588,14 @@ end) 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)) @@ -623,13 +636,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) @@ -638,8 +669,8 @@ function getLineFromSTDIN() elseif key == '\b' if !isempty(line) - line = line[1:length(line)-1] - print("\b \b") + print("\b\033[K") + line = backspaceStr(line, 1) end elseif key == '\e' @@ -654,6 +685,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) @@ -677,7 +722,7 @@ EXPECT_CFA = defPrimWord("EXPECT", () -> begin end mem[SPAN] = min(length(line), maxLen) - putString(line[1:mem[SPAN]], addr) + putString(line, addr, maxLen) return NEXT end) @@ -707,10 +752,12 @@ FROMLINK_CFA = defPrimWord("LINK>", () -> begin return NEXT end) +NUMCONTEXT, NUMCONTEXT_CFA = defNewVar("#CONTEXT", 1) + createHeader("FORTH", 0) FORTH_CFA = mem[H] dictWrite(defPrim(() -> begin - mem[CONTEXT] = reg.W + mem[CONTEXT + mem[NUMCONTEXT] - 1] = reg.W return NEXT end, name="FORTH")) dictWrite(0) # cell for latest @@ -723,41 +770,31 @@ mem[CURRENT] = FORTH_CFA CONTEXT, CONTEXT_CFA = defNewVar("CONTEXT", zeros(Int64, 10)) mem[CONTEXT] = FORTH_CFA -NUMCONTEXT, NUMCONTEXT_CFA = defNewVar("#CONTEXT", 1) - -FIND_CFA = defPrimWord("FIND", () -> begin +FINDVOCAB_CFA = defPrimWord("FINDVOCAB", () -> begin + vocabCFA = popPS() countedAddr = popPS() + wordAddr = countedAddr + 1 wordLen = mem[countedAddr] word = lowercase(getString(wordAddr, wordLen)) - context = mem[CONTEXT:(CONTEXT+mem[NUMCONTEXT]-1)] - + lfa = vocabCFA+1 lenAndFlags = 0 - lfa = 0 - for vocabCFA in reverse(context) - lfa = vocabCFA+1 - - while (lfa = mem[lfa]) > 0 + while (lfa = mem[lfa]) > 0 - lenAndFlags = mem[lfa+1] - len = lenAndFlags & F_LENMASK - hidden = (lenAndFlags & F_HIDDEN) == F_HIDDEN - - if hidden || len != wordLen - continue - end + lenAndFlags = mem[lfa+1] + len = lenAndFlags & F_LENMASK + hidden = (lenAndFlags & F_HIDDEN) == F_HIDDEN - thisWord = lowercase(getString(lfa+2, len)) - - if thisWord == word - break - end + if hidden || len != wordLen + continue end - if lfa>0 + thisWord = lowercase(getString(lfa+2, len)) + + if thisWord == word break end end @@ -778,6 +815,31 @@ FIND_CFA = defPrimWord("FIND", () -> begin return NEXT end) +FIND_CFA = defPrimWord("FIND", () -> begin + + countedAddr = popPS() + context = mem[CONTEXT:(CONTEXT+mem[NUMCONTEXT]-1)] + + for vocabCFA in reverse(context) + pushPS(countedAddr) + pushPS(vocabCFA) + callPrim(mem[FINDVOCAB_CFA]) + + callPrim(mem[DUP_CFA]) + if popPS() != 0 + return NEXT + else + popPS() + popPS() + end + end + + pushPS(countedAddr) + pushPS(0) + + return NEXT +end) + # Branching @@ -993,8 +1055,11 @@ INTERPRET_CFA = defWord("INTERPRET", EXIT_CFA]) PROMPT_CFA = defPrimWord("PROMPT", () -> begin - if (mem[STATE] == 0 && currentSource() == STDIN) - println(" ok") + if currentSource() == STDIN + if mem[STATE] == 0 + print(" ok") + end + println() end return NEXT @@ -1009,7 +1074,7 @@ QUIT_CFA = defWord("QUIT", BRANCH_CFA,-4]) ABORT_CFA = defWord("ABORT", - [PSP0_CFA, PSPSTORE_CFA, QUIT_CFA]) + [CLOSEFILES_CFA, PSP0_CFA, PSPSTORE_CFA, QUIT_CFA]) BYE_CFA = defPrimWord("BYE", () -> begin println("\nBye!") @@ -1133,7 +1198,7 @@ function dump(startAddr::Int64; count::Int64 = 100, cellsPerLine::Int64 = 10) i += 1 end - println("\t", ASCIIString(chars)) + println("\t", AbstractString(chars)) end end