function defPrim(f::Function; name="nameless")
push!(primitives, f)
- push!(primNames, name)
+ push!(primNames, replace(replace(name, "\004", "EOF"), "\n", "\\n"))
return -length(primitives)
end
end)
DUP = defPrimWord("DUP", () -> begin
+ ensurePSDepth(1)
pushPS(mem[reg.PSP])
return NEXT
end)
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 reg.source != STDIN && eof(reg.source)
- reg.source = STDIN
+ if !eof(reg.source)
+ line = readline(reg.source)
+ mem[NUMTIB] = length(line)
+ putString(line, TIB)
+ else
+ mem[NUMTIB] = 1
+ mem[TIB] = EOF
end
-
- line = readline(reg.source)
- mem[NUMTIB] = length(line)
- putString(line, TIB)
end
pushPS(mem[TIB + mem[TOIN]])
end)
WORD = defPrimWord("WORD", () -> begin
-
- c = -1
+
+ eof_char = Char(EOF)
+ c = eof_char
skip_to_end = false
while true
end
if skip_to_end
- if c == '\n'
+ if c == '\n' || c == eof_char
skip_to_end = false
end
continue
wordAddr = mem[HERE]
offset = 0
- if c == '\n'
+ if c == '\n' || c == eof_char
# Treat newline as a special word
mem[wordAddr + offset] = Int64(c)
callPrim(mem[KEY])
c = Char(popPS())
- if c == ' ' || c == '\t' || c == '\n'
+ if c == ' ' || c == '\t' || c == '\n' || c == eof_char
# Rewind KEY
mem[TOIN] -= 1
break
callPrim(mem[WORD])
wordName = getString(mem[reg.PSP-1], mem[reg.PSP])
- #println("... ", replace(wordName, "\n", "\\n"), " ...")
+ #println("... ", replace(replace(wordName, "\004", "EOF"), "\n", "\\n"), " ...")
callPrim(mem[TWODUP])
callPrim(mem[FIND])
return NEXT
end, flags=F_IMMED)
-# Odds and Ends
+INCLUDE = defPrimWord("INCLUDE", () -> begin
-CHAR = defPrimWord("CHAR", () -> begin
callPrim(mem[WORD])
wordLen = popPS()
wordAddr = popPS()
word = getString(wordAddr, wordLen)
- pushPS(Int64(word[1]))
+
+ reg.source = open(word, "r")
+
+ # Clear input buffer
+ mem[NUMTIB] = 0
return NEXT
end)
-INCLUDE = defPrimWord("INCLUDE", () -> begin
+EOF_WORD = defPrimWord("\x04", () -> begin
+ if reg.source == STDIN
+ return 0
+ else
+ close(reg.source)
+ reg.source = STDIN
+ return NEXT
+ end
+end, flags=F_IMMED)
+
+# Odds and Ends
+CHAR = defPrimWord("CHAR", () -> begin
callPrim(mem[WORD])
wordLen = popPS()
wordAddr = popPS()
word = getString(wordAddr, wordLen)
-
- println("Reading from $word...")
-
- reg.source = open(word, "r")
-
- # Clear input buffer
- mem[NUMTIB] = 0
+ pushPS(Int64(word[1]))
return NEXT
end)
# Primitive processing loop.
# Everyting else is simply a consequence of this loop!
jmp = NEXT
- while (jmp = callPrim(jmp)) != 0
- #println("Evaluating prim $jmp [$(primNames[-jmp])]")
+ while jmp != 0
+ try
+ #println("Evaluating prim $jmp $(primNames[-jmp])")
+ jmp = callPrim(jmp)
+
+ catch ex
+ if isa(ex, StackUnderflow)
+ println("Stack underflow!")
+
+ mem[NUMTIB] = 0
+ reg.IP = QUIT + 1
+ jmp = NEXT
+ end
+ end
end
end