The Lambda Lab
/
projects
/
forth.jl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
REPL character substitution now working again.
[forth.jl.git]
/
src
/
forth.jl
diff --git
a/src/forth.jl
b/src/forth.jl
index
3882a53
..
ead0bbc
100644
(file)
--- a/
src/forth.jl
+++ b/
src/forth.jl
@@
-1,6
+1,6
@@
module forth
module forth
-import
Base.REPLCompletions, Base.invokelatest
+import
REPL.REPLCompletions, Base.invokelatest, Pkg
# VM mem size
size_mem = 1000000 # 1 mega-int
# VM mem size
size_mem = 1000000 # 1 mega-int
@@
-12,9
+12,9
@@
size_TIB = 1000 # Terminal input buffer size
size_FIB = 1000 # File input buffer size
# Memory arrays
size_FIB = 1000 # File input buffer size
# Memory arrays
-mem = Array{Int64,1}(size_mem)
-primitives = Array{Function,1}()
-primNames = Array{AbstractString,1}()
+mem = Array{Int64,1}(
undef,
size_mem)
+primitives = Array{Function,1}(
undef, 0
)
+primNames = Array{AbstractString,1}(
undef, 0
)
# Memory geography and built-in variables
# Memory geography and built-in variables
@@
-34,7
+34,7
@@
mem[CURRENT] = FORTH_LATEST-1 # Compile words to system dict initially
DICT = mem[H] # Save bottom of dictionary as constant
# VM registers
DICT = mem[H] # Save bottom of dictionary as constant
# VM registers
-
type
Reg
+
mutable struct
Reg
RSP::Int64 # Return stack pointer
PSP::Int64 # Parameter/data stack pointer
IP::Int64 # Instruction pointer
RSP::Int64 # Return stack pointer
PSP::Int64 # Parameter/data stack pointer
IP::Int64 # Instruction pointer
@@
-114,7
+114,7
@@
stringAsInts(str::AbstractString) = [Int(c) for c in collect(str)]
function defPrim(f::Function; name="nameless")
push!(primitives, f)
function defPrim(f::Function; name="nameless")
push!(primitives, f)
- push!(primNames, replace(name, "\004"
,
"EOF"))
+ push!(primNames, replace(name, "\004"
=>
"EOF"))
return -length(primitives)
end
return -length(primitives)
end
@@
-682,7
+682,7
@@
READ_LINE_CFA = defPrimWord("READ-LINE", () -> begin
end
fh = openFiles[fid]
end
fh = openFiles[fid]
- line = readline(fh,
chomp=fals
e)
+ line = readline(fh,
keep=tru
e)
eofFlag = endswith(line, '\n') ? 0 : -1
line = chomp(line)
eofFlag = endswith(line, '\n') ? 0 : -1
line = chomp(line)
@@
-722,14
+722,14
@@
EMIT_CFA = defPrimWord("EMIT", () -> begin
end)
function raw_mode!(mode::Bool)
end)
function raw_mode!(mode::Bool)
- if ccall(:jl_tty_set_mode, Int32, (Ptr{
Void}, Int32), STDIN
.handle, mode) != 0
+ if ccall(:jl_tty_set_mode, Int32, (Ptr{
Nothing}, Int32), stdin
.handle, mode) != 0
throw("FATAL: Terminal unable to enter raw mode.")
end
end
function getKey()
raw_mode!(true)
throw("FATAL: Terminal unable to enter raw mode.")
end
end
function getKey()
raw_mode!(true)
- byte = read(
STDIN
, 1)[1]
+ byte = read(
stdin
, 1)[1]
raw_mode!(false)
if byte == 0x0d
raw_mode!(false)
if byte == 0x0d
@@
-750,9
+750,9
@@
function getLineFromSTDIN()
function getFrag(s)
chars = collect(s)
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
return join(chars[slashIdx:length(chars)])
else
return nothing
@@
-837,7
+837,7
@@
NUMBER_CFA = defPrimWord("NUMBER", () -> begin
s = getString(wordAddr, wordLen)
s = getString(wordAddr, wordLen)
- pushPS(parse(Int64, s, mem[BASE]))
+ pushPS(parse(Int64, s,
base=
mem[BASE]))
return NEXT
end)
return NEXT
end)
@@
-1341,7
+1341,7
@@
function run(fileName=nothing; initialize=true)
catch ex
println(string("Error in primitive '", getPrimName(jmp), "' at address ", jmp))
catch ex
println(string("Error in primitive '", getPrimName(jmp), "' at address ", jmp))
- showerror(
STDOUT
, ex)
+ showerror(
stdout
, ex)
println()
# QUIT
println()
# QUIT
@@
-1364,7
+1364,7
@@
TRACE_CFA = defPrimWord("TRACE", () -> begin
end)
function dump(startAddr::Int64; count::Int64 = 100, cellsPerLine::Int64 = 10)
end)
function dump(startAddr::Int64; count::Int64 = 100, cellsPerLine::Int64 = 10)
- chars = Array{Char,1}(cellsPerLine)
+ chars = Array{Char,1}(
undef,
cellsPerLine)
lineStartAddr = cellsPerLine*div((startAddr-1),cellsPerLine) + 1
endAddr = startAddr + count - 1
lineStartAddr = cellsPerLine*div((startAddr-1),cellsPerLine) + 1
endAddr = startAddr + count - 1