X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=src%2Fforth.jl;h=16791158bba44e90991b2339db55d7f2ab7e69bf;hb=4aaffe598cbf92821d47324d80ba8a8044572aaa;hp=bf2c8fedc3c1d72b1957554b1efe3cdc10d7c14d;hpb=f756abef44feaa53e5f3cf2b7ff2f9bc7940eb10;p=forth.jl.git

diff --git a/src/forth.jl b/src/forth.jl
index bf2c8fe..1679115 100644
--- a/src/forth.jl
+++ b/src/forth.jl
@@ -122,9 +122,14 @@ function defPrim(f::Function; name="nameless")
 end
 
 callPrim(addr::Int64) = primitives[-addr]()
+getPrimName(addr::Int64) = primNames[-addr]
 
 # Word creation functions
 
+F_IMMED = 128
+F_HIDDEN = 256
+F_LENMASK = 127
+
 function createHeader(name::AbstractString, flags::Int64)
     mem[mem[HERE]] = mem[LATEST]
     mem[LATEST] = mem[HERE]
@@ -184,10 +189,12 @@ end
 function defConst(name::AbstractString, val::Int64; flags::Int64=0)
     createHeader(name, flags)
 
+    codeWordAddr = mem[HERE]
+
     mem[mem[HERE]] = DOCON; mem[HERE] += 1
     mem[mem[HERE]] = val; mem[HERE] += 1
 
-    return val
+    return codeWordAddr
 end
 
 # Threading Primitives (inner interpreter)
@@ -233,9 +240,9 @@ defConst("DOVAR", DOVAR)
 defConst("DICT", DICT)
 defConst("MEMSIZE", size_mem)
 
-F_IMMED = defConst("F_IMMED", 128)
-F_HIDDEN = defConst("F_HIDDEN", 256)
-F_LENMASK = defConst("F_LENMASK", 127)
+F_IMMED_CFA = defConst("F_IMMED", F_IMMED)
+F_HIDDEN_CFA = defConst("F_HIDDEN", F_HIDDEN)
+F_LENMASK_CFA = defConst("F_LENMASK", F_LENMASK)
 
 # Basic forth primitives
 
@@ -394,14 +401,14 @@ TWODIV = defPrimWord("2/", () -> begin
     return NEXT
 end)
 
-EQU = defPrimWord("=", () -> begin
+EQ = defPrimWord("=", () -> begin
     b = popPS()
     a = popPS()
     pushPS(a==b ? -1 : 0)
     return NEXT
 end)
 
-NEQU = defPrimWord("<>", () -> begin
+NE = defPrimWord("<>", () -> begin
     b = popPS()
     a = popPS()
     pushPS(a!=b ? -1 : 0)
@@ -436,12 +443,12 @@ GE = defPrimWord(">=", () -> begin
     return NEXT
 end)
 
-ZEQU = defPrimWord("0=", () -> begin
+ZE = defPrimWord("0=", () -> begin
     pushPS(popPS() == 0 ? -1 : 0)
     return NEXT
 end)
 
-ZNEQU = defPrimWord("0<>", () -> begin
+ZNE = defPrimWord("0<>", () -> begin
     pushPS(popPS() != 0 ? -1 : 0)
     return NEXT
 end)
@@ -591,100 +598,38 @@ end)
 sources = Array{Any,1}()
 currentSource() = sources[length(sources)]
 
-defConst("TIB", TIB)
-NUMTIB, NUMTIB_CFA = defNewVar("#TIB", 0)
-TOIN, TOIN_CFA = defNewVar(">IN", 0)
-EOF = defConst("EOF", 4)
-
-KEY = defPrimWord("KEY", () -> begin
-    if mem[TOIN] >= mem[NUMTIB]
-        mem[TOIN] = 0
-
-        if !eof(currentSource())
-            line = readline(currentSource())
-            mem[NUMTIB] = length(line)
-            putString(line, TIB)
-        else
-            mem[NUMTIB] = 1
-            mem[TIB] = EOF
-        end
-    end
-
-    pushPS(mem[TIB + mem[TOIN]])
-    mem[TOIN] += 1
-
-    return NEXT
-end)
+EOF_CFA = defConst("EOF", 4)
 
 EMIT = defPrimWord("EMIT", () -> begin
     print(Char(popPS()))
     return NEXT
 end)
 
-WORD = defPrimWord("WORD", () -> begin
-
-    eof_char = Char(EOF)
-    c = eof_char
-
-    while true
-        callPrim(mem[KEY])
-        c = Char(popPS())
-
-        if c == ' ' || c == '\t'
-            continue
-        end
-
-        break
-    end
-
-    wordAddr = mem[HERE]
-    offset = 0
-
-    if c == '\n' || c == eof_char
-        # Treat newline as a special word
-
-        mem[wordAddr + offset] = Int64(c)
-        pushPS(wordAddr)
-        pushPS(1)
-        return NEXT
-    end
-
-    while true
-        mem[wordAddr + offset] = Int64(c)
-        offset += 1
-
-        callPrim(mem[KEY])
-        c = Char(popPS())
+SPAN, SPAN_CFA = defNewVar("SPAN", 0)
+EXPECT = defPrimWord("EXPECT", () -> begin
+    maxLen = popPS()
+    addr = popPS()
 
-        if c == ' ' || c == '\t' || c == '\n' || c == eof_char
-            # Rewind KEY
-            mem[TOIN] -= 1
-            break
-        end
+    if !eof(currentSource())
+        line = chomp(readline(currentSource()))
+        mem[SPAN] = min(length(line), maxLen)
+        putString(line[1:mem[SPAN]], addr)
+    else
+        mem[SPAN] = 1
+        mem[addr] = EOF
     end
 
-    wordLen = offset
-
-    pushPS(wordAddr)
-    pushPS(wordLen)
-
     return NEXT
 end)
 
 BASE, BASE_CFA = defNewVar("BASE", 10)
 NUMBER = defPrimWord("NUMBER", () -> begin
-
-    wordLen = popPS()
-    wordAddr = popPS()
+    wordAddr = popPS()+1
+    wordLen = mem[wordAddr-1]
 
     s = getString(wordAddr, wordLen)
 
-    try
-        pushPS(parse(Int64, s, mem[BASE]))
-        pushPS(0)
-    catch
-        pushPS(1) # Error indication
-    end
+    pushPS(parse(Int64, s, mem[BASE]))
 
     return NEXT
 end)
@@ -693,8 +638,9 @@ end)
 
 FIND = defPrimWord("FIND", () -> begin
 
-    wordLen = popPS()
-    wordAddr = popPS()
+    countedAddr = popPS()
+    wordAddr = countedAddr + 1
+    wordLen = mem[countedAddr]
     word = lowercase(getString(wordAddr, wordLen))
 
     latest = LATEST
@@ -752,99 +698,6 @@ ZBRANCH = defPrimWord("0BRANCH", () -> begin
     return NEXT
 end)
 
-# Compilation
-
-STATE, STATE_CFA = defNewVar("STATE", 0)
-
-HEADER = defPrimWord("HEADER", () -> begin
-
-    wordLen = popPS()
-    wordAddr = popPS()
-    word = getString(wordAddr, wordLen)
-
-    createHeader(word, 0)
-
-    return NEXT
-end)
-
-COMMA = defPrimWord(",", () -> begin
-    mem[mem[HERE]] = popPS()
-    mem[HERE] += 1
-
-    return NEXT
-end)
-
-LBRAC = defPrimWord("[", () -> begin
-    mem[STATE] = 0
-    return NEXT
-end, flags=F_IMMED)
-
-RBRAC = defPrimWord("]", () -> begin
-    mem[STATE] = 1
-    return NEXT
-end, flags=F_IMMED)
-
-HIDDEN = defPrimWord("HIDDEN", () -> begin
-    addr = popPS() + 1
-    mem[addr] = mem[addr] $ F_HIDDEN
-    return NEXT
-end)
-
-HIDE = defWord("HIDE",
-    [WORD,
-    FIND,
-    HIDDEN,
-    EXIT])
-
-COLON = defWord(":",
-    [WORD,
-    HEADER,
-    LIT, DOCOL, COMMA,
-    LATEST_CFA, FETCH, HIDDEN,
-    RBRAC,
-    EXIT])
-
-SEMICOLON = defWord(";",
-    [LIT, EXIT, COMMA,
-    LATEST_CFA, FETCH, HIDDEN,
-    LBRAC,
-    EXIT], flags=F_IMMED)
-
-IMMEDIATE = defPrimWord("IMMEDIATE", () -> begin
-    lenAndFlagsAddr = mem[LATEST] + 1
-    mem[lenAndFlagsAddr] = mem[lenAndFlagsAddr] $ F_IMMED
-    return NEXT
-end, flags=F_IMMED)
-
-TICK = defWord("'",
-    [WORD, FIND, TOCFA, EXIT])
-
-BTICK = defWord("[']",
-    [FROMR, DUP, INCR, TOR, FETCH, EXIT])
-
-# CREATE and DOES>
-
-CREATE = defWord("CREATE",
-    [WORD,
-    HEADER,
-    LIT, DOVAR, COMMA, EXIT]);
-
-DODOES = defPrim(() -> begin
-    pushRS(reg.IP)
-    reg.IP = reg.W + 1
-    return NEXT
-end, name="DOCOL")
-
-defConst("DODOES", DODOES)
-
-FROMDOES_PAREN = defWord("(DOES>)",
-    [DODOES, LATEST, FETCH, TOCFA, STORE, EXIT])
-
-FROMDOES = defWord("DOES>",
-    [BTICK, FROMDOES_PAREN, COMMA, BTICK, EXIT, COMMA,
-    BTICK, LIT, COMMA, LATEST, FETCH, TODFA, COMMA], flags=F_IMMED)
-    
-
 # Strings
 
 LITSTRING = defPrimWord("LITSTRING", () -> begin
@@ -867,68 +720,104 @@ end)
 
 # Outer interpreter
 
+TRACE = defPrimWord("TRACE", () -> begin
+    print("RS: "); printRS()
+    print("PS: "); printPS()
+    print("[paused]")
+    readline()
+
+    return NEXT
+end)
+
+COMMA = defPrimWord(",", () -> begin
+    mem[mem[HERE]] = popPS()
+    mem[HERE] += 1
+
+    return NEXT
+end)
+
+BTICK = defWord("[']",
+    [FROMR, DUP, INCR, TOR, FETCH, EXIT])
+
 EXECUTE = defPrimWord("EXECUTE", () -> begin
     reg.W = popPS()
     return mem[reg.W]
 end)
 
-type ParseError <: Exception
-    wordName::ASCIIString
-end
-Base.showerror(io::IO, ex::ParseError) = print(io, "Parse error at word: '$(ex.wordName)'.")
+TIB_CFA = defConst("TIB", TIB)
+NUMTIB, NUMTIB_CFA = defNewVar("#TIB", 0)
+TOIN, TOIN_CFA = defNewVar(">IN", 0)
 
-DEBUG, DEBUG_CFA = defNewVar("DEBUG", 0)
+QUERY = defWord("QUERY",
+    [TIB_CFA, LIT, 80, EXPECT,
+    SPAN_CFA, FETCH, NUMTIB_CFA, STORE,
+    LIT, 0, TOIN_CFA, STORE,
+    EXIT])
 
-INTERPRET = defPrimWord("INTERPRET", () -> begin
+WORD = defPrimWord("WORD", () -> begin
+    delim = popPS()
 
-    callPrim(mem[WORD])
+    # Chew up initial occurrences of delim
+    while (mem[TOIN]<mem[NUMTIB] && mem[TIB+mem[TOIN]] == delim)
+        mem[TOIN] += 1
+    end
 
-    wordName = getString(mem[reg.PSP-1], mem[reg.PSP])
-    if mem[DEBUG] != 0
-        println("... ", replace(replace(wordName, "\004", "EOF"), "\n", "\\n"), " ...")
+    countAddr = mem[HERE]
+    addr = mem[HERE]+1
+
+    # Start reading in word
+    count = 0
+    while (mem[TOIN]<mem[NUMTIB] && mem[TIB+mem[TOIN]] != delim)
+        mem[addr] = mem[TIB+mem[TOIN]]
+        count += 1
+        addr += 1
+        mem[TOIN] += 1
     end
 
-    callPrim(mem[TWODUP])
-    callPrim(mem[FIND])
+    # Record count
+    mem[countAddr] = count
+    pushPS(countAddr)
 
-    wordAddr = mem[reg.PSP]
+    return NEXT
+end)
 
-    if wordAddr>0
-        # Word in dictionary
+STATE, STATE_CFA = defNewVar("STATE", 0)
 
-        isImmediate = (mem[wordAddr+1] & F_IMMED) != 0
-        callPrim(mem[TOCFA])
+INTERPRET = defWord("INTERPRET",
+    [LIT, 32, WORD, # Read next space-delimited word
 
-        callPrim(mem[NROT]) # get rid of extra copy of word string details
-        popPS()
-        popPS()
+    DUP, FETCH, ZE, ZBRANCH, 3,
+        DROP, EXIT, # Exit if TIB is exhausted
 
-        if mem[STATE] == 0 || isImmediate
-            # Execute!
-            return callPrim(mem[EXECUTE])
-        else
-            # Append CFA to dictionary
-            callPrim(mem[COMMA])
-        end
-    else
-        # Not in dictionary, assume number
+    STATE_CFA, FETCH, ZBRANCH, 27,
+        # Compiling
+        DUP, FIND, ZBRANCH, 17,
 
-        popPS()
+            # Found word. 
+            DUP, TOCFA, SWAP, INCR, FETCH, LIT, F_IMMED, AND, ZBRANCH, 4,
+                # Immediate: Execute!
+                EXECUTE, BRANCH, -30,
 
-        callPrim(mem[NUMBER])
+                # Not immediate: Compile!
+                COMMA, BRANCH, -33,
 
-        if popPS() != 0
-            throw(ParseError(wordName))
-        end
+            # No word found, parse number
+            NUMBER, BTICK, LIT, COMMA, BRANCH, -39,
+        
+       # Interpreting
+        DUP, FIND, QDUP, ZBRANCH, 7,
 
-        if mem[STATE] == 0
-            # Number already on stack!
-        else
-            # Append literal to dictionary
-            pushPS(LIT)
-            callPrim(mem[COMMA])
-            callPrim(mem[COMMA])
-        end
+            # Found word. Execute!
+            SWAP, DROP, TOCFA, EXECUTE, BRANCH, -50,
+
+            # No word found, parse number and leave on stack
+            NUMBER, BRANCH, -53,
+    EXIT]
+)
+
+PROMPT = defPrimWord("PROMPT", () -> begin
+    if (mem[STATE] == 0 && currentSource() == STDIN)
+        println(" ok")
     end
 
     return NEXT
@@ -936,24 +825,15 @@ end)
 
 QUIT = defWord("QUIT",
     [RSP0_CFA, RSPSTORE,
-    INTERPRET,
-    BRANCH,-2])
+    QUERY,
+    INTERPRET, PROMPT,
+    BRANCH,-4])
 
 BYE = defPrimWord("BYE", () -> begin
+    println("Bye!")
     return 0
 end)
 
-PROMPT = defPrimWord("PROMPT", () -> begin
-    println(" ok")
-end)
-
-NL = defPrimWord("\n", () -> begin
-    if mem[STATE] == 0 && currentSource() == STDIN
-        callPrim(mem[PROMPT])
-    end
-    return NEXT
-end, flags=F_IMMED)
-
 INCLUDE = defPrimWord("INCLUDE", () -> begin
     callPrim(mem[WORD])
     wordLen = popPS()
@@ -968,24 +848,65 @@ INCLUDE = defPrimWord("INCLUDE", () -> begin
     return NEXT
 end)
 
-EOF_WORD = defPrimWord("\x04", () -> begin
-    if currentSource() != STDIN
-        close(currentSource())
-    end
+# Compilation
 
-    pop!(sources)
+HEADER = defPrimWord("HEADER", () -> begin
 
-    if length(sources)>0
-        if currentSource() == STDIN
-            callPrim(mem[PROMPT])
-        end
+    wordAddr = popPS()+1
+    wordLen = mem[wordAddr-1]
+    word = getString(wordAddr, wordLen)
 
-        return NEXT
-    else
-        return 0
-    end
+    createHeader(word, 0)
+
+    return NEXT
+end)
+
+LBRAC = defPrimWord("[", () -> begin
+    mem[STATE] = 0
+    return NEXT
+end, flags=F_IMMED)
+
+RBRAC = defPrimWord("]", () -> begin
+    mem[STATE] = 1
+    return NEXT
+end, flags=F_IMMED)
+
+HIDDEN = defPrimWord("HIDDEN", () -> begin
+    addr = popPS() + 1
+    mem[addr] = mem[addr] $ F_HIDDEN
+    return NEXT
+end)
+
+HIDE = defWord("HIDE",
+    [WORD,
+    FIND,
+    HIDDEN,
+    EXIT])
+
+COLON = defWord(":",
+    [WORD,
+    HEADER,
+    LIT, DOCOL, COMMA,
+    LATEST_CFA, FETCH, HIDDEN,
+    RBRAC,
+    EXIT])
+
+SEMICOLON = defWord(";",
+    [LIT, EXIT, COMMA,
+    LATEST_CFA, FETCH, HIDDEN,
+    LBRAC,
+    EXIT], flags=F_IMMED)
+
+IMMEDIATE = defPrimWord("IMMEDIATE", () -> begin
+    lenAndFlagsAddr = mem[LATEST] + 1
+    mem[lenAndFlagsAddr] = mem[lenAndFlagsAddr] $ F_IMMED
+    return NEXT
 end, flags=F_IMMED)
 
+TICK = defWord("'",
+    [WORD, FIND, TOCFA, EXIT])
+
+
 #### VM loop ####
 
 initialized = false
@@ -996,7 +917,7 @@ elseif isfile(Pkg.dir("forth/src/lib.4th"))
     initFileName = Pkg.dir("forth/src/lib.4th")
 end
 
-function run(;initialize=true)
+function run(;initialize=false)
     # Begin with STDIN as source
     push!(sources, STDIN)
 
@@ -1019,10 +940,7 @@ function run(;initialize=true)
     jmp = NEXT
     while jmp != 0
         try
-            if mem[DEBUG] != 0
-                println("Evaluating prim ", jmp," ", primNames[-jmp])
-            end
-
+            #println("Entering prim $(getPrimName(jmp))")
             jmp = callPrim(jmp)
 
         catch ex