X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=scheme.4th;h=269eb5205833ce048a8ec5c56d12914b75be6615;hb=f636021f07e61701c3df7a6ba1b7dac3160c2110;hp=ea02cd513b424fd72efede52139568e87c758204;hpb=26a971100b29dee243a42096d52d69ca518905ea;p=scheme.forth.jl.git

diff --git a/scheme.4th b/scheme.4th
index ea02cd5..269eb52 100644
--- a/scheme.4th
+++ b/scheme.4th
@@ -1,16 +1,51 @@
-\ Scheme interpreter
-
 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
+5 constant symbol-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 +!
+;
+
+: 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
@@ -134,11 +169,13 @@ parse-idx-stack parse-idx-sp !
 ;
 
 : str-equiv? ( str -- bool )
+
     push-parse-idx
 
-    true
+    true -rot
 
     swap dup rot + swap
+
     do
         i @ nextchar <> if
             drop false
@@ -148,7 +185,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
 ;
@@ -163,15 +200,19 @@ parse-idx-stack parse-idx-sp !
 
     inc-parse-idx
 
-    S" newline" str-equiv? if true exit then
-    S" space" str-equiv? if true exit then
-    S" tab" str-equiv? if true exit then
+    S" newline" str-equiv? if pop-parse-idx true exit then
+    S" space" str-equiv? if pop-parse-idx true exit then
+    S" tab" str-equiv? if pop-parse-idx true exit then
 
     charavailable? false = if pop-parse-idx false exit then
 
     pop-parse-idx true
 ;
 
+: pair? ( -- bool )
+    nextchar [char] ( = ;
+
+
 : readnum ( -- num-atom )
     minus? dup if
         inc-parse-idx
@@ -207,17 +248,61 @@ parse-idx-stack parse-idx-sp !
     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
+    S" newline" str-equiv? if 7 parse-idx +! '\n' character-type exit then
+    S" space" str-equiv? if 5 parse-idx +! bl character-type exit then
+    S" tab" str-equiv? if 3 parse-idx +! 9 character-type exit then
 
     nextchar character-type
 
     inc-parse-idx
 ;
 
+defer read
+
+: readpair ( -- obj )
+    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
+
+        dec-parse-idx
+
+        0 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
+
+    eatspaces
+
+    cons
+;
+
 \ Parse a scheme expression
-: read ( -- obj )
+:noname ( -- obj )
 
     eatspaces
 
@@ -236,6 +321,25 @@ parse-idx-stack parse-idx-sp !
         exit
     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
+
     eof? if
         bold fg blue ." Moriturus te saluto." reset-term ."  ok" cr
         quit
@@ -245,19 +349,23 @@ parse-idx-stack parse-idx-sp !
     nextchar emit
     ." '. Aborting." reset-term cr
     abort
-;
+
+; 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
-    self-evaluating? if
-        exit
-    then
+    \ self-evaluating? if
+    \     exit
+    \ then
+    exit
 
     bold fg red ." Error evaluating expression - unrecognized type. Aborting." reset-term cr
     abort
@@ -265,7 +373,7 @@ parse-idx-stack parse-idx-sp !
 
 \ ---- Print ----
 
-: printnum ( numobj -- ) drop . ;
+: printnum ( numobj -- ) drop 0 .R ;
 
 : printbool ( numobj -- )
     drop if
@@ -281,15 +389,34 @@ parse-idx-stack parse-idx-sp !
         9 of ." #\tab" endof
         bl of ." #\space" endof
         '\n' of ." #\newline" endof
+        
+        dup ." #\" emit
     endcase
 ;
 
-: print ( obj -- )
-    ." ; "
+: printnil ( nilobj -- )
+    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
+;
+
+: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 ----
 
@@ -303,7 +430,7 @@ parse-idx-stack parse-idx-sp !
         cr bold fg green ." > " reset-term
         read
         eval
-        fg cyan print reset-term
+        fg cyan ." ; " print reset-term
     again
 ;