Almost done with characters.

[scheme.forth.jl.git] / scheme.4th

diff --git a/scheme.4th b/scheme.4th
index bf57ac7..a4e2d07 100644 (file)
--- a/scheme.4th
+++ b/scheme.4th
@@ -18,7 +18,6 @@ variable stored-parse-idx
 create parse-str 161 allot
 variable parse-str-span
 
-
 create parse-idx-stack 10 allot 
 variable parse-idx-sp
 parse-idx-stack parse-idx-sp !
@@ -105,7 +104,7 @@ parse-idx-stack parse-idx-sp !
         inc-parse-idx
     repeat
 
-    delim? charavailable? false = or if
+    delim? if
         pop-parse-idx
         true
     else
@@ -124,16 +123,24 @@ parse-idx-stack parse-idx-sp !
     nextchar [char] f <>
     and if pop-parse-idx false exit then
 
-    pop-parse-idx
-    true
+    inc-parse-idx
+    delim? if
+        pop-parse-idx
+        true
+    else
+        pop-parse-idx
+        false
+    then
 ;
 
 : str-equiv? ( str -- bool )
+
     push-parse-idx
 
-    true
+    true -rot
 
     swap dup rot + swap
+
     do
         i @ nextchar <> if
             drop false
@@ -143,7 +150,7 @@ parse-idx-stack parse-idx-sp !
         inc-parse-idx
     loop
 
-    delim? <> if drop false then
+    delim? false = if drop false then
 
     pop-parse-idx
 ;
@@ -198,6 +205,19 @@ parse-idx-stack parse-idx-sp !
     boolean-type
 ;
 
+: readchar ( -- char-atom )
+    inc-parse-idx
+    inc-parse-idx
+
+    S" newline" str-equiv? if '\n' character-type exit then
+    S" space" str-equiv? if bl character-type exit then
+    S" tab" str-equiv? if 9 character-type exit then
+
+    nextchar character-type
+
+    inc-parse-idx
+;
+
 \ Parse a scheme expression
 : read ( -- obj )
 
@@ -213,6 +233,11 @@ parse-idx-stack parse-idx-sp !
         exit
     then
 
+    character? if
+        readchar
+        exit
+    then
+
     eof? if
         bold fg blue ." Moriturus te saluto." reset-term ."  ok" cr
         quit
@@ -229,6 +254,7 @@ parse-idx-stack parse-idx-sp !
 : self-evaluating? ( obj -- obj bool )
     number-type istype? if true exit then
     boolean-type istype? if true exit then
+    character-type istype? if true exit then
     false ;
 
 : eval
@@ -252,10 +278,24 @@ parse-idx-stack parse-idx-sp !
     then
 ;
 
+: printchar ( charobj -- )
+    drop
+    case
+        9 of ." #\tab" endof
+        bl of ." #\space" endof
+        '\n' of ." #\newline" endof
+        
+        ." #\" emit
+    endcase
+
+    trace
+;
+
 : print ( obj -- )
     ." ; "
     number-type istype? if printnum exit then
     boolean-type istype? if printbool exit then
+    character-type istype? if printchar exit then
 ;
 
 \ ---- REPL ----