JavaScriptCore-7601.1.46.3.tar.gz

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

diff --git a/runtime/ConstructData.h b/runtime/ConstructData.h
index 3d5f732a2210cfe2622ddaa22016053dc53f2ffe..8d4ed8f28c7e1ecd879cbc0f2f4fefd14c4c1558 100644 (file)
--- a/runtime/ConstructData.h
+++ b/runtime/ConstructData.h
@@ -10,7 +10,7 @@
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
@@ -29,35 +29,34 @@
 #ifndef ConstructData_h
 #define ConstructData_h
 
-#include "JSValue.h"
+#include "CallData.h"
+#include "JSCJSValue.h"
 
 namespace JSC {
 
-    class ArgList;
-    class ExecState;
-    class FunctionExecutable;
-    class JSObject;
-    class ScopeChainNode;
-
-    enum ConstructType {
-        ConstructTypeNone,
-        ConstructTypeHost,
-        ConstructTypeJS
-    };
-
-    typedef EncodedJSValue (JSC_HOST_CALL *NativeConstructor)(ExecState*);
-
-    union ConstructData {
-        struct {
-            NativeConstructor function;
-        } native;
-        struct {
-            FunctionExecutable* functionExecutable;
-            ScopeChainNode* scopeChain;
-        } js;
-    };
-
-    JSObject* construct(ExecState*, JSValue constructor, ConstructType, const ConstructData&, const ArgList&);
+class ArgList;
+class ExecState;
+class FunctionExecutable;
+class JSObject;
+class JSScope;
+
+enum ConstructType {
+    ConstructTypeNone,
+    ConstructTypeHost,
+    ConstructTypeJS
+};
+
+union ConstructData {
+    struct {
+        NativeFunction function;
+    } native;
+    struct {
+        FunctionExecutable* functionExecutable;
+        JSScope* scope;
+    } js;
+};
+
+JS_EXPORT_PRIVATE JSObject* construct(ExecState*, JSValue constructor, ConstructType, const ConstructData&, const ArgList&);
 
 } // namespace JSC