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

Timestamp:

Apr 15, 2002, 4:43:21 PM (23 years ago)

Author:

darin

Message:

Merged KDE 3.0 final code in and:

JavaScriptCore:

• kjs/internal.cpp:
• kjs/property_map.cpp:
• kjs/ustring.h: Removed some unneeded <config.h> includes so we are more similar to the real KDE sources.

Merged changes from KDE 3.0 final and did some build fixes.

• JavaScriptCore.pbproj/project.pbxproj: Added nodes2string.cpp.

• kjs/grammar.*: Regenerated.
• kjs/*.lut.h: Regenerated.

WebCore:

• src/kdelibs/khtml/rendering/render_text.cpp: (TextSlave::printDecoration): Remove some minor gratuitous diffs vs. KDE.

• src/kdelibs/khtml/rendering/render_text.cpp: (TextSlave::printDecoration): Richard updated to reflect changes in KDE.

• src/kdelibs/khtml/css/css_valueimpl.cpp: (FontFamilyValueImpl::FontFamilyValueImpl): Fix comment.
• src/kdelibs/khtml/css/cssstyleselector.cpp: Remove some gratuitous diffs vs. KDE.
• src/kdelibs/khtml/html/html_objectimpl.cpp: (HTMLEmbedElementImpl::parseAttribute): Remove unneeded copy from KWQ's early days.
• src/kdelibs/khtml/html/html_tableimpl.cpp: (HTMLTableElementImpl::parseAttribute), (HTMLTablePartElementImpl::parseAttribute): Remove unneeded copy from KWQ's early days.
• src/kdelibs/khtml/html/htmltokenizer.cpp: (HTMLTokenizer::processToken): Redo the APPLE_CHANGES ifdef here.
• src/kdelibs/khtml/khtmlpart_p.h: Update to latest kde.
• src/kdelibs/khtml/khtmlview.cpp: (KHTMLView::KHTMLView): Add ifdef APPLE_CHANGES. (KHTMLView::~KHTMLView): Add ifdef APPLE_CHANGES. (KHTMLView::print): Remove code left in here during merge process.
• src/kwq/KWQKHTMLPart.mm: Remove unused setFontSizes(), fontSizes(), and resetFontSizes(). After the merge is landed, remove more.
• src/libwebcore.exp: Export updateStyleSelector() for WebKit.

Fix text to it displays at the right font size.

• src/kdelibs/khtml/css/cssstyleselector.cpp: (CSSStyleSelector::computeFontSizes): Apply the same SCREEN_RESOLUTION hack here that we do elsewhere.
• src/kdelibs/khtml/rendering/font.cpp: (Font::width): Use kMin instead of max (oops). (Font::update): Turn off font database chicanery.
• src/kwq/KWQKHTMLPart.mm: (KHTMLPart::zoomFactor): Use zoom factor 100, not 1.

More fixes so text displays (still at wrong font size).

• src/kdelibs/khtml/rendering/font.cpp: (max): New helper. (Font::drawText): Simplified implementation for now. (Font::width): Simplified implementation for now.
• src/kwq/KWQColorGroup.mm: Reinstated QCOLOR_GROUP_SIZE.

• src/kwq/qt/qfontmetrics.h: Removed charWidth and changed _width to take QChar *.
• src/kwq/KWQFontMetrics.mm: Removed charWidth and changed _width to take QChar *.

Merged changes from KDE 3.0 final. Other fixes to get things compiling.

• src/kdelibs/khtml/css/css_valueimpl.cpp: (CSSStyleDeclarationImpl::setProperty): Fix unused variable.
• src/kdelibs/khtml/khtmlview.cpp: (KHTMLView::contentsContextMenuEvent): Fix unused variable.
• src/kdelibs/khtml/rendering/font.cpp: (Font::drawText), (Font::width), (Font::update): Disable special "nsbp" logic for now. We can reenable it if necessary.
• src/kdelibs/khtml/rendering/render_replaced.cpp: Fix mismerge.
• src/kdelibs/khtml/rendering/render_text.cpp: (RenderText::nodeAtPoint): Fix unused variable.
• src/kwq/KWQApplication.mm: (QDesktopWidget::width), (QApplication::desktop): Fix mismerge.
• src/kwq/KWQColorGroup.mm: Fix QCOLOR_GROUP_SIZE.
• src/kwq/KWQFontMetrics.mm: (QFontMetrics::lineSpacing): New. (QFontMetrics::width): Remove unused optimization.
• src/kwq/qt/qfontmetrics.h: Add lineSpacing().

Merged changes from previous merge pass.

2002-03-25 Darin Adler <Darin Adler>

Last bit of making stuff compile and link. Probably will drop the merge now
and take it up again when it's time to merge in KDE 3.0 final.

• src/kwq/KWQEvent.mm: (QFocusEvent::reason): New.
• src/kwq/KWQPainter.mm: (QPainter::drawText): New overload.

2002-03-25 Darin Adler <Darin Adler>

• src/kdelibs/khtml/rendering/font.cpp: (Font::width): Make it call _width so we don't lose the optimization.

• src/kwq/KWQApplication.mm: (QDesktopWidget::screenNumber): New. (QDesktopWidget::screenGeometry): New. (QApplication::style): New.
• src/kwq/KWQColorGroup.mm: (QColorGroup::highlight): New. (QColorGroup::highlightedText): New.
• src/kwq/KWQFont.mm: (QFont::setPixelSize): New.
• src/kwq/KWQFontMetrics.mm: (QFontMetrics::charWidth): New.
• src/kwq/KWQKGlobal.mm: (KGlobal::locale): Implement. (KLocale::KLocale): New. (KLocale::languageList): New.
• src/kwq/KWQKHTMLPart.mm: (KHTMLPart::sheetUsed): New. (KHTMLPart::setSheetUsed): New. (KHTMLPart::zoomFactor): New.
• src/kwq/KWQKHTMLSettings.mm: (KHTMLSettings::mediumFontSize): New.
• src/kwq/KWQScrollView.mm: (QScrollView::childX): New. (QScrollView::childY): New.

• src/kwq/qt/qapplication.h: style() returns a QStyle &.
• src/kwq/qt/qpalette.h: Add Highlight and HighlightedText.

2002-03-24 Darin Adler <Darin Adler>

More compiling. Still won't link.

• src/kdelibs/khtml/khtmlview.cpp: Disable printing and drag and drop code.
• src/kdelibs/khtml/rendering/render_text.cpp: (TextSlave::printDecoration): Temporarily turn off our smarter underlining since it relies on access to the string, and TextSlave doesn't have that any more. (RenderText::nodeAtPoint): Get rid of a workaround we don't need any more for a bug that was fixed by KDE folks.
• src/kwq/KWQApplication.mm: (QApplication::desktop): Make the desktop be a QDesktopWidget.
• src/kwq/qt/qnamespace.h: Add MetaButton.
• src/kwq/qt/qtooltip.h: Add a maybeTip virtual function member and a virtual destructor.

2002-03-24 Darin Adler <Darin Adler>

Some fixes to get more stuff to compile.

• src/kdelibs/khtml/ecma/kjs_dom.cpp: (DOMDocument::getValueProperty): Don't try to look at the private m_bComplete to display "complete". Just do "loading" and "loaded".
• src/kdelibs/khtml/khtmlpart_p.h: #ifdef this all out for APPLE_CHANGES.
• src/kdelibs/khtml/rendering/font.cpp: (Font::update): Add an explicit cast to int to avoid float -> int warning.
• src/kdelibs/khtml/rendering/render_table.cpp: (RenderTable::calcColMinMax): Add an explicit cast to int to avoid uint compared with int warning.
• src/kdelibs/khtml/xml/dom_docimpl.cpp: (DocumentImpl::recalcStyleSelector): Use sheetUsed() and setSheetUsed() functions on KHTMLPart intead of getting at private fields the way the real KDE code does.

• src/kwq/KWQKHTMLPart.h: Declare zoomFactor(), sheetUsed(), and setSheetUsed().
• src/kwq/KWQStyle.h: Add PM_DefaultFramWidth as another metric.
• src/kwq/kdecore/klocale.h: Add languageList().
• src/kwq/khtml/khtml_settings.h: Add mediumFontSize().
• src/kwq/qt/qapplication.h: Add style() and QDesktopWidget.
• src/kwq/qt/qevent.h: Add reason().
• src/kwq/qt/qfont.h: Add setPixelSize(int).
• src/kwq/qt/qfontmetrics.h: Add charWidth() and _charWidth() functions.
• src/kwq/qt/qpainter.h: Add drawText() overload with position parameter.
• src/kwq/qt/qpalette.h: Add highlight() and highlightedText().
• src/kwq/qt/qscrollview.h: Add childX() and childY().

• src/kwq/KWQApplication.mm: Change KWQDesktopWidget to QDesktopWidget.

WebKit:

• WebView.subproj/IFPreferences.h:
• WebView.subproj/IFPreferences.mm: (+[IFPreferences load]): Remove the old WebKitFontSizes preference. (-[IFPreferences mediumFontSize]), (-[IFPreferences setMediumFontSize:]): New.

• WebView.subproj/IFWebView.mm: (-[IFWebView reapplyStyles]): Call updateStyleSelector() instead of recalcStyle().

Merged changes from previous merge branch.

2002-03-25 Darin Adler <Darin Adler>

• WebView.subproj/IFPreferences.mm: (+[IFPreferences load]): Add WebKitMediumFontSizePreferenceKey.

WebBrowser:

• Preferences.subproj/TextPreferences.m: (-[TextPreferences defaultFontSize]), (-[TextPreferences setDefaultFontSize:]): Just get and set the new mediumFontSize preference rather than doing the whole fontSizes preference dance.

File:

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

trunk/JavaScriptCore/kjs/lexer.cpp

@@ -19 +19 @@
  *  Boston, MA 02111-1307, USA.
  *
- *  $Id$
  */
 
@@ -53 +52 @@
 #include "lexer.lut.h"
 
-extern YYLTYPE yylloc;  // global bison variable holding token info
+extern YYLTYPE yylloc; // global bison variable holding token info
 
 // a bridge for yacc from the C world to C++
@@ -62 +61 @@
 
 Lexer::Lexer()
-  : yylineno(0),
+  : yylineno(1),
     size8(128), size16(128), restrKeyword(false),
     eatNextIdentifier(false), stackToken(-1), lastToken(-1), pos(0),
@@ -95 +94 @@
 void Lexer::setCode(const UChar *c, unsigned int len)
 {
-  yylineno = 0;
+  yylineno = 1;
   restrKeyword = false;
   delimited = false;
@@ -126 +125 @@
     next3 = (pos + 3 < length) ? code[pos+3].unicode() : 0;
   }
+}
+
+// called on each new line
+void Lexer::nextLine()
+{
+  yylineno++;
+#ifndef KJS_PURE_ECMA
+  bol = true;
+#endif
 }
 
@@ -167 +175 @@
     case Start:
       if (isWhiteSpace()) {
-        // do nothing
+        // do nothing
       } else if (current == '/' && next1 == '/') {
-        shift(1);
-        state = InSingleLineComment;
+        shift(1);
+        state = InSingleLineComment;
       } else if (current == '/' && next1 == '*') {
-        shift(1);
-        state = InMultiLineComment;
+        shift(1);
+        state = InMultiLineComment;
       } else if (current == 0) {
-        if (!terminator && !delimited) {
-          // automatic semicolon insertion if program incomplete
-          token = ';';
-          stackToken = 0;
-          setDone(Other);
-        } else
-          setDone(Eof);
+        if (!terminator && !delimited) {
+          // automatic semicolon insertion if program incomplete
+          token = ';';
+          stackToken = 0;
+          setDone(Other);
+        } else
+          setDone(Eof);
       } else if (isLineTerminator()) {
-        yylineno++;
+        nextLine();
+        terminator = true;
+        if (restrKeyword) {
+          token = ';';
+          setDone(Other);
+        }
+      } else if (current == '"' || current == '\'') {
+        state = InString;
+        stringType = current;
+      } else if (isIdentLetter(current)) {
+        record16(current);
+        state = InIdentifier;
+      } else if (current == '0') {
+        record8(current);
+        state = InNum0;
+      } else if (isDecimalDigit(current)) {
+        record8(current);
+        state = InNum;
+      } else if (current == '.' && isDecimalDigit(next1)) {
+        record8(current);
+        state = InDecimal;
 #ifndef KJS_PURE_ECMA
-        bol = true;
-#endif
-        terminator = true;
-        if (restrKeyword) {
-          token = ';';
-          setDone(Other);
-        }
-      } else if (current == '"' || current == '\'') {
-        state = InString;
-        stringType = current;
-      } else if (isIdentLetter(current)) {
-        record16(current);
-        state = InIdentifier;
-      } else if (current == '0') {
-        record8(current);
-        state = InNum0;
-      } else if (isDecimalDigit(current)) {
-        record8(current);
-        state = InNum;
-      } else if (current == '.' && isDecimalDigit(next1)) {
-        record8(current);
-        state = InDecimal;
-#ifndef KJS_PURE_ECMA
-        // <!-- marks the beginning of a line comment (for www usage)
-      } else if (bol && current == '<' && next1 == '!' &&
-                 next2 == '-' && next3 == '-') {
-        shift(3);
-        state = InSingleLineComment;
-        // same of -->
+        // <!-- marks the beginning of a line comment (for www usage)
+      } else if (current == '<' && next1 == '!' &&
+                 next2 == '-' && next3 == '-') {
+        shift(3);
+        state = InSingleLineComment;
+        // same for -->
       } else if (bol && current == '-' && next1 == '-' &&  next2 == '>') {
-        shift(2);
-        state = InSingleLineComment;
+        shift(2);
+        state = InSingleLineComment;
 #endif
       } else {
-        token = matchPunctuator(current, next1, next2, next3);
-        if (token != -1) {
-          setDone(Other);
-        } else {
-          //      cerr << "encountered unknown character" << endl;
-          setDone(Bad);
-        }
+        token = matchPunctuator(current, next1, next2, next3);
+        if (token != -1) {
+          setDone(Other);
+        } else {
+          //      cerr << "encountered unknown character" << endl;
+          setDone(Bad);
+        }
       }
       break;
     case InString:
       if (current == stringType) {
-        shift(1);
-        setDone(String);
+        shift(1);
+        setDone(String);
       } else if (current == 0 || isLineTerminator()) {
-        setDone(Bad);
+        setDone(Bad);
       } else if (current == '\\') {
-        state = InEscapeSequence;
+        state = InEscapeSequence;
       } else {
-        record16(current);
+        record16(current);
       }
       break;
@@ -243 +248 @@
     case InEscapeSequence:
       if (isOctalDigit(current)) {
-        if (current >= '0' && current <= '3' &&
-            isOctalDigit(next1) && isOctalDigit(next2)) {
-          record16(convertOctal(current, next1, next2));
-          shift(2);
-          state = InString;
-        } else if (isOctalDigit(current) && isOctalDigit(next1)) {
-          record16(convertOctal('0', current, next1));
-          shift(1);
-          state = InString;
-        } else if (isOctalDigit(current)) {
-          record16(convertOctal('0', '0', current));
-          state = InString;
-        } else {
-          setDone(Bad);
-        }
+        if (current >= '0' && current <= '3' &&
+            isOctalDigit(next1) && isOctalDigit(next2)) {
+          record16(convertOctal(current, next1, next2));
+          shift(2);
+          state = InString;
+        } else if (isOctalDigit(current) && isOctalDigit(next1)) {
+          record16(convertOctal('0', current, next1));
+          shift(1);
+          state = InString;
+        } else if (isOctalDigit(current)) {
+          record16(convertOctal('0', '0', current));
+          state = InString;
+        } else {
+          setDone(Bad);
+        }
       } else if (current == 'x')
-        state = InHexEscape;
+        state = InHexEscape;
       else if (current == 'u')
-        state = InUnicodeEscape;
+        state = InUnicodeEscape;
       else {
-        record16(singleEscape(current));
-        state = InString;
+        record16(singleEscape(current));
+        state = InString;
       }
       break;
     case InHexEscape:
       if (isHexDigit(current) && isHexDigit(next1)) {
-        state = InString;
-        record16(convertHex(current, next1));
-        shift(1);
+        state = InString;
+        record16(convertHex(current, next1));
+        shift(1);
       } else if (current == stringType) {
-        record16('x');
-        shift(1);
-        setDone(String);
+        record16('x');
+        shift(1);
+        setDone(String);
       } else {
-        record16('x');
-        record16(current);
-        state = InString;
+        record16('x');
+        record16(current);
+        state = InString;
       }
       break;
     case InUnicodeEscape:
       if (isHexDigit(current) && isHexDigit(next1) &&
-          isHexDigit(next2) && isHexDigit(next3)) {
-        record16(convertUnicode(current, next1, next2, next3));
-        shift(3);
-        state = InString;
+          isHexDigit(next2) && isHexDigit(next3)) {
+        record16(convertUnicode(current, next1, next2, next3));
+        shift(3);
+        state = InString;
       } else if (current == stringType) {
-        record16('u');
-        shift(1);
-        setDone(String);
+        record16('u');
+        shift(1);
+        setDone(String);
       } else {
-        setDone(Bad);
+        setDone(Bad);
       }
       break;
     case InSingleLineComment:
       if (isLineTerminator()) {
-        yylineno++;
-        terminator = true;
-#ifndef KJS_PURE_ECMA
-        bol = true;
-#endif
-        if (restrKeyword) {
-          token = ';';
-          setDone(Other);
-        } else
-          state = Start;
+        nextLine();
+        terminator = true;
+        if (restrKeyword) {
+          token = ';';
+          setDone(Other);
+        } else
+          state = Start;
       } else if (current == 0) {
-        setDone(Eof);
+        setDone(Eof);
       }
       break;
     case InMultiLineComment:
       if (current == 0) {
-        setDone(Bad);
+        setDone(Bad);
       } else if (isLineTerminator()) {
-        yylineno++;
+        nextLine();
       } else if (current == '*' && next1 == '/') {
-        state = Start;
-        shift(1);
+        state = Start;
+        shift(1);
       }
       break;
     case InIdentifier:
       if (isIdentLetter(current) || isDecimalDigit(current)) {
-        record16(current);
-        break;
+        record16(current);
+        break;
       }
       setDone(Identifier);
@@ -331 +333 @@
     case InNum0:
       if (current == 'x' || current == 'X') {
-        record8(current);
-        state = InHex;
+        record8(current);
+        state = InHex;
       } else if (current == '.') {
-        record8(current);
-        state = InDecimal;
+        record8(current);
+        state = InDecimal;
       } else if (current == 'e' || current == 'E') {
-        record8(current);
-        state = InExponentIndicator;
+        record8(current);
+        state = InExponentIndicator;
       } else if (isOctalDigit(current)) {
-        record8(current);
-        state = InOctal;
+        record8(current);
+        state = InOctal;
       } else if (isDecimalDigit(current)) {
         record8(current);
         state = InDecimal;
       } else {
-        setDone(Number);
+        setDone(Number);
       }
       break;
     case InHex:
       if (isHexDigit(current)) {
-        record8(current);
+        record8(current);
       } else {
-        setDone(Hex);
+        setDone(Hex);
       }
       break;
     case InOctal:
       if (isOctalDigit(current)) {
-        record8(current);
+        record8(current);
       }
       else if (isDecimalDigit(current)) {
@@ -364 +366 @@
         state = InDecimal;
       } else
-        setDone(Octal);
+        setDone(Octal);
       break;
     case InNum:
       if (isDecimalDigit(current)) {
-        record8(current);
+        record8(current);
       } else if (current == '.') {
-        record8(current);
-        state = InDecimal;
+        record8(current);
+        state = InDecimal;
       } else if (current == 'e' || current == 'E') {
-        record8(current);
-        state = InExponentIndicator;
+        record8(current);
+        state = InExponentIndicator;
       } else
-        setDone(Number);
+        setDone(Number);
       break;
     case InDecimal:
       if (isDecimalDigit(current)) {
-        record8(current);
+        record8(current);
       } else if (current == 'e' || current == 'E') {
-        record8(current);
-        state = InExponentIndicator;
+        record8(current);
+        state = InExponentIndicator;
       } else
-        setDone(Number);
+        setDone(Number);
       break;
     case InExponentIndicator:
       if (current == '+' || current == '-') {
-        record8(current);
+        record8(current);
       } else if (isDecimalDigit(current)) {
-        record8(current);
-        state = InExponent;
+        record8(current);
+        state = InExponent;
       } else
-        setDone(Bad);
+        setDone(Bad);
       break;
     case InExponent:
       if (isDecimalDigit(current)) {
-        record8(current);
+        record8(current);
       } else
-        setDone(Number);
+        setDone(Number);
       break;
     default:
@@ -506 +508 @@
 
     if (token == CONTINUE || token == BREAK ||
-        token == RETURN || token == THROW)
+        token == RETURN || token == THROW)
       restrKeyword = true;
     break;
@@ -531 +533 @@
 {
   return (current == ' ' || current == '\t' ||
-          current == 0x0b || current == 0x0c);
+          current == 0x0b || current == 0x0c);
 }
 
@@ -549 +551 @@
   /* TODO: allow other legitimate unicode chars */
   return (c >= 'a' && c <= 'z' ||
-          c >= 'A' && c <= 'Z' ||
-          c == '$' || c == '_');
+          c >= 'A' && c <= 'Z' ||
+          c == '$' || c == '_');
 }
 
@@ -561 +563 @@
 {
   return (c >= '0' && c <= '9' ||
-          c >= 'a' && c <= 'f' ||
-          c >= 'A' && c <= 'F');
+          c >= 'a' && c <= 'f' ||
+          c >= 'A' && c <= 'F');
 }
 
@@ -571 +573 @@
 
 int Lexer::matchPunctuator(unsigned short c1, unsigned short c2,
-                              unsigned short c3, unsigned short c4)
+                              unsigned short c3, unsigned short c4)
 {
   if (c1 == '>' && c2 == '>' && c3 == '>' && c4 == '=') {
@@ -736 +738 @@
 {
   return UChar((convertHex(c1) << 4) + convertHex(c2),
-               (convertHex(c3) << 4) + convertHex(c4));
+               (convertHex(c3) << 4) + convertHex(c4));
 }