Changeset 18712 in webkit for trunk/JavaScriptCore/kjs/lexer.cpp

Timestamp:

Jan 9, 2007, 6:54:26 AM (18 years ago)

Author:

darin

Message:

JavaScriptCore:

Reviewed by Maciej.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=12174 improve Unicode use (less WTF::Unicode:: prefix, centralized character names)

• wtf/unicode/icu/UnicodeIcu.h: Change parameter and return types to UChar32 and UChar. Removed unneeded type casts and added some const to functions that lacked it. Removed WTF::Unicode::memcmp. (WTF::Unicode::umemcasecmp): Renamed from strcasecmp since this doesn't work on 0-terminated strings as the str functions do.
• wtf/unicode/qt4/UnicodeQt4.h: Ditto.

• got rid of namespace prefixes from most uses of WTF::Unicode

• kjs/function.cpp: (KJS::isStrWhiteSpace): (KJS::escapeStringForPrettyPrinting):
• kjs/lexer.cpp: (KJS::Lexer::isWhiteSpace): (KJS::Lexer::isIdentStart): (KJS::Lexer::isIdentPart):
• kjs/string_object.cpp: (KJS::StringProtoFunc::callAsFunction):

WebCore:

Reviewed by Maciej.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=12174 improve Unicode use (less WTF::Unicode:: prefix, centralized character names)

• got rid of namespace prefixes from most uses of WTF::Unicode

• updated for removal of WTF::Unicode::memcmp
• updated for renaming of WTF::Unicode::strcasecmp to umemcasecmp.

• unified constants for special Unicode characters in a new CharacterNames.h header

• WebCore.xcodeproj/project.pbxproj:
• css/cssparser.cpp: (WebCore::ParseString::lower):
• dom/Document.cpp: (WebCore::isValidNameStart): (WebCore::isValidNamePart):
• dom/Position.cpp: (WebCore::Position::leadingWhitespacePosition): (WebCore::Position::trailingWhitespacePosition):
• editing/CompositeEditCommand.cpp: (WebCore::isWhitespace):
• editing/HTMLInterchange.cpp:
• editing/TextIterator.cpp: (WebCore::CircularSearchBuffer::CircularSearchBuffer): (WebCore::CircularSearchBuffer::append):
• editing/htmlediting.cpp: (WebCore::stringWithRebalancedWhitespace): (WebCore::nonBreakingSpaceString):
• editing/htmlediting.h:
• html/HTMLFontElement.cpp: (WebCore::parseFontSizeNumber):
• html/HTMLParser.cpp: (WebCore::HTMLParser::handleError):
• html/HTMLSelectElement.cpp: (WebCore::stripLeadingWhiteSpace):
• platform/Font.cpp: (WebCore::WidthIterator::advance): (WebCore::WidthIterator::normalizeVoicingMarks):
• platform/GlyphMap.cpp: (WebCore::GlyphMap::locatePage):
• platform/MimeTypeRegistry.h:
• platform/StringHash.h:
• platform/StringImpl.cpp: (WebCore::isSpace): (WebCore::StringImpl::append): (WebCore::StringImpl::insert): (WebCore::StringImpl::truncate): (WebCore::StringImpl::remove): (WebCore::parseLength): (WebCore::StringImpl::isLower): (WebCore::StringImpl::lower): (WebCore::StringImpl::upper): (WebCore::StringImpl::secure): (WebCore::StringImpl::foldCase): (WebCore::StringImpl::capitalize):t (WebCore::StringImpl::toInt): (WebCore::equalIgnoringCase): (WebCore::StringImpl::find):
• platform/TextBoundaries.h:
• platform/TextCodec.h:
• platform/TextCodecLatin1.cpp:
• platform/TextEncoding.h:
• platform/TextEncodingRegistry.h:
• platform/mac/PasteboardMac.mm: (WebCore::Pasteboard::writeSelection):
• platform/mac/TextCodecMac.cpp: (WebCore::TextCodecMac::decode):
• rendering/RenderBlock.cpp: (WebCore::RenderBlock::updateFirstLetter):
• rendering/RenderListMarker.cpp: (WebCore::listMarkerText): (WebCore::RenderListMarker::paint):
• rendering/RenderText.cpp: (WebCore::RenderText::widthFromCache): (WebCore::isSpaceAccordingToStyle): (WebCore::RenderText::setInternalString):
• rendering/RenderTreeAsText.cpp: (WebCore::quoteAndEscapeNonPrintables): (WebCore::operator<<):
• rendering/bidi.cpp: (WebCore::BidiState::BidiState): (WebCore::BidiContext::BidiContext): (WebCore::bidiNext): (WebCore::bidiFirst): (WebCore::BidiIterator::direction): (WebCore::appendRun): (WebCore::embed): (WebCore::RenderBlock::bidiReorderLine): (WebCore::RenderBlock::layoutInlineChildren): (WebCore::skipNonBreakingSpace): (WebCore::RenderBlock::findNextLineBreak):
• rendering/break_lines.cpp: (WebCore::nextBreakablePosition):
• rendering/break_lines.h:
• xml/XPathParser.cpp: (WebCore::XPath::charCat):

File:

• trunk/JavaScriptCore/kjs/lexer.cpp (modified) (6 diffs)

trunk/JavaScriptCore/kjs/lexer.cpp

@@ -32 +32 @@
 #include <wtf/unicode/Unicode.h>
 
-static bool isDecimalDigit(int);
+using namespace WTF;
+using namespace Unicode;
 
 // we can't specify the namespace in yacc's C output, so do it here
 using namespace KJS;
-
-static Lexer *currLexer = 0;
 
 #ifndef KDE_USE_FINAL
@@ -53 +52 @@
   return Lexer::curr()->lex();
 }
+
+namespace KJS {
+
+static Lexer* currLexer = 0;
+
+static bool isDecimalDigit(int);
 
 Lexer::Lexer()
@@ -566 +571 @@
 bool Lexer::isWhiteSpace() const
 {
-  return current == '\t' || current == 0x0b || current == 0x0c || WTF::Unicode::isSeparatorSpace(current);
+  return current == '\t' || current == 0x0b || current == 0x0c || isSeparatorSpace(current);
 }
 
@@ -582 +587 @@
 bool Lexer::isIdentStart(int c)
 {
-  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))
+  return (category(c) & (Letter_Uppercase | Letter_Lowercase | Letter_Titlecase | Letter_Modifier | Letter_Other))
     || c == '$' || c == '_';
 }
@@ -592 +593 @@
 bool Lexer::isIdentPart(int c)
 {
-  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))
+  return (category(c) & (Letter_Uppercase | Letter_Lowercase | Letter_Titlecase | Letter_Modifier | Letter_Other
+        | Mark_NonSpacing | Mark_SpacingCombining | Number_DecimalDigit | Punctuation_Connector))
     || c == '$' || c == '_';
 }
@@ -912 +906 @@
   return string;
 }
+
+}