Replaced old eval with "expand analyze evaluate-eproc"

[scheme.forth.jl.git] / src / scheme-primitives.4th

diff --git a/src/scheme-primitives.4th b/src/scheme-primitives.4th
index 1e37e0d..183efec 100644 (file)
--- a/src/scheme-primitives.4th
+++ b/src/scheme-primitives.4th
@@ -592,13 +592,13 @@ defer display
 
 \ ==== Evaluation ==== {{{
 
-:noname ( args -- result )
-    2dup car 2swap cdr
-
-    nil? false = if car then ( proc argvals )
-    
-    apply
-; make-primitive apply 
+\ :noname ( args -- result )
+\     2dup car 2swap cdr
+\ 
+\     nil? false = if car then ( proc argvals )
+\     
+\     apply
+\ ; make-primitive apply 
 
 \ }}}
 
@@ -611,12 +611,15 @@ defer display
     nil? if
         ." Error."
     else
-        ." Error: "
-
-        begin
-            2dup car print
-            cdr nil?
-        until
+        ." Error:"
+
+        2dup car space display
+        cdr nil? invert if
+            begin
+                2dup car space print
+                cdr nil?
+            until
+        then
 
         2drop
     then