Removed use of deprecated parse() in favour of Meta.parse().

[forth.jl.git] / src / forth.jl

diff --git a/src/forth.jl b/src/forth.jl
index 97e9c4b..c298b72 100644 (file)
--- a/src/forth.jl
+++ b/src/forth.jl
@@ -750,9 +750,9 @@ function getLineFromSTDIN()
 
     function getFrag(s)
         chars = collect(s)
-        slashIdx = findlast(chars, '\\')
+        slashIdx = findlast(isequal('\\'), chars)
 
-        if slashIdx > 0
+        if slashIdx != nothing
             return join(chars[slashIdx:length(chars)])
         else
             return nothing
@@ -1164,7 +1164,7 @@ CREATE_PRIM_CFA = defPrimWord("CREATE-PRIM", () -> begin
                         getString(addr, len), "\n",
                         "return NEXT\n",
                         "end")
-    func = eval(parse(exprString))
+    func = eval(Meta.parse(exprString))
 
     pushPS(defPrim(func))
     return NEXT
@@ -1270,7 +1270,7 @@ oldCWD = ""
 SETLIBCWD_CFA = defPrimWord("SETLIBCWD", () -> begin
     global oldCWD = pwd()
     if !isfile("lib.4th") # Exception for debugging.
-        cd(Pkg.dir("forth","src"))
+        cd(@__DIR__) # Macro expands to CWD at compile time
     end
     return NEXT
 end)