Added forth-level exception handling to repl.

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

diff --git a/scheme-primitives.4th b/scheme-primitives.4th
index e446b2e..97c098f 100644 (file)
--- a/scheme-primitives.4th
+++ b/scheme-primitives.4th
@@ -358,7 +358,7 @@ defer display
 :noname ( args -- none )
     2dup 1 ensure-arg-count
 
-    car print cr
+    car print
 
     none
 ; make-primitive write
@@ -388,7 +388,7 @@ defer display
     2dup 1 ensure-arg-count
     car string-type ensure-arg-type
 
-    (printstring) cr
+    (printstring)
 
     none
 ; make-primitive display-string
@@ -397,7 +397,7 @@ defer display
     2dup 1 ensure-arg-count
     car character-type ensure-arg-type
 
-    displaychar cr
+    displaychar
 
     none
 ; make-primitive display-character
@@ -406,7 +406,7 @@ defer display
     2dup 1 ensure-arg-count
     car
 
-    display cr
+    display
 
     none
 ; make-primitive display
@@ -421,8 +421,10 @@ defer display
 
 ( ==== Evaluation ==== )
 
-:noname 
-    \ Dummy apply procedure
-    \ Should never actually run!
-    ." Error: Dummy apply procedure executed!" cr
-; make-primitive apply
+:noname ( args -- result )
+    2dup car 2swap cdr
+
+    nil? false = if car then ( proc argvals )
+    
+    apply
+; make-primitive apply