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

diff --git a/src/forth.jl b/src/forth.jl
index edca589..1679115 100644
--- a/src/forth.jl
+++ b/src/forth.jl
@@ -1,12 +1,12 @@
 module forth
 
 # VM mem size
-size_mem = 640*1024
+size_mem = 1000000 # 1 mega-int
 
 # Buffer sizes
-size_RS = 1024   # Return stack size
-size_PS = 1024   # Parameter stack size
-size_TIB = 1096  # Terminal input buffer size
+size_RS = 1000   # Return stack size
+size_PS = 1000   # Parameter stack size
+size_TIB = 1000  # Terminal input buffer size
 
 # The mem array constitutes the memory of the VM. It has the following geography:
 #
@@ -26,11 +26,12 @@ size_TIB = 1096  # Terminal input buffer size
 # the dictionary.
 #
 # Simple linear addressing is used with one exception: references to primitive code
-# blocks, which are represented as anonymous functions, appear the negative index
-# into the primitives array which contains only these functions.
+# blocks, which are represented as anonymous functions, appear as negative indicies
+# into the primitives array which contains these functions.
 
 mem = Array{Int64,1}(size_mem)
 primitives = Array{Function,1}()
+primNames = Array{ASCIIString,1}()
 
 # Built-in variables
 
@@ -54,26 +55,29 @@ type Reg
     PSP::Int64  # Parameter/data stack pointer
     IP::Int64   # Instruction pointer
     W::Int64    # Working register
-    X::Int64    # Extra register
 end
-reg = Reg(mem[RSP0], mem[PSP0], 0, 0, 0)
+reg = Reg(mem[RSP0], mem[PSP0], 0, 0)
 
-# Stack manipulation
+# Stack manipulation functions
 
-type StackUnderflow <: Exception end
+type ParamStackUnderflow <: Exception end
+type ReturnStackUnderflow <: Exception end
+
+Base.showerror(io::IO, ex::ParamStackUnderflow) = print(io, "Parameter stack underflow.")
+Base.showerror(io::IO, ex::ReturnStackUnderflow) = print(io, "Return stack underflow.")
 
 getRSDepth() = reg.RSP - mem[RSP0]
 getPSDepth() = reg.PSP - mem[PSP0]
 
 function ensurePSDepth(depth::Int64)
     if getPSDepth()<depth
-        throw(StackUnderflow())
+        throw(ParamStackUnderflow())
     end
 end
 
 function ensureRSDepth(depth::Int64)
     if getRSDepth()<depth
-        throw(StackUnderflow())
+        throw(ReturnStackUnderflow())
     end
 end
 
@@ -101,31 +105,70 @@ function popPS()
     return val
 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)]])
+function putString(str::ASCIIString, addr::Int64)
+    mem[addr:(addr+length(str)-1)] = [Int64(c) for c in str]
+end
+
 # Primitive creation and calling functions
 
+function defPrim(f::Function; name="nameless")
+    push!(primitives, f)
+    push!(primNames, replace(replace(name, "\004", "EOF"), "\n", "\\n"))
+
+    return -length(primitives)
+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]
     mem[HERE] += 1
 
     mem[mem[HERE]] = length(name) | flags; mem[HERE] += 1
-    mem[mem[HERE]:(mem[HERE]+length(name)-1)] = [Int(c) for c in name]; mem[HERE] += length(name)
+    putString(name, mem[HERE]); mem[HERE] += length(name)
 end
 
-function defPrim(name::AbstractString, f::Function; flags::Int64=0)
+function defPrimWord(name::AbstractString, f::Function; flags::Int64=0)
     createHeader(name, flags)
 
-    push!(primitives, f)
-    mem[mem[HERE]] = -length(primitives)
+    codeWordAddr = mem[HERE]
+    mem[codeWordAddr] = defPrim(f, name=name)
     mem[HERE] += 1
 
-    return -length(primitives)
+    return codeWordAddr
 end
 
-callPrim(addr::Int64) = primitives[-addr]()
+function defWord(name::AbstractString, wordAddrs::Array{Int64,1}; flags::Int64=0)
+    createHeader(name, flags)
+
+    addr = mem[HERE]
+    mem[mem[HERE]] = DOCOL
+    mem[HERE] += 1
+
+    for wordAddr in wordAddrs
+        mem[mem[HERE]] = wordAddr
+        mem[HERE] += 1
+    end
+
+    return addr
+end
+
+# Variable creation functions
 
 function defExistingVar(name::AbstractString, varAddr::Int64; flags::Int64=0)
-    defPrim(name, eval(:(() -> begin
+
+    defPrimWord(name, eval(:(() -> begin
         pushPS($(varAddr))
         return NEXT
     end)))
@@ -134,56 +177,81 @@ end
 function defNewVar(name::AbstractString, initial::Int64; flags::Int64=0)
     createHeader(name, flags)
     
+    codeWordAddr = mem[HERE]
     varAddr = mem[HERE] + 1
-    push!(primitives, eval(:(() -> begin
-        pushPS($(varAddr))
-        return NEXT
-    end)))
-    mem[mem[HERE]] = -length(primitives); mem[HERE] += 1
 
+    mem[mem[HERE]] = DOVAR; mem[HERE] += 1
     mem[mem[HERE]] = initial; mem[HERE] += 1
 
-    return varAddr
+    return varAddr, codeWordAddr
 end
 
 function defConst(name::AbstractString, val::Int64; flags::Int64=0)
-    defPrim(name, eval(:(() -> begin
-        pushPS($(val))
-        return NEXT
-    end)))
+    createHeader(name, flags)
 
-    return val
+    codeWordAddr = mem[HERE]
+
+    mem[mem[HERE]] = DOCON; mem[HERE] += 1
+    mem[mem[HERE]] = val; mem[HERE] += 1
+
+    return codeWordAddr
 end
 
-# Threading Primitives
+# Threading Primitives (inner interpreter)
 
-NEXT = defPrim("NEXT", () -> begin
+NEXT = defPrim(() -> begin
     reg.W = mem[reg.IP]
     reg.IP += 1
-    X = mem[reg.W]
-    return X
-end)
+    return mem[reg.W]
+end, name="NEXT")
 
-DOCOL = defPrim("DOCOL", () -> begin
+DOCOL = defPrim(() -> begin
     pushRS(reg.IP)
     reg.IP = reg.W + 1
     return NEXT
-end)
+end, name="DOCOL")
+
+DOVAR = defPrim(() -> begin
+    pushPS(reg.W + 1)
+    return NEXT
+end, name="DOVAR")
 
-EXIT = defPrim("EXIT", () -> begin
+DOCON = defPrim(() -> begin
+    pushPS(mem[reg.W + 1])
+    return NEXT
+end, name="DOVAR")
+
+EXIT = defPrimWord("EXIT", () -> begin
     reg.IP = popRS()
     return NEXT
 end)
 
+# Dictionary entries for core built-in variables, constants
+
+HERE_CFA = defExistingVar("HERE", HERE)
+LATEST_CFA = defExistingVar("LATEST", LATEST)
+PSP0_CFA = defExistingVar("PSP0", PSP0)
+RSP0_CFA = defExistingVar("RSP0", RSP0)
+
+defConst("DOCOL", DOCOL)
+defConst("DOCON", DOCON)
+defConst("DOVAR", DOVAR)
+
+defConst("DICT", DICT)
+defConst("MEMSIZE", size_mem)
+
+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
 
-DROP = defPrim("DROP", () -> begin
+DROP = defPrimWord("DROP", () -> begin
     popPS()
     return NEXT
 end)
 
-SWAP = defPrim("SWAP", () -> begin
+SWAP = defPrimWord("SWAP", () -> begin
     a = popPS()
     b = popPS()
     pushPS(a)
@@ -191,44 +259,46 @@ SWAP = defPrim("SWAP", () -> begin
     return NEXT
 end)
 
-DUP = defPrim("DUP", () -> begin
+DUP = defPrimWord("DUP", () -> begin
+    ensurePSDepth(1)
     pushPS(mem[reg.PSP])
     return NEXT
 end)
 
-OVER = defPrim("OVER", () -> begin
+OVER = defPrimWord("OVER", () -> begin
     ensurePSDepth(2)
     pushPS(mem[reg.PSP-1])
     return NEXT
 end)
 
-ROT = defPrim("ROT", () -> begin
+ROT = defPrimWord("ROT", () -> begin
     a = popPS()
     b = popPS()
     c = popPS()
+    pushPS(b)
     pushPS(a)
     pushPS(c)
-    pushPS(b)
     return NEXT
 end)
 
-NROT = defPrim("-ROT", () -> begin
+NROT = defPrimWord("-ROT", () -> begin
     a = popPS()
     b = popPS()
     c = popPS()
-    pushPS(b)
     pushPS(a)
     pushPS(c)
+    pushPS(b)
     return NEXT
 end)
 
-TWODROP = defPrim("2DROP", () -> begin
+
+TWODROP = defPrimWord("2DROP", () -> begin
     popPS()
     popPS()
     return NEXT
 end)
 
-TWODUP = defPrim("2DUP", () -> begin
+TWODUP = defPrimWord("2DUP", () -> begin
     ensurePSDepth(2)
     a = mem[reg.PSP-1]
     b = mem[reg.PSP]
@@ -237,19 +307,28 @@ TWODUP = defPrim("2DUP", () -> begin
     return NEXT
 end)
 
-TWOSWAP = defPrim("2SWAP", () -> begin
+TWOSWAP = defPrimWord("2SWAP", () -> begin
     a = popPS()
     b = popPS()
     c = popPS()
     d = popPS()
     pushPS(b)
     pushPS(a)
-    pushPS(c)
     pushPS(d)
+    pushPS(c)
     return NEXT
 end)
 
-QDUP = defPrim("?DUP", () -> begin
+TWOOVER = defPrimWord("2OVER", () -> begin
+    ensurePSDepth(4)
+    a = mem[reg.PSP-3]
+    b = mem[reg.PSP-2]
+    pushPS(a)
+    pushPS(b)
+    return NEXT
+end)
+
+QDUP = defPrimWord("?DUP", () -> begin
     ensurePSDepth(1)
     val = mem[reg.PSP]
     if val != 0
@@ -258,7 +337,171 @@ QDUP = defPrim("?DUP", () -> begin
     return NEXT
 end)
 
-LIT = defPrim("LIT", () -> begin
+INCR = defPrimWord("1+", () -> begin
+    ensurePSDepth(1)
+    mem[reg.PSP] += 1
+    return NEXT
+end)
+
+DECR = defPrimWord("1-", () -> begin
+    ensurePSDepth(1)
+    mem[reg.PSP] -= 1
+    return NEXT
+end)
+
+INCR2 = defPrimWord("2+", () -> begin
+    ensurePSDepth(1)
+    mem[reg.PSP] += 2
+    return NEXT
+end)
+
+DECR2 = defPrimWord("2-", () -> begin
+    ensurePSDepth(1)
+    mem[reg.PSP] -= 2
+    return NEXT
+end)
+
+ADD = defPrimWord("+", () -> begin
+    b = popPS()
+    a = popPS()
+    pushPS(a+b)
+    return NEXT
+end)
+
+SUB = defPrimWord("-", () -> begin
+    b = popPS()
+    a = popPS()
+    pushPS(a-b)
+    return NEXT
+end)
+
+MUL = defPrimWord("*", () -> begin
+    b = popPS()
+    a = popPS()
+    pushPS(a*b)
+    return NEXT
+end)
+
+DIVMOD = defPrimWord("/MOD", () -> begin
+    b = popPS()
+    a = popPS()
+    q,r = divrem(a,b)
+    pushPS(r)
+    pushPS(q)
+    return NEXT
+end)
+
+TWOMUL = defPrimWord("2*", () -> begin
+    pushPS(popPS() << 1)
+    return NEXT
+end)
+
+TWODIV = defPrimWord("2/", () -> begin
+    pushPS(popPS() >> 1)
+    return NEXT
+end)
+
+EQ = defPrimWord("=", () -> begin
+    b = popPS()
+    a = popPS()
+    pushPS(a==b ? -1 : 0)
+    return NEXT
+end)
+
+NE = defPrimWord("<>", () -> begin
+    b = popPS()
+    a = popPS()
+    pushPS(a!=b ? -1 : 0)
+    return NEXT
+end)
+
+LT = defPrimWord("<", () -> begin
+    b = popPS()
+    a = popPS()
+    pushPS(a<b ? -1 : 0)
+    return NEXT
+end)
+
+GT = defPrimWord(">", () -> begin
+    b = popPS()
+    a = popPS()
+    pushPS(a>b ? -1 : 0)
+    return NEXT
+end)
+
+LE = defPrimWord("<=", () -> begin
+    b = popPS()
+    a = popPS()
+    pushPS(a<=b ? -1 : 0)
+    return NEXT
+end)
+
+GE = defPrimWord(">=", () -> begin
+    b = popPS()
+    a = popPS()
+    pushPS(a>=b ? -1 : 0)
+    return NEXT
+end)
+
+ZE = defPrimWord("0=", () -> begin
+    pushPS(popPS() == 0 ? -1 : 0)
+    return NEXT
+end)
+
+ZNE = defPrimWord("0<>", () -> begin
+    pushPS(popPS() != 0 ? -1 : 0)
+    return NEXT
+end)
+
+ZLT = defPrimWord("0<", () -> begin
+    pushPS(popPS() < 0 ? -1 : 0)
+    return NEXT
+end)
+
+ZGT = defPrimWord("0>", () -> begin
+    pushPS(popPS() > 0 ? -1 : 0)
+    return NEXT
+end)
+
+ZLE = defPrimWord("0<=", () -> begin
+    pushPS(popPS() <= 0 ? -1 : 0)
+    return NEXT
+end)
+
+ZGE = defPrimWord("0>=", () -> begin
+    pushPS(popPS() >= 0 ? -1 : 0)
+    return NEXT
+end)
+
+AND = defPrimWord("AND", () -> begin
+    b = popPS()
+    a = popPS()
+    pushPS(a & b)
+    return NEXT
+end)
+
+OR = defPrimWord("OR", () -> begin
+    b = popPS()
+    a = popPS()
+    pushPS(a | b)
+    return NEXT
+end)
+
+XOR = defPrimWord("XOR", () -> begin
+    b = popPS()
+    a = popPS()
+    pushPS(a $ b)
+    return NEXT
+end)
+
+INVERT = defPrimWord("INVERT", () -> begin
+    pushPS(~popPS())
+    return NEXT
+end)
+
+# Literals
+
+LIT = defPrimWord("LIT", () -> begin
     pushPS(mem[reg.IP])
     reg.IP += 1
     return NEXT
@@ -266,27 +509,27 @@ end)
 
 # Memory primitives
 
-STORE = defPrim("!", () -> begin
+STORE = defPrimWord("!", () -> begin
     addr = popPS()
     dat = popPS()
     mem[addr] = dat
     return NEXT
 end)
 
-FETCH = defPrim("@", () -> begin
+FETCH = defPrimWord("@", () -> begin
     addr = popPS()
     pushPS(mem[addr])
     return NEXT
 end)
 
-ADDSTORE = defPrim("+!", () -> begin
+ADDSTORE = defPrimWord("+!", () -> begin
     addr = popPS()
     toAdd = popPS()
     mem[addr] += toAdd
     return NEXT
 end)
 
-SUBSTORE = defPrim("-!", () -> begin
+SUBSTORE = defPrimWord("-!", () -> begin
     addr = popPS()
     toSub = popPS()
     mem[addr] -= toSub
@@ -294,229 +537,462 @@ SUBSTORE = defPrim("-!", () -> begin
 end)
 
 
-# Built-in variables
-
-defExistingVar("HERE", HERE)
-defExistingVar("LATEST", LATEST)
-defExistingVar("PSP0", PSP0)
-defExistingVar("RSP0", RSP0)
-STATE = defNewVar("STATE", 0)
-BASE = defNewVar("BASE", 10)
-
-# Constants
-
-defConst("VERSION", 1)
-defConst("DOCOL", DOCOL)
-defConst("DICT", DICT)
-F_IMMED = defConst("F_IMMED", 128)
-F_HIDDEN = defConst("F_HIDDEN", 256)
-F_LENMASK = defConst("F_LENMASK", 127)
-
 # Return Stack
 
-TOR = defPrim(">R", () -> begin
+TOR = defPrimWord(">R", () -> begin
     pushRS(popPS())
     return NEXT
 end)
 
-FROMR = defPrim("R>", () -> begin
+FROMR = defPrimWord("R>", () -> begin
     pushPS(popRS())
     return NEXT
 end)
 
-RSPFETCH = defPrim("RSP@", () -> begin
+RFETCH = defPrimWord("R@", () -> begin
+    pushPS(mem[reg.RSP])
+    return NEXT
+end)
+
+RSPFETCH = defPrimWord("RSP@", () -> begin
     pushPS(reg.RSP)
     return NEXT
 end)
 
-RSPSTORE = defPrim("RSP!", () -> begin
+RSPSTORE = defPrimWord("RSP!", () -> begin
     RSP = popPS()
     return NEXT
 end)
 
-RDROP = defPrim("RDROP", () -> begin
+RDROP = defPrimWord("RDROP", () -> begin
     popRS()
     return NEXT
 end)
 
 # Parameter Stack
 
-PSPFETCH = defPrim("PSP@", () -> begin
+PSPFETCH = defPrimWord("PSP@", () -> begin
     pushPS(reg.PSP)
     return NEXT
 end)
 
-PSPSTORE = defPrim("PSP!", () -> begin
+PSPSTORE = defPrimWord("PSP!", () -> begin
     PSP = popPS()
     return NEXT
 end)
 
+# Working Register
+
+WFETCH = defPrimWord("W@", () -> begin
+    pushPS(reg.W)
+    return NEXT
+end)
+
+WSTORE = defPrimWord("W!", () -> begin
+    reg.W = popPS()
+    return NEXT
+end)
+
 # I/O
 
-defConst("TIB", TIB)
-NUMTIB = defNewVar("#TIB", 0)
-TOIN = defNewVar(">IN", 0)
+sources = Array{Any,1}()
+currentSource() = sources[length(sources)]
 
-KEY = defPrim("KEY", () -> begin
-    if mem[TOIN] >= mem[NUMTIB]
-        mem[TOIN] = 0
-        line = readline()
-        mem[NUMTIB] = length(line)
-        mem[TIB:(TIB+mem[NUMTIB]-1)] = [Int64(c) for c in collect(line)]
-    end
+EOF_CFA = defConst("EOF", 4)
+
+EMIT = defPrimWord("EMIT", () -> begin
+    print(Char(popPS()))
+    return NEXT
+end)
 
-    pushPS(mem[TIB + mem[TOIN]])
-    mem[TOIN] += 1
+SPAN, SPAN_CFA = defNewVar("SPAN", 0)
+EXPECT = defPrimWord("EXPECT", () -> begin
+    maxLen = popPS()
+    addr = popPS()
+
+    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
 
     return NEXT
 end)
 
-EMIT = defPrim("EMIT", () -> begin
-    print(Char(popPS()))
+BASE, BASE_CFA = defNewVar("BASE", 10)
+NUMBER = defPrimWord("NUMBER", () -> begin
+    wordAddr = popPS()+1
+    wordLen = mem[wordAddr-1]
+
+    s = getString(wordAddr, wordLen)
+
+    pushPS(parse(Int64, s, mem[BASE]))
+
     return NEXT
 end)
 
-WORD = defPrim("WORD", () -> begin
-    
-    c = -1
+# Dictionary searches
 
-    skip_to_end = false
-    while true
+FIND = defPrimWord("FIND", () -> begin
 
-        callPrim(KEY)
-        c = Char(popPS())
+    countedAddr = popPS()
+    wordAddr = countedAddr + 1
+    wordLen = mem[countedAddr]
+    word = lowercase(getString(wordAddr, wordLen))
 
-        if c == '\\'
-            skip_to_end = true
-            continue
-        end
+    latest = LATEST
+    
+    i = 0
+    while (latest = mem[latest]) > 0
+        lenAndFlags = mem[latest+1]
+        len = lenAndFlags & F_LENMASK
+        hidden = (lenAndFlags & F_HIDDEN) == F_HIDDEN
 
-        if skip_to_end
-            if c == '\n'
-                skip_to_end = false
-            end
+        if hidden || len != wordLen
             continue
         end
+        
+        thisAddr = latest+2
+        thisWord = lowercase(getString(thisAddr, len))
 
-        if c == ' ' || c == '\t'
-            continue
+        if lowercase(thisWord) == lowercase(word)
+            break
         end
-
-        break
     end
 
-    wordAddr = mem[HERE]
-    offset = 0
+    pushPS(latest)
 
-    while true
-        mem[wordAddr + offset] = Int64(c)
-        offset += 1
+    return NEXT
+end)
 
-        callPrim(KEY)
-        c = Char(popPS())
+TOCFA = defPrimWord(">CFA", () -> begin
 
-        if c == ' ' || c == '\t' || c == '\n'
-            break
-        end
+    addr = popPS()
+    lenAndFlags = mem[addr+1]
+    len = lenAndFlags & F_LENMASK
+
+    pushPS(addr + 2 + len)
+
+    return NEXT
+end)
+
+TODFA = defWord(">DFA", [TOCFA, INCR, EXIT])
+
+# Branching
+
+BRANCH = defPrimWord("BRANCH", () -> begin
+    reg.IP += mem[reg.IP]
+    return NEXT
+end)
+
+ZBRANCH = defPrimWord("0BRANCH", () -> begin
+    if (popPS() == 0)
+        reg.IP += mem[reg.IP]
+    else
+        reg.IP += 1
     end
 
-    wordLen = offset
+    return NEXT
+end)
+
+# Strings
 
-    pushPS(wordAddr)
-    pushPS(wordLen)
+LITSTRING = defPrimWord("LITSTRING", () -> begin
+    len = mem[reg.IP]
+    reg.IP += 1
+    pushPS(reg.IP)
+    pushPS(len)
+    reg.IP += len
 
     return NEXT
 end)
 
-NUMBER = defPrim("NUMBER", () -> begin
+TYPE = defPrimWord("TYPE", () -> begin
+    len = popPS()
+    addr = popPS()
+    str = getString(addr, len)
+    print(str)
+    return NEXT
+end)
 
-    wordLen = popPS()
-    wordAddr = popPS()
+# 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)
 
-    s = ASCIIString([Char(c) for c in mem[wordAddr:(wordAddr+wordLen-1)]])
+TIB_CFA = defConst("TIB", TIB)
+NUMTIB, NUMTIB_CFA = defNewVar("#TIB", 0)
+TOIN, TOIN_CFA = defNewVar(">IN", 0)
 
-    try
-        pushPS(parse(Int64, s, mem[BASE]))
-        pushPS(0)
-    catch
-        pushPS(1) # Error indication
+QUERY = defWord("QUERY",
+    [TIB_CFA, LIT, 80, EXPECT,
+    SPAN_CFA, FETCH, NUMTIB_CFA, STORE,
+    LIT, 0, TOIN_CFA, STORE,
+    EXIT])
+
+WORD = defPrimWord("WORD", () -> begin
+    delim = popPS()
+
+    # Chew up initial occurrences of delim
+    while (mem[TOIN]<mem[NUMTIB] && mem[TIB+mem[TOIN]] == delim)
+        mem[TOIN] += 1
+    end
+
+    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
 
+    # Record count
+    mem[countAddr] = count
+    pushPS(countAddr)
+
     return NEXT
 end)
 
-# Dictionary searches
+STATE, STATE_CFA = defNewVar("STATE", 0)
 
-FIND = defPrim("FIND", () -> begin
+INTERPRET = defWord("INTERPRET",
+    [LIT, 32, WORD, # Read next space-delimited word
 
-    wordLen = popPS()
-    wordAddr = popPS()
-    word = ASCIIString([Char(c) for c in mem[wordAddr:(wordAddr+wordLen-1)]])
+    DUP, FETCH, ZE, ZBRANCH, 3,
+        DROP, EXIT, # Exit if TIB is exhausted
 
-    latest = mem[LATEST]
-    
-    while latest>0
-        lenAndFlags = mem[latest+1]
-        len = lenAndFlags & F_LENMASK
-        hidden = (lenAndFlags & F_HIDDEN) == F_HIDDEN
+    STATE_CFA, FETCH, ZBRANCH, 27,
+        # Compiling
+        DUP, FIND, ZBRANCH, 17,
 
-        if hidden || len != wordLen
-            latest = mem[latest]
-            continue
-        end
+            # Found word. 
+            DUP, TOCFA, SWAP, INCR, FETCH, LIT, F_IMMED, AND, ZBRANCH, 4,
+                # Immediate: Execute!
+                EXECUTE, BRANCH, -30,
+
+                # Not immediate: Compile!
+                COMMA, BRANCH, -33,
+
+            # No word found, parse number
+            NUMBER, BTICK, LIT, COMMA, BRANCH, -39,
         
-        thisAddr = latest+2
-        thisWord = ASCIIString([Char(c) for c in mem[thisAddr:(thisAddr+len-1)]])
+       # Interpreting
+        DUP, FIND, QDUP, ZBRANCH, 7,
 
-        if thisWord == word
-            break
-        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
 
-    pushPS(latest)
+    return NEXT
+end)
+
+QUIT = defWord("QUIT",
+    [RSP0_CFA, RSPSTORE,
+    QUERY,
+    INTERPRET, PROMPT,
+    BRANCH,-4])
+
+BYE = defPrimWord("BYE", () -> begin
+    println("Bye!")
+    return 0
+end)
+
+INCLUDE = defPrimWord("INCLUDE", () -> begin
+    callPrim(mem[WORD])
+    wordLen = popPS()
+    wordAddr = popPS()
+    word = getString(wordAddr, wordLen)
+
+    push!(sources, open(word, "r"))
+
+    # Clear input buffer
+    mem[NUMTIB] = 0
 
     return NEXT
 end)
 
-TOCFA = defPrim(">CFA", () -> begin
+# Compilation
 
-    addr = popPS()
-    lenAndFlags = mem[addr+1]
-    len = lenAndFlags & F_LENMASK
+HEADER = defPrimWord("HEADER", () -> begin
+
+    wordAddr = popPS()+1
+    wordLen = mem[wordAddr-1]
+    word = getString(wordAddr, wordLen)
+
+    createHeader(word, 0)
+
+    return NEXT
+end)
 
-    pushPS(addr + 1 + len)
+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 ####
-#function runVM(reg::Reg)
-#    jmp = NEXT
-#    while (jmp = callPrim(reg, jmp)) != 0 end
-#end
 
-# Debugging tools
+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
 
-function coredump(startAddr::Int64; count::Int64 = 16, cellsPerLine::Int64 = 8)
-    chars = Array{Char,1}(cellsPerLine)
+function run(;initialize=false)
+    # Begin with STDIN as source
+    push!(sources, STDIN)
 
-    for i in 0:(count-1)
-        addr = startAddr + i
-        if i%cellsPerLine == 0
-            print("$addr:")
+    global initialized, initFileName
+    if !initialized && initialize
+        if initFileName != nothing
+            print("Including definitions from $initFileName...")
+            push!(sources, open(initFileName, "r"))
+            initialized = true
+        else
+            println("No library file found. Only primitive words available.")
         end
+    end
 
-        print("\t$(mem[addr]) ")
+    # Start with IP pointing to first instruction of outer interpreter
+    reg.IP = QUIT + 1
 
-        if (mem[addr]>=32 && mem[addr]<176)
-            chars[i%cellsPerLine + 1] = Char(mem[addr])
-        else
-            chars[i%cellsPerLine + 1] = '.'
+    # Primitive processing loop.
+    # Everyting else is simply a consequence of this loop!
+    jmp = NEXT
+    while jmp != 0
+        try
+            #println("Entering prim $(getPrimName(jmp))")
+            jmp = callPrim(jmp)
+
+        catch ex
+            showerror(STDOUT, ex)
+            println()
+
+            while !isempty(sources) && currentSource() != STDIN
+                close(pop!(sources))
+            end
+
+            mem[STATE] = 0
+            mem[NUMTIB] = 0
+            reg.PSP = mem[PSP0]
+            reg.RSP = mem[RSP0]
+            reg.IP = QUIT + 1
+            jmp = NEXT
         end
+    end
+end
+
+# Debugging tools
 
-        if i%cellsPerLine == cellsPerLine-1
-            println(string("\t", ASCIIString(chars)))
+function dump(startAddr::Int64; count::Int64 = 100, cellsPerLine::Int64 = 10)
+    chars = Array{Char,1}(cellsPerLine)
+
+    lineStartAddr = cellsPerLine*div((startAddr-1),cellsPerLine) + 1
+    endAddr = startAddr + count - 1
+
+    q, r = divrem((endAddr-lineStartAddr+1), cellsPerLine)
+    numLines = q + (r > 0 ? 1 : 0)
+
+    i = lineStartAddr
+    for l in 1:numLines
+        print(i,":")
+
+        for c in 1:cellsPerLine
+            if i >= startAddr && i <= endAddr
+                print("\t",mem[i])
+                if mem[i]>=32 && mem[i]<128
+                    chars[c] = Char(mem[i])
+                else
+                    chars[c] = '.'
+                end
+            else
+                print("\t")
+                chars[c] = ' '
+            end
+
+            i += 1
         end
+
+        println("\t", ASCIIString(chars))
     end
 end
 
@@ -534,4 +1010,27 @@ function printPS()
     end
 end
 
+function printRS()
+    count = reg.RSP - mem[RSP0]
+
+    if count > 0
+        print("<$count>")
+        for i in (mem[RSP0]+1):reg.RSP
+            print(" $(mem[i])")
+        end
+        println()
+    else
+        println("Return stack empty")
+    end
+end
+
+DUMP = defPrimWord("DUMP", () -> begin
+    count = popPS()
+    addr = popPS()
+
+    dump(addr, count=count)
+
+    return NEXT
+end)
+
 end