X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=scheme.4th;h=d93e722b1493323c2aac9254fd67332c3e122fd2;hb=c91efd8c4adc50172e831c9cf22cc66cdc3fa6ad;hp=c69f0ecbf67570f1c8400c4802dc186cae4b992d;hpb=21606409845e717c4760793e95326c25e4e95029;p=scheme.forth.jl.git

diff --git a/scheme.4th b/scheme.4th
index c69f0ec..d93e722 100644
--- a/scheme.4th
+++ b/scheme.4th
@@ -3,6 +3,11 @@ scheme definitions
 
 include term-colours.4th
 include defer-is.4th
+include throw-catch.4th
+
+defer read
+defer eval
+defer print
 
 \ ------ Types ------
 
@@ -20,7 +25,7 @@ include defer-is.4th
 
 \ ------ Cons cell memory ------ {{{
 
-1000 constant N
+10000 constant N
 create car-cells N allot
 create car-type-cells N allot
 create cdr-cells N allot
@@ -78,8 +83,8 @@ variable nextfree
 : type@ ( objvar -- type ) 1+ @ ;
 : value! ( newval objvar -- ) ! ;
 : type! ( newtype objvar -- ) 1+ ! ;
-: setobj ( newobj objvar -- ) dup rot swap 1+ ! ! ; 
-: fetchobj ( objvar -- obj ) dup @ swap 1+ @ ; 
+: obj! ( newobj objvar -- ) dup rot swap 1+ ! ! ; 
+: obj@ ( objvar -- obj ) dup @ swap 1+ @ ; 
 
 : objeq? ( obj obj -- bool )
     rot = -rot = and ;
@@ -141,7 +146,7 @@ objvar symbol-table
 
 : charlist>symbol ( charlist -- symbol-obj )
 
-    symbol-table fetchobj
+    symbol-table obj@
 
     begin
         nil? false =
@@ -159,8 +164,8 @@ objvar symbol-table
 
     2drop
     drop symbol-type 2dup
-    symbol-table fetchobj cons
-    symbol-table setobj
+    symbol-table obj@ cons
+    symbol-table obj!
 ;
 
 
@@ -185,9 +190,9 @@ objvar symbol-table
 
     2dup
 
-    symbol-table fetchobj
+    symbol-table obj@
     cons
-    symbol-table setobj
+    symbol-table obj!
 
     create swap , ,
     does> dup @ swap 1+ @
@@ -199,6 +204,7 @@ create-symbol set!      set!-symbol
 create-symbol ok        ok-symbol
 create-symbol if        if-symbol
 create-symbol lambda    lambda-symbol
+create-symbol λ         λ-symbol
 
 \ }}}
 
@@ -237,19 +243,19 @@ objvar vars
 objvar vals
 
 : get-vars-vals-frame ( var frame -- bool )
-    2dup frame-vars vars setobj
-    frame-vals vals setobj
+    2dup frame-vars vars obj!
+    frame-vals vals obj!
 
     begin
-        vars fetchobj nil objeq? false =
+        vars obj@ nil objeq? false =
     while
-        2dup vars fetchobj car objeq? if
+        2dup vars obj@ car objeq? if
             2drop true
             exit
         then
 
-        vars fetchobj cdr vars setobj
-        vals fetchobj cdr vals setobj
+        vars obj@ cdr vars obj!
+        vals obj@ cdr vals obj!
     repeat
 
     2drop false
@@ -263,7 +269,7 @@ objvar vals
         2over 2over first-frame
         get-vars-vals-frame if
             2drop 2drop
-            vars fetchobj vals fetchobj true
+            vars obj@ vals obj@ true
             exit
         then
 
@@ -298,15 +304,15 @@ hide vals
 objvar env
 
 : define-var ( var val env -- )
-    env setobj 
+    env obj! 
 
-    2over env fetchobj ( var val var env )
+    2over env obj@ ( var val var env )
     get-vars-vals if
         2swap 2drop ( var val vals )
         set-car!
         2drop
     else
-        env fetchobj
+        env obj@
         first-frame ( var val frame )
         add-binding
     then
@@ -316,7 +322,7 @@ hide env
 
 objvar global-env
 nil nil nil extend-env
-global-env setobj
+global-env obj!
 
 \ }}}
 
@@ -331,12 +337,12 @@ global-env setobj
     
     2dup
 
-    symbol-table fetchobj
+    symbol-table obj@
     cons
-    symbol-table setobj
+    symbol-table obj!
 
     rot primitive-proc-type ( var prim )
-    global-env fetchobj define-var
+    global-env obj@ define-var
 ;
 
 : arg-count-error
@@ -375,8 +381,6 @@ include scheme-primitives.4th
 
 \ ---- Read ---- {{{
 
-defer read
-
 variable parse-idx
 variable stored-parse-idx
 create parse-str 161 allot
@@ -772,14 +776,18 @@ parse-idx-stack parse-idx-sp !
     \ Anything else is parsed as a symbol
     readsymbol charlist>symbol
 
+    \ Replace λ with lambda
+    2dup λ-symbol objeq? if
+        2drop lambda-symbol
+    then
+    
+
 ; is read
 
 \ }}}
 
 \ ---- Eval ---- {{{
 
-defer eval
-
 : self-evaluating? ( obj -- obj bool )
     boolean-type istype? if true exit then
     fixnum-type istype? if true exit then
@@ -810,11 +818,23 @@ defer eval
 : definition? ( obj -- obj bool )
     define-symbol tagged-list? ;
 
+: make-lambda ( params body -- lambda-exp )
+    lambda-symbol -2rot cons cons ;
+
 : definition-var ( obj -- var )
-    cdr car ;
+    cdr car
+    symbol-type istype? false = if car then
+;
 
 : definition-val ( obj -- val )
-    cdr cdr car ;
+    2dup cdr car symbol-type istype? if
+        2drop
+        cdr cdr car
+    else
+        cdr 2swap cdr cdr
+        make-lambda
+    then
+;
 
 : assignment? ( obj -- obj bool )
     set!-symbol tagged-list? ;
@@ -881,6 +901,21 @@ defer eval
 : true? ( boolobj -- bool )
     false? invert ;
 
+: lambda? ( obj -- obj bool )
+    lambda-symbol tagged-list? ;
+
+: lambda-parameters ( obj -- params )
+    cdr car ;
+
+: lambda-body ( obj -- body )
+    cdr cdr ;
+
+: make-procedure ( params body env -- proc )
+    nil
+    cons cons cons
+    drop compound-proc-type
+;
+
 : application? ( obj -- obj bool)
     pair-type istype? ;
 
@@ -911,6 +946,15 @@ defer eval
     then
 ;
 
+: procedure-params ( proc -- params )
+    drop pair-type car ;
+
+: procedure-body ( proc -- body )
+    drop pair-type cdr car ;
+
+: procedure-env ( proc -- body )
+    drop pair-type cdr cdr car ;
+
 : apply ( proc args )
         2swap dup case
             primitive-proc-type of
@@ -918,7 +962,27 @@ defer eval
             endof
 
             compound-proc-type of
-                ." Compound procedures not yet implemented."
+                2dup procedure-body ( args proc body )
+                -2rot 2dup procedure-params ( body args proc params )
+                -2rot procedure-env ( body params args procenv )
+
+                extend-env ( body env )
+
+                2swap ( env body )
+
+                begin
+                    2dup cdr 2dup nil objeq? false =
+                while
+                    -2rot car 2over ( nextbody env exp env )
+                    eval
+                    2drop \ discard result
+                    2swap ( env nextbody )
+                repeat
+
+                2drop ( env body )
+                car 2swap ( exp env )
+
+                R> drop ['] eval goto-deferred  \ Tail call optimization
             endof
 
             bold fg red ." Object not applicable. Aboring." reset-term cr
@@ -966,7 +1030,15 @@ defer eval
             if-alternative
         then
 
-        2swap ['] eval goto
+        2swap
+        ['] eval goto-deferred
+    then
+
+    lambda? if
+        2dup lambda-parameters
+        2swap lambda-body
+        2rot make-procedure
+        exit
     then
 
     application? if
@@ -987,8 +1059,6 @@ defer eval
 
 \ ---- Print ---- {{{
 
-defer print
-
 : printnum ( numobj -- ) drop 0 .R ;
 
 : printbool ( numobj -- )
@@ -1050,6 +1120,9 @@ defer print
 : printprim ( primobj -- )
     2drop ." <primitive procedure>" ;
 
+: printcomp ( primobj -- )
+    2drop ." <compound procedure>" ;
+
 :noname ( obj -- )
     fixnum-type istype? if printnum exit then
     boolean-type istype? if printbool exit then
@@ -1059,6 +1132,7 @@ defer print
     nil-type istype? if printnil exit then
     pair-type istype? if ." (" printpair ." )" exit then
     primitive-proc-type istype? if printprim exit then
+    compound-proc-type istype? if printcomp exit then
 
     bold fg red ." Error printing expression - unrecognized type. Aborting" reset-term cr
     abort
@@ -1077,7 +1151,7 @@ defer print
     begin
         cr bold fg green ." > " reset-term
         read
-        global-env fetchobj eval
+        global-env obj@ eval
         fg cyan ." ; " print reset-term
     again
 ;