2008-11-06 Cameron Zwarich <zwarich@apple.com>
Reviewed by Geoff Garen.
Move the remaining files in the kjs subdirectory of JavaScriptCore to
a new parser subdirectory, and remove the kjs subdirectory entirely.
JavaScriptCore:
* AllInOneFile.cpp:
* DerivedSources.make:
* GNUmakefile.am:
* JavaScriptCore.pri:
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* JavaScriptCore.vcproj/WTF/WTF.vcproj:
* JavaScriptCore.vcproj/jsc/jsc.vcproj:
* JavaScriptCore.xcodeproj/project.pbxproj:
* JavaScriptCoreSources.bkl:
* VM/CodeBlock.h:
* VM/ExceptionHelpers.cpp:
* VM/SamplingTool.h:
* bytecompiler/CodeGenerator.h:
* jsc.pro:
* jscore.bkl:
* kjs: Removed.
* kjs/NodeInfo.h: Removed.
* kjs/Parser.cpp: Removed.
* kjs/Parser.h: Removed.
* kjs/ResultType.h: Removed.
* kjs/SourceCode.h: Removed.
* kjs/SourceProvider.h: Removed.
* kjs/grammar.y: Removed.
* kjs/keywords.table: Removed.
* kjs/lexer.cpp: Removed.
* kjs/lexer.h: Removed.
* kjs/nodes.cpp: Removed.
* kjs/nodes.h: Removed.
* kjs/nodes2string.cpp: Removed.
* parser: Added.
* parser/Grammar.y: Copied from kjs/grammar.y.
* parser/Keywords.table: Copied from kjs/keywords.table.
* parser/Lexer.cpp: Copied from kjs/lexer.cpp.
* parser/Lexer.h: Copied from kjs/lexer.h.
* parser/NodeInfo.h: Copied from kjs/NodeInfo.h.
* parser/Nodes.cpp: Copied from kjs/nodes.cpp.
* parser/Nodes.h: Copied from kjs/nodes.h.
* parser/Parser.cpp: Copied from kjs/Parser.cpp.
* parser/Parser.h: Copied from kjs/Parser.h.
* parser/ResultType.h: Copied from kjs/ResultType.h.
* parser/SourceCode.h: Copied from kjs/SourceCode.h.
* parser/SourceProvider.h: Copied from kjs/SourceProvider.h.
* parser/nodes2string.cpp: Copied from kjs/nodes2string.cpp.
* pcre/pcre.pri:
* pcre/pcre_exec.cpp:
* runtime/FunctionConstructor.cpp:
* runtime/JSActivation.h:
* runtime/JSFunction.h:
* runtime/JSGlobalData.cpp:
* runtime/JSGlobalObjectFunctions.cpp:
* runtime/JSObject.cpp:
(JSC::JSObject::toNumber):
* runtime/RegExp.cpp:
WebCore:
* ForwardingHeaders/kjs: Removed.
* ForwardingHeaders/kjs/Parser.h: Removed.
* ForwardingHeaders/kjs/SavedBuiltins.h: Removed.
* ForwardingHeaders/kjs/SourceCode.h: Removed.
* ForwardingHeaders/kjs/SourceProvider.h: Removed.
* ForwardingHeaders/parser: Added.
* ForwardingHeaders/parser/Parser.h: Copied from ForwardingHeaders/kjs/Parser.h.
* ForwardingHeaders/parser/SourceCode.h: Copied from ForwardingHeaders/kjs/SourceCode.h.
* ForwardingHeaders/parser/SourceProvider.h: Copied from ForwardingHeaders/kjs/SourceProvider.h.
* WebCore.pro:
* WebCore.vcproj/WebCore.vcproj:
* bindings/js/StringSourceProvider.h:
* bindings/js/WorkerScriptController.cpp:
* bridge/NP_jsobject.cpp:
* bridge/jni/jni_jsobject.mm:
* bridge/testbindings.pro:
* inspector/JavaScriptDebugServer.cpp:
WebKit/mac:
* ForwardingHeaders/kjs: Removed.
* ForwardingHeaders/kjs/SavedBuiltins.h: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@38205 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/AllInOneFile.cpp b/JavaScriptCore/AllInOneFile.cpp
index ff76313..fcc30d7 100644
--- a/JavaScriptCore/AllInOneFile.cpp
+++ b/JavaScriptCore/AllInOneFile.cpp
@@ -66,7 +66,7 @@
#include "runtime/JSImmediate.cpp"
#include "runtime/JSLock.cpp"
#include "runtime/JSWrapperObject.cpp"
-#include "kjs/lexer.cpp"
+#include "parser/Lexer.cpp"
#include "runtime/ArgList.cpp"
#include "runtime/Lookup.cpp"
#include "runtime/MathObject.cpp"
@@ -75,15 +75,15 @@
#include "runtime/NumberConstructor.cpp"
#include "runtime/NumberObject.cpp"
#include "runtime/NumberPrototype.cpp"
-#include "kjs/nodes.cpp"
-#include "kjs/nodes2string.cpp"
+#include "parser/Nodes.cpp"
+#include "parser/nodes2string.cpp"
#include "runtime/JSObject.cpp"
#include "runtime/Error.cpp"
#include "runtime/JSGlobalObject.cpp"
#include "runtime/ObjectConstructor.cpp"
#include "runtime/ObjectPrototype.cpp"
#include "runtime/Operations.cpp"
-#include "kjs/Parser.cpp"
+#include "parser/Parser.cpp"
#include "runtime/PropertySlot.cpp"
#include "runtime/PropertyNameArray.cpp"
#include "runtime/RegExp.cpp"
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 9185cda..39306d5 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,64 @@
+2008-11-06 Cameron Zwarich <zwarich@apple.com>
+
+ Reviewed by Geoff Garen.
+
+ Move the remaining files in the kjs subdirectory of JavaScriptCore to
+ a new parser subdirectory, and remove the kjs subdirectory entirely.
+
+ * AllInOneFile.cpp:
+ * DerivedSources.make:
+ * GNUmakefile.am:
+ * JavaScriptCore.pri:
+ * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
+ * JavaScriptCore.vcproj/WTF/WTF.vcproj:
+ * JavaScriptCore.vcproj/jsc/jsc.vcproj:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * JavaScriptCoreSources.bkl:
+ * VM/CodeBlock.h:
+ * VM/ExceptionHelpers.cpp:
+ * VM/SamplingTool.h:
+ * bytecompiler/CodeGenerator.h:
+ * jsc.pro:
+ * jscore.bkl:
+ * kjs: Removed.
+ * kjs/NodeInfo.h: Removed.
+ * kjs/Parser.cpp: Removed.
+ * kjs/Parser.h: Removed.
+ * kjs/ResultType.h: Removed.
+ * kjs/SourceCode.h: Removed.
+ * kjs/SourceProvider.h: Removed.
+ * kjs/grammar.y: Removed.
+ * kjs/keywords.table: Removed.
+ * kjs/lexer.cpp: Removed.
+ * kjs/lexer.h: Removed.
+ * kjs/nodes.cpp: Removed.
+ * kjs/nodes.h: Removed.
+ * kjs/nodes2string.cpp: Removed.
+ * parser: Added.
+ * parser/Grammar.y: Copied from kjs/grammar.y.
+ * parser/Keywords.table: Copied from kjs/keywords.table.
+ * parser/Lexer.cpp: Copied from kjs/lexer.cpp.
+ * parser/Lexer.h: Copied from kjs/lexer.h.
+ * parser/NodeInfo.h: Copied from kjs/NodeInfo.h.
+ * parser/Nodes.cpp: Copied from kjs/nodes.cpp.
+ * parser/Nodes.h: Copied from kjs/nodes.h.
+ * parser/Parser.cpp: Copied from kjs/Parser.cpp.
+ * parser/Parser.h: Copied from kjs/Parser.h.
+ * parser/ResultType.h: Copied from kjs/ResultType.h.
+ * parser/SourceCode.h: Copied from kjs/SourceCode.h.
+ * parser/SourceProvider.h: Copied from kjs/SourceProvider.h.
+ * parser/nodes2string.cpp: Copied from kjs/nodes2string.cpp.
+ * pcre/pcre.pri:
+ * pcre/pcre_exec.cpp:
+ * runtime/FunctionConstructor.cpp:
+ * runtime/JSActivation.h:
+ * runtime/JSFunction.h:
+ * runtime/JSGlobalData.cpp:
+ * runtime/JSGlobalObjectFunctions.cpp:
+ * runtime/JSObject.cpp:
+ (JSC::JSObject::toNumber):
+ * runtime/RegExp.cpp:
+
2008-11-06 Adam Roben <aroben@apple.com>
Windows build fix after r38196
diff --git a/JavaScriptCore/DerivedSources.make b/JavaScriptCore/DerivedSources.make
index ba0a74a..a76021b 100644
--- a/JavaScriptCore/DerivedSources.make
+++ b/JavaScriptCore/DerivedSources.make
@@ -26,7 +26,7 @@
VPATH = \
$(JavaScriptCore) \
- $(JavaScriptCore)/kjs \
+ $(JavaScriptCore)/parser \
$(JavaScriptCore)/VM \
$(JavaScriptCore)/pcre \
$(JavaScriptCore)/docs \
@@ -39,7 +39,7 @@
chartables.c \
DatePrototype.lut.h \
grammar.cpp \
- lexer.lut.h \
+ Lexer.lut.h \
MathObject.lut.h \
NumberConstructor.lut.h \
RegExpConstructor.lut.h \
@@ -52,12 +52,12 @@
%.lut.h: create_hash_table %.cpp
$^ -i > $@
-lexer.lut.h: create_hash_table keywords.table
+Lexer.lut.h: create_hash_table Keywords.table
$^ > $@
# JavaScript language grammar
-grammar.cpp: grammar.y
+grammar.cpp: Grammar.y
bison -d -p kjsyy $< -o $@ > bison_out.txt 2>&1
perl -p -e 'END { if ($$conflict) { unlink "grammar.cpp"; die; } } $$conflict ||= /conflict/' < bison_out.txt
touch grammar.cpp.h
diff --git a/JavaScriptCore/GNUmakefile.am b/JavaScriptCore/GNUmakefile.am
index b505805..a6cd083 100644
--- a/JavaScriptCore/GNUmakefile.am
+++ b/JavaScriptCore/GNUmakefile.am
@@ -9,7 +9,7 @@
-I$(srcdir)/JavaScriptCore/runtime \
-I$(srcdir)/JavaScriptCore/wtf/unicode \
-I$(top_builddir)/JavaScriptCore/pcre \
- -I$(top_builddir)/JavaScriptCore/kjs \
+ -I$(top_builddir)/JavaScriptCore/parser \
-I$(top_builddir)/JavaScriptCore/runtime
javascriptcore_h_api += \
@@ -25,7 +25,7 @@
JavaScriptCore/API/WebKitAvailability.h
javascriptcore_built_nosources += \
- DerivedSources/lexer.lut.h \
+ DerivedSources/Lexer.lut.h \
JavaScriptCore/runtime/ArrayPrototype.lut.h \
JavaScriptCore/runtime/DatePrototype.lut.h \
JavaScriptCore/runtime/MathObject.lut.h \
@@ -127,18 +127,18 @@
JavaScriptCore/runtime/JSGlobalData.h \
JavaScriptCore/runtime/JSStaticScopeObject.h \
JavaScriptCore/runtime/JSType.h \
- JavaScriptCore/kjs/NodeInfo.h \
- JavaScriptCore/kjs/Parser.h \
+ JavaScriptCore/parser/NodeInfo.h \
+ JavaScriptCore/parser/Parser.h \
JavaScriptCore/runtime/PropertyNameArray.h \
JavaScriptCore/runtime/RegExpConstructor.h \
JavaScriptCore/runtime/RegExpMatchesArray.h \
JavaScriptCore/runtime/RegExpObject.h \
JavaScriptCore/runtime/RegExpPrototype.h \
- JavaScriptCore/kjs/ResultType.h \
+ JavaScriptCore/parser/ResultType.h \
JavaScriptCore/runtime/ScopeChain.h \
JavaScriptCore/runtime/ScopeChainMark.h \
- JavaScriptCore/kjs/SourceProvider.h \
- JavaScriptCore/kjs/SourceCode.h \
+ JavaScriptCore/parser/SourceProvider.h \
+ JavaScriptCore/parser/SourceCode.h \
JavaScriptCore/runtime/SymbolTable.h \
JavaScriptCore/runtime/Tracing.h \
JavaScriptCore/runtime/TypeInfo.h \
@@ -149,9 +149,9 @@
JavaScriptCore/wtf/dtoa.h \
JavaScriptCore/runtime/Identifier.h \
JavaScriptCore/runtime/Interpreter.h \
- JavaScriptCore/kjs/lexer.h \
+ JavaScriptCore/parser/Lexer.h \
JavaScriptCore/runtime/Lookup.h \
- JavaScriptCore/kjs/nodes.h \
+ JavaScriptCore/parser/Nodes.h \
JavaScriptCore/runtime/Operations.h \
JavaScriptCore/runtime/Protect.h \
JavaScriptCore/runtime/RegExp.h \
@@ -319,7 +319,7 @@
JavaScriptCore/runtime/JSLock.h \
JavaScriptCore/runtime/JSStaticScopeObject.cpp \
JavaScriptCore/bytecompiler/LabelScope.h \
- JavaScriptCore/kjs/Parser.cpp \
+ JavaScriptCore/parser/Parser.cpp \
JavaScriptCore/runtime/PropertyNameArray.cpp \
JavaScriptCore/runtime/RegExpConstructor.cpp \
JavaScriptCore/runtime/RegExpObject.cpp \
@@ -330,10 +330,10 @@
JavaScriptCore/wtf/dtoa.cpp \
JavaScriptCore/runtime/Identifier.cpp \
JavaScriptCore/runtime/Interpreter.cpp \
- JavaScriptCore/kjs/lexer.cpp \
+ JavaScriptCore/parser/Lexer.cpp \
JavaScriptCore/runtime/Lookup.cpp \
- JavaScriptCore/kjs/nodes.cpp \
- JavaScriptCore/kjs/nodes2string.cpp \
+ JavaScriptCore/parser/Nodes.cpp \
+ JavaScriptCore/parser/nodes2string.cpp \
JavaScriptCore/runtime/Operations.cpp \
JavaScriptCore/runtime/RegExp.cpp \
JavaScriptCore/runtime/UString.cpp \
@@ -397,13 +397,13 @@
DerivedSources/grammar.h: DerivedSources/grammar.cpp;
-DerivedSources/grammar.cpp: $(srcdir)/JavaScriptCore/kjs/grammar.y
- $(BISON) -d -p kjsyy $(srcdir)/JavaScriptCore/kjs/grammar.y -o $@ > bison_out.txt 2>&1
+DerivedSources/grammar.cpp: $(srcdir)/JavaScriptCore/parser/Grammar.y
+ $(BISON) -d -p kjsyy $(srcdir)/JavaScriptCore/parser/Grammar.y -o $@ > bison_out.txt 2>&1
$(PERL) -p -e 'END { if ($$conflict) { unlink "grammar.cpp"; die; } } $$conflict ||= /conflict/' < bison_out.txt
cat $(GENSOURCES)/grammar.hpp > $(GENSOURCES)/grammar.h
rm -f $(GENSOURCES)/grammar.hpp bison_out.txt
-DerivedSources/lexer.lut.h: $(CREATE_HASH_TABLE) $(srcdir)/JavaScriptCore/kjs/keywords.table
+DerivedSources/Lexer.lut.h: $(CREATE_HASH_TABLE) $(srcdir)/JavaScriptCore/parser/Keywords.table
$(PERL) $^ > $@
JavaScriptCore/%.lut.h: $(CREATE_HASH_TABLE) $(srcdir)/JavaScriptCore/%.cpp
@@ -476,8 +476,8 @@
JavaScriptCore/pcre/AUTHORS \
JavaScriptCore/pcre/dftables \
JavaScriptCore/pcre/ucptable.cpp \
- JavaScriptCore/kjs/grammar.y \
- JavaScriptCore/kjs/keywords.table
+ JavaScriptCore/parser/Grammar.y \
+ JavaScriptCore/parser/Keywords.table
# Clean rules for JavaScriptCore
CLEANFILES += \
diff --git a/JavaScriptCore/JavaScriptCore.pri b/JavaScriptCore/JavaScriptCore.pri
index d66bd62..878e50a 100644
--- a/JavaScriptCore/JavaScriptCore.pri
+++ b/JavaScriptCore/JavaScriptCore.pri
@@ -2,7 +2,7 @@
VPATH += $$PWD
INCLUDEPATH += tmp
-INCLUDEPATH += $$PWD $$PWD/kjs $$PWD/bytecompiler $$PWD/debugger $$PWD/runtime $$PWD/wtf $$PWD/wtf/unicode $$PWD/VM $$PWD/profiler $$PWD/API $$PWD/.. \
+INCLUDEPATH += $$PWD $$PWD/parser $$PWD/bytecompiler $$PWD/debugger $$PWD/runtime $$PWD/wtf $$PWD/wtf/unicode $$PWD/VM $$PWD/profiler $$PWD/API $$PWD/.. \
$$PWD/ForwardingHeaders
DEFINES += BUILDING_QT__
@@ -24,10 +24,10 @@
runtime/RegExpObject.cpp
KEYWORDLUT_FILES += \
- kjs/keywords.table
+ parser/Keywords.table
KJSBISON += \
- kjs/grammar.y
+ parser/Grammar.y
SOURCES += \
wtf/Assertions.cpp \
@@ -107,20 +107,20 @@
runtime/JSString.cpp \
runtime/JSValue.cpp \
runtime/JSWrapperObject.cpp \
- kjs/lexer.cpp \
+ parser/Lexer.cpp \
runtime/Lookup.cpp \
runtime/MathObject.cpp \
runtime/NativeErrorConstructor.cpp \
runtime/NativeErrorPrototype.cpp \
- kjs/nodes.cpp \
- kjs/nodes2string.cpp \
+ parser/Nodes.cpp \
+ parser/nodes2string.cpp \
runtime/NumberConstructor.cpp \
runtime/NumberObject.cpp \
runtime/NumberPrototype.cpp \
runtime/ObjectConstructor.cpp \
runtime/ObjectPrototype.cpp \
runtime/Operations.cpp \
- kjs/Parser.cpp \
+ parser/Parser.cpp \
runtime/PropertyNameArray.cpp \
runtime/PropertySlot.cpp \
runtime/PrototypeFunction.cpp \
@@ -155,7 +155,7 @@
addExtraCompiler(lut)
# GENERATOR 1-B: particular LUT creator (for 1 file only)
-keywordlut.output = $$GENERATED_SOURCES_DIR/lexer.lut.h
+keywordlut.output = $$GENERATED_SOURCES_DIR/Lexer.lut.h
keywordlut.commands = perl $$PWD/create_hash_table ${QMAKE_FILE_NAME} -i > ${QMAKE_FILE_OUT}
keywordlut.depend = ${QMAKE_FILE_NAME}
keywordlut.input = KEYWORDLUT_FILES
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
index 3d92512..db023a7 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
@@ -42,7 +42,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\DerivedSources\";../../;../../API/;../../pcre/;../../kjs/;../../bytecompiler/;../../runtime/;../../VM/;../../wtf/;../../profiler;../../masm/;../../debugger/;../../wrec/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";../../../icu/include;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility""
+ AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\DerivedSources\";../../;../../API/;../../pcre/;../../parser/;../../bytecompiler/;../../runtime/;../../VM/;../../wtf/;../../profiler;../../masm/;../../debugger/;../../wrec/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";../../../icu/include;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility""
PreprocessorDefinitions="__STD_C"
ForcedIncludeFiles=""
/>
@@ -73,7 +73,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="mkdir 2>NUL "$(WebKitOutputDir)\include\JavaScriptCore"

xcopy /y /d "$(ProjectDir)\..\..\wtf\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\wtf\unicode\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\wtf\unicode\icu\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\kjs\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\runtime\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\VM\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\masm\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\wrec\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\debugger\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\profiler\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\create_hash_table" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\pcre\pcre.h" "$(WebKitOutputDir)\include\JavaScriptCore"

if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
"
+ CommandLine="mkdir 2>NUL "$(WebKitOutputDir)\include\JavaScriptCore"

xcopy /y /d "$(ProjectDir)\..\..\wtf\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\wtf\unicode\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\wtf\unicode\icu\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\parser\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\runtime\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\VM\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\masm\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\wrec\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\debugger\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\profiler\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\create_hash_table" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\pcre\pcre.h" "$(WebKitOutputDir)\include\JavaScriptCore"

if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
"
/>
</Configuration>
<Configuration
@@ -104,7 +104,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\DerivedSources\";../../;../../API/;../../pcre/;../../kjs/;../../bytecompiler/;../../runtime/;../../VM/;../../wtf/;../../profiler;../../masm/;../../debugger/;../../wrec/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";../../../icu/include;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility""
+ AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\DerivedSources\";../../;../../API/;../../pcre/;../../parser/;../../bytecompiler/;../../runtime/;../../VM/;../../wtf/;../../profiler;../../masm/;../../debugger/;../../wrec/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";../../../icu/include;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility""
PreprocessorDefinitions="__STD_C"
ForcedIncludeFiles=""
/>
@@ -135,7 +135,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="mkdir 2>NUL "$(WebKitOutputDir)\include\JavaScriptCore"

xcopy /y /d "$(ProjectDir)\..\..\wtf\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\wtf\unicode\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\wtf\unicode\icu\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\kjs\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\runtime\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\VM\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\masm\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\wrec\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\debugger\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\profiler\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\create_hash_table" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\pcre\pcre.h" "$(WebKitOutputDir)\include\JavaScriptCore"

if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
"
+ CommandLine="mkdir 2>NUL "$(WebKitOutputDir)\include\JavaScriptCore"

xcopy /y /d "$(ProjectDir)\..\..\wtf\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\wtf\unicode\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\wtf\unicode\icu\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\parser\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\runtime\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\VM\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\masm\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\wrec\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\debugger\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\profiler\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\create_hash_table" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\pcre\pcre.h" "$(WebKitOutputDir)\include\JavaScriptCore"

if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
"
/>
</Configuration>
<Configuration
@@ -165,7 +165,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\DerivedSources\";../../;../../API/;../../pcre/;../../kjs/;../../bytecompiler/;../../runtime/;../../VM/;../../wtf/;../../profiler;../../masm/;../../debugger/;../../wrec/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";../../../icu/include;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility""
+ AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\DerivedSources\";../../;../../API/;../../pcre/;../../parser/;../../bytecompiler/;../../runtime/;../../VM/;../../wtf/;../../profiler;../../masm/;../../debugger/;../../wrec/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";../../../icu/include;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility""
PreprocessorDefinitions="__STD_C"
ForcedIncludeFiles=""
/>
@@ -196,7 +196,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="mkdir 2>NUL "$(WebKitOutputDir)\include\JavaScriptCore"

xcopy /y /d "$(ProjectDir)\..\..\wtf\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\wtf\unicode\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\wtf\unicode\icu\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\kjs\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\runtime\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\VM\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\masm\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\wrec\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\debugger\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\profiler\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\create_hash_table" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\pcre\pcre.h" "$(WebKitOutputDir)\include\JavaScriptCore"

if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
"
+ CommandLine="mkdir 2>NUL "$(WebKitOutputDir)\include\JavaScriptCore"

xcopy /y /d "$(ProjectDir)\..\..\wtf\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\wtf\unicode\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\wtf\unicode\icu\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\parser\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\runtime\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\VM\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\masm\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\wrec\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\debugger\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\profiler\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\create_hash_table" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\pcre\pcre.h" "$(WebKitOutputDir)\include\JavaScriptCore"

if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
"
/>
</Configuration>
<Configuration
@@ -227,7 +227,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\DerivedSources\";../../;../../API/;../../pcre/;../../kjs/;../../bytecompiler/;../../runtime/;../../VM/;../../wtf/;../../profiler;../../masm/;../../debugger/;../../wrec/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";../../../icu/include;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility""
+ AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\DerivedSources\";../../;../../API/;../../pcre/;../../parser/;../../bytecompiler/;../../runtime/;../../VM/;../../wtf/;../../profiler;../../masm/;../../debugger/;../../wrec/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";../../../icu/include;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility""
PreprocessorDefinitions="__STD_C"
ForcedIncludeFiles=""
/>
@@ -258,7 +258,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="mkdir 2>NUL "$(WebKitOutputDir)\include\JavaScriptCore"

xcopy /y /d "$(ProjectDir)\..\..\wtf\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\wtf\unicode\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\wtf\unicode\icu\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\kjs\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\runtime\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\VM\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\masm\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\wrec\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\debugger\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\profiler\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\create_hash_table" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\pcre\pcre.h" "$(WebKitOutputDir)\include\JavaScriptCore"

if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
"
+ CommandLine="mkdir 2>NUL "$(WebKitOutputDir)\include\JavaScriptCore"

xcopy /y /d "$(ProjectDir)\..\..\wtf\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\wtf\unicode\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\wtf\unicode\icu\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\parser\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\runtime\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\VM\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\masm\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\wrec\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\debugger\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\profiler\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\create_hash_table" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\pcre\pcre.h" "$(WebKitOutputDir)\include\JavaScriptCore"

if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
"
/>
</Configuration>
</Configurations>
@@ -266,7 +266,7 @@
</References>
<Files>
<Filter
- Name="KJS"
+ Name="JavaScriptCore"
>
<File
RelativePath="..\..\runtime\ArgList.cpp"
@@ -685,7 +685,7 @@
>
</File>
<File
- RelativePath="..\..\kjs\NodeInfo.h"
+ RelativePath="..\..\parser\NodeInfo.h"
>
</File>
<File
@@ -821,11 +821,11 @@
>
</File>
<File
- RelativePath="..\..\kjs\SourceCode.h"
+ RelativePath="..\..\parser\SourceCode.h"
>
</File>
<File
- RelativePath="..\..\kjs\SourceProvider.h"
+ RelativePath="..\..\parser\SourceProvider.h"
>
</File>
<File
@@ -1190,15 +1190,15 @@
>
</File>
<File
- RelativePath="..\..\kjs\lexer.cpp"
+ RelativePath="..\..\parser\Lexer.cpp"
>
</File>
<File
- RelativePath="..\..\kjs\lexer.h"
+ RelativePath="..\..\parser\Lexer.h"
>
</File>
<File
- RelativePath="..\..\kjs\nodes.cpp"
+ RelativePath="..\..\parser\Nodes.cpp"
>
<FileConfiguration
Name="Release_PGO|Win32"
@@ -1210,19 +1210,19 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\kjs\nodes.h"
+ RelativePath="..\..\parser\Nodes.h"
>
</File>
<File
- RelativePath="..\..\kjs\nodes2string.cpp"
+ RelativePath="..\..\parser\nodes2string.cpp"
>
</File>
<File
- RelativePath="..\..\kjs\Parser.cpp"
+ RelativePath="..\..\parser\Parser.cpp"
>
</File>
<File
- RelativePath="..\..\kjs\Parser.h"
+ RelativePath="..\..\parser\Parser.h"
>
</File>
<File
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
index 35dd8e4..6074786 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
+++ b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
@@ -42,7 +42,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../kjs/;../../wtf/;../../wtf/unicode/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads""
+ AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../parser/;../../wtf/;../../wtf/unicode/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads""
PreprocessorDefinitions="__STD_C"
ForcedIncludeFiles=""
/>
@@ -105,7 +105,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../kjs/;../../wtf/;../../wtf/unicode/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads""
+ AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../parser/;../../wtf/;../../wtf/unicode/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads""
PreprocessorDefinitions="__STD_C"
ForcedIncludeFiles=""
/>
@@ -167,7 +167,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../kjs/;../../wtf/;../../wtf/unicode/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads""
+ AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../parser/;../../wtf/;../../wtf/unicode/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads""
PreprocessorDefinitions="__STD_C"
ForcedIncludeFiles=""
/>
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/jsc/jsc.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/jsc/jsc.vcproj
index 3a02b9e..0f41040 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/jsc/jsc.vcproj
+++ b/JavaScriptCore/JavaScriptCore.vcproj/jsc/jsc.vcproj
@@ -39,7 +39,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(WebKitOutputDir)\include";"$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../kjs/;../../runtime/;../../VM/;../../wtf/;../../debugger/;../../bytecompiler/;"$(WebKitLibrariesDir)\include\icu";"$(WebKitLibrariesDir)\include\pthreads";../../../icu/include;"$(WebKitLibrariesDir)\include""
+ AdditionalIncludeDirectories=""$(WebKitOutputDir)\include";"$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../parser/;../../runtime/;../../VM/;../../wtf/;../../debugger/;../../bytecompiler/;"$(WebKitLibrariesDir)\include\icu";"$(WebKitLibrariesDir)\include\pthreads";../../../icu/include;"$(WebKitLibrariesDir)\include""
PreprocessorDefinitions="__STD_C"
/>
<Tool
@@ -109,7 +109,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(WebKitOutputDir)\include";"$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../kjs/;../../runtime/;../../VM/;../../wtf/;../../debugger/;../../bytecompiler/;"$(WebKitLibrariesDir)\include\icu";"$(WebKitLibrariesDir)\include\pthreads";../../../icu/include;"$(WebKitLibrariesDir)\include""
+ AdditionalIncludeDirectories=""$(WebKitOutputDir)\include";"$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../parser/;../../runtime/;../../VM/;../../wtf/;../../debugger/;../../bytecompiler/;"$(WebKitLibrariesDir)\include\icu";"$(WebKitLibrariesDir)\include\pthreads";../../../icu/include;"$(WebKitLibrariesDir)\include""
PreprocessorDefinitions="__STD_C"
/>
<Tool
@@ -178,7 +178,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(WebKitOutputDir)\include";"$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../kjs/;../../runtime/;../../VM/;../../wtf/;../../debugger/;../../bytecompiler/;"$(WebKitLibrariesDir)\include\icu";"$(WebKitLibrariesDir)\include\pthreads";../../../icu/include;"$(WebKitLibrariesDir)\include""
+ AdditionalIncludeDirectories=""$(WebKitOutputDir)\include";"$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../parser/;../../runtime/;../../VM/;../../wtf/;../../debugger/;../../bytecompiler/;"$(WebKitLibrariesDir)\include\icu";"$(WebKitLibrariesDir)\include\pthreads";../../../icu/include;"$(WebKitLibrariesDir)\include""
PreprocessorDefinitions="__STD_C"
/>
<Tool
diff --git a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
index 83a010c..a4ef178 100644
--- a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -205,7 +205,7 @@
BC18C42D0E16F5CD00B34460 /* JSVariableObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 14F252560D08DD8D004ECFFF /* JSVariableObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC18C42E0E16F5CD00B34460 /* JSWrapperObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 65C7A1720A8EAACB00FA37EA /* JSWrapperObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC18C42F0E16F5CD00B34460 /* LabelID.h in Headers */ = {isa = PBXBuildFile; fileRef = 149B20D70D8A0891009CB8C7 /* LabelID.h */; };
- BC18C4310E16F5CD00B34460 /* lexer.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8660255597D01FF60F7 /* lexer.h */; };
+ BC18C4310E16F5CD00B34460 /* Lexer.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8660255597D01FF60F7 /* Lexer.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, ); }; };
@@ -216,7 +216,7 @@
BC18C43B0E16F5CD00B34460 /* MathExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF6553B0A2048DE0038A194 /* MathExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC18C43C0E16F5CD00B34460 /* MathObject.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A86B0255597D01FF60F7 /* MathObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC18C43E0E16F5CD00B34460 /* MessageQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = E1EE798B0D6CA53D00FEA3BA /* MessageQueue.h */; settings = {ATTRIBUTES = (Private, ); }; };
- BC18C43F0E16F5CD00B34460 /* nodes.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A86E0255597D01FF60F7 /* nodes.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ BC18C43F0E16F5CD00B34460 /* Nodes.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A86E0255597D01FF60F7 /* Nodes.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC18C4400E16F5CD00B34460 /* Noncopyable.h in Headers */ = {isa = PBXBuildFile; fileRef = 9303F5690991190000AD71B8 /* Noncopyable.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC18C4410E16F5CD00B34460 /* NumberConstructor.h in Headers */ = {isa = PBXBuildFile; fileRef = BC2680C30E16D4E900A06E92 /* NumberConstructor.h */; };
BC18C4420E16F5CD00B34460 /* NumberConstructor.lut.h in Headers */ = {isa = PBXBuildFile; fileRef = BC2680E60E16D52300A06E92 /* NumberConstructor.lut.h */; };
@@ -526,7 +526,7 @@
7E2C6C980D31C6B6002D44E2 /* ScopeChainMark.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScopeChainMark.h; sourceTree = "<group>"; };
7E4EE7080EBB7963005934AA /* StructureIDChain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StructureIDChain.h; sourceTree = "<group>"; };
7E4EE70E0EBB7A5B005934AA /* StructureIDChain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StructureIDChain.cpp; sourceTree = "<group>"; };
- 7EFF00630EC05A9A00AA7C93 /* NodeInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NodeInfo.h; path = kjs/NodeInfo.h; sourceTree = "<group>"; };
+ 7EFF00630EC05A9A00AA7C93 /* NodeInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NodeInfo.h; sourceTree = "<group>"; };
8613F4580E3A433E00C948FD /* SamplingTool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SamplingTool.cpp; path = VM/SamplingTool.cpp; sourceTree = "<group>"; };
8613F4590E3A433E00C948FD /* SamplingTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SamplingTool.h; path = VM/SamplingTool.h; sourceTree = "<group>"; };
8683B02B0E636482004C19EE /* CTI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CTI.cpp; path = VM/CTI.cpp; sourceTree = "<group>"; };
@@ -549,7 +549,7 @@
932F5BE10822A1C700736975 /* jsc */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jsc; sourceTree = BUILT_PRODUCTS_DIR; };
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; };
+ 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; };
935AF46909E9D9DB00ACD1D8 /* Forward.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Forward.h; sourceTree = "<group>"; };
@@ -568,9 +568,9 @@
93E26BD308B1514100F85226 /* pcre_xclass.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pcre_xclass.cpp; sourceTree = "<group>"; tabWidth = 8; };
93E26BE508B1517100F85226 /* pcre_internal.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = pcre_internal.h; sourceTree = "<group>"; tabWidth = 8; };
93E26BFC08B151D400F85226 /* ucpinternal.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = ucpinternal.h; sourceTree = "<group>"; tabWidth = 8; };
- 93F0B3A909BB4DC00068FCE3 /* Parser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Parser.cpp; path = kjs/Parser.cpp; sourceTree = "<group>"; };
- 93F0B3AA09BB4DC00068FCE3 /* Parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Parser.h; path = kjs/Parser.h; sourceTree = "<group>"; };
- 93F1981A08245AAE001E9ABC /* keywords.table */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = text; path = keywords.table; sourceTree = "<group>"; tabWidth = 8; };
+ 93F0B3A909BB4DC00068FCE3 /* Parser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Parser.cpp; sourceTree = "<group>"; };
+ 93F0B3AA09BB4DC00068FCE3 /* Parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Parser.h; sourceTree = "<group>"; };
+ 93F1981A08245AAE001E9ABC /* Keywords.table */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = text; path = Keywords.table; sourceTree = "<group>"; tabWidth = 8; };
952C63AC0E4777D600C13936 /* JSProfilerPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSProfilerPrivate.h; sourceTree = "<group>"; };
95742F630DD11F5A000917FB /* Profile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Profile.cpp; path = profiler/Profile.cpp; sourceTree = "<group>"; };
95742F640DD11F5A000917FB /* Profile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Profile.h; path = profiler/Profile.h; sourceTree = "<group>"; };
@@ -709,7 +709,7 @@
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; };
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; };
+ F5FFE656026B47A6018635CA /* nodes2string.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = 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; };
@@ -726,14 +726,14 @@
F692A8620255597D01FF60F7 /* JSString.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = JSString.h; sourceTree = "<group>"; tabWidth = 8; };
F692A8630255597D01FF60F7 /* Interpreter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Interpreter.cpp; sourceTree = "<group>"; tabWidth = 8; };
F692A8640255597D01FF60F7 /* Interpreter.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Interpreter.h; sourceTree = "<group>"; tabWidth = 8; };
- F692A8650255597D01FF60F7 /* lexer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lexer.cpp; path = kjs/lexer.cpp; sourceTree = "<group>"; tabWidth = 8; };
- F692A8660255597D01FF60F7 /* lexer.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = lexer.h; path = kjs/lexer.h; sourceTree = "<group>"; tabWidth = 8; };
+ F692A8650255597D01FF60F7 /* Lexer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Lexer.cpp; sourceTree = "<group>"; tabWidth = 8; };
+ F692A8660255597D01FF60F7 /* Lexer.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = 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; };
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; };
+ F692A86D0255597D01FF60F7 /* Nodes.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Nodes.cpp; sourceTree = "<group>"; tabWidth = 8; };
+ F692A86E0255597D01FF60F7 /* Nodes.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = 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; };
@@ -825,8 +825,8 @@
7E39D81D0EC38EFA003AF11A /* bytecompiler */,
149B15DF0D81F887009CB8C7 /* compiler */,
1480DB9A0DDC2231003CFDF2 /* debugger */,
- 65417200039E01BA0058BFEB /* kjs */,
8690813F0E640C89000D36ED /* masm */,
+ 7E39D8370EC3A388003AF11A /* parser */,
65417203039E01F90058BFEB /* pcre */,
95AB831A0DA42C6900BC83F3 /* profiler */,
7EF6E0BB0EB7A1EC0079AFAF /* runtime */,
@@ -943,14 +943,6 @@
isa = PBXGroup;
children = (
149B20D70D8A0891009CB8C7 /* LabelID.h */,
- F692A8650255597D01FF60F7 /* lexer.cpp */,
- F692A8660255597D01FF60F7 /* lexer.h */,
- 7EFF00630EC05A9A00AA7C93 /* NodeInfo.h */,
- F692A86D0255597D01FF60F7 /* nodes.cpp */,
- F692A86E0255597D01FF60F7 /* nodes.h */,
- F5FFE656026B47A6018635CA /* nodes2string.cpp */,
- 93F0B3A909BB4DC00068FCE3 /* Parser.cpp */,
- 93F0B3AA09BB4DC00068FCE3 /* Parser.h */,
149B16B80D82583F009CB8C7 /* RegisterID.h */,
A7C31DA80DBEBA4300FDF8EB /* SegmentedVector.h */,
);
@@ -1079,20 +1071,6 @@
tabWidth = 4;
usesTabs = 0;
};
- 65417200039E01BA0058BFEB /* kjs */ = {
- isa = PBXGroup;
- children = (
- 933A3499038AE7C6008635CE /* grammar.y */,
- 93F1981A08245AAE001E9ABC /* keywords.table */,
- 869EBCB60E8C6D4A008722CC /* ResultType.h */,
- 65E866ED0DD59AFA00A2B2A1 /* SourceProvider.h */,
- 65E866EE0DD59AFA00A2B2A1 /* SourceCode.h */,
- );
- path = kjs;
- sourceTree = "<group>";
- tabWidth = 4;
- usesTabs = 0;
- };
65417203039E01F90058BFEB /* pcre */ = {
isa = PBXGroup;
children = (
@@ -1120,6 +1098,26 @@
path = bytecompiler;
sourceTree = "<group>";
};
+ 7E39D8370EC3A388003AF11A /* parser */ = {
+ isa = PBXGroup;
+ children = (
+ 933A3499038AE7C6008635CE /* Grammar.y */,
+ 93F1981A08245AAE001E9ABC /* Keywords.table */,
+ F692A8650255597D01FF60F7 /* Lexer.cpp */,
+ F692A8660255597D01FF60F7 /* Lexer.h */,
+ 7EFF00630EC05A9A00AA7C93 /* NodeInfo.h */,
+ F692A86D0255597D01FF60F7 /* Nodes.cpp */,
+ F692A86E0255597D01FF60F7 /* Nodes.h */,
+ F5FFE656026B47A6018635CA /* nodes2string.cpp */,
+ 93F0B3A909BB4DC00068FCE3 /* Parser.cpp */,
+ 93F0B3AA09BB4DC00068FCE3 /* Parser.h */,
+ 869EBCB60E8C6D4A008722CC /* ResultType.h */,
+ 65E866EE0DD59AFA00A2B2A1 /* SourceCode.h */,
+ 65E866ED0DD59AFA00A2B2A1 /* SourceProvider.h */,
+ );
+ path = parser;
+ sourceTree = "<group>";
+ };
7EF6E0BB0EB7A1EC0079AFAF /* runtime */ = {
isa = PBXGroup;
children = (
@@ -1450,7 +1448,7 @@
BC18C42D0E16F5CD00B34460 /* JSVariableObject.h in Headers */,
BC18C42E0E16F5CD00B34460 /* JSWrapperObject.h in Headers */,
BC18C42F0E16F5CD00B34460 /* LabelID.h in Headers */,
- BC18C4310E16F5CD00B34460 /* lexer.h in Headers */,
+ BC18C4310E16F5CD00B34460 /* Lexer.h in Headers */,
BC18C4340E16F5CD00B34460 /* ListHashSet.h in Headers */,
BC18C4350E16F5CD00B34460 /* ListRefPtr.h in Headers */,
BC18C4360E16F5CD00B34460 /* Locker.h in Headers */,
@@ -1461,7 +1459,7 @@
BC18C43B0E16F5CD00B34460 /* MathExtras.h in Headers */,
BC18C43C0E16F5CD00B34460 /* MathObject.h in Headers */,
BC18C43E0E16F5CD00B34460 /* MessageQueue.h in Headers */,
- BC18C43F0E16F5CD00B34460 /* nodes.h in Headers */,
+ BC18C43F0E16F5CD00B34460 /* Nodes.h in Headers */,
BC18C4400E16F5CD00B34460 /* Noncopyable.h in Headers */,
BC18C4410E16F5CD00B34460 /* NumberConstructor.h in Headers */,
BC18C4420E16F5CD00B34460 /* NumberConstructor.lut.h in Headers */,
diff --git a/JavaScriptCore/JavaScriptCoreSources.bkl b/JavaScriptCore/JavaScriptCoreSources.bkl
index dd4ff6e..cebdd79 100644
--- a/JavaScriptCore/JavaScriptCoreSources.bkl
+++ b/JavaScriptCore/JavaScriptCoreSources.bkl
@@ -48,10 +48,6 @@
<set append="1" var="JSCORE_SOURCES_KJS">
DerivedSources/JavaScriptCore/grammar.cpp
wtf/dtoa.cpp
- kjs/lexer.cpp
- kjs/nodes.cpp
- kjs/nodes2string.cpp
- kjs/Parser.cpp
</set>
<set append="1" var="JSCORE_SOURCES_PCRE">
pcre/pcre_compile.cpp
@@ -63,6 +59,12 @@
<set append="1" var="JSCORE_BYTECOMPILER_SOURCES">
bytecompiler/CodeGenerator.cpp
</set>
+ <set append="1" var="JSCORE_PARSER_SOURCES">
+ parser/Lexer.cpp
+ parser/Nodes.cpp
+ parser/nodes2string.cpp
+ parser/Parser.cpp
+ </set>
<set append="1" var="JSCORE_PROFILER_SOURCES">
profiler/HeavyProfile.cpp
profiler/ProfileGenerator.cpp
diff --git a/JavaScriptCore/VM/CodeBlock.h b/JavaScriptCore/VM/CodeBlock.h
index 9b6301e..446fc09 100644
--- a/JavaScriptCore/VM/CodeBlock.h
+++ b/JavaScriptCore/VM/CodeBlock.h
@@ -32,7 +32,7 @@
#include "Instruction.h"
#include "JSGlobalObject.h"
-#include "nodes.h"
+#include "Nodes.h"
#include "Parser.h"
#include "SourceCode.h"
#include "UString.h"
diff --git a/JavaScriptCore/VM/ExceptionHelpers.cpp b/JavaScriptCore/VM/ExceptionHelpers.cpp
index 0ad332d..8e18d5f 100644
--- a/JavaScriptCore/VM/ExceptionHelpers.cpp
+++ b/JavaScriptCore/VM/ExceptionHelpers.cpp
@@ -34,7 +34,7 @@
#include "JSObject.h"
#include "JSNotAnObject.h"
#include "Machine.h"
-#include "nodes.h"
+#include "Nodes.h"
namespace JSC {
diff --git a/JavaScriptCore/VM/SamplingTool.h b/JavaScriptCore/VM/SamplingTool.h
index 059f0d5..db9fb00 100644
--- a/JavaScriptCore/VM/SamplingTool.h
+++ b/JavaScriptCore/VM/SamplingTool.h
@@ -33,7 +33,7 @@
#include <wtf/HashMap.h>
#include <wtf/Threading.h>
-#include "nodes.h"
+#include "Nodes.h"
#include "Opcode.h"
namespace JSC {
diff --git a/JavaScriptCore/bytecompiler/CodeGenerator.h b/JavaScriptCore/bytecompiler/CodeGenerator.h
index 75fc0a5b..4d4638f 100644
--- a/JavaScriptCore/bytecompiler/CodeGenerator.h
+++ b/JavaScriptCore/bytecompiler/CodeGenerator.h
@@ -40,7 +40,7 @@
#include "SegmentedVector.h"
#include "SymbolTable.h"
#include "Debugger.h"
-#include "nodes.h"
+#include "Nodes.h"
#include <wtf/PassRefPtr.h>
#include <wtf/Vector.h>
diff --git a/JavaScriptCore/jsc.pro b/JavaScriptCore/jsc.pro
index 44258b1..cfd78d4 100644
--- a/JavaScriptCore/jsc.pro
+++ b/JavaScriptCore/jsc.pro
@@ -4,7 +4,7 @@
SOURCES = jsc.cpp
QT -= gui
INCLUDEPATH += $$PWD \
- $$PWD/kjs \
+ $$PWD/parser \
$$PWD/bindings \
$$PWD/bindings/c \
$$PWD/wtf \
diff --git a/JavaScriptCore/jscore.bkl b/JavaScriptCore/jscore.bkl
index 6345805..dfa90de 100644
--- a/JavaScriptCore/jscore.bkl
+++ b/JavaScriptCore/jscore.bkl
@@ -56,7 +56,7 @@
<include>$(SRCDIR)/DerivedSources/JavaScriptCore</include>
<include>$(SRCDIR)/ForwardingHeaders</include>
<include>$(SRCDIR)/debugger</include>
- <include>$(SRCDIR)/kjs</include>
+ <include>$(SRCDIR)/parser</include>
<include>$(SRCDIR)/pcre</include>
<include>$(SRCDIR)/profiler</include>
<include>$(SRCDIR)/runtime</include>
@@ -91,7 +91,7 @@
<include>$(WK_ROOT)/JavaScriptCore</include>
<include>$(WK_ROOT)/JavaScriptCore/bytecompiler</include>
<include>$(WK_ROOT)/JavaScriptCore/debugger</include>
- <include>$(WK_ROOT)/JavaScriptCore/kjs</include>
+ <include>$(WK_ROOT)/JavaScriptCore/parser</include>
<include>$(WK_ROOT)/JavaScriptCore/pcre</include>
<include>$(WK_ROOT)/JavaScriptCore/profiler</include>
<include>$(WK_ROOT)/JavaScriptCore/runtime</include>
diff --git a/JavaScriptCore/kjs/grammar.y b/JavaScriptCore/parser/Grammar.y
similarity index 99%
rename from JavaScriptCore/kjs/grammar.y
rename to JavaScriptCore/parser/Grammar.y
index 370798d..dec24a2 100644
--- a/JavaScriptCore/kjs/grammar.y
+++ b/JavaScriptCore/parser/Grammar.y
@@ -29,8 +29,8 @@
#include <stdlib.h>
#include "JSValue.h"
#include "JSObject.h"
-#include "nodes.h"
-#include "lexer.h"
+#include "Nodes.h"
+#include "Lexer.h"
#include "JSString.h"
#include "JSGlobalData.h"
#include "CommonIdentifiers.h"
diff --git a/JavaScriptCore/kjs/keywords.table b/JavaScriptCore/parser/Keywords.table
similarity index 100%
rename from JavaScriptCore/kjs/keywords.table
rename to JavaScriptCore/parser/Keywords.table
diff --git a/JavaScriptCore/kjs/lexer.cpp b/JavaScriptCore/parser/Lexer.cpp
similarity index 99%
rename from JavaScriptCore/kjs/lexer.cpp
rename to JavaScriptCore/parser/Lexer.cpp
index 039f621..c4b5a3b 100644
--- a/JavaScriptCore/kjs/lexer.cpp
+++ b/JavaScriptCore/parser/Lexer.cpp
@@ -21,11 +21,11 @@
*/
#include "config.h"
-#include "lexer.h"
+#include "Lexer.h"
#include "dtoa.h"
#include "JSFunction.h"
-#include "nodes.h"
+#include "Nodes.h"
#include "NodeInfo.h"
#include "JSGlobalObjectFunctions.h"
#include <ctype.h>
@@ -45,7 +45,7 @@
#endif
#include "Lookup.h"
-#include "lexer.lut.h"
+#include "Lexer.lut.h"
// a bridge for yacc from the C world to C++
int kjsyylex(void* lvalp, void* llocp, void* globalData)
diff --git a/JavaScriptCore/kjs/lexer.h b/JavaScriptCore/parser/Lexer.h
similarity index 100%
rename from JavaScriptCore/kjs/lexer.h
rename to JavaScriptCore/parser/Lexer.h
diff --git a/JavaScriptCore/kjs/NodeInfo.h b/JavaScriptCore/parser/NodeInfo.h
similarity index 98%
rename from JavaScriptCore/kjs/NodeInfo.h
rename to JavaScriptCore/parser/NodeInfo.h
index 2d11dc2..a518b23 100644
--- a/JavaScriptCore/kjs/NodeInfo.h
+++ b/JavaScriptCore/parser/NodeInfo.h
@@ -20,7 +20,7 @@
#ifndef NodeInfo_h
#define NodeInfo_h
-#include "nodes.h"
+#include "Nodes.h"
#include "Parser.h"
namespace JSC {
diff --git a/JavaScriptCore/kjs/nodes.cpp b/JavaScriptCore/parser/Nodes.cpp
similarity index 99%
rename from JavaScriptCore/kjs/nodes.cpp
rename to JavaScriptCore/parser/Nodes.cpp
index 0761eb2..5e5fd01 100644
--- a/JavaScriptCore/kjs/nodes.cpp
+++ b/JavaScriptCore/parser/Nodes.cpp
@@ -24,7 +24,7 @@
*/
#include "config.h"
-#include "nodes.h"
+#include "Nodes.h"
#include "CodeGenerator.h"
#include "ExecState.h"
@@ -36,7 +36,7 @@
#include "RegExpObject.h"
#include "SamplingTool.h"
#include "Debugger.h"
-#include "lexer.h"
+#include "Lexer.h"
#include "Operations.h"
#include <math.h>
#include <wtf/Assertions.h>
diff --git a/JavaScriptCore/kjs/nodes.h b/JavaScriptCore/parser/Nodes.h
similarity index 100%
rename from JavaScriptCore/kjs/nodes.h
rename to JavaScriptCore/parser/Nodes.h
diff --git a/JavaScriptCore/kjs/Parser.cpp b/JavaScriptCore/parser/Parser.cpp
similarity index 98%
rename from JavaScriptCore/kjs/Parser.cpp
rename to JavaScriptCore/parser/Parser.cpp
index 26773e8..51ffaf62 100644
--- a/JavaScriptCore/kjs/Parser.cpp
+++ b/JavaScriptCore/parser/Parser.cpp
@@ -24,7 +24,7 @@
#include "Parser.h"
#include "Debugger.h"
-#include "lexer.h"
+#include "Lexer.h"
#include <wtf/HashSet.h>
#include <wtf/Vector.h>
diff --git a/JavaScriptCore/kjs/Parser.h b/JavaScriptCore/parser/Parser.h
similarity index 99%
rename from JavaScriptCore/kjs/Parser.h
rename to JavaScriptCore/parser/Parser.h
index c2f55d7..2b00dc9 100644
--- a/JavaScriptCore/kjs/Parser.h
+++ b/JavaScriptCore/parser/Parser.h
@@ -25,7 +25,7 @@
#include "SourceProvider.h"
#include "Debugger.h"
-#include "nodes.h"
+#include "Nodes.h"
#include <wtf/Forward.h>
#include <wtf/Noncopyable.h>
#include <wtf/OwnPtr.h>
diff --git a/JavaScriptCore/kjs/ResultType.h b/JavaScriptCore/parser/ResultType.h
similarity index 100%
rename from JavaScriptCore/kjs/ResultType.h
rename to JavaScriptCore/parser/ResultType.h
diff --git a/JavaScriptCore/kjs/SourceCode.h b/JavaScriptCore/parser/SourceCode.h
similarity index 100%
rename from JavaScriptCore/kjs/SourceCode.h
rename to JavaScriptCore/parser/SourceCode.h
diff --git a/JavaScriptCore/kjs/SourceProvider.h b/JavaScriptCore/parser/SourceProvider.h
similarity index 100%
rename from JavaScriptCore/kjs/SourceProvider.h
rename to JavaScriptCore/parser/SourceProvider.h
diff --git a/JavaScriptCore/kjs/nodes2string.cpp b/JavaScriptCore/parser/nodes2string.cpp
similarity index 99%
rename from JavaScriptCore/kjs/nodes2string.cpp
rename to JavaScriptCore/parser/nodes2string.cpp
index 4afefe0..62bb266 100644
--- a/JavaScriptCore/kjs/nodes2string.cpp
+++ b/JavaScriptCore/parser/nodes2string.cpp
@@ -21,7 +21,7 @@
*/
#include "config.h"
-#include "nodes.h"
+#include "Nodes.h"
#include <wtf/MathExtras.h>
#include <wtf/StringExtras.h>
diff --git a/JavaScriptCore/pcre/pcre.pri b/JavaScriptCore/pcre/pcre.pri
index ec5c0d5..ed866cf 100644
--- a/JavaScriptCore/pcre/pcre.pri
+++ b/JavaScriptCore/pcre/pcre.pri
@@ -1,6 +1,6 @@
# Perl Compatible Regular Expressions - Qt4 build info
VPATH += $$PWD
-INCLUDEPATH += $$PWD $$OUTPUT_DIR/JavaScriptCore/kjs/tmp
+INCLUDEPATH += $$PWD $$OUTPUT_DIR/JavaScriptCore/parser/tmp
DEPENDPATH += $$PWD
isEmpty(GENERATED_SOURCES_DIR):GENERATED_SOURCES_DIR = tmp
diff --git a/JavaScriptCore/pcre/pcre_exec.cpp b/JavaScriptCore/pcre/pcre_exec.cpp
index 41f50c9..312393c 100644
--- a/JavaScriptCore/pcre/pcre_exec.cpp
+++ b/JavaScriptCore/pcre/pcre_exec.cpp
@@ -50,7 +50,7 @@
#include <wtf/Vector.h>
#if REGEXP_HISTOGRAM
-#include <kjs/DateMath.h>
+#include <parser/DateMath.h>
#include <runtime/UString.h>
#endif
diff --git a/JavaScriptCore/runtime/FunctionConstructor.cpp b/JavaScriptCore/runtime/FunctionConstructor.cpp
index adc3d3c..bc6bf23 100644
--- a/JavaScriptCore/runtime/FunctionConstructor.cpp
+++ b/JavaScriptCore/runtime/FunctionConstructor.cpp
@@ -27,8 +27,8 @@
#include "JSString.h"
#include "Parser.h"
#include "Debugger.h"
-#include "lexer.h"
-#include "nodes.h"
+#include "Lexer.h"
+#include "Nodes.h"
namespace JSC {
diff --git a/JavaScriptCore/runtime/JSActivation.h b/JavaScriptCore/runtime/JSActivation.h
index 16d131b..c849156 100644
--- a/JavaScriptCore/runtime/JSActivation.h
+++ b/JavaScriptCore/runtime/JSActivation.h
@@ -33,7 +33,7 @@
#include "JSVariableObject.h"
#include "RegisterFile.h"
#include "SymbolTable.h"
-#include "nodes.h"
+#include "Nodes.h"
namespace JSC {
diff --git a/JavaScriptCore/runtime/JSFunction.h b/JavaScriptCore/runtime/JSFunction.h
index 694a0f4..944c3fb 100644
--- a/JavaScriptCore/runtime/JSFunction.h
+++ b/JavaScriptCore/runtime/JSFunction.h
@@ -27,7 +27,7 @@
#include "InternalFunction.h"
#include "JSVariableObject.h"
#include "SymbolTable.h"
-#include "nodes.h"
+#include "Nodes.h"
#include "JSObject.h"
namespace JSC {
diff --git a/JavaScriptCore/runtime/JSGlobalData.cpp b/JavaScriptCore/runtime/JSGlobalData.cpp
index bd725f5..3e324a1 100644
--- a/JavaScriptCore/runtime/JSGlobalData.cpp
+++ b/JavaScriptCore/runtime/JSGlobalData.cpp
@@ -39,9 +39,9 @@
#include "Machine.h"
#include "Parser.h"
#include "Collector.h"
-#include "lexer.h"
+#include "Lexer.h"
#include "Lookup.h"
-#include "nodes.h"
+#include "Nodes.h"
#if ENABLE(JSC_MULTIPLE_THREADS)
#include <wtf/Threading.h>
diff --git a/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp b/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp
index 8bb1c6b..0bc8f28 100644
--- a/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp
+++ b/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp
@@ -32,8 +32,8 @@
#include "Machine.h"
#include "Parser.h"
#include "dtoa.h"
-#include "lexer.h"
-#include "nodes.h"
+#include "Lexer.h"
+#include "Nodes.h"
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/JavaScriptCore/runtime/JSObject.cpp b/JavaScriptCore/runtime/JSObject.cpp
index 897cf38..0723d1c 100644
--- a/JavaScriptCore/runtime/JSObject.cpp
+++ b/JavaScriptCore/runtime/JSObject.cpp
@@ -32,7 +32,7 @@
#include "ObjectPrototype.h"
#include "PropertyNameArray.h"
#include "Lookup.h"
-#include "nodes.h"
+#include "Nodes.h"
#include "Operations.h"
#include <math.h>
#include <wtf/Assertions.h>
@@ -435,7 +435,7 @@
double JSObject::toNumber(ExecState* exec) const
{
JSValue* primitive = toPrimitive(exec, PreferNumber);
- if (exec->hadException()) // should be picked up soon in nodes.cpp
+ if (exec->hadException()) // should be picked up soon in Nodes.cpp
return 0.0;
return primitive->toNumber(exec);
}
diff --git a/JavaScriptCore/runtime/RegExp.cpp b/JavaScriptCore/runtime/RegExp.cpp
index 661a1c7..974a1fc 100644
--- a/JavaScriptCore/runtime/RegExp.cpp
+++ b/JavaScriptCore/runtime/RegExp.cpp
@@ -22,7 +22,7 @@
#include "RegExp.h"
#include "CTI.h"
-#include "lexer.h"
+#include "Lexer.h"
#include <pcre/pcre.h>
#include <stdio.h>
#include <stdlib.h>
