X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=scheme.4th;h=4dee70f16a352f0bf8f6ab483facb697a7db141d;hb=b2a917e726a54a7cc3b21b8559cd166d3c2100f7;hp=4df51d08bc3be9441c848ab99be4bfad949f50ee;hpb=c48d0766c23a3f5218e6fedf99250c727bf75dbc;p=scheme.forth.jl.git

diff --git a/scheme.4th b/scheme.4th
index 4df51d0..4dee70f 100644
--- a/scheme.4th
+++ b/scheme.4th
@@ -16,7 +16,7 @@ include defer-is.4th
 : istype? ( obj type -- obj bool )
     over = ;
 
-\ ------ Memory ------
+\ ------ Cons cell memory ------ {{{
 
 1000 constant N
 create car-cells N allot
@@ -50,6 +50,18 @@ variable nextfree
     cdr-type-cells + @
 ;
 
+: set-car! ( obj pair-obj -- )
+    drop dup
+    rot swap  car-type-cells + !
+    car-cells + !
+;
+
+: set-cdr! ( obj pair-obj -- )
+    drop dup
+    rot swap  cdr-type-cells + !
+    cdr-cells + !
+;
+
 : caar car car ;
 : cadr cdr car ;
 : cdar car cdr ;
@@ -58,7 +70,7 @@ variable nextfree
 : nil 0 nil-type ;
 : nil? nil-type istype? ;
 
-: objvar create 0 , 0 , ;
+: objvar create nil swap , , ;
 
 : value@ ( objvar -- val ) @ ;
 : type@ ( objvar -- type ) 1+ @ ;
@@ -67,13 +79,14 @@ variable nextfree
 : 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 ----
+\ }}}
+
+\ ---- Pre-defined symbols ---- {{{
+
+objvar symbol-table
 
 : (create-symbol) ( addr n -- symbol-obj )
     dup 0= if
@@ -104,9 +117,132 @@ nil symbol-table setobj
     does> dup @ swap 1+ @
 ;
 
-create-symbol quote quote
+create-symbol quote     quote-symbol
+create-symbol define    define-symbol
+create-symbol set!      set!-symbol
+create-symbol ok        ok-symbol
+
+\ }}}
+
+\ ---- Environments ---- {{{
+
+: enclosing-env ( env -- env )
+    cdr ;
+
+: first-frame ( env -- frame )
+    car ;
+
+: make-frame ( vars vals -- frame )
+    cons ;
+
+: frame-vars ( frame -- vars )
+    car ;
+
+: frame-vals ( frame -- vals )
+    cdr ;
+
+: add-binding ( var val frame -- )
+    2swap 2over frame-vals cons
+    2over set-car!
+    2swap 2over frame-vars cons
+    swap set-cdr!
+;
+
+: extend-env ( vars vals env -- env )
+    >R >R
+    make-frame
+    R> R>
+    cons
+;
+
+objvar vars
+objvar vals
+
+: get-vars-vals-frame ( var frame -- bool )
+    2dup frame-vars vars setobj
+    frame-vals vals setobj
+
+    begin
+        vars fetchobj nil objeq? false =
+    while
+        2dup vars fetchobj car objeq? if
+            2drop true
+            exit
+        then
+
+        vars fetchobj cdr vars setobj
+        vals fetchobj cdr vals setobj
+    repeat
+
+    2drop false
+;
+
+: get-vars-vals ( var env -- vars? vals? bool )
+
+    begin
+        2dup nil objeq? false =
+    while
+        2over 2over first-frame
+        get-vars-vals-frame if
+            2drop 2drop
+            vars fetchobj vals fetchobj true
+            exit
+        then
+
+        enclosing-env
+    repeat
+
+    2drop 2drop
+    false
+;
+
+hide vars
+hide vals
+
+: lookup-var ( var env -- val )
+    get-vars-vals if
+        2swap 2drop car
+    else
+        bold fg red ." Tried to read unbound variable." reset-term abort
+    then
+;
+
+: set-var ( var val env -- )
+    >R >R 2swap R> R> ( val var env )
+    get-vars-vals if
+        2swap 2drop ( val vals )
+        set-car!
+    else
+        bold fg red ." Tried to set unbound variable." reset-term abort
+    then
+;
+
+objvar env
 
-\ ---- Read ----
+: define-var ( var val env -- )
+    env setobj 
+
+    2over env fetchobj ( var val var env )
+    get-vars-vals if
+        2swap 2drop ( var val vals )
+        set-car!
+        2drop
+    else
+        env fetchobj
+        first-frame ( var val frame )
+        add-binding
+    then
+;
+
+hide env
+
+objvar global-env
+nil nil nil extend-env
+global-env setobj
+
+\ }}}
+
+\ ---- Read ---- {{{
 
 variable parse-idx
 variable stored-parse-idx
@@ -275,30 +411,6 @@ parse-idx-stack parse-idx-sp !
 : string? ( -- bool )
     nextchar [char] " = ;
 
-: initial? ( -- bool )
-    nextchar [char] A >= nextchar [char] Z <= and if true exit then
-    nextchar [char] a >= nextchar [char] z <= and if true exit then
-    nextchar [char] * = if true exit then
-    nextchar [char] / = if true exit then
-    nextchar [char] > = if true exit then
-    nextchar [char] < = if true exit then
-    nextchar [char] = = if true exit then
-    nextchar [char] ? = if true exit then
-    nextchar [char] ! = if true exit then
-    false
-;
-
-: symbol? ( -- bool )
-    initial? if true exit then
-    nextchar [char] + =
-    nextchar [char] - = or if
-        inc-parse-idx
-        delim? if dec-parse-idx true exit then
-        dec-parse-idx
-    then
-    false
-;
-
 : readnum ( -- num-atom )
     minus? dup if
         inc-parse-idx
@@ -505,6 +617,7 @@ defer read
 
     string? if
         inc-parse-idx
+
         readstring
         drop string-type
 
@@ -514,11 +627,7 @@ defer read
         then
 
         inc-parse-idx
-        exit
-    then
 
-    symbol? if
-        readsymbol charlist>symbol
         exit
     then
 
@@ -543,7 +652,7 @@ defer read
 
     nextchar [char] ' = if
         inc-parse-idx
-        quote recurse nil cons cons exit
+        quote-symbol recurse nil cons cons exit
     then
 
     eof? if
@@ -551,14 +660,14 @@ defer read
         quit
     then
 
-    bold fg red ." Error parsing string starting at character '"
-    nextchar emit
-    ." '. Aborting." reset-term cr
-    abort
+    \ Anything else is parsed as a symbol
+    readsymbol charlist>symbol
 
 ; is read
 
-\ ---- Eval ----
+\ }}}
+
+\ ---- Eval ---- {{{
 
 : self-evaluating? ( obj -- obj bool )
     boolean-type istype? if true exit then
@@ -579,26 +688,98 @@ defer read
     then ;
 
 : quote? ( obj -- obj bool )
-    quote tagged-list?  ;
+    quote-symbol tagged-list?  ;
 
 : quote-body ( quote-obj -- quote-body-obj )
     cadr ;
+
+: variable? ( obj -- obj bool )
+    symbol-type istype? ;
+
+: definition? ( obj -- obj bool )
+    define-symbol tagged-list? ;
+
+: definition-var ( obj -- var )
+    cdr car ;
+
+: definition-val ( obj -- val )
+    cdr cdr car ;
+
+: assignment? ( obj -- obj bool )
+    set!-symbol tagged-list? ;
+
+: assignment-var ( obj -- var )
+    cdr car ;
+    
+: assignment-val ( obj -- val )
+    cdr cdr car ;
+
+defer eval
+
+: eval-definition ( obj env -- res )
+    2swap 
+    2over 2over ( env obj env obj )
+    definition-val 2swap ( env obj valexp env )
+    eval  ( env obj val )
     
-: eval
+    2swap definition-var 2swap ( env var val )
+
+    >R >R 2swap R> R> 2swap ( var val env )
+    define-var
+
+    ok-symbol
+;
+    
+: eval-assignment ( obj env -- res )
+    2swap 
+    2over 2over ( env obj env obj )
+    assignment-val 2swap ( env obj valexp env )
+    eval  ( env obj val )
+    
+    2swap assignment-var 2swap ( env var val )
+
+    >R >R 2swap R> R> 2swap ( var val env )
+    set-var
+
+    ok-symbol
+;
+
+:noname ( obj env -- result )
+    2swap
+
     self-evaluating? if
+        2swap 2drop
         exit
     then
 
     quote? if
         quote-body
+        2swap 2drop
+        exit
+    then
+
+    variable? if
+        2swap lookup-var
+        exit
+    then
+
+    definition? if
+        2swap eval-definition
+        exit
+    then
+
+    assignment? if
+        2swap eval-assignment
         exit
     then
 
     bold fg red ." Error evaluating expression - unrecognized type. Aborting." reset-term cr
     abort
-;
+; is eval
+
+\ }}}
 
-\ ---- Print ----
+\ ---- Print ---- {{{
 
 : printnum ( numobj -- ) drop 0 .R ;
 
@@ -672,6 +853,8 @@ defer print
     abort
 ; is print
 
+\ }}}
+
 \ ---- REPL ----
 
 : repl
@@ -683,7 +866,7 @@ defer print
     begin
         cr bold fg green ." > " reset-term
         read
-        eval
+        global-env fetchobj eval
         fg cyan ." ; " print reset-term
     again
 ;