Finished defer/is.

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

diff --git a/scheme.4th b/scheme.4th
index c4d5d4c..8c84378 100644 (file)
--- a/scheme.4th
+++ b/scheme.4th
@@ -2,13 +2,36 @@ vocabulary scheme
 scheme definitions
 
 include term-colours.4th
+include defer-is.4th
 
 0 constant number-type
 1 constant boolean-type
 2 constant character-type
+3 constant nil-type
+4 constant pair-type
 : istype? ( obj -- obj b )
     over = ;
 
+100 constant N
+create car-cells N allot
+create car-type-cells N allot
+create cdr-cells N allot
+create cdr-type-cells N allot
+
+variable nextfree
+0 nextfree !
+
+: cons ( car-obj cdr-obj -- pair-obj )
+    cdr-type-cells nextfree @ + !
+    cdr-cells nextfree @ + !
+    car-type-cells nextfree @ + !
+    car-cells nextfree @ + !
+
+    nextfree @ pair-type
+
+    1 nextfree +!
+;
+
 \ ---- Read ----
 
 variable parse-idx
@@ -172,6 +195,10 @@ parse-idx-stack parse-idx-sp !
     pop-parse-idx true
 ;
 
+: pair? ( -- bool )
+    nextchar [char] ( = ;
+
+
 : readnum ( -- num-atom )
     minus? dup if
         inc-parse-idx
@@ -216,8 +243,50 @@ parse-idx-stack parse-idx-sp !
     inc-parse-idx
 ;
 
+defer read
+
+: readpair ( -- obj )
+    inc-parse-idx
+    eatspaces
+
+    \ Empty lists
+    nextchar [char] ) = if
+        inc-parse-idx
+
+        delim? false = if
+            bold fg red
+            ." No delimiter following right paren. Aborting." cr
+            reset-term abort
+        then
+
+        nil-type exit
+    then
+
+    \ Read first pair element
+    read
+
+    \ Pairs
+    eatspaces
+    nextchar [char] . = if
+        inc-parse-idx
+
+        delim? false = if
+            bold fg red
+            ." No delimiter following '.'. Aborting." cr
+            reset-term abort
+        then
+
+        eatspaces read
+
+    else
+        recurse
+    then
+
+    cons
+;
+
 \ Parse a scheme expression
-: read ( -- obj )
+: (read) ( -- obj )
 
     eatspaces
 
@@ -236,6 +305,11 @@ parse-idx-stack parse-idx-sp !
         exit
     then
 
+    pair? if
+        readpair
+        exit
+    then
+
     eof? if
         bold fg blue ." Moriturus te saluto." reset-term ."  ok" cr
         quit
@@ -247,12 +321,15 @@ parse-idx-stack parse-idx-sp !
     abort
 ;
 
+' (read) is read
+
 \ ---- Eval ----
 
 : 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
+    nil-type istype? if true exit then
     false ;
 
 : eval
@@ -287,11 +364,18 @@ parse-idx-stack parse-idx-sp !
     endcase
 ;
 
+: printnil ( nilobj -- )
+    drop ." ()" ;
+
 : print ( obj -- )
     ." ; "
     number-type istype? if printnum exit then
     boolean-type istype? if printbool exit then
     character-type istype? if printchar exit then
+    nil-type istype? if printnil exit then
+
+    bold fg red ." Error printing expression - unrecognized type. Aborting" reset-term cr
+    abort
 ;
 
 \ ---- REPL ----