2008-11-05 Cameron Zwarich <zwarich@apple.com>
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: http://svn.webkit.org/repository/webkit/trunk@38137 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/API/APICast.h b/JavaScriptCore/API/APICast.h
index ecd524c..fd8110c 100644
--- a/JavaScriptCore/API/APICast.h
+++ b/JavaScriptCore/API/APICast.h
@@ -26,7 +26,7 @@
#ifndef APICast_h
#define APICast_h
-#include "ustring.h"
+#include "UString.h"
#include "ExecState.h"
typedef const struct OpaqueJSContextGroup* JSContextGroupRef;
diff --git a/JavaScriptCore/API/JSBase.cpp b/JavaScriptCore/API/JSBase.cpp
index bd2935c..851a224 100644
--- a/JavaScriptCore/API/JSBase.cpp
+++ b/JavaScriptCore/API/JSBase.cpp
@@ -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>
diff --git a/JavaScriptCore/API/JSCallbackObject.cpp b/JavaScriptCore/API/JSCallbackObject.cpp
index 4be35bd..2fde0f8 100644
--- a/JavaScriptCore/API/JSCallbackObject.cpp
+++ b/JavaScriptCore/API/JSCallbackObject.cpp
@@ -27,7 +27,7 @@
#include "config.h"
#include "JSCallbackObject.h"
-#include "collector.h"
+#include "Collector.h"
namespace JSC {
diff --git a/JavaScriptCore/API/JSClassRef.cpp b/JavaScriptCore/API/JSClassRef.cpp
index 88fd70d..77a33f0 100644
--- a/JavaScriptCore/API/JSClassRef.cpp
+++ b/JavaScriptCore/API/JSClassRef.cpp
@@ -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;
diff --git a/JavaScriptCore/API/JSClassRef.h b/JavaScriptCore/API/JSClassRef.h
index 71fae18..4f67618 100644
--- a/JavaScriptCore/API/JSClassRef.h
+++ b/JavaScriptCore/API/JSClassRef.h
@@ -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>
diff --git a/JavaScriptCore/API/JSStringRefCF.cpp b/JavaScriptCore/API/JSStringRefCF.cpp
index 3a37866..65edd09 100644
--- a/JavaScriptCore/API/JSStringRefCF.cpp
+++ b/JavaScriptCore/API/JSStringRefCF.cpp
@@ -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>
diff --git a/JavaScriptCore/API/JSValueRef.cpp b/JavaScriptCore/API/JSValueRef.cpp
index 15dd633..3d45b5d 100644
--- a/JavaScriptCore/API/JSValueRef.cpp
+++ b/JavaScriptCore/API/JSValueRef.cpp
@@ -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>
diff --git a/JavaScriptCore/API/OpaqueJSString.cpp b/JavaScriptCore/API/OpaqueJSString.cpp
index 0819141..e3275b6 100644
--- a/JavaScriptCore/API/OpaqueJSString.cpp
+++ b/JavaScriptCore/API/OpaqueJSString.cpp
@@ -28,7 +28,7 @@
#include <runtime/ExecState.h>
#include <runtime/JSGlobalObject.h>
-#include <kjs/identifier.h>
+#include <runtime/Identifier.h>
using namespace JSC;
diff --git a/JavaScriptCore/API/OpaqueJSString.h b/JavaScriptCore/API/OpaqueJSString.h
index da05b06..473c815 100644
--- a/JavaScriptCore/API/OpaqueJSString.h
+++ b/JavaScriptCore/API/OpaqueJSString.h
@@ -26,7 +26,7 @@
#ifndef OpaqueJSString_h
#define OpaqueJSString_h
-#include <kjs/ustring.h>
+#include <runtime/UString.h>
namespace JSC {
class Identifier;
diff --git a/JavaScriptCore/AllInOneFile.cpp b/JavaScriptCore/AllInOneFile.cpp
index 6423f99..be2113a 100644
--- a/JavaScriptCore/AllInOneFile.cpp
+++ b/JavaScriptCore/AllInOneFile.cpp
@@ -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"
@@ -57,18 +57,18 @@
#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"
@@ -82,11 +82,11 @@
#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"
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 081aae1..0acef5a 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -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.
diff --git a/JavaScriptCore/GNUmakefile.am b/JavaScriptCore/GNUmakefile.am
index 95e59a9..3b39c54 100644
--- a/JavaScriptCore/GNUmakefile.am
+++ b/JavaScriptCore/GNUmakefile.am
@@ -140,21 +140,21 @@
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/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 \
diff --git a/JavaScriptCore/JavaScriptCore.pri b/JavaScriptCore/JavaScriptCore.pri
index be59dcd..e00a7a0 100644
--- a/JavaScriptCore/JavaScriptCore.pri
+++ b/JavaScriptCore/JavaScriptCore.pri
@@ -74,7 +74,7 @@
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 @@
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 @@
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 @@
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 @@
runtime/StringPrototype.cpp \
runtime/StructureID.cpp \
runtime/StructureIDChain.cpp \
- kjs/ustring.cpp \
+ runtime/UString.cpp \
profiler/HeavyProfile.cpp \
profiler/Profile.cpp \
profiler/ProfileGenerator.cpp \
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
index 306b5fa..0fbaf00 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
@@ -337,11 +337,11 @@
>
</File>
<File
- RelativePath="..\..\kjs\collector.cpp"
+ RelativePath="..\..\runtime\Collector.cpp"
>
</File>
<File
- RelativePath="..\..\kjs\collector.h"
+ RelativePath="..\..\runtime\Collector.h"
>
</File>
<File
@@ -357,7 +357,7 @@
>
</File>
<File
- RelativePath="..\..\kjs\completion.h"
+ RelativePath="..\..\runtime\Completion.h"
>
</File>
<File
@@ -477,11 +477,11 @@
>
</File>
<File
- RelativePath="..\..\kjs\identifier.cpp"
+ RelativePath="..\..\runtime\Identifier.cpp"
>
</File>
<File
- RelativePath="..\..\kjs\identifier.h"
+ RelativePath="..\..\runtime\Identifier.h"
>
</File>
<File
@@ -501,11 +501,11 @@
>
</File>
<File
- RelativePath="..\..\kjs\interpreter.cpp"
+ RelativePath="..\..\runtime\Interpreter.cpp"
>
</File>
<File
- RelativePath="..\..\kjs\interpreter.h"
+ RelativePath="..\..\runtime\Interpreter.h"
>
</File>
<File
@@ -653,11 +653,11 @@
>
</File>
<File
- RelativePath="..\..\kjs\lookup.cpp"
+ RelativePath="..\..\runtime\Lookup.cpp"
>
</File>
<File
- RelativePath="..\..\kjs\lookup.h"
+ RelativePath="..\..\runtime\Lookup.h"
>
</File>
<File
@@ -729,11 +729,11 @@
>
</File>
<File
- RelativePath="..\..\kjs\operations.cpp"
+ RelativePath="..\..\runtime\Operations.cpp"
>
</File>
<File
- RelativePath="..\..\kjs\operations.h"
+ RelativePath="..\..\runtime\Operations.h"
>
</File>
<File
@@ -757,7 +757,7 @@
>
</File>
<File
- RelativePath="..\..\kjs\protect.h"
+ RelativePath="..\..\runtime\Protect.h"
>
</File>
<File
@@ -769,11 +769,11 @@
>
</File>
<File
- RelativePath="..\..\kjs\regexp.cpp"
+ RelativePath="..\..\runtime\RegExp.cpp"
>
</File>
<File
- RelativePath="..\..\kjs\regexp.h"
+ RelativePath="..\..\runtime\RegExp.h"
>
</File>
<File
@@ -881,11 +881,11 @@
>
</File>
<File
- RelativePath="..\..\kjs\ustring.cpp"
+ RelativePath="..\..\runtime\UString.cpp"
>
</File>
<File
- RelativePath="..\..\kjs\ustring.h"
+ RelativePath="..\..\runtime\UString.h"
>
</File>
<Filter
diff --git a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
index 008e8ce..950fc36 100644
--- a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -147,9 +147,9 @@
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 */; };
@@ -172,10 +172,10 @@
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 */; };
@@ -209,7 +209,7 @@
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 */; };
@@ -225,7 +225,7 @@
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, ); }; };
@@ -238,11 +238,11 @@
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, ); }; };
@@ -268,7 +268,7 @@
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, ); }; };
@@ -498,7 +498,7 @@
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>"; };
@@ -550,8 +550,8 @@
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>"; };
@@ -707,15 +707,15 @@
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; };
@@ -724,26 +724,26 @@
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 */
@@ -1083,29 +1083,12 @@
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>";
@@ -1150,9 +1133,12 @@
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 */,
@@ -1181,10 +1167,14 @@
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 */,
@@ -1222,6 +1212,8 @@
14F252560D08DD8D004ECFFF /* JSVariableObject.h */,
65C7A1710A8EAACB00FA37EA /* JSWrapperObject.cpp */,
65C7A1720A8EAACB00FA37EA /* JSWrapperObject.h */,
+ F692A8680255597D01FF60F7 /* Lookup.cpp */,
+ F692A8690255597D01FF60F7 /* Lookup.h */,
F692A86A0255597D01FF60F7 /* MathObject.cpp */,
F692A86B0255597D01FF60F7 /* MathObject.h */,
BC02E9080E1839DB000F9297 /* NativeErrorConstructor.cpp */,
@@ -1238,14 +1230,19 @@
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 */,
@@ -1273,6 +1270,9 @@
14A396A60CD2933100B5B4FF /* SymbolTable.h */,
5D53726D0E1C546B0021E549 /* Tracing.d */,
5D53726E0E1C54880021E549 /* Tracing.h */,
+ 6507D2970E871E4A00D7D896 /* TypeInfo.h */,
+ F692A8850255597D01FF60F7 /* UString.cpp */,
+ F692A8860255597D01FF60F7 /* UString.h */,
);
path = runtime;
sourceTree = "<group>";
@@ -1383,9 +1383,9 @@
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 */,
@@ -1409,10 +1409,10 @@
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 */,
@@ -1446,7 +1446,7 @@
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 */,
@@ -1462,7 +1462,7 @@
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 */,
@@ -1475,12 +1475,12 @@
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 */,
@@ -1507,7 +1507,7 @@
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 */,
diff --git a/JavaScriptCore/JavaScriptCoreSources.bkl b/JavaScriptCore/JavaScriptCoreSources.bkl
index 4c692e1..bf52dc9 100644
--- a/JavaScriptCore/JavaScriptCoreSources.bkl
+++ b/JavaScriptCore/JavaScriptCoreSources.bkl
@@ -47,15 +47,10 @@
</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 @@
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 @@
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 @@
runtime/JSValue.cpp
runtime/JSVariableObject.cpp
runtime/JSWrapperObject.cpp
+ runtime/Lookup.cpp
runtime/MathObject.cpp
runtime/NativeErrorConstructor.cpp
runtime/NativeErrorPrototype.cpp
diff --git a/JavaScriptCore/VM/CodeBlock.h b/JavaScriptCore/VM/CodeBlock.h
index d745164..9b6301e 100644
--- a/JavaScriptCore/VM/CodeBlock.h
+++ b/JavaScriptCore/VM/CodeBlock.h
@@ -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>
diff --git a/JavaScriptCore/VM/CodeGenerator.cpp b/JavaScriptCore/VM/CodeGenerator.cpp
index 04fcc3a..23a00f5 100644
--- a/JavaScriptCore/VM/CodeGenerator.cpp
+++ b/JavaScriptCore/VM/CodeGenerator.cpp
@@ -33,7 +33,7 @@
#include "BatchedTransitionOptimizer.h"
#include "JSFunction.h"
#include "Machine.h"
-#include "ustring.h"
+#include "UString.h"
using namespace std;
diff --git a/JavaScriptCore/VM/Machine.cpp b/JavaScriptCore/VM/Machine.cpp
index a605d25..b6852af 100644
--- a/JavaScriptCore/VM/Machine.cpp
+++ b/JavaScriptCore/VM/Machine.cpp
@@ -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>
diff --git a/JavaScriptCore/VM/RegisterFile.h b/JavaScriptCore/VM/RegisterFile.h
index 0955ccb..2036cbf 100644
--- a/JavaScriptCore/VM/RegisterFile.h
+++ b/JavaScriptCore/VM/RegisterFile.h
@@ -30,7 +30,7 @@
#define RegisterFile_h
#include "Register.h"
-#include "collector.h"
+#include "Collector.h"
#if HAVE(MMAP)
#include <sys/mman.h>
#endif
diff --git a/JavaScriptCore/debugger/Debugger.h b/JavaScriptCore/debugger/Debugger.h
index 4a6a9b3..6af116f 100644
--- a/JavaScriptCore/debugger/Debugger.h
+++ b/JavaScriptCore/debugger/Debugger.h
@@ -22,7 +22,7 @@
#ifndef Debugger_h
#define Debugger_h
-#include "protect.h"
+#include "Protect.h"
namespace JSC {
diff --git a/JavaScriptCore/kjs/SourceProvider.h b/JavaScriptCore/kjs/SourceProvider.h
index 755a10f..07da9e0 100644
--- a/JavaScriptCore/kjs/SourceProvider.h
+++ b/JavaScriptCore/kjs/SourceProvider.h
@@ -29,7 +29,7 @@
#ifndef SourceProvider_h
#define SourceProvider_h
-#include "ustring.h"
+#include "UString.h"
#include <wtf/RefCounted.h>
namespace JSC {
diff --git a/JavaScriptCore/kjs/create_hash_table b/JavaScriptCore/kjs/create_hash_table
index 829a024..adcbbf7 100755
--- a/JavaScriptCore/kjs/create_hash_table
+++ b/JavaScriptCore/kjs/create_hash_table
@@ -30,7 +30,7 @@
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
diff --git a/JavaScriptCore/kjs/lexer.cpp b/JavaScriptCore/kjs/lexer.cpp
index 7313b12..039f621 100644
--- a/JavaScriptCore/kjs/lexer.cpp
+++ b/JavaScriptCore/kjs/lexer.cpp
@@ -44,7 +44,7 @@
#include "grammar.h"
#endif
-#include "lookup.h"
+#include "Lookup.h"
#include "lexer.lut.h"
// a bridge for yacc from the C world to C++
diff --git a/JavaScriptCore/kjs/lexer.h b/JavaScriptCore/kjs/lexer.h
index 16bc4b6..3943160 100644
--- a/JavaScriptCore/kjs/lexer.h
+++ b/JavaScriptCore/kjs/lexer.h
@@ -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"
diff --git a/JavaScriptCore/kjs/nodes.cpp b/JavaScriptCore/kjs/nodes.cpp
index b4aeb28..0761eb2 100644
--- a/JavaScriptCore/kjs/nodes.cpp
+++ b/JavaScriptCore/kjs/nodes.cpp
@@ -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>
diff --git a/JavaScriptCore/kjs/nodes.h b/JavaScriptCore/kjs/nodes.h
index a70d350..1a87244 100644
--- a/JavaScriptCore/kjs/nodes.h
+++ b/JavaScriptCore/kjs/nodes.h
@@ -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>
diff --git a/JavaScriptCore/pcre/pcre_exec.cpp b/JavaScriptCore/pcre/pcre_exec.cpp
index 36d81e2..41f50c9 100644
--- a/JavaScriptCore/pcre/pcre_exec.cpp
+++ b/JavaScriptCore/pcre/pcre_exec.cpp
@@ -51,7 +51,7 @@
#if REGEXP_HISTOGRAM
#include <kjs/DateMath.h>
-#include <kjs/ustring.h>
+#include <runtime/UString.h>
#endif
using namespace WTF;
diff --git a/JavaScriptCore/profiler/CallIdentifier.h b/JavaScriptCore/profiler/CallIdentifier.h
index c24c44b..6ceef13 100644
--- a/JavaScriptCore/profiler/CallIdentifier.h
+++ b/JavaScriptCore/profiler/CallIdentifier.h
@@ -27,7 +27,7 @@
#ifndef CallIdentifier_h
#define CallIdentifier_h
-#include <kjs/ustring.h>
+#include <runtime/UString.h>
namespace JSC {
diff --git a/JavaScriptCore/profiler/Profile.h b/JavaScriptCore/profiler/Profile.h
index c232c55..dd96f77 100644
--- a/JavaScriptCore/profiler/Profile.h
+++ b/JavaScriptCore/profiler/Profile.h
@@ -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>
diff --git a/JavaScriptCore/runtime/ArrayConstructor.cpp b/JavaScriptCore/runtime/ArrayConstructor.cpp
index 5784af0..a9949ba 100644
--- a/JavaScriptCore/runtime/ArrayConstructor.cpp
+++ b/JavaScriptCore/runtime/ArrayConstructor.cpp
@@ -26,7 +26,7 @@
#include "ArrayPrototype.h"
#include "JSArray.h"
-#include "lookup.h"
+#include "Lookup.h"
namespace JSC {
diff --git a/JavaScriptCore/runtime/ArrayPrototype.cpp b/JavaScriptCore/runtime/ArrayPrototype.cpp
index 5280784..ecf9c19 100644
--- a/JavaScriptCore/runtime/ArrayPrototype.cpp
+++ b/JavaScriptCore/runtime/ArrayPrototype.cpp
@@ -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>
diff --git a/JavaScriptCore/runtime/ArrayPrototype.h b/JavaScriptCore/runtime/ArrayPrototype.h
index 33ce30b..95f69c7 100644
--- a/JavaScriptCore/runtime/ArrayPrototype.h
+++ b/JavaScriptCore/runtime/ArrayPrototype.h
@@ -22,7 +22,7 @@
#define ArrayPrototype_h
#include "JSArray.h"
-#include "lookup.h"
+#include "Lookup.h"
namespace JSC {
diff --git a/JavaScriptCore/kjs/collector.cpp b/JavaScriptCore/runtime/Collector.cpp
similarity index 99%
rename from JavaScriptCore/kjs/collector.cpp
rename to JavaScriptCore/runtime/Collector.cpp
index 091c889..67273cf 100644
--- a/JavaScriptCore/kjs/collector.cpp
+++ b/JavaScriptCore/runtime/Collector.cpp
@@ -19,7 +19,7 @@
*/
#include "config.h"
-#include "collector.h"
+#include "Collector.h"
#include "ArgList.h"
#include "CollectorHeapIterator.h"
diff --git a/JavaScriptCore/kjs/collector.h b/JavaScriptCore/runtime/Collector.h
similarity index 100%
rename from JavaScriptCore/kjs/collector.h
rename to JavaScriptCore/runtime/Collector.h
diff --git a/JavaScriptCore/runtime/CollectorHeapIterator.h b/JavaScriptCore/runtime/CollectorHeapIterator.h
index c5e1d78..c4b9dfc 100644
--- a/JavaScriptCore/runtime/CollectorHeapIterator.h
+++ b/JavaScriptCore/runtime/CollectorHeapIterator.h
@@ -24,7 +24,7 @@
*/
#include "config.h"
-#include "collector.h"
+#include "Collector.h"
namespace JSC {
diff --git a/JavaScriptCore/kjs/completion.h b/JavaScriptCore/runtime/Completion.h
similarity index 100%
rename from JavaScriptCore/kjs/completion.h
rename to JavaScriptCore/runtime/Completion.h
diff --git a/JavaScriptCore/runtime/ErrorPrototype.cpp b/JavaScriptCore/runtime/ErrorPrototype.cpp
index 69255c1..993f179 100644
--- a/JavaScriptCore/runtime/ErrorPrototype.cpp
+++ b/JavaScriptCore/runtime/ErrorPrototype.cpp
@@ -24,7 +24,7 @@
#include "JSString.h"
#include "ObjectPrototype.h"
#include "PrototypeFunction.h"
-#include "ustring.h"
+#include "UString.h"
namespace JSC {
diff --git a/JavaScriptCore/kjs/identifier.cpp b/JavaScriptCore/runtime/Identifier.cpp
similarity index 100%
rename from JavaScriptCore/kjs/identifier.cpp
rename to JavaScriptCore/runtime/Identifier.cpp
diff --git a/JavaScriptCore/kjs/identifier.h b/JavaScriptCore/runtime/Identifier.h
similarity index 99%
rename from JavaScriptCore/kjs/identifier.h
rename to JavaScriptCore/runtime/Identifier.h
index a79dd92..9088d53 100644
--- a/JavaScriptCore/kjs/identifier.h
+++ b/JavaScriptCore/runtime/Identifier.h
@@ -22,7 +22,7 @@
#define KJS_IDENTIFIER_H
#include "JSGlobalData.h"
-#include "ustring.h"
+#include "UString.h"
namespace JSC {
diff --git a/JavaScriptCore/runtime/InitializeThreading.cpp b/JavaScriptCore/runtime/InitializeThreading.cpp
index 9e14768..26bfb75 100644
--- a/JavaScriptCore/runtime/InitializeThreading.cpp
+++ b/JavaScriptCore/runtime/InitializeThreading.cpp
@@ -29,12 +29,12 @@
#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 {
diff --git a/JavaScriptCore/kjs/interpreter.cpp b/JavaScriptCore/runtime/Interpreter.cpp
similarity index 100%
rename from JavaScriptCore/kjs/interpreter.cpp
rename to JavaScriptCore/runtime/Interpreter.cpp
diff --git a/JavaScriptCore/kjs/interpreter.h b/JavaScriptCore/runtime/Interpreter.h
similarity index 100%
rename from JavaScriptCore/kjs/interpreter.h
rename to JavaScriptCore/runtime/Interpreter.h
diff --git a/JavaScriptCore/runtime/JSCell.h b/JavaScriptCore/runtime/JSCell.h
index 108dab6..8d8e30c 100644
--- a/JavaScriptCore/runtime/JSCell.h
+++ b/JavaScriptCore/runtime/JSCell.h
@@ -25,7 +25,7 @@
#include "StructureID.h"
#include "JSValue.h"
-#include "collector.h"
+#include "Collector.h"
namespace JSC {
diff --git a/JavaScriptCore/runtime/JSGlobalData.cpp b/JavaScriptCore/runtime/JSGlobalData.cpp
index 8910679..bd725f5 100644
--- a/JavaScriptCore/runtime/JSGlobalData.cpp
+++ b/JavaScriptCore/runtime/JSGlobalData.cpp
@@ -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)
diff --git a/JavaScriptCore/runtime/JSGlobalData.h b/JavaScriptCore/runtime/JSGlobalData.h
index 3210149..814ff9d 100644
--- a/JavaScriptCore/runtime/JSGlobalData.h
+++ b/JavaScriptCore/runtime/JSGlobalData.h
@@ -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;
diff --git a/JavaScriptCore/runtime/JSLock.cpp b/JavaScriptCore/runtime/JSLock.cpp
index ee7fb3b..708553a 100644
--- a/JavaScriptCore/runtime/JSLock.cpp
+++ b/JavaScriptCore/runtime/JSLock.cpp
@@ -21,7 +21,7 @@
#include "config.h"
#include "JSLock.h"
-#include "collector.h"
+#include "Collector.h"
#include "ExecState.h"
#if ENABLE(JSC_MULTIPLE_THREADS)
diff --git a/JavaScriptCore/runtime/JSNumberCell.cpp b/JavaScriptCore/runtime/JSNumberCell.cpp
index 5b3f3bd..0e33da6 100644
--- a/JavaScriptCore/runtime/JSNumberCell.cpp
+++ b/JavaScriptCore/runtime/JSNumberCell.cpp
@@ -24,7 +24,7 @@
#include "JSNumberCell.h"
#include "NumberObject.h"
-#include "ustring.h"
+#include "UString.h"
namespace JSC {
diff --git a/JavaScriptCore/runtime/JSNumberCell.h b/JavaScriptCore/runtime/JSNumberCell.h
index e2f6990..89fdf1b0 100644
--- a/JavaScriptCore/runtime/JSNumberCell.h
+++ b/JavaScriptCore/runtime/JSNumberCell.h
@@ -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 {
diff --git a/JavaScriptCore/runtime/JSObject.cpp b/JavaScriptCore/runtime/JSObject.cpp
index 82c1c63..897cf38 100644
--- a/JavaScriptCore/runtime/JSObject.cpp
+++ b/JavaScriptCore/runtime/JSObject.cpp
@@ -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>
diff --git a/JavaScriptCore/runtime/JSValue.h b/JavaScriptCore/runtime/JSValue.h
index 059a5e6..815a600 100644
--- a/JavaScriptCore/runtime/JSValue.h
+++ b/JavaScriptCore/runtime/JSValue.h
@@ -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
diff --git a/JavaScriptCore/kjs/lookup.cpp b/JavaScriptCore/runtime/Lookup.cpp
similarity index 98%
rename from JavaScriptCore/kjs/lookup.cpp
rename to JavaScriptCore/runtime/Lookup.cpp
index 41ac725..b44b1e4 100644
--- a/JavaScriptCore/kjs/lookup.cpp
+++ b/JavaScriptCore/runtime/Lookup.cpp
@@ -18,7 +18,7 @@
*/
#include "config.h"
-#include "lookup.h"
+#include "Lookup.h"
#include "PrototypeFunction.h"
diff --git a/JavaScriptCore/kjs/lookup.h b/JavaScriptCore/runtime/Lookup.h
similarity index 100%
rename from JavaScriptCore/kjs/lookup.h
rename to JavaScriptCore/runtime/Lookup.h
diff --git a/JavaScriptCore/runtime/MathObject.cpp b/JavaScriptCore/runtime/MathObject.cpp
index 8b972d3..ee7b700 100644
--- a/JavaScriptCore/runtime/MathObject.cpp
+++ b/JavaScriptCore/runtime/MathObject.cpp
@@ -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>
diff --git a/JavaScriptCore/runtime/NativeErrorPrototype.cpp b/JavaScriptCore/runtime/NativeErrorPrototype.cpp
index 9403aa9..df311d5 100644
--- a/JavaScriptCore/runtime/NativeErrorPrototype.cpp
+++ b/JavaScriptCore/runtime/NativeErrorPrototype.cpp
@@ -23,7 +23,7 @@
#include "ErrorPrototype.h"
#include "JSString.h"
-#include "ustring.h"
+#include "UString.h"
namespace JSC {
diff --git a/JavaScriptCore/runtime/NumberPrototype.cpp b/JavaScriptCore/runtime/NumberPrototype.cpp
index d203e3f..4f5b4f9 100644
--- a/JavaScriptCore/runtime/NumberPrototype.cpp
+++ b/JavaScriptCore/runtime/NumberPrototype.cpp
@@ -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>
diff --git a/JavaScriptCore/kjs/operations.cpp b/JavaScriptCore/runtime/Operations.cpp
similarity index 98%
rename from JavaScriptCore/kjs/operations.cpp
rename to JavaScriptCore/runtime/Operations.cpp
index f2d8deb..a857bf2 100644
--- a/JavaScriptCore/kjs/operations.cpp
+++ b/JavaScriptCore/runtime/Operations.cpp
@@ -20,7 +20,7 @@
*/
#include "config.h"
-#include "operations.h"
+#include "Operations.h"
#include "Error.h"
#include "JSObject.h"
diff --git a/JavaScriptCore/kjs/operations.h b/JavaScriptCore/runtime/Operations.h
similarity index 100%
rename from JavaScriptCore/kjs/operations.h
rename to JavaScriptCore/runtime/Operations.h
diff --git a/JavaScriptCore/runtime/PropertyMapHashTable.h b/JavaScriptCore/runtime/PropertyMapHashTable.h
index 98b0727..0d6c521 100644
--- a/JavaScriptCore/runtime/PropertyMapHashTable.h
+++ b/JavaScriptCore/runtime/PropertyMapHashTable.h
@@ -21,7 +21,7 @@
#ifndef PropertyMapHashTable_h
#define PropertyMapHashTable_h
-#include "ustring.h"
+#include "UString.h"
namespace JSC {
diff --git a/JavaScriptCore/kjs/protect.h b/JavaScriptCore/runtime/Protect.h
similarity index 99%
rename from JavaScriptCore/kjs/protect.h
rename to JavaScriptCore/runtime/Protect.h
index b317424..9a406bf 100644
--- a/JavaScriptCore/kjs/protect.h
+++ b/JavaScriptCore/runtime/Protect.h
@@ -23,7 +23,7 @@
#define protect_h
#include "JSCell.h"
-#include "collector.h"
+#include "Collector.h"
namespace JSC {
diff --git a/JavaScriptCore/kjs/regexp.cpp b/JavaScriptCore/runtime/RegExp.cpp
similarity index 99%
rename from JavaScriptCore/kjs/regexp.cpp
rename to JavaScriptCore/runtime/RegExp.cpp
index 7397232..661a1c7 100644
--- a/JavaScriptCore/kjs/regexp.cpp
+++ b/JavaScriptCore/runtime/RegExp.cpp
@@ -19,7 +19,7 @@
*/
#include "config.h"
-#include "regexp.h"
+#include "RegExp.h"
#include "CTI.h"
#include "lexer.h"
diff --git a/JavaScriptCore/kjs/regexp.h b/JavaScriptCore/runtime/RegExp.h
similarity index 98%
rename from JavaScriptCore/kjs/regexp.h
rename to JavaScriptCore/runtime/RegExp.h
index 1842d94..2abb805 100644
--- a/JavaScriptCore/kjs/regexp.h
+++ b/JavaScriptCore/runtime/RegExp.h
@@ -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>
diff --git a/JavaScriptCore/runtime/RegExpConstructor.cpp b/JavaScriptCore/runtime/RegExpConstructor.cpp
index 4c4db39..6e3b90cd 100644
--- a/JavaScriptCore/runtime/RegExpConstructor.cpp
+++ b/JavaScriptCore/runtime/RegExpConstructor.cpp
@@ -29,7 +29,7 @@
#include "RegExpMatchesArray.h"
#include "RegExpObject.h"
#include "RegExpPrototype.h"
-#include "regexp.h"
+#include "RegExp.h"
namespace JSC {
diff --git a/JavaScriptCore/runtime/RegExpObject.h b/JavaScriptCore/runtime/RegExpObject.h
index d80b47c..d5bf225 100644
--- a/JavaScriptCore/runtime/RegExpObject.h
+++ b/JavaScriptCore/runtime/RegExpObject.h
@@ -22,7 +22,7 @@
#define RegExpObject_h
#include "JSObject.h"
-#include "regexp.h"
+#include "RegExp.h"
namespace JSC {
diff --git a/JavaScriptCore/runtime/RegExpPrototype.cpp b/JavaScriptCore/runtime/RegExpPrototype.cpp
index ceee32a..6514ad6 100644
--- a/JavaScriptCore/runtime/RegExpPrototype.cpp
+++ b/JavaScriptCore/runtime/RegExpPrototype.cpp
@@ -29,7 +29,7 @@
#include "ObjectPrototype.h"
#include "PrototypeFunction.h"
#include "RegExpObject.h"
-#include "regexp.h"
+#include "RegExp.h"
namespace JSC {
diff --git a/JavaScriptCore/runtime/SmallStrings.h b/JavaScriptCore/runtime/SmallStrings.h
index 7c71208..7e5f5c8 100644
--- a/JavaScriptCore/runtime/SmallStrings.h
+++ b/JavaScriptCore/runtime/SmallStrings.h
@@ -26,7 +26,7 @@
#ifndef SmallStrings_h
#define SmallStrings_h
-#include "ustring.h"
+#include "UString.h"
#include <wtf/OwnPtr.h>
namespace JSC {
diff --git a/JavaScriptCore/runtime/StringObjectThatMasqueradesAsUndefined.h b/JavaScriptCore/runtime/StringObjectThatMasqueradesAsUndefined.h
index d703228..fad3852 100644
--- a/JavaScriptCore/runtime/StringObjectThatMasqueradesAsUndefined.h
+++ b/JavaScriptCore/runtime/StringObjectThatMasqueradesAsUndefined.h
@@ -23,7 +23,7 @@
#include "JSGlobalObject.h"
#include "StringObject.h"
-#include "ustring.h"
+#include "UString.h"
namespace JSC {
diff --git a/JavaScriptCore/runtime/StructureID.cpp b/JavaScriptCore/runtime/StructureID.cpp
index 8333595..95da830 100644
--- a/JavaScriptCore/runtime/StructureID.cpp
+++ b/JavaScriptCore/runtime/StructureID.cpp
@@ -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>
diff --git a/JavaScriptCore/runtime/StructureID.h b/JavaScriptCore/runtime/StructureID.h
index 4f45dac..fcd2eee 100644
--- a/JavaScriptCore/runtime/StructureID.h
+++ b/JavaScriptCore/runtime/StructureID.h
@@ -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>
diff --git a/JavaScriptCore/runtime/StructureIDTransitionTable.h b/JavaScriptCore/runtime/StructureIDTransitionTable.h
index dd65971..1e757d8 100644
--- a/JavaScriptCore/runtime/StructureIDTransitionTable.h
+++ b/JavaScriptCore/runtime/StructureIDTransitionTable.h
@@ -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>
diff --git a/JavaScriptCore/runtime/SymbolTable.h b/JavaScriptCore/runtime/SymbolTable.h
index d730d58..c00f95a 100644
--- a/JavaScriptCore/runtime/SymbolTable.h
+++ b/JavaScriptCore/runtime/SymbolTable.h
@@ -30,7 +30,7 @@
#define SymbolTable_h
#include "JSObject.h"
-#include "ustring.h"
+#include "UString.h"
#include <wtf/AlwaysInline.h>
namespace JSC {
diff --git a/JavaScriptCore/kjs/TypeInfo.h b/JavaScriptCore/runtime/TypeInfo.h
similarity index 100%
rename from JavaScriptCore/kjs/TypeInfo.h
rename to JavaScriptCore/runtime/TypeInfo.h
diff --git a/JavaScriptCore/kjs/ustring.cpp b/JavaScriptCore/runtime/UString.cpp
similarity index 99%
rename from JavaScriptCore/kjs/ustring.cpp
rename to JavaScriptCore/runtime/UString.cpp
index 3a85b1d..395933f 100644
--- a/JavaScriptCore/kjs/ustring.cpp
+++ b/JavaScriptCore/runtime/UString.cpp
@@ -21,13 +21,13 @@
*/
#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>
diff --git a/JavaScriptCore/kjs/ustring.h b/JavaScriptCore/runtime/UString.h
similarity index 99%
rename from JavaScriptCore/kjs/ustring.h
rename to JavaScriptCore/runtime/UString.h
index f47b134..b964849 100644
--- a/JavaScriptCore/kjs/ustring.h
+++ b/JavaScriptCore/runtime/UString.h
@@ -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>
diff --git a/JavaScriptCore/wrec/CharacterClassConstructor.h b/JavaScriptCore/wrec/CharacterClassConstructor.h
index 5accdae..6146a3d 100644
--- a/JavaScriptCore/wrec/CharacterClassConstructor.h
+++ b/JavaScriptCore/wrec/CharacterClassConstructor.h
@@ -28,7 +28,7 @@
#if ENABLE(WREC)
-#include "ustring.h"
+#include "UString.h"
namespace JSC {
diff --git a/JavaScriptCore/wrec/WREC.h b/JavaScriptCore/wrec/WREC.h
index 301bd3b..7cdd655 100644
--- a/JavaScriptCore/wrec/WREC.h
+++ b/JavaScriptCore/wrec/WREC.h
@@ -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>
