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

diff --git a/scheme.4th b/scheme.4th
index 915edba..6d56d64 100644
--- a/scheme.4th
+++ b/scheme.4th
@@ -4,15 +4,21 @@ scheme definitions
 include term-colours.4th
 include defer-is.4th
 
+\ ------ Types ------
+
 0 constant number-type
 1 constant boolean-type
 2 constant character-type
-3 constant nil-type
-4 constant pair-type
-: istype? ( obj -- obj b )
+3 constant string-type
+4 constant nil-type
+5 constant pair-type
+6 constant symbol-type
+: istype? ( obj type -- obj bool )
     over = ;
 
-100 constant N
+\ ------ Memory ------
+
+1000 constant N
 create car-cells N allot
 create car-type-cells N allot
 create cdr-cells N allot
@@ -32,6 +38,74 @@ 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 + @
+;
+
+: caar car car ;
+: cadr cdr car ;
+: cdar car cdr ;
+: cddr cdr cdr ;
+
+: nil 0 nil-type ;
+: nil? nil-type istype? ;
+
+: objvar create 0 , 0 , ;
+
+: value@ ( objvar -- val ) @ ;
+: type@ ( objvar -- type ) 1+ @ ;
+: value! ( newval objvar -- ) ! ;
+: type! ( newtype objvar -- ) 1+ ! ;
+: setobj ( newobj objvar -- ) dup rot swap 1+ ! ! ; 
+: fetchobj ( objvar -- obj ) dup @ swap 1+ @ ; 
+
+objvar symbol-table
+nil symbol-table setobj
+
+: objeq? ( obj obj -- bool )
+    rot = -rot = and ;
+
+\ ---- Pre-defined symbols ----
+
+: (create-symbol) ( addr n -- symbol-obj )
+    dup 0= if
+        2drop nil
+    else
+        2dup drop @ character-type 2swap
+        swap 1+ swap 1-
+        recurse
+
+        cons
+    then
+;
+
+: create-symbol ( -- )
+    bl word
+    count
+
+    (create-symbol)
+    drop symbol-type
+
+    2dup
+
+    symbol-table fetchobj
+    cons
+    symbol-table setobj
+
+    create swap , ,
+    does> dup @ swap 1+ @
+;
+
+create-symbol quote quote
+
 \ ---- Read ----
 
 variable parse-idx
@@ -198,6 +272,8 @@ parse-idx-stack parse-idx-sp !
 : pair? ( -- bool )
     nextchar [char] ( = ;
 
+: string? ( -- bool )
+    nextchar [char] " = ;
 
 : readnum ( -- num-atom )
     minus? dup if
@@ -243,10 +319,105 @@ parse-idx-stack parse-idx-sp !
     inc-parse-idx
 ;
 
+: readstring ( -- charlist )
+    nextchar [char] " = if
+        inc-parse-idx
+
+        delim? false = if
+            bold fg red
+            ." No delimiter following right double quote. Aborting." cr
+            reset-term abort
+        then
+
+        dec-parse-idx
+
+        0 nil-type exit
+    then
+
+    nextchar [char] \ = if
+        inc-parse-idx
+        nextchar case
+            [char] n of '\n' endof
+            [char] " of [char] " endof
+            [char] \
+        endcase
+    else
+        nextchar
+    then
+    inc-parse-idx character-type
+
+    recurse
+
+    cons
+;
+
+: readsymbol ( -- charlist )
+    delim? if nil exit then
+
+    nextchar inc-parse-idx character-type
+
+    recurse
+
+    cons
+;
+
+: charlist-equiv ( charlist charlist -- bool )
+
+    2over 2over
+
+    \ One or both nil
+    nil? -rot 2drop
+    if
+        nil? -rot 2drop
+        if
+            2drop 2drop true exit
+        else
+            2drop 2drop false exit
+        then
+    else
+        nil? -rot 2drop
+        if
+            2drop 2drop false exit
+        then
+    then
+
+    2over 2over
+
+    \ Neither nil
+    car drop -rot car drop = if
+            cdr 2swap cdr recurse
+        else
+            2drop 2drop false
+    then
+;
+
+: charlist>symbol ( charlist -- symbol-obj )
+
+    symbol-table fetchobj
+
+    begin
+        nil? false =
+    while
+        2over 2over
+        car drop pair-type
+        charlist-equiv if
+            2swap 2drop
+            car
+            exit
+        else
+            cdr
+        then
+    repeat
+
+    2drop
+    drop symbol-type 2dup
+    symbol-table fetchobj cons
+    symbol-table setobj
+;
+
 defer read
 
-: readpair ( -- obj )
-    inc-parse-idx
+: readpair ( -- pairobj )
     eatspaces
 
     \ Empty lists
@@ -259,7 +430,9 @@ defer read
             reset-term abort
         then
 
-        nil-type exit
+        dec-parse-idx
+
+        0 nil-type exit
     then
 
     \ Read first pair element
@@ -277,16 +450,17 @@ defer read
         then
 
         eatspaces read
-
     else
         recurse
     then
 
+    eatspaces
+
     cons
 ;
 
 \ Parse a scheme expression
-: (read) ( -- obj )
+:noname ( -- obj )
 
     eatspaces
 
@@ -305,45 +479,97 @@ defer read
         exit
     then
 
+    string? if
+        inc-parse-idx
+        readstring
+        drop string-type
+
+        nextchar [char] " <> if
+            bold red ." Missing closing double-quote." reset-term cr
+            abort
+        then
+
+        inc-parse-idx
+        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
 
+    nextchar [char] ' = if
+        inc-parse-idx
+        quote recurse nil cons cons exit
+    then
+
     eof? if
         bold fg blue ." Moriturus te saluto." reset-term ."  ok" cr
         quit
     then
 
-    bold fg red ." Error parsing string starting at character '"
-    nextchar emit
-    ." '. Aborting." reset-term cr
-    abort
-;
+    \ Anything else is assumed to be a symbol
+    readsymbol charlist>symbol
 
-' (read) is read
+; is read
 
 \ ---- Eval ----
 
 : self-evaluating? ( obj -- obj bool )
-    number-type istype? if true exit then
     boolean-type istype? if true exit then
+    number-type istype? if true exit then
     character-type istype? if true exit then
+    string-type istype? if true exit then
     nil-type istype? if true exit then
-    false ;
 
+    false
+;
+
+: tagged-list? ( obj tag-obj -- obj bool )
+    2over 
+    pair-type istype? false = if
+        2drop 2drop false
+    else
+        car objeq?
+    then ;
+
+: quote? ( obj -- obj bool )
+    quote tagged-list?  ;
+
+: quote-body ( quote-obj -- quote-body-obj )
+    cadr ;
+    
 : eval
     self-evaluating? if
         exit
     then
 
+    quote? if
+        quote-body
+        exit
+    then
+
     bold fg red ." Error evaluating expression - unrecognized type. Aborting." reset-term cr
     abort
 ;
 
 \ ---- Print ----
 
-: printnum ( numobj -- ) drop . ;
+: printnum ( numobj -- ) drop 0 .R ;
 
 : printbool ( numobj -- )
     drop if
@@ -364,16 +590,56 @@ defer read
     endcase
 ;
 
+: (printstring) ( stringobj -- )
+    nil-type istype? if 2drop exit then
+
+    2dup car drop dup
+    case
+        '\n' of ." \n" drop endof
+        [char] \ of ." \\" drop endof
+        [char] " of [char] \ emit [char] " emit drop endof
+        emit
+    endcase
+
+    cdr recurse
+;
+: printstring ( stringobj -- )
+    [char] " emit
+    (printstring)
+    [char] " emit ;
+
+: printsymbol ( symbolobj -- )
+    nil-type istype? if 2drop exit then
+
+    2dup car drop emit
+    cdr recurse
+;
+
 : 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
+    string-type istype? if printstring exit then
+    symbol-type istype? if printsymbol 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 +653,7 @@ defer read
         cr bold fg green ." > " reset-term
         read
         eval
-        fg cyan print reset-term
+        fg cyan ." ; " print reset-term
     again
 ;