[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[zherczeg at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 7b2c5324b633d88a2c7e91240265422fce5eb411
Author: zherczeg at webkit.org <zherczeg at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 9 06:53:33 2010 +0000

    Removing doneSemicolon label in the lexer
    https://bugs.webkit.org/show_bug.cgi?id=45289
    
    Reviewed by Darin Adler.
    
    As a side effect of moving the multiline comment parsing
    to a separate function, an opportunity raised to simplify
    the single line comment parsing, and removing doneSemicolon
    label. Slight performance increase on --parse-only
    tests (from 32.8ms to 31.5ms)
    
    * parser/Lexer.cpp:
    (JSC::Lexer::lex):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67066 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 9239f97..ed7391b 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-08  Zoltan Herczeg  <zherczeg at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Removing doneSemicolon label in the lexer
+        https://bugs.webkit.org/show_bug.cgi?id=45289
+
+        As a side effect of moving the multiline comment parsing
+        to a separate function, an opportunity raised to simplify
+        the single line comment parsing, and removing doneSemicolon
+        label. Slight performance increase on --parse-only
+        tests (from 32.8ms to 31.5ms)
+
+        * parser/Lexer.cpp:
+        (JSC::Lexer::lex):
+
 2010-09-08  Xan Lopez  <xlopez at igalia.com>
 
         Reviewed by Alexey Proskuryakov.
diff --git a/JavaScriptCore/parser/Lexer.cpp b/JavaScriptCore/parser/Lexer.cpp
index 021dd6b..cc4321d 100644
--- a/JavaScriptCore/parser/Lexer.cpp
+++ b/JavaScriptCore/parser/Lexer.cpp
@@ -1025,7 +1025,8 @@ inNumberAfterDecimalPoint:
         m_terminator = true;
         if (lastTokenWasRestrKeyword()) {
             token = SEMICOLON;
-            goto doneSemicolon;
+            m_delimited = true;
+            goto returnToken;
         }
         goto start;
     case CharacterInvalid:
@@ -1047,23 +1048,19 @@ inSingleLineComment:
     shiftLineTerminator();
     m_atLineStart = true;
     m_terminator = true;
-    if (lastTokenWasRestrKeyword())
-        goto doneSemicolon;
-    goto start;
+    if (!lastTokenWasRestrKeyword())
+        goto start;
 
-doneSemicolon:
     token = SEMICOLON;
     m_delimited = true;
     // Fall through into returnToken.
 
-returnToken: {
-    int lineNumber = m_lineNumber;
-    llocp->line = lineNumber;
+returnToken:
+    llocp->line = m_lineNumber;
     llocp->startOffset = startOffset;
     llocp->endOffset = currentOffset();
     m_lastToken = token;
     return token;
-}
 
 returnError:
     m_error = true;

-- 
WebKit Debian packaging