Changeset 47265 in webkit for trunk/JavaScriptCore

Timestamp:

Aug 13, 2009, 6:15:15 PM (16 years ago)

Author:

Darin Adler

Message:

JavaScriptCore: Some small bits of housekeeping.

Patch by Darin Adler <Darin Adler> on 2009-08-13
Reviewed by Mark Rowe.

• JavaScriptCore.xcodeproj/project.pbxproj: Make Parser.h

project instead of private. Remove JSONObject.lut.h.

• assembler/ARMAssembler.h: Remove unneeded WTF prefix.
• assembler/AssemblerBufferWithConstantPool.h: Ditto.
• bytecompiler/BytecodeGenerator.h: Ditto.

• wtf/SegmentedVector.h: Add a "using" statement as we do

with the other WTF headers.

WebCore: Follow-up to earlier work to remove dependencies on JavaScriptCore.

Patch by Darin Adler <Darin Adler> on 2009-08-13
Reviewed by Mark Rowe.

• ForwardingHeaders/parser/Parser.h: Removed.
• inspector/JavaScriptDebugServer.cpp: Removed now-unneeded includes

of Parser.h.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (3 diffs)
• assembler/ARMAssembler.h (modified) (1 diff)
• assembler/AssemblerBufferWithConstantPool.h (modified) (1 diff)
• bytecompiler/BytecodeGenerator.h (modified) (2 diffs)
• wtf/SegmentedVector.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-08-13  Darin Adler  <[email protected]>
+
+        Reviewed by Mark Rowe.
+
+        Some small bits of housekeeping.
+
+        * JavaScriptCore.xcodeproj/project.pbxproj: Make Parser.h
+        project instead of private. Remove JSONObject.lut.h.
+
+        * assembler/ARMAssembler.h: Remove unneeded WTF prefix.
+        * assembler/AssemblerBufferWithConstantPool.h: Ditto.
+        * bytecompiler/BytecodeGenerator.h: Ditto.
+
+        * wtf/SegmentedVector.h: Add a "using" statement as we do
+        with the other WTF headers.
+
 2009-08-13  Darin Adler  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -213 +213 @@
                 A7F9935F0FD7325100A0B2D0 /* JSONObject.h in Headers */ = {isa = PBXBuildFile; fileRef = A7F9935D0FD7325100A0B2D0 /* JSONObject.h */; };
                 A7F993600FD7325100A0B2D0 /* JSONObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7F9935E0FD7325100A0B2D0 /* JSONObject.cpp */; };
-                A7F9949B0FD746A300A0B2D0 /* JSONObject.lut.h in Headers */ = {isa = PBXBuildFile; fileRef = A7F9949A0FD746A300A0B2D0 /* JSONObject.lut.h */; };
                 BC02E90D0E1839DB000F9297 /* ErrorConstructor.h in Headers */ = {isa = PBXBuildFile; fileRef = BC02E9050E1839DB000F9297 /* ErrorConstructor.h */; };
                 BC02E90F0E1839DB000F9297 /* ErrorPrototype.h in Headers */ = {isa = PBXBuildFile; fileRef = BC02E9070E1839DB000F9297 /* ErrorPrototype.h */; };
@@ -306 +305 @@
                 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, ); }; };
+                BC18C44B0E16F5CD00B34460 /* Parser.h in Headers */ = {isa = PBXBuildFile; fileRef = 93F0B3AA09BB4DC00068FCE3 /* Parser.h */; settings = {ATTRIBUTES = (); }; };
                 BC18C44C0E16F5CD00B34460 /* PassRefPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 6580F795094070560082C219 /* PassRefPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 BC18C44D0E16F5CD00B34460 /* pcre.h in Headers */ = {isa = PBXBuildFile; fileRef = 6541720F039E08B90058BFEB /* pcre.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -1764 +1763 @@
                                 BC18C4250E16F5CD00B34460 /* JSObjectRef.h in Headers */,
                                 A7F9935F0FD7325100A0B2D0 /* JSONObject.h in Headers */,
-                                A7F9949B0FD746A300A0B2D0 /* JSONObject.lut.h in Headers */,
                                 9534AAFB0E5B7A9600B8A45B /* JSProfilerPrivate.h in Headers */,
                                 BC18C4260E16F5CD00B34460 /* JSRetainPtr.h in Headers */,

trunk/JavaScriptCore/assembler/ARMAssembler.h

@@ -78 +78 @@
         typedef ARM::FPRegisterID FPRegisterID;
         typedef AssemblerBufferWithConstantPool<2048, 4, 4, ARMAssembler> ARMBuffer;
-        typedef WTF::SegmentedVector<int, 64> Jumps;
+        typedef SegmentedVector<int, 64> Jumps;
 
         ARMAssembler() { }

trunk/JavaScriptCore/assembler/AssemblerBufferWithConstantPool.h

@@ -87 +87 @@
 template <int maxPoolSize, int barrierSize, int maxInstructionSize, class AssemblerType>
 class AssemblerBufferWithConstantPool: public AssemblerBuffer {
-    typedef WTF::SegmentedVector<uint32_t, 512> LoadOffsets;
+    typedef SegmentedVector<uint32_t, 512> LoadOffsets;
 public:
     enum {

trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.h

@@ -62 +62 @@
     };
 
-    class BytecodeGenerator : public WTF::FastAllocBase {
+    class BytecodeGenerator : public FastAllocBase {
     public:
         typedef DeclarationStacks::VarStack VarStack;
@@ -445 +445 @@
         RegisterID m_argumentsRegister;
         int m_activationRegisterIndex;
-        WTF::SegmentedVector<RegisterID, 32> m_constantPoolRegisters;
-        WTF::SegmentedVector<RegisterID, 32> m_calleeRegisters;
-        WTF::SegmentedVector<RegisterID, 32> m_parameters;
-        WTF::SegmentedVector<RegisterID, 32> m_globals;
-        WTF::SegmentedVector<Label, 32> m_labels;
-        WTF::SegmentedVector<LabelScope, 8> m_labelScopes;
+        SegmentedVector<RegisterID, 32> m_constantPoolRegisters;
+        SegmentedVector<RegisterID, 32> m_calleeRegisters;
+        SegmentedVector<RegisterID, 32> m_parameters;
+        SegmentedVector<RegisterID, 32> m_globals;
+        SegmentedVector<Label, 32> m_labels;
+        SegmentedVector<LabelScope, 8> m_labelScopes;
         RefPtr<RegisterID> m_lastVar;
         int m_finallyDepth;

trunk/JavaScriptCore/wtf/SegmentedVector.h

@@ -251 +251 @@
 } // namespace WTF
 
+using WTF::SegmentedVector;
+
 #endif // SegmentedVector_h