X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=src%2Fforth.jl;h=9668025d1c83b1b119c4d0b88995f2c9eba51305;hb=9bfbc52aa2ba873acd40fada868bf26b3e26d8ae;hp=890cf241e66d5eee8f4fc9913f5345f50bb43480;hpb=ebff3ca5a9b2dd5a6608b696e7862aa7264f6682;p=forth.jl.git

diff --git a/src/forth.jl b/src/forth.jl
index 890cf24..9668025 100644
--- a/src/forth.jl
+++ b/src/forth.jl
@@ -707,10 +707,12 @@ FROMLINK_CFA = defPrimWord("LINK>", () -> begin
     return NEXT
 end)
 
+NUMCONTEXT, NUMCONTEXT_CFA = defNewVar("#CONTEXT", 1)
+
 createHeader("FORTH", 0)
 FORTH_CFA = mem[H]
 dictWrite(defPrim(() -> begin
-    mem[CONTEXT] = reg.W
+    mem[CONTEXT + mem[NUMCONTEXT] - 1] = reg.W
     return NEXT
 end, name="FORTH"))
 dictWrite(0) # cell for latest
@@ -723,7 +725,6 @@ mem[CURRENT] = FORTH_CFA
 
 CONTEXT, CONTEXT_CFA = defNewVar("CONTEXT", zeros(Int64, 10))
 mem[CONTEXT] = FORTH_CFA
-NUMCONTEXT, NUMCONTEXT_CFA = defNewVar("#CONTEXT", 1)
 
 FIND_CFA = defPrimWord("FIND", () -> begin