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)
[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
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)
DUP_CFA, SOURCE_ID_CFA, STORE_CFA, # Mark this as the current source
DUP_CFA, QUERY_FILE_CFA, # Read line from file
INTERPRET_CFA, # Interpret line
- INVERT_CFA, ZBRANCH_CFA, -5, # Loop if not EOF
+ ZBRANCH_CFA, -4, # Loop if not EOF
CLOSE_FILE_CFA, DROP_CFA, # Close file
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",
jmp = mem[EXIT_CFA]
while jmp != 0
try
- print("Entering prim $(getPrimName(jmp)), PS: ")
- printPS()
+ #print("Entering prim $(getPrimName(jmp)), PS: ")
+ #printPS()
jmp = callPrim(jmp)