Commit bb863518 authored by mjs's avatar mjs

JavaScriptCore:

        Rubber stamped by Anders.
        
        - renamed kxmlcore to wtf
        
        kxmlcore --> wtf
        KXMLCore --> WTF
        WKC --> WTF

        * JavaScriptCore.xcodeproj/project.pbxproj:
        * bindings/c/c_instance.cpp:
        * bindings/objc/WebScriptObject.mm:
        * kjs/JSImmediate.h:
        * kjs/Parser.cpp:
        * kjs/Parser.h:
        * kjs/array_object.cpp:
        * kjs/collector.cpp:
        (KJS::Collector::registerThread):
        * kjs/collector.h:
        * kjs/config.h:
        * kjs/function.cpp:
        (KJS::isStrWhiteSpace):
        * kjs/function.h:
        * kjs/identifier.cpp:
        * kjs/internal.cpp:
        * kjs/internal.h:
        * kjs/lexer.cpp:
        (Lexer::shift):
        (Lexer::isWhiteSpace):
        (Lexer::isIdentStart):
        (Lexer::isIdentPart):
        * kjs/lookup.cpp:
        * kjs/nodes.cpp:
        * kjs/nodes.h:
        * kjs/number_object.cpp:
        * kjs/object.h:
        * kjs/property_map.cpp:
        * kjs/property_map.h:
        * kjs/string_object.cpp:
        (StringProtoFunc::callAsFunction):
        * kjs/testkjs.cpp:
        (testIsInteger):
        * kjs/ustring.cpp:
        * kjs/ustring.h:
        * kxmlcore: Removed.
        * kxmlcore/AlwaysInline.h: Removed.
        * kxmlcore/Assertions.cpp: Removed.
        * kxmlcore/Assertions.h: Removed.
        * kxmlcore/FastMalloc.cpp: Removed.
        * kxmlcore/FastMalloc.h: Removed.
        * kxmlcore/FastMallocInternal.h: Removed.
        * kxmlcore/Forward.h: Removed.
        * kxmlcore/HashCountedSet.h: Removed.
        * kxmlcore/HashFunctions.h: Removed.
        * kxmlcore/HashMap.h: Removed.
        * kxmlcore/HashSet.h: Removed.
        * kxmlcore/HashTable.cpp: Removed.
        * kxmlcore/HashTable.h: Removed.
        * kxmlcore/HashTraits.h: Removed.
        * kxmlcore/ListRefPtr.h: Removed.
        * kxmlcore/Noncopyable.h: Removed.
        * kxmlcore/OwnArrayPtr.h: Removed.
        * kxmlcore/OwnPtr.h: Removed.
        * kxmlcore/PassRefPtr.h: Removed.
        * kxmlcore/Platform.h: Removed.
        * kxmlcore/RefPtr.h: Removed.
        * kxmlcore/TCPageMap.h: Removed.
        * kxmlcore/TCSpinLock.h: Removed.
        * kxmlcore/TCSystemAlloc.cpp: Removed.
        * kxmlcore/TCSystemAlloc.h: Removed.
        * kxmlcore/UnusedParam.h: Removed.
        * kxmlcore/Vector.h: Removed.
        * kxmlcore/VectorTraits.h: Removed.
        * kxmlcore/unicode: Removed.
        * kxmlcore/unicode/Unicode.h: Removed.
        * kxmlcore/unicode/UnicodeCategory.h: Removed.
        * kxmlcore/unicode/icu: Removed.
        * kxmlcore/unicode/icu/UnicodeIcu.h: Removed.
        * kxmlcore/unicode/posix: Removed.
        * kxmlcore/unicode/qt3: Removed.
        * kxmlcore/unicode/qt4: Removed.
        * kxmlcore/unicode/qt4/UnicodeQt4.h: Removed.
        * pcre/pcre_get.c:
        * wtf: Added.
        * wtf/Assertions.cpp:
        * wtf/Assertions.h:
        * wtf/FastMalloc.cpp:
        (WTF::TCMalloc_ThreadCache::Scavenge):
        (WTF::do_malloc):
        (WTF::do_free):
        (WTF::TCMallocGuard::TCMallocGuard):
        (WTF::malloc):
        (WTF::free):
        (WTF::calloc):
        (WTF::cfree):
        (WTF::realloc):
        * wtf/FastMalloc.h:
        * wtf/FastMallocInternal.h:
        * wtf/Forward.h:
        * wtf/HashCountedSet.h:
        * wtf/HashFunctions.h:
        * wtf/HashMap.h:
        * wtf/HashSet.h:
        * wtf/HashTable.cpp:
        * wtf/HashTable.h:
        * wtf/HashTraits.h:
        * wtf/ListRefPtr.h:
        * wtf/Noncopyable.h:
        * wtf/OwnArrayPtr.h:
        * wtf/OwnPtr.h:
        * wtf/PassRefPtr.h:
        * wtf/RefPtr.h:
        * wtf/TCSystemAlloc.cpp:
        (TCMalloc_SystemAlloc):
        * wtf/Vector.h:
        * wtf/VectorTraits.h:
        * wtf/unicode/UnicodeCategory.h:
        * wtf/unicode/icu/UnicodeIcu.h:

JavaScriptGlue:

        Rubber stamped by Anders.
        
        - renamed kxmlcore to wtf
        
        kxmlcore --> wtf
        KXMLCore --> WTF
        WKC --> WTF

        * config.h:
        * kxmlcore: Removed.
        * kxmlcore/AlwaysInline.h: Removed.
        * kxmlcore/Assertions.h: Removed.
        * kxmlcore/FastMalloc.h: Removed.
        * kxmlcore/Forward.h: Removed.
        * kxmlcore/HashCountedSet.h: Removed.
        * kxmlcore/HashSet.h: Removed.
        * kxmlcore/Noncopyable.h: Removed.
        * kxmlcore/OwnArrayPtr.h: Removed.
        * kxmlcore/OwnPtr.h: Removed.
        * kxmlcore/PassRefPtr.h: Removed.
        * kxmlcore/Platform.h: Removed.
        * kxmlcore/RefPtr.h: Removed.
        * kxmlcore/Vector.h: Removed.
        * wtf: Added.

WebCore:

        Rubber stamped by Anders.
        
        - renamed kxmlcore to wtf
        
        kxmlcore --> wtf
        KXMLCore --> WTF
        WKC --> WTF

        * ForwardingHeaders/kxmlcore: Removed.
        * ForwardingHeaders/kxmlcore/AlwaysInline.h: Removed.
        * ForwardingHeaders/kxmlcore/Assertions.h: Removed.
        * ForwardingHeaders/kxmlcore/FastMalloc.h: Removed.
        * ForwardingHeaders/kxmlcore/Forward.h: Removed.
        * ForwardingHeaders/kxmlcore/HashCountedSet.h: Removed.
        * ForwardingHeaders/kxmlcore/HashMap.h: Removed.
        * ForwardingHeaders/kxmlcore/HashSet.h: Removed.
        * ForwardingHeaders/kxmlcore/HashTraits.h: Removed.
        * ForwardingHeaders/kxmlcore/Noncopyable.h: Removed.
        * ForwardingHeaders/kxmlcore/OwnArrayPtr.h: Removed.
        * ForwardingHeaders/kxmlcore/OwnPtr.h: Removed.
        * ForwardingHeaders/kxmlcore/PassRefPtr.h: Removed.
        * ForwardingHeaders/kxmlcore/Platform.h: Removed.
        * ForwardingHeaders/kxmlcore/RefPtr.h: Removed.
        * ForwardingHeaders/kxmlcore/Vector.h: Removed.
        * ForwardingHeaders/wtf: Added.
        * bindings/js/JSHTMLElementWrapperFactory.h:
        * bindings/js/kjs_binding.cpp:
        * bindings/js/kjs_window.h:
        * bindings/objc/DOMImplementationFront.h:
        * bridge/JavaAppletWidget.h:
        * bridge/mac/WebCoreFrameNamespaces.mm:
        * bridge/mac/WebCorePageBridge.mm:
        (initializeLogChannel):
        * bridge/mac/WebCoreStringTruncator.mm:
        * bridge/mac/WebCoreViewFactory.m:
        * config.h:
        * css/css_base.h:
        * css/css_valueimpl.h:
        * css/csshelper.cpp:
        * css/cssparser.h:
        * dom/DOMImplementation.h:
        * dom/Document.h:
        * dom/NamedNodeMap.h:
        * dom/Node.h:
        * dom/NodeList.h:
        * dom/QualifiedName.cpp:
        * dom/Range.h:
        * dom/StyledElement.cpp:
        * dom/dom2_traversalimpl.h:
        * dom/xml_tokenizer.h:
        * editing/RebalanceWhitespaceCommand.cpp:
        * editing/RemoveCSSPropertyCommand.cpp:
        * editing/RemoveNodeAttributeCommand.cpp:
        * editing/RemoveNodeCommand.cpp:
        * editing/RemoveNodePreservingChildrenCommand.cpp:
        * editing/ReplaceSelectionCommand.h:
        * editing/Selection.cpp:
        * editing/SetNodeAttributeCommand.cpp:
        * editing/SplitElementCommand.cpp:
        * editing/SplitTextNodeCommand.cpp:
        * editing/SplitTextNodeContainingElementCommand.cpp:
        * editing/TextIterator.h:
        * editing/htmlediting.h:
        * editing/markup.h:
        * html/CanvasGradient.h:
        * html/CanvasRenderingContext2D.h:
        * html/CanvasStyle.cpp:
        * html/HTMLCollection.h:
        * html/HTMLElementFactory.h:
        * kcanvas/KCanvasFilters.cpp:
        * kcanvas/KCanvasPath.h:
        * kcanvas/RenderPath.cpp:
        * kcanvas/RenderSVGImage.cpp:
        * kcanvas/RenderSVGText.cpp:
        * kcanvas/device/quartz/KCanvasItemQuartz.mm:
        * kcanvas/device/quartz/KRenderingPaintServerGradientQuartz.mm:
        * kcanvas/device/quartz/QuartzSupport.mm:
        * ksvg2/misc/KSVGTimeScheduler.h:
        * ksvg2/misc/SVGDocumentExtensions.h:
        * ksvg2/scripts/make_names.pl:
        * ksvg2/svg/SVGDOMImplementation.cpp:
        * ksvg2/svg/SVGExternalResourcesRequired.h:
        * ksvg2/svg/SVGFilterPrimitiveStandardAttributes.cpp:
        * ksvg2/svg/SVGForeignObjectElement.cpp:
        * ksvg2/svg/SVGImageElement.cpp:
        * ksvg2/svg/SVGMaskElement.cpp:
        * ksvg2/svg/SVGStyledElement.cpp:
        * ksvg2/svg/SVGTests.h:
        * ksvg2/svg/SVGTransform.h:
        * ksvg2/svg/SVGTransformable.cpp:
        * kwq/AccessibilityObjectCache.h:
        * kwq/KWQCString.cpp:
        * kwq/KWQFormData.mm:
        * kwq/KWQListBox.mm:
        * kwq/KWQResourceLoader.mm:
        * kwq/KWQTextEdit.mm:
        * loader/Cache.h:
        * loader/CachedObject.h:
        * loader/CachedObjectClientWalker.h:
        * loader/Decoder.h:
        * loader/DocLoader.h:
        * loader/loader.cpp:
        * loader/loader.h:
        * page/DOMWindow.h:
        * page/Frame.h:
        * page/FramePrivate.h:
        * page/FrameTree.cpp:
        * page/Page.cpp:
        * page/Page.h:
        * page/Plugin.h:
        * platform/Arena.cpp:
        * platform/ArrayImpl.h:
        * platform/AtomicString.cpp:
        * platform/CharsetNames.cpp:
        * platform/Color.cpp:
        * platform/DeprecatedPtrListImpl.cpp:
        * platform/DeprecatedValueListImpl.h:
        * platform/FontFallbackList.h:
        * platform/GraphicsContext.h:
        * platform/GraphicsTypes.cpp:
        * platform/Image.h:
        * platform/KURL.cpp:
        * platform/Logging.cpp:
        * platform/Logging.h:
        * platform/PlatformString.h:
        * platform/PlugInInfoStore.h:
        * platform/StreamingTextDecoder.cpp:
        * platform/StreamingTextDecoder.h:
        * platform/String.cpp:
        * platform/StringHash.h:
        * platform/StringImpl.cpp:
        * platform/StringImpl.h:
        * platform/TextEncoding.cpp:
        * platform/Timer.cpp:
        * platform/Timer.h:
        * platform/TransferJob.h:
        * platform/TransferJobInternal.h:
        * platform/mac/BlockExceptions.mm:
        * platform/mac/ColorMac.mm:
        * platform/mac/FontData.mm:
        * platform/mac/KURLMac.mm:
        * platform/mac/QStringMac.mm:
        * platform/mac/SharedTimerMac.cpp:
        * platform/mac/TextEncodingMac.cpp:
        * platform/mac/WebCoreImageRendererFactory.m:
        * platform/mac/WebCoreKeyGenerator.m:
        * platform/mac/WebCoreTextArea.mm:
        * platform/mac/WebCoreTextField.mm:
        * platform/mac/WebTextRendererFactory.h:
        * platform/mac/WebTextRendererFactory.mm:
        * platform/win/TemporaryLinkStubs.cpp:
        (JavaAppletWidget::JavaAppletWidget):
        * rendering/InlineTextBox.cpp:
        * rendering/RenderText.cpp:
        * rendering/RenderTreeAsText.cpp:
        * rendering/bidi.cpp:
        * xml/XSLTProcessor.h:
        * xpath/impl/XPathExpressionNode.h:
        * xpath/impl/XPathParser.h:
        * xpath/impl/XPathPath.h:
        * xpath/impl/XPathUtil.h:

WebKit:

        Rubber stamped by Anders.
        
        - renamed kxmlcore to wtf
        
        kxmlcore --> wtf
        KXMLCore --> WTF
        WKC --> WTF

        * Misc/WebKitLogging.h:
        * Misc/WebKitLogging.m:
        (initializeLogChannel):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14256 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 9274e380
2006-05-09 Maciej Stachowiak <mjs@apple.com>
Rubber stamped by Anders.
- renamed kxmlcore to wtf
kxmlcore --> wtf
KXMLCore --> WTF
WKC --> WTF
* JavaScriptCore.xcodeproj/project.pbxproj:
* bindings/c/c_instance.cpp:
* bindings/objc/WebScriptObject.mm:
* kjs/JSImmediate.h:
* kjs/Parser.cpp:
* kjs/Parser.h:
* kjs/array_object.cpp:
* kjs/collector.cpp:
(KJS::Collector::registerThread):
* kjs/collector.h:
* kjs/config.h:
* kjs/function.cpp:
(KJS::isStrWhiteSpace):
* kjs/function.h:
* kjs/identifier.cpp:
* kjs/internal.cpp:
* kjs/internal.h:
* kjs/lexer.cpp:
(Lexer::shift):
(Lexer::isWhiteSpace):
(Lexer::isIdentStart):
(Lexer::isIdentPart):
* kjs/lookup.cpp:
* kjs/nodes.cpp:
* kjs/nodes.h:
* kjs/number_object.cpp:
* kjs/object.h:
* kjs/property_map.cpp:
* kjs/property_map.h:
* kjs/string_object.cpp:
(StringProtoFunc::callAsFunction):
* kjs/testkjs.cpp:
(testIsInteger):
* kjs/ustring.cpp:
* kjs/ustring.h:
* kxmlcore: Removed.
* kxmlcore/AlwaysInline.h: Removed.
* kxmlcore/Assertions.cpp: Removed.
* kxmlcore/Assertions.h: Removed.
* kxmlcore/FastMalloc.cpp: Removed.
* kxmlcore/FastMalloc.h: Removed.
* kxmlcore/FastMallocInternal.h: Removed.
* kxmlcore/Forward.h: Removed.
* kxmlcore/HashCountedSet.h: Removed.
* kxmlcore/HashFunctions.h: Removed.
* kxmlcore/HashMap.h: Removed.
* kxmlcore/HashSet.h: Removed.
* kxmlcore/HashTable.cpp: Removed.
* kxmlcore/HashTable.h: Removed.
* kxmlcore/HashTraits.h: Removed.
* kxmlcore/ListRefPtr.h: Removed.
* kxmlcore/Noncopyable.h: Removed.
* kxmlcore/OwnArrayPtr.h: Removed.
* kxmlcore/OwnPtr.h: Removed.
* kxmlcore/PassRefPtr.h: Removed.
* kxmlcore/Platform.h: Removed.
* kxmlcore/RefPtr.h: Removed.
* kxmlcore/TCPageMap.h: Removed.
* kxmlcore/TCSpinLock.h: Removed.
* kxmlcore/TCSystemAlloc.cpp: Removed.
* kxmlcore/TCSystemAlloc.h: Removed.
* kxmlcore/UnusedParam.h: Removed.
* kxmlcore/Vector.h: Removed.
* kxmlcore/VectorTraits.h: Removed.
* kxmlcore/unicode: Removed.
* kxmlcore/unicode/Unicode.h: Removed.
* kxmlcore/unicode/UnicodeCategory.h: Removed.
* kxmlcore/unicode/icu: Removed.
* kxmlcore/unicode/icu/UnicodeIcu.h: Removed.
* kxmlcore/unicode/posix: Removed.
* kxmlcore/unicode/qt3: Removed.
* kxmlcore/unicode/qt4: Removed.
* kxmlcore/unicode/qt4/UnicodeQt4.h: Removed.
* pcre/pcre_get.c:
* wtf: Added.
* wtf/Assertions.cpp:
* wtf/Assertions.h:
* wtf/FastMalloc.cpp:
(WTF::TCMalloc_ThreadCache::Scavenge):
(WTF::do_malloc):
(WTF::do_free):
(WTF::TCMallocGuard::TCMallocGuard):
(WTF::malloc):
(WTF::free):
(WTF::calloc):
(WTF::cfree):
(WTF::realloc):
* wtf/FastMalloc.h:
* wtf/FastMallocInternal.h:
* wtf/Forward.h:
* wtf/HashCountedSet.h:
* wtf/HashFunctions.h:
* wtf/HashMap.h:
* wtf/HashSet.h:
* wtf/HashTable.cpp:
* wtf/HashTable.h:
* wtf/HashTraits.h:
* wtf/ListRefPtr.h:
* wtf/Noncopyable.h:
* wtf/OwnArrayPtr.h:
* wtf/OwnPtr.h:
* wtf/PassRefPtr.h:
* wtf/RefPtr.h:
* wtf/TCSystemAlloc.cpp:
(TCMalloc_SystemAlloc):
* wtf/Vector.h:
* wtf/VectorTraits.h:
* wtf/unicode/UnicodeCategory.h:
* wtf/unicode/icu/UnicodeIcu.h:
2006-05-08 Timothy Hatcher <timothy@apple.com>
Reviewed by Tim O.
......
......@@ -549,7 +549,7 @@
children = (
937B63CC09E766D200A671DD /* DerivedSources.make */,
65417200039E01BA0058BFEB /* kjs */,
65162EF108E6A21C007556CD /* kxmlcore */,
65162EF108E6A21C007556CD /* wtf */,
51856D950562EE9C008B9D83 /* bindings */,
65417203039E01F90058BFEB /* pcre */,
650FDF8D09D0FCA700769E54 /* Derived Sources */,
......@@ -648,7 +648,7 @@
path = DerivedSources/JavaScriptCore;
sourceTree = BUILT_PRODUCTS_DIR;
};
65162EF108E6A21C007556CD /* kxmlcore */ = {
65162EF108E6A21C007556CD /* wtf */ = {
isa = PBXGroup;
children = (
E195678D09E7CF1200B89D13 /* unicode */,
......@@ -681,7 +681,7 @@
6592C316098B7DE10003D4F6 /* Vector.h */,
6592C317098B7DE10003D4F6 /* VectorTraits.h */,
);
path = kxmlcore;
path = wtf;
sourceTree = "<group>";
};
65417200039E01BA0058BFEB /* kjs */ = {
......
......@@ -31,7 +31,7 @@
#include "c_utility.h"
#include "list.h"
#include "npruntime_impl.h"
#include <kxmlcore/Vector.h>
#include <wtf/Vector.h>
namespace KJS {
namespace Bindings {
......
......@@ -28,7 +28,7 @@
#import "objc_instance.h"
#import "runtime_object.h"
#import <kxmlcore/UnusedParam.h>
#import <wtf/UnusedParam.h>
using namespace KJS;
using namespace KJS::Bindings;
......
......@@ -23,7 +23,7 @@
#define KJS_JS_IMMEDIATE_H
#include "JSType.h"
#include <kxmlcore/Assertions.h>
#include <wtf/Assertions.h>
#include <stdint.h>
#include <stdlib.h>
......
......@@ -27,8 +27,8 @@
#include "lexer.h"
#include "nodes.h"
#include <kxmlcore/HashSet.h>
#include <kxmlcore/Vector.h>
#include <wtf/HashSet.h>
#include <wtf/Vector.h>
extern int kjsyyparse();
......
......@@ -25,7 +25,7 @@
#ifndef Parser_h
#define Parser_h
#include <kxmlcore/Forward.h>
#include <wtf/Forward.h>
namespace KJS {
......
......@@ -28,7 +28,7 @@
#include "lookup.h"
#include "operations.h"
#include "reference_list.h"
#include <kxmlcore/HashSet.h>
#include <wtf/HashSet.h>
#include <stdio.h>
#include "array_object.lut.h"
......
......@@ -22,9 +22,9 @@
#include "config.h"
#include "collector.h"
#include <kxmlcore/FastMalloc.h>
#include <kxmlcore/FastMallocInternal.h>
#include <kxmlcore/HashCountedSet.h>
#include <wtf/FastMalloc.h>
#include <wtf/FastMallocInternal.h>
#include <wtf/HashCountedSet.h>
#include "internal.h"
#include "list.h"
#include "value.h"
......@@ -235,7 +235,7 @@ void Collector::registerThread()
if (!pthread_getspecific(registeredThreadKey)) {
pthread_t pthread = pthread_self();
KXMLCore::fastMallocRegisterThread(pthread);
WTF::fastMallocRegisterThread(pthread);
Collector::Thread *thread = new Collector::Thread(pthread, pthread_mach_thread_np(pthread));
thread->next = registeredThreads;
registeredThreads = thread;
......
......@@ -25,7 +25,7 @@
#define KJSCOLLECTOR_H_
#include "value.h"
#include <kxmlcore/HashCountedSet.h>
#include <wtf/HashCountedSet.h>
#define KJS_MEM_LIMIT 500000
......
#include <kxmlcore/Platform.h>
#include <wtf/Platform.h>
#if PLATFORM(DARWIN)
......@@ -43,10 +43,10 @@
#define HAVE_STDINT_H 1
#define HAVE_STRING_H 1
#define KXC_CHANGES 1
#define WTF_CHANGES 1
#ifdef __cplusplus
#undef new
#undef delete
#include <kxmlcore/FastMalloc.h>
#include <wtf/FastMalloc.h>
#endif
......@@ -40,7 +40,7 @@
#include <string.h>
#include <ctype.h>
#include <kxmlcore/unicode/Unicode.h>
#include <wtf/unicode/Unicode.h>
namespace KJS {
......@@ -661,7 +661,7 @@ static bool isStrWhiteSpace(unsigned short c)
case 0x2029:
return true;
default:
return KXMLCore::Unicode::isSeparatorSpace(c);
return WTF::Unicode::isSeparatorSpace(c);
}
}
......
......@@ -25,7 +25,7 @@
#define KJS_FUNCTION_H
#include "internal.h"
#include <kxmlcore/OwnPtr.h>
#include <wtf/OwnPtr.h>
namespace KJS {
......
......@@ -38,12 +38,12 @@
#include "identifier.h"
#include <kxmlcore/FastMalloc.h>
#include <kxmlcore/HashSet.h>
#include <wtf/FastMalloc.h>
#include <wtf/HashSet.h>
#include <string.h> // for strlen
#include <new> // for placement new
namespace KXMLCore {
namespace WTF {
template<typename T> class DefaultHash;
template<typename T> class StrHash;
......
......@@ -42,9 +42,9 @@
#include "regexp_object.h"
#include "string_object.h"
#include <assert.h>
#include <kxmlcore/HashMap.h>
#include <kxmlcore/HashSet.h>
#include <kxmlcore/Vector.h>
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
#include <wtf/Vector.h>
#include <math.h>
#include <stdio.h>
......
......@@ -33,7 +33,7 @@
#include "types.h"
#include "ustring.h"
#include <kxmlcore/Noncopyable.h>
#include <wtf/Noncopyable.h>
#define I18N_NOOP(s) s
......
......@@ -29,7 +29,7 @@
#include "interpreter.h"
#include "nodes.h"
#include "lookup.h"
#include <kxmlcore/unicode/Unicode.h>
#include <wtf/unicode/Unicode.h>
static bool isDecimalDigit(unsigned short c);
......@@ -129,7 +129,7 @@ void Lexer::shift(unsigned int p)
break;
}
next3 = code[pos++].uc;
} while (KXMLCore::Unicode::isFormatChar(next3));
} while (WTF::Unicode::isFormatChar(next3));
}
}
......@@ -564,7 +564,7 @@ int Lexer::lex()
bool Lexer::isWhiteSpace() const
{
return current == '\t' || current == 0x0b || current == 0x0c || KXMLCore::Unicode::isSeparatorSpace(current);
return current == '\t' || current == 0x0b || current == 0x0c || WTF::Unicode::isSeparatorSpace(current);
}
bool Lexer::isLineTerminator()
......@@ -580,25 +580,25 @@ bool Lexer::isLineTerminator()
bool Lexer::isIdentStart(unsigned short c)
{
return (KXMLCore::Unicode::category(c) & (KXMLCore::Unicode::Letter_Uppercase
| KXMLCore::Unicode::Letter_Lowercase
| KXMLCore::Unicode::Letter_Titlecase
| KXMLCore::Unicode::Letter_Modifier
| KXMLCore::Unicode::Letter_Other))
return (WTF::Unicode::category(c) & (WTF::Unicode::Letter_Uppercase
| WTF::Unicode::Letter_Lowercase
| WTF::Unicode::Letter_Titlecase
| WTF::Unicode::Letter_Modifier
| WTF::Unicode::Letter_Other))
|| c == '$' || c == '_';
}
bool Lexer::isIdentPart(unsigned short c)
{
return (KXMLCore::Unicode::category(c) & (KXMLCore::Unicode::Letter_Uppercase
| KXMLCore::Unicode::Letter_Lowercase
| KXMLCore::Unicode::Letter_Titlecase
| KXMLCore::Unicode::Letter_Modifier
| KXMLCore::Unicode::Letter_Other
| KXMLCore::Unicode::Mark_NonSpacing
| KXMLCore::Unicode::Mark_SpacingCombining
| KXMLCore::Unicode::Number_DecimalDigit
| KXMLCore::Unicode::Punctuation_Connector))
return (WTF::Unicode::category(c) & (WTF::Unicode::Letter_Uppercase
| WTF::Unicode::Letter_Lowercase
| WTF::Unicode::Letter_Titlecase
| WTF::Unicode::Letter_Modifier
| WTF::Unicode::Letter_Other
| WTF::Unicode::Mark_NonSpacing
| WTF::Unicode::Mark_SpacingCombining
| WTF::Unicode::Number_DecimalDigit
| WTF::Unicode::Punctuation_Connector))
|| c == '$' || c == '_';
}
......
......@@ -25,7 +25,7 @@
#include <string.h>
#include "lookup.h"
#include <kxmlcore/Assertions.h>
#include <wtf/Assertions.h>
using namespace KJS;
......
......@@ -36,8 +36,8 @@
#include "lexer.h"
#include "operations.h"
#include "reference_list.h"
#include <kxmlcore/HashSet.h>
#include <kxmlcore/HashCountedSet.h>
#include <wtf/HashSet.h>
#include <wtf/HashCountedSet.h>
using namespace KJS;
......
......@@ -27,7 +27,7 @@
#include "Parser.h"
#include "internal.h"
#include <kxmlcore/ListRefPtr.h>
#include <wtf/ListRefPtr.h>
namespace KJS {
......
......@@ -26,7 +26,7 @@
#include "error_object.h"
#include "lookup.h"
#include "operations.h"
#include <kxmlcore/Vector.h>
#include <wtf/Vector.h>
#include <math.h>
#include "number_object.lut.h"
......
......@@ -30,7 +30,7 @@
#include "property_map.h"
#include "property_slot.h"
#include "scope_chain.h"
#include <kxmlcore/AlwaysInline.h>
#include <wtf/AlwaysInline.h>
namespace KJS {
......
......@@ -26,8 +26,8 @@
#include "protect.h"
#include "reference_list.h"
#include <algorithm>
#include <kxmlcore/FastMalloc.h>
#include <kxmlcore/Vector.h>
#include <wtf/FastMalloc.h>
#include <wtf/Vector.h>
using std::max;
......
......@@ -24,7 +24,7 @@
#define KJS_PROPERTY_MAP_H_
#include "identifier.h"
#include <kxmlcore/OwnArrayPtr.h>
#include <wtf/OwnArrayPtr.h>
namespace KJS {
......
......@@ -28,7 +28,7 @@
#include "operations.h"
#include "reference_list.h"
#include "regexp_object.h"
#include <kxmlcore/unicode/Unicode.h>
#include <wtf/unicode/Unicode.h>
#include "string_object.lut.h"
......@@ -626,7 +626,7 @@ JSValue *StringProtoFunc::callAsFunction(ExecState *exec, JSObject *thisObj, con
uint16_t* dataPtr = reinterpret_cast<uint16_t*>(u.rep()->data());
uint16_t* destIfNeeded;
int len = KXMLCore::Unicode::toLower(dataPtr, u.size(), destIfNeeded);
int len = WTF::Unicode::toLower(dataPtr, u.size(), destIfNeeded);
if (len >= 0)
result = jsString(UString(reinterpret_cast<UChar *>(destIfNeeded ? destIfNeeded : dataPtr), len));
else
......@@ -642,7 +642,7 @@ JSValue *StringProtoFunc::callAsFunction(ExecState *exec, JSObject *thisObj, con
uint16_t* dataPtr = reinterpret_cast<uint16_t*>(u.rep()->data());
uint16_t* destIfNeeded;
int len = KXMLCore::Unicode::toUpper(dataPtr, u.size(), destIfNeeded);
int len = WTF::Unicode::toUpper(dataPtr, u.size(), destIfNeeded);
if (len >= 0)
result = jsString(UString(reinterpret_cast<UChar *>(destIfNeeded ? destIfNeeded : dataPtr), len));
else
......
......@@ -44,7 +44,7 @@
#endif
using namespace KJS;
using namespace KXMLCore;
using namespace WTF;
static void testIsInteger();
static char* createStringWithContentsOfFile(const char* fileName);
......@@ -275,8 +275,8 @@ int kjsmain(int argc, char** argv)
static void testIsInteger()
{
// Unit tests for KXMLCore::IsInteger. Don't have a better place for them now.
// FIXME: move these once we create a unit test directory for KXMLCore.
// Unit tests for WTF::IsInteger. Don't have a better place for them now.
// FIXME: move these once we create a unit test directory for WTF.
assert(IsInteger<bool>::value);
assert(IsInteger<char>::value);
......
......@@ -40,7 +40,7 @@
#include <math.h>
#include "dtoa.h"
#include <kxmlcore/Vector.h>
#include <wtf/Vector.h>
using std::max;
......
......@@ -24,9 +24,9 @@
#ifndef _KJS_USTRING_H_
#define _KJS_USTRING_H_
#include <kxmlcore/FastMalloc.h>
#include <kxmlcore/RefPtr.h>
#include <kxmlcore/PassRefPtr.h>
#include <wtf/FastMalloc.h>
#include <wtf/RefPtr.h>
#include <wtf/PassRefPtr.h>
#include <stdint.h>
......
......@@ -44,7 +44,7 @@ for these functions came from Scott Wimer. */
#include "pcre_internal.h"
#include <kxmlcore/UnusedParam.h>
#include <wtf/UnusedParam.h>
/*************************************************
......
......@@ -62,7 +62,7 @@ static void vprintf_stderr_common(const char *format, va_list args)
vfprintf_no_warning(stderr, format, args);
}
void KXCReportAssertionFailure(const char *file, int line, const char *function, const char *assertion)
void WTFReportAssertionFailure(const char *file, int line, const char *function, const char *assertion)
{
if (assertion)
fprintf(stderr, "=================\nASSERTION FAILED: %s (%s:%d %s)\n=================\n", assertion, file, line, function);
......@@ -70,7 +70,7 @@ void KXCReportAssertionFailure(const char *file, int line, const char *function,
fprintf(stderr, "=================\nSHOULD NEVER BE REACHED (%s:%d %s)\n=================\n", file, line, function);
}
void KXCReportAssertionFailureWithMessage(const char *file, int line, const char *function, const char *assertion, const char *format, ...)
void WTFReportAssertionFailureWithMessage(const char *file, int line, const char *function, const char *assertion, const char *format, ...)
{
fprintf(stderr, "=================\nASSERTION FAILED: ");
va_list args;
......@@ -80,12 +80,12 @@ void KXCReportAssertionFailureWithMessage(const char *file, int line, const char
fprintf(stderr, "\n%s (%s:%d %s)\n=================\n", assertion, file, line, function);
}
void KXCReportArgumentAssertionFailure(const char *file, int line, const char *function, const char *argName, const char *assertion)
void WTFReportArgumentAssertionFailure(const char *file, int line, const char *function, const char *argName, const char *assertion)
{
fprintf(stderr, "=================\nARGUMENT BAD: %s, %s (%s:%d %s)\n=================\n", argName, assertion, file, line, function);
}
void KXCReportFatalError(const char *file, int line, const char *function, const char *format, ...)
void WTFReportFatalError(const char *file, int line, const char *function, const char *format, ...)
{
fprintf(stderr, "=================\nFATAL ERROR: ");
va_list args;
......@@ -95,7 +95,7 @@ void KXCReportFatalError(const char *file, int line, const char *function, const
fprintf(stderr, "\n(%s:%d %s)\n=================\n", file, line, function);
}
void KXCReportError(const char *file, int line, const char *function, const char *format, ...)
void WTFReportError(const char *file, int line, const char *function, const char *format, ...)
{
fprintf(stderr, "=================\nERROR: ");