basis: use lint.vocabs tool to trim using lists

[factor.git] / basis / eval / eval.factor

diff --git a/basis/eval/eval.factor b/basis/eval/eval.factor
index 3672337a584d0f17f8860a816246f6ef87d93348..a4efaa366f6a3782d6c89a815b64175e2780c3f6 100644 (file)
--- a/basis/eval/eval.factor
+++ b/basis/eval/eval.factor
@@ -1,24 +1,41 @@
 ! Copyright (C) 2008, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: splitting parser compiler.units kernel namespaces
-debugger io.streams.string fry ;
+USING: combinators combinators.smart compiler.units
+continuations debugger effects.parser io.streams.string
+kernel namespaces parser parser.notes prettyprint splitting ;
 IN: eval
 
 : parse-string ( str -- quot )
-    [ string-lines parse-lines ] with-compilation-unit ;
+    [ split-lines parse-lines ] with-compilation-unit ;
 
-: (eval) ( str -- )
-    parse-string call ;
+: (eval) ( str effect -- )
+    [ parse-string ] dip call-effect ; inline
 
-: eval ( str -- )
-    [ (eval) ] with-file-vocabs ;
+: eval ( str effect -- )
+    [ (eval) ] with-file-vocabs ; inline
+
+SYNTAX: eval( \ eval parse-call-paren ;
 
 : (eval>string) ( str -- output )
     [
-        "quiet" on
-        parser-notes off
-        '[ _ (eval) ] try
+        parser-quiet? on
+        '[ _ ( -- ) (eval) ] [ print-error ] recover
     ] with-string-writer ;
 
 : eval>string ( str -- output )
-    [ (eval>string) ] with-file-vocabs ;
\ No newline at end of file
+    [ (eval>string) ] with-file-vocabs ;
+
+: (eval-with-stack) ( str -- )
+    parse-string [ output>array datastack. ] call( quot -- ) ;
+
+: eval-with-stack ( str -- )
+    [ (eval-with-stack) ] with-file-vocabs ;
+
+: (eval-with-stack>string) ( str -- output )
+    [
+        parser-quiet? on
+        [ (eval-with-stack) ] [ nip print-error ] recover
+    ] with-string-writer ;
+
+: eval-with-stack>string ( str -- output )
+    [ (eval-with-stack>string) ] with-file-vocabs ;