Changeset 33979 in webkit for trunk/JavaScriptCore/kjs/interpreter.h

Timestamp:

May 21, 2008, 6:20:45 PM (17 years ago)

Author:

[email protected]

Message:

Merge squirrelfish branch into trunk.

File:

• trunk/JavaScriptCore/kjs/interpreter.h (modified) (4 diffs)

trunk/JavaScriptCore/kjs/interpreter.h

@@ -24 +24 @@
 #define KJS_Interpreter_h
 
+#include <wtf/PassRefPtr.h>
 #include <wtf/unicode/Unicode.h>
 
@@ -31 +32 @@
   class ExecState;
   class JSValue;
+  class ScopeChain;
+  class SourceProvider;
   class UString;
   
@@ -43 +46 @@
      */
     static Completion checkSyntax(ExecState*, const UString& sourceURL, int startingLineNumber, const UString& code);
-    static Completion checkSyntax(ExecState*, const UString& sourceURL, int startingLineNumber, const UChar* code, int codeLength);
+    static Completion checkSyntax(ExecState*, const UString& sourceURL, int startingLineNumber, PassRefPtr<SourceProvider> source);
 
     /**
@@ -60 +63 @@
      * @return A completion object representing the result of the execution.
      */
-    static Completion evaluate(ExecState*, const UString& sourceURL, int startingLineNumber, const UString& code, JSValue* thisV = 0);
-    static Completion evaluate(ExecState*, const UString& sourceURL, int startingLineNumber, const UChar* code, int codeLength, JSValue* thisV = 0);
+    static Completion evaluate(ExecState*, ScopeChain&, const UString& sourceURL, int startingLineNumber, const UString& code, JSValue* thisV = 0);
+    static Completion evaluate(ExecState*, ScopeChain&, const UString& sourceURL, int startingLineNumber, PassRefPtr<SourceProvider>, JSValue* thisV = 0);
     
     static bool shouldPrintExceptions();