JavaScriptCore-1218.34.tar.gz

[apple/javascriptcore.git] / runtime / Completion.h

diff --git a/runtime/Completion.h b/runtime/Completion.h
index 41c9a642f286e037fea5e7f66a428bf8693c9f99..78f8ac795d8c782cd5cf582899f773ec4ec1cb1c 100644 (file)
--- a/runtime/Completion.h
+++ b/runtime/Completion.h
@@ -23,40 +23,19 @@
 #ifndef Completion_h
 #define Completion_h
 
-#include "JSValue.h"
+#include "JSCJSValue.h"
 
 namespace JSC {
-
+    
+    struct ParserError;
     class ExecState;
-    class ScopeChain;
+    class JSScope;
     class SourceCode;
+    class VM;
 
-    enum ComplType { Normal, Break, Continue, ReturnValue, Throw, Interrupted };
-
-    /*
-     * Completion objects are used to convey the return status and value
-     * from functions.
-     */
-    class Completion {
-    public:
-        Completion(ComplType type = Normal, JSValue value = JSValue())
-            : m_type(type)
-            , m_value(value)
-        {
-        }
-
-        ComplType complType() const { return m_type; }
-        JSValue value() const { return m_value; }
-        void setValue(JSValue v) { m_value = v; }
-        bool isValueCompletion() const { return m_value; }
-
-    private:
-        ComplType m_type;
-        JSValue m_value;
-    };
-
-    Completion checkSyntax(ExecState*, const SourceCode&);
-    Completion evaluate(ExecState*, ScopeChain&, const SourceCode&, JSValue thisValue = JSValue());
+    JS_EXPORT_PRIVATE bool checkSyntax(VM&, const SourceCode&, ParserError&);
+    JS_EXPORT_PRIVATE bool checkSyntax(ExecState*, const SourceCode&, JSValue* exception = 0);
+    JS_EXPORT_PRIVATE JSValue evaluate(ExecState*, const SourceCode&, JSValue thisValue = JSValue(), JSValue* exception = 0);
 
 } // namespace JSC