callPrim(addr::Int64) = primitives[-addr]()
-# Word creation
+# Word creation functions
function createHeader(name::AbstractString, flags::Int64)
mem[mem[HERE]] = mem[LATEST]
return addr
end
-# Variable creation
+# Variable creation functions
function defExistingVar(name::AbstractString, varAddr::Int64; flags::Int64=0)
codeWordAddr = mem[HERE]
varAddr = mem[HERE] + 1
- f = eval(:(() -> begin
- pushPS($(varAddr))
- return NEXT
- end))
-
- mem[mem[HERE]] = defPrim(f, name=name); mem[HERE] += 1
+ mem[mem[HERE]] = DOVAR; mem[HERE] += 1
mem[mem[HERE]] = initial; mem[HERE] += 1
return varAddr, codeWordAddr
end
function defConst(name::AbstractString, val::Int64; flags::Int64=0)
- defPrimWord(name, eval(:(() -> begin
- pushPS($(val))
- return NEXT
- end)))
+ createHeader(name, flags)
+
+ mem[mem[HERE]] = DOCON; mem[HERE] += 1
+ mem[mem[HERE]] = val; mem[HERE] += 1
return val
end
return NEXT
end, name="DOCOL")
+DOVAR = defPrim(() -> begin
+ pushPS(reg.W + 1)
+ return NEXT
+end, name="DOVAR")
+
+DOCON = defPrim(() -> begin
+ pushPS(mem[reg.W + 1])
+ return NEXT
+end, name="DOVAR")
+
EXIT = defPrimWord("EXIT", () -> begin
reg.IP = popRS()
return NEXT
d = popPS()
pushPS(b)
pushPS(a)
- pushPS(c)
pushPS(d)
+ pushPS(c)
+ return NEXT
+end)
+
+TWOOVER = defPrimWord("2OVER", () -> begin
+ ensurePSDepth(4)
+ a = mem[reg.PSP-3]
+ b = mem[reg.PSP-2]
+ pushPS(a)
+ pushPS(b)
return NEXT
end)
# Constants
-defConst("VERSION", 1)
defConst("DOCOL", DOCOL)
+defConst("DOCON", DOCON)
+defConst("DOVAR", DOVAR)
+
defConst("DICT", DICT)
+
F_IMMED = defConst("F_IMMED", 128)
F_HIDDEN = defConst("F_HIDDEN", 256)
F_LENMASK = defConst("F_LENMASK", 127)
# Compilation
-CREATE = defPrimWord("CREATE", () -> begin
+HEADER = defPrimWord("HEADER", () -> begin
wordLen = popPS()
wordAddr = popPS()
COLON = defWord(":",
[WORD,
- CREATE,
+ HEADER,
LIT, DOCOL, COMMA,
LATEST_CFA, FETCH, HIDDEN,
RBRAC,
end, flags=F_IMMED)
TICK = defWord("'",
- [STATE_CFA, FETCH, ZBRANCH, 7,
- FROMR, DUP, INCR, TOR, FETCH, EXIT,
- WORD, FIND, TOCFA, EXIT])
+ [WORD, FIND, TOCFA, EXIT])
+
+BTICK = defWord("[']",
+ [FROMR, DUP, INCR, TOR, FETCH, EXIT])
+
# Strings