The Lambda Lab
/
projects
/
forth.jl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
INCLUDE now reads lib_2 up to ENDCASE.
[forth.jl.git]
/
src
/
forth.jl
diff --git
a/src/forth.jl
b/src/forth.jl
index
acd6c45
..
3526960
100644
(file)
--- a/
src/forth.jl
+++ b/
src/forth.jl
@@
-968,6
+968,16
@@
NUMTIB, NUMTIB_CFA = defNewVar("#TIB", 0)
FIB_CFA = defConst("FIB", FIB)
NUMFIB, NUMFIB_CFA = defNewVar("#FIB", 0)
FIB_CFA = defConst("FIB", FIB)
NUMFIB, NUMFIB_CFA = defNewVar("#FIB", 0)
+IB_CFA = defPrimWord("IB", () -> begin
+ pushPS(mem[SOURCE_ID] == 0 ? TIB : FIB)
+ return NEXT
+end)
+
+NUMIB_CFA = defPrimWord("#IB", () -> begin
+ pushPS(mem[SOURCE_ID] == 0 ? NUMTIB : NUMFIB)
+ return NEXT
+end)
+
TOIN, TOIN_CFA = defNewVar(">IN", 0)
SOURCE_ID, SOURCE_ID_CFA = defNewVar("SOURCE-ID", 0)
TOIN, TOIN_CFA = defNewVar(">IN", 0)
SOURCE_ID, SOURCE_ID_CFA = defNewVar("SOURCE-ID", 0)
@@
-995,6
+1005,7
@@
QUERY_FILE_CFA = defWord("QUERY-FILE",
[FIB_CFA, LIT_CFA, 160, ROT_CFA, READ_LINE_CFA,
DROP_CFA, SWAP_CFA,
NUMFIB_CFA, STORE_CFA,
[FIB_CFA, LIT_CFA, 160, ROT_CFA, READ_LINE_CFA,
DROP_CFA, SWAP_CFA,
NUMFIB_CFA, STORE_CFA,
+ LIT_CFA, 0, TOIN_CFA, STORE_CFA,
EXIT_CFA])
WORD_CFA = defPrimWord("WORD", () -> begin
EXIT_CFA])
WORD_CFA = defPrimWord("WORD", () -> begin
@@
-1030,7
+1041,7
@@
WORD_CFA = defPrimWord("WORD", () -> begin
mem[countAddr] = count
pushPS(countAddr)
mem[countAddr] = count
pushPS(countAddr)
-
#println("Processing word: '$(getString(countAddr+1,mem[countAddr]))'
")
+
println("Processing word: '$(getString(countAddr+1,mem[countAddr]))' (state $(mem[STATE]))
")
return NEXT
end)
return NEXT
end)
@@
-1236,7
+1247,10
@@
INCLUDED_CFA = defWord("INCLUDED",
FROMR_CFA, SOURCE_ID_CFA, STORE_CFA, # Restore input source
EXIT_CFA])
FROMR_CFA, SOURCE_ID_CFA, STORE_CFA, # Restore input source
EXIT_CFA])
-INCLUDE_CFA = defWord("INCLUDE", [LIT_CFA, 32, WORD_CFA, INCLUDED_CFA, EXIT_CFA]);
+INCLUDE_CFA = defWord("INCLUDE", [LIT_CFA, 32, WORD_CFA,
+ DUP_CFA, INCR_CFA,
+ SWAP_CFA, FETCH_CFA,
+ INCLUDED_CFA, EXIT_CFA]);
ABORT_CFA = defWord("ABORT",
ABORT_CFA = defWord("ABORT",