2008-11-05 Cameron Zwarich <zwarich@apple.com>
authorcwzwarich@webkit.org <cwzwarich@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 5 Nov 2008 23:21:32 +0000 (23:21 +0000)
committercwzwarich@webkit.org <cwzwarich@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 5 Nov 2008 23:21:32 +0000 (23:21 +0000)
        Rubber-stamped by Sam Weinig.

        Move more files to the runtime subdirectory of JavaScriptCore.

        JavaScriptCore:

        * API/APICast.h:
        * API/JSBase.cpp:
        * API/JSCallbackObject.cpp:
        * API/JSClassRef.cpp:
        * API/JSClassRef.h:
        * API/JSStringRefCF.cpp:
        * API/JSValueRef.cpp:
        * API/OpaqueJSString.cpp:
        * API/OpaqueJSString.h:
        * AllInOneFile.cpp:
        * GNUmakefile.am:
        * JavaScriptCore.pri:
        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
        * JavaScriptCore.xcodeproj/project.pbxproj:
        * JavaScriptCoreSources.bkl:
        * VM/CodeBlock.h:
        * VM/CodeGenerator.cpp:
        * VM/Machine.cpp:
        * VM/RegisterFile.h:
        * debugger/Debugger.h:
        * kjs/SourceProvider.h:
        * kjs/TypeInfo.h: Removed.
        * kjs/collector.cpp: Removed.
        * kjs/collector.h: Removed.
        * kjs/completion.h: Removed.
        * kjs/create_hash_table:
        * kjs/identifier.cpp: Removed.
        * kjs/identifier.h: Removed.
        * kjs/interpreter.cpp: Removed.
        * kjs/interpreter.h: Removed.
        * kjs/lexer.cpp:
        * kjs/lexer.h:
        * kjs/lookup.cpp: Removed.
        * kjs/lookup.h: Removed.
        * kjs/nodes.cpp:
        * kjs/nodes.h:
        * kjs/operations.cpp: Removed.
        * kjs/operations.h: Removed.
        * kjs/protect.h: Removed.
        * kjs/regexp.cpp: Removed.
        * kjs/regexp.h: Removed.
        * kjs/ustring.cpp: Removed.
        * kjs/ustring.h: Removed.
        * pcre/pcre_exec.cpp:
        * profiler/CallIdentifier.h:
        * profiler/Profile.h:
        * runtime/ArrayConstructor.cpp:
        * runtime/ArrayPrototype.cpp:
        * runtime/ArrayPrototype.h:
        * runtime/Collector.cpp: Copied from kjs/collector.cpp.
        * runtime/Collector.h: Copied from kjs/collector.h.
        * runtime/CollectorHeapIterator.h:
        * runtime/Completion.h: Copied from kjs/completion.h.
        * runtime/ErrorPrototype.cpp:
        * runtime/Identifier.cpp: Copied from kjs/identifier.cpp.
        * runtime/Identifier.h: Copied from kjs/identifier.h.
        * runtime/InitializeThreading.cpp:
        * runtime/Interpreter.cpp: Copied from kjs/interpreter.cpp.
        * runtime/Interpreter.h: Copied from kjs/interpreter.h.
        * runtime/JSCell.h:
        * runtime/JSGlobalData.cpp:
        * runtime/JSGlobalData.h:
        * runtime/JSLock.cpp:
        * runtime/JSNumberCell.cpp:
        * runtime/JSNumberCell.h:
        * runtime/JSObject.cpp:
        * runtime/JSValue.h:
        * runtime/Lookup.cpp: Copied from kjs/lookup.cpp.
        * runtime/Lookup.h: Copied from kjs/lookup.h.
        * runtime/MathObject.cpp:
        * runtime/NativeErrorPrototype.cpp:
        * runtime/NumberPrototype.cpp:
        * runtime/Operations.cpp: Copied from kjs/operations.cpp.
        * runtime/Operations.h: Copied from kjs/operations.h.
        * runtime/PropertyMapHashTable.h:
        * runtime/Protect.h: Copied from kjs/protect.h.
        * runtime/RegExp.cpp: Copied from kjs/regexp.cpp.
        * runtime/RegExp.h: Copied from kjs/regexp.h.
        * runtime/RegExpConstructor.cpp:
        * runtime/RegExpObject.h:
        * runtime/RegExpPrototype.cpp:
        * runtime/SmallStrings.h:
        * runtime/StringObjectThatMasqueradesAsUndefined.h:
        * runtime/StructureID.cpp:
        * runtime/StructureID.h:
        * runtime/StructureIDTransitionTable.h:
        * runtime/SymbolTable.h:
        * runtime/TypeInfo.h: Copied from kjs/TypeInfo.h.
        * runtime/UString.cpp: Copied from kjs/ustring.cpp.
        * runtime/UString.h: Copied from kjs/ustring.h.
        * wrec/CharacterClassConstructor.h:
        * wrec/WREC.h:

        WebCore:

        * ForwardingHeaders/kjs/collector.h: Removed.
        * ForwardingHeaders/kjs/completion.h: Removed.
        * ForwardingHeaders/kjs/identifier.h: Removed.
        * ForwardingHeaders/kjs/interpreter.h: Removed.
        * ForwardingHeaders/kjs/lookup.h: Removed.
        * ForwardingHeaders/kjs/operations.h: Removed.
        * ForwardingHeaders/kjs/protect.h: Removed.
        * ForwardingHeaders/kjs/ustring.h: Removed.
        * ForwardingHeaders/runtime/Collector.h: Copied from ForwardingHeaders/kjs/collector.h.
        * ForwardingHeaders/runtime/Completion.h: Copied from ForwardingHeaders/kjs/completion.h.
        * ForwardingHeaders/runtime/Identifier.h: Copied from ForwardingHeaders/kjs/identifier.h.
        * ForwardingHeaders/runtime/Interpreter.h: Copied from ForwardingHeaders/kjs/interpreter.h.
        * ForwardingHeaders/runtime/Lookup.h: Copied from ForwardingHeaders/kjs/lookup.h.
        * ForwardingHeaders/runtime/Operations.h: Copied from ForwardingHeaders/kjs/operations.h.
        * ForwardingHeaders/runtime/Protect.h: Copied from ForwardingHeaders/kjs/protect.h.
        * ForwardingHeaders/runtime/UString.h: Copied from ForwardingHeaders/kjs/ustring.h.
        * bindings/js/GCController.cpp:
        * bindings/js/JSCustomPositionCallback.h:
        * bindings/js/JSCustomPositionErrorCallback.h:
        * bindings/js/JSCustomSQLStatementCallback.h:
        * bindings/js/JSCustomSQLStatementErrorCallback.h:
        * bindings/js/JSCustomSQLTransactionErrorCallback.h:
        * bindings/js/JSCustomVoidCallback.h:
        * bindings/js/JSDOMBinding.h:
        * bindings/js/JSDOMWindowBase.h:
        * bindings/js/JSEventListener.h:
        * bindings/js/ScheduledAction.h:
        * bindings/js/ScriptController.cpp:
        * bindings/js/ScriptController.h:
        * bindings/objc/WebScriptObject.mm:
        * bindings/scripts/CodeGeneratorJS.pm:
        * bridge/NP_jsobject.cpp:
        * bridge/c/c_class.cpp:
        * bridge/jni/jni_class.cpp:
        * bridge/jni/jni_jsobject.mm:
        * bridge/npruntime.cpp:
        * bridge/runtime_root.h:
        * history/CachedPage.h:
        * html/CanvasRenderingContext2D.cpp:
        * html/HTMLCanvasElement.cpp:
        * inspector/InspectorController.cpp:
        * inspector/JavaScriptCallFrame.cpp:
        * page/Console.cpp:
        * page/Page.cpp:
        * platform/text/AtomicString.cpp:
        * platform/text/PlatformString.h:

        WebKit/mac:

        * ForwardingHeaders/kjs/collector.h: Removed.
        * ForwardingHeaders/kjs/identifier.h: Removed.
        * ForwardingHeaders/kjs/interpreter.h: Removed.
        * ForwardingHeaders/kjs/lookup.h: Removed.
        * ForwardingHeaders/kjs/operations.h: Removed.
        * ForwardingHeaders/kjs/protect.h: Removed.
        * ForwardingHeaders/runtime/Interpreter.h: Copied from ForwardingHeaders/kjs/interpreter.h.
        * WebView/WebScriptDebugDelegate.mm:

        WebKit/wx:

        * WebFrame.cpp:
        * WebView.cpp:

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

134 files changed:
JavaScriptCore/API/APICast.h
JavaScriptCore/API/JSBase.cpp
JavaScriptCore/API/JSCallbackObject.cpp
JavaScriptCore/API/JSClassRef.cpp
JavaScriptCore/API/JSClassRef.h
JavaScriptCore/API/JSStringRefCF.cpp
JavaScriptCore/API/JSValueRef.cpp
JavaScriptCore/API/OpaqueJSString.cpp
JavaScriptCore/API/OpaqueJSString.h
JavaScriptCore/AllInOneFile.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.h
JavaScriptCore/VM/CodeGenerator.cpp
JavaScriptCore/VM/Machine.cpp
JavaScriptCore/VM/RegisterFile.h
JavaScriptCore/debugger/Debugger.h
JavaScriptCore/kjs/SourceProvider.h
JavaScriptCore/kjs/create_hash_table
JavaScriptCore/kjs/lexer.cpp
JavaScriptCore/kjs/lexer.h
JavaScriptCore/kjs/nodes.cpp
JavaScriptCore/kjs/nodes.h
JavaScriptCore/pcre/pcre_exec.cpp
JavaScriptCore/profiler/CallIdentifier.h
JavaScriptCore/profiler/Profile.h
JavaScriptCore/runtime/ArrayConstructor.cpp
JavaScriptCore/runtime/ArrayPrototype.cpp
JavaScriptCore/runtime/ArrayPrototype.h
JavaScriptCore/runtime/Collector.cpp [moved from JavaScriptCore/kjs/collector.cpp with 99% similarity]
JavaScriptCore/runtime/Collector.h [moved from JavaScriptCore/kjs/collector.h with 100% similarity]
JavaScriptCore/runtime/CollectorHeapIterator.h
JavaScriptCore/runtime/Completion.h [moved from JavaScriptCore/kjs/completion.h with 100% similarity]
JavaScriptCore/runtime/ErrorPrototype.cpp
JavaScriptCore/runtime/Identifier.cpp [moved from JavaScriptCore/kjs/identifier.cpp with 100% similarity]
JavaScriptCore/runtime/Identifier.h [moved from JavaScriptCore/kjs/identifier.h with 99% similarity]
JavaScriptCore/runtime/InitializeThreading.cpp
JavaScriptCore/runtime/Interpreter.cpp [moved from JavaScriptCore/kjs/interpreter.cpp with 100% similarity]
JavaScriptCore/runtime/Interpreter.h [moved from JavaScriptCore/kjs/interpreter.h with 100% similarity]
JavaScriptCore/runtime/JSCell.h
JavaScriptCore/runtime/JSGlobalData.cpp
JavaScriptCore/runtime/JSGlobalData.h
JavaScriptCore/runtime/JSLock.cpp
JavaScriptCore/runtime/JSNumberCell.cpp
JavaScriptCore/runtime/JSNumberCell.h
JavaScriptCore/runtime/JSObject.cpp
JavaScriptCore/runtime/JSValue.h
JavaScriptCore/runtime/Lookup.cpp [moved from JavaScriptCore/kjs/lookup.cpp with 99% similarity]
JavaScriptCore/runtime/Lookup.h [moved from JavaScriptCore/kjs/lookup.h with 100% similarity]
JavaScriptCore/runtime/MathObject.cpp
JavaScriptCore/runtime/NativeErrorPrototype.cpp
JavaScriptCore/runtime/NumberPrototype.cpp
JavaScriptCore/runtime/Operations.cpp [moved from JavaScriptCore/kjs/operations.cpp with 98% similarity]
JavaScriptCore/runtime/Operations.h [moved from JavaScriptCore/kjs/operations.h with 100% similarity]
JavaScriptCore/runtime/PropertyMapHashTable.h
JavaScriptCore/runtime/Protect.h [moved from JavaScriptCore/kjs/protect.h with 99% similarity]
JavaScriptCore/runtime/RegExp.cpp [moved from JavaScriptCore/kjs/regexp.cpp with 99% similarity]
JavaScriptCore/runtime/RegExp.h [moved from JavaScriptCore/kjs/regexp.h with 99% similarity]
JavaScriptCore/runtime/RegExpConstructor.cpp
JavaScriptCore/runtime/RegExpObject.h
JavaScriptCore/runtime/RegExpPrototype.cpp
JavaScriptCore/runtime/SmallStrings.h
JavaScriptCore/runtime/StringObjectThatMasqueradesAsUndefined.h
JavaScriptCore/runtime/StructureID.cpp
JavaScriptCore/runtime/StructureID.h
JavaScriptCore/runtime/StructureIDTransitionTable.h
JavaScriptCore/runtime/SymbolTable.h
JavaScriptCore/runtime/TypeInfo.h [moved from JavaScriptCore/kjs/TypeInfo.h with 100% similarity]
JavaScriptCore/runtime/UString.cpp [moved from JavaScriptCore/kjs/ustring.cpp with 99% similarity]
JavaScriptCore/runtime/UString.h [moved from JavaScriptCore/kjs/ustring.h with 99% similarity]
JavaScriptCore/wrec/CharacterClassConstructor.h
JavaScriptCore/wrec/WREC.h
WebCore/ChangeLog
WebCore/ForwardingHeaders/kjs/collector.h [deleted file]
WebCore/ForwardingHeaders/kjs/completion.h [deleted file]
WebCore/ForwardingHeaders/kjs/identifier.h [deleted file]
WebCore/ForwardingHeaders/kjs/lookup.h [deleted file]
WebCore/ForwardingHeaders/kjs/operations.h [deleted file]
WebCore/ForwardingHeaders/kjs/protect.h [deleted file]
WebCore/ForwardingHeaders/kjs/ustring.h [deleted file]
WebCore/ForwardingHeaders/runtime/Collector.h [new file with mode: 0644]
WebCore/ForwardingHeaders/runtime/Completion.h [new file with mode: 0644]
WebCore/ForwardingHeaders/runtime/Identifier.h [new file with mode: 0644]
WebCore/ForwardingHeaders/runtime/Interpreter.h [moved from WebCore/ForwardingHeaders/kjs/interpreter.h with 100% similarity]
WebCore/ForwardingHeaders/runtime/Lookup.h [new file with mode: 0644]
WebCore/ForwardingHeaders/runtime/Operations.h [new file with mode: 0644]
WebCore/ForwardingHeaders/runtime/Protect.h [new file with mode: 0644]
WebCore/ForwardingHeaders/runtime/UString.h [new file with mode: 0644]
WebCore/bindings/js/GCController.cpp
WebCore/bindings/js/JSCustomPositionCallback.h
WebCore/bindings/js/JSCustomPositionErrorCallback.h
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/JSDOMWindowBase.h
WebCore/bindings/js/JSEventListener.h
WebCore/bindings/js/ScheduledAction.h
WebCore/bindings/js/ScriptController.cpp
WebCore/bindings/js/ScriptController.h
WebCore/bindings/objc/WebScriptObject.mm
WebCore/bindings/scripts/CodeGeneratorJS.pm
WebCore/bridge/NP_jsobject.cpp
WebCore/bridge/c/c_class.cpp
WebCore/bridge/jni/jni_class.cpp
WebCore/bridge/jni/jni_jsobject.mm
WebCore/bridge/npruntime.cpp
WebCore/bridge/runtime_root.h
WebCore/history/CachedPage.h
WebCore/html/CanvasRenderingContext2D.cpp
WebCore/html/HTMLCanvasElement.cpp
WebCore/inspector/InspectorController.cpp
WebCore/inspector/JavaScriptCallFrame.cpp
WebCore/page/Console.cpp
WebCore/page/Page.cpp
WebCore/platform/text/AtomicString.cpp
WebCore/platform/text/PlatformString.h
WebKit/mac/ChangeLog
WebKit/mac/ForwardingHeaders/kjs/collector.h [deleted file]
WebKit/mac/ForwardingHeaders/kjs/identifier.h [deleted file]
WebKit/mac/ForwardingHeaders/kjs/interpreter.h [deleted file]
WebKit/mac/ForwardingHeaders/kjs/lookup.h [deleted file]
WebKit/mac/ForwardingHeaders/kjs/operations.h [deleted file]
WebKit/mac/ForwardingHeaders/kjs/protect.h [deleted file]
WebKit/mac/ForwardingHeaders/runtime/Interpreter.h [new file with mode: 0644]
WebKit/mac/WebView/WebScriptDebugDelegate.mm
WebKit/wx/ChangeLog
WebKit/wx/WebFrame.cpp
WebKit/wx/WebView.cpp

index ecd524c..fd8110c 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef APICast_h
 #define APICast_h
 
-#include "ustring.h"
+#include "UString.h"
 #include "ExecState.h"
 
 typedef const struct OpaqueJSContextGroup* JSContextGroupRef;
index bd2935c..851a224 100644 (file)
@@ -33,7 +33,7 @@
 #include "SourceCode.h"
 #include <runtime/ExecState.h>
 #include <runtime/InitializeThreading.h>
-#include <kjs/interpreter.h>
+#include <runtime/Interpreter.h>
 #include <runtime/JSGlobalObject.h>
 #include <runtime/JSLock.h>
 #include <runtime/JSObject.h>
index 4be35bd..2fde0f8 100644 (file)
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "JSCallbackObject.h"
 
-#include "collector.h"
+#include "Collector.h"
 
 namespace JSC {
 
index 88fd70d..77a33f0 100644 (file)
@@ -32,7 +32,7 @@
 #include <runtime/InitializeThreading.h>
 #include <runtime/JSGlobalObject.h>
 #include <runtime/ObjectPrototype.h>
-#include <kjs/identifier.h>
+#include <runtime/Identifier.h>
 
 using namespace JSC;
 
index 71fae18..4f67618 100644 (file)
@@ -29,8 +29,8 @@
 #include "JSObjectRef.h"
 
 #include <runtime/JSObject.h>
-#include <kjs/protect.h>
-#include <kjs/ustring.h>
+#include <runtime/Protect.h>
+#include <runtime/UString.h>
 #include <wtf/HashMap.h>
 #include <wtf/RefCounted.h>
 
index 3a37866..65edd09 100644 (file)
@@ -29,7 +29,7 @@
 #include "APICast.h"
 #include "JSStringRef.h"
 #include "OpaqueJSString.h"
-#include <kjs/ustring.h>
+#include <runtime/UString.h>
 #include <runtime/JSValue.h>
 #include <wtf/OwnArrayPtr.h>
 
index 15dd633..3d45b5d 100644 (file)
@@ -32,9 +32,9 @@
 
 #include <runtime/JSGlobalObject.h>
 #include <runtime/JSString.h>
-#include <kjs/operations.h>
-#include <kjs/protect.h>
-#include <kjs/ustring.h>
+#include <runtime/Operations.h>
+#include <runtime/Protect.h>
+#include <runtime/UString.h>
 #include <runtime/JSValue.h>
 
 #include <wtf/Assertions.h>
index 0819141..e3275b6 100644 (file)
@@ -28,7 +28,7 @@
 
 #include <runtime/ExecState.h>
 #include <runtime/JSGlobalObject.h>
-#include <kjs/identifier.h>
+#include <runtime/Identifier.h>
 
 using namespace JSC;
 
index da05b06..473c815 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef OpaqueJSString_h
 #define OpaqueJSString_h
 
-#include <kjs/ustring.h>
+#include <runtime/UString.h>
 
 namespace JSC {
     class Identifier;
index 6423f99..be2113a 100644 (file)
@@ -44,7 +44,7 @@
 #include "runtime/BooleanConstructor.cpp"
 #include "runtime/BooleanObject.cpp"
 #include "runtime/BooleanPrototype.cpp"
-#include "kjs/collector.cpp"
+#include "runtime/Collector.cpp"
 #include "runtime/CommonIdentifiers.cpp"
 #include "runtime/DateConstructor.cpp"
 #include "runtime/DateMath.cpp"
 #include "runtime/FunctionConstructor.cpp"
 #include "runtime/FunctionPrototype.cpp"
 #include "grammar.cpp"
-#include "kjs/identifier.cpp"
+#include "runtime/Identifier.cpp"
 #include "runtime/JSString.cpp"
 #include "runtime/JSNumberCell.cpp"
 #include "runtime/GetterSetter.cpp"
 #include "runtime/InternalFunction.cpp"
-#include "kjs/interpreter.cpp"
+#include "runtime/Interpreter.cpp"
 #include "runtime/JSImmediate.cpp"
 #include "runtime/JSLock.cpp"
 #include "runtime/JSWrapperObject.cpp"
 #include "kjs/lexer.cpp"
 #include "runtime/ArgList.cpp"
-#include "kjs/lookup.cpp"
+#include "runtime/Lookup.cpp"
 #include "runtime/MathObject.cpp"
 #include "runtime/NativeErrorConstructor.cpp"
 #include "runtime/NativeErrorPrototype.cpp"
 #include "runtime/JSGlobalObject.cpp"
 #include "runtime/ObjectConstructor.cpp"
 #include "runtime/ObjectPrototype.cpp"
-#include "kjs/operations.cpp"
+#include "runtime/Operations.cpp"
 #include "kjs/Parser.cpp"
 #include "runtime/PropertySlot.cpp"
 #include "runtime/PropertyNameArray.cpp"
-#include "kjs/regexp.cpp"
+#include "runtime/RegExp.cpp"
 #include "runtime/RegExpConstructor.cpp"
 #include "runtime/RegExpObject.cpp"
 #include "runtime/RegExpPrototype.cpp"
@@ -94,7 +94,7 @@
 #include "runtime/StringConstructor.cpp"
 #include "runtime/StringObject.cpp"
 #include "runtime/StringPrototype.cpp"
-#include "kjs/ustring.cpp"
+#include "runtime/UString.cpp"
 #include "runtime/JSValue.cpp"
 #include "runtime/CallData.cpp"
 #include "runtime/ConstructData.cpp"
index 081aae1..0acef5a 100644 (file)
@@ -1,3 +1,102 @@
+2008-11-05  Cameron Zwarich  <zwarich@apple.com>
+
+        Rubber-stamped by Sam Weinig.
+
+        Move more files to the runtime subdirectory of JavaScriptCore.
+
+        * API/APICast.h:
+        * API/JSBase.cpp:
+        * API/JSCallbackObject.cpp:
+        * API/JSClassRef.cpp:
+        * API/JSClassRef.h:
+        * API/JSStringRefCF.cpp:
+        * API/JSValueRef.cpp:
+        * API/OpaqueJSString.cpp:
+        * API/OpaqueJSString.h:
+        * AllInOneFile.cpp:
+        * GNUmakefile.am:
+        * JavaScriptCore.pri:
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * JavaScriptCoreSources.bkl:
+        * VM/CodeBlock.h:
+        * VM/CodeGenerator.cpp:
+        * VM/Machine.cpp:
+        * VM/RegisterFile.h:
+        * debugger/Debugger.h:
+        * kjs/SourceProvider.h:
+        * kjs/TypeInfo.h: Removed.
+        * kjs/collector.cpp: Removed.
+        * kjs/collector.h: Removed.
+        * kjs/completion.h: Removed.
+        * kjs/create_hash_table:
+        * kjs/identifier.cpp: Removed.
+        * kjs/identifier.h: Removed.
+        * kjs/interpreter.cpp: Removed.
+        * kjs/interpreter.h: Removed.
+        * kjs/lexer.cpp:
+        * kjs/lexer.h:
+        * kjs/lookup.cpp: Removed.
+        * kjs/lookup.h: Removed.
+        * kjs/nodes.cpp:
+        * kjs/nodes.h:
+        * kjs/operations.cpp: Removed.
+        * kjs/operations.h: Removed.
+        * kjs/protect.h: Removed.
+        * kjs/regexp.cpp: Removed.
+        * kjs/regexp.h: Removed.
+        * kjs/ustring.cpp: Removed.
+        * kjs/ustring.h: Removed.
+        * pcre/pcre_exec.cpp:
+        * profiler/CallIdentifier.h:
+        * profiler/Profile.h:
+        * runtime/ArrayConstructor.cpp:
+        * runtime/ArrayPrototype.cpp:
+        * runtime/ArrayPrototype.h:
+        * runtime/Collector.cpp: Copied from kjs/collector.cpp.
+        * runtime/Collector.h: Copied from kjs/collector.h.
+        * runtime/CollectorHeapIterator.h:
+        * runtime/Completion.h: Copied from kjs/completion.h.
+        * runtime/ErrorPrototype.cpp:
+        * runtime/Identifier.cpp: Copied from kjs/identifier.cpp.
+        * runtime/Identifier.h: Copied from kjs/identifier.h.
+        * runtime/InitializeThreading.cpp:
+        * runtime/Interpreter.cpp: Copied from kjs/interpreter.cpp.
+        * runtime/Interpreter.h: Copied from kjs/interpreter.h.
+        * runtime/JSCell.h:
+        * runtime/JSGlobalData.cpp:
+        * runtime/JSGlobalData.h:
+        * runtime/JSLock.cpp:
+        * runtime/JSNumberCell.cpp:
+        * runtime/JSNumberCell.h:
+        * runtime/JSObject.cpp:
+        * runtime/JSValue.h:
+        * runtime/Lookup.cpp: Copied from kjs/lookup.cpp.
+        * runtime/Lookup.h: Copied from kjs/lookup.h.
+        * runtime/MathObject.cpp:
+        * runtime/NativeErrorPrototype.cpp:
+        * runtime/NumberPrototype.cpp:
+        * runtime/Operations.cpp: Copied from kjs/operations.cpp.
+        * runtime/Operations.h: Copied from kjs/operations.h.
+        * runtime/PropertyMapHashTable.h:
+        * runtime/Protect.h: Copied from kjs/protect.h.
+        * runtime/RegExp.cpp: Copied from kjs/regexp.cpp.
+        * runtime/RegExp.h: Copied from kjs/regexp.h.
+        * runtime/RegExpConstructor.cpp:
+        * runtime/RegExpObject.h:
+        * runtime/RegExpPrototype.cpp:
+        * runtime/SmallStrings.h:
+        * runtime/StringObjectThatMasqueradesAsUndefined.h:
+        * runtime/StructureID.cpp:
+        * runtime/StructureID.h:
+        * runtime/StructureIDTransitionTable.h:
+        * runtime/SymbolTable.h:
+        * runtime/TypeInfo.h: Copied from kjs/TypeInfo.h.
+        * runtime/UString.cpp: Copied from kjs/ustring.cpp.
+        * runtime/UString.h: Copied from kjs/ustring.h.
+        * wrec/CharacterClassConstructor.h:
+        * wrec/WREC.h:
+
 2008-11-05  Geoffrey Garen  <ggaren@apple.com>
 
         Suggested by Darin Adler.
index 95e59a9..3b39c54 100644 (file)
@@ -140,21 +140,21 @@ javascriptcore_sources += \
        JavaScriptCore/kjs/SourceCode.h \
        JavaScriptCore/runtime/SymbolTable.h \
        JavaScriptCore/runtime/Tracing.h \
-       JavaScriptCore/kjs/TypeInfo.h \
-       JavaScriptCore/kjs/collector.h \
-       JavaScriptCore/kjs/completion.h \
+       JavaScriptCore/runtime/TypeInfo.h \
+       JavaScriptCore/runtime/Collector.h \
+       JavaScriptCore/runtime/Completion.h \
        JavaScriptCore/config.h \
        JavaScriptCore/debugger/Debugger.h \
        JavaScriptCore/wtf/dtoa.h \
-       JavaScriptCore/kjs/identifier.h \
-       JavaScriptCore/kjs/interpreter.h \
+       JavaScriptCore/runtime/Identifier.h \
+       JavaScriptCore/runtime/Interpreter.h \
        JavaScriptCore/kjs/lexer.h \
-       JavaScriptCore/kjs/lookup.h \
+       JavaScriptCore/runtime/Lookup.h \
        JavaScriptCore/kjs/nodes.h \
-       JavaScriptCore/kjs/operations.h \
-       JavaScriptCore/kjs/protect.h \
-       JavaScriptCore/kjs/regexp.h \
-       JavaScriptCore/kjs/ustring.h \
+       JavaScriptCore/runtime/Operations.h \
+       JavaScriptCore/runtime/Protect.h \
+       JavaScriptCore/runtime/RegExp.h \
+       JavaScriptCore/runtime/UString.h \
        JavaScriptCore/masm/X86Assembler.h \
        JavaScriptCore/os-win32/stdbool.h \
        JavaScriptCore/os-win32/stdint.h \
@@ -324,18 +324,18 @@ javascriptcore_sources += \
        JavaScriptCore/runtime/RegExpObject.cpp \
        JavaScriptCore/runtime/RegExpPrototype.cpp \
        JavaScriptCore/runtime/ScopeChain.cpp \
-       JavaScriptCore/kjs/collector.cpp \
+       JavaScriptCore/runtime/Collector.cpp \
        JavaScriptCore/debugger/Debugger.cpp \
        JavaScriptCore/wtf/dtoa.cpp \
-       JavaScriptCore/kjs/identifier.cpp \
-       JavaScriptCore/kjs/interpreter.cpp \
+       JavaScriptCore/runtime/Identifier.cpp \
+       JavaScriptCore/runtime/Interpreter.cpp \
        JavaScriptCore/kjs/lexer.cpp \
-       JavaScriptCore/kjs/lookup.cpp \
+       JavaScriptCore/runtime/Lookup.cpp \
        JavaScriptCore/kjs/nodes.cpp \
        JavaScriptCore/kjs/nodes2string.cpp \
-       JavaScriptCore/kjs/operations.cpp \
-       JavaScriptCore/kjs/regexp.cpp \
-       JavaScriptCore/kjs/ustring.cpp \
+       JavaScriptCore/runtime/Operations.cpp \
+       JavaScriptCore/runtime/RegExp.cpp \
+       JavaScriptCore/runtime/UString.cpp \
        JavaScriptCore/runtime/ArrayConstructor.cpp \
        JavaScriptCore/runtime/ArrayPrototype.cpp \
        JavaScriptCore/runtime/BooleanConstructor.cpp \
index be59dcd..e00a7a0 100644 (file)
@@ -74,7 +74,7 @@ SOURCES += \
     runtime/BooleanObject.cpp \
     runtime/BooleanPrototype.cpp \
     runtime/CallData.cpp \
-    kjs/collector.cpp \
+    runtime/Collector.cpp \
     runtime/CommonIdentifiers.cpp \
     runtime/ConstructData.cpp \
     runtime/DateConstructor.cpp \
@@ -93,9 +93,9 @@ SOURCES += \
     runtime/FunctionPrototype.cpp \
     runtime/GetterSetter.cpp \
     runtime/GlobalEvalFunction.cpp \
-    kjs/identifier.cpp \
+    runtime/Identifier.cpp \
     runtime/InternalFunction.cpp \
-    kjs/interpreter.cpp \
+    runtime/Interpreter.cpp \
     runtime/JSArray.cpp \
     runtime/JSCell.cpp \
     runtime/JSFunction.cpp \
@@ -108,7 +108,7 @@ SOURCES += \
     runtime/JSValue.cpp \
     runtime/JSWrapperObject.cpp \
     kjs/lexer.cpp \
-    kjs/lookup.cpp \
+    runtime/Lookup.cpp \
     runtime/MathObject.cpp \
     runtime/NativeErrorConstructor.cpp \
     runtime/NativeErrorPrototype.cpp \
@@ -119,12 +119,12 @@ SOURCES += \
     runtime/NumberPrototype.cpp \
     runtime/ObjectConstructor.cpp \
     runtime/ObjectPrototype.cpp \
-    kjs/operations.cpp \
+    runtime/Operations.cpp \
     kjs/Parser.cpp \
     runtime/PropertyNameArray.cpp \
     runtime/PropertySlot.cpp \
     runtime/PrototypeFunction.cpp \
-    kjs/regexp.cpp \
+    runtime/RegExp.cpp \
     runtime/RegExpConstructor.cpp \
     runtime/RegExpObject.cpp \
     runtime/RegExpPrototype.cpp \
@@ -135,7 +135,7 @@ SOURCES += \
     runtime/StringPrototype.cpp \
     runtime/StructureID.cpp \
     runtime/StructureIDChain.cpp \
-    kjs/ustring.cpp \
+    runtime/UString.cpp \
     profiler/HeavyProfile.cpp \
     profiler/Profile.cpp \
     profiler/ProfileGenerator.cpp \
index 306b5fa..0fbaf00 100644 (file)
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kjs\collector.cpp"\r
+                               RelativePath="..\..\runtime\Collector.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kjs\collector.h"\r
+                               RelativePath="..\..\runtime\Collector.h"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kjs\completion.h"\r
+                               RelativePath="..\..\runtime\Completion.h"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kjs\identifier.cpp"\r
+                               RelativePath="..\..\runtime\Identifier.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kjs\identifier.h"\r
+                               RelativePath="..\..\runtime\Identifier.h"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kjs\interpreter.cpp"\r
+                               RelativePath="..\..\runtime\Interpreter.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kjs\interpreter.h"\r
+                               RelativePath="..\..\runtime\Interpreter.h"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kjs\lookup.cpp"\r
+                               RelativePath="..\..\runtime\Lookup.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kjs\lookup.h"\r
+                               RelativePath="..\..\runtime\Lookup.h"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kjs\operations.cpp"\r
+                               RelativePath="..\..\runtime\Operations.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kjs\operations.h"\r
+                               RelativePath="..\..\runtime\Operations.h"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kjs\protect.h"\r
+                               RelativePath="..\..\runtime\Protect.h"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kjs\regexp.cpp"\r
+                               RelativePath="..\..\runtime\RegExp.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kjs\regexp.h"\r
+                               RelativePath="..\..\runtime\RegExp.h"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kjs\ustring.cpp"\r
+                               RelativePath="..\..\runtime\UString.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kjs\ustring.h"\r
+                               RelativePath="..\..\runtime\UString.h"\r
                                >\r
                        </File>\r
                        <Filter\r
index 008e8ce..950fc36 100644 (file)
                BC18C3EE0E16F5CD00B34460 /* CodeBlock.h in Headers */ = {isa = PBXBuildFile; fileRef = 149B1A9D0D86ED73009CB8C7 /* CodeBlock.h */; };
                BC18C3EF0E16F5CD00B34460 /* CodeGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 149B15E80D81F986009CB8C7 /* CodeGenerator.h */; };
                BC18C3F00E16F5CD00B34460 /* Collator.h in Headers */ = {isa = PBXBuildFile; fileRef = E1A862AA0D7EBB7D001EC6AA /* Collator.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               BC18C3F10E16F5CD00B34460 /* collector.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8530255597D01FF60F7 /* collector.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               BC18C3F10E16F5CD00B34460 /* Collector.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8530255597D01FF60F7 /* Collector.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C3F30E16F5CD00B34460 /* CommonIdentifiers.h in Headers */ = {isa = PBXBuildFile; fileRef = 65EA73630BAE35D1001BB560 /* CommonIdentifiers.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               BC18C3F40E16F5CD00B34460 /* completion.h in Headers */ = {isa = PBXBuildFile; fileRef = F5BB2BC5030F772101FCFE1D /* completion.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               BC18C3F40E16F5CD00B34460 /* Completion.h in Headers */ = {isa = PBXBuildFile; fileRef = F5BB2BC5030F772101FCFE1D /* Completion.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C3F50E16F5CD00B34460 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = F68EBB8C0255D4C601FF60F7 /* config.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C3F60E16F5CD00B34460 /* ConstructData.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8F3CCF0DAF17BA00577A80 /* ConstructData.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C3F90E16F5CD00B34460 /* DateMath.h in Headers */ = {isa = PBXBuildFile; fileRef = D21202290AD4310C00ED79B6 /* DateMath.h */; };
                BC18C40C0E16F5CD00B34460 /* HashSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 65DFC92C08EA173A00F7300B /* HashSet.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C40D0E16F5CD00B34460 /* HashTable.h in Headers */ = {isa = PBXBuildFile; fileRef = 65DFC92E08EA173A00F7300B /* HashTable.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C40E0E16F5CD00B34460 /* HashTraits.h in Headers */ = {isa = PBXBuildFile; fileRef = 65DFC92F08EA173A00F7300B /* HashTraits.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               BC18C40F0E16F5CD00B34460 /* identifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 933A349A038AE7C6008635CE /* identifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               BC18C40F0E16F5CD00B34460 /* Identifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 933A349A038AE7C6008635CE /* Identifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C4100E16F5CD00B34460 /* InitializeThreading.h in Headers */ = {isa = PBXBuildFile; fileRef = E178633F0D9BEC0000D74E75 /* InitializeThreading.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C4110E16F5CD00B34460 /* Instruction.h in Headers */ = {isa = PBXBuildFile; fileRef = 149B1AA10D86ED7C009CB8C7 /* Instruction.h */; };
-               BC18C4120E16F5CD00B34460 /* interpreter.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8640255597D01FF60F7 /* interpreter.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               BC18C4120E16F5CD00B34460 /* Interpreter.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8640255597D01FF60F7 /* Interpreter.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C4130E16F5CD00B34460 /* JavaScript.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CAA8B4A0D32C39A0041BCFF /* JavaScript.h */; settings = {ATTRIBUTES = (Public, ); }; };
                BC18C4140E16F5CD00B34460 /* JavaScriptCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CAA8B4B0D32C39A0041BCFF /* JavaScriptCore.h */; settings = {ATTRIBUTES = (Public, ); }; };
                BC18C4150E16F5CD00B34460 /* JavaScriptCorePrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = F5C290E60284F98E018635CA /* JavaScriptCorePrefix.h */; };
                BC18C4340E16F5CD00B34460 /* ListHashSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 657EB7450B708F540063461B /* ListHashSet.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C4350E16F5CD00B34460 /* ListRefPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 148A1626095D16BB00666D0D /* ListRefPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C4360E16F5CD00B34460 /* Locker.h in Headers */ = {isa = PBXBuildFile; fileRef = E1EE79270D6C964500FEA3BA /* Locker.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               BC18C4370E16F5CD00B34460 /* lookup.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8690255597D01FF60F7 /* lookup.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               BC18C4370E16F5CD00B34460 /* Lookup.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8690255597D01FF60F7 /* Lookup.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C4380E16F5CD00B34460 /* Machine.h in Headers */ = {isa = PBXBuildFile; fileRef = 149B15E60D81F986009CB8C7 /* Machine.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C4390E16F5CD00B34460 /* MainThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 06D358A30DAAD9C4003B174E /* MainThread.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C43A0E16F5CD00B34460 /* MallocZoneSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DBD18AF0C5401A700C15EAE /* MallocZoneSupport.h */; };
                BC18C4450E16F5CD00B34460 /* ObjectConstructor.h in Headers */ = {isa = PBXBuildFile; fileRef = BC2680C70E16D4E900A06E92 /* ObjectConstructor.h */; };
                BC18C4460E16F5CD00B34460 /* ObjectPrototype.h in Headers */ = {isa = PBXBuildFile; fileRef = BC2680C90E16D4E900A06E92 /* ObjectPrototype.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C4470E16F5CD00B34460 /* Opcode.h in Headers */ = {isa = PBXBuildFile; fileRef = 149B15E40D81F986009CB8C7 /* Opcode.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               BC18C4480E16F5CD00B34460 /* operations.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8780255597D01FF60F7 /* operations.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               BC18C4480E16F5CD00B34460 /* Operations.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8780255597D01FF60F7 /* Operations.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C4490E16F5CD00B34460 /* OwnArrayPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 9303F5A409911A5800AD71B8 /* OwnArrayPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C44A0E16F5CD00B34460 /* OwnPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 9303F567099118FA00AD71B8 /* OwnPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C44B0E16F5CD00B34460 /* Parser.h in Headers */ = {isa = PBXBuildFile; fileRef = 93F0B3AA09BB4DC00068FCE3 /* Parser.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C4520E16F5CD00B34460 /* Profiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 95AB832F0DA42CAD00BC83F3 /* Profiler.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C4540E16F5CD00B34460 /* PropertyNameArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 65400C100A69BAF200509887 /* PropertyNameArray.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C4550E16F5CD00B34460 /* PropertySlot.h in Headers */ = {isa = PBXBuildFile; fileRef = 65621E6C089E859700760F35 /* PropertySlot.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               BC18C4560E16F5CD00B34460 /* protect.h in Headers */ = {isa = PBXBuildFile; fileRef = 65C02FBB0637462A003E7EE6 /* protect.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               BC18C4560E16F5CD00B34460 /* Protect.h in Headers */ = {isa = PBXBuildFile; fileRef = 65C02FBB0637462A003E7EE6 /* Protect.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C4570E16F5CD00B34460 /* RefCounted.h in Headers */ = {isa = PBXBuildFile; fileRef = 1419D32C0CEA7CDE00FF507A /* RefCounted.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C4580E16F5CD00B34460 /* RefPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 65C647B3093EF8D60022C380 /* RefPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C4590E16F5CD00B34460 /* RefPtrHashMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 148A1ECD0D10C23B0069A47C /* RefPtrHashMap.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               BC18C45A0E16F5CD00B34460 /* regexp.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A87E0255597D01FF60F7 /* regexp.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               BC18C45A0E16F5CD00B34460 /* RegExp.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A87E0255597D01FF60F7 /* RegExp.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C45B0E16F5CD00B34460 /* RegExpObject.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A87C0255597D01FF60F7 /* RegExpObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C45D0E16F5CD00B34460 /* Register.h in Headers */ = {isa = PBXBuildFile; fileRef = 149B24FF0D8AF6D1009CB8C7 /* Register.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C45E0E16F5CD00B34460 /* RegisterFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 14D792640DAA03FB001A9F05 /* RegisterFile.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C4730E16F5CD00B34460 /* Unicode.h in Headers */ = {isa = PBXBuildFile; fileRef = E195679409E7CF1200B89D13 /* Unicode.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C4740E16F5CD00B34460 /* UnicodeIcu.h in Headers */ = {isa = PBXBuildFile; fileRef = E195678F09E7CF1200B89D13 /* UnicodeIcu.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C4750E16F5CD00B34460 /* UnusedParam.h in Headers */ = {isa = PBXBuildFile; fileRef = 935AF46B09E9D9DB00ACD1D8 /* UnusedParam.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               BC18C4760E16F5CD00B34460 /* ustring.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8860255597D01FF60F7 /* ustring.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               BC18C4760E16F5CD00B34460 /* UString.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8860255597D01FF60F7 /* UString.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C4770E16F5CD00B34460 /* UTF8.h in Headers */ = {isa = PBXBuildFile; fileRef = E1EF79A90CE97BA60088D500 /* UTF8.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C4780E16F5CD00B34460 /* Vector.h in Headers */ = {isa = PBXBuildFile; fileRef = 6592C316098B7DE10003D4F6 /* Vector.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C4790E16F5CD00B34460 /* VectorTraits.h in Headers */ = {isa = PBXBuildFile; fileRef = 6592C317098B7DE10003D4F6 /* VectorTraits.h */; settings = {ATTRIBUTES = (Private, ); }; };
                6592C316098B7DE10003D4F6 /* Vector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Vector.h; sourceTree = "<group>"; };
                6592C317098B7DE10003D4F6 /* VectorTraits.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = VectorTraits.h; sourceTree = "<group>"; };
                65B174BE09D1000200820339 /* chartables.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = chartables.c; sourceTree = "<group>"; };
-               65C02FBB0637462A003E7EE6 /* protect.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = protect.h; sourceTree = "<group>"; tabWidth = 8; };
+               65C02FBB0637462A003E7EE6 /* Protect.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Protect.h; sourceTree = "<group>"; tabWidth = 8; };
                65C647B3093EF8D60022C380 /* RefPtr.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = RefPtr.h; sourceTree = "<group>"; tabWidth = 8; };
                65C7A1710A8EAACB00FA37EA /* JSWrapperObject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSWrapperObject.cpp; sourceTree = "<group>"; };
                65C7A1720A8EAACB00FA37EA /* JSWrapperObject.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSWrapperObject.h; sourceTree = "<group>"; };
                93303FE80E6A72B500786E6A /* SmallStrings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SmallStrings.cpp; sourceTree = "<group>"; };
                93303FEA0E6A72C000786E6A /* SmallStrings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SmallStrings.h; sourceTree = "<group>"; };
                933A3499038AE7C6008635CE /* grammar.y */ = {isa = PBXFileReference; explicitFileType = sourcecode.yacc; fileEncoding = 4; indentWidth = 4; path = grammar.y; sourceTree = "<group>"; tabWidth = 8; };
-               933A349A038AE7C6008635CE /* identifier.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = identifier.h; sourceTree = "<group>"; tabWidth = 8; };
-               933A349D038AE80F008635CE /* identifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = identifier.cpp; sourceTree = "<group>"; tabWidth = 8; };
+               933A349A038AE7C6008635CE /* Identifier.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Identifier.h; sourceTree = "<group>"; tabWidth = 8; };
+               933A349D038AE80F008635CE /* Identifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Identifier.cpp; sourceTree = "<group>"; tabWidth = 8; };
                935AF46909E9D9DB00ACD1D8 /* Forward.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Forward.h; sourceTree = "<group>"; };
                935AF46B09E9D9DB00ACD1D8 /* UnusedParam.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnusedParam.h; sourceTree = "<group>"; };
                937013470CA97E0E00FA14D3 /* pcre_ucp_searchfuncs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pcre_ucp_searchfuncs.cpp; sourceTree = "<group>"; };
                E1EE798B0D6CA53D00FEA3BA /* MessageQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageQueue.h; sourceTree = "<group>"; };
                E1EF79A80CE97BA60088D500 /* UTF8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UTF8.cpp; sourceTree = "<group>"; };
                E1EF79A90CE97BA60088D500 /* UTF8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UTF8.h; sourceTree = "<group>"; };
-               F5BB2BC5030F772101FCFE1D /* completion.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = completion.h; sourceTree = "<group>"; tabWidth = 8; };
+               F5BB2BC5030F772101FCFE1D /* Completion.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Completion.h; sourceTree = "<group>"; tabWidth = 8; };
                F5C290E60284F98E018635CA /* JavaScriptCorePrefix.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = JavaScriptCorePrefix.h; sourceTree = "<group>"; tabWidth = 8; };
                F5FFE656026B47A6018635CA /* nodes2string.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = nodes2string.cpp; path = kjs/nodes2string.cpp; sourceTree = "<group>"; tabWidth = 8; };
                F68EBB8C0255D4C601FF60F7 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A84D0255597D01FF60F7 /* ArrayPrototype.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArrayPrototype.cpp; sourceTree = "<group>"; tabWidth = 8; };
                F692A84E0255597D01FF60F7 /* ArrayPrototype.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = ArrayPrototype.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A8500255597D01FF60F7 /* BooleanObject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BooleanObject.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A8520255597D01FF60F7 /* collector.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collector.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A8530255597D01FF60F7 /* collector.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = collector.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A8520255597D01FF60F7 /* Collector.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Collector.cpp; sourceTree = "<group>"; tabWidth = 8; };
+               F692A8530255597D01FF60F7 /* Collector.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Collector.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A8540255597D01FF60F7 /* create_hash_table */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = text.script.perl; path = create_hash_table; sourceTree = "<group>"; tabWidth = 8; };
                F692A8580255597D01FF60F7 /* Debugger.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Debugger.cpp; sourceTree = "<group>"; tabWidth = 8; };
                F692A8590255597D01FF60F7 /* Debugger.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Debugger.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; };
                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; };
+               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; };
                F692A8660255597D01FF60F7 /* lexer.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = lexer.h; path = kjs/lexer.h; sourceTree = "<group>"; tabWidth = 8; };
-               F692A8680255597D01FF60F7 /* lookup.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lookup.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A8690255597D01FF60F7 /* lookup.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = lookup.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A8680255597D01FF60F7 /* Lookup.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Lookup.cpp; sourceTree = "<group>"; tabWidth = 8; };
+               F692A8690255597D01FF60F7 /* Lookup.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Lookup.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A86A0255597D01FF60F7 /* MathObject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathObject.cpp; sourceTree = "<group>"; tabWidth = 8; };
                F692A86B0255597D01FF60F7 /* MathObject.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = MathObject.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A86D0255597D01FF60F7 /* nodes.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = nodes.cpp; path = kjs/nodes.cpp; sourceTree = "<group>"; tabWidth = 8; };
                F692A86E0255597D01FF60F7 /* nodes.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = nodes.h; path = kjs/nodes.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A8700255597D01FF60F7 /* NumberObject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NumberObject.cpp; sourceTree = "<group>"; tabWidth = 8; };
                F692A8710255597D01FF60F7 /* NumberObject.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = NumberObject.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; };
+               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; };
                F692A87B0255597D01FF60F7 /* RegExpObject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RegExpObject.cpp; sourceTree = "<group>"; tabWidth = 8; };
                F692A87C0255597D01FF60F7 /* RegExpObject.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = RegExpObject.h; sourceTree = "<group>"; tabWidth = 8; };
-               F692A87D0255597D01FF60F7 /* regexp.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = regexp.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A87E0255597D01FF60F7 /* regexp.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = regexp.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; };
+               F692A87D0255597D01FF60F7 /* RegExp.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RegExp.cpp; sourceTree = "<group>"; tabWidth = 8; };
+               F692A87E0255597D01FF60F7 /* RegExp.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = RegExp.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 /* JSValue.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSValue.cpp; sourceTree = "<group>"; tabWidth = 8; };
 /* End PBXFileReference section */
 
                65417200039E01BA0058BFEB /* kjs */ = {
                        isa = PBXGroup;
                        children = (
-                               6507D2970E871E4A00D7D896 /* TypeInfo.h */,
-                               F692A8520255597D01FF60F7 /* collector.cpp */,
-                               F692A8530255597D01FF60F7 /* collector.h */,
-                               F5BB2BC5030F772101FCFE1D /* completion.h */,
                                F692A8540255597D01FF60F7 /* create_hash_table */,
                                933A3499038AE7C6008635CE /* grammar.y */,
-                               933A349D038AE80F008635CE /* identifier.cpp */,
-                               933A349A038AE7C6008635CE /* identifier.h */,
-                               F692A8630255597D01FF60F7 /* interpreter.cpp */,
-                               F692A8640255597D01FF60F7 /* interpreter.h */,
                                93F1981A08245AAE001E9ABC /* keywords.table */,
-                               F692A8680255597D01FF60F7 /* lookup.cpp */,
-                               F692A8690255597D01FF60F7 /* lookup.h */,
-                               F692A8770255597D01FF60F7 /* operations.cpp */,
-                               F692A8780255597D01FF60F7 /* operations.h */,
-                               65C02FBB0637462A003E7EE6 /* protect.h */,
-                               F692A87D0255597D01FF60F7 /* regexp.cpp */,
-                               F692A87E0255597D01FF60F7 /* regexp.h */,
                                869EBCB60E8C6D4A008722CC /* ResultType.h */,
                                65E866ED0DD59AFA00A2B2A1 /* SourceProvider.h */,
                                65E866EE0DD59AFA00A2B2A1 /* SourceCode.h */,
-                               F692A8850255597D01FF60F7 /* ustring.cpp */,
-                               F692A8860255597D01FF60F7 /* ustring.h */,
                        );
                        path = kjs;
                        sourceTree = "<group>";
                                BCA62DFE0E2826230004F30D /* CallData.cpp */,
                                145C507F0D9DF63B0088F6B9 /* CallData.h */,
                                BC6AAAE40E1F426500AD87D8 /* ClassInfo.h */,
+                               F692A8520255597D01FF60F7 /* Collector.cpp */,
+                               F692A8530255597D01FF60F7 /* Collector.h */,
                                14F3488E0E95EF8A003648BC /* CollectorHeapIterator.h */,
                                65EA73620BAE35D1001BB560 /* CommonIdentifiers.cpp */,
                                65EA73630BAE35D1001BB560 /* CommonIdentifiers.h */,
+                               F5BB2BC5030F772101FCFE1D /* Completion.h */,
                                BCA62DFF0E2826310004F30D /* ConstructData.cpp */,
                                BC8F3CCF0DAF17BA00577A80 /* ConstructData.h */,
                                BCD203450E17135E002C7E82 /* DateConstructor.cpp */,
                                BC337BDE0E1AF0B80076918A /* GetterSetter.h */,
                                BC257DED0E1F52ED0016B6C9 /* GlobalEvalFunction.cpp */,
                                BC257DEE0E1F52ED0016B6C9 /* GlobalEvalFunction.h */,
+                               933A349D038AE80F008635CE /* Identifier.cpp */,
+                               933A349A038AE7C6008635CE /* Identifier.h */,
                                E178636C0D9BEEC300D74E75 /* InitializeThreading.cpp */,
                                E178633F0D9BEC0000D74E75 /* InitializeThreading.h */,
                                BC9BB95B0E19680600DF8855 /* InternalFunction.cpp */,
                                BC11667A0E199C05008066DD /* InternalFunction.h */,
+                               F692A8630255597D01FF60F7 /* Interpreter.cpp */,
+                               F692A8640255597D01FF60F7 /* Interpreter.h */,
                                14DA818F0D99FD2000B0A4FB /* JSActivation.cpp */,
                                14DA818E0D99FD2000B0A4FB /* JSActivation.h */,
                                93ADFCE60CCBD7AC00D30B08 /* JSArray.cpp */,
                                14F252560D08DD8D004ECFFF /* JSVariableObject.h */,
                                65C7A1710A8EAACB00FA37EA /* JSWrapperObject.cpp */,
                                65C7A1720A8EAACB00FA37EA /* JSWrapperObject.h */,
+                               F692A8680255597D01FF60F7 /* Lookup.cpp */,
+                               F692A8690255597D01FF60F7 /* Lookup.h */,
                                F692A86A0255597D01FF60F7 /* MathObject.cpp */,
                                F692A86B0255597D01FF60F7 /* MathObject.h */,
                                BC02E9080E1839DB000F9297 /* NativeErrorConstructor.cpp */,
                                BC2680C70E16D4E900A06E92 /* ObjectConstructor.h */,
                                BC2680C80E16D4E900A06E92 /* ObjectPrototype.cpp */,
                                BC2680C90E16D4E900A06E92 /* ObjectPrototype.h */,
+                               F692A8770255597D01FF60F7 /* Operations.cpp */,
+                               F692A8780255597D01FF60F7 /* Operations.h */,
                                BC95437C0EBA70FD0072B6D3 /* PropertyMapHashTable.h */,
                                65400C0F0A69BAF200509887 /* PropertyNameArray.cpp */,
                                65400C100A69BAF200509887 /* PropertyNameArray.h */,
                                65621E6B089E859700760F35 /* PropertySlot.cpp */,
                                65621E6C089E859700760F35 /* PropertySlot.h */,
+                               65C02FBB0637462A003E7EE6 /* Protect.h */,
                                BC257DF10E1F53740016B6C9 /* PrototypeFunction.cpp */,
                                BC257DF20E1F53740016B6C9 /* PrototypeFunction.h */,
                                147B84620E6DE6B1004775A4 /* PutPropertySlot.h */,
+                               F692A87D0255597D01FF60F7 /* RegExp.cpp */,
+                               F692A87E0255597D01FF60F7 /* RegExp.h */,
                                BCD202BD0E1706A7002C7E82 /* RegExpConstructor.cpp */,
                                BCD202BE0E1706A7002C7E82 /* RegExpConstructor.h */,
                                93CEDDFB0EA91EE600258EBE /* RegExpMatchesArray.h */,
                                14A396A60CD2933100B5B4FF /* SymbolTable.h */,
                                5D53726D0E1C546B0021E549 /* Tracing.d */,
                                5D53726E0E1C54880021E549 /* Tracing.h */,
+                               6507D2970E871E4A00D7D896 /* TypeInfo.h */,
+                               F692A8850255597D01FF60F7 /* UString.cpp */,
+                               F692A8860255597D01FF60F7 /* UString.h */,
                        );
                        path = runtime;
                        sourceTree = "<group>";
                                BC18C3EE0E16F5CD00B34460 /* CodeBlock.h in Headers */,
                                BC18C3EF0E16F5CD00B34460 /* CodeGenerator.h in Headers */,
                                BC18C3F00E16F5CD00B34460 /* Collator.h in Headers */,
-                               BC18C3F10E16F5CD00B34460 /* collector.h in Headers */,
+                               BC18C3F10E16F5CD00B34460 /* Collector.h in Headers */,
                                BC18C3F30E16F5CD00B34460 /* CommonIdentifiers.h in Headers */,
-                               BC18C3F40E16F5CD00B34460 /* completion.h in Headers */,
+                               BC18C3F40E16F5CD00B34460 /* Completion.h in Headers */,
                                BC18C3F50E16F5CD00B34460 /* config.h in Headers */,
                                BC18C3F60E16F5CD00B34460 /* ConstructData.h in Headers */,
                                5DE6E5B30E1728EC00180407 /* create_hash_table in Headers */,
                                BC18C40C0E16F5CD00B34460 /* HashSet.h in Headers */,
                                BC18C40D0E16F5CD00B34460 /* HashTable.h in Headers */,
                                BC18C40E0E16F5CD00B34460 /* HashTraits.h in Headers */,
-                               BC18C40F0E16F5CD00B34460 /* identifier.h in Headers */,
+                               BC18C40F0E16F5CD00B34460 /* Identifier.h in Headers */,
                                BC18C4100E16F5CD00B34460 /* InitializeThreading.h in Headers */,
                                BC18C4110E16F5CD00B34460 /* Instruction.h in Headers */,
-                               BC18C4120E16F5CD00B34460 /* interpreter.h in Headers */,
+                               BC18C4120E16F5CD00B34460 /* Interpreter.h in Headers */,
                                BC18C4130E16F5CD00B34460 /* JavaScript.h in Headers */,
                                BC18C4140E16F5CD00B34460 /* JavaScriptCore.h in Headers */,
                                BC18C4150E16F5CD00B34460 /* JavaScriptCorePrefix.h in Headers */,
                                BC18C4340E16F5CD00B34460 /* ListHashSet.h in Headers */,
                                BC18C4350E16F5CD00B34460 /* ListRefPtr.h in Headers */,
                                BC18C4360E16F5CD00B34460 /* Locker.h in Headers */,
-                               BC18C4370E16F5CD00B34460 /* lookup.h in Headers */,
+                               BC18C4370E16F5CD00B34460 /* Lookup.h in Headers */,
                                BC18C4380E16F5CD00B34460 /* Machine.h in Headers */,
                                BC18C4390E16F5CD00B34460 /* MainThread.h in Headers */,
                                BC18C43A0E16F5CD00B34460 /* MallocZoneSupport.h in Headers */,
                                BC18C4450E16F5CD00B34460 /* ObjectConstructor.h in Headers */,
                                BC18C4460E16F5CD00B34460 /* ObjectPrototype.h in Headers */,
                                BC18C4470E16F5CD00B34460 /* Opcode.h in Headers */,
-                               BC18C4480E16F5CD00B34460 /* operations.h in Headers */,
+                               BC18C4480E16F5CD00B34460 /* Operations.h in Headers */,
                                BC18C4490E16F5CD00B34460 /* OwnArrayPtr.h in Headers */,
                                BC18C44A0E16F5CD00B34460 /* OwnPtr.h in Headers */,
                                BC18C44B0E16F5CD00B34460 /* Parser.h in Headers */,
                                BC18C4520E16F5CD00B34460 /* Profiler.h in Headers */,
                                BC18C4540E16F5CD00B34460 /* PropertyNameArray.h in Headers */,
                                BC18C4550E16F5CD00B34460 /* PropertySlot.h in Headers */,
-                               BC18C4560E16F5CD00B34460 /* protect.h in Headers */,
+                               BC18C4560E16F5CD00B34460 /* Protect.h in Headers */,
                                BC18C4570E16F5CD00B34460 /* RefCounted.h in Headers */,
                                90D3469C0E285280009492EE /* RefCountedLeakCounter.h in Headers */,
                                BC18C4580E16F5CD00B34460 /* RefPtr.h in Headers */,
                                BC18C4590E16F5CD00B34460 /* RefPtrHashMap.h in Headers */,
-                               BC18C45A0E16F5CD00B34460 /* regexp.h in Headers */,
+                               BC18C45A0E16F5CD00B34460 /* RegExp.h in Headers */,
                                BC18C45B0E16F5CD00B34460 /* RegExpObject.h in Headers */,
                                BC18C45D0E16F5CD00B34460 /* Register.h in Headers */,
                                BC18C45E0E16F5CD00B34460 /* RegisterFile.h in Headers */,
                                BC18C4730E16F5CD00B34460 /* Unicode.h in Headers */,
                                BC18C4740E16F5CD00B34460 /* UnicodeIcu.h in Headers */,
                                BC18C4750E16F5CD00B34460 /* UnusedParam.h in Headers */,
-                               BC18C4760E16F5CD00B34460 /* ustring.h in Headers */,
+                               BC18C4760E16F5CD00B34460 /* UString.h in Headers */,
                                BC18C4770E16F5CD00B34460 /* UTF8.h in Headers */,
                                BC18C4780E16F5CD00B34460 /* Vector.h in Headers */,
                                BC18C4790E16F5CD00B34460 /* VectorTraits.h in Headers */,
index 4c692e1..bf52dc9 100644 (file)
@@ -47,15 +47,10 @@ Source files for JSCore.
     </set>
     <set append="1" var="JSCORE_SOURCES_KJS">
         DerivedSources/JavaScriptCore/grammar.cpp
-        kjs/collector.cpp
         wtf/dtoa.cpp
-        kjs/identifier.cpp
-        kjs/interpreter.cpp
         kjs/lexer.cpp
-        kjs/lookup.cpp
         kjs/nodes.cpp
         kjs/nodes2string.cpp
-        kjs/operations.cpp
         kjs/Parser.cpp
         kjs/regexp.cpp
         kjs/ustring.cpp
@@ -84,6 +79,7 @@ Source files for JSCore.
         runtime/BooleanObject.cpp
         runtime/BooleanPrototype.cpp
         runtime/CallData.cpp
+        runtime/Collector.cpp
         runtime/CommonIdentifiers.cpp
         runtime/ConstructData.cpp
         runtime/DateConstructor.cpp
@@ -99,8 +95,10 @@ Source files for JSCore.
         runtime/FunctionPrototype.cpp
         runtime/GetterSetter.cpp
         runtime/GlobalEvalFunction.cpp
+        runtime/Identifier.cpp
         runtime/InitializeThreading.cpp
         runtime/InternalFunction.cpp
+        runtime/Interpreter.cpp
         runtime/JSActivation.cpp
         runtime/JSArray.cpp
         runtime/JSCell.cpp
@@ -119,6 +117,7 @@ Source files for JSCore.
         runtime/JSValue.cpp
         runtime/JSVariableObject.cpp
         runtime/JSWrapperObject.cpp
+        runtime/Lookup.cpp
         runtime/MathObject.cpp
         runtime/NativeErrorConstructor.cpp
         runtime/NativeErrorPrototype.cpp
index d745164..9b6301e 100644 (file)
@@ -35,7 +35,7 @@
 #include "nodes.h"
 #include "Parser.h"
 #include "SourceCode.h"
-#include "ustring.h"
+#include "UString.h"
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
 
index 04fcc3a..23a00f5 100644 (file)
@@ -33,7 +33,7 @@
 #include "BatchedTransitionOptimizer.h"
 #include "JSFunction.h"
 #include "Machine.h"
-#include "ustring.h"
+#include "UString.h"
 
 using namespace std;
 
index a605d25..b6852af 100644 (file)
@@ -50,9 +50,9 @@
 #include "RegExpObject.h"
 #include "RegExpPrototype.h"
 #include "Register.h"
-#include "collector.h"
+#include "Collector.h"
 #include "Debugger.h"
-#include "operations.h"
+#include "Operations.h"
 #include "SamplingTool.h"
 #include <stdio.h>
 
index 0955ccb..2036cbf 100644 (file)
@@ -30,7 +30,7 @@
 #define RegisterFile_h
 
 #include "Register.h"
-#include "collector.h"
+#include "Collector.h"
 #if HAVE(MMAP)
 #include <sys/mman.h>
 #endif
index 4a6a9b3..6af116f 100644 (file)
@@ -22,7 +22,7 @@
 #ifndef Debugger_h
 #define Debugger_h
 
-#include "protect.h"
+#include "Protect.h"
 
 namespace JSC {
 
index 755a10f..07da9e0 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef SourceProvider_h
 #define SourceProvider_h
 
-#include "ustring.h"
+#include "UString.h"
 #include <wtf/RefCounted.h>
 
 namespace JSC {
index 829a024..adcbbf7 100755 (executable)
@@ -30,7 +30,7 @@ my $file = $ARGV[0];
 shift;
 my $includelookup = 0;
 
-# Use -i as second argument to make it include "lookup.h"
+# Use -i as second argument to make it include "Lookup.h"
 $includelookup = 1 if (defined($ARGV[0]) && $ARGV[0] eq "-i");
 
 # Use -n as second argument to make it use the third argument as namespace parameter ie. -n KDOM
index 7313b12..039f621 100644 (file)
@@ -44,7 +44,7 @@ using namespace JSC;
 #include "grammar.h"
 #endif
 
-#include "lookup.h"
+#include "Lookup.h"
 #include "lexer.lut.h"
 
 // a bridge for yacc from the C world to C++
index 16bc4b6..3943160 100644 (file)
@@ -23,8 +23,8 @@
 #ifndef Lexer_h
 #define Lexer_h
 
-#include "lookup.h"
-#include "ustring.h"
+#include "Lookup.h"
+#include "UString.h"
 #include <wtf/Vector.h>
 #include "SourceCode.h"
 
index b4aeb28..0761eb2 100644 (file)
@@ -37,7 +37,7 @@
 #include "SamplingTool.h"
 #include "Debugger.h"
 #include "lexer.h"
-#include "operations.h"
+#include "Operations.h"
 #include <math.h>
 #include <wtf/Assertions.h>
 #include <wtf/HashCountedSet.h>
index a70d350..1a87244 100644 (file)
@@ -34,7 +34,7 @@
 #include "ResultType.h"
 #include "SourceCode.h"
 #include "SymbolTable.h"
-#include "regexp.h"
+#include "RegExp.h"
 #include <wtf/ListRefPtr.h>
 #include <wtf/MathExtras.h>
 #include <wtf/OwnPtr.h>
index 36d81e2..41f50c9 100644 (file)
@@ -51,7 +51,7 @@ the JavaScript specification. There are also some supporting functions. */
 
 #if REGEXP_HISTOGRAM
 #include <kjs/DateMath.h>
-#include <kjs/ustring.h>
+#include <runtime/UString.h>
 #endif
 
 using namespace WTF;
index c24c44b..6ceef13 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef CallIdentifier_h
 #define CallIdentifier_h
 
-#include <kjs/ustring.h>
+#include <runtime/UString.h>
 
 namespace JSC {
 
index c232c55..dd96f77 100644 (file)
@@ -27,7 +27,7 @@
 #define Profile_h
 
 #include "ProfileNode.h"
-#include <kjs/ustring.h>
+#include <runtime/UString.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
 
index 5784af0..a9949ba 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "ArrayPrototype.h"
 #include "JSArray.h"
-#include "lookup.h"
+#include "Lookup.h"
 
 namespace JSC {
 
index 5280784..ecf9c19 100644 (file)
@@ -26,8 +26,8 @@
 
 #include "Machine.h"
 #include "ObjectPrototype.h"
-#include "lookup.h"
-#include "operations.h"
+#include "Lookup.h"
+#include "Operations.h"
 #include <algorithm>
 #include <wtf/Assertions.h>
 #include <wtf/HashSet.h>
index 33ce30b..95f69c7 100644 (file)
@@ -22,7 +22,7 @@
 #define ArrayPrototype_h
 
 #include "JSArray.h"
-#include "lookup.h"
+#include "Lookup.h"
 
 namespace JSC {
 
similarity index 99%
rename from JavaScriptCore/kjs/collector.cpp
rename to JavaScriptCore/runtime/Collector.cpp
index 091c889..67273cf 100644 (file)
@@ -19,7 +19,7 @@
  */
 
 #include "config.h"
-#include "collector.h"
+#include "Collector.h"
 
 #include "ArgList.h"
 #include "CollectorHeapIterator.h"
index c5e1d78..c4b9dfc 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "collector.h"
+#include "Collector.h"
 
 namespace JSC {
 
index 69255c1..993f179 100644 (file)
@@ -24,7 +24,7 @@
 #include "JSString.h"
 #include "ObjectPrototype.h"
 #include "PrototypeFunction.h"
-#include "ustring.h"
+#include "UString.h"
 
 namespace JSC {
 
similarity index 99%
rename from JavaScriptCore/kjs/identifier.h
rename to JavaScriptCore/runtime/Identifier.h
index a79dd92..9088d53 100644 (file)
@@ -22,7 +22,7 @@
 #define KJS_IDENTIFIER_H
 
 #include "JSGlobalData.h"
-#include "ustring.h"
+#include "UString.h"
 
 namespace JSC {
 
index 9e14768..26bfb75 100644 (file)
 #include "config.h"
 #include "InitializeThreading.h"
 
-#include "collector.h"
+#include "Collector.h"
 #include "DateMath.h"
 #include "dtoa.h"
 #include "identifier.h"
 #include "JSGlobalObject.h"
-#include "ustring.h"
+#include "UString.h"
 #include <wtf/Threading.h>
 
 namespace JSC {
index 108dab6..8d8e30c 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "StructureID.h"
 #include "JSValue.h"
-#include "collector.h"
+#include "Collector.h"
 
 namespace JSC {
 
index 8910679..bd725f5 100644 (file)
@@ -38,9 +38,9 @@
 #include "JSStaticScopeObject.h"
 #include "Machine.h"
 #include "Parser.h"
-#include "collector.h"
+#include "Collector.h"
 #include "lexer.h"
-#include "lookup.h"
+#include "Lookup.h"
 #include "nodes.h"
 
 #if ENABLE(JSC_MULTIPLE_THREADS)
index 3210149..814ff9d 100644 (file)
@@ -32,7 +32,7 @@
 #include <wtf/Forward.h>
 #include <wtf/HashMap.h>
 #include <wtf/RefCounted.h>
-#include "collector.h"
+#include "Collector.h"
 #include "SmallStrings.h"
 
 struct OpaqueJSClass;
index ee7fb3b..708553a 100644 (file)
@@ -21,7 +21,7 @@
 #include "config.h"
 #include "JSLock.h"
 
-#include "collector.h"
+#include "Collector.h"
 #include "ExecState.h"
 
 #if ENABLE(JSC_MULTIPLE_THREADS)
index 5b3f3bd..0e33da6 100644 (file)
@@ -24,7 +24,7 @@
 #include "JSNumberCell.h"
 
 #include "NumberObject.h"
-#include "ustring.h"
+#include "UString.h"
 
 namespace JSC {
 
index e2f6990..89fdf1b 100644 (file)
@@ -26,8 +26,8 @@
 #include "ExecState.h"
 #include "JSCell.h"
 #include "JSImmediate.h"
-#include "collector.h"
-#include "ustring.h"
+#include "Collector.h"
+#include "UString.h"
 #include <stddef.h> // for size_t
 
 namespace JSC {
index 82c1c63..897cf38 100644 (file)
@@ -31,9 +31,9 @@
 #include "NativeErrorConstructor.h"
 #include "ObjectPrototype.h"
 #include "PropertyNameArray.h"
-#include "lookup.h"
+#include "Lookup.h"
 #include "nodes.h"
-#include "operations.h"
+#include "Operations.h"
 #include <math.h>
 #include <wtf/Assertions.h>
 
index 059a5e6..815a600 100644 (file)
@@ -26,7 +26,7 @@
 #include "CallData.h"
 #include "ConstructData.h"
 #include "JSImmediate.h"
-#include "ustring.h"
+#include "UString.h"
 #include <stddef.h> // for size_t
 
 // The magic number 0x4000 is not important here, it is being subtracted back out (avoiding using zero since this
similarity index 99%
rename from JavaScriptCore/kjs/lookup.cpp
rename to JavaScriptCore/runtime/Lookup.cpp
index 41ac725..b44b1e4 100644 (file)
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "lookup.h"
+#include "Lookup.h"
 
 #include "PrototypeFunction.h"
 
index 8b972d3..ee7b700 100644 (file)
@@ -22,7 +22,7 @@
 #include "MathObject.h"
 
 #include "ObjectPrototype.h"
-#include "operations.h"
+#include "Operations.h"
 #include <time.h>
 #include <wtf/Assertions.h>
 #include <wtf/MathExtras.h>
index 9403aa9..df311d5 100644 (file)
@@ -23,7 +23,7 @@
 
 #include "ErrorPrototype.h"
 #include "JSString.h"
-#include "ustring.h"
+#include "UString.h"
 
 namespace JSC {
 
index d203e3f..4f5b4f9 100644 (file)
@@ -26,7 +26,7 @@
 #include "JSString.h"
 #include "PrototypeFunction.h"
 #include "dtoa.h"
-#include "operations.h"
+#include "Operations.h"
 #include <wtf/Assertions.h>
 #include <wtf/MathExtras.h>
 #include <wtf/Vector.h>
similarity index 98%
rename from JavaScriptCore/kjs/operations.cpp
rename to JavaScriptCore/runtime/Operations.cpp
index f2d8deb..a857bf2 100644 (file)
@@ -20,7 +20,7 @@
  */
 
 #include "config.h"
-#include "operations.h"
+#include "Operations.h"
 
 #include "Error.h"
 #include "JSObject.h"
index 98b0727..0d6c521 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef PropertyMapHashTable_h
 #define PropertyMapHashTable_h
 
-#include "ustring.h"
+#include "UString.h"
 
 namespace JSC {
 
similarity index 99%
rename from JavaScriptCore/kjs/protect.h
rename to JavaScriptCore/runtime/Protect.h
index b317424..9a406bf 100644 (file)
@@ -23,7 +23,7 @@
 #define protect_h
 
 #include "JSCell.h"
-#include "collector.h"
+#include "Collector.h"
 
 namespace JSC {
 
similarity index 99%
rename from JavaScriptCore/kjs/regexp.cpp
rename to JavaScriptCore/runtime/RegExp.cpp
index 7397232..661a1c7 100644 (file)
@@ -19,7 +19,7 @@
  */
 
 #include "config.h"
-#include "regexp.h"
+#include "RegExp.h"
 
 #include "CTI.h"
 #include "lexer.h"
similarity index 99%
rename from JavaScriptCore/kjs/regexp.h
rename to JavaScriptCore/runtime/RegExp.h
index 1842d94..2abb805 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef KJS_REGEXP_H
 #define KJS_REGEXP_H
 
-#include "ustring.h"
+#include "UString.h"
 #include <wtf/Forward.h>
 #include <wtf/RefCounted.h>
 
index 4c4db39..6e3b90c 100644 (file)
@@ -29,7 +29,7 @@
 #include "RegExpMatchesArray.h"
 #include "RegExpObject.h"
 #include "RegExpPrototype.h"
-#include "regexp.h"
+#include "RegExp.h"
 
 namespace JSC {
 
index d80b47c..d5bf225 100644 (file)
@@ -22,7 +22,7 @@
 #define RegExpObject_h
 
 #include "JSObject.h"
-#include "regexp.h"
+#include "RegExp.h"
 
 namespace JSC {
 
index ceee32a..6514ad6 100644 (file)
@@ -29,7 +29,7 @@
 #include "ObjectPrototype.h"
 #include "PrototypeFunction.h"
 #include "RegExpObject.h"
-#include "regexp.h"
+#include "RegExp.h"
 
 namespace JSC {
 
index 7c71208..7e5f5c8 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef SmallStrings_h
 #define SmallStrings_h
 
-#include "ustring.h"
+#include "UString.h"
 #include <wtf/OwnPtr.h>
 
 namespace JSC {
index d703228..fad3852 100644 (file)
@@ -23,7 +23,7 @@
 
 #include "JSGlobalObject.h"
 #include "StringObject.h"
-#include "ustring.h"
+#include "UString.h"
 
 namespace JSC {
 
index 8333595..95da830 100644 (file)
@@ -30,7 +30,7 @@
 #include "PropertyNameArray.h"
 #include "StructureIDChain.h"
 #include "identifier.h"
-#include "lookup.h"
+#include "Lookup.h"
 #include <wtf/RefCountedLeakCounter.h>
 #include <wtf/RefPtr.h>
 
index 4f45dac..fcd2eee 100644 (file)
@@ -33,7 +33,7 @@
 #include "StructureIDTransitionTable.h"
 #include "TypeInfo.h"
 #include "identifier.h"
-#include "ustring.h"
+#include "UString.h"
 #include <wtf/HashFunctions.h>
 #include <wtf/HashTraits.h>
 #include <wtf/OwnArrayPtr.h>
index dd65971..1e757d8 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef StructureIDTransitionTable_h
 #define StructureIDTransitionTable_h
 
-#include "ustring.h"
+#include "UString.h"
 #include <wtf/HashFunctions.h>
 #include <wtf/HashMap.h>
 #include <wtf/HashTraits.h>
index d730d58..c00f95a 100644 (file)
@@ -30,7 +30,7 @@
 #define SymbolTable_h
 
 #include "JSObject.h"
-#include "ustring.h"
+#include "UString.h"
 #include <wtf/AlwaysInline.h>
 
 namespace JSC {
similarity index 99%
rename from JavaScriptCore/kjs/ustring.cpp
rename to JavaScriptCore/runtime/UString.cpp
index 3a85b1d..395933f 100644 (file)
  */
 
 #include "config.h"
-#include "ustring.h"
+#include "UString.h"
 
 #include "JSGlobalObjectFunctions.h"
-#include "collector.h"
+#include "Collector.h"
 #include "dtoa.h"
 #include "identifier.h"
-#include "operations.h"
+#include "Operations.h"
 #include <ctype.h>
 #include <float.h>
 #include <limits.h>
similarity index 99%
rename from JavaScriptCore/kjs/ustring.h
rename to JavaScriptCore/runtime/UString.h
index f47b134..b964849 100644 (file)
@@ -22,7 +22,7 @@
 #ifndef _KJS_USTRING_H_
 #define _KJS_USTRING_H_
 
-#include "collector.h"
+#include "Collector.h"
 #include <stdint.h>
 #include <string.h>
 #include <wtf/Assertions.h>
index 5accdae..6146a3d 100644 (file)
@@ -28,7 +28,7 @@
 
 #if ENABLE(WREC)
 
-#include "ustring.h"
+#include "UString.h"
 
 namespace JSC {
 
index 301bd3b..7cdd655 100644 (file)
@@ -28,7 +28,7 @@
 
 #if ENABLE(WREC)
 
-#include "ustring.h"
+#include "UString.h"
 #include <masm/X86Assembler.h>
 #include <wtf/ASCIICType.h>
 #include <wtf/Vector.h>
index a24be90..f11bd00 100644 (file)
@@ -1,3 +1,56 @@
+2008-11-05  Cameron Zwarich  <zwarich@apple.com>
+
+        Rubber-stamped by Sam Weinig.
+
+        Move more files to the runtime subdirectory of JavaScriptCore.
+
+        * ForwardingHeaders/kjs/collector.h: Removed.
+        * ForwardingHeaders/kjs/completion.h: Removed.
+        * ForwardingHeaders/kjs/identifier.h: Removed.
+        * ForwardingHeaders/kjs/interpreter.h: Removed.
+        * ForwardingHeaders/kjs/lookup.h: Removed.
+        * ForwardingHeaders/kjs/operations.h: Removed.
+        * ForwardingHeaders/kjs/protect.h: Removed.
+        * ForwardingHeaders/kjs/ustring.h: Removed.
+        * ForwardingHeaders/runtime/Collector.h: Copied from ForwardingHeaders/kjs/collector.h.
+        * ForwardingHeaders/runtime/Completion.h: Copied from ForwardingHeaders/kjs/completion.h.
+        * ForwardingHeaders/runtime/Identifier.h: Copied from ForwardingHeaders/kjs/identifier.h.
+        * ForwardingHeaders/runtime/Interpreter.h: Copied from ForwardingHeaders/kjs/interpreter.h.
+        * ForwardingHeaders/runtime/Lookup.h: Copied from ForwardingHeaders/kjs/lookup.h.
+        * ForwardingHeaders/runtime/Operations.h: Copied from ForwardingHeaders/kjs/operations.h.
+        * ForwardingHeaders/runtime/Protect.h: Copied from ForwardingHeaders/kjs/protect.h.
+        * ForwardingHeaders/runtime/UString.h: Copied from ForwardingHeaders/kjs/ustring.h.
+        * bindings/js/GCController.cpp:
+        * bindings/js/JSCustomPositionCallback.h:
+        * bindings/js/JSCustomPositionErrorCallback.h:
+        * bindings/js/JSCustomSQLStatementCallback.h:
+        * bindings/js/JSCustomSQLStatementErrorCallback.h:
+        * bindings/js/JSCustomSQLTransactionErrorCallback.h:
+        * bindings/js/JSCustomVoidCallback.h:
+        * bindings/js/JSDOMBinding.h:
+        * bindings/js/JSDOMWindowBase.h:
+        * bindings/js/JSEventListener.h:
+        * bindings/js/ScheduledAction.h:
+        * bindings/js/ScriptController.cpp:
+        * bindings/js/ScriptController.h:
+        * bindings/objc/WebScriptObject.mm:
+        * bindings/scripts/CodeGeneratorJS.pm:
+        * bridge/NP_jsobject.cpp:
+        * bridge/c/c_class.cpp:
+        * bridge/jni/jni_class.cpp:
+        * bridge/jni/jni_jsobject.mm:
+        * bridge/npruntime.cpp:
+        * bridge/runtime_root.h:
+        * history/CachedPage.h:
+        * html/CanvasRenderingContext2D.cpp:
+        * html/HTMLCanvasElement.cpp:
+        * inspector/InspectorController.cpp:
+        * inspector/JavaScriptCallFrame.cpp:
+        * page/Console.cpp:
+        * page/Page.cpp:
+        * platform/text/AtomicString.cpp:
+        * platform/text/PlatformString.h:
+
 2008-11-05  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Anders Carlsson.
diff --git a/WebCore/ForwardingHeaders/kjs/collector.h b/WebCore/ForwardingHeaders/kjs/collector.h
deleted file mode 100644 (file)
index faa8e1d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <JavaScriptCore/collector.h>
diff --git a/WebCore/ForwardingHeaders/kjs/completion.h b/WebCore/ForwardingHeaders/kjs/completion.h
deleted file mode 100644 (file)
index 329a0e5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <JavaScriptCore/completion.h>
diff --git a/WebCore/ForwardingHeaders/kjs/identifier.h b/WebCore/ForwardingHeaders/kjs/identifier.h
deleted file mode 100644 (file)
index 2471c99..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <JavaScriptCore/identifier.h>
diff --git a/WebCore/ForwardingHeaders/kjs/lookup.h b/WebCore/ForwardingHeaders/kjs/lookup.h
deleted file mode 100644 (file)
index 6e65272..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <JavaScriptCore/lookup.h>
diff --git a/WebCore/ForwardingHeaders/kjs/operations.h b/WebCore/ForwardingHeaders/kjs/operations.h
deleted file mode 100644 (file)
index eb80f49..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <JavaScriptCore/operations.h>
diff --git a/WebCore/ForwardingHeaders/kjs/protect.h b/WebCore/ForwardingHeaders/kjs/protect.h
deleted file mode 100644 (file)
index 836d0dd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <JavaScriptCore/protect.h>
diff --git a/WebCore/ForwardingHeaders/kjs/ustring.h b/WebCore/ForwardingHeaders/kjs/ustring.h
deleted file mode 100644 (file)
index 94418a9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <JavaScriptCore/ustring.h>
diff --git a/WebCore/ForwardingHeaders/runtime/Collector.h b/WebCore/ForwardingHeaders/runtime/Collector.h
new file mode 100644 (file)
index 0000000..6d8b5cd
--- /dev/null
@@ -0,0 +1 @@
+#include <JavaScriptCore/Collector.h>
diff --git a/WebCore/ForwardingHeaders/runtime/Completion.h b/WebCore/ForwardingHeaders/runtime/Completion.h
new file mode 100644 (file)
index 0000000..d6a081f
--- /dev/null
@@ -0,0 +1 @@
+#include <JavaScriptCore/Completion.h>
diff --git a/WebCore/ForwardingHeaders/runtime/Identifier.h b/WebCore/ForwardingHeaders/runtime/Identifier.h
new file mode 100644 (file)
index 0000000..5c925eb
--- /dev/null
@@ -0,0 +1 @@
+#include <JavaScriptCore/Identifier.h>
diff --git a/WebCore/ForwardingHeaders/runtime/Lookup.h b/WebCore/ForwardingHeaders/runtime/Lookup.h
new file mode 100644 (file)
index 0000000..0622dca
--- /dev/null
@@ -0,0 +1 @@
+#include <JavaScriptCore/Lookup.h>
diff --git a/WebCore/ForwardingHeaders/runtime/Operations.h b/WebCore/ForwardingHeaders/runtime/Operations.h
new file mode 100644 (file)
index 0000000..ab763a6
--- /dev/null
@@ -0,0 +1 @@
+#include <JavaScriptCore/Operations.h>
diff --git a/WebCore/ForwardingHeaders/runtime/Protect.h b/WebCore/ForwardingHeaders/runtime/Protect.h
new file mode 100644 (file)
index 0000000..0ba5798
--- /dev/null
@@ -0,0 +1 @@
+#include <JavaScriptCore/Protect.h>
diff --git a/WebCore/ForwardingHeaders/runtime/UString.h b/WebCore/ForwardingHeaders/runtime/UString.h
new file mode 100644 (file)
index 0000000..7a36767
--- /dev/null
@@ -0,0 +1 @@
+#include <JavaScriptCore/UString.h>
index fc8a778..7a3f20d 100644 (file)
@@ -29,7 +29,7 @@
 #include "JSDOMWindow.h"
 #include <runtime/JSGlobalData.h>
 #include <runtime/JSLock.h>
-#include <kjs/collector.h>
+#include <runtime/Collector.h>
 
 #if USE(PTHREADS)
 #include <pthread.h>
index 96e6177..6c0d306 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "PositionCallback.h"
 #include <runtime/JSObject.h>
-#include <kjs/protect.h>
+#include <runtime/Protect.h>
 #include <wtf/Forward.h>
 
 namespace JSC {
index 190e5a4..9f143a2 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "PositionErrorCallback.h"
 #include <runtime/JSObject.h>
-#include <kjs/protect.h>
+#include <runtime/Protect.h>
 #include <wtf/Forward.h>
 
 namespace JSC {
index d4fd6ec..3a3ae21 100644 (file)
@@ -32,7 +32,7 @@
 #include "SQLStatementCallback.h"
 
 #include <runtime/JSObject.h>
-#include <kjs/protect.h>
+#include <runtime/Protect.h>
 #include <wtf/Forward.h>
 
 namespace JSC {
index e235f23..2847114 100644 (file)
@@ -32,7 +32,7 @@
 #include "SQLStatementErrorCallback.h"
 
 #include <runtime/JSObject.h>
-#include <kjs/protect.h>
+#include <runtime/Protect.h>
 #include <wtf/Forward.h>
 
 namespace JSC {
index bfbb1e2..122224f 100644 (file)
@@ -32,7 +32,7 @@
 #include "SQLTransactionErrorCallback.h"
 
 #include <runtime/JSObject.h>
-#include <kjs/protect.h>
+#include <runtime/Protect.h>
 #include <wtf/Forward.h>
 
 namespace JSC {
index 9931631..5a35488 100644 (file)
@@ -32,7 +32,7 @@
 #include "VoidCallback.h"
 
 #include <runtime/JSObject.h>
-#include <kjs/protect.h>
+#include <runtime/Protect.h>
 #include <wtf/Forward.h>
 
 namespace WebCore {
index e8040f2..9d25de4 100644 (file)
@@ -22,8 +22,8 @@
 #define JSDOMBinding_h
 
 #include "JSDOMGlobalObject.h"
-#include <kjs/interpreter.h>
-#include <kjs/lookup.h>
+#include <runtime/Interpreter.h>
+#include <runtime/Lookup.h>
 #include <runtime/JSFunction.h>
 #include <wtf/Noncopyable.h>
 
index f345f47..62ecdb5 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "PlatformString.h"
 #include "JSDOMBinding.h"
-#include <kjs/protect.h>
+#include <runtime/Protect.h>
 #include <wtf/HashMap.h>
 #include <wtf/OwnPtr.h>
 
index 3c9edd0..859d5d4 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "EventListener.h"
 #include "PlatformString.h"
-#include <kjs/protect.h>
+#include <runtime/Protect.h>
 
 namespace WebCore {
 
index 938ac7b..78af962 100644 (file)
@@ -21,7 +21,7 @@
 #define ScheduledAction_h
 
 #include "PlatformString.h"
-#include <kjs/protect.h>
+#include <runtime/Protect.h>
 #include <wtf/Vector.h>
 
 namespace WebCore {
index e9291d5..37d08f9 100644 (file)
@@ -41,7 +41,7 @@
 #include "Settings.h"
 #include "StringSourceProvider.h"
 
-#include <kjs/completion.h>
+#include <runtime/Completion.h>
 #include <debugger/Debugger.h>
 #include <runtime/JSLock.h>
 
index 047957c..ab7af91 100644 (file)
@@ -23,7 +23,7 @@
 #define ScriptController_h
 
 #include "JSDOMWindowShell.h"
-#include <kjs/protect.h>
+#include <runtime/Protect.h>
 #include <wtf/RefPtr.h>
 
 #if PLATFORM(MAC)
index 6262b97..d4b11f5 100644 (file)
@@ -43,8 +43,8 @@
 #import <runtime/ExecState.h>
 #import <runtime/JSGlobalObject.h>
 #import <runtime/JSLock.h>
-#import <kjs/completion.h>
-#import <kjs/interpreter.h>
+#import <runtime/Completion.h>
+#import <runtime/Interpreter.h>
 
 #ifdef BUILDING_ON_TIGER
 typedef unsigned NSUInteger;
index a095fc7..16f5457 100644 (file)
@@ -395,7 +395,7 @@ sub GenerateHeader
     }
 
     if ($dataNode->extendedAttributes->{"InlineGetOwnPropertySlot"}) {
-        push(@headerContentHeader, "#include <kjs/lookup.h>\n");
+        push(@headerContentHeader, "#include <runtime/Lookup.h>\n");
         push(@headerContentHeader, "#include <wtf/AlwaysInline.h>\n");
     }
 
index 6fb6373..7dfc210 100644 (file)
@@ -40,8 +40,8 @@
 #include <runtime/JSLock.h>
 #include <runtime/PropertyNameArray.h>
 #include <kjs/SourceCode.h>
-#include <kjs/completion.h>
-#include <kjs/interpreter.h>
+#include <runtime/Completion.h>
+#include <runtime/Interpreter.h>
 
 using WebCore::String;
 using WebCore::StringSourceProvider;
index 1b72476..f81feda 100644 (file)
@@ -32,7 +32,7 @@
 #include "c_instance.h"
 #include "c_runtime.h"
 #include "npruntime_impl.h"
-#include <kjs/identifier.h>
+#include <runtime/Identifier.h>
 #include <runtime/JSLock.h>
 
 namespace JSC { namespace Bindings {
index 4140524..069089c 100644 (file)
@@ -29,7 +29,7 @@
 #if ENABLE(MAC_JAVA_BRIDGE)
 
 #include "JSDOMWindow.h"
-#include <kjs/identifier.h>
+#include <runtime/Identifier.h>
 #include <runtime/JSLock.h>
 #include "jni_utility.h"
 #include "jni_runtime.h"
index 042d1ed..84c2335 100644 (file)
@@ -38,8 +38,8 @@
 #include <runtime/ExecState.h>
 #include <runtime/JSGlobalObject.h>
 #include <runtime/JSLock.h>
-#include <kjs/completion.h>
-#include <kjs/interpreter.h>
+#include <runtime/Completion.h>
+#include <runtime/Interpreter.h>
 #include <wtf/Assertions.h>
 #include <kjs/SourceProvider.h>
 
index bef3676..789114e 100644 (file)
@@ -32,7 +32,7 @@
 #include "npruntime_priv.h"
 
 #include "c_utility.h"
-#include <kjs/identifier.h>
+#include <runtime/Identifier.h>
 #include <runtime/JSLock.h>
 #include <wtf/Assertions.h>
 #include <wtf/HashMap.h>
index a86096d..0d6fdbd 100644 (file)
@@ -29,7 +29,7 @@
 #if PLATFORM(MAC)
 #include "jni_jsobject.h"
 #endif
-#include <kjs/protect.h>
+#include <runtime/Protect.h>
 
 #include <wtf/HashSet.h>
 #include <wtf/Noncopyable.h>
index 842cb03..a1ca625 100644 (file)
@@ -29,7 +29,7 @@
 #include "KURL.h"
 #include <wtf/OwnPtr.h>
 #include "PausedTimeouts.h"
-#include <kjs/protect.h>
+#include <runtime/Protect.h>
 
 namespace WebCore {
     
index 43fc7e0..50c31a1 100644 (file)
@@ -55,7 +55,7 @@
 #include "SecurityOrigin.h"
 #include "Settings.h"
 #include "TextMetrics.h"
-#include <kjs/interpreter.h>
+#include <runtime/Interpreter.h>
 #include <stdio.h>
 #include <wtf/MathExtras.h>
 
index f3ca1fd..fce4d1c 100644 (file)
@@ -42,7 +42,7 @@
 #include "Page.h"
 #include "RenderHTMLCanvas.h"
 #include "Settings.h"
-#include <kjs/interpreter.h>
+#include <runtime/Interpreter.h>
 #include <math.h>
 #include <stdio.h>
 
index 8476b98..109464a 100644 (file)
@@ -69,7 +69,7 @@
 #include <JavaScriptCore/JSStringRef.h>
 #include <JavaScriptCore/OpaqueJSString.h>
 #include <runtime/JSLock.h>
-#include <kjs/ustring.h>
+#include <runtime/UString.h>
 #include <runtime/CollectorHeapIterator.h>
 #include <profiler/Profile.h>
 #include <profiler/Profiler.h>
index e87880b..2076921 100644 (file)
@@ -29,7 +29,7 @@
 #include "PlatformString.h"
 #include <debugger/DebuggerCallFrame.h>
 #include <runtime/JSGlobalObject.h>
-#include <kjs/interpreter.h>
+#include <runtime/Interpreter.h>
 #include <runtime/JSLock.h>
 #include <runtime/JSObject.h>
 #include <runtime/JSValue.h>
index bfcc478..62448d9 100644 (file)
@@ -40,7 +40,7 @@
 #include "PageGroup.h"
 #include "PlatformString.h"
 #include <runtime/ArgList.h>
-#include <kjs/interpreter.h>
+#include <runtime/Interpreter.h>
 #include <runtime/JSObject.h>
 #include <VM/Machine.h>
 #include <profiler/Profiler.h>
index 3c573d6..1a9bade 100644 (file)
@@ -50,7 +50,7 @@
 #include "TextResourceDecoder.h"
 #include "Widget.h"
 #include "ScriptController.h"
-#include <kjs/collector.h>
+#include <runtime/Collector.h>
 #include <runtime/JSLock.h>
 #include <wtf/HashMap.h>
 #include <wtf/RefCountedLeakCounter.h>
index dc573e1..7d14c59 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "StaticConstructors.h"
 #include "StringHash.h"
-#include <kjs/identifier.h>
+#include <runtime/Identifier.h>
 #include <wtf/Threading.h>
 #include <wtf/HashSet.h>
 
index 73a44bd..2786ded 100644 (file)
@@ -30,9 +30,9 @@
 #include <wtf/PassRefPtr.h>
 
 #if USE(JSC)
-#include <kjs/identifier.h>
+#include <runtime/Identifier.h>
 #else
-// kjs/identifier.h includes HashMap.h. We explicitly include it in the case of
+// runtime/Identifier.h includes HashMap.h. We explicitly include it in the case of
 // non-JSC builds to keep things consistent.
 #include <wtf/HashMap.h>
 #endif
index 93ddeb7..954c00d 100644 (file)
@@ -1,3 +1,19 @@
+2008-11-05  Cameron Zwarich  <zwarich@apple.com>
+
+        Rubber-stamped by Sam Weinig.
+
+        Correct forwarding headers for files moved to the runtime subdirectory
+        of JavaScriptCore and remove unused forwarding headers.
+
+        * ForwardingHeaders/kjs/collector.h: Removed.
+        * ForwardingHeaders/kjs/identifier.h: Removed.
+        * ForwardingHeaders/kjs/interpreter.h: Removed.
+        * ForwardingHeaders/kjs/lookup.h: Removed.
+        * ForwardingHeaders/kjs/operations.h: Removed.
+        * ForwardingHeaders/kjs/protect.h: Removed.
+        * ForwardingHeaders/runtime/Interpreter.h: Copied from ForwardingHeaders/kjs/interpreter.h.
+        * WebView/WebScriptDebugDelegate.mm:
+
 2008-11-05  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Kevin Decker.
diff --git a/WebKit/mac/ForwardingHeaders/kjs/collector.h b/WebKit/mac/ForwardingHeaders/kjs/collector.h
deleted file mode 100644 (file)
index b8ef5a1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#import <JavaScriptCore/collector.h>
diff --git a/WebKit/mac/ForwardingHeaders/kjs/identifier.h b/WebKit/mac/ForwardingHeaders/kjs/identifier.h
deleted file mode 100644 (file)
index 2471c99..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <JavaScriptCore/identifier.h>
diff --git a/WebKit/mac/ForwardingHeaders/kjs/interpreter.h b/WebKit/mac/ForwardingHeaders/kjs/interpreter.h
deleted file mode 100644 (file)
index 08c2be3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#import <JavaScriptCore/interpreter.h>
diff --git a/WebKit/mac/ForwardingHeaders/kjs/lookup.h b/WebKit/mac/ForwardingHeaders/kjs/lookup.h
deleted file mode 100644 (file)
index 5e2ffa0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#import <JavaScriptCore/lookup.h>
diff --git a/WebKit/mac/ForwardingHeaders/kjs/operations.h b/WebKit/mac/ForwardingHeaders/kjs/operations.h
deleted file mode 100644 (file)
index eb80f49..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <JavaScriptCore/operations.h>
diff --git a/WebKit/mac/ForwardingHeaders/kjs/protect.h b/WebKit/mac/ForwardingHeaders/kjs/protect.h
deleted file mode 100644 (file)
index e4e0499..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#import <JavaScriptCore/protect.h>
diff --git a/WebKit/mac/ForwardingHeaders/runtime/Interpreter.h b/WebKit/mac/ForwardingHeaders/runtime/Interpreter.h
new file mode 100644 (file)
index 0000000..da343a1
--- /dev/null
@@ -0,0 +1 @@
+#import <JavaScriptCore/Interpreter.h>
index be0a0d5..79ac14f 100644 (file)
@@ -37,7 +37,7 @@
 #import <runtime/JSGlobalObject.h>
 #import <runtime/JSFunction.h>
 #import <runtime/JSLock.h>
-#import <kjs/interpreter.h>
+#import <runtime/Interpreter.h>
 #import <WebCore/Frame.h>
 #import <WebCore/WebScriptObjectPrivate.h>
 #import <WebCore/ScriptController.h>
index beb9f8a..1f497c1 100644 (file)
@@ -1,3 +1,12 @@
+2008-11-05  Cameron Zwarich  <zwarich@apple.com>
+
+        Rubber-stamped by Sam Weinig.
+
+        Move more files to the runtime subdirectory of JavaScriptCore.
+
+        * WebFrame.cpp:
+        * WebView.cpp:
+
 2008-10-31  Kevin Ollivier  <kevino@theolliviers.com>
 
         wxMSW build fix. Missing header.
index b1f03e0..a1b3045 100644 (file)
@@ -44,7 +44,7 @@
 #include "ScriptController.h"
 #include "JSDOMBinding.h"
 #include <runtime/JSValue.h>
-#include <kjs/ustring.h>
+#include <runtime/UString.h>
 
 #include "wx/wxprec.h"
 #ifndef WX_PRECOMP
index fb2164f..101ba71 100644 (file)
@@ -57,7 +57,7 @@
 #include "ScriptController.h"
 #include "JSDOMBinding.h"
 #include <runtime/JSValue.h>
-#include <kjs/ustring.h>
+#include <runtime/UString.h>
 
 #include "wx/wxprec.h"
 #ifndef WX_PRECOMP