Fixed broken DO LOOP

diff --git a/src/forth.jl b/src/forth.jl
index e2292e1..99d9451 100644 (file)
--- a/src/forth.jl
+++ b/src/forth.jl
@@ -952,11 +952,31 @@ CHAR = defPrimWord("CHAR", () -> begin
     return NEXT
 end)
 
+initialized = false
+initFileName = nothing
+if isfile("lib.4th")
+    initFileName = "lib.4th"
+elseif isfile(Pkg.dir("forth/src/lib.4th"))
+    initFileName = Pkg.dir("forth/src/lib.4th")
+end
+
+
 #### VM loop ####
-function run()
+function run(;initialize=true)
     # Begin with STDIN as source
     push!(sources, STDIN)
 
+    global initialized, initFileName
+    if !initialized && initialize
+        if initFileName != nothing
+            print("Including definitions from $initFileName.")
+            push!(sources, open(initFileName, "r"))
+            initialized = true
+        else
+            println("No library file found. Only primitive words available.")
+        end
+    end
+
     # Start with IP pointing to first instruction of outer interpreter
     reg.IP = QUIT + 1
 

diff --git a/src/lib.4th b/src/lib.4th
index b44fb65..c9e07bf 100644 (file)
--- a/src/lib.4th
+++ b/src/lib.4th
@@ -106,25 +106,18 @@
 ;
 
 : DO IMMEDIATE
-        ' LIT , 
-        HERE @
-        0 ,
-        ' >R , ' >R , ' >R ,
+        ' >R , ' >R ,
         HERE @
 ;
 
 : I RSP@ 2- @ ;
 
-: LEAVE RDROP RDROP RDROP EXIT ;
-
 : LOOP IMMEDIATE
         ' R> , ' R> , ' 1+ , ' 2DUP , ' - ,
         ' SWAP , ' >R , ' SWAP , ' >R ,
         ' 0<= , ' 0BRANCH ,
         HERE @ - ,
-        ' RDROP , ' RDROP , ' RDROP ,
-        DUP HERE @ SWAP -
-        SWAP !
+        ' RDROP , ' RDROP ,
 ;