Changeset 26676 in webkit for trunk/JavaScriptCore/kjs/date_object.cpp

Timestamp:

Oct 16, 2007, 1:13:24 PM (18 years ago)

Author:

darin

Message:

JavaScriptCore:

Reviewed by Maciej and Geoff (and looked over by Eric).

• ​http://bugs.webkit.org/show_bug.cgi?id=15519 eliminate use of <ctype.h> for processing ASCII

• wtf/ASCIICType.h: Added.
• wtf/DisallowCType.h: Added.

• kjs/config.h: Include DisallowCType.h.

• kjs/date_object.cpp: (KJS::skipSpacesAndComments): (KJS::findMonth): (KJS::parseDate):
• kjs/function.cpp: (KJS::decode):
• kjs/ustring.cpp: (KJS::UString::toDouble): Use ASCIICType.h functions instead of ctype.h ones.

WebCore:

Reviewed by Maciej and Geoff (and looked over by Eric).

• ​http://bugs.webkit.org/show_bug.cgi?id=15519 eliminate use of <ctype.h> for processing ASCII

• ForwardingHeaders/wtf/ASCIICType.h: Added.
• ForwardingHeaders/wtf/DisallowCType.h: Added.

• WebCorePrefix.h: Get rid of inclusion of <ctype.h>.
• config.h: Include DisallowCType.h.

• css/CSSParser.cpp: (WebCore::ParseString::lower):
• css/CSSPrimitiveValue.cpp: (WebCore::isCSSTokenizerIdentifier):
• css/CSSStyleDeclaration.cpp: (WebCore::propertyID):
• html/HTMLSelectElement.cpp: (WebCore::stripLeadingWhiteSpace):
• html/HTMLTokenizer.cpp: (WebCore::tagMatch):
• loader/FTPDirectoryParser.cpp: (WebCore::parseOneFTPLine):
• loader/TextResourceDecoder.cpp: (WebCore::TextResourceDecoder::checkForHeadCharset):
• platform/DeprecatedCString.cpp: (WebCore::DeprecatedCString::lower): (WebCore::DeprecatedCString::upper): (WebCore::DeprecatedCString::find): (WebCore::DeprecatedCString::contains):
• platform/DeprecatedString.cpp: (WebCore::equalCaseInsensitive): (WebCore::isCharacterAllowedInBase): (WebCore::DeprecatedString::find): (WebCore::DeprecatedString::contains): (WebCore::toIntegralType):
• platform/DeprecatedString.h: (WebCore::DeprecatedChar::isSpace): (WebCore::DeprecatedChar::lower): (WebCore::DeprecatedChar::upper):
• platform/KURL.cpp: (WebCore::KURL::parse):
• platform/StringImpl.cpp: (WebCore::isSpace): (WebCore::StringImpl::containsOnlyWhitespace): (WebCore::StringImpl::isLower): (WebCore::StringImpl::lower): (WebCore::StringImpl::find): (WebCore::StringImpl::reverseFind): (WebCore::equalIgnoringCase):
• platform/TextEncodingRegistry.cpp: (WebCore::TextEncodingNameHash::equal): (WebCore::TextEncodingNameHash::hash): (WebCore::atomicCanonicalTextEncodingName):
• platform/mac/KeyEventMac.mm: (WebCore::keyIdentifierForKeyEvent):
• platform/win/KeyEventWin.cpp: (WebCore::keyIdentifierForWindowsKeyCode):
• platform/win/PopupMenuWin.cpp: (WebCore::isASCIIPrintable): (WebCore::PopupWndProc):
• plugins/win/PluginViewWin.cpp: (WebCore::capitalizeRFC822HeaderFieldName):
• rendering/RenderText.cpp: (WebCore::RenderText::widthFromCache): Use ASCIICType.h functions instead of ctype.h ones.

WebKit:

Reviewed by Maciej and Geoff (and looked over by Eric).

• ​http://bugs.webkit.org/show_bug.cgi?id=15519 eliminate use of <ctype.h> for processing ASCII

• ForwardingHeaders/wtf/ASCIICType.h: Added.
• ForwardingHeaders/wtf/DisallowCType.h: Added.

• WebKitPrefix.h: Include DisallowCType.h.

• Misc/WebNSURLExtras.mm: (-[NSURL _web_URLWithLowercasedScheme]): Use toASCIILower.
• WebView/WebHTMLView.mm: (-[WebHTMLView callWebCoreCommand:]): Use toASCIIUpper. (-[WebTextCompleteController filterKeyDown:]): Add a list of specific character codes, instead of using ispunct.

File:

• trunk/JavaScriptCore/kjs/date_object.cpp (modified) (9 diffs)

trunk/JavaScriptCore/kjs/date_object.cpp

@@ -1 +1 @@
 /*
- *  This file is part of the KDE libraries
  *  Copyright (C) 1999-2000 Harri Porten ([email protected])
- *  Copyright (C) 2004 Apple Computer, Inc.
+ *  Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
@@ -41 +40 @@
 #endif
 
-#include <ctype.h>
 #include <float.h>
 #include <limits.h>
@@ -55 +53 @@
 #include "DateMath.h"
 
+#include <wtf/ASCIICType.h>
 #include <wtf/MathExtras.h>
 #include <wtf/StringExtras.h>
@@ -61 +60 @@
     #include <CoreFoundation/CoreFoundation.h>
 #endif
+
+using namespace WTF;
 
 namespace KJS {
@@ -743 +744 @@
 };
 
-inline static void skipSpacesAndComments(const char *&s)
+inline static void skipSpacesAndComments(const char*& s)
 {
     int nesting = 0;
     char ch;
     while ((ch = *s)) {
-        if (!isspace(ch)) {
+        if (!isASCIISpace(ch)) {
             if (ch == '(')
                 nesting++;
@@ -761 +762 @@
 
 // returns 0-11 (Jan-Dec); -1 on failure
-static int findMonth(const char *monthStr)
+static int findMonth(const char* monthStr)
 {
     assert(monthStr);
@@ -768 +769 @@
         if (!*monthStr)
             return -1;
-        needle[i] = static_cast<char>(tolower(*monthStr++));
+        needle[i] = static_cast<char>(toASCIILower(*monthStr++));
     }
     needle[3] = '\0';
@@ -806 +807 @@
     const char *wordStart = dateString;
     // Check contents of first words if not number
-    while (*dateString && !isdigit(*dateString)) {
-        if (isspace(*dateString) || *dateString == '(') {
+    while (*dateString && !isASCIIDigit(*dateString)) {
+        if (isASCIISpace(*dateString) || *dateString == '(') {
             if (dateString - wordStart >= 3)
                 month = findMonth(wordStart);
@@ -956 +957 @@
 
             // ':40 GMT'
-            if (*dateString && *dateString != ':' && !isspace(*dateString))
+            if (*dateString && *dateString != ':' && !isASCIISpace(*dateString))
                 return NaN;