X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=scheme.4th;h=63a342019a1ac7ed2857029c6ac13058fa3f56ec;hb=f95f47dbec94087af4452f20e9eca72fb7f299c8;hp=915edbad79021f817a5d24dffdd8fa6fe89136c3;hpb=95c071f1ce6af0571791b2e8b885780182982dff;p=scheme.forth.jl.git

diff --git a/scheme.4th b/scheme.4th
index 915edba..63a3420 100644
--- a/scheme.4th
+++ b/scheme.4th
@@ -32,6 +32,19 @@ variable nextfree
     1 nextfree +!
 ;
 
+: car ( pair-obj -- car-obj )
+    drop
+    dup car-cells + @ swap
+    car-type-cells + @
+;
+
+: cdr ( pair-obj -- car-obj )
+    drop
+    dup cdr-cells + @ swap
+    cdr-type-cells + @
+;
+
+
 \ ---- Read ----
 
 variable parse-idx
@@ -246,7 +259,6 @@ parse-idx-stack parse-idx-sp !
 defer read
 
 : readpair ( -- obj )
-    inc-parse-idx
     eatspaces
 
     \ Empty lists
@@ -259,7 +271,9 @@ defer read
             reset-term abort
         then
 
-        nil-type exit
+        dec-parse-idx
+
+        0 nil-type exit
     then
 
     \ Read first pair element
@@ -277,16 +291,17 @@ defer read
         then
 
         eatspaces read
-
     else
         recurse
     then
 
+    eatspaces
+
     cons
 ;
 
 \ Parse a scheme expression
-: (read) ( -- obj )
+:noname ( -- obj )
 
     eatspaces
 
@@ -306,7 +321,21 @@ defer read
     then
 
     pair? if
+        inc-parse-idx
+
+        eatspaces
+
         readpair
+
+        eatspaces
+
+        nextchar [char] ) <> if
+            bold red ." Missing closing paren." reset-term cr
+            abort
+        then
+
+        inc-parse-idx
+
         exit
     then
 
@@ -319,9 +348,8 @@ defer read
     nextchar emit
     ." '. Aborting." reset-term cr
     abort
-;
 
-' (read) is read
+; is read
 
 \ ---- Eval ----
 
@@ -333,9 +361,10 @@ defer read
     false ;
 
 : eval
-    self-evaluating? if
-        exit
-    then
+    \ self-evaluating? if
+    \     exit
+    \ then
+    exit
 
     bold fg red ." Error evaluating expression - unrecognized type. Aborting." reset-term cr
     abort
@@ -343,7 +372,7 @@ defer read
 
 \ ---- Print ----
 
-: printnum ( numobj -- ) drop . ;
+: printnum ( numobj -- ) drop 0 .R ;
 
 : printbool ( numobj -- )
     drop if
@@ -365,15 +394,28 @@ defer read
 ;
 
 : printnil ( nilobj -- )
-    drop ." ()" ;
+    2drop ." ()" ;
+
+defer print
+: printpair ( pairobj -- )
+    2dup
+    car print
+    cdr
+    nil-type istype? if 2drop exit then
+    pair-type istype? if space recurse exit then
+    ."  . " print
+;
 
-: print ( obj -- )
-    ." ; "
+:noname ( 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
-;
+    pair-type istype? if ." (" printpair ." )" exit then
+
+    bold fg red ." Error printing expression - unrecognized type. Aborting" reset-term cr
+    abort
+; is print
 
 \ ---- REPL ----
 
@@ -387,7 +429,7 @@ defer read
         cr bold fg green ." > " reset-term
         read
         eval
-        fg cyan print reset-term
+        fg cyan ." ; " print reset-term
     again
 ;