JavaScriptCore:

2008-06-16  Maciej Stachowiak  <mjs@apple.com>

        Reviewed by Alexey.

        - removed nearly unused types.h and LocalStorageEntry.h headers

        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
        * JavaScriptCore.xcodeproj/project.pbxproj:
        * kjs/ExecState.h:
        * kjs/LocalStorageEntry.h: Removed.
        * kjs/RegExpObject.cpp:
        * kjs/error_object.cpp:
        * kjs/grammar.y:
        * kjs/nodes.cpp:
        * kjs/types.h: Removed.

JavaScriptGlue:

2008-06-16  Maciej Stachowiak  <mjs@apple.com>

        Reviewed by Alexey.

        - removed nearly unused types.h and LocalStorageEntry.h headers

        * JSUtils.h:

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

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 9517c6bd33b258df6a616c2a2545f3bfd3193c73..29e4570be73b111cee5aa5f2fc13404a1978d725 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,19 @@
+2008-06-16  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Alexey.
+        
+        - removed nearly unused types.h and LocalStorageEntry.h headers
+
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * kjs/ExecState.h:
+        * kjs/LocalStorageEntry.h: Removed.
+        * kjs/RegExpObject.cpp:
+        * kjs/error_object.cpp:
+        * kjs/grammar.y:
+        * kjs/nodes.cpp:
+        * kjs/types.h: Removed.
+
 2008-06-16  Alp Toker  <alp@nuanti.com>
 
         Rubber-stamped by Geoff.

diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
index c3eefed9441dfb5a0ae70d011d0bb78b544c8f35..5686139038c1925a154c031ec5d28e9ab5c21a08 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
@@ -492,10 +492,6 @@
                                RelativePath="..\..\kjs\list.h"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\kjs\LocalStorageEntry.h"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\kjs\lookup.cpp"\r
                                >\r
@@ -628,10 +624,6 @@
                                RelativePath="..\..\kjs\SymbolTable.h"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\kjs\types.h"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\kjs\ustring.cpp"\r
                                >\r

diff --git a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
index 1fe3d9a17ec93d51af5ad387fd62cdff2d843ba4..e3e5767440be0eb3ff7e2b8f30800fdd993b5c08 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -146,7 +146,6 @@
                65E866F30DD59B6400A2B2A1 /* SourceRange.h in Headers */ = {isa = PBXBuildFile; fileRef = 65E866EE0DD59AFA00A2B2A1 /* SourceRange.h */; settings = {ATTRIBUTES = (Private, ); }; };
                65EA4C9C092AF9E20093D800 /* JSLock.h in Headers */ = {isa = PBXBuildFile; fileRef = 65EA4C9A092AF9E20093D800 /* JSLock.h */; settings = {ATTRIBUTES = (Private, ); }; };
                65EA73650BAE35D1001BB560 /* CommonIdentifiers.h in Headers */ = {isa = PBXBuildFile; fileRef = 65EA73630BAE35D1001BB560 /* CommonIdentifiers.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               65F340940CD6C1C000C0CA8B /* LocalStorageEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = 65F340840CD6C0DE00C0CA8B /* LocalStorageEntry.h */; settings = {ATTRIBUTES = (Private, ); }; };
                65FB3EB309D109F000F49DEB /* lexer.lut.h in Headers */ = {isa = PBXBuildFile; fileRef = 65FB3EB209D109F000F49DEB /* lexer.lut.h */; };
                65FB3F4F09D11B2400F49DEB /* date_object.lut.h in Headers */ = {isa = PBXBuildFile; fileRef = 65FB3F4709D11B2400F49DEB /* date_object.lut.h */; };
                65FB3F5109D11B2400F49DEB /* grammar.h in Headers */ = {isa = PBXBuildFile; fileRef = 65FB3F4909D11B2400F49DEB /* grammar.h */; };
@@ -179,7 +178,6 @@
                932F5B570822A1C700736975 /* RegExpObject.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A87C0255597D01FF60F7 /* RegExpObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
                932F5B580822A1C700736975 /* regexp.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A87E0255597D01FF60F7 /* regexp.h */; settings = {ATTRIBUTES = (Private, ); }; };
                932F5B590822A1C700736975 /* string_object.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8800255597D01FF60F7 /* string_object.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               932F5B5B0822A1C700736975 /* types.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8840255597D01FF60F7 /* types.h */; settings = {ATTRIBUTES = (Private, ); }; };
                932F5B5C0822A1C700736975 /* ustring.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8860255597D01FF60F7 /* ustring.h */; settings = {ATTRIBUTES = (Private, ); }; };
                932F5B600822A1C700736975 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = F68EBB8C0255D4C601FF60F7 /* config.h */; settings = {ATTRIBUTES = (Private, ); }; };
                932F5B610822A1C700736975 /* JavaScriptCorePrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = F5C290E60284F98E018635CA /* JavaScriptCorePrefix.h */; };
@@ -518,7 +516,6 @@
                65EA4C9A092AF9E20093D800 /* JSLock.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = JSLock.h; sourceTree = "<group>"; tabWidth = 8; };
                65EA73620BAE35D1001BB560 /* CommonIdentifiers.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CommonIdentifiers.cpp; sourceTree = "<group>"; };
                65EA73630BAE35D1001BB560 /* CommonIdentifiers.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CommonIdentifiers.h; sourceTree = "<group>"; };
-               65F340840CD6C0DE00C0CA8B /* LocalStorageEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalStorageEntry.h; sourceTree = "<group>"; };
                65FB3EB209D109F000F49DEB /* lexer.lut.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = lexer.lut.h; path = ../../../../../symroots/Debug/DerivedSources/JavaScriptCore/lexer.lut.h; sourceTree = "<group>"; };
                65FB3F4709D11B2400F49DEB /* date_object.lut.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = date_object.lut.h; path = ../../../../../symroots/Debug/DerivedSources/JavaScriptCore/date_object.lut.h; sourceTree = "<group>"; };
                65FB3F4809D11B2400F49DEB /* grammar.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = grammar.cpp; sourceTree = "<group>"; };
@@ -646,7 +643,6 @@
                F692A87E0255597D01FF60F7 /* regexp.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = regexp.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A87F0255597D01FF60F7 /* string_object.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string_object.cpp; sourceTree = "<group>"; tabWidth = 8; };
                F692A8800255597D01FF60F7 /* string_object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = string_object.h; sourceTree = "<group>"; tabWidth = 8; };
-               F692A8840255597D01FF60F7 /* types.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = types.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; };
@@ -1036,7 +1032,6 @@
                                65B813A80CD1D01900DF59D6 /* LabelStack.h */,
                                931C6CF0038EE8DE008635CE /* list.cpp */,
                                931C6CEF038EE8DE008635CE /* list.h */,
-                               65F340840CD6C0DE00C0CA8B /* LocalStorageEntry.h */,
                                F692A8680255597D01FF60F7 /* lookup.cpp */,
                                F692A8690255597D01FF60F7 /* lookup.h */,
                                F692A86A0255597D01FF60F7 /* MathObject.cpp */,
@@ -1066,7 +1061,6 @@
                                F692A87F0255597D01FF60F7 /* string_object.cpp */,
                                F692A8800255597D01FF60F7 /* string_object.h */,
                                14A396A60CD2933100B5B4FF /* SymbolTable.h */,
-                               F692A8840255597D01FF60F7 /* types.h */,
                                F692A8850255597D01FF60F7 /* ustring.cpp */,
                                F692A8860255597D01FF60F7 /* ustring.h */,
                                F692A8870255597D01FF60F7 /* JSValue.cpp */,
@@ -1207,7 +1201,6 @@
                                65A7A5E00CD1D50E00061F8E /* LabelStack.h in Headers */,
                                657EB7460B708F540063461B /* ListHashSet.h in Headers */,
                                148A1627095D16BB00666D0D /* ListRefPtr.h in Headers */,
-                               65F340940CD6C1C000C0CA8B /* LocalStorageEntry.h in Headers */,
                                5DBD18B00C5401A700C15EAE /* MallocZoneSupport.h in Headers */,
                                BCF655590A2049710038A194 /* MathExtras.h in Headers */,
                                E1EE798C0D6CA53D00FEA3BA /* MessageQueue.h in Headers */,
@@ -1277,7 +1270,6 @@
                                932F5B680822A1C700736975 /* ScopeChain.h in Headers */,
                                932F5B590822A1C700736975 /* string_object.h in Headers */,
                                65B174F809D100FA00820339 /* string_object.lut.h in Headers */,
-                               932F5B5B0822A1C700736975 /* types.h in Headers */,
                                93E26BFE08B151D400F85226 /* ucpinternal.h in Headers */,
                                932F5B5C0822A1C700736975 /* ustring.h in Headers */,
                                14ABB36F099C076400E2A24F /* JSValue.h in Headers */,

diff --git a/JavaScriptCore/kjs/ExecState.h b/JavaScriptCore/kjs/ExecState.h
index 491615923d5168b08dd617988700154a627117ed..dea49e9d515ae197edfd7216c0dc05dfb3c81ea2 100644 (file)
--- a/JavaScriptCore/kjs/ExecState.h
+++ b/JavaScriptCore/kjs/ExecState.h
@@ -26,7 +26,6 @@
 
 #include "JSGlobalData.h"
 #include "LabelStack.h"
-#include "LocalStorageEntry.h"
 #include "completion.h"
 #include "list.h"
 #include "ScopeChain.h"

diff --git a/JavaScriptCore/kjs/LocalStorageEntry.h b/JavaScriptCore/kjs/LocalStorageEntry.h
deleted file mode 100644 (file)
index 3788bdd..0000000
--- a/JavaScriptCore/kjs/LocalStorageEntry.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// -*- mode: c++; c-basic-offset: 4 -*-
-/*
- *  Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
- *  Copyright (C) 2003, 2006, 2007, 2008 Apple Inc. All rights reserved.
- *  Copyright (C) 2007 Cameron Zwarich (cwzwarich@uwaterloo.ca)
- *  Copyright (C) 2007 Maks Orlovich
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public License
- *  along with this library; see the file COPYING.LIB.  If not, write to
- *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef LocalStorageEntry_h
-#define LocalStorageEntry_h
-
-#include <wtf/Forward.h>
-#include <wtf/VectorTraits.h>
-
-namespace KJS {
-
-    class JSValue;
-
-    struct LocalStorageEntry {
-        LocalStorageEntry()
-        {
-        }
-    
-        LocalStorageEntry(JSValue* v, unsigned a)
-            : value(v)
-            , attributes(a)
-        {
-        }
-
-        JSValue* value;
-        unsigned attributes;
-    };
-
-    typedef Vector<LocalStorageEntry, 32> LocalStorage;
-
-} // namespace KJS
-
-namespace WTF {
-
-    template<> struct VectorTraits<KJS::LocalStorageEntry> : VectorTraitsBase<true, KJS::LocalStorageEntry> { };
-
-} // namespace WTF
-
-#endif // LocalStorageEntry_h

diff --git a/JavaScriptCore/kjs/RegExpObject.cpp b/JavaScriptCore/kjs/RegExpObject.cpp
index f6f8eb688ee7fc6e7d667bd0c703da39435b4e74..bbc7ec558f83436ce883bbd78a2f997f4ec57b7c 100644 (file)
--- a/JavaScriptCore/kjs/RegExpObject.cpp
+++ b/JavaScriptCore/kjs/RegExpObject.cpp
@@ -29,7 +29,6 @@
 #include "JSObject.h"
 #include "operations.h"
 #include "regexp.h"
-#include "types.h"
 #include "JSValue.h"
 #include "UnusedParam.h"
 

diff --git a/JavaScriptCore/kjs/error_object.cpp b/JavaScriptCore/kjs/error_object.cpp
index d37365638806a217775c1037a9502504048abd52..efe0074b6401060814d42210c5839568dd90c372 100644 (file)
--- a/JavaScriptCore/kjs/error_object.cpp
+++ b/JavaScriptCore/kjs/error_object.cpp
@@ -24,7 +24,6 @@
 #include "JSGlobalObject.h"
 #include "JSObject.h"
 #include "operations.h"
-#include "types.h"
 #include "JSValue.h"
 
 namespace KJS {

diff --git a/JavaScriptCore/kjs/grammar.y b/JavaScriptCore/kjs/grammar.y
index f51987e73e0f58ef22d9427b39d90fae73e7d48d..656c5659e4122f923b99bd144c706642162a6579 100644 (file)
--- a/JavaScriptCore/kjs/grammar.y
+++ b/JavaScriptCore/kjs/grammar.y
@@ -29,7 +29,6 @@
 #include <stdlib.h>
 #include "JSValue.h"
 #include "JSObject.h"
-#include "types.h"
 #include "nodes.h"
 #include "lexer.h"
 #include "JSString.h"

diff --git a/JavaScriptCore/kjs/nodes.cpp b/JavaScriptCore/kjs/nodes.cpp
index 49f4d5d7000a64fd68d924e50d8d0a43eab54eae..59d2b1a984baf58c7d9f8cc338ed63834cba7f4c 100644 (file)
--- a/JavaScriptCore/kjs/nodes.cpp
+++ b/JavaScriptCore/kjs/nodes.cpp
@@ -45,12 +45,6 @@
 
 namespace KJS {
 
-static inline bool isConstant(const LocalStorage& localStorage, size_t index)
-{
-    ASSERT(index < localStorage.size());
-    return localStorage[index].attributes & ReadOnly;
-}
-
 static inline UString::Rep* rep(const Identifier& ident)
 {
     return ident.ustring().rep();

diff --git a/JavaScriptCore/kjs/types.h b/JavaScriptCore/kjs/types.h
deleted file mode 100644 (file)
index 603b2a2..0000000
--- a/JavaScriptCore/kjs/types.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// -*- c-basic-offset: 2 -*-
-/*
- *  This file is part of the KDE libraries
- *  Copyright (C) 1999-2001 Harri Porten (porten@kde.org)
- *  Copyright (C) 2001 Peter Kelly (pmk@post.com)
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public License
- *  along with this library; see the file COPYING.LIB.  If not, write to
- *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301, USA.
- *
- */
-
-#include "completion.h"
-#include "list.h"

diff --git a/JavaScriptGlue/ChangeLog b/JavaScriptGlue/ChangeLog
index c7ac48ccb7cf0fa618325eb4911b9131bebd4fd4..208ff4f9edbaecdd12f7f8d6b995880313db07b9 100644 (file)
--- a/JavaScriptGlue/ChangeLog
+++ b/JavaScriptGlue/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-16  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Alexey.
+
+        - removed nearly unused types.h and LocalStorageEntry.h headers
+
+        * JSUtils.h:
+
 2008-06-16  Alexey Proskuryakov  <ap@webkit.org>
 
         Reviewed by Geoff Garen.

diff --git a/JavaScriptGlue/JSUtils.h b/JavaScriptGlue/JSUtils.h
index f084a235b49047591053c983867bb33e607cbd8d..71678cbd5301274297674c7235b8a5a22bfd3f9b 100644 (file)
--- a/JavaScriptGlue/JSUtils.h
+++ b/JavaScriptGlue/JSUtils.h
@@ -34,7 +34,6 @@
 #include <JavaScriptCore/JSValue.h>
 #include <JavaScriptCore/JSObject.h>
 #include <JavaScriptCore/JSGlobalObject.h>
-#include <JavaScriptCore/types.h>
 #include <JavaScriptCore/interpreter.h>
 #include <JavaScriptCore/protect.h>
 #include <JavaScriptCore/collector.h>