The Lambda Lab
/
projects
/
forth.jl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
19b36fc
)
Propper EOF handling.
author
Tim Vaughan
<tgvaughan@gmail.com>
Sun, 24 Apr 2016 05:05:41 +0000
(17:05 +1200)
committer
Tim Vaughan
<tgvaughan@gmail.com>
Sun, 24 Apr 2016 05:05:41 +0000
(17:05 +1200)
src/forth.jl
patch
|
blob
|
history
src/lib.fs
patch
|
blob
|
history
diff --git
a/src/forth.jl
b/src/forth.jl
index
19e5965
..
1ed96c8
100644
(file)
--- a/
src/forth.jl
+++ b/
src/forth.jl
@@
-558,18
+558,20
@@
end)
defConst("TIB", TIB)
NUMTIB, NUMTIB_CFA = defNewVar("#TIB", 0)
TOIN, TOIN_CFA = defNewVar(">IN", 0)
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
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
end
-
- line = readline(reg.source)
- mem[NUMTIB] = length(line)
- putString(line, TIB)
end
pushPS(mem[TIB + mem[TOIN]])
end
pushPS(mem[TIB + mem[TOIN]])
@@
-584,8
+586,9
@@
EMIT = defPrimWord("EMIT", () -> begin
end)
WORD = defPrimWord("WORD", () -> begin
end)
WORD = defPrimWord("WORD", () -> begin
-
- c = -1
+
+ eof_char = Char(EOF)
+ c = eof_char
skip_to_end = false
while true
skip_to_end = false
while true
@@
-599,7
+602,7
@@
WORD = defPrimWord("WORD", () -> begin
end
if skip_to_end
end
if skip_to_end
- if c == '\n'
+ if c == '\n'
|| c == eof_char
skip_to_end = false
end
continue
skip_to_end = false
end
continue
@@
-615,7
+618,7
@@
WORD = defPrimWord("WORD", () -> begin
wordAddr = mem[HERE]
offset = 0
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)
# Treat newline as a special word
mem[wordAddr + offset] = Int64(c)
@@
-631,7
+634,7
@@
WORD = defPrimWord("WORD", () -> begin
callPrim(mem[KEY])
c = Char(popPS())
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
# Rewind KEY
mem[TOIN] -= 1
break
@@
-888,31
+891,39
@@
NL = defPrimWord("\n", () -> begin
return NEXT
end, flags=F_IMMED)
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)
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)
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)
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)
return NEXT
end)
diff --git
a/src/lib.fs
b/src/lib.fs
index
14194cd
..
7ecfd1d
100644
(file)
--- a/
src/lib.fs
+++ b/
src/lib.fs
@@
-18,5
+18,5
@@
,
;
,
;
-: ':' [ CHAR : ] LITERAL ;
+
\
: ':' [ CHAR : ] LITERAL ;