The Lambda Lab
/
projects
/
forth.jl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2037d21
)
Fixed library loading bug.
author
Tim Vaughan
<tgvaughan@gmail.com>
Mon, 30 May 2016 11:18:01 +0000
(23:18 +1200)
committer
Tim Vaughan
<tgvaughan@gmail.com>
Mon, 30 May 2016 11:18:01 +0000
(23:18 +1200)
src/forth.jl
patch
|
blob
|
history
diff --git
a/src/forth.jl
b/src/forth.jl
index
9439dea
..
1a65ff6
100644
(file)
--- a/
src/forth.jl
+++ b/
src/forth.jl
@@
-994,7
+994,14
@@
INCLUDE_CFA = defPrimWord("INCLUDE", () -> begin
wordLen = mem[wordAddr-1]
word = getString(wordAddr, wordLen)
wordLen = mem[wordAddr-1]
word = getString(wordAddr, wordLen)
- push!(sources, open(word, "r"))
+ fname = word
+ if !isfile(fname)
+ fname = Pkg.dir("forth","src",word)
+ if !isfile(fname)
+ error("No file named $word found in current directory or package source directory.")
+ end
+ end
+ push!(sources, open(fname, "r"))
# Clear input buffer
mem[NUMTIB] = 0
# Clear input buffer
mem[NUMTIB] = 0
@@
-1009,8
+1016,8
@@
initialized = false
initFileName = nothing
if isfile("lib.4th")
initFileName = "lib.4th"
initFileName = nothing
if isfile("lib.4th")
initFileName = "lib.4th"
-elseif isfile(Pkg.dir("forth
/src/
lib.4th"))
- initFileName = Pkg.dir("forth
/src/
lib.4th")
+elseif isfile(Pkg.dir("forth
","src", "
lib.4th"))
+ initFileName = Pkg.dir("forth
","src","
lib.4th")
end
function run(;initialize=true)
end
function run(;initialize=true)