X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=scheme.4th;h=1e58af98a478e8c725a1d3926a9f684748b36446;hb=8b13461967492e23111209c6f87f96ad61b4f5c1;hp=52ce34625049b8521453aefadd27548d56d06578;hpb=46a8d1c9a93efc50d4da538cba460faa1b29d602;p=scheme.forth.jl.git

diff --git a/scheme.4th b/scheme.4th
index 52ce346..1e58af9 100644
--- a/scheme.4th
+++ b/scheme.4th
@@ -13,7 +13,8 @@ include defer-is.4th
 4 constant nil-type
 5 constant pair-type
 6 constant symbol-type
-7 constant primitive-type
+7 constant primitive-proc-type
+8 constant compound-proc-type
 : istype? ( obj type -- obj bool )
     over = ;
 
@@ -103,6 +104,66 @@ variable nextfree
 
 objvar symbol-table
 
+: duplicate-charlist ( charlist -- copy )
+    2dup nil objeq? false = if
+        2dup car 2swap cdr recurse cons
+    then ;
+
+: 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
+;
+
+
 : (create-symbol) ( addr n -- symbol-obj )
     dup 0= if
         2drop nil
@@ -137,6 +198,7 @@ create-symbol define    define-symbol
 create-symbol set!      set!-symbol
 create-symbol ok        ok-symbol
 create-symbol if        if-symbol
+create-symbol lambda    lambda-symbol
 
 \ }}}
 
@@ -273,45 +335,41 @@ global-env setobj
     cons
     symbol-table setobj
 
-    rot primitive-type ( var prim )
+    rot primitive-proc-type ( var prim )
     global-env fetchobj define-var
 ;
 
-( = Arithmeic = )
+: arg-count-error
+            bold fg red ." Incorrect argument count." reset-term cr
+            abort
+;
 
-: add-prim ( args -- )
-    2dup nil objeq? if
-        2drop
-        0 fixnum-type
+: ensure-arg-count ( args n -- )
+    dup 0= if
+        drop nil objeq? false = if
+            arg-count-error
+        then
     else
-        2dup car drop
-        -rot cdr recurse drop
-        + fixnum-type
+        -rot 2dup nil objeq? if
+            arg-count-error
+        then
+        
+        cdr rot 1- recurse
     then
 ;
-' add-prim make-primitive +
 
-:noname ( args -- )
-    2dup nil objeq? if
-        2drop
-        0 fixnum-type
-    else
-        2dup car drop
-        -rot cdr add-prim drop
-        - fixnum-type
-    then
-; make-primitive -
+: arg-type-error
+            bold fg red ." Incorrect argument type." reset-term cr
+            abort
+;
 
-:noname ( args -- )
-    2dup nil objeq? if
-        2drop
-        1 fixnum-type
-    else
-        2dup car drop
-        -rot cdr recurse drop
-        * fixnum-type
+: ensure-arg-type ( arg type -- arg )
+    istype? false = if
+        arg-type-error
     then
-; make-primitive *
+;
+
+include scheme-primitives.4th
 
 \ }}}
 
@@ -381,12 +439,27 @@ parse-idx-stack parse-idx-sp !
     nextchar [char] ) = or
 ;
 
+: commentstart? ( -- bool )
+    nextchar [char] ; = ;
+
 : eatspaces
+
+    false \ Indicates whether or not we're eating a comment
+
     begin
-        whitespace?
+        dup whitespace? or commentstart? or
     while
+        dup nextchar '\n' = and if
+            invert \ Stop eating comment
+        else
+            dup false = commentstart? and if   
+                invert \ Begin eating comment
+            then
+        then
+
         inc-parse-idx
     repeat
+    drop
 ;
 
 : digit? ( -- bool )
@@ -397,8 +470,11 @@ parse-idx-stack parse-idx-sp !
 : minus? ( -- bool )
     nextchar [char] - = ;
 
+: plus? ( -- bool )
+    nextchar [char] + = ;
+
 : fixnum? ( -- bool )
-    minus? if
+    minus? plus? or if
         inc-parse-idx
 
         delim? if
@@ -497,8 +573,11 @@ parse-idx-stack parse-idx-sp !
     nextchar [char] " = ;
 
 : readnum ( -- num-atom )
-    minus? dup if
+    plus? minus? or if
+        minus?
         inc-parse-idx
+    else
+        false
     then
 
     0
@@ -582,60 +661,6 @@ parse-idx-stack parse-idx-sp !
     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
-;
-
 : readpair ( -- pairobj )
     eatspaces
 
@@ -739,6 +764,7 @@ parse-idx-stack parse-idx-sp !
     then
 
     eof? if
+        inc-parse-idx
         bold fg blue ." Moriturus te saluto." reset-term ."  ok" cr
         quit
     then
@@ -932,7 +958,7 @@ defer eval
         2over 2over
         operator 2swap eval
 
-        primitive-type istype? false = if
+        primitive-proc-type istype? false = if
             bold fg red ." Object not applicable. Aboring." reset-term cr
             abort
         then
@@ -1023,7 +1049,7 @@ defer print
     symbol-type istype? if printsymbol exit then
     nil-type istype? if printnil exit then
     pair-type istype? if ." (" printpair ." )" exit then
-    primitive-type istype? if printprim exit then
+    primitive-proc-type istype? if printprim exit then
 
     bold fg red ." Error printing expression - unrecognized type. Aborting" reset-term cr
     abort