Skip to content
Permalink
Browse files
JavaScriptCore:
2008-07-05  Sam Weinig  <sam@webkit.org>

        Rubber-stamped by Cameron Zwarich.

        Rename list.h/cpp to ArgList.h/cpp.

        * GNUmakefile.am:
        * JavaScriptCore.pri:
        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
        * JavaScriptCore.xcodeproj/project.pbxproj:
        * JavaScriptCoreSources.bkl:
        * VM/Machine.h:
        * kjs/AllInOneFile.cpp:
        * kjs/ArgList.cpp: Copied from JavaScriptCore/kjs/list.cpp.
        * kjs/ArgList.h: Copied from JavaScriptCore/kjs/list.h.
        * kjs/IndexToNameMap.cpp:
        * kjs/JSGlobalData.cpp:
        * kjs/JSGlobalData.h:
        * kjs/JSObject.h:
        * kjs/collector.cpp:
        * kjs/list.cpp: Removed.
        * kjs/list.h: Removed.

WebCore:

2008-07-05  Sam Weinig  <sam@webkit.org>

        Rubber-stamped by Cameron Zwarich.

        Rename list.h/cpp to ArgList.h/cpp.

        * ForwardingHeaders/kjs/ArgList.h: Copied from WebCore/ForwardingHeaders/kjs/list.h.
        * ForwardingHeaders/kjs/list.h: Removed.
        * WebCore.vcproj/WebCore.vcproj:
        * bridge/qt/qt_instance.cpp:
        * page/Console.cpp:



Canonical link: https://commits.webkit.org/27464@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@35021 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
weinig committed Jul 6, 2008
1 parent c23039f commit 8d54e69346bf15ef6ed484e507577b549f768165
Showing 21 changed files with 69 additions and 39 deletions.
@@ -1,3 +1,26 @@
2008-07-05 Sam Weinig <sam@webkit.org>

Rubber-stamped by Cameron Zwarich.

Rename list.h/cpp to ArgList.h/cpp.

* GNUmakefile.am:
* JavaScriptCore.pri:
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* JavaScriptCore.xcodeproj/project.pbxproj:
* JavaScriptCoreSources.bkl:
* VM/Machine.h:
* kjs/AllInOneFile.cpp:
* kjs/ArgList.cpp: Copied from JavaScriptCore/kjs/list.cpp.
* kjs/ArgList.h: Copied from JavaScriptCore/kjs/list.h.
* kjs/IndexToNameMap.cpp:
* kjs/JSGlobalData.cpp:
* kjs/JSGlobalData.h:
* kjs/JSObject.h:
* kjs/collector.cpp:
* kjs/list.cpp: Removed.
* kjs/list.h: Removed.

2008-07-05 Sam Weinig <sam@webkit.org>

Fix non-AllInOne builds again.
@@ -74,6 +74,7 @@ javascriptcore_built_sources += \
DerivedSources/grammar.cpp

javascriptcore_sources += \
JavaScriptCore/kjs/ArgList.cpp \
JavaScriptCore/kjs/Arguments.cpp \
JavaScriptCore/kjs/ArrayConstructor.cpp \
JavaScriptCore/kjs/ArrayPrototype.cpp \
@@ -115,7 +116,6 @@ javascriptcore_sources += \
JavaScriptCore/kjs/JSWrapperObject.cpp \
JavaScriptCore/kjs/LabelStack.cpp \
JavaScriptCore/kjs/lexer.cpp \
JavaScriptCore/kjs/list.cpp \
JavaScriptCore/kjs/lookup.cpp \
JavaScriptCore/kjs/MathObject.cpp \
JavaScriptCore/kjs/NativeErrorConstructor.cpp \
@@ -61,6 +61,7 @@ SOURCES += \
# AllInOneFile.cpp helps gcc analize and optimize code
# Other compilers may be able to do this at link time
SOURCES += \
kjs/ArgList.cpp \
kjs/Arguments.cpp \
kjs/ArrayConstructor.cpp \
kjs/ArrayPrototype.cpp \
@@ -102,7 +103,6 @@ SOURCES += \
kjs/JSWrapperObject.cpp \
kjs/LabelStack.cpp \
kjs/lexer.cpp \
kjs/list.cpp \
kjs/lookup.cpp \
kjs/MathObject.cpp \
kjs/NativeErrorConstructor.cpp \
@@ -269,7 +269,11 @@
Name="KJS"
>
<File
RelativePath="..\..\kjs\Activation.h"
RelativePath="..\..\kjs\ArgList.cpp"
>
</File>
<File
RelativePath="..\..\kjs\ArgList.h"
>
</File>
<File
@@ -644,14 +648,6 @@
RelativePath="..\..\kjs\LabelStack.h"
>
</File>
<File
RelativePath="..\..\kjs\list.cpp"
>
</File>
<File
RelativePath="..\..\kjs\list.h"
>
</File>
<File
RelativePath="..\..\kjs\lookup.cpp"
>
@@ -178,7 +178,6 @@
BC18C42F0E16F5CD00B34460 /* LabelID.h in Headers */ = {isa = PBXBuildFile; fileRef = 149B20D70D8A0891009CB8C7 /* LabelID.h */; };
BC18C4300E16F5CD00B34460 /* LabelStack.h in Headers */ = {isa = PBXBuildFile; fileRef = 65B813A80CD1D01900DF59D6 /* LabelStack.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC18C4310E16F5CD00B34460 /* lexer.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8660255597D01FF60F7 /* lexer.h */; };
BC18C4330E16F5CD00B34460 /* list.h in Headers */ = {isa = PBXBuildFile; fileRef = 931C6CEF038EE8DE008635CE /* list.h */; settings = {ATTRIBUTES = (Private, ); }; };
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, ); }; };
@@ -267,6 +266,7 @@
BCD2034A0E17135E002C7E82 /* DateConstructor.h in Headers */ = {isa = PBXBuildFile; fileRef = BCD203460E17135E002C7E82 /* DateConstructor.h */; };
BCD2034C0E17135E002C7E82 /* DatePrototype.h in Headers */ = {isa = PBXBuildFile; fileRef = BCD203480E17135E002C7E82 /* DatePrototype.h */; };
BCD203E80E1718F4002C7E82 /* DatePrototype.lut.h in Headers */ = {isa = PBXBuildFile; fileRef = BCD203E70E1718F4002C7E82 /* DatePrototype.lut.h */; };
BCF605140E203EF800B9A64D /* ArgList.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF605120E203EF800B9A64D /* ArgList.h */; settings = {ATTRIBUTES = (Private, ); }; };
E178636D0D9BEEC300D74E75 /* InitializeThreading.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E178636C0D9BEEC300D74E75 /* InitializeThreading.cpp */; };
E18E3A590DF9278C00D90B34 /* JSGlobalData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E18E3A570DF9278C00D90B34 /* JSGlobalData.cpp */; };
E1A862A90D7EBB76001EC6AA /* CollatorICU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1A862A80D7EBB76001EC6AA /* CollatorICU.cpp */; settings = {COMPILER_FLAGS = "-fno-strict-aliasing"; }; };
@@ -558,8 +558,6 @@
930754BF08B0F68000AB3056 /* pcre_compile.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pcre_compile.cpp; path = pcre/pcre_compile.cpp; sourceTree = "<group>"; tabWidth = 8; };
930754CE08B0F74500AB3056 /* pcre_tables.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pcre_tables.cpp; path = pcre/pcre_tables.cpp; sourceTree = "<group>"; tabWidth = 8; };
930754E908B0F78500AB3056 /* pcre_exec.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pcre_exec.cpp; path = pcre/pcre_exec.cpp; sourceTree = "<group>"; tabWidth = 8; };
931C6CEF038EE8DE008635CE /* list.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = list.h; sourceTree = "<group>"; tabWidth = 8; };
931C6CF0038EE8DE008635CE /* list.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = list.cpp; sourceTree = "<group>"; tabWidth = 8; };
9322A00306C341D3009067BB /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = /usr/lib/libicucore.dylib; sourceTree = "<absolute>"; };
932F5BD80822A1C700736975 /* Info.plist */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; tabWidth = 8; usesTabs = 1; };
932F5BD90822A1C700736975 /* JavaScriptCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JavaScriptCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -683,6 +681,8 @@
BCD203470E17135E002C7E82 /* DatePrototype.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatePrototype.cpp; sourceTree = "<group>"; };
BCD203480E17135E002C7E82 /* DatePrototype.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatePrototype.h; sourceTree = "<group>"; };
BCD203E70E1718F4002C7E82 /* DatePrototype.lut.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatePrototype.lut.h; sourceTree = "<group>"; };
BCF605110E203EF800B9A64D /* ArgList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArgList.cpp; sourceTree = "<group>"; };
BCF605120E203EF800B9A64D /* ArgList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArgList.h; sourceTree = "<group>"; };
BCF6553B0A2048DE0038A194 /* MathExtras.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MathExtras.h; sourceTree = "<group>"; };
D21202280AD4310C00ED79B6 /* DateMath.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DateMath.cpp; sourceTree = "<group>"; };
D21202290AD4310C00ED79B6 /* DateMath.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DateMath.h; sourceTree = "<group>"; };
@@ -1064,6 +1064,8 @@
isa = PBXGroup;
children = (
659126BC0BDD1728001921FB /* AllInOneFile.cpp */,
BCF605110E203EF800B9A64D /* ArgList.cpp */,
BCF605120E203EF800B9A64D /* ArgList.h */,
BC257DE50E1F51C50016B6C9 /* Arguments.cpp */,
BC257DE60E1F51C50016B6C9 /* Arguments.h */,
BC7952060E15E8A800A898AB /* ArrayConstructor.cpp */,
@@ -1163,8 +1165,6 @@
93F1981A08245AAE001E9ABC /* keywords.table */,
BC02E9B70E1844CF000F9297 /* LabelStack.cpp */,
65B813A80CD1D01900DF59D6 /* LabelStack.h */,
931C6CF0038EE8DE008635CE /* list.cpp */,
931C6CEF038EE8DE008635CE /* list.h */,
F692A8680255597D01FF60F7 /* lookup.cpp */,
F692A8690255597D01FF60F7 /* lookup.h */,
F692A86A0255597D01FF60F7 /* MathObject.cpp */,
@@ -1384,7 +1384,6 @@
BC18C42F0E16F5CD00B34460 /* LabelID.h in Headers */,
BC18C4300E16F5CD00B34460 /* LabelStack.h in Headers */,
BC18C4310E16F5CD00B34460 /* lexer.h in Headers */,
BC18C4330E16F5CD00B34460 /* list.h in Headers */,
BC18C4340E16F5CD00B34460 /* ListHashSet.h in Headers */,
BC18C4350E16F5CD00B34460 /* ListRefPtr.h in Headers */,
BC18C4360E16F5CD00B34460 /* Locker.h in Headers */,
@@ -1485,6 +1484,7 @@
BC257DF00E1F52ED0016B6C9 /* GlobalEvalFunction.h in Headers */,
BC257DF40E1F53740016B6C9 /* PrototypeFunction.h in Headers */,
BC756FC90E2031B200DE7D12 /* JSGlobalObjectFunctions.h in Headers */,
BCF605140E203EF800B9A64D /* ArgList.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -43,6 +43,7 @@ Source files for JSCore.

<set append="1" var="JSCORE_SOURCES_KJS">
DerivedSources/JavaScriptCore/grammar.cpp
kjs/ArgList.cpp
kjs/Arguments.cpp
kjs/ArrayConstructor.cpp
kjs/ArrayPrototype.cpp
@@ -90,7 +91,6 @@ Source files for JSCore.
kjs/JSWrapperObject.cpp
kjs/LabelStack.cpp
kjs/lexer.cpp
kjs/list.cpp
kjs/lookup.cpp
kjs/MathObject.cpp
kjs/NativeErrorConstructor.cpp
@@ -29,11 +29,11 @@
#ifndef Machine_h
#define Machine_h

#include "ArgList.h"
#include "JSCell.h"
#include "JSValue.h"
#include "Opcode.h"
#include "RegisterFile.h"
#include <kjs/list.h>
#include <wtf/HashMap.h>

namespace KJS {
@@ -66,7 +66,7 @@
#include "JSLock.cpp"
#include "JSWrapperObject.cpp"
#include "lexer.cpp"
#include "list.cpp"
#include "ArgList.cpp"
#include "lookup.cpp"
#include "MathObject.cpp"
#include "NativeErrorConstructor.cpp"
@@ -19,7 +19,7 @@
*/

#include "config.h"
#include "list.h"
#include "ArgList.h"

#include "JSValue.h"
#include "JSCell.h"
@@ -19,8 +19,8 @@
*
*/

#ifndef KJS_LIST_H
#define KJS_LIST_H
#ifndef ArgList_h
#define ArgList_h

#include "JSImmediate.h"
#include <wtf/HashSet.h>
@@ -30,7 +30,6 @@
namespace KJS {

class JSValue;
class ArgList;

class ArgList : Noncopyable {
private:
@@ -138,7 +137,7 @@ namespace KJS {
void* operator new(size_t, void*);
void operator delete(void*, size_t);
};

} // namespace KJS

#endif // KJS_LIST_H
#endif // ArgList_h
@@ -25,9 +25,9 @@
#include "config.h"
#include "IndexToNameMap.h"

#include "ArgList.h"
#include "JSFunction.h"
#include "identifier.h"
#include "list.h"

namespace KJS {

@@ -29,15 +29,15 @@
#include "config.h"
#include "JSGlobalData.h"

#include "collector.h"
#include "ArgList.h"
#include "CommonIdentifiers.h"
#include "JSLock.h"
#include "Machine.h"
#include "Parser.h"
#include "collector.h"
#include "lexer.h"
#include "list.h"
#include "lookup.h"
#include "Machine.h"
#include "nodes.h"
#include "Parser.h"

#if USE(MULTIPLE_THREADS)
#include <wtf/Threading.h>
@@ -29,7 +29,7 @@
#ifndef JSGlobalData_h
#define JSGlobalData_h

#include "list.h"
#include "ArgList.h"
#include <wtf/HashCountedSet.h>
#include <wtf/HashSet.h>
#include <wtf/Noncopyable.h>
@@ -23,6 +23,7 @@
#ifndef JSObject_h
#define JSObject_h

#include "ArgList.h"
#include "ClassInfo.h"
#include "CommonIdentifiers.h"
#include "ExecState.h"
@@ -31,7 +32,6 @@
#include "PropertyMap.h"
#include "PropertySlot.h"
#include "ScopeChain.h"
#include "list.h"

namespace KJS {

@@ -21,12 +21,12 @@
#include "config.h"
#include "collector.h"

#include "ArgList.h"
#include "ExecState.h"
#include "JSGlobalObject.h"
#include "JSLock.h"
#include "JSString.h"
#include "JSValue.h"
#include "list.h"
#include "Machine.h"
#include "Tracing.h"
#include <algorithm>
@@ -1,3 +1,15 @@
2008-07-05 Sam Weinig <sam@webkit.org>

Rubber-stamped by Cameron Zwarich.

Rename list.h/cpp to ArgList.h/cpp.

* ForwardingHeaders/kjs/ArgList.h: Copied from WebCore/ForwardingHeaders/kjs/list.h.
* ForwardingHeaders/kjs/list.h: Removed.
* WebCore.vcproj/WebCore.vcproj:
* bridge/qt/qt_instance.cpp:
* page/Console.cpp:

2008-07-05 Sam Weinig <sam@webkit.org>

Rubber-stamped by Cameron Zwarich.
@@ -0,0 +1 @@
#include <JavaScriptCore/ArgList.h>

This file was deleted.

@@ -16327,7 +16327,7 @@
>
</File>
<File
RelativePath="..\ForwardingHeaders\kjs\list.h"
RelativePath="..\ForwardingHeaders\kjs\ArgList.h"
>
</File>
<File
@@ -20,9 +20,9 @@
#include "config.h"
#include "qt_instance.h"

#include "ArgList.h"
#include "JSGlobalObject.h"
#include "JSLock.h"
#include "list.h"
#include "qt_class.h"
#include "qt_runtime.h"
#include "PropertyNameArray.h"
@@ -38,9 +38,9 @@
#include "Page.h"
#include "PageGroup.h"
#include "PlatformString.h"
#include <kjs/JSObject.h>
#include <kjs/ArgList.h>
#include <kjs/interpreter.h>
#include <kjs/list.h>
#include <kjs/JSObject.h>
#include <stdio.h>

using namespace KJS;

0 comments on commit 8d54e69

Please sign in to comment.