Commit fee62a72 authored by weinig@apple.com's avatar weinig@apple.com

2008-06-29 Sam Weinig <sam@webkit.org>

        Rubber-stamped by Cameron Zwarich.

        Splits ErrorConstructor, ErrorPrototype,  NativeErrorConstructor and
        NativeErrorPrototype out of error_object.h/cpp and renames it ErrorInstance.

        * GNUmakefile.am:
        * JavaScriptCore.pri:
        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
        * JavaScriptCore.xcodeproj/project.pbxproj:
        * JavaScriptCoreSources.bkl:
        * kjs/AllInOneFile.cpp:
        * kjs/ArrayConstructor.cpp:
        * kjs/ArrayPrototype.cpp:
        * kjs/BooleanPrototype.cpp:
        * kjs/DatePrototype.cpp:
        * kjs/ErrorConstructor.cpp: Copied from kjs/error_object.cpp.
        * kjs/ErrorConstructor.h: Copied from kjs/error_object.h.
        * kjs/ErrorInstance.cpp: Copied from kjs/error_object.cpp.
        * kjs/ErrorInstance.h: Copied from kjs/error_object.h.
        * kjs/ErrorPrototype.cpp: Copied from kjs/error_object.cpp.
        * kjs/ErrorPrototype.h: Copied from kjs/error_object.h.
        * kjs/JSGlobalObject.cpp:
        * kjs/JSObject.cpp:
        * kjs/JSValue.cpp:
        * kjs/NativeErrorConstructor.cpp: Copied from kjs/error_object.cpp.
        * kjs/NativeErrorConstructor.h: Copied from kjs/error_object.h.
        * kjs/NativeErrorPrototype.cpp: Copied from kjs/error_object.cpp.
        * kjs/NativeErrorPrototype.h: Copied from kjs/error_object.h.
        * kjs/NumberPrototype.cpp:
        * kjs/RegExpConstructor.cpp:
        * kjs/RegExpObject.cpp:
        * kjs/RegExpPrototype.cpp:
        * kjs/StringPrototype.cpp:
        * kjs/error_object.cpp: Removed.
        * kjs/error_object.h: Removed.
        * kjs/internal.cpp:



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@34876 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 2e67c024
2008-06-29 Sam Weinig <sam@webkit.org>
Rubber-stamped by Cameron Zwarich.
Splits ErrorConstructor, ErrorPrototype, NativeErrorConstructor and
NativeErrorPrototype out of error_object.h/cpp and renames it ErrorInstance.
* GNUmakefile.am:
* JavaScriptCore.pri:
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* JavaScriptCore.xcodeproj/project.pbxproj:
* JavaScriptCoreSources.bkl:
* kjs/AllInOneFile.cpp:
* kjs/ArrayConstructor.cpp:
* kjs/ArrayPrototype.cpp:
* kjs/BooleanPrototype.cpp:
* kjs/DatePrototype.cpp:
* kjs/ErrorConstructor.cpp: Copied from kjs/error_object.cpp.
* kjs/ErrorConstructor.h: Copied from kjs/error_object.h.
* kjs/ErrorInstance.cpp: Copied from kjs/error_object.cpp.
* kjs/ErrorInstance.h: Copied from kjs/error_object.h.
* kjs/ErrorPrototype.cpp: Copied from kjs/error_object.cpp.
* kjs/ErrorPrototype.h: Copied from kjs/error_object.h.
* kjs/JSGlobalObject.cpp:
* kjs/JSObject.cpp:
* kjs/JSValue.cpp:
* kjs/NativeErrorConstructor.cpp: Copied from kjs/error_object.cpp.
* kjs/NativeErrorConstructor.h: Copied from kjs/error_object.h.
* kjs/NativeErrorPrototype.cpp: Copied from kjs/error_object.cpp.
* kjs/NativeErrorPrototype.h: Copied from kjs/error_object.h.
* kjs/NumberPrototype.cpp:
* kjs/RegExpConstructor.cpp:
* kjs/RegExpObject.cpp:
* kjs/RegExpPrototype.cpp:
* kjs/StringPrototype.cpp:
* kjs/error_object.cpp: Removed.
* kjs/error_object.h: Removed.
* kjs/internal.cpp:
2008-06-29 Sam Weinig <sam@webkit.org> 2008-06-29 Sam Weinig <sam@webkit.org>
Fix non-AllInOne build. Fix non-AllInOne build.
...@@ -96,7 +96,9 @@ javascriptcore_sources += \ ...@@ -96,7 +96,9 @@ javascriptcore_sources += \
JavaScriptCore/kjs/DatePrototype.cpp \ JavaScriptCore/kjs/DatePrototype.cpp \
JavaScriptCore/kjs/debugger.cpp \ JavaScriptCore/kjs/debugger.cpp \
JavaScriptCore/kjs/dtoa.cpp \ JavaScriptCore/kjs/dtoa.cpp \
JavaScriptCore/kjs/error_object.cpp \ JavaScriptCore/kjs/ErrorConstructor.cpp \
JavaScriptCore/kjs/ErrorInstance.cpp \
JavaScriptCore/kjs/ErrorPrototype.cpp \
JavaScriptCore/kjs/JSFunction.cpp \ JavaScriptCore/kjs/JSFunction.cpp \
JavaScriptCore/kjs/JSVariableObject.cpp \ JavaScriptCore/kjs/JSVariableObject.cpp \
JavaScriptCore/kjs/FunctionConstructor.cpp \ JavaScriptCore/kjs/FunctionConstructor.cpp \
...@@ -110,6 +112,8 @@ javascriptcore_sources += \ ...@@ -110,6 +112,8 @@ javascriptcore_sources += \
JavaScriptCore/kjs/MathObject.cpp \ JavaScriptCore/kjs/MathObject.cpp \
JavaScriptCore/kjs/nodes.cpp \ JavaScriptCore/kjs/nodes.cpp \
JavaScriptCore/kjs/nodes2string.cpp \ JavaScriptCore/kjs/nodes2string.cpp \
JavaScriptCore/kjs/NativeErrorConstructor.cpp \
JavaScriptCore/kjs/NativeErrorPrototype.cpp \
JavaScriptCore/kjs/NumberConstructor.cpp \ JavaScriptCore/kjs/NumberConstructor.cpp \
JavaScriptCore/kjs/NumberObject.cpp \ JavaScriptCore/kjs/NumberObject.cpp \
JavaScriptCore/kjs/NumberPrototype.cpp \ JavaScriptCore/kjs/NumberPrototype.cpp \
......
...@@ -81,7 +81,9 @@ SOURCES += \ ...@@ -81,7 +81,9 @@ SOURCES += \
kjs/DatePrototype.cpp \ kjs/DatePrototype.cpp \
kjs/DebuggerCallFrame.cpp \ kjs/DebuggerCallFrame.cpp \
kjs/dtoa.cpp \ kjs/dtoa.cpp \
kjs/error_object.cpp \ kjs/ErrorConstructor.cpp \
kjs/ErrorInstance.cpp \
kjs/ErrorPrototype.cpp \
kjs/ExecState.cpp \ kjs/ExecState.cpp \
kjs/FunctionConstructor.cpp \ kjs/FunctionConstructor.cpp \
kjs/FunctionPrototype.cpp \ kjs/FunctionPrototype.cpp \
...@@ -95,6 +97,8 @@ SOURCES += \ ...@@ -95,6 +97,8 @@ SOURCES += \
kjs/list.cpp \ kjs/list.cpp \
kjs/lookup.cpp \ kjs/lookup.cpp \
kjs/MathObject.cpp \ kjs/MathObject.cpp \
kjs/NativeErrorConstructor.cpp \
kjs/NativeErrorPrototype.cpp \
kjs/nodes.cpp \ kjs/nodes.cpp \
kjs/nodes2string.cpp \ kjs/nodes2string.cpp \
kjs/NumberConstructor.cpp \ kjs/NumberConstructor.cpp \
......
...@@ -381,11 +381,27 @@ ...@@ -381,11 +381,27 @@
> >
</File> </File>
<File <File
RelativePath="..\..\kjs\error_object.cpp" RelativePath="..\..\kjs\ErrorConstructor.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\kjs\error_object.h" RelativePath="..\..\kjs\ErrorConstructor.h"
>
</File>
<File
RelativePath="..\..\kjs\ErrorInstance.cpp"
>
</File>
<File
RelativePath="..\..\kjs\ErrorInstance.h"
>
</File>
<File
RelativePath="..\..\kjs\ErrorPrototype.cpp"
>
</File>
<File
RelativePath="..\..\kjs\ErrorPrototype.h"
> >
</File> </File>
<File <File
...@@ -576,6 +592,22 @@ ...@@ -576,6 +592,22 @@
RelativePath="..\..\kjs\NodeInfo.h" RelativePath="..\..\kjs\NodeInfo.h"
> >
</File> </File>
<File
RelativePath="..\..\kjs\NativeErrorConstructor.cpp"
>
</File>
<File
RelativePath="..\..\kjs\NativeErrorConstructor.h"
>
</File>
<File
RelativePath="..\..\kjs\NativeErrorPrototype.cpp"
>
</File>
<File
RelativePath="..\..\kjs\NativeErrorPrototype.h"
>
</File>
<File <File
RelativePath="..\..\kjs\NumberConstructor.cpp" RelativePath="..\..\kjs\NumberConstructor.cpp"
> >
......
...@@ -58,7 +58,9 @@ Source files for JSCore. ...@@ -58,7 +58,9 @@ Source files for JSCore.
kjs/debugger.cpp kjs/debugger.cpp
kjs/DebuggerCallFrame.cpp kjs/DebuggerCallFrame.cpp
kjs/dtoa.cpp kjs/dtoa.cpp
kjs/error_object.cpp kjs/ErrorConstructor.cpp
kjs/ErrorInstance.cpp
kjs/ErrorPrototype.cpp
kjs/ExecState.cpp kjs/ExecState.cpp
kjs/JSFunction.cpp kjs/JSFunction.cpp
kjs/FunctionConstructor.cpp kjs/FunctionConstructor.cpp
...@@ -79,6 +81,8 @@ Source files for JSCore. ...@@ -79,6 +81,8 @@ Source files for JSCore.
kjs/list.cpp kjs/list.cpp
kjs/lookup.cpp kjs/lookup.cpp
kjs/MathObject.cpp kjs/MathObject.cpp
kjs/NativeErrorConstructor.cpp
kjs/NativeErrorPrototype.cpp
kjs/nodes.cpp kjs/nodes.cpp
kjs/nodes2string.cpp kjs/nodes2string.cpp
kjs/NumberConstructor.cpp kjs/NumberConstructor.cpp
......
...@@ -44,7 +44,9 @@ ...@@ -44,7 +44,9 @@
#include "DatePrototype.cpp" #include "DatePrototype.cpp"
#include "date_object.cpp" #include "date_object.cpp"
#include "dtoa.cpp" #include "dtoa.cpp"
#include "error_object.cpp" #include "ErrorInstance.cpp"
#include "ErrorPrototype.cpp"
#include "ErrorConstructor.cpp"
#include "FunctionConstructor.cpp" #include "FunctionConstructor.cpp"
#include "FunctionPrototype.cpp" #include "FunctionPrototype.cpp"
#include "grammar.cpp" #include "grammar.cpp"
...@@ -58,11 +60,13 @@ ...@@ -58,11 +60,13 @@
#include "list.cpp" #include "list.cpp"
#include "lookup.cpp" #include "lookup.cpp"
#include "MathObject.cpp" #include "MathObject.cpp"
#include "nodes.cpp" #include "NativeErrorConstructor.cpp"
#include "nodes2string.cpp" #include "NativeErrorPrototype.cpp"
#include "NumberConstructor.cpp" #include "NumberConstructor.cpp"
#include "NumberObject.cpp" #include "NumberObject.cpp"
#include "NumberPrototype.cpp" #include "NumberPrototype.cpp"
#include "nodes.cpp"
#include "nodes2string.cpp"
#include "JSObject.cpp" #include "JSObject.cpp"
#include "JSGlobalObject.cpp" #include "JSGlobalObject.cpp"
#include "ObjectConstructor.cpp" #include "ObjectConstructor.cpp"
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include "ArrayPrototype.h" #include "ArrayPrototype.h"
#include "FunctionPrototype.h" #include "FunctionPrototype.h"
#include "JSArray.h" #include "JSArray.h"
#include "error_object.h"
#include "lookup.h" #include "lookup.h"
namespace KJS { namespace KJS {
......
...@@ -26,12 +26,10 @@ ...@@ -26,12 +26,10 @@
#include "Machine.h" #include "Machine.h"
#include "ObjectPrototype.h" #include "ObjectPrototype.h"
#include "error_object.h"
#include "lookup.h" #include "lookup.h"
#include "operations.h" #include "operations.h"
#include <wtf/Assertions.h> #include <wtf/Assertions.h>
#include <wtf/HashSet.h> #include <wtf/HashSet.h>
#include <algorithm> // for std::min #include <algorithm> // for std::min
namespace KJS { namespace KJS {
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include "FunctionPrototype.h" #include "FunctionPrototype.h"
#include "ObjectPrototype.h" #include "ObjectPrototype.h"
#include "error_object.h"
namespace KJS { namespace KJS {
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include "JSString.h" #include "JSString.h"
#include "ObjectPrototype.h" #include "ObjectPrototype.h"
#include "date_object.h" #include "date_object.h"
#include "error_object.h"
#include <float.h> #include <float.h>
#include <limits.h> #include <limits.h>
#include <locale.h> #include <locale.h>
......
/*
* Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
* Copyright (C) 2003, 2008 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#include "config.h"
#include "ErrorConstructor.h"
#include "ErrorInstance.h"
#include "ErrorPrototype.h"
#include "FunctionPrototype.h"
#include "JSGlobalObject.h"
#include "JSString.h"
namespace KJS {
ErrorConstructor::ErrorConstructor(ExecState* exec, FunctionPrototype* funcProto, ErrorPrototype* errorProto)
: InternalFunction(funcProto, Identifier(exec, errorProto->classInfo()->className))
{
// ECMA 15.11.3.1 Error.prototype
putDirect(exec->propertyNames().prototype, errorProto, DontEnum|DontDelete|ReadOnly);
putDirect(exec->propertyNames().length, jsNumber(exec, 1), DontDelete|ReadOnly|DontEnum);
}
// ECMA 15.9.3
static ErrorInstance* constructError(ExecState* exec, const ArgList& args)
{
ErrorInstance* obj = new (exec) ErrorInstance(exec->lexicalGlobalObject()->errorPrototype());
if (!args[0]->isUndefined())
obj->putDirect(exec->propertyNames().message, jsString(exec, args[0]->toString(exec)));
return obj;
}
static JSObject* constructWithErrorConstructor(ExecState* exec, JSObject*, const ArgList& args)
{
return constructError(exec, args);
}
ConstructType ErrorConstructor::getConstructData(ConstructData& constructData)
{
constructData.native.function = constructWithErrorConstructor;
return ConstructTypeNative;
}
// ECMA 15.9.2
static JSValue* callErrorConstructor(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
{
// "Error()" gives the sames result as "new Error()"
return constructError(exec, args);
}
CallType ErrorConstructor::getCallData(CallData& callData)
{
callData.native.function = callErrorConstructor;
return CallTypeNative;
}
} // namespace KJS
/*
* Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
* Copyright (C) 2008 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#ifndef ErrorConstructor_h
#define ErrorConstructor_h
#include "JSFunction.h"
namespace KJS {
class ErrorPrototype;
class FunctionPrototype;
class ErrorConstructor : public InternalFunction {
public:
ErrorConstructor(ExecState*, FunctionPrototype*, ErrorPrototype*);
private:
virtual ConstructType getConstructData(ConstructData&);
virtual CallType getCallData(CallData&);
};
} // namespace KJS
#endif // ErrorConstructor_h
/*
* Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
* Copyright (C) 2003, 2008 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#include "config.h"
#include "ErrorInstance.h"
namespace KJS {
const ClassInfo ErrorInstance::info = { "Error", 0, 0, 0 };
ErrorInstance::ErrorInstance(JSObject* prototype)
: JSObject(prototype)
{
}
} // namespace KJS
/*
* Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
* Copyright (C) 2008 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#ifndef ErrorInstance_h
#define ErrorInstance_h
#include "JSObject.h"
namespace KJS {
class ErrorInstance : public JSObject {
public:
ErrorInstance(JSObject* prototype);
virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info;
};
} // namespace KJS
#endif // ErrorInstance_h
/*
* Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
* Copyright (C) 2003, 2008 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#include "config.h"
#include "ErrorPrototype.h"
#include "FunctionPrototype.h"
#include "ObjectPrototype.h"
#include "ustring.h"
namespace KJS {
static JSValue* errorProtoFuncToString(ExecState*, JSObject*, JSValue*, const ArgList&);
// ECMA 15.9.4
ErrorPrototype::ErrorPrototype(ExecState* exec, ObjectPrototype* objectPrototype, FunctionPrototype* functionPrototype)
: ErrorInstance(objectPrototype)
{
// The constructor will be added later in ErrorConstructor's constructor
putDirect(exec->propertyNames().name, jsString(exec, "Error"), DontEnum);
putDirect(exec->propertyNames().message, jsString(exec, "Unknown error"), DontEnum);
putDirectFunction(new (exec) PrototypeFunction(exec, functionPrototype, 0, exec->propertyNames().toString, errorProtoFuncToString), DontEnum);
}
JSValue* errorProtoFuncToString(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
{
JSObject* thisObj = thisValue->toThisObject(exec);
UString s = "Error";
JSValue* v = thisObj->get(exec, exec->propertyNames().name);
if (!v->isUndefined())
s = v->toString(exec);
v = thisObj->get(exec, exec->propertyNames().message);
if (!v->isUndefined()) {
// Mozilla-compatible format.
s += ": ";
s += v->toString(exec);
}
return jsString(exec, s);
}
} // namespace KJS
/*
* Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
* Copyright (C) 2008 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#ifndef ErrorPrototype_h
#define ErrorPrototype_h
#include "ErrorInstance.h"
namespace KJS {
class FunctionPrototype;
class ObjectPrototype;
class ErrorPrototype : public ErrorInstance {
public:
ErrorPrototype(ExecState*, ObjectPrototype*, FunctionPrototype*);
};
} // namespace KJS
#endif // ErrorPrototype_h
...@@ -37,10 +37,14 @@ ...@@ -37,10 +37,14 @@
#include "CodeBlock.h" #include "CodeBlock.h"
#include "DateConstructor.h" #include "DateConstructor.h"
#include "DatePrototype.h" #include "DatePrototype.h"
#include "ErrorConstructor.h"
#include "ErrorPrototype.h"
#include "FunctionConstructor.h" #include "FunctionConstructor.h"
#include "FunctionPrototype.h" #include "FunctionPrototype.h"
#include "Machine.h" #include "Machine.h"
#include "MathObject.h" #include "MathObject.h"
#include "NativeErrorConstructor.h"
#include "NativeErrorPrototype.h"
#include "NumberConstructor.h" #include "NumberConstructor.h"
#include "NumberPrototype.h" #include "NumberPrototype.h"
#include "ObjectConstructor.h" #include "ObjectConstructor.h"
...@@ -51,7 +55,6 @@ ...@@ -51,7 +55,6 @@
#include "StringConstructor.h" #include "StringConstructor.h"
#include "StringPrototype.h" #include "StringPrototype.h"
#include "debugger.h" #include "debugger.h"
#include "error_object.h"
namespace KJS { namespace KJS {
......
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
#include "JSObject.h" #include "JSObject.h"
#include "DatePrototype.h" #include "DatePrototype.h"
#include "ErrorConstructor.h"
#include "JSGlobalObject.h" #include "JSGlobalObject.h"
#include "ObjectPrototype.h" #include "ObjectPrototype.h"
#include "PropertyNameArray.h" #include "PropertyNameArray.h"
#include "error_object.h"
#include "lookup.h" #include "lookup.h"
#include "nodes.h" #include "nodes.h"
#include "operations.h" #include "operations.h"
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include "config.h" #include "config.h"
#include "JSValue.h" #include "JSValue.h"
#include "error_object.h"
#include "nodes.h" #include "nodes.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
......
...@@ -19,115 +19,14 @@ ...@@ -19,115 +19,14 @@
*/ */
#include "config.h" #include "config.h"
#include "error_object.h" #include "NativeErrorConstructor.h"
#include "JSGlobalObject.h" #include "ErrorInstance.h"
#include "JSObject.h" #include "FunctionPrototype.h"
#include "JSValue.h" #include "NativeErrorPrototype.h"
#include "ObjectPrototype.h"
#include "operations.h"
namespace KJS { namespace KJS {
// ------------------------------ ErrorInstance ----------------------------
const ClassInfo ErrorInstance::info = { "Error", 0, 0, 0 };