JavaScriptCore:
Rubber-stamped by John Sullivan.
- switched from a shell script to a makefile for generated files
- removed lots of unneeded includes
- added new Forward.h and HashForward.h headers that allow compiling with
fewer unneeded templates
* DerivedSources.make: Added.
* generate-derived-sources: Removed.
* JavaScriptCore.xcodeproj/project.pbxproj: Added new files, changed to use
DerivedSources.make.
* kxmlcore/Forward.h: Added.
* kxmlcore/HashForward.h: Added.
* kxmlcore/HashCountedSet.h: Include HashForward for default args.
* kxmlcore/HashMap.h: Ditto.
* kxmlcore/HashSet.h: Ditto.
* kjs/object.h:
* kjs/object.cpp:
Moved KJS_MAX_STACK into the .cpp file.
* bindings/NP_jsobject.cpp:
* bindings/c/c_instance.h:
* bindings/jni/jni_class.h:
* bindings/jni/jni_runtime.h:
* bindings/jni/jni_utility.h:
* bindings/objc/WebScriptObject.mm:
* bindings/objc/WebScriptObjectPrivate.h:
* bindings/objc/objc_class.h:
* bindings/objc/objc_class.mm:
* bindings/objc/objc_instance.h:
* bindings/objc/objc_instance.mm:
* bindings/objc/objc_runtime.mm:
* bindings/objc/objc_utility.mm:
* bindings/runtime.h:
* bindings/runtime_array.cpp:
* bindings/runtime_array.h:
* bindings/runtime_method.cpp:
* bindings/runtime_method.h:
* bindings/runtime_object.cpp:
* bindings/runtime_root.h:
* kjs/JSImmediate.cpp:
* kjs/Parser.h:
* kjs/array_object.cpp:
* kjs/array_object.h:
* kjs/bool_object.cpp:
* kjs/bool_object.h:
* kjs/collector.h:
* kjs/context.h:
* kjs/debugger.cpp:
* kjs/error_object.h:
* kjs/function_object.h:
* kjs/internal.h:
* kjs/lexer.cpp:
* kjs/math_object.cpp:
* kjs/math_object.h:
* kjs/nodes.cpp:
* kjs/nodes.h:
* kjs/number_object.cpp:
* kjs/number_object.h:
* kjs/object_object.cpp:
* kjs/operations.cpp:
* kjs/protected_reference.h:
* kjs/reference.h:
* kjs/reference_list.h:
* kjs/regexp_object.h:
* kjs/string_object.cpp:
* kjs/string_object.h:
* kjs/testkjs.cpp:
* kjs/value.cpp:
* kjs/value.h:
* kxmlcore/HashTable.h:
* kxmlcore/ListRefPtr.h:
* kxmlcore/TCPageMap.h:
* kxmlcore/Vector.h:
Removed unneeded header includes.
JavaScriptGlue:
Rubber-stamped by John Sullivan.
- added forwarding headers for the new Forward.h and HashForward.h files
* kxmlcore/Forward.h: Added.
* kxmlcore/HashForward.h: Added.
WebCore:
Rubber-stamped by John Sullivan (except for pbxproj change).
- updated to use the new Forward.h and HashForward.h headers
- moved the showTree debugging functions out of the WebCore
namespace so they are easier to call from gdb, and renamed
the showTree member functions so they don't get in the way;
now you can do "call showTree(x)" in gdb and it just works
- removed a lot of unneeded includes
* WebCore.xcodeproj/project.pbxproj: Fixed a lot of paths that
were not relative to the enclosing group.
* ForwardingHeaders/kxmlcore/Forward.h: Added.
* ForwardingHeaders/kxmlcore/HashForward.h: Added.
* bindings/js/JSCanvasRenderingContext2DBase.cpp:
* bindings/js/JSXMLHttpRequest.cpp:
* bindings/js/JSXMLHttpRequest.h:
* bindings/js/JSXSLTProcessor.h:
* bindings/js/kjs_binding.h:
* bindings/js/kjs_dom.cpp:
* bindings/js/kjs_dom.h:
* bindings/js/kjs_events.cpp:
* bindings/js/kjs_events.h:
* bindings/js/kjs_html.cpp:
* bindings/js/kjs_navigator.cpp:
* bindings/js/kjs_navigator.h:
* bindings/js/kjs_proxy.cpp:
* bindings/js/kjs_traversal.h:
* bindings/js/kjs_window.cpp:
* bindings/js/kjs_window.h:
* bindings/objc/DOM.mm:
* bindings/objc/DOMCSS.mm:
* bindings/objc/DOMCore.h:
* bindings/objc/DOMEvents.mm:
* bindings/objc/DOMHTML.mm:
* bindings/objc/DOMImplementationFront.h:
* bindings/objc/DOMInternal.mm:
* bindings/objc/DOMUtility.mm:
* bindings/objc/DOMViews.mm:
* bridge/BrowserExtension.h:
* bridge/mac/BrowserExtensionMac.mm:
* bridge/mac/FrameMac.h:
* bridge/mac/FrameMac.mm:
* bridge/mac/WebCoreFrameBridge.mm:
* bridge/mac/WebCoreFrameNamespaces.mm:
* bridge/mac/WebCoreJavaScript.mm:
* bridge/win/PageWin.cpp:
* css/CSSComputedStyleDeclaration.cpp:
* css/css_base.h:
* css/css_ruleimpl.h:
* css/css_valueimpl.cpp:
* css/cssparser.cpp:
* css/cssparser.h:
* css/cssstyleselector.cpp:
* css/cssstyleselector.h:
* dom/AbstractView.h:
* dom/AtomicStringList.h:
* dom/Attribute.cpp:
* dom/Attribute.h:
* dom/Comment.cpp:
* dom/ContainerNode.cpp:
* dom/DOMImplementation.cpp:
* dom/DOMImplementation.h:
* dom/Document.cpp:
* dom/Document.h:
* dom/Element.h:
* dom/EventTargetNode.cpp:
(WebCore::EventTargetNode::dump):
(WebCore::forbidEventDispatch):
(WebCore::allowEventDispatch):
(WebCore::eventDispatchForbidden):
* dom/EventTargetNode.h:
(WebCore::EventTargetNode::postDispatchEventHandler):
* dom/NamedAttrMap.h:
* dom/Node.cpp:
(WebCore::Node::showNode):
(WebCore::Node::showTree):
(WebCore::Node::showTreeAndMark):
(showTree):
* dom/Node.h:
* dom/NodeList.cpp:
* dom/NodeList.h:
* dom/Position.cpp:
(showTree):
* dom/Position.h:
* dom/Range.cpp:
* dom/Range.h:
* dom/StyledElement.cpp:
* dom/StyledElement.h:
* dom/dom2_eventsimpl.cpp:
* dom/dom2_eventsimpl.h:
* dom/dom2_traversalimpl.h:
* dom/dom_xmlimpl.cpp:
* dom/xml_tokenizer.cpp:
* dom/xml_tokenizer.h:
* editing/AppendNodeCommand.cpp:
* editing/ApplyStyleCommand.cpp:
* editing/ApplyStyleCommand.h:
* editing/BreakBlockquoteCommand.cpp:
* editing/CompositeEditCommand.cpp:
* editing/CreateLinkCommand.cpp:
* editing/DeleteFromTextNodeCommand.cpp:
* editing/DeleteFromTextNodeCommand.h:
* editing/DeleteSelectionCommand.cpp:
* editing/EditCommand.cpp:
* editing/EditCommand.h:
* editing/HTMLInterchange.cpp:
* editing/InsertIntoTextNodeCommand.cpp:
* editing/InsertIntoTextNodeCommand.h:
* editing/InsertLineBreakCommand.cpp:
* editing/InsertNodeBeforeCommand.cpp:
* editing/InsertParagraphSeparatorCommand.cpp:
* editing/InsertTextCommand.cpp:
* editing/JSEditor.cpp:
* editing/JoinTextNodesCommand.cpp:
* editing/MergeIdenticalElementsCommand.cpp:
* editing/ModifySelectionListLevelCommand.cpp:
* editing/MoveSelectionCommand.cpp:
* editing/RebalanceWhitespaceCommand.h:
* editing/RemoveCSSPropertyCommand.h:
* editing/ReplaceSelectionCommand.cpp:
* editing/ReplaceSelectionCommand.h:
* editing/Selection.cpp:
(WebCore::Selection::formatForDebugger):
(WebCore::Selection::showTree):
(showTree):
* editing/Selection.h:
* editing/SelectionController.cpp:
(WebCore::SelectionController::formatForDebugger):
(WebCore::SelectionController::showTree):
(showTree):
* editing/SelectionController.h:
* editing/TextIterator.cpp:
* editing/TextIterator.h:
* editing/TypingCommand.cpp:
* editing/TypingCommand.h:
* editing/UnlinkCommand.cpp:
* editing/VisiblePosition.cpp:
(WebCore::isEqualIgnoringAffinity):
(WebCore::VisiblePosition::formatForDebugger):
(WebCore::VisiblePosition::showTree):
(showTree):
* editing/VisiblePosition.h:
(WebCore::VisiblePosition::VisiblePosition):
(WebCore::operator==):
* editing/WrapContentsInDummySpanCommand.cpp:
* editing/htmlediting.h:
* editing/markup.cpp:
* editing/markup.h:
(WebCore::):
* editing/visible_units.cpp:
* html/CanvasGradient.cpp:
* html/CanvasRenderingContext2D.h:
* html/CanvasStyle.cpp:
* html/CanvasStyle.h:
* html/FormDataList.cpp:
* html/FormDataList.h:
* html/HTMLCollection.cpp:
* html/HTMLCollection.h:
* html/HTMLDocument.cpp:
* html/HTMLDocument.h:
* html/HTMLElement.cpp:
* html/HTMLElementFactory.cpp:
* html/HTMLElementFactory.h:
* html/HTMLFormCollection.cpp:
* html/HTMLFormElement.cpp:
* html/HTMLFormElement.h:
* html/HTMLInputElement.cpp:
* html/HTMLParser.cpp:
* html/HTMLSelectElement.cpp:
* html/HTMLSelectElement.h:
* html/HTMLTokenizer.cpp:
* html/HTMLTokenizer.h:
* html/html_baseimpl.cpp:
* html/html_headimpl.h:
* kcanvas/KCanvasCreator.cpp:
* kcanvas/KCanvasFilters.h:
* kcanvas/KCanvasPath.h:
* kcanvas/KCanvasResources.h:
* kcanvas/KCanvasTreeDebug.cpp:
* kcanvas/RenderPath.cpp:
* kcanvas/RenderPath.h:
* kcanvas/device/KRenderingDevice.h:
* kcanvas/device/KRenderingPaintServerGradient.h:
* kcanvas/device/KRenderingPaintServerPattern.h:
* kcanvas/device/KRenderingPaintServerSolid.h:
* kcanvas/device/quartz/KCanvasFilterQuartz.mm:
* kcanvas/device/quartz/KCanvasMaskerQuartz.h:
* kcanvas/device/quartz/KCanvasResourcesQuartz.h:
* kcanvas/device/quartz/KCanvasResourcesQuartz.mm:
* kcanvas/device/quartz/KRenderingPaintServerQuartz.h:
* khtml/misc/decoder.cpp:
* khtml/misc/decoder.h:
* khtml/xsl/XSLStyleSheet.cpp:
* khtml/xsl/XSLTProcessor.cpp:
* khtml/xsl/XSLTProcessor.h:
* ksvg2/css/SVGRenderStyle.h:
* ksvg2/ecma/GlobalObject.cpp:
* ksvg2/misc/KCanvasRenderingStyle.h:
* ksvg2/misc/SVGDocumentExtensions.h:
* ksvg2/svg/SVGAngle.h:
* ksvg2/svg/SVGAnimateColorElement.h:
* ksvg2/svg/SVGAnimatedColor.h:
* ksvg2/svg/SVGAnimatedLengthList.h:
* ksvg2/svg/SVGAnimatedNumberList.h:
* ksvg2/svg/SVGAnimatedString.h:
* ksvg2/svg/SVGAnimatedTransformList.h:
* ksvg2/svg/SVGAnimationElement.h:
* ksvg2/svg/SVGColor.h:
* ksvg2/svg/SVGCursorElement.h:
* ksvg2/svg/SVGHelper.h:
* ksvg2/svg/SVGLength.h:
* ksvg2/svg/SVGList.h:
* ksvg2/svg/SVGPaint.h:
* ksvg2/svg/SVGPathSeg.h:
* ksvg2/svg/SVGPatternElement.h:
* ksvg2/svg/SVGSVGElement.cpp:
* ksvg2/svg/SVGSVGElement.h:
* ksvg2/svg/SVGStringList.h:
* ksvg2/svg/SVGTransform.h:
* kwq/AccessibilityObjectCache.mm:
* kwq/ClipboardMac.mm:
* kwq/JavaAppletWidget.mm:
* kwq/KWQComboBox.mm:
* kwq/KWQEditCommand.mm:
* kwq/KWQFileButton.mm:
* kwq/KWQKHTMLSettings.h:
* kwq/KWQKSSLKeyGen.mm:
* kwq/KWQLoader.mm:
* kwq/KWQPageState.mm:
* kwq/KWQTextEdit.mm:
* kwq/RegularExpression.h:
* kwq/RenderTreeAsText.cpp:
* kwq/RenderTreeAsText.h:
* kwq/WebCoreAXObject.mm:
* loader/Cache.cpp:
* loader/Cache.h:
* loader/CachedCSSStyleSheet.cpp:
* loader/CachedObject.h:
* loader/CachedScript.cpp:
* loader/CachedXBLDocument.cpp:
* loader/CachedXBLDocument.h:
* loader/CachedXSLStyleSheet.cpp:
* loader/CachedXSLStyleSheet.h:
* loader/DocLoader.cpp:
* page/Frame.cpp:
* page/Frame.h:
* page/FramePrivate.h:
* page/FrameTree.cpp:
* page/FrameTree.h:
* page/FrameView.cpp:
* page/FrameView.h:
* page/Page.cpp:
* page/Page.h:
* page/Plugin.h:
(WebCore::Plugin::Plugin):
(WebCore::Plugin::view):
* platform/Color.cpp:
* platform/FloatRect.h:
* platform/Font.cpp:
* platform/Font.h:
* platform/FontFamily.cpp:
* platform/GraphicsContext.cpp:
* platform/Image.cpp:
* platform/Image.h:
* platform/IntRect.h:
* platform/KURL.cpp:
* platform/KURL.h:
* platform/SegmentedString.h:
* platform/Shared.h:
* platform/StreamingTextDecoder.cpp:
* platform/StringImpl.cpp:
* platform/StringImpl.h:
* platform/TextEncoding.h:
* platform/Timer.cpp:
* platform/Timer.h:
* platform/TransferJob.cpp:
* platform/TransferJob.h:
* platform/TransferJobInternal.h:
* platform/cairo/GraphicsContextCairo.cpp:
* platform/cairo/ImageCairo.cpp:
* platform/cairo/ImageSourceCairo.cpp:
* platform/image-decoders/gif/GIFImageReader.cpp:
* platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
* platform/mac/FontFamilyMac.mm:
* platform/mac/FontMac.mm:
* platform/mac/ImageMac.mm:
* platform/mac/TextEncodingMac.cpp:
* platform/mac/TransferJobMac.mm:
* platform/win/FontPlatformDataWin.cpp:
* platform/win/TransferJobWin.cpp:
* rendering/RenderBlock.cpp:
* rendering/RenderBlock.h:
* rendering/RenderBox.cpp:
* rendering/RenderBox.h:
* rendering/RenderCanvas.cpp:
* rendering/RenderCanvas.h:
* rendering/RenderContainer.cpp:
* rendering/RenderFlexibleBox.h:
* rendering/RenderFlow.cpp:
* rendering/RenderFlow.h:
* rendering/RenderImage.cpp:
* rendering/RenderImage.h:
* rendering/RenderLayer.cpp:
* rendering/RenderLayer.h:
* rendering/RenderObject.cpp:
(showTree):
* rendering/RenderObject.h:
* rendering/RenderTableCell.h:
* rendering/RenderTableSection.h:
* rendering/RenderText.cpp:
* rendering/RenderText.h:
* rendering/RenderTextField.cpp:
* rendering/RenderTextFragment.h:
* rendering/RenderTheme.h:
* rendering/RenderThemeMac.mm:
* rendering/RenderThemeWin.cpp:
* rendering/bidi.cpp:
* rendering/render_form.h:
* rendering/render_line.cpp:
(showTree):
* rendering/render_line.h:
* rendering/render_list.cpp:
* rendering/render_replaced.cpp:
* rendering/render_replaced.h:
* rendering/render_style.cpp:
* rendering/render_style.h:
* xml/xmlhttprequest.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@13821 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index c351163..fbba78b 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,84 @@
+2006-04-10 Darin Adler <darin@apple.com>
+
+ Rubber-stamped by John Sullivan.
+
+ - switched from a shell script to a makefile for generated files
+ - removed lots of unneeded includes
+ - added new Forward.h and HashForward.h headers that allow compiling with
+ fewer unneeded templates
+
+ * DerivedSources.make: Added.
+ * generate-derived-sources: Removed.
+ * JavaScriptCore.xcodeproj/project.pbxproj: Added new files, changed to use
+ DerivedSources.make.
+
+ * kxmlcore/Forward.h: Added.
+ * kxmlcore/HashForward.h: Added.
+
+ * kxmlcore/HashCountedSet.h: Include HashForward for default args.
+ * kxmlcore/HashMap.h: Ditto.
+ * kxmlcore/HashSet.h: Ditto.
+
+ * kjs/object.h:
+ * kjs/object.cpp:
+ Moved KJS_MAX_STACK into the .cpp file.
+
+ * bindings/NP_jsobject.cpp:
+ * bindings/c/c_instance.h:
+ * bindings/jni/jni_class.h:
+ * bindings/jni/jni_runtime.h:
+ * bindings/jni/jni_utility.h:
+ * bindings/objc/WebScriptObject.mm:
+ * bindings/objc/WebScriptObjectPrivate.h:
+ * bindings/objc/objc_class.h:
+ * bindings/objc/objc_class.mm:
+ * bindings/objc/objc_instance.h:
+ * bindings/objc/objc_instance.mm:
+ * bindings/objc/objc_runtime.mm:
+ * bindings/objc/objc_utility.mm:
+ * bindings/runtime.h:
+ * bindings/runtime_array.cpp:
+ * bindings/runtime_array.h:
+ * bindings/runtime_method.cpp:
+ * bindings/runtime_method.h:
+ * bindings/runtime_object.cpp:
+ * bindings/runtime_root.h:
+ * kjs/JSImmediate.cpp:
+ * kjs/Parser.h:
+ * kjs/array_object.cpp:
+ * kjs/array_object.h:
+ * kjs/bool_object.cpp:
+ * kjs/bool_object.h:
+ * kjs/collector.h:
+ * kjs/context.h:
+ * kjs/debugger.cpp:
+ * kjs/error_object.h:
+ * kjs/function_object.h:
+ * kjs/internal.h:
+ * kjs/lexer.cpp:
+ * kjs/math_object.cpp:
+ * kjs/math_object.h:
+ * kjs/nodes.cpp:
+ * kjs/nodes.h:
+ * kjs/number_object.cpp:
+ * kjs/number_object.h:
+ * kjs/object_object.cpp:
+ * kjs/operations.cpp:
+ * kjs/protected_reference.h:
+ * kjs/reference.h:
+ * kjs/reference_list.h:
+ * kjs/regexp_object.h:
+ * kjs/string_object.cpp:
+ * kjs/string_object.h:
+ * kjs/testkjs.cpp:
+ * kjs/value.cpp:
+ * kjs/value.h:
+ * kxmlcore/HashTable.h:
+ * kxmlcore/ListRefPtr.h:
+ * kxmlcore/TCPageMap.h:
+ * kxmlcore/Vector.h:
+ Removed unneeded header includes.
+
2006-04-09 Geoffrey Garen <ggaren@apple.com>
Reviewed by eric.
diff --git a/JavaScriptCore/DerivedSources.make b/JavaScriptCore/DerivedSources.make
new file mode 100644
index 0000000..d75e575
--- /dev/null
+++ b/JavaScriptCore/DerivedSources.make
@@ -0,0 +1,63 @@
+# Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+# its contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+VPATH = \
+ $(JavaScriptCore)/kjs \
+#
+
+.PHONY : all
+all : \
+ array_object.lut.h \
+ chartables.c \
+ date_object.lut.h \
+ grammar.cpp \
+ lexer.lut.h \
+ math_object.lut.h \
+ number_object.lut.h \
+ regexp_object.lut.h \
+ string_object.lut.h \
+#
+
+# lookup tables for classes
+
+%.lut.h: create_hash_table %.cpp
+ $^ > $@
+lexer.lut.h: create_hash_table keywords.table
+ $^ > $@
+
+# JavaScript language grammar
+
+grammar.cpp : grammar.y
+ bison -d -p kjsyy $< -o $@
+ touch grammar.cpp.h
+ touch grammar.hpp
+ cat grammar.cpp.h grammar.hpp > grammar.h
+ rm -f grammar.cpp.h grammar.hpp
+
+# character tables for PCRE
+
+chartables.c : $(BUILT_PRODUCTS_DIR)/dftables
+ $^ $@
diff --git a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
index e19ccb4..861f103 100644
--- a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -77,6 +77,7 @@
9303F568099118FA00AD71B8 /* OwnPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 9303F567099118FA00AD71B8 /* OwnPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
9303F56A0991190000AD71B8 /* Noncopyable.h in Headers */ = {isa = PBXBuildFile; fileRef = 9303F5690991190000AD71B8 /* Noncopyable.h */; settings = {ATTRIBUTES = (Private, ); }; };
9303F5A509911A5800AD71B8 /* OwnArrayPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 9303F5A409911A5800AD71B8 /* OwnArrayPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 9304635709EB51E8008855DC /* HashForward.h in Headers */ = {isa = PBXBuildFile; fileRef = 9304635609EB51E8008855DC /* HashForward.h */; settings = {ATTRIBUTES = (Private, ); }; };
930754C108B0F68000AB3056 /* pcre_compile.c in Sources */ = {isa = PBXBuildFile; fileRef = 930754BF08B0F68000AB3056 /* pcre_compile.c */; };
930754D008B0F74600AB3056 /* pcre_tables.c in Sources */ = {isa = PBXBuildFile; fileRef = 930754CE08B0F74500AB3056 /* pcre_tables.c */; };
930754D308B0F76300AB3056 /* pcre_globals.c in Sources */ = {isa = PBXBuildFile; fileRef = 930754D108B0F76200AB3056 /* pcre_globals.c */; };
@@ -209,6 +210,8 @@
932F5BDD0822A1C700736975 /* testkjs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45E12D8806A49B0F00E9DF84 /* testkjs.cpp */; };
932F5BEA0822A1C700736975 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 932F5BD90822A1C700736975 /* JavaScriptCore.framework */; };
932FC11D0824A6A3005B3C75 /* create_hash_table in Headers */ = {isa = PBXBuildFile; fileRef = F692A8540255597D01FF60F7 /* create_hash_table */; settings = {ATTRIBUTES = (Private, ); }; };
+ 935AF46C09E9D9DB00ACD1D8 /* Forward.h in Headers */ = {isa = PBXBuildFile; fileRef = 935AF46909E9D9DB00ACD1D8 /* Forward.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 935AF46E09E9D9DB00ACD1D8 /* UnusedParam.h in Headers */ = {isa = PBXBuildFile; fileRef = 935AF46B09E9D9DB00ACD1D8 /* UnusedParam.h */; };
935F69FE08245057003D1A45 /* dftables.c in Sources */ = {isa = PBXBuildFile; fileRef = 6541720E039E08B90058BFEB /* dftables.c */; };
93AA4F780957251F0084B3A7 /* AlwaysInline.h in Headers */ = {isa = PBXBuildFile; fileRef = 93AA4F770957251F0084B3A7 /* AlwaysInline.h */; settings = {ATTRIBUTES = (Private, ); }; };
93E26BCA08B1511900F85226 /* pcre_ord2utf8.c in Sources */ = {isa = PBXBuildFile; fileRef = 93E26BC908B1511900F85226 /* pcre_ord2utf8.c */; };
@@ -372,7 +375,6 @@
65B174F409D100FA00820339 /* string_object.lut.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = string_object.lut.h; sourceTree = "<group>"; };
65C02FBB0637462A003E7EE6 /* protect.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = protect.h; sourceTree = "<group>"; tabWidth = 8; };
65C647B3093EF8D60022C380 /* RefPtr.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = RefPtr.h; sourceTree = "<group>"; tabWidth = 8; };
- 65D2CD9C09D1F54E009AB1A1 /* generate-derived-sources */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = "generate-derived-sources"; sourceTree = SOURCE_ROOT; };
65D6D87E09B5A32E0002E4D7 /* Platform.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Platform.h; sourceTree = "<group>"; };
65D7D19B08F10B5B0015ABD8 /* FastMallocInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = FastMallocInternal.h; sourceTree = "<group>"; tabWidth = 8; };
65DFC92A08EA173A00F7300B /* HashFunctions.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = HashFunctions.h; sourceTree = "<group>"; tabWidth = 8; };
@@ -404,6 +406,7 @@
9303F567099118FA00AD71B8 /* OwnPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OwnPtr.h; sourceTree = "<group>"; };
9303F5690991190000AD71B8 /* Noncopyable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Noncopyable.h; sourceTree = "<group>"; };
9303F5A409911A5800AD71B8 /* OwnArrayPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OwnArrayPtr.h; sourceTree = "<group>"; };
+ 9304635609EB51E8008855DC /* HashForward.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HashForward.h; sourceTree = "<group>"; };
930754BF08B0F68000AB3056 /* pcre_compile.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.c; name = pcre_compile.c; path = pcre/pcre_compile.c; sourceTree = "<group>"; tabWidth = 8; };
930754CE08B0F74500AB3056 /* pcre_tables.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.c; name = pcre_tables.c; path = pcre/pcre_tables.c; sourceTree = "<group>"; tabWidth = 8; };
930754D108B0F76200AB3056 /* pcre_globals.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.c; name = pcre_globals.c; path = pcre/pcre_globals.c; sourceTree = "<group>"; tabWidth = 8; };
@@ -418,11 +421,14 @@
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>"; };
+ 935AF46B09E9D9DB00ACD1D8 /* UnusedParam.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnusedParam.h; sourceTree = "<group>"; };
935F69F608244FEA003D1A45 /* dftables */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = dftables; sourceTree = BUILT_PRODUCTS_DIR; };
9364B273045B7D6C00A9CAC1 /* fpconst.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fpconst.cpp; sourceTree = "<group>"; tabWidth = 8; };
9373524E038DA8C2008635CE /* context.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = context.h; sourceTree = "<group>"; tabWidth = 8; };
9374D3A7038D9D74008635CE /* scope_chain.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = scope_chain.h; sourceTree = "<group>"; tabWidth = 8; };
9374D3A8038D9D74008635CE /* scope_chain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scope_chain.cpp; sourceTree = "<group>"; tabWidth = 8; };
+ 937B63CC09E766D200A671DD /* DerivedSources.make */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; path = DerivedSources.make; sourceTree = "<group>"; usesTabs = 1; };
938772E5038BFE19008635CE /* array_instance.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = array_instance.h; sourceTree = "<group>"; tabWidth = 8; };
93AA4F770957251F0084B3A7 /* AlwaysInline.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = AlwaysInline.h; sourceTree = "<group>"; tabWidth = 8; };
93E26BC908B1511900F85226 /* pcre_ord2utf8.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.c; name = pcre_ord2utf8.c; path = pcre/pcre_ord2utf8.c; sourceTree = "<group>"; tabWidth = 8; };
@@ -543,7 +549,7 @@
0867D691FE84028FC02AAC07 /* JavaScriptCore */ = {
isa = PBXGroup;
children = (
- 65D2CD9C09D1F54E009AB1A1 /* generate-derived-sources */,
+ 937B63CC09E766D200A671DD /* DerivedSources.make */,
65417200039E01BA0058BFEB /* kjs */,
65162EF108E6A21C007556CD /* kxmlcore */,
51856D950562EE9C008B9D83 /* bindings */,
@@ -654,7 +660,9 @@
65E217B908E7EECC0023E5F6 /* FastMalloc.cpp */,
65E217BA08E7EECC0023E5F6 /* FastMalloc.h */,
65D7D19B08F10B5B0015ABD8 /* FastMallocInternal.h */,
+ 935AF46909E9D9DB00ACD1D8 /* Forward.h */,
657EEBBF094E445E008C9C7B /* HashCountedSet.h */,
+ 9304635609EB51E8008855DC /* HashForward.h */,
65DFC92A08EA173A00F7300B /* HashFunctions.h */,
65DFC92B08EA173A00F7300B /* HashMap.h */,
65DFC92C08EA173A00F7300B /* HashSet.h */,
@@ -672,6 +680,7 @@
6541BD6F08E80A17002CBEE7 /* TCSpinLock.h */,
6541BD7008E80A17002CBEE7 /* TCSystemAlloc.cpp */,
6541BD7108E80A17002CBEE7 /* TCSystemAlloc.h */,
+ 935AF46B09E9D9DB00ACD1D8 /* UnusedParam.h */,
6592C316098B7DE10003D4F6 /* Vector.h */,
6592C317098B7DE10003D4F6 /* VectorTraits.h */,
);
@@ -944,6 +953,9 @@
E195679609E7CF1200B89D13 /* UnicodeIcu.h in Headers */,
E195679809E7CF1200B89D13 /* Unicode.h in Headers */,
E195679909E7CF1200B89D13 /* UnicodeCategory.h in Headers */,
+ 935AF46C09E9D9DB00ACD1D8 /* Forward.h in Headers */,
+ 935AF46E09E9D9DB00ACD1D8 /* UnusedParam.h in Headers */,
+ 9304635709EB51E8008855DC /* HashForward.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1112,7 +1124,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "./generate-derived-sources\n";
+ shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore\"\n\nexport JavaScriptCore=\"${SRCROOT}\"\n\nmake -f \"$JavaScriptCore/DerivedSources.make\"\n";
};
9319586B09D9F91A00A56FD4 /* Check For Global Initializers */ = {
isa = PBXShellScriptBuildPhase;
diff --git a/JavaScriptCore/bindings/NP_jsobject.cpp b/JavaScriptCore/bindings/NP_jsobject.cpp
index 2194214..3298e78 100644
--- a/JavaScriptCore/bindings/NP_jsobject.cpp
+++ b/JavaScriptCore/bindings/NP_jsobject.cpp
@@ -27,10 +27,6 @@
#include "NP_jsobject.h"
#include "c_utility.h"
-#include "identifier.h"
-#include "interpreter.h"
-#include "list.h"
-#include "npruntime.h"
#include "npruntime_impl.h"
#include "npruntime_priv.h"
#include "runtime_root.h"
diff --git a/JavaScriptCore/bindings/c/c_instance.h b/JavaScriptCore/bindings/c/c_instance.h
index 31e888a..e8f8009 100644
--- a/JavaScriptCore/bindings/c/c_instance.h
+++ b/JavaScriptCore/bindings/c/c_instance.h
@@ -22,10 +22,10 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _BINDINGS_C_INSTANCE_H_
-#define _BINDINGS_C_INSTANCE_H_
-#include "JSType.h"
+#ifndef BINDINGS_C_INSTANCE_H_
+#define BINDINGS_C_INSTANCE_H_
+
#include "npruntime.h"
#include "runtime.h"
diff --git a/JavaScriptCore/bindings/jni/jni_class.h b/JavaScriptCore/bindings/jni/jni_class.h
index 6860257..1a93fef 100644
--- a/JavaScriptCore/bindings/jni/jni_class.h
+++ b/JavaScriptCore/bindings/jni/jni_class.h
@@ -22,14 +22,10 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _JNI_CLASS_H_
-#define _JNI_CLASS_H_
-#include <CoreFoundation/CoreFoundation.h>
+#ifndef JNI_CLASS_H_
+#define JNI_CLASS_H_
-#include <JavaVM/jni.h>
-
-#include <runtime.h>
#include <jni_runtime.h>
namespace KJS {
diff --git a/JavaScriptCore/bindings/jni/jni_runtime.h b/JavaScriptCore/bindings/jni/jni_runtime.h
index e26d3de..e975f75 100644
--- a/JavaScriptCore/bindings/jni/jni_runtime.h
+++ b/JavaScriptCore/bindings/jni/jni_runtime.h
@@ -25,12 +25,8 @@
#ifndef _JNI_RUNTIME_H_
#define _JNI_RUNTIME_H_
-#include <CoreFoundation/CoreFoundation.h>
-
#include <jni_utility.h>
#include <jni_instance.h>
-#include <runtime.h>
-#include <ustring.h>
namespace KJS
diff --git a/JavaScriptCore/bindings/jni/jni_utility.h b/JavaScriptCore/bindings/jni/jni_utility.h
index 7670779..97a03d4 100644
--- a/JavaScriptCore/bindings/jni/jni_utility.h
+++ b/JavaScriptCore/bindings/jni/jni_utility.h
@@ -26,7 +26,6 @@
#define _JNI_UTILITY_H_
#include <list.h>
-#include <value.h>
#include <JavaVM/jni.h>
diff --git a/JavaScriptCore/bindings/objc/WebScriptObject.mm b/JavaScriptCore/bindings/objc/WebScriptObject.mm
index efb43836..5023a52 100644
--- a/JavaScriptCore/bindings/objc/WebScriptObject.mm
+++ b/JavaScriptCore/bindings/objc/WebScriptObject.mm
@@ -23,19 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "config.h"
+#import "config.h"
#import "WebScriptObjectPrivate.h"
-#import "internal.h"
-#import "list.h"
-#import "value.h"
-
#import "objc_instance.h"
-#import "objc_utility.h"
-
#import "runtime_object.h"
-#import "runtime_root.h"
-
#import <kxmlcore/UnusedParam.h>
using namespace KJS;
diff --git a/JavaScriptCore/bindings/objc/WebScriptObjectPrivate.h b/JavaScriptCore/bindings/objc/WebScriptObjectPrivate.h
index 290696e..9aea1c7 100644
--- a/JavaScriptCore/bindings/objc/WebScriptObjectPrivate.h
+++ b/JavaScriptCore/bindings/objc/WebScriptObjectPrivate.h
@@ -7,10 +7,7 @@
#import <JavaScriptCore/WebScriptObject.h>
#include <JavaScriptCore/internal.h>
-#include <JavaScriptCore/list.h>
-#include <JavaScriptCore/object.h>
#include <JavaScriptCore/runtime_root.h>
-#include <JavaScriptCore/value.h>
@interface WebScriptObject (Private)
+ (id)_convertValueToObjcValue:(KJS::JSValue *)value originExecutionContext:(const KJS::Bindings::RootObject *)originExecutionContext executionContext:(const KJS::Bindings::RootObject *)executionContext;
diff --git a/JavaScriptCore/bindings/objc/objc_class.h b/JavaScriptCore/bindings/objc/objc_class.h
index 8a359a4..2c4949c 100644
--- a/JavaScriptCore/bindings/objc/objc_class.h
+++ b/JavaScriptCore/bindings/objc/objc_class.h
@@ -26,8 +26,6 @@
#ifndef KJS_BINDINGS_OBJC_CLASS_H
#define KJS_BINDINGS_OBJC_CLASS_H
-#include <CoreFoundation/CoreFoundation.h>
-
#include "objc_runtime.h"
namespace KJS {
diff --git a/JavaScriptCore/bindings/objc/objc_class.mm b/JavaScriptCore/bindings/objc/objc_class.mm
index 597e22b..f69d7ee 100644
--- a/JavaScriptCore/bindings/objc/objc_class.mm
+++ b/JavaScriptCore/bindings/objc/objc_class.mm
@@ -22,14 +22,12 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "config.h"
-#include <Foundation/Foundation.h>
-#include <objc_class.h>
-#include <objc_instance.h>
-#include <objc_runtime.h>
-#include <objc_utility.h>
-#include <WebScriptObject.h>
+#include "config.h"
+#include "objc_class.h"
+
+#include "objc_instance.h"
+#include "WebScriptObject.h"
namespace KJS {
namespace Bindings {
diff --git a/JavaScriptCore/bindings/objc/objc_instance.h b/JavaScriptCore/bindings/objc/objc_instance.h
index 36b5c4d..b487f4d 100644
--- a/JavaScriptCore/bindings/objc/objc_instance.h
+++ b/JavaScriptCore/bindings/objc/objc_instance.h
@@ -22,13 +22,11 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _BINDINGS_OBJC_INSTANCE_H_
-#define _BINDINGS_OBJC_INSTANCE_H_
-#include <CoreFoundation/CoreFoundation.h>
+#ifndef BINDINGS_OBJC_INSTANCE_H_
+#define BINDINGS_OBJC_INSTANCE_H_
#include <objc_class.h>
-#include <objc_runtime.h>
#include <objc_utility.h>
namespace KJS {
diff --git a/JavaScriptCore/bindings/objc/objc_instance.mm b/JavaScriptCore/bindings/objc/objc_instance.mm
index 5f69a01..00bcf20 100644
--- a/JavaScriptCore/bindings/objc/objc_instance.mm
+++ b/JavaScriptCore/bindings/objc/objc_instance.mm
@@ -22,11 +22,11 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "config.h"
-#import <Foundation/Foundation.h>
-#import <JavaScriptCore/objc_instance.h>
-#import <JavaScriptCore/WebScriptObject.h>
+#import "config.h"
+#import "objc_instance.h"
+
+#import "WebScriptObject.h"
#ifdef NDEBUG
#define OBJC_LOG(formatAndArgs...) ((void)0)
@@ -37,8 +37,6 @@
}
#endif
-#include <JavaScriptCore/objc_runtime.h>
-
using namespace KJS::Bindings;
using namespace KJS;
diff --git a/JavaScriptCore/bindings/objc/objc_runtime.mm b/JavaScriptCore/bindings/objc/objc_runtime.mm
index 6e5a6a2..235fdc8 100644
--- a/JavaScriptCore/bindings/objc/objc_runtime.mm
+++ b/JavaScriptCore/bindings/objc/objc_runtime.mm
@@ -22,19 +22,15 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
#include "config.h"
-#include <Foundation/Foundation.h>
+#include "objc_runtime.h"
-
-#include <JavaScriptCore/internal.h>
-
-#include <objc_instance.h>
+#include "objc_instance.h"
+#include "runtime_array.h"
+#include "runtime_object.h"
#include <WebScriptObjectPrivate.h>
-#include <runtime_array.h>
-#include <runtime_object.h>
-
-
using namespace KJS;
using namespace KJS::Bindings;
diff --git a/JavaScriptCore/bindings/objc/objc_utility.mm b/JavaScriptCore/bindings/objc/objc_utility.mm
index 6f1b28d..e5a3e10 100644
--- a/JavaScriptCore/bindings/objc/objc_utility.mm
+++ b/JavaScriptCore/bindings/objc/objc_utility.mm
@@ -26,15 +26,10 @@
#include "config.h"
#include "objc_utility.h"
-#include <Foundation/Foundation.h>
-
-#include "internal.h"
-
#include "objc_instance.h"
#include "runtime_array.h"
#include "runtime_object.h"
-#include "runtime_root.h"
#include "WebScriptObjectPrivate.h"
diff --git a/JavaScriptCore/bindings/runtime.h b/JavaScriptCore/bindings/runtime.h
index f95ff6d..853cd4f 100644
--- a/JavaScriptCore/bindings/runtime.h
+++ b/JavaScriptCore/bindings/runtime.h
@@ -26,7 +26,6 @@
#ifndef JAVASCRIPTCORE_BINDINGS_RUNTIME_H
#define JAVASCRIPTCORE_BINDINGS_RUNTIME_H
-#include "JSType.h"
#include "value.h"
#include <CoreFoundation/CFDictionary.h>
diff --git a/JavaScriptCore/bindings/runtime_array.cpp b/JavaScriptCore/bindings/runtime_array.cpp
index 3c20415..627da93 100644
--- a/JavaScriptCore/bindings/runtime_array.cpp
+++ b/JavaScriptCore/bindings/runtime_array.cpp
@@ -22,11 +22,9 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
#include "config.h"
-#include <identifier.h>
-#include <interpreter.h>
-#include <runtime.h>
-#include <runtime_array.h>
+#include "runtime_array.h"
using namespace KJS;
diff --git a/JavaScriptCore/bindings/runtime_array.h b/JavaScriptCore/bindings/runtime_array.h
index d53fb12..2ece874 100644
--- a/JavaScriptCore/bindings/runtime_array.h
+++ b/JavaScriptCore/bindings/runtime_array.h
@@ -22,13 +22,12 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _RUNTIME_ARRAY_H_
-#define _RUNTIME_ARRAY_H_
-#include <array_instance.h>
-#include <object.h>
-#include <runtime.h>
+#ifndef RUNTIME_ARRAY_H_
+#define RUNTIME_ARRAY_H_
+#include "array_instance.h"
+#include "runtime.h"
namespace KJS {
diff --git a/JavaScriptCore/bindings/runtime_method.cpp b/JavaScriptCore/bindings/runtime_method.cpp
index b380fef..9aeebc2 100644
--- a/JavaScriptCore/bindings/runtime_method.cpp
+++ b/JavaScriptCore/bindings/runtime_method.cpp
@@ -24,9 +24,9 @@
*/
#include "config.h"
-#include "context.h"
-#include "internal.h"
#include "runtime_method.h"
+
+#include "context.h"
#include "runtime_object.h"
using namespace KJS::Bindings;
diff --git a/JavaScriptCore/bindings/runtime_method.h b/JavaScriptCore/bindings/runtime_method.h
index cfe3a4f..e3bad02 100644
--- a/JavaScriptCore/bindings/runtime_method.h
+++ b/JavaScriptCore/bindings/runtime_method.h
@@ -22,11 +22,13 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _RUNTIME_FUNCTION_H_
-#define _RUNTIME_FUNCTION_H_
-#include <JavaScriptCore/runtime.h>
-#include <JavaScriptCore/object.h>
+#ifndef RUNTIME_FUNCTION_H_
+#define RUNTIME_FUNCTION_H_
+
+#include "function.h"
+#include "runtime.h"
+#include "object.h"
namespace KJS {
diff --git a/JavaScriptCore/bindings/runtime_object.cpp b/JavaScriptCore/bindings/runtime_object.cpp
index 576fb7e..e852851 100644
--- a/JavaScriptCore/bindings/runtime_object.cpp
+++ b/JavaScriptCore/bindings/runtime_object.cpp
@@ -24,19 +24,11 @@
*/
#include "config.h"
+#include "runtime_object.h"
#include "error_object.h"
-#include "function.h"
-#include "interpreter.h"
-#include "object.h"
#include "operations.h"
#include "runtime_method.h"
-#include "runtime_object.h"
-#include "types.h"
-#include "value.h"
-
-
-#include <assert.h>
using namespace KJS;
using namespace Bindings;
diff --git a/JavaScriptCore/bindings/runtime_root.h b/JavaScriptCore/bindings/runtime_root.h
index 94f8576..0796e8b 100644
--- a/JavaScriptCore/bindings/runtime_root.h
+++ b/JavaScriptCore/bindings/runtime_root.h
@@ -22,11 +22,10 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _RUNTIME_ROOT_H_
-#define _RUNTIME_ROOT_H_
-#include <JavaScriptCore/interpreter.h>
-#include <JavaScriptCore/object.h>
+#ifndef RUNTIME_ROOT_H_
+#define RUNTIME_ROOT_H_
+
#include <JavaScriptCore/protect.h>
#include <JavaScriptCore/jni_jsobject.h>
#include <JavaScriptCore/protect.h>
diff --git a/JavaScriptCore/generate-derived-sources b/JavaScriptCore/generate-derived-sources
deleted file mode 100755
index 4fef0c0..0000000
--- a/JavaScriptCore/generate-derived-sources
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-DerivedSourcesDir="${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore"
-
-mkdir -p "${DerivedSourcesDir}"
-
-# Invoke the create_hash_table perl script to create all of our lookup tables
-
-if [ kjs/array_object.cpp -nt "$DerivedSourcesDir/array_object.lut.h" -o kjs/create_hash_table -nt "$DerivedSourcesDir/array_object.lut.h" ]; then
- kjs/create_hash_table kjs/array_object.cpp > "$DerivedSourcesDir/array_object.lut.h" -i
-fi
-
-if [ kjs/date_object.cpp -nt "$DerivedSourcesDir/date_object.lut.h" -o kjs/create_hash_table -nt "$DerivedSourcesDir/date_object.lut.h" ]; then
- kjs/create_hash_table kjs/date_object.cpp > "$DerivedSourcesDir/date_object.lut.h" -i
-fi
-
-if [ kjs/math_object.cpp -nt "$DerivedSourcesDir/math_object.lut.h" -o kjs/create_hash_table -nt "$DerivedSourcesDir/math_object.lut.h" ]; then
- kjs/create_hash_table kjs/math_object.cpp > "$DerivedSourcesDir/math_object.lut.h" -i
-fi
-
-if [ kjs/number_object.cpp -nt "$DerivedSourcesDir/number_object.lut.h" -o kjs/create_hash_table -nt "$DerivedSourcesDir/number_object.lut.h" ]; then
- kjs/create_hash_table kjs/number_object.cpp > "$DerivedSourcesDir/number_object.lut.h" -i
-fi
-
-if [ kjs/regexp_object.cpp -nt "$DerivedSourcesDir/regexp_object.lut.h" -o kjs/create_hash_table -nt "$DerivedSourcesDir/regexp_object.lut.h" ]; then
- kjs/create_hash_table kjs/regexp_object.cpp > "$DerivedSourcesDir/regexp_object.lut.h" -i
-fi
-
-if [ kjs/string_object.cpp -nt "$DerivedSourcesDir/string_object.lut.h" -o kjs/create_hash_table -nt "$DerivedSourcesDir/string_object.lut.h" ]; then
- kjs/create_hash_table kjs/string_object.cpp > "$DerivedSourcesDir/string_object.lut.h" -i
-fi
-
-if [ kjs/keywords.table -nt "$DerivedSourcesDir/lexer.lut.h" -o kjs/create_hash_table -nt "$DerivedSourcesDir/lexer.lut.h" ]; then
- kjs/create_hash_table kjs/keywords.table > "$DerivedSourcesDir/lexer.lut.h" -i
-fi
-
-# Generate the grammar using bison
-if [ kjs/grammar.y -nt "$DerivedSourcesDir/grammar.cpp" -o kjs/grammar.y -nt "$DerivedSourcesDir/grammar.h" ]; then
- echo "Generating the JS grammar using bison..."
- bison -d -p kjsyy kjs/grammar.y -o "$DerivedSourcesDir/grammar.cpp"
- cat "$DerivedSourcesDir/grammar.cpp.h" "$DerivedSourcesDir/grammar.hpp" > "$DerivedSourcesDir/grammar.h" 2>/dev/null
-fi
-
-if [ "$BUILT_PRODUCTS_DIR/dftables" -nt "$DerivedSourcesDir/chartables.c" ]; then
- echo "Generating chartables.c using dftables..."
- "$BUILT_PRODUCTS_DIR/dftables" "$DerivedSourcesDir/chartables.c"
-fi
diff --git a/JavaScriptCore/kjs/JSImmediate.cpp b/JavaScriptCore/kjs/JSImmediate.cpp
index 699d18b..50939d6 100644
--- a/JavaScriptCore/kjs/JSImmediate.cpp
+++ b/JavaScriptCore/kjs/JSImmediate.cpp
@@ -21,9 +21,8 @@
#include "config.h"
#include "JSImmediate.h"
-#include "kxmlcore/Assertions.h"
+
#include "object.h"
-#include "value.h"
namespace KJS {
diff --git a/JavaScriptCore/kjs/Parser.h b/JavaScriptCore/kjs/Parser.h
index 5bb4391..b2d1f08 100644
--- a/JavaScriptCore/kjs/Parser.h
+++ b/JavaScriptCore/kjs/Parser.h
@@ -25,7 +25,7 @@
#ifndef Parser_h
#define Parser_h
-#include <kxmlcore/PassRefPtr.h>
+#include <kxmlcore/Forward.h>
namespace KJS {
diff --git a/JavaScriptCore/kjs/array_object.cpp b/JavaScriptCore/kjs/array_object.cpp
index 150a03c..e3977d1 100644
--- a/JavaScriptCore/kjs/array_object.cpp
+++ b/JavaScriptCore/kjs/array_object.cpp
@@ -25,20 +25,14 @@
#include "array_object.h"
#include "error_object.h"
-#include "internal.h"
-#include "interpreter.h"
-#include "object.h"
+#include "lookup.h"
#include "operations.h"
#include "reference_list.h"
-#include "types.h"
-#include "value.h"
#include <kxmlcore/HashSet.h>
+#include <stdio.h>
#include "array_object.lut.h"
-#include <stdio.h>
-#include <assert.h>
-
using namespace KJS;
// ------------------------------ ArrayInstance -----------------------------
diff --git a/JavaScriptCore/kjs/array_object.h b/JavaScriptCore/kjs/array_object.h
index 21e1348..9ca66b1 100644
--- a/JavaScriptCore/kjs/array_object.h
+++ b/JavaScriptCore/kjs/array_object.h
@@ -19,11 +19,10 @@
*
*/
-#ifndef _ARRAY_OBJECT_H_
-#define _ARRAY_OBJECT_H_
+#ifndef ARRAY_OBJECT_H_
+#define ARRAY_OBJECT_H_
#include "array_instance.h"
-#include "internal.h"
#include "function_object.h"
namespace KJS {
diff --git a/JavaScriptCore/kjs/bool_object.cpp b/JavaScriptCore/kjs/bool_object.cpp
index 9aa302d..610f832 100644
--- a/JavaScriptCore/kjs/bool_object.cpp
+++ b/JavaScriptCore/kjs/bool_object.cpp
@@ -21,15 +21,10 @@
*/
#include "config.h"
-#include "value.h"
-#include "object.h"
-#include "types.h"
-#include "interpreter.h"
-#include "operations.h"
#include "bool_object.h"
-#include "error_object.h"
-#include <assert.h>
+#include "operations.h"
+#include "error_object.h"
using namespace KJS;
diff --git a/JavaScriptCore/kjs/bool_object.h b/JavaScriptCore/kjs/bool_object.h
index b00d8b0..d858323 100644
--- a/JavaScriptCore/kjs/bool_object.h
+++ b/JavaScriptCore/kjs/bool_object.h
@@ -19,10 +19,9 @@
*
*/
-#ifndef _BOOL_OBJECT_H_
-#define _BOOL_OBJECT_H_
+#ifndef BOOL_OBJECT_H_
+#define BOOL_OBJECT_H_
-#include "internal.h"
#include "function_object.h"
namespace KJS {
diff --git a/JavaScriptCore/kjs/collector.h b/JavaScriptCore/kjs/collector.h
index d68dac1..64deb2f 100644
--- a/JavaScriptCore/kjs/collector.h
+++ b/JavaScriptCore/kjs/collector.h
@@ -21,11 +21,11 @@
*
*/
-#ifndef _KJSCOLLECTOR_H_
-#define _KJSCOLLECTOR_H_
+#ifndef KJSCOLLECTOR_H_
+#define KJSCOLLECTOR_H_
#include "value.h"
-#include <kxmlcore/HashCountedSet.h>
+#include <kxmlcore/HashForward.h>
#define KJS_MEM_LIMIT 500000
diff --git a/JavaScriptCore/kjs/context.h b/JavaScriptCore/kjs/context.h
index c48a604..87804de 100644
--- a/JavaScriptCore/kjs/context.h
+++ b/JavaScriptCore/kjs/context.h
@@ -26,7 +26,6 @@
#define KJS_CONTEXT_H
#include "function.h"
-#include "protect.h"
namespace KJS {
diff --git a/JavaScriptCore/kjs/debugger.cpp b/JavaScriptCore/kjs/debugger.cpp
index c908ffa..a37ca2b 100644
--- a/JavaScriptCore/kjs/debugger.cpp
+++ b/JavaScriptCore/kjs/debugger.cpp
@@ -22,13 +22,10 @@
#include "config.h"
#include "debugger.h"
-#include "value.h"
-#include "object.h"
-#include "types.h"
-#include "interpreter.h"
-#include "internal.h"
#include "ustring.h"
+#include "internal.h"
+
using namespace KJS;
// ------------------------------ Debugger -------------------------------------
diff --git a/JavaScriptCore/kjs/error_object.h b/JavaScriptCore/kjs/error_object.h
index 52c0fbc..3e1ac8a 100644
--- a/JavaScriptCore/kjs/error_object.h
+++ b/JavaScriptCore/kjs/error_object.h
@@ -19,10 +19,9 @@
*
*/
-#ifndef _ERROR_OBJECT_H_
-#define _ERROR_OBJECT_H_
+#ifndef ERROR_OBJECT_H_
+#define ERROR_OBJECT_H_
-#include "internal.h"
#include "function_object.h"
namespace KJS {
diff --git a/JavaScriptCore/kjs/function_object.h b/JavaScriptCore/kjs/function_object.h
index ee9cc60..399cca8 100644
--- a/JavaScriptCore/kjs/function_object.h
+++ b/JavaScriptCore/kjs/function_object.h
@@ -20,10 +20,9 @@
*
*/
-#ifndef _FUNCTION_OBJECT_H_
-#define _FUNCTION_OBJECT_H_
+#ifndef FUNCTION_OBJECT_H_
+#define FUNCTION_OBJECT_H_
-#include "internal.h"
#include "object_object.h"
#include "function.h"
diff --git a/JavaScriptCore/kjs/internal.h b/JavaScriptCore/kjs/internal.h
index f38aa1c..0f85f6e 100644
--- a/JavaScriptCore/kjs/internal.h
+++ b/JavaScriptCore/kjs/internal.h
@@ -34,7 +34,6 @@
#include "ustring.h"
#include <kxmlcore/Noncopyable.h>
-#include <kxmlcore/RefPtr.h>
#define I18N_NOOP(s) s
diff --git a/JavaScriptCore/kjs/lexer.cpp b/JavaScriptCore/kjs/lexer.cpp
index c9e4f3f..deb156e 100644
--- a/JavaScriptCore/kjs/lexer.cpp
+++ b/JavaScriptCore/kjs/lexer.cpp
@@ -24,19 +24,11 @@
#include "lexer.h"
#include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <assert.h>
-#include "value.h"
-#include "object.h"
-#include "types.h"
#include "interpreter.h"
#include "nodes.h"
-#include "identifier.h"
#include "lookup.h"
-#include "internal.h"
#include <kxmlcore/unicode/Unicode.h>
static bool isDecimalDigit(unsigned short c);
diff --git a/JavaScriptCore/kjs/math_object.cpp b/JavaScriptCore/kjs/math_object.cpp
index 7a16a44..26712f1 100644
--- a/JavaScriptCore/kjs/math_object.cpp
+++ b/JavaScriptCore/kjs/math_object.cpp
@@ -20,18 +20,13 @@
*/
#include "config.h"
-#include <math.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <time.h>
-
-#include "value.h"
-#include "object.h"
-#include "types.h"
-#include "interpreter.h"
-#include "operations.h"
#include "math_object.h"
+#include "lookup.h"
+#include "operations.h"
+#include <math.h>
+#include <time.h>
+
#include "math_object.lut.h"
#if PLATFORM(WIN_OS)
diff --git a/JavaScriptCore/kjs/math_object.h b/JavaScriptCore/kjs/math_object.h
index 807249b..5843e31 100644
--- a/JavaScriptCore/kjs/math_object.h
+++ b/JavaScriptCore/kjs/math_object.h
@@ -19,10 +19,9 @@
*
*/
-#ifndef _MATH_OBJECT_H_
-#define _MATH_OBJECT_H_
+#ifndef MATH_OBJECT_H_
+#define MATH_OBJECT_H_
-#include "internal.h"
#include "function_object.h"
namespace KJS {
diff --git a/JavaScriptCore/kjs/nodes.cpp b/JavaScriptCore/kjs/nodes.cpp
index ed96a3c..1cea76f 100644
--- a/JavaScriptCore/kjs/nodes.cpp
+++ b/JavaScriptCore/kjs/nodes.cpp
@@ -25,24 +25,16 @@
#include "nodes.h"
#include <math.h>
-#include <assert.h>
#ifdef KJS_DEBUG_MEM
#include <stdio.h>
#include <typeinfo>
#endif
-#include "collector.h"
#include "context.h"
#include "debugger.h"
#include "function_object.h"
-#include "internal.h"
-#include "value.h"
-#include "object.h"
-#include "types.h"
-#include "interpreter.h"
#include "lexer.h"
#include "operations.h"
-#include "ustring.h"
#include "reference_list.h"
#include <kxmlcore/HashSet.h>
#include <kxmlcore/HashCountedSet.h>
diff --git a/JavaScriptCore/kjs/nodes.h b/JavaScriptCore/kjs/nodes.h
index 14b2aec..98b9dbe 100644
--- a/JavaScriptCore/kjs/nodes.h
+++ b/JavaScriptCore/kjs/nodes.h
@@ -28,7 +28,6 @@
#include "Parser.h"
#include "internal.h"
#include <kxmlcore/ListRefPtr.h>
-#include <kxmlcore/RefPtr.h>
namespace KJS {
diff --git a/JavaScriptCore/kjs/number_object.cpp b/JavaScriptCore/kjs/number_object.cpp
index 7982502..63c9971 100644
--- a/JavaScriptCore/kjs/number_object.cpp
+++ b/JavaScriptCore/kjs/number_object.cpp
@@ -20,25 +20,19 @@
*/
#include "config.h"
-#include "value.h"
-#include "object.h"
-#include "types.h"
-#include "interpreter.h"
-#include "operations.h"
#include "number_object.h"
-#include "error_object.h"
-#include "dtoa.h"
+#include "dtoa.h"
+#include "error_object.h"
+#include "lookup.h"
+#include "operations.h"
#include <kxmlcore/Vector.h>
+#include <math.h>
#include "number_object.lut.h"
-#include <assert.h>
-#include <math.h>
-
using namespace KJS;
-
// ------------------------------ NumberInstance ----------------------------
const ClassInfo NumberInstance::info = {"Number", 0, 0, 0};
diff --git a/JavaScriptCore/kjs/number_object.h b/JavaScriptCore/kjs/number_object.h
index da1e353..56a672a 100644
--- a/JavaScriptCore/kjs/number_object.h
+++ b/JavaScriptCore/kjs/number_object.h
@@ -19,10 +19,9 @@
*
*/
-#ifndef _NUMBER_OBJECT_H_
-#define _NUMBER_OBJECT_H_
+#ifndef NUMBER_OBJECT_H_
+#define NUMBER_OBJECT_H_
-#include "internal.h"
#include "function_object.h"
namespace KJS {
diff --git a/JavaScriptCore/kjs/object.cpp b/JavaScriptCore/kjs/object.cpp
index bee49aa..8360c01 100644
--- a/JavaScriptCore/kjs/object.cpp
+++ b/JavaScriptCore/kjs/object.cpp
@@ -23,22 +23,24 @@
*/
#include "config.h"
-#include "value.h"
#include "object.h"
-#include "types.h"
-#include "interpreter.h"
-#include "lookup.h"
-#include "reference_list.h"
-#include <assert.h>
-#include <math.h>
-#include <stdio.h>
-
-#include "internal.h"
-#include "collector.h"
-#include "operations.h"
#include "error_object.h"
+#include "lookup.h"
#include "nodes.h"
+#include "operations.h"
+#include "reference_list.h"
+#include <math.h>
+
+// maximum global call stack size. Protects against accidental or
+// malicious infinite recursions. Define to -1 if you want no limit.
+#if PLATFORM(DARWIN)
+// Given OS X stack sizes we run out of stack at about 350 levels.
+// If we improve our stack usage, we can bump this number.
+#define KJS_MAX_STACK 100
+#else
+#define KJS_MAX_STACK 1000
+#endif
#define JAVASCRIPT_CALL_TRACING 0
diff --git a/JavaScriptCore/kjs/object.h b/JavaScriptCore/kjs/object.h
index efd65ff..2833970 100644
--- a/JavaScriptCore/kjs/object.h
+++ b/JavaScriptCore/kjs/object.h
@@ -25,24 +25,12 @@
#ifndef KJS_OBJECT_H
#define KJS_OBJECT_H
-// Objects
-
-// maximum global call stack size. Protects against accidental or
-// malicious infinite recursions. Define to -1 if you want no limit.
-#if PLATFORM(DARWIN)
-// Given OS X stack sizes we run out of stack at about 350 levels.
-// If we improve our stack usage, we can bump this number.
-#define KJS_MAX_STACK 100
-#else
-#define KJS_MAX_STACK 1000
-#endif
-
#include "JSType.h"
#include "interpreter.h"
-#include "kxmlcore/AlwaysInline.h"
#include "property_map.h"
#include "property_slot.h"
#include "scope_chain.h"
+#include <kxmlcore/AlwaysInline.h>
namespace KJS {
diff --git a/JavaScriptCore/kjs/object_object.cpp b/JavaScriptCore/kjs/object_object.cpp
index 2114e5c..2284b65 100644
--- a/JavaScriptCore/kjs/object_object.cpp
+++ b/JavaScriptCore/kjs/object_object.cpp
@@ -20,15 +20,11 @@
*/
#include "config.h"
-#include "value.h"
-#include "object.h"
-#include "types.h"
-#include "interpreter.h"
-#include "operations.h"
#include "object_object.h"
+
+#include "operations.h"
#include "function_object.h"
#include <stdio.h>
-#include <assert.h>
using namespace KJS;
diff --git a/JavaScriptCore/kjs/operations.cpp b/JavaScriptCore/kjs/operations.cpp
index ac4c6fa..b5d88a5 100644
--- a/JavaScriptCore/kjs/operations.cpp
+++ b/JavaScriptCore/kjs/operations.cpp
@@ -20,15 +20,11 @@
*
*/
-
-#include "JSType.h"
#include "config.h"
#include "operations.h"
-#include <assert.h>
#include <math.h>
#include <stdio.h>
-#include <stdlib.h>
#if HAVE(FUNC_ISINF) && HAVE(IEEEFP_H)
#include <ieeefp.h>
diff --git a/JavaScriptCore/kjs/protected_reference.h b/JavaScriptCore/kjs/protected_reference.h
index f3996d2..2229c01 100644
--- a/JavaScriptCore/kjs/protected_reference.h
+++ b/JavaScriptCore/kjs/protected_reference.h
@@ -24,8 +24,6 @@
#define KJS_PROTECTED_REFERENCE_H
#include "protect.h"
-#include "reference.h"
-#include "interpreter.h"
namespace KJS {
diff --git a/JavaScriptCore/kjs/reference.h b/JavaScriptCore/kjs/reference.h
index cfc1c6f..08ef367 100644
--- a/JavaScriptCore/kjs/reference.h
+++ b/JavaScriptCore/kjs/reference.h
@@ -20,10 +20,9 @@
*
*/
-#ifndef _KJS_REFERENCE_H_
-#define _KJS_REFERENCE_H_
+#ifndef KJS_REFERENCE_H_
+#define KJS_REFERENCE_H_
-#include "identifier.h"
#include "object.h"
namespace KJS {
diff --git a/JavaScriptCore/kjs/reference_list.h b/JavaScriptCore/kjs/reference_list.h
index 54b1ac7..dcd4891 100644
--- a/JavaScriptCore/kjs/reference_list.h
+++ b/JavaScriptCore/kjs/reference_list.h
@@ -20,10 +20,9 @@
*
*/
-#ifndef _KJS_REFERENCE_LIST_H_
-#define _KJS_REFERENCE_LIST_H_
+#ifndef KJS_REFERENCE_LIST_H_
+#define KJS_REFERENCE_LIST_H_
-#include "types.h"
#include "reference.h"
namespace KJS {
diff --git a/JavaScriptCore/kjs/regexp_object.h b/JavaScriptCore/kjs/regexp_object.h
index be5a178..0f23f81 100644
--- a/JavaScriptCore/kjs/regexp_object.h
+++ b/JavaScriptCore/kjs/regexp_object.h
@@ -19,13 +19,11 @@
*
*/
-#ifndef _REGEXP_OBJECT_H_
-#define _REGEXP_OBJECT_H_
+#ifndef REGEXP_OBJECT_H_
+#define REGEXP_OBJECT_H_
-#include "internal.h"
#include "function_object.h"
#include "regexp.h"
-#include <kxmlcore/OwnArrayPtr.h>
namespace KJS {
class ExecState;
diff --git a/JavaScriptCore/kjs/string_object.cpp b/JavaScriptCore/kjs/string_object.cpp
index 00f4be5..cab65ad 100644
--- a/JavaScriptCore/kjs/string_object.cpp
+++ b/JavaScriptCore/kjs/string_object.cpp
@@ -23,19 +23,15 @@
#include "config.h"
#include "string_object.h"
-#include "value.h"
-#include "object.h"
-#include "types.h"
-#include "interpreter.h"
+#include "error_object.h"
+#include "lookup.h"
#include "operations.h"
#include "reference_list.h"
-#include "regexp.h"
#include "regexp_object.h"
-#include "error_object.h"
-#include <stdio.h>
-#include "string_object.lut.h"
#include <kxmlcore/unicode/Unicode.h>
+#include "string_object.lut.h"
+
using namespace KJS;
// ------------------------------ StringInstance ----------------------------
diff --git a/JavaScriptCore/kjs/string_object.h b/JavaScriptCore/kjs/string_object.h
index dc05841..cef1917 100644
--- a/JavaScriptCore/kjs/string_object.h
+++ b/JavaScriptCore/kjs/string_object.h
@@ -19,10 +19,9 @@
*
*/
-#ifndef _STRING_OBJECT_H_
-#define _STRING_OBJECT_H_
+#ifndef STRING_OBJECT_H_
+#define STRING_OBJECT_H_
-#include "internal.h"
#include "function_object.h"
namespace KJS {
diff --git a/JavaScriptCore/kjs/testkjs.cpp b/JavaScriptCore/kjs/testkjs.cpp
index 727cb0a..4a260d4 100644
--- a/JavaScriptCore/kjs/testkjs.cpp
+++ b/JavaScriptCore/kjs/testkjs.cpp
@@ -26,14 +26,10 @@
#include "HashTraits.h"
#include "JSLock.h"
-#include "interpreter.h"
#include "object.h"
-#include "types.h"
-#include "value.h"
#include <math.h>
#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
#if HAVE(SYS_TIME_H)
#include <sys/time.h>
diff --git a/JavaScriptCore/kjs/value.cpp b/JavaScriptCore/kjs/value.cpp
index 11c2bc0..715132f 100644
--- a/JavaScriptCore/kjs/value.cpp
+++ b/JavaScriptCore/kjs/value.cpp
@@ -24,16 +24,10 @@
#include "config.h"
#include "value.h"
-#include "object.h"
-#include "types.h"
-#include "interpreter.h"
-
#include <math.h>
#include <stdio.h>
#include <string.h>
-#include "internal.h"
-#include "collector.h"
#include "operations.h"
#include "error_object.h"
#include "nodes.h"
diff --git a/JavaScriptCore/kjs/value.h b/JavaScriptCore/kjs/value.h
index 85d411a..6c47970 100644
--- a/JavaScriptCore/kjs/value.h
+++ b/JavaScriptCore/kjs/value.h
@@ -24,6 +24,10 @@
#ifndef KJS_VALUE_H
#define KJS_VALUE_H
+#include "JSImmediate.h"
+#include "ustring.h"
+#include <stddef.h> // for size_t
+
#ifndef NDEBUG // protection against problems if committing with KJS_VERBOSE on
// Uncomment this to enable very verbose output from KJS
@@ -33,13 +37,6 @@
#endif
-#include "JSImmediate.h"
-#include "JSType.h"
-#include "kxmlcore/Assertions.h"
-#include "ustring.h"
-
-#include <stdlib.h> // for size_t
-
namespace KJS {
class ClassInfo;
diff --git a/JavaScriptCore/kxmlcore/Forward.h b/JavaScriptCore/kxmlcore/Forward.h
new file mode 100644
index 0000000..bf915a0
--- /dev/null
+++ b/JavaScriptCore/kxmlcore/Forward.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2006 Apple Computer, Inc.
+ *
+ * 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 KXMLCORE_FORWARD_H
+#define KXMLCORE_FORWARD_H
+
+#include <stddef.h>
+
+namespace KXMLCore {
+ template<typename T> class ListRefPtr;
+ template<typename T> class OwnArrayPtr;
+ template<typename T> class OwnPtr;
+ template<typename T> class PassRefPtr;
+ template<typename T> class RefPtr;
+ template<typename T, size_t inlineCapacity = 0> class Vector;
+}
+
+using KXMLCore::ListRefPtr;
+using KXMLCore::OwnArrayPtr;
+using KXMLCore::OwnPtr;
+using KXMLCore::PassRefPtr;
+using KXMLCore::RefPtr;
+using KXMLCore::Vector;
+
+#endif
diff --git a/JavaScriptCore/kxmlcore/HashCountedSet.h b/JavaScriptCore/kxmlcore/HashCountedSet.h
index 963e9e6..840f7af 100644
--- a/JavaScriptCore/kxmlcore/HashCountedSet.h
+++ b/JavaScriptCore/kxmlcore/HashCountedSet.h
@@ -28,8 +28,7 @@
namespace KXMLCore {
- template<typename Value, typename HashFunctions = typename DefaultHash<Value>::Hash, typename Traits = HashTraits<Value> >
- class HashCountedSet {
+ template<typename Value, typename HashFunctions, typename Traits> class HashCountedSet {
private:
typedef HashMap<Value, unsigned, HashFunctions, Traits> ImplType;
public:
@@ -176,5 +175,3 @@
using KXMLCore::HashCountedSet;
#endif /* KXMLCORE_HASH_COUNTED_SET_H */
-
-
diff --git a/JavaScriptCore/kxmlcore/HashForward.h b/JavaScriptCore/kxmlcore/HashForward.h
new file mode 100644
index 0000000..5e7d2e2
--- /dev/null
+++ b/JavaScriptCore/kxmlcore/HashForward.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2006 Apple Computer, Inc.
+ *
+ * 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 KXMLCORE_HASH_FORWARD_H
+#define KXMLCORE_HASH_FORWARD_H
+
+#include "HashTraits.h"
+
+namespace KXMLCore {
+ template<typename Value, typename HashFunctions = typename DefaultHash<Value>::Hash,
+ typename Traits = HashTraits<Value> > class HashCountedSet;
+ template<typename Key, typename Mapped, typename Hash = typename DefaultHash<Key>::Hash,
+ typename KeyTraits = HashTraits<Key>, typename MappedTraits = HashTraits<Mapped> > class HashMap;
+ template<typename Value, typename Hash = typename DefaultHash<Value>::Hash,
+ typename Traits = HashTraits<Value> > class HashSet;
+}
+
+using KXMLCore::HashCountedSet;
+using KXMLCore::HashMap;
+using KXMLCore::HashSet;
+
+#endif
diff --git a/JavaScriptCore/kxmlcore/HashMap.h b/JavaScriptCore/kxmlcore/HashMap.h
index cd4de5c..770802e 100644
--- a/JavaScriptCore/kxmlcore/HashMap.h
+++ b/JavaScriptCore/kxmlcore/HashMap.h
@@ -24,14 +24,15 @@
#ifndef KXMLCORE_HASH_MAP_H
#define KXMLCORE_HASH_MAP_H
+#include "HashForward.h"
#include "HashTable.h"
namespace KXMLCore {
template<typename PairType> struct PairFirstExtractor;
- template<typename KeyArg, typename MappedArg, typename HashArg = typename DefaultHash<KeyArg>::Hash,
- typename KeyTraitsArg = HashTraits<KeyArg>, typename MappedTraitsArg = HashTraits<MappedArg> > class HashMap {
+ template<typename KeyArg, typename MappedArg, typename HashArg, typename KeyTraitsArg,
+ typename MappedTraitsArg> class HashMap {
private:
typedef KeyTraitsArg KeyTraits;
typedef MappedTraitsArg MappedTraits;
diff --git a/JavaScriptCore/kxmlcore/HashSet.h b/JavaScriptCore/kxmlcore/HashSet.h
index 00f4938..960183a 100644
--- a/JavaScriptCore/kxmlcore/HashSet.h
+++ b/JavaScriptCore/kxmlcore/HashSet.h
@@ -24,6 +24,7 @@
#ifndef KXMLCORE_HASH_SET_H
#define KXMLCORE_HASH_SET_H
+#include "HashForward.h"
#include "HashTable.h"
namespace KXMLCore {
@@ -34,8 +35,7 @@
template<typename Value, typename HashFunctions, typename Traits>
void deleteAllValues(HashSet<Value, HashFunctions, Traits>&);
- template<typename ValueArg, typename HashArg = typename DefaultHash<ValueArg>::Hash,
- typename TraitsArg = HashTraits<ValueArg> > class HashSet {
+ template<typename ValueArg, typename HashArg, typename TraitsArg> class HashSet {
private:
typedef HashArg HashFunctions;
typedef TraitsArg ValueTraits;
diff --git a/JavaScriptCore/kxmlcore/HashTable.h b/JavaScriptCore/kxmlcore/HashTable.h
index 31bf577..0d9f251 100644
--- a/JavaScriptCore/kxmlcore/HashTable.h
+++ b/JavaScriptCore/kxmlcore/HashTable.h
@@ -26,7 +26,6 @@
#include "FastMalloc.h"
#include "HashTraits.h"
#include <assert.h>
-#include <algorithm>
namespace KXMLCore {
diff --git a/JavaScriptCore/kxmlcore/ListRefPtr.h b/JavaScriptCore/kxmlcore/ListRefPtr.h
index daee65f..00fc2f5 100644
--- a/JavaScriptCore/kxmlcore/ListRefPtr.h
+++ b/JavaScriptCore/kxmlcore/ListRefPtr.h
@@ -24,7 +24,6 @@
#define KXMLCORE_LIST_REF_PTR_H
#include <kxmlcore/RefPtr.h>
-#include <algorithm>
namespace KXMLCore {
diff --git a/JavaScriptCore/kxmlcore/TCPageMap.h b/JavaScriptCore/kxmlcore/TCPageMap.h
index d26d148..018e324 100644
--- a/JavaScriptCore/kxmlcore/TCPageMap.h
+++ b/JavaScriptCore/kxmlcore/TCPageMap.h
@@ -57,7 +57,7 @@
#include <string.h>
-#include "kxmlcore/Assertions.h"
+#include "Assertions.h"
// Single-level array
template <int BITS>
diff --git a/JavaScriptCore/kxmlcore/Vector.h b/JavaScriptCore/kxmlcore/Vector.h
index c62897b..ea2ad6d 100644
--- a/JavaScriptCore/kxmlcore/Vector.h
+++ b/JavaScriptCore/kxmlcore/Vector.h
@@ -24,6 +24,7 @@
#define KXMLCORE_VECTOR_H
#include "Assertions.h"
+#include "Forward.h"
#include "VectorTraits.h"
#include <limits>
#include <stdlib.h>
@@ -301,7 +302,7 @@
char m_inlineBuffer[m_inlineBufferSize];
};
- template<typename T, size_t inlineCapacity = 0>
+ template<typename T, size_t inlineCapacity>
class Vector {
private:
typedef VectorBuffer<T, inlineCapacity> Impl;
