Transitioning to julia 0.6 (may be hard)

diff --git a/src/forth.jl b/src/forth.jl
index 01b39a2..947aafb 100644 (file)
--- a/src/forth.jl
+++ b/src/forth.jl
@@ -501,7 +501,7 @@ end)
 XOR_CFA = defPrimWord("XOR", () -> begin
     b = popPS()
     a = popPS()
 XOR_CFA = defPrimWord("XOR", () -> begin
     b = popPS()
     a = popPS()

-    pushPS(a $ b)
+    pushPS(xor(a, b))

     return NEXT
 end)
 
     return NEXT
 end)
 


@@ -678,7 +678,7 @@ READ_LINE_CFA = defPrimWord("READ-LINE", () -> begin
     addr = popPS()
 
     fh = openFiles[fid]
     addr = popPS()
 
     fh = openFiles[fid]

-    line = readline(fh)
+    line = readline(fh, chomp=false)

 
     eofFlag = endswith(line, '\n') ? 0 : -1
     line = chomp(line)
 
     eofFlag = endswith(line, '\n') ? 0 : -1
     line = chomp(line)


@@ -1127,7 +1127,7 @@ end, flags=F_IMMED)
 
 HIDDEN_CFA = defPrimWord("HIDDEN", () -> begin
     lenAndFlagsAddr = mem[mem[CURRENT]+1] + 1
 
 HIDDEN_CFA = defPrimWord("HIDDEN", () -> begin
     lenAndFlagsAddr = mem[mem[CURRENT]+1] + 1

-    mem[lenAndFlagsAddr] = mem[lenAndFlagsAddr] $ F_HIDDEN
+    mem[lenAndFlagsAddr] = xor(mem[lenAndFlagsAddr], F_HIDDEN)

     return NEXT
 end)
 
     return NEXT
 end)
 


@@ -1147,7 +1147,7 @@ SEMICOLON_CFA = defWord(";",
 
 IMMEDIATE_CFA = defPrimWord("IMMEDIATE", () -> begin
     lenAndFlagsAddr = mem[mem[CURRENT]+1] + 1
 
 IMMEDIATE_CFA = defPrimWord("IMMEDIATE", () -> begin
     lenAndFlagsAddr = mem[mem[CURRENT]+1] + 1

-    mem[lenAndFlagsAddr] = mem[lenAndFlagsAddr] $ F_IMMED
+    mem[lenAndFlagsAddr] = xor(mem[lenAndFlagsAddr],  F_IMMED)

     return NEXT
 end, flags=F_IMMED)
 
     return NEXT
 end, flags=F_IMMED)
 

diff --git a/src/lib_8_vocab.4th b/src/lib_8_vocab.4th
index 22d98b5..8ad875f 100644 (file)
--- a/src/lib_8_vocab.4th
+++ b/src/lib_8_vocab.4th
@@ -47,7 +47,6 @@
         2DROP           ( len addr -- )
 ;
 
         2DROP           ( len addr -- )
 ;
 

-

 \ Create new vocabulary
 : VOCABULARY
         create 0 ,
 \ Create new vocabulary
 : VOCABULARY
         create 0 ,