JavaScriptCore:
authordarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 16 Jun 2008 04:00:19 +0000 (04:00 +0000)
committerdarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 16 Jun 2008 04:00:19 +0000 (04:00 +0000)
2008-06-15  Darin Adler  <darin@apple.com>

        - new names for a few key JavaScriptCore files

        * API/JSBase.cpp:
        * API/JSCallbackConstructor.h:
        * API/JSCallbackFunction.cpp:
        * API/JSCallbackFunction.h:
        * API/JSCallbackObject.h:
        * API/JSCallbackObjectFunctions.h:
        * API/JSClassRef.h:
        * API/JSContextRef.cpp:
        * API/JSObjectRef.cpp:
        * API/JSStringRef.cpp:
        * API/JSStringRefCF.cpp:
        * API/JSValueRef.cpp:
        * GNUmakefile.am:
        * JavaScriptCore.pri:
        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
        * JavaScriptCore.xcodeproj/project.pbxproj:
        * JavaScriptCoreSources.bkl:
        * VM/CodeBlock.cpp:
        * VM/CodeGenerator.cpp:
        * VM/ExceptionHelpers.cpp:
        * VM/ExceptionHelpers.h:
        * VM/JSPropertyNameIterator.cpp:
        * VM/JSPropertyNameIterator.h:
        * VM/Machine.cpp:
        * kjs/AllInOneFile.cpp:
        * kjs/DateMath.cpp:
        * kjs/DebuggerCallFrame.cpp:
        * kjs/ExecState.cpp:
        * kjs/JSActivation.cpp:
        * kjs/JSFunction.cpp: Copied from JavaScriptCore/kjs/function.cpp.
        * kjs/JSFunction.h: Copied from JavaScriptCore/kjs/function.h.
        * kjs/JSImmediate.cpp:
        * kjs/JSNotAnObject.h:
        * kjs/JSObject.cpp: Copied from JavaScriptCore/kjs/object.cpp.
        * kjs/JSObject.h: Copied from JavaScriptCore/kjs/object.h.
        * kjs/JSString.h: Copied from JavaScriptCore/kjs/internal.h.
        * kjs/JSValue.cpp: Copied from JavaScriptCore/kjs/value.cpp.
        * kjs/JSValue.h: Copied from JavaScriptCore/kjs/value.h.
        * kjs/JSVariableObject.h:
        * kjs/JSWrapperObject.h:
        * kjs/Shell.cpp:
        * kjs/SymbolTable.h:
        * kjs/array_instance.h:
        * kjs/collector.cpp:
        * kjs/date_object.cpp:
        * kjs/date_object.h:
        * kjs/error_object.cpp:
        * kjs/function.cpp: Removed.
        * kjs/function.h: Removed.
        * kjs/function_object.cpp:
        * kjs/function_object.h:
        * kjs/grammar.y:
        * kjs/internal.cpp:
        * kjs/internal.h: Removed.
        * kjs/lexer.cpp:
        * kjs/list.h:
        * kjs/lookup.h:
        * kjs/nodes.h:
        * kjs/object.cpp: Removed.
        * kjs/object.h: Removed.
        * kjs/object_object.h:
        * kjs/operations.cpp:
        * kjs/property_map.cpp:
        * kjs/property_slot.cpp:
        * kjs/property_slot.h:
        * kjs/protect.h:
        * kjs/regexp_object.cpp:
        * kjs/scope_chain.cpp:
        * kjs/string_object.h:
        * kjs/ustring.cpp:
        * kjs/value.cpp: Removed.
        * kjs/value.h: Removed.
        * profiler/Profile.cpp:
        * profiler/Profiler.cpp:

JavaScriptGlue:

2008-06-15  Darin Adler  <darin@apple.com>

        - new names for a few key JavaScriptCore files

        * ForwardingHeaders/kjs/JSValue.h: Copied from JavaScriptGlue/ForwardingHeaders/kjs/value.h.
        * ForwardingHeaders/kjs/value.h: Removed.
        * JSUtils.h:

WebCore:

2008-06-15  Darin Adler  <darin@apple.com>

        - new names for a few key JavaScriptCore files

        * ForwardingHeaders/kjs/JSFunction.h: Copied from WebCore/ForwardingHeaders/kjs/function.h.
        * ForwardingHeaders/kjs/JSObject.h: Copied from WebCore/ForwardingHeaders/kjs/object.h.
        * ForwardingHeaders/kjs/JSString.h: Copied from WebCore/ForwardingHeaders/kjs/internal.h.
        * ForwardingHeaders/kjs/JSValue.h: Copied from WebCore/ForwardingHeaders/kjs/value.h.
        * ForwardingHeaders/kjs/function.h: Removed.
        * ForwardingHeaders/kjs/internal.h: Removed.
        * ForwardingHeaders/kjs/object.h: Removed.
        * ForwardingHeaders/kjs/value.h: Removed.
        * WebCore.vcproj/WebCore.vcproj:
        * bindings/js/JSCustomSQLStatementCallback.h:
        * bindings/js/JSCustomSQLStatementErrorCallback.h:
        * bindings/js/JSCustomSQLTransactionErrorCallback.h:
        * bindings/js/JSCustomVoidCallback.h:
        * bindings/js/JSDOMBinding.h:
        * bindings/js/JSDOMWindowCustom.cpp:
        * bindings/js/JSDOMWindowShell.cpp:
        * bindings/js/JSQuarantinedObjectWrapper.h:
        * bridge/objc/objc_runtime.h:
        * bridge/objc/objc_utility.h:
        * bridge/qt/qt_runtime.cpp:
        * bridge/runtime.h:
        * bridge/runtime_array.h:
        * bridge/runtime_method.h:
        * bridge/runtime_object.h:
        * bridge/testbindings.cpp:
        * bridge/testbindings.mm:
        * bridge/testqtbindings.cpp:
        * loader/FrameLoader.cpp:
        * page/JavaScriptCallFrame.cpp:
        * page/JavaScriptProfile.cpp:
        * page/JavaScriptProfileNode.cpp:
        * platform/graphics/gtk/VideoSinkGStreamer.h:
        * plugins/PluginView.cpp:
        * plugins/gtk/PluginViewGtk.cpp:
        * plugins/qt/PluginViewQt.cpp:
        * plugins/win/PluginViewWin.cpp:

WebKit/gtk:

2008-06-15  Darin Adler  <darin@apple.com>

        - new names for a few key JavaScriptCore files

        * WebCoreSupport/ContextMenuClientGtk.cpp:
        * webkit/webkitnetworkrequest.h:
        * webkit/webkitwebbackforwardlist.h:
        * webkit/webkitwebframe.h:
        * webkit/webkitwebhistoryitem.h:
        * webkit/webkitwebsettings.h:

WebKit/mac:

2008-06-15  Darin Adler  <darin@apple.com>

        - new names for a few key JavaScriptCore files

        * ForwardingHeaders/kjs/JSFunction.h: Copied from WebKit/mac/ForwardingHeaders/kjs/function.h.
        * ForwardingHeaders/kjs/JSObject.h: Copied from WebKit/mac/ForwardingHeaders/kjs/object.h.
        * ForwardingHeaders/kjs/JSString.h: Copied from WebKit/mac/ForwardingHeaders/kjs/internal.h.
        * ForwardingHeaders/kjs/JSValue.h: Copied from WebKit/mac/ForwardingHeaders/kjs/value.h.
        * ForwardingHeaders/kjs/function.h: Removed.
        * ForwardingHeaders/kjs/internal.h: Removed.
        * ForwardingHeaders/kjs/object.h: Removed.
        * ForwardingHeaders/kjs/value.h: Removed.
        * WebView/WebScriptDebugDelegate.mm:

WebKit/qt:

2008-06-15  Darin Adler  <darin@apple.com>

        - new names for a few key JavaScriptCore files

        * Api/qwebframe.cpp:

WebKit/win:

2008-06-15  Darin Adler  <darin@apple.com>

        - new names for a few key JavaScriptCore files

        * WebView.cpp:

WebKit/wx:

2008-06-15  Darin Adler  <darin@apple.com>

        - new names for a few key JavaScriptCore files

        * WebView.cpp:

WebKitTools:

2008-06-15  Darin Adler  <darin@apple.com>

        * Scripts/do-file-rename: Updated for the latest round of renaming.
        * Scripts/do-webcore-rename: Tweaked and reorganized a bit.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@34581 268f45cc-cd09-0410-ab3c-d52691b4dbfc

135 files changed:
JavaScriptCore/API/JSBase.cpp
JavaScriptCore/API/JSCallbackConstructor.h
JavaScriptCore/API/JSCallbackFunction.cpp
JavaScriptCore/API/JSCallbackFunction.h
JavaScriptCore/API/JSCallbackObject.h
JavaScriptCore/API/JSCallbackObjectFunctions.h
JavaScriptCore/API/JSClassRef.h
JavaScriptCore/API/JSContextRef.cpp
JavaScriptCore/API/JSObjectRef.cpp
JavaScriptCore/API/JSStringRef.cpp
JavaScriptCore/API/JSStringRefCF.cpp
JavaScriptCore/API/JSValueRef.cpp
JavaScriptCore/ChangeLog
JavaScriptCore/GNUmakefile.am
JavaScriptCore/JavaScriptCore.pri
JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
JavaScriptCore/JavaScriptCoreSources.bkl
JavaScriptCore/VM/CodeBlock.cpp
JavaScriptCore/VM/CodeGenerator.cpp
JavaScriptCore/VM/ExceptionHelpers.cpp
JavaScriptCore/VM/ExceptionHelpers.h
JavaScriptCore/VM/JSPropertyNameIterator.cpp
JavaScriptCore/VM/JSPropertyNameIterator.h
JavaScriptCore/VM/Machine.cpp
JavaScriptCore/kjs/AllInOneFile.cpp
JavaScriptCore/kjs/DateMath.cpp
JavaScriptCore/kjs/DebuggerCallFrame.cpp
JavaScriptCore/kjs/ExecState.cpp
JavaScriptCore/kjs/JSActivation.cpp
JavaScriptCore/kjs/JSFunction.cpp [moved from JavaScriptCore/kjs/function.cpp with 99% similarity]
JavaScriptCore/kjs/JSFunction.h [moved from JavaScriptCore/kjs/function.h with 99% similarity]
JavaScriptCore/kjs/JSImmediate.cpp
JavaScriptCore/kjs/JSNotAnObject.h
JavaScriptCore/kjs/JSObject.cpp [moved from JavaScriptCore/kjs/object.cpp with 99% similarity]
JavaScriptCore/kjs/JSObject.h [moved from JavaScriptCore/kjs/object.h with 100% similarity]
JavaScriptCore/kjs/JSString.h [moved from JavaScriptCore/kjs/internal.h with 99% similarity]
JavaScriptCore/kjs/JSValue.cpp [moved from JavaScriptCore/kjs/value.cpp with 99% similarity]
JavaScriptCore/kjs/JSValue.h [moved from JavaScriptCore/kjs/value.h with 100% similarity]
JavaScriptCore/kjs/JSVariableObject.h
JavaScriptCore/kjs/JSWrapperObject.h
JavaScriptCore/kjs/Shell.cpp
JavaScriptCore/kjs/SymbolTable.h
JavaScriptCore/kjs/array_instance.h
JavaScriptCore/kjs/collector.cpp
JavaScriptCore/kjs/date_object.cpp
JavaScriptCore/kjs/date_object.h
JavaScriptCore/kjs/error_object.cpp
JavaScriptCore/kjs/function_object.cpp
JavaScriptCore/kjs/function_object.h
JavaScriptCore/kjs/grammar.y
JavaScriptCore/kjs/internal.cpp
JavaScriptCore/kjs/lexer.cpp
JavaScriptCore/kjs/list.h
JavaScriptCore/kjs/lookup.h
JavaScriptCore/kjs/nodes.h
JavaScriptCore/kjs/object_object.h
JavaScriptCore/kjs/operations.cpp
JavaScriptCore/kjs/property_map.cpp
JavaScriptCore/kjs/property_slot.cpp
JavaScriptCore/kjs/property_slot.h
JavaScriptCore/kjs/protect.h
JavaScriptCore/kjs/regexp_object.cpp
JavaScriptCore/kjs/scope_chain.cpp
JavaScriptCore/kjs/string_object.h
JavaScriptCore/kjs/ustring.cpp
JavaScriptCore/profiler/Profile.cpp
JavaScriptCore/profiler/Profiler.cpp
JavaScriptGlue/ChangeLog
JavaScriptGlue/ForwardingHeaders/kjs/JSValue.h [new file with mode: 0644]
JavaScriptGlue/ForwardingHeaders/kjs/value.h [deleted file]
JavaScriptGlue/JSUtils.h
WebCore/ChangeLog
WebCore/ForwardingHeaders/kjs/JSFunction.h [new file with mode: 0644]
WebCore/ForwardingHeaders/kjs/JSObject.h [new file with mode: 0644]
WebCore/ForwardingHeaders/kjs/JSString.h [new file with mode: 0644]
WebCore/ForwardingHeaders/kjs/JSValue.h [new file with mode: 0644]
WebCore/ForwardingHeaders/kjs/function.h [deleted file]
WebCore/ForwardingHeaders/kjs/internal.h [deleted file]
WebCore/ForwardingHeaders/kjs/object.h [deleted file]
WebCore/ForwardingHeaders/kjs/value.h [deleted file]
WebCore/WebCore.vcproj/WebCore.vcproj
WebCore/bindings/js/JSCustomSQLStatementCallback.h
WebCore/bindings/js/JSCustomSQLStatementErrorCallback.h
WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.h
WebCore/bindings/js/JSCustomVoidCallback.h
WebCore/bindings/js/JSDOMBinding.h
WebCore/bindings/js/JSDOMWindowCustom.cpp
WebCore/bindings/js/JSDOMWindowShell.cpp
WebCore/bindings/js/JSQuarantinedObjectWrapper.h
WebCore/bridge/objc/objc_runtime.h
WebCore/bridge/objc/objc_utility.h
WebCore/bridge/qt/qt_runtime.cpp
WebCore/bridge/runtime.h
WebCore/bridge/runtime_array.h
WebCore/bridge/runtime_method.h
WebCore/bridge/runtime_object.h
WebCore/bridge/testbindings.cpp
WebCore/bridge/testbindings.mm
WebCore/bridge/testqtbindings.cpp
WebCore/loader/FrameLoader.cpp
WebCore/page/JavaScriptCallFrame.cpp
WebCore/page/JavaScriptProfile.cpp
WebCore/page/JavaScriptProfileNode.cpp
WebCore/platform/graphics/gtk/VideoSinkGStreamer.h
WebCore/plugins/PluginView.cpp
WebCore/plugins/gtk/PluginViewGtk.cpp
WebCore/plugins/qt/PluginViewQt.cpp
WebCore/plugins/win/PluginViewWin.cpp
WebKit/gtk/ChangeLog
WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp
WebKit/gtk/webkit/webkitnetworkrequest.h
WebKit/gtk/webkit/webkitwebbackforwardlist.h
WebKit/gtk/webkit/webkitwebframe.h
WebKit/gtk/webkit/webkitwebhistoryitem.h
WebKit/gtk/webkit/webkitwebsettings.h
WebKit/mac/ChangeLog
WebKit/mac/ForwardingHeaders/kjs/JSFunction.h [new file with mode: 0644]
WebKit/mac/ForwardingHeaders/kjs/JSObject.h [new file with mode: 0644]
WebKit/mac/ForwardingHeaders/kjs/JSString.h [new file with mode: 0644]
WebKit/mac/ForwardingHeaders/kjs/JSValue.h [new file with mode: 0644]
WebKit/mac/ForwardingHeaders/kjs/function.h [deleted file]
WebKit/mac/ForwardingHeaders/kjs/internal.h [deleted file]
WebKit/mac/ForwardingHeaders/kjs/object.h [deleted file]
WebKit/mac/ForwardingHeaders/kjs/value.h [deleted file]
WebKit/mac/WebView/WebScriptDebugDelegate.mm
WebKit/qt/Api/qwebframe.cpp
WebKit/qt/ChangeLog
WebKit/win/ChangeLog
WebKit/win/WebView.cpp
WebKit/wx/ChangeLog
WebKit/wx/WebView.cpp
WebKitTools/ChangeLog
WebKitTools/Scripts/do-file-rename
WebKitTools/Scripts/do-webcore-rename

index ebafe30..8fa8820 100644 (file)
@@ -33,7 +33,7 @@
 #include <kjs/interpreter.h>
 #include <kjs/JSGlobalObject.h>
 #include <kjs/JSLock.h>
-#include <kjs/object.h>
+#include <kjs/JSObject.h>
 
 using namespace KJS;
 
index 9149995..b48700d 100644 (file)
@@ -28,7 +28,7 @@
 #define JSCallbackConstructor_h
 
 #include "JSObjectRef.h"
-#include <kjs/object.h>
+#include <kjs/JSObject.h>
 
 namespace KJS {
 
index c04cf2a..0aa7509 100644 (file)
@@ -29,7 +29,7 @@
 #include "JSCallbackFunction.h"
 
 #include "APICast.h"
-#include "function.h"
+#include "JSFunction.h"
 #include "function_object.h"
 #include <kjs/JSGlobalObject.h>
 #include <wtf/Vector.h>
index 2671da2..782e523 100644 (file)
@@ -28,8 +28,8 @@
 #define JSCallbackFunction_h
 
 #include "JSObjectRef.h"
-#include "function.h"
-#include "object.h"
+#include "JSFunction.h"
+#include "JSObject.h"
 
 namespace KJS {
 
index 726403d..29b57a1 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "JSObjectRef.h"
 #include "JSValueRef.h"
-#include "object.h"
+#include "JSObject.h"
 
 namespace KJS {
 
index 7fb9e06..3f2f3f1 100644 (file)
@@ -33,7 +33,7 @@
 #include "JSGlobalObject.h"
 #include "JSStringRef.h"
 #include "PropertyNameArray.h"
-#include "internal.h"
+#include "JSString.h"
 #include <wtf/Vector.h>
 
 namespace KJS {
index 6532440..8a677c8 100644 (file)
@@ -29,7 +29,7 @@
 
 #include "JSObjectRef.h"
 
-#include <kjs/object.h>
+#include <kjs/JSObject.h>
 #include <kjs/protect.h>
 #include <kjs/ustring.h>
 #include <wtf/HashMap.h>
index c651b59..57ba5ce 100644 (file)
@@ -32,7 +32,7 @@
 #include "JSCallbackObject.h"
 #include "JSClassRef.h"
 #include "JSGlobalObject.h"
-#include "object.h"
+#include "JSObject.h"
 #include <wtf/Platform.h>
 
 using namespace KJS;
index 77202ee..2eec76c 100644 (file)
 #include "JSGlobalObject.h"
 #include "JSValueRef.h"
 #include "PropertyNameArray.h"
-#include "function.h"
+#include "JSFunction.h"
 #include "function_object.h"
 #include "identifier.h"
-#include "internal.h"
-#include "object.h"
+#include "JSString.h"
+#include "JSObject.h"
 #include "object_object.h"
 #include <wtf/Platform.h>
 
index 13dfae6..f6d73af 100644 (file)
 #include "APICast.h"
 #include <kjs/JSLock.h>
 #include <kjs/JSType.h>
-#include <kjs/internal.h>
+#include <kjs/JSString.h>
 #include <kjs/operations.h>
 #include <kjs/ustring.h>
-#include <kjs/value.h>
+#include <kjs/JSValue.h>
 #include <wtf/unicode/UTF8.h>
 
 using namespace KJS;
index 80cb705..f79f048 100644 (file)
@@ -31,7 +31,7 @@
 #include "JSStringRef.h"
 #include <kjs/JSLock.h>
 #include <kjs/ustring.h>
-#include <kjs/value.h>
+#include <kjs/JSValue.h>
 
 using namespace KJS;
 
index 54cc3ac..8ad5100 100644 (file)
 
 #include <kjs/JSType.h>
 #include <kjs/JSGlobalObject.h>
-#include <kjs/internal.h>
+#include <kjs/JSString.h>
 #include <kjs/operations.h>
 #include <kjs/protect.h>
 #include <kjs/ustring.h>
-#include <kjs/value.h>
+#include <kjs/JSValue.h>
 
 #include <wtf/Assertions.h>
 
index 2b927b5..502e1a3 100644 (file)
@@ -1,5 +1,84 @@
 2008-06-15  Darin Adler  <darin@apple.com>
 
+        - new names for a few key JavaScriptCore files
+
+        * API/JSBase.cpp:
+        * API/JSCallbackConstructor.h:
+        * API/JSCallbackFunction.cpp:
+        * API/JSCallbackFunction.h:
+        * API/JSCallbackObject.h:
+        * API/JSCallbackObjectFunctions.h:
+        * API/JSClassRef.h:
+        * API/JSContextRef.cpp:
+        * API/JSObjectRef.cpp:
+        * API/JSStringRef.cpp:
+        * API/JSStringRefCF.cpp:
+        * API/JSValueRef.cpp:
+        * GNUmakefile.am:
+        * JavaScriptCore.pri:
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * JavaScriptCoreSources.bkl:
+        * VM/CodeBlock.cpp:
+        * VM/CodeGenerator.cpp:
+        * VM/ExceptionHelpers.cpp:
+        * VM/ExceptionHelpers.h:
+        * VM/JSPropertyNameIterator.cpp:
+        * VM/JSPropertyNameIterator.h:
+        * VM/Machine.cpp:
+        * kjs/AllInOneFile.cpp:
+        * kjs/DateMath.cpp:
+        * kjs/DebuggerCallFrame.cpp:
+        * kjs/ExecState.cpp:
+        * kjs/JSActivation.cpp:
+        * kjs/JSFunction.cpp: Copied from JavaScriptCore/kjs/function.cpp.
+        * kjs/JSFunction.h: Copied from JavaScriptCore/kjs/function.h.
+        * kjs/JSImmediate.cpp:
+        * kjs/JSNotAnObject.h:
+        * kjs/JSObject.cpp: Copied from JavaScriptCore/kjs/object.cpp.
+        * kjs/JSObject.h: Copied from JavaScriptCore/kjs/object.h.
+        * kjs/JSString.h: Copied from JavaScriptCore/kjs/internal.h.
+        * kjs/JSValue.cpp: Copied from JavaScriptCore/kjs/value.cpp.
+        * kjs/JSValue.h: Copied from JavaScriptCore/kjs/value.h.
+        * kjs/JSVariableObject.h:
+        * kjs/JSWrapperObject.h:
+        * kjs/Shell.cpp:
+        * kjs/SymbolTable.h:
+        * kjs/array_instance.h:
+        * kjs/collector.cpp:
+        * kjs/date_object.cpp:
+        * kjs/date_object.h:
+        * kjs/error_object.cpp:
+        * kjs/function.cpp: Removed.
+        * kjs/function.h: Removed.
+        * kjs/function_object.cpp:
+        * kjs/function_object.h:
+        * kjs/grammar.y:
+        * kjs/internal.cpp:
+        * kjs/internal.h: Removed.
+        * kjs/lexer.cpp:
+        * kjs/list.h:
+        * kjs/lookup.h:
+        * kjs/nodes.h:
+        * kjs/object.cpp: Removed.
+        * kjs/object.h: Removed.
+        * kjs/object_object.h:
+        * kjs/operations.cpp:
+        * kjs/property_map.cpp:
+        * kjs/property_slot.cpp:
+        * kjs/property_slot.h:
+        * kjs/protect.h:
+        * kjs/regexp_object.cpp:
+        * kjs/scope_chain.cpp:
+        * kjs/string_object.h:
+        * kjs/ustring.cpp:
+        * kjs/value.cpp: Removed.
+        * kjs/value.h: Removed.
+        * profiler/Profile.cpp:
+        * profiler/Profiler.cpp:
+
+2008-06-15  Darin Adler  <darin@apple.com>
+
         Rubber stamped by Sam.
 
         - cut down on confusing uses of "Object" and "Imp" in
index d72d023..801fd81 100644 (file)
@@ -94,7 +94,7 @@ javascriptcore_sources += \
        JavaScriptCore/kjs/debugger.cpp \
        JavaScriptCore/kjs/dtoa.cpp \
        JavaScriptCore/kjs/error_object.cpp \
-       JavaScriptCore/kjs/function.cpp \
+       JavaScriptCore/kjs/JSFunction.cpp \
        JavaScriptCore/kjs/function_object.cpp \
        JavaScriptCore/kjs/identifier.cpp \
        JavaScriptCore/kjs/internal.cpp \
@@ -106,7 +106,7 @@ javascriptcore_sources += \
        JavaScriptCore/kjs/nodes.cpp \
        JavaScriptCore/kjs/nodes2string.cpp \
        JavaScriptCore/kjs/number_object.cpp \
-       JavaScriptCore/kjs/object.cpp \
+       JavaScriptCore/kjs/JSObject.cpp \
        JavaScriptCore/kjs/object_object.cpp \
        JavaScriptCore/kjs/operations.cpp \
        JavaScriptCore/kjs/property_map.cpp \
@@ -116,7 +116,7 @@ javascriptcore_sources += \
        JavaScriptCore/kjs/scope_chain.cpp \
        JavaScriptCore/kjs/string_object.cpp \
        JavaScriptCore/kjs/ustring.cpp \
-       JavaScriptCore/kjs/value.cpp \
+       JavaScriptCore/kjs/JSValue.cpp \
        JavaScriptCore/wtf/FastMalloc.cpp \
        JavaScriptCore/wtf/TCSystemAlloc.cpp \
        JavaScriptCore/VM/CodeGenerator.cpp \
index f605356..5e3e068 100644 (file)
@@ -65,7 +65,7 @@ SOURCES += \
 # AllInOneFile.cpp helps gcc analize and optimize code
 # Other compilers may be able to do this at link time
 SOURCES += \
-    kjs/function.cpp \
+    kjs/JSFunction.cpp \
     kjs/debugger.cpp \
     kjs/array_instance.cpp \
     kjs/array_object.cpp \
@@ -92,7 +92,7 @@ SOURCES += \
     kjs/nodes.cpp \
     kjs/nodes2string.cpp \
     kjs/number_object.cpp \
-    kjs/object.cpp \
+    kjs/JSObject.cpp \
     kjs/object_object.cpp \
     kjs/operations.cpp \
     kjs/Parser.cpp \
@@ -104,7 +104,7 @@ SOURCES += \
     kjs/scope_chain.cpp \
     kjs/string_object.cpp \
     kjs/ustring.cpp \
-    kjs/value.cpp \
+    kjs/JSValue.cpp \
     profiler/ProfileNode.cpp \
     profiler/Profile.cpp \
     profiler/Profiler.cpp \
index 8860ae5..ca4a461 100644 (file)
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kjs\function.cpp"\r
+                               RelativePath="..\..\kjs\JSFunction.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kjs\function.h"\r
+                               RelativePath="..\..\kjs\JSFunction.h"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kjs\internal.h"\r
+                               RelativePath="..\..\kjs\JSString.h"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kjs\object.cpp"\r
+                               RelativePath="..\..\kjs\JSObject.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kjs\object.h"\r
+                               RelativePath="..\..\kjs\JSObject.h"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kjs\value.cpp"\r
+                               RelativePath="..\..\kjs\JSValue.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kjs\value.h"\r
+                               RelativePath="..\..\kjs\JSValue.h"\r
                                >\r
                        </File>\r
                        <Filter\r
index ed1ea89..9ff6ab1 100644 (file)
@@ -88,7 +88,7 @@
                149B25010D8AF6D1009CB8C7 /* Register.h in Headers */ = {isa = PBXBuildFile; fileRef = 149B24FF0D8AF6D1009CB8C7 /* Register.h */; settings = {ATTRIBUTES = (Private, ); }; };
                149B25020D8AF6D1009CB8C7 /* Register.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 149B25000D8AF6D1009CB8C7 /* Register.cpp */; };
                14A396A70CD2933100B5B4FF /* SymbolTable.h in Headers */ = {isa = PBXBuildFile; fileRef = 14A396A60CD2933100B5B4FF /* SymbolTable.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               14ABB36F099C076400E2A24F /* value.h in Headers */ = {isa = PBXBuildFile; fileRef = 14ABB36E099C076400E2A24F /* value.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               14ABB36F099C076400E2A24F /* JSValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 14ABB36E099C076400E2A24F /* JSValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
                14ABB455099C2A0F00E2A24F /* JSType.h in Headers */ = {isa = PBXBuildFile; fileRef = 14ABB454099C2A0F00E2A24F /* JSType.h */; settings = {ATTRIBUTES = (Private, ); }; };
                14ABDF5F0A437FEF00ECCA01 /* JSCallbackObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 14ABDF5D0A437FEF00ECCA01 /* JSCallbackObject.h */; };
                14ABDF600A437FEF00ECCA01 /* JSCallbackObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14ABDF5E0A437FEF00ECCA01 /* JSCallbackObject.cpp */; };
                932F5B450822A1C700736975 /* debugger.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8590255597D01FF60F7 /* debugger.h */; settings = {ATTRIBUTES = (Private, ); }; };
                932F5B460822A1C700736975 /* error_object.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A85B0255597D01FF60F7 /* error_object.h */; settings = {ATTRIBUTES = (Private, ); }; };
                932F5B470822A1C700736975 /* function_object.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A85D0255597D01FF60F7 /* function_object.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               932F5B480822A1C700736975 /* function.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A85F0255597D01FF60F7 /* function.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               932F5B490822A1C700736975 /* internal.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8620255597D01FF60F7 /* internal.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               932F5B480822A1C700736975 /* JSFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A85F0255597D01FF60F7 /* JSFunction.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               932F5B490822A1C700736975 /* JSString.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8620255597D01FF60F7 /* JSString.h */; settings = {ATTRIBUTES = (Private, ); }; };
                932F5B4A0822A1C700736975 /* interpreter.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8640255597D01FF60F7 /* interpreter.h */; settings = {ATTRIBUTES = (Private, ); }; };
                932F5B4B0822A1C700736975 /* lexer.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8660255597D01FF60F7 /* lexer.h */; };
                932F5B4D0822A1C700736975 /* lookup.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8690255597D01FF60F7 /* lookup.h */; settings = {ATTRIBUTES = (Private, ); }; };
                932F5B500822A1C700736975 /* nodes.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A86E0255597D01FF60F7 /* nodes.h */; settings = {ATTRIBUTES = (Private, ); }; };
                932F5B510822A1C700736975 /* number_object.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8710255597D01FF60F7 /* number_object.h */; settings = {ATTRIBUTES = (Private, ); }; };
                932F5B530822A1C700736975 /* object_object.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8740255597D01FF60F7 /* object_object.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               932F5B540822A1C700736975 /* object.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8760255597D01FF60F7 /* object.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               932F5B540822A1C700736975 /* JSObject.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8760255597D01FF60F7 /* JSObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
                932F5B550822A1C700736975 /* operations.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8780255597D01FF60F7 /* operations.h */; settings = {ATTRIBUTES = (Private, ); }; };
                932F5B560822A1C700736975 /* property_map.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A87A0255597D01FF60F7 /* property_map.h */; settings = {ATTRIBUTES = (Private, ); }; };
                932F5B570822A1C700736975 /* regexp_object.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A87C0255597D01FF60F7 /* regexp_object.h */; settings = {ATTRIBUTES = (Private, ); }; };
                149B24FF0D8AF6D1009CB8C7 /* Register.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Register.h; path = VM/Register.h; sourceTree = "<group>"; };
                149B25000D8AF6D1009CB8C7 /* Register.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Register.cpp; path = VM/Register.cpp; sourceTree = "<group>"; };
                14A396A60CD2933100B5B4FF /* SymbolTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SymbolTable.h; sourceTree = "<group>"; };
-               14ABB36E099C076400E2A24F /* value.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = value.h; sourceTree = "<group>"; };
+               14ABB36E099C076400E2A24F /* JSValue.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSValue.h; sourceTree = "<group>"; };
                14ABB454099C2A0F00E2A24F /* JSType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSType.h; sourceTree = "<group>"; };
                14ABDF5D0A437FEF00ECCA01 /* JSCallbackObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCallbackObject.h; sourceTree = "<group>"; };
                14ABDF5E0A437FEF00ECCA01 /* JSCallbackObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCallbackObject.cpp; sourceTree = "<group>"; };
                F692A85B0255597D01FF60F7 /* error_object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = error_object.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A85C0255597D01FF60F7 /* function_object.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = function_object.cpp; sourceTree = "<group>"; tabWidth = 8; };
                F692A85D0255597D01FF60F7 /* function_object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = function_object.h; sourceTree = "<group>"; tabWidth = 8; };
-               F692A85E0255597D01FF60F7 /* function.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = function.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A85F0255597D01FF60F7 /* function.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = function.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A85E0255597D01FF60F7 /* JSFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFunction.cpp; sourceTree = "<group>"; tabWidth = 8; };
+               F692A85F0255597D01FF60F7 /* JSFunction.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = JSFunction.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A8610255597D01FF60F7 /* internal.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = internal.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A8620255597D01FF60F7 /* internal.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = internal.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A8620255597D01FF60F7 /* JSString.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = JSString.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A8630255597D01FF60F7 /* interpreter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = interpreter.cpp; sourceTree = "<group>"; tabWidth = 8; };
                F692A8640255597D01FF60F7 /* interpreter.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = interpreter.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A8650255597D01FF60F7 /* lexer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lexer.cpp; path = kjs/lexer.cpp; sourceTree = "<group>"; tabWidth = 8; };
                F692A8710255597D01FF60F7 /* number_object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = number_object.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A8730255597D01FF60F7 /* object_object.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = object_object.cpp; sourceTree = "<group>"; tabWidth = 8; };
                F692A8740255597D01FF60F7 /* object_object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = object_object.h; sourceTree = "<group>"; tabWidth = 8; };
-               F692A8750255597D01FF60F7 /* object.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = object.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A8760255597D01FF60F7 /* object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = object.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A8750255597D01FF60F7 /* JSObject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSObject.cpp; sourceTree = "<group>"; tabWidth = 8; };
+               F692A8760255597D01FF60F7 /* JSObject.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = JSObject.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A8770255597D01FF60F7 /* operations.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = operations.cpp; sourceTree = "<group>"; tabWidth = 8; };
                F692A8780255597D01FF60F7 /* operations.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = operations.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A8790255597D01FF60F7 /* property_map.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = property_map.cpp; sourceTree = "<group>"; tabWidth = 8; };
                F692A8840255597D01FF60F7 /* types.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = types.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A8850255597D01FF60F7 /* ustring.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ustring.cpp; sourceTree = "<group>"; tabWidth = 8; };
                F692A8860255597D01FF60F7 /* ustring.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = ustring.h; sourceTree = "<group>"; tabWidth = 8; };
-               F692A8870255597D01FF60F7 /* value.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = value.cpp; sourceTree = "<group>"; tabWidth = 8; };
+               F692A8870255597D01FF60F7 /* JSValue.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSValue.cpp; sourceTree = "<group>"; tabWidth = 8; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
                                F692A85B0255597D01FF60F7 /* error_object.h */,
                                14BD53F40A3E12D800BAF59C /* ExecState.cpp */,
                                14BD53F30A3E12D800BAF59C /* ExecState.h */,
-                               F692A85E0255597D01FF60F7 /* function.cpp */,
-                               F692A85F0255597D01FF60F7 /* function.h */,
+                               F692A85E0255597D01FF60F7 /* JSFunction.cpp */,
+                               F692A85F0255597D01FF60F7 /* JSFunction.h */,
                                F692A85C0255597D01FF60F7 /* function_object.cpp */,
                                F692A85D0255597D01FF60F7 /* function_object.h */,
                                933A3499038AE7C6008635CE /* grammar.y */,
                                E178636C0D9BEEC300D74E75 /* InitializeThreading.cpp */,
                                E178633F0D9BEC0000D74E75 /* InitializeThreading.h */,
                                F692A8610255597D01FF60F7 /* internal.cpp */,
-                               F692A8620255597D01FF60F7 /* internal.h */,
+                               F692A8620255597D01FF60F7 /* JSString.h */,
                                F692A8630255597D01FF60F7 /* interpreter.cpp */,
                                F692A8640255597D01FF60F7 /* interpreter.h */,
                                14DA818F0D99FD2000B0A4FB /* JSActivation.cpp */,
                                F692A86B0255597D01FF60F7 /* math_object.h */,
                                F692A8700255597D01FF60F7 /* number_object.cpp */,
                                F692A8710255597D01FF60F7 /* number_object.h */,
-                               F692A8750255597D01FF60F7 /* object.cpp */,
-                               F692A8760255597D01FF60F7 /* object.h */,
+                               F692A8750255597D01FF60F7 /* JSObject.cpp */,
+                               F692A8760255597D01FF60F7 /* JSObject.h */,
                                F692A8730255597D01FF60F7 /* object_object.cpp */,
                                F692A8740255597D01FF60F7 /* object_object.h */,
                                F692A8770255597D01FF60F7 /* operations.cpp */,
                                F692A8840255597D01FF60F7 /* types.h */,
                                F692A8850255597D01FF60F7 /* ustring.cpp */,
                                F692A8860255597D01FF60F7 /* ustring.h */,
-                               F692A8870255597D01FF60F7 /* value.cpp */,
-                               14ABB36E099C076400E2A24F /* value.h */,
+                               F692A8870255597D01FF60F7 /* JSValue.cpp */,
+                               14ABB36E099C076400E2A24F /* JSValue.h */,
                                A72700770DAC605600E548D7 /* JSNotAnObject.h */,
                                A72700780DAC605600E548D7 /* JSNotAnObject.cpp */,
                        );
                                932F5B450822A1C700736975 /* debugger.h in Headers */,
                                932F5B6B0822A1C700736975 /* dtoa.h in Headers */,
                                932F5B460822A1C700736975 /* error_object.h in Headers */,
-                               932F5B480822A1C700736975 /* function.h in Headers */,
+                               932F5B480822A1C700736975 /* JSFunction.h in Headers */,
                                932F5B470822A1C700736975 /* function_object.h in Headers */,
                                65FB3F5109D11B2400F49DEB /* grammar.h in Headers */,
                                932F5B660822A1C700736975 /* identifier.h in Headers */,
-                               932F5B490822A1C700736975 /* internal.h in Headers */,
+                               932F5B490822A1C700736975 /* JSString.h in Headers */,
                                932F5B4A0822A1C700736975 /* interpreter.h in Headers */,
                                932F5B4B0822A1C700736975 /* lexer.h in Headers */,
                                65FB3EB309D109F000F49DEB /* lexer.lut.h in Headers */,
                                932F5B500822A1C700736975 /* nodes.h in Headers */,
                                932F5B510822A1C700736975 /* number_object.h in Headers */,
                                65B174F609D100FA00820339 /* number_object.lut.h in Headers */,
-                               932F5B540822A1C700736975 /* object.h in Headers */,
+                               932F5B540822A1C700736975 /* JSObject.h in Headers */,
                                932F5B530822A1C700736975 /* object_object.h in Headers */,
                                932F5B550822A1C700736975 /* operations.h in Headers */,
                                932F5B6C0822A1C700736975 /* pcre.h in Headers */,
                                932F5B5B0822A1C700736975 /* types.h in Headers */,
                                93E26BFE08B151D400F85226 /* ucpinternal.h in Headers */,
                                932F5B5C0822A1C700736975 /* ustring.h in Headers */,
-                               14ABB36F099C076400E2A24F /* value.h in Headers */,
+                               14ABB36F099C076400E2A24F /* JSValue.h in Headers */,
                                E1EE79280D6C964500FEA3BA /* Locker.h in Headers */,
                                E1A862AB0D7EBB7D001EC6AA /* Collator.h in Headers */,
                                E17863400D9BEC0000D74E75 /* InitializeThreading.h in Headers */,
index 640beb0..c51cf6f 100644 (file)
@@ -55,7 +55,7 @@ Source files for JSCore.
         kjs/dtoa.cpp
         kjs/error_object.cpp
         kjs/ExecState.cpp
-        kjs/function.cpp
+        kjs/JSFunction.cpp
         kjs/function_object.cpp
         kjs/identifier.cpp
         kjs/InitializeThreading.cpp
@@ -76,7 +76,7 @@ Source files for JSCore.
         kjs/nodes.cpp
         kjs/nodes2string.cpp
         kjs/number_object.cpp
-        kjs/object.cpp
+        kjs/JSObject.cpp
         kjs/object_object.cpp
         kjs/operations.cpp
         kjs/Parser.cpp
@@ -88,7 +88,7 @@ Source files for JSCore.
         kjs/scope_chain.cpp
         kjs/string_object.cpp
         kjs/ustring.cpp
-        kjs/value.cpp
+        kjs/JSValue.cpp
 
     </set>
     <set append="1" var="JSCORE_SOURCES_PCRE">
index 63bfa0e..a1875b7 100644 (file)
@@ -32,7 +32,7 @@
 
 #include "Machine.h"
 #include "debugger.h"
-#include "value.h"
+#include "JSValue.h"
 #include <stdio.h>
 
 namespace KJS {
index 7ae37aa..6538a81 100644 (file)
@@ -31,7 +31,7 @@
 #include "CodeGenerator.h"
 
 #include "Machine.h"
-#include "function.h"
+#include "JSFunction.h"
 
 using namespace std;
 
index 73d6b5d..f64fb9e 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "ExecState.h"
 #include "nodes.h"
-#include "object.h"
+#include "JSObject.h"
 
 namespace KJS {
 
index 231f3b7..5dcbc92 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef ExceptionHelpers_h
 #define ExceptionHelpers_h
 
-#include "object.h"
+#include "JSObject.h"
 
 namespace KJS {
 
index 0ccb886..5e64626 100644 (file)
@@ -30,7 +30,7 @@
 #include "JSPropertyNameIterator.h"
 
 #include "identifier.h"
-#include "object.h"
+#include "JSObject.h"
 #include "PropertyNameArray.h"
 
 namespace KJS {
index 530d11a..d4062b8 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef JSPropertyNameIterator_h
 #define JSPropertyNameIterator_h
 
-#include "value.h"
+#include "JSValue.h"
 
 namespace KJS {
 
index ec7c633..53179b1 100644 (file)
@@ -42,8 +42,8 @@
 #include "Register.h"
 #include "array_object.h"
 #include "debugger.h"
-#include "function.h"
-#include "internal.h"
+#include "JSFunction.h"
+#include "JSString.h"
 #include "object_object.h"
 #include "operations.h"
 #include "operations.h"
index 9f6ceb2..e0b0edb 100644 (file)
@@ -26,7 +26,7 @@
 #define JAVASCRIPTCORE_BUILDING_ALL_IN_ONE_FILE 1
 #include "config.h"
 
-#include "function.cpp"
+#include "JSFunction.cpp"
 #include "debugger.cpp"
 #include "array_instance.cpp"
 #include "array_object.cpp"
@@ -55,7 +55,7 @@
 #include "nodes.cpp"
 #include "nodes2string.cpp"
 #include "number_object.cpp"
-#include "object.cpp"
+#include "JSObject.cpp"
 #include "object_object.cpp"
 #include "operations.cpp"
 #include "Parser.cpp"
@@ -67,7 +67,7 @@
 #include "scope_chain.cpp"
 #include "string_object.cpp"
 #include "ustring.cpp"
-#include "value.cpp"
+#include "JSValue.cpp"
 #include "wtf/FastMalloc.cpp"
 #include "wtf/TCSystemAlloc.cpp"
 #include "VM/CodeGenerator.cpp"
index 7f05b98..c6fab33 100644 (file)
@@ -44,7 +44,7 @@
 
 #include <math.h>
 #include <stdint.h>
-#include <value.h>
+#include <JSValue.h>
 
 #include <wtf/Assertions.h>
 
index f6095b7..5ee060f 100644 (file)
@@ -29,7 +29,7 @@
 #include "config.h"
 #include "DebuggerCallFrame.h"
 
-#include "function.h"
+#include "JSFunction.h"
 #include "CodeBlock.h"
 #include "Machine.h"
 #include "Parser.h"
index 907cc27..1558f26 100644 (file)
@@ -25,8 +25,8 @@
 #include "ExecState.h"
 
 #include "JSGlobalObject.h"
-#include "function.h"
-#include "internal.h"
+#include "JSFunction.h"
+#include "JSString.h"
 #include "scope_chain_mark.h"
 
 namespace KJS {
index a26159f..9243dcd 100644 (file)
@@ -32,7 +32,7 @@
 #include "CodeBlock.h"
 #include "Machine.h"
 #include "Register.h"
-#include "function.h"
+#include "JSFunction.h"
 
 namespace KJS {
 
similarity index 99%
rename from JavaScriptCore/kjs/function.cpp
rename to JavaScriptCore/kjs/JSFunction.cpp
index 2fc78ad..b827fdc 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "function.h"
+#include "JSFunction.h"
 
 #include "ExecState.h"
 #include "JSActivation.h"
@@ -35,7 +35,7 @@
 #include "debugger.h"
 #include "dtoa.h"
 #include "function_object.h"
-#include "internal.h"
+#include "JSString.h"
 #include "lexer.h"
 #include "nodes.h"
 #include "operations.h"
similarity index 99%
rename from JavaScriptCore/kjs/function.h
rename to JavaScriptCore/kjs/JSFunction.h
index 13cdc85..687e5c3 100644 (file)
@@ -28,7 +28,7 @@
 #include "JSVariableObject.h"
 #include "SymbolTable.h"
 #include "nodes.h"
-#include "object.h"
+#include "JSObject.h"
 
 namespace KJS {
 
index e416729..d48f1e8 100644 (file)
@@ -25,7 +25,7 @@
 #include "bool_object.h"
 #include "JSNotAnObject.h"
 #include "number_object.h"
-#include "object.h"
+#include "JSObject.h"
 
 namespace KJS {
 
index 81c9e35..34f1d7e 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef JSNotAnObject_h
 #define JSNotAnObject_h
 
-#include "object.h"
+#include "JSObject.h"
 
 namespace KJS {
 
similarity index 99%
rename from JavaScriptCore/kjs/object.cpp
rename to JavaScriptCore/kjs/JSObject.cpp
index 43f8061..e3eb5cb 100644 (file)
@@ -23,7 +23,7 @@
  */
 
 #include "config.h"
-#include "object.h"
+#include "JSObject.h"
 
 #include "date_object.h"
 #include "error_object.h"
similarity index 99%
rename from JavaScriptCore/kjs/internal.h
rename to JavaScriptCore/kjs/JSString.h
index 0cc5157..20524d0 100644 (file)
@@ -24,7 +24,7 @@
 #ifndef INTERNAL_H
 #define INTERNAL_H
 
-#include "object.h"
+#include "JSObject.h"
 #include "ustring.h"
 
 namespace KJS {
similarity index 99%
rename from JavaScriptCore/kjs/value.cpp
rename to JavaScriptCore/kjs/JSValue.cpp
index bda5347..1c8dc01 100644 (file)
@@ -21,7 +21,7 @@
  */
 
 #include "config.h"
-#include "value.h"
+#include "JSValue.h"
 
 #include "error_object.h"
 #include "nodes.h"
index 6069a0e..5486614 100644 (file)
@@ -32,7 +32,7 @@
 #include "Register.h"
 #include "SymbolTable.h"
 #include "UnusedParam.h"
-#include "object.h"
+#include "JSObject.h"
 #include <wtf/UnusedParam.h>
 
 namespace KJS {
index 0a06c9f..c0f7354 100644 (file)
@@ -23,7 +23,7 @@
 #ifndef KJS_JSWrapperObject_h
 #define KJS_JSWrapperObject_h
 
-#include "object.h"
+#include "JSObject.h"
 
 namespace KJS {
     
index 2c8b735..ff219ec 100644 (file)
 #include "Parser.h"
 #include "array_object.h"
 #include "collector.h"
-#include "function.h"
+#include "JSFunction.h"
 #include "InitializeThreading.h"
 #include "interpreter.h"
 #include "nodes.h"
-#include "object.h"
+#include "JSObject.h"
 #include "protect.h"
 #include <math.h>
 #include <stdio.h>
index 768693b..e240af9 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef SymbolTable_h
 #define SymbolTable_h
 
-#include "object.h"
+#include "JSObject.h"
 #include "ustring.h"
 #include <wtf/AlwaysInline.h>
 
index 37a16a0..4d698c6 100644 (file)
@@ -22,7 +22,7 @@
 #ifndef ARRAY_INSTANCE_H
 #define ARRAY_INSTANCE_H
 
-#include "object.h"
+#include "JSObject.h"
 
 namespace KJS {
 
index e2969d9..1a6bbe9 100644 (file)
@@ -23,9 +23,9 @@
 
 #include "ExecState.h"
 #include "JSGlobalObject.h"
-#include "internal.h"
+#include "JSString.h"
 #include "list.h"
-#include "value.h"
+#include "JSValue.h"
 #include <algorithm>
 #include <setjmp.h>
 #include <stdlib.h>
index 1acf666..9485446 100644 (file)
@@ -22,7 +22,7 @@
 #include "config.h"
 #include "date_object.h"
 #include "date_object.lut.h"
-#include "internal.h"
+#include "JSString.h"
 
 #if HAVE(ERRNO_H)
 #include <errno.h>
index eafc4d9..f216139 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef DATE_OBJECT_H
 #define DATE_OBJECT_H
 
-#include "function.h"
+#include "JSFunction.h"
 #include "JSWrapperObject.h"
 #include "lookup.h"
 
index 782f114..04f8dd8 100644 (file)
 #include "error_object.h"
 
 #include "JSGlobalObject.h"
-#include "object.h"
+#include "JSObject.h"
 #include "operations.h"
 #include "types.h"
-#include "value.h"
+#include "JSValue.h"
 
 namespace KJS {
 
index 4f45a62..545a0ae 100644 (file)
 #include "Parser.h"
 #include "array_object.h"
 #include "debugger.h"
-#include "function.h"
-#include "internal.h"
+#include "JSFunction.h"
+#include "JSString.h"
 #include "lexer.h"
 #include "nodes.h"
-#include "object.h"
+#include "JSObject.h"
 #include <stdio.h>
 #include <string.h>
 #include <wtf/Assertions.h>
index c0d2e56..e0a7215 100644 (file)
@@ -24,7 +24,7 @@
 #define FUNCTION_OBJECT_H_
 
 #include "object_object.h"
-#include "function.h"
+#include "JSFunction.h"
 
 namespace KJS {
 
index d8851d2..59382d7 100644 (file)
 
 #include <string.h>
 #include <stdlib.h>
-#include "value.h"
-#include "object.h"
+#include "JSValue.h"
+#include "JSObject.h"
 #include "types.h"
 #include "nodes.h"
 #include "lexer.h"
-#include "internal.h"
+#include "JSString.h"
 #include "JSGlobalData.h"
 #include "CommonIdentifiers.h"
 #include "NodeInfo.h"
index f04de9e..8c3031b 100644 (file)
@@ -21,7 +21,7 @@
  */
 
 #include "config.h"
-#include "internal.h"
+#include "JSString.h"
 
 #include "ExecState.h"
 #include "array_object.h"
@@ -35,7 +35,7 @@
 #include "math_object.h"
 #include "nodes.h"
 #include "number_object.h"
-#include "object.h"
+#include "JSObject.h"
 #include "object_object.h"
 #include "operations.h"
 #include "regexp_object.h"
index b3fcdb8..483b1f4 100644 (file)
@@ -24,7 +24,7 @@
 #include "lexer.h"
 
 #include "dtoa.h"
-#include "function.h"
+#include "JSFunction.h"
 #include "nodes.h"
 #include "NodeInfo.h"
 #include <ctype.h>
index 57b52f3..7e83921 100644 (file)
@@ -22,7 +22,7 @@
 #ifndef KJS_LIST_H
 #define KJS_LIST_H
 
-#include <kjs/value.h>
+#include <kjs/JSValue.h>
 #include <wtf/HashSet.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/Vector.h>
index f9c9449..f0e0f19 100644 (file)
 #define KJS_lookup_h
 
 #include "ExecState.h"
-#include "function.h"
+#include "JSFunction.h"
 #include "identifier.h"
 #include "JSGlobalObject.h"
-#include "object.h"
+#include "JSObject.h"
 #include <stdio.h>
 #include <wtf/Assertions.h>
 
index 00a4481..a4fa711 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef NODES_H_
 #define NODES_H_
 
-#include "internal.h"
+#include "JSString.h"
 #include "Opcode.h"
 #include "regexp.h"
 #include "RegisterID.h"
index 0d9580b..bdd13bb 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef _OBJECT_OBJECT_H_
 #define _OBJECT_OBJECT_H_
 
-#include "function.h"
+#include "JSFunction.h"
 
 namespace KJS {
 
index eeb2c56..e20e551 100644 (file)
@@ -23,8 +23,8 @@
 #include "config.h"
 #include "operations.h"
 
-#include "internal.h"
-#include "object.h"
+#include "JSString.h"
+#include "JSObject.h"
 #include <math.h>
 #include <stdio.h>
 #include <wtf/MathExtras.h>
index e811d3e..5bb62bc 100644 (file)
@@ -21,7 +21,7 @@
 #include "config.h"
 #include "property_map.h"
 
-#include "object.h"
+#include "JSObject.h"
 #include "protect.h"
 #include "PropertyNameArray.h"
 #include <algorithm>
index d3c45cb..d8f2617 100644 (file)
@@ -24,7 +24,7 @@
 #include "property_slot.h"
 
 #include "JSGlobalObject.h"
-#include "object.h"
+#include "JSObject.h"
 #include "RegisterFileStack.h"
 
 namespace KJS {
index d67064b..fa00513 100644 (file)
@@ -23,7 +23,7 @@
 #define KJS_PROPERTY_SLOT_H
 
 #include "identifier.h"
-#include "value.h"
+#include "JSValue.h"
 #include <wtf/Assertions.h>
 
 namespace KJS {
index 912e45c..9092cba 100644 (file)
@@ -24,7 +24,7 @@
 #ifndef _KJS_PROTECT_H_
 #define _KJS_PROTECT_H_
 
-#include "value.h"
+#include "JSValue.h"
 #include "collector.h"
 #include "JSLock.h"
 
index ce38fb9..72f63f5 100644 (file)
 #include "array_instance.h"
 #include "array_object.h"
 #include "error_object.h"
-#include "internal.h"
-#include "object.h"
+#include "JSString.h"
+#include "JSObject.h"
 #include "operations.h"
 #include "regexp.h"
 #include "types.h"
-#include "value.h"
+#include "JSValue.h"
 #include "UnusedParam.h"
 
 #include <stdio.h>
index 9b8e976..c7f2923 100644 (file)
@@ -23,7 +23,7 @@
 #include "scope_chain.h"
 
 #include "PropertyNameArray.h"
-#include "object.h"
+#include "JSObject.h"
 #include <stdio.h>
 
 namespace KJS {
index d2cc3c1..7f27724 100644 (file)
@@ -24,7 +24,7 @@
 
 #include "function_object.h"
 #include "JSWrapperObject.h"
-#include "internal.h"
+#include "JSString.h"
 #include "lookup.h"
 
 namespace KJS {
index b53a0a9..8be88fc 100644 (file)
@@ -27,7 +27,7 @@
 #include "JSLock.h"
 #include "collector.h"
 #include "dtoa.h"
-#include "function.h"
+#include "JSFunction.h"
 #include "identifier.h"
 #include "operations.h"
 #include <ctype.h>
index 122b718..1ead9c0 100644 (file)
@@ -29,7 +29,7 @@
 #include "ProfileNode.h"
 #include "JSGlobalObject.h"
 #include "ExecState.h"
-#include "function.h"
+#include "JSFunction.h"
 
 #include <stdio.h>
 
index c65b782..b07ea77 100644 (file)
@@ -30,7 +30,7 @@
 #include "Profiler.h"
 
 #include "ExecState.h"
-#include "function.h"
+#include "JSFunction.h"
 #include "ProfileNode.h"
 #include "JSGlobalObject.h"
 #include "Profile.h"
index 3395f26..76610a2 100644 (file)
@@ -1,3 +1,11 @@
+2008-06-15  Darin Adler  <darin@apple.com>
+
+        - new names for a few key JavaScriptCore files
+
+        * ForwardingHeaders/kjs/JSValue.h: Copied from JavaScriptGlue/ForwardingHeaders/kjs/value.h.
+        * ForwardingHeaders/kjs/value.h: Removed.
+        * JSUtils.h:
+
 2008-06-03  Darin Adler  <darin@apple.com>
 
         - update for JavaScriptCore changes for https://bugs.webkit.org/show_bug.cgi?id=19269
diff --git a/JavaScriptGlue/ForwardingHeaders/kjs/JSValue.h b/JavaScriptGlue/ForwardingHeaders/kjs/JSValue.h
new file mode 100644 (file)
index 0000000..ebbed6c
--- /dev/null
@@ -0,0 +1 @@
+#include <JavaScriptCore/JSValue.h>
diff --git a/JavaScriptGlue/ForwardingHeaders/kjs/value.h b/JavaScriptGlue/ForwardingHeaders/kjs/value.h
deleted file mode 100644 (file)
index ecd784d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <JavaScriptCore/value.h>
index 1fe8428..a075501 100644 (file)
@@ -31,8 +31,8 @@
 
 #include "JavaScriptGlue.h"
 
-#include <JavaScriptCore/value.h>
-#include <JavaScriptCore/object.h>
+#include <JavaScriptCore/JSValue.h>
+#include <JavaScriptCore/JSObject.h>
 #include <JavaScriptCore/JSGlobalObject.h>
 #include <JavaScriptCore/types.h>
 #include <JavaScriptCore/interpreter.h>
index a64781c..071a52c 100644 (file)
@@ -1,5 +1,46 @@
 2008-06-15  Darin Adler  <darin@apple.com>
 
+        - new names for a few key JavaScriptCore files
+
+        * ForwardingHeaders/kjs/JSFunction.h: Copied from WebCore/ForwardingHeaders/kjs/function.h.
+        * ForwardingHeaders/kjs/JSObject.h: Copied from WebCore/ForwardingHeaders/kjs/object.h.
+        * ForwardingHeaders/kjs/JSString.h: Copied from WebCore/ForwardingHeaders/kjs/internal.h.
+        * ForwardingHeaders/kjs/JSValue.h: Copied from WebCore/ForwardingHeaders/kjs/value.h.
+        * ForwardingHeaders/kjs/function.h: Removed.
+        * ForwardingHeaders/kjs/internal.h: Removed.
+        * ForwardingHeaders/kjs/object.h: Removed.
+        * ForwardingHeaders/kjs/value.h: Removed.
+        * WebCore.vcproj/WebCore.vcproj:
+        * bindings/js/JSCustomSQLStatementCallback.h:
+        * bindings/js/JSCustomSQLStatementErrorCallback.h:
+        * bindings/js/JSCustomSQLTransactionErrorCallback.h:
+        * bindings/js/JSCustomVoidCallback.h:
+        * bindings/js/JSDOMBinding.h:
+        * bindings/js/JSDOMWindowCustom.cpp:
+        * bindings/js/JSDOMWindowShell.cpp:
+        * bindings/js/JSQuarantinedObjectWrapper.h:
+        * bridge/objc/objc_runtime.h:
+        * bridge/objc/objc_utility.h:
+        * bridge/qt/qt_runtime.cpp:
+        * bridge/runtime.h:
+        * bridge/runtime_array.h:
+        * bridge/runtime_method.h:
+        * bridge/runtime_object.h:
+        * bridge/testbindings.cpp:
+        * bridge/testbindings.mm:
+        * bridge/testqtbindings.cpp:
+        * loader/FrameLoader.cpp:
+        * page/JavaScriptCallFrame.cpp:
+        * page/JavaScriptProfile.cpp:
+        * page/JavaScriptProfileNode.cpp:
+        * platform/graphics/gtk/VideoSinkGStreamer.h:
+        * plugins/PluginView.cpp:
+        * plugins/gtk/PluginViewGtk.cpp:
+        * plugins/qt/PluginViewQt.cpp:
+        * plugins/win/PluginViewWin.cpp:
+
+2008-06-15  Darin Adler  <darin@apple.com>
+
         Rubber stamped by Sam.
 
         - cut down on confusing uses of "Object" and "Imp" in
diff --git a/WebCore/ForwardingHeaders/kjs/JSFunction.h b/WebCore/ForwardingHeaders/kjs/JSFunction.h
new file mode 100644 (file)
index 0000000..396407d
--- /dev/null
@@ -0,0 +1 @@
+#include <JavaScriptCore/JSFunction.h>
diff --git a/WebCore/ForwardingHeaders/kjs/JSObject.h b/WebCore/ForwardingHeaders/kjs/JSObject.h
new file mode 100644 (file)
index 0000000..45133f3
--- /dev/null
@@ -0,0 +1 @@
+#include <JavaScriptCore/JSObject.h>
diff --git a/WebCore/ForwardingHeaders/kjs/JSString.h b/WebCore/ForwardingHeaders/kjs/JSString.h
new file mode 100644 (file)
index 0000000..195ed21
--- /dev/null
@@ -0,0 +1 @@
+#include <JavaScriptCore/JSString.h>
diff --git a/WebCore/ForwardingHeaders/kjs/JSValue.h b/WebCore/ForwardingHeaders/kjs/JSValue.h
new file mode 100644 (file)
index 0000000..ebbed6c
--- /dev/null
@@ -0,0 +1 @@
+#include <JavaScriptCore/JSValue.h>
diff --git a/WebCore/ForwardingHeaders/kjs/function.h b/WebCore/ForwardingHeaders/kjs/function.h
deleted file mode 100644 (file)
index 3e08e6d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <JavaScriptCore/function.h>
diff --git a/WebCore/ForwardingHeaders/kjs/internal.h b/WebCore/ForwardingHeaders/kjs/internal.h
deleted file mode 100644 (file)
index 85a04e2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <JavaScriptCore/internal.h>
diff --git a/WebCore/ForwardingHeaders/kjs/object.h b/WebCore/ForwardingHeaders/kjs/object.h
deleted file mode 100644 (file)
index ab82bcd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <JavaScriptCore/object.h>
diff --git a/WebCore/ForwardingHeaders/kjs/value.h b/WebCore/ForwardingHeaders/kjs/value.h
deleted file mode 100644 (file)
index ecd784d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <JavaScriptCore/value.h>
index b2597f2..2ea54a8 100644 (file)
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\ForwardingHeaders\kjs\internal.h"\r
+                                       RelativePath="..\ForwardingHeaders\kjs\JSString.h"\r
                                        >\r
                                </File>\r
                                <File\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\ForwardingHeaders\kjs\object.h"\r
+                                       RelativePath="..\ForwardingHeaders\kjs\JSObject.h"\r
                                        >\r
                                </File>\r
                                <File\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\ForwardingHeaders\kjs\value.h"\r
+                                       RelativePath="..\ForwardingHeaders\kjs\JSValue.h"\r
                                        >\r
                                </File>\r
                        </Filter>\r
index 31e4656..af7d3c3 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "SQLStatementCallback.h"
 
-#include <kjs/object.h>
+#include <kjs/JSObject.h>
 #include <kjs/protect.h>
 #include <wtf/Forward.h>
 
index 832fbc5..54a0ea2 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "SQLStatementErrorCallback.h"
 
-#include <kjs/object.h>
+#include <kjs/JSObject.h>
 #include <kjs/protect.h>
 #include <wtf/Forward.h>
 
index b2559b5..0d4d899 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "SQLTransactionErrorCallback.h"
 
-#include <kjs/object.h>
+#include <kjs/JSObject.h>
 #include <kjs/protect.h>
 #include <wtf/Forward.h>
 
index 81e40fa..6ac4f2e 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "VoidCallback.h"
 
-#include <kjs/object.h>
+#include <kjs/JSObject.h>
 #include <kjs/protect.h>
 #include <wtf/Forward.h>
 
index af7bce1..e0a33c9 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef JSDOMBinding_h
 #define JSDOMBinding_h
 
-#include <kjs/function.h>
+#include <kjs/JSFunction.h>
 #include <kjs/interpreter.h>
 #include <kjs/lookup.h>
 #include <wtf/Noncopyable.h>
index 0b41ec5..621ae87 100644 (file)
@@ -30,7 +30,7 @@
 #include "JSDOMWindowShell.h"
 #include "Settings.h"
 #include "ScriptController.h"
-#include <kjs/object.h>
+#include <kjs/JSObject.h>
 
 using namespace KJS;
 
index 510b092..2466291 100644 (file)
@@ -33,7 +33,7 @@
 #include "JSDOMWindow.h"
 #include "DOMWindow.h"
 #include "ScriptController.h"
-#include <kjs/object.h>
+#include <kjs/JSObject.h>
 
 using namespace KJS;
 
index 786b57a..f1abf64 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef JSQuarantinedObjectWrapper_h
 #define JSQuarantinedObjectWrapper_h
 
-#include <kjs/object.h>
+#include <kjs/JSObject.h>
 
 namespace WebCore {
 
index c735bb1..8026aad 100644 (file)
@@ -27,7 +27,7 @@
 #define KJS_BINDINGS_OBJC_RUNTIME_H
 
 #include <CoreFoundation/CoreFoundation.h>
-#include <kjs/object.h>
+#include <kjs/JSObject.h>
 #include "objc_header.h"
 #include "runtime.h"
 
index 321c7fe..f6e8c93 100644 (file)
@@ -28,7 +28,7 @@
 
 #include <CoreFoundation/CoreFoundation.h>
 
-#include <kjs/object.h>
+#include <kjs/JSObject.h>
 #include "objc_header.h"
 
 #ifdef __OBJC__
index ff2cf7a..47100d9 100644 (file)
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "qt_runtime.h"
 #include "qt_instance.h"
-#include "object.h"
+#include "JSObject.h"
 #include "array_instance.h"
 #include "date_object.h"
 #include "DateMath.h"
@@ -28,7 +28,7 @@
 #include <runtime.h>
 #include <runtime_object.h>
 #include <runtime_array.h>
-#include <function.h>
+#include <JSFunction.h>
 #include "PropertyNameArray.h"
 #include "qmetatype.h"
 #include "qmetaobject.h"
index fef2323..30fbda7 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef JAVASCRIPTCORE_BINDINGS_RUNTIME_H
 #define JAVASCRIPTCORE_BINDINGS_RUNTIME_H
 
-#include <kjs/value.h>
+#include <kjs/JSValue.h>
 
 #include <wtf/HashMap.h>
 #include <wtf/RefCounted.h>
index fdebb8d..dcb0241 100644 (file)
@@ -28,7 +28,7 @@
 
 #include <wtf/OwnPtr.h>
 
-#include <kjs/object.h>
+#include <kjs/JSObject.h>
 #include "runtime.h"
 
 namespace KJS {
index dcf3213..1f97a8b 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef RUNTIME_FUNCTION_H_
 #define RUNTIME_FUNCTION_H_
 
-#include <kjs/function.h>
+#include <kjs/JSFunction.h>
 #include "runtime.h"
 
 namespace KJS {
index 37da998..9f8e6c6 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef KJS_RUNTIME_OBJECT_H
 #define KJS_RUNTIME_OBJECT_H
 
-#include <kjs/object.h>
+#include <kjs/JSObject.h>
 
 #include "runtime.h"
 
index 25f1f99..1863cc9 100644 (file)
@@ -24,8 +24,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "value.h"
-#include "object.h"
+#include "JSValue.h"
+#include "JSObject.h"
 #include "types.h"
 #include "interpreter.h"
 
index 7061503..14a2256 100644 (file)
@@ -31,8 +31,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "value.h"
-#include "object.h"
+#include "JSValue.h"
+#include "JSObject.h"
 #include "types.h"
 #include "interpreter.h"
 
index 490b3ff..02e9f42 100644 (file)
@@ -27,8 +27,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "value.h"
-#include "object.h"
+#include "JSValue.h"
+#include "JSObject.h"
 #include "types.h"
 #include "interpreter.h"
 
index c274ce2..4b7b162 100644 (file)
@@ -87,7 +87,7 @@
 #include "JSDOMBinding.h"
 #include "ScriptController.h"
 #include <kjs/JSLock.h>
-#include <kjs/object.h>
+#include <kjs/JSObject.h>
 
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
 #include "ApplicationCache.h"
index 24994ea..0561db6 100644 (file)
@@ -30,8 +30,8 @@
 #include <kjs/DebuggerCallFrame.h>
 #include <kjs/JSGlobalObject.h>
 #include <kjs/interpreter.h>
-#include <kjs/object.h>
-#include <kjs/value.h>
+#include <kjs/JSObject.h>
+#include <kjs/JSValue.h>
 
 using namespace KJS;
 
index 63bb536..4aea1c2 100644 (file)
@@ -31,8 +31,8 @@
 #include <JavaScriptCore/APICast.h>
 #include <JavaScriptCore/JSObjectRef.h>
 #include <JavaScriptCore/JSStringRef.h>
-#include <kjs/object.h>
-#include <kjs/value.h>
+#include <kjs/JSObject.h>
+#include <kjs/JSValue.h>
 
 using namespace KJS;
 
index 8532361..56078c3 100644 (file)
@@ -33,7 +33,7 @@
 #include <JavaScriptCore/JSContextRef.h>
 #include <JavaScriptCore/JSRetainPtr.h>
 #include <JavaScriptCore/JSStringRef.h>
-#include <kjs/value.h>
+#include <kjs/JSValue.h>
 
 using namespace KJS;
 
index 2a706fb..2ac86cd 100644 (file)
@@ -21,7 +21,7 @@
 #define _HAVE_WEBKIT_VIDEO_SINK_H
 
 #include <cairo.h>
-#include <glib-object.h>
+#include <glib-JSObject.h>
 #include <gst/base/gstbasesink.h>
 
 G_BEGIN_DECLS
index 3450659..e878dd3 100644 (file)
@@ -62,7 +62,7 @@
 #include "Settings.h"
 #include "runtime.h"
 #include <kjs/JSLock.h>
-#include <kjs/value.h>
+#include <kjs/JSValue.h>
 #include <wtf/ASCIICType.h>
 
 using KJS::ExecState;
index ee77026..8425cd4 100644 (file)
@@ -55,7 +55,7 @@
 #include "runtime.h"
 #include "runtime_root.h"
 #include <kjs/JSLock.h>
-#include <kjs/value.h>
+#include <kjs/JSValue.h>
 
 #include <gdkconfig.h>
 #include <gtk/gtk.h>
index a65b264..115fc81 100644 (file)
@@ -38,7 +38,7 @@
 #include "runtime.h"
 #include "runtime_root.h"
 #include <kjs/JSLock.h>
-#include <kjs/value.h>
+#include <kjs/JSValue.h>
 #include "JSDOMBinding.h"
 #include "ScriptController.h"
 
index 0d65843..08ba471 100644 (file)
@@ -61,7 +61,7 @@
 #include "Settings.h"
 #include "runtime.h"
 #include <kjs/JSLock.h>
-#include <kjs/value.h>
+#include <kjs/JSValue.h>
 #include <wtf/ASCIICType.h>
 
 using KJS::ExecState;
index 91b5780..6227f9a 100644 (file)
@@ -1,3 +1,14 @@
+2008-06-15  Darin Adler  <darin@apple.com>
+
+        - new names for a few key JavaScriptCore files
+
+        * WebCoreSupport/ContextMenuClientGtk.cpp:
+        * webkit/webkitnetworkrequest.h:
+        * webkit/webkitwebbackforwardlist.h:
+        * webkit/webkitwebframe.h:
+        * webkit/webkitwebhistoryitem.h:
+        * webkit/webkitwebsettings.h:
+
 2008-06-15  Christian Dywan  <christian@twotoasts.de>
 
         Reviewed by Alp Toker.
index 8888f2b..e10f83f 100644 (file)
@@ -22,7 +22,7 @@
 #include "KURL.h"
 #include "NotImplemented.h"
 
-#include <glib-object.h>
+#include <glib-JSObject.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include "webkitprivate.h"
index f67334b..a8e9406 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef WEBKIT_NETWORK_REQUEST_H
 #define WEBKIT_NETWORK_REQUEST_H
 
-#include <glib-object.h>
+#include <glib-JSObject.h>
 
 #include <webkit/webkitdefines.h>
 
index 68e18eb..214d1a5 100644 (file)
@@ -21,7 +21,7 @@
 #define WEBKIT_WEB_BACK_FORWARD_LIST_H
 
 #include <glib.h>
-#include <glib-object.h>
+#include <glib-JSObject.h>
 
 #include <webkit/webkitdefines.h>
 #include <webkit/webkitwebhistoryitem.h>
index 656d882..ed90a04 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef WEBKIT_WEB_FRAME_H
 #define WEBKIT_WEB_FRAME_H
 
-#include <glib-object.h>
+#include <glib-JSObject.h>
 #include <JavaScriptCore/JSBase.h>
 
 #include <webkit/webkitdefines.h>
index 730188e..c9e8463 100644 (file)
@@ -21,7 +21,7 @@
 #define WEBKIT_WEB_HISTORY_ITEM_H
 
 #include <glib.h>
-#include <glib-object.h>
+#include <glib-JSObject.h>
 #include <gdk/gdk.h>
 
 #include <webkit/webkitdefines.h>
index 33fa54a..5f2ab33 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef __WEBKIT_WEB_SETTINGS_H__
 #define __WEBKIT_WEB_SETTINGS_H__
 
-#include <glib-object.h>
+#include <glib-JSObject.h>
 
 #include <webkit/webkitdefines.h>
 
index 0c5e15d..2659e19 100644 (file)
@@ -1,5 +1,19 @@
 2008-06-15  Darin Adler  <darin@apple.com>
 
+        - new names for a few key JavaScriptCore files
+
+        * ForwardingHeaders/kjs/JSFunction.h: Copied from WebKit/mac/ForwardingHeaders/kjs/function.h.
+        * ForwardingHeaders/kjs/JSObject.h: Copied from WebKit/mac/ForwardingHeaders/kjs/object.h.
+        * ForwardingHeaders/kjs/JSString.h: Copied from WebKit/mac/ForwardingHeaders/kjs/internal.h.
+        * ForwardingHeaders/kjs/JSValue.h: Copied from WebKit/mac/ForwardingHeaders/kjs/value.h.
+        * ForwardingHeaders/kjs/function.h: Removed.
+        * ForwardingHeaders/kjs/internal.h: Removed.
+        * ForwardingHeaders/kjs/object.h: Removed.
+        * ForwardingHeaders/kjs/value.h: Removed.
+        * WebView/WebScriptDebugDelegate.mm:
+
+2008-06-15  Darin Adler  <darin@apple.com>
+
         Rubber stamped by Sam.
 
         - use JS prefix and simpler names for basic JavaScriptCore types,
diff --git a/WebKit/mac/ForwardingHeaders/kjs/JSFunction.h b/WebKit/mac/ForwardingHeaders/kjs/JSFunction.h
new file mode 100644 (file)
index 0000000..396407d
--- /dev/null
@@ -0,0 +1 @@
+#include <JavaScriptCore/JSFunction.h>
diff --git a/WebKit/mac/ForwardingHeaders/kjs/JSObject.h b/WebKit/mac/ForwardingHeaders/kjs/JSObject.h
new file mode 100644 (file)
index 0000000..5d4c157
--- /dev/null
@@ -0,0 +1 @@
+#import <JavaScriptCore/JSObject.h>
diff --git a/WebKit/mac/ForwardingHeaders/kjs/JSString.h b/WebKit/mac/ForwardingHeaders/kjs/JSString.h
new file mode 100644 (file)
index 0000000..3469129
--- /dev/null
@@ -0,0 +1 @@
+#import <JavaScriptCore/JSString.h>
diff --git a/WebKit/mac/ForwardingHeaders/kjs/JSValue.h b/WebKit/mac/ForwardingHeaders/kjs/JSValue.h
new file mode 100644 (file)
index 0000000..4f49f83
--- /dev/null
@@ -0,0 +1 @@
+#import <JavaScriptCore/JSValue.h>
diff --git a/WebKit/mac/ForwardingHeaders/kjs/function.h b/WebKit/mac/ForwardingHeaders/kjs/function.h
deleted file mode 100644 (file)
index 3e08e6d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <JavaScriptCore/function.h>
diff --git a/WebKit/mac/ForwardingHeaders/kjs/internal.h b/WebKit/mac/ForwardingHeaders/kjs/internal.h
deleted file mode 100644 (file)
index a20f3f3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#import <JavaScriptCore/internal.h>
diff --git a/WebKit/mac/ForwardingHeaders/kjs/object.h b/WebKit/mac/ForwardingHeaders/kjs/object.h
deleted file mode 100644 (file)
index 3309cc1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#import <JavaScriptCore/object.h>
diff --git a/WebKit/mac/ForwardingHeaders/kjs/value.h b/WebKit/mac/ForwardingHeaders/kjs/value.h
deleted file mode 100644 (file)
index cf0b9c8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#import <JavaScriptCore/value.h>
index 103220b..bd29d1a 100644 (file)
@@ -35,7 +35,7 @@
 #import <JavaScriptCore/DebuggerCallFrame.h>
 #import <JavaScriptCore/ExecState.h>
 #import <JavaScriptCore/JSGlobalObject.h>
-#import <JavaScriptCore/function.h>
+#import <JavaScriptCore/JSFunction.h>
 #import <JavaScriptCore/interpreter.h>
 #import <WebCore/Frame.h>
 #import <WebCore/WebScriptObjectPrivate.h>
index 7a3d7ec..5078f59 100644 (file)
@@ -59,7 +59,7 @@
 #include "ScriptController.h"
 #include "JSDOMBinding.h"
 #include "ExecState.h"
-#include "object.h"
+#include "JSObject.h"
 #include "qt_runtime.h"
 
 #include "wtf/HashMap.h"
index a7bea04..5f233e9 100644 (file)
@@ -1,3 +1,9 @@
+2008-06-15  Darin Adler  <darin@apple.com>
+
+        - new names for a few key JavaScriptCore files
+
+        * Api/qwebframe.cpp:
+
 2008-06-14  Darin Adler  <darin@apple.com>
 
         Rubber stamped by Sam.
index e5d2753..f78403c 100644 (file)
@@ -1,5 +1,11 @@
 2008-06-15  Darin Adler  <darin@apple.com>
 
+        - new names for a few key JavaScriptCore files
+
+        * WebView.cpp:
+
+2008-06-15  Darin Adler  <darin@apple.com>
+
         Rubber stamped by Sam.
 
         - use JS prefix and simpler names for basic JavaScriptCore types,
index 98bee93..bee46e5 100644 (file)
@@ -97,7 +97,7 @@
 #include <WebCore/WindowMessageBroadcaster.h>
 #pragma warning(pop)
 #include <kjs/InitializeThreading.h>
-#include <JavaScriptCore/value.h>
+#include <JavaScriptCore/JSValue.h>
 #include <CFNetwork/CFURLCachePriv.h>
 #include <CFNetwork/CFURLProtocolPriv.h>
 #include <CoreFoundation/CoreFoundation.h>
index 63ce6d9..d1750bb 100644 (file)
@@ -1,3 +1,9 @@
+2008-06-15  Darin Adler  <darin@apple.com>
+
+        - new names for a few key JavaScriptCore files
+
+        * WebView.cpp:
+
 2008-06-14  Darin Adler  <darin@apple.com>
 
         Rubber stamped by Sam.
index a0f263f..c5572c5 100644 (file)
@@ -58,7 +58,7 @@
 
 #include "ScriptController.h"
 #include "JSDOMBinding.h"
-#include <kjs/value.h>
+#include <kjs/JSValue.h>
 #include <kjs/ustring.h>
 
 #include "wx/wxprec.h"
index 8d30471..e6337e8 100644 (file)
@@ -1,5 +1,10 @@
 2008-06-15  Darin Adler  <darin@apple.com>
 
+        * Scripts/do-file-rename: Updated for the latest round of renaming.
+        * Scripts/do-webcore-rename: Tweaked and reorganized a bit.
+
+2008-06-15  Darin Adler  <darin@apple.com>
+
         * Scripts/create-exports: Added.
         * Scripts/do-file-rename: Added some planned renames.
         * Scripts/do-webcore-rename: Updated for the latest round of renaming.
index 2ac2a34..2099825 100755 (executable)
@@ -68,14 +68,16 @@ sub wanted
 }
 
 my %renames = (
-);
-
-my %plannedRenames = (
+    "function.cpp" => "JSFunction.cpp",
+    "function.h" => "JSFunction.h",
     "internal.h" => "JSString.h",
-    "object.h" => "JSObject.h",
     "object.cpp" => "JSObject.cpp",
-    "function.h" => "JSFunction.h",
-    "function.cpp" => "JSFunction.cpp",
+    "object.h" => "JSObject.h",
+    "value.cpp" => "JSValue.cpp",
+    "value.h" => "JSValue.h",
+);
+
+my %renamesContemplatedForTheFuture = (
 );
 
 # rename files
@@ -109,7 +111,7 @@ for my $file (sort @paths) {
     my $newContents = $contents;
 
     for my $from (keys %renames) {
-        $newContents =~ s/\b\Q$from\E(?!["\w])/$renames{$from}/g; # this " unconfuses Xcode syntax highlighting
+        $newContents =~ s/\b\Q$from\E(?!\w)/$renames{$from}/g; # this " unconfuses Xcode syntax highlighting
     }
 
     if ($newContents ne $contents) {
index f32ff82..64f6340 100755 (executable)
@@ -68,83 +68,85 @@ sub wanted
 }
 
 my %renames = (
-    "ArrayObjectImp" => "ArrayConstructor",
-    "BooleanInstance" => "BooleanObject",
-    "BooleanObjectImp" => "BooleanConstructor",
-    "DateObjectFuncImp" => "DateFunction",
-    "DateObjectImp" => "DateConstructor",
-    "ErrorObjectImp" => "ErrorConstructor",
-    "NativeErrorImp" => "NativeErrorConstructor",
-    "FunctionObjectImp" => "FunctionConstructor",
-    "InternalFunctionImp" => "InternalFunction",
-    "MathObjectImp" => "MathObject",
-    "NumberInstance" => "NumberObject",
-    "NumberObjectImp" => "NumberConstructor",
-    "ObjectObjectImp" => "ObjectConstructor",
-    "RegExpImp" => "RegExpObject",
-    "RegExpObjectImp" => "RegExpConstructor",
-    "RegExpObjectImpPrivate" => "RegExpConstructorPrivate",
-    "RegExpProtoFunc" => "RegExpFunction",
-    "RegExpImpTable" => "regExpTable",
-    "RegExpObjectImpTable" => "regExpConstructorTable",
-    "StringInstance" => "StringObject",
-    "StringInstanceThatMasqueradesAsUndefined" => "StringObjectThatMasqueradesAsUndefined",
-    "StringObjectImp" => "StringConstructor",
-    "StringObjectFuncImp" => "StringConstructorFunction",
 );
 
-my %plannedRenames = (
+my %renamesContemplatedForTheFuture = (
     "ARRAY_INSTANCE_H" => "JSArray_h",
+    "ARRAY_OBJECT_H_" => "ArrayObject_h",
+    "BOOL_OBJECT_H_" => "BooleanObject_h",
+    "FUNCTION_OBJECT_H_" => "FunctionPrototype_h",
+    "INTERNAL_H" => "JSString_h",
+    "KJS_FUNCTION_H" => "JSFunction_h",
+    "KJS_PROPERTY_MAP_H_" => "PropertyMap_h",
+    "KJS_PROPERTY_SLOT_H" => "PropertySlot_h",
+    "KJS_SCOPE_CHAIN_H" => "ScopeChain_h",
+    "KJS_VALUE_H" => "JSValue_h",
+    "MATH_OBJECT_H_" => "MathObject_h",
+    "NUMBER_OBJECT_H_" => "NumberObject_h",
+    "REGEXP_OBJECT_H_" => "RegExpObject_h",
+    "array_instance" => "JSArray",
+    "array_object" => "ArrayPrototype",
+    "bool_object" => "BooleanObject",
+    "function_object" => "FunctionPrototype",
+    "math_object" => "MathObject",
+    "number_object" => "NumberObject",
+    "property_map" => "PropertyMap",
+    "property_slot" => "PropertySlot",
+    "regexp_object" => "RegExpObject",
+    "scope_chain" => "ScopeChain",
+    "scope_chain_mark" => "ScopeChainMark",
+    "scope_chain_mark_h" => "ScopeChainMark_h",
+
+    "DateInstance" => "DateObject",
+    "ErrorInstance" => "ErrorObject",
+
+    "date_object" => "DateObject",
+    "error_object" => "ErrorObject",
+    "string_object" => "StringObject",
+
     "CLONE_CONTENTS" => "Clone",
     "DELETE_CONTENTS" => "Delete",
-    "DateInstance" => "Date",
     "EXTRACT_CONTENTS" => "Extract",
-    "ErrorInstance" => "Error", # after eliminating the existing Error class which is just a namespace for two functions
-    "FTPDirectoryTokenizer" => "FTPDirectoryDocumentBuilder",
-    "HTMLTokenizer" => "HTMLDocumentBuilder",
+
     "ImageConstructorImp" => "JSImageConstructor",
-    "ImageTokenizer" => "ImageDocumentBuilder",
+    "Navigator" => "JSNavigator",
+
     "JSHTMLOptionElementConstructor" => "JSOptionConstructor",
-    "KJS_PROPERTY_SLOT_H" => "PropertySlot_h",
-    "KJS_SCOPE_CHAIN_H" => "ScopeChain_h",
+    "XSLTProcessorPrototypeTable" => "JSXSLTProcessorPrototypeTable",
+
     "KURL" => "URL",
     "KURLCFNet" => "URLCF",
     "KURLMac" => "URLMac",
     "KURL_H_" => "URL_h",
+
     "List" => "JSArgumentList",
-    "Navigator" => "JSNavigator",
-    "ObjcFallbackObjectImp" => "ObjCFallbackObject",
-    "PluginTokenizer" => "PluginDocumentBuilder",
+
+    "StringImpl" => "SharedString",
+
     "RenderView" => "RenderViewport",
+
+    "ObjcFallbackObjectImp" => "ObjCFallbackObject",
     "RuntimeObjectImp" => "ForeignObject",
-    "StringImpl" => "SharedString",
-    "TextTokenizer" => "TextDocumentBuilder",
+
     "ThreadSafeShared" => "ThreadSafeRefCounted",
+
+    "animationController" => "animation",
+    "scriptProxy" => "script",
+    "selectionController" => "selection",
+
+    "equalIgnoringCase" => "equalFoldingCase",
+
+    "FTPDirectoryTokenizer" => "FTPDirectoryDocumentBuilder",
+    "HTMLTokenizer" => "HTMLDocumentBuilder",
+    "ImageTokenizer" => "ImageDocumentBuilder",
+    "PluginTokenizer" => "PluginDocumentBuilder",
+    "TextTokenizer" => "TextDocumentBuilder",
     "Tokenizer" => "DocumentBuilder",
     "Tokenizer_h" => "DocumentBuilder_h",
     "XMLTokenizer" => "XMLDocumentBuilder",
-    "XSLTProcessorPrototypeTable" => "JSXSLTProcessorPrototypeTable",
-    "animationController" => "animation",
-    "array_instance" => "JSArray",
-    "array_object" => "ArrayPrototype",
-    "bool_object" => "BooleanObject",
-    "createTokenizer" => "createBuilder",
-    "date_object" => "Date",
-    "equalIgnoringCase" => "equalFoldingCase",
-    "error_object" => "Error",
-    "function_object" => "FunctionPrototype",
     "isHTMLTokenizer" => "isHTMLDocumentBuilder",
     "m_tokenizer" => "m_builder",
-    "math_object" => "MathObject",
-    "property_map" => "PropertyMap",
-    "property_slot" => "PropertySlot",
-    "regexp_object" => "RegExpObject",
-    "scope_chain" => "ScopeChain",
-    "scope_chain_mark" => "ScopeChainMark",
-    "scope_chain_mark_h" => "ScopeChainMark_h",
-    "scriptProxy" => "script",
-    "selectionController" => "selection",
-    "string_object" => "StringObject",
+    "createTokenizer" => "createBuilder",
     "tokenizerProcessedData" => "documentBuilderProcessedData",
 );