Changeset 88724 in webkit

Timestamp:

Jun 13, 2011 3:46:21 PM (13 years ago)

Author:

oliver@apple.com

Message:

2011-06-13 Oliver Hunt <​oliver@apple.com>

Reviewed by Gavin Barraclough.

Fix llocp and lvalp names in the lexer to something more meaningful
​https://bugs.webkit.org/show_bug.cgi?id=62605

A simple rename

• parser/Lexer.cpp: (JSC::Lexer::parseIdentifier): (JSC::Lexer::parseString): (JSC::Lexer::lex):
• parser/Lexer.h: (JSC::Lexer::lexExpectIdentifier):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• parser/Lexer.cpp (modified) (12 diffs)
• parser/Lexer.h (modified) (5 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-06-13  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Gavin Barraclough.
+
+        Fix llocp and lvalp names in the lexer to something more meaningful
+        https://bugs.webkit.org/show_bug.cgi?id=62605
+
+        A simple rename
+
+        * parser/Lexer.cpp:
+        (JSC::Lexer::parseIdentifier):
+        (JSC::Lexer::parseString):
+        (JSC::Lexer::lex):
+        * parser/Lexer.h:
+        (JSC::Lexer::lexExpectIdentifier):
+
 2011-06-13  Oliver Hunt  <oliver@apple.com>
 

trunk/Source/JavaScriptCore/parser/Lexer.cpp

@@ -406 +406 @@
 }
 
-template <bool shouldCreateIdentifier> ALWAYS_INLINE JSTokenType Lexer::parseIdentifier(JSTokenData* lvalp, unsigned lexType)
+template <bool shouldCreateIdentifier> ALWAYS_INLINE JSTokenType Lexer::parseIdentifier(JSTokenData* tokenData, unsigned lexType)
 {
     const ptrdiff_t remaining = m_codeEnd - m_code;
     if ((remaining >= maxTokenLength) && !(lexType & IgnoreReservedWords)) {
-        JSTokenType keyword = parseKeyword<shouldCreateIdentifier>(lvalp);
+        JSTokenType keyword = parseKeyword<shouldCreateIdentifier>(tokenData);
         if (keyword != IDENT) {
-            ASSERT((!shouldCreateIdentifier) || lvalp->ident);
+            ASSERT((!shouldCreateIdentifier) || tokenData->ident);
             return keyword;
         }
@@ -458 +458 @@
 
         ident = makeIdentifier(identifierStart, identifierLength);
-        lvalp->ident = ident;
+        tokenData->ident = ident;
     } else
-        lvalp->ident = 0;
+        tokenData->ident = 0;
 
     m_delimited = false;
@@ -479 +479 @@
 }
 
-template <bool shouldBuildStrings> ALWAYS_INLINE bool Lexer::parseString(JSTokenData* lvalp, bool strictMode)
+template <bool shouldBuildStrings> ALWAYS_INLINE bool Lexer::parseString(JSTokenData* tokenData, bool strictMode)
 {
     int stringQuoteCharacter = m_current;
@@ -575 +575 @@
         m_buffer16.append(stringStart, currentCharacter() - stringStart);
     if (shouldBuildStrings)
-        lvalp->ident = makeIdentifier(m_buffer16.data(), m_buffer16.size());
+        tokenData->ident = makeIdentifier(m_buffer16.data(), m_buffer16.size());
     else
-        lvalp->ident = 0;
+        tokenData->ident = 0;
 
     m_buffer16.resize(0);
@@ -753 +753 @@
 }
 
-JSTokenType Lexer::lex(JSTokenData* lvalp, JSTokenInfo* llocp, unsigned lexType, bool strictMode)
+JSTokenType Lexer::lex(JSTokenData* tokenData, JSTokenInfo* tokenInfo, unsigned lexType, bool strictMode)
 {
     ASSERT(!m_error);
@@ -1008 +1008 @@
         break;
     case CharacterOpenBrace:
-        lvalp->intValue = currentOffset();
+        tokenData->intValue = currentOffset();
         shift();
         token = OPENBRACE;
         break;
     case CharacterCloseBrace:
-        lvalp->intValue = currentOffset();
+        tokenData->intValue = currentOffset();
         m_delimited = true;
         shift();
@@ -1028 +1028 @@
         shift();
         if ((m_current | 0x20) == 'x' && isASCIIHexDigit(peek(1))) {
-            parseHex(lvalp->doubleValue);
+            parseHex(tokenData->doubleValue);
             token = NUMBER;
         } else {
             record8('0');
             if (isASCIIOctalDigit(m_current)) {
-                if (parseOctal(lvalp->doubleValue)) {
+                if (parseOctal(tokenData->doubleValue)) {
                     if (strictMode)
                         goto returnError;
@@ -1043 +1043 @@
     case CharacterNumber:
         if (LIKELY(token != NUMBER)) {
-            if (!parseDecimal(lvalp->doubleValue)) {
+            if (!parseDecimal(tokenData->doubleValue)) {
                 if (m_current == '.') {
                     shift();
@@ -1054 +1054 @@
                 // Null-terminate string for strtod.
                 m_buffer8.append('\0');
-                lvalp->doubleValue = WTF::strtod(m_buffer8.data(), 0);
+                tokenData->doubleValue = WTF::strtod(m_buffer8.data(), 0);
             }
             token = NUMBER;
@@ -1067 +1067 @@
     case CharacterQuote:
         if (lexType & DontBuildStrings) {
-            if (UNLIKELY(!parseString<false>(lvalp, strictMode)))
+            if (UNLIKELY(!parseString<false>(tokenData, strictMode)))
                 goto returnError;
         } else {
-            if (UNLIKELY(!parseString<true>(lvalp, strictMode)))
+            if (UNLIKELY(!parseString<true>(tokenData, strictMode)))
                 goto returnError;
         }
@@ -1082 +1082 @@
     case CharacterBackSlash:
         if (lexType & DontBuildKeywords)
-            token = parseIdentifier<false>(lvalp, lexType);
+            token = parseIdentifier<false>(tokenData, lexType);
         else
-            token = parseIdentifier<true>(lvalp, lexType);
+            token = parseIdentifier<true>(tokenData, lexType);
         break;
     case CharacterLineTerminator:
@@ -1119 +1119 @@
 
 returnToken:
-    llocp->line = m_lineNumber;
-    llocp->startOffset = startOffset;
-    llocp->endOffset = currentOffset();
+    tokenInfo->line = m_lineNumber;
+    tokenInfo->startOffset = startOffset;
+    tokenInfo->endOffset = currentOffset();
     m_lastToken = token;
     return token;

trunk/Source/JavaScriptCore/parser/Lexer.h

@@ -58 +58 @@
             DontBuildKeywords = 4
         };
-        JSTokenType lex(JSTokenData* lvalp, JSTokenInfo* llocp, unsigned, bool strictMode);
+        JSTokenType lex(JSTokenData*, JSTokenInfo*, unsigned, bool strictMode);
         bool nextTokenIsColon();
         int lineNumber() const { return m_lineNumber; }
@@ -90 +90 @@
         SourceProvider* sourceProvider() const { return m_source->provider(); }
         
-        JSTokenType lexExpectIdentifier(JSTokenData* lvalp, JSTokenInfo* llocp, unsigned, bool strictMode);
+        JSTokenType lexExpectIdentifier(JSTokenData*, JSTokenInfo*, unsigned, bool strictMode);
         
     private:
@@ -120 +120 @@
         template <bool shouldCreateIdentifier> ALWAYS_INLINE JSTokenType parseKeyword(JSTokenData*);
         template <bool shouldBuildIdentifiers> ALWAYS_INLINE JSTokenType parseIdentifier(JSTokenData*, unsigned);
-        template <bool shouldBuildStrings> ALWAYS_INLINE bool parseString(JSTokenData* lvalp, bool strictMode);
+        template <bool shouldBuildStrings> ALWAYS_INLINE bool parseString(JSTokenData*, bool strictMode);
         ALWAYS_INLINE void parseHex(double& returnValue);
         ALWAYS_INLINE bool parseOctal(double& returnValue);
@@ -182 +182 @@
     }
 
-    ALWAYS_INLINE JSTokenType Lexer::lexExpectIdentifier(JSTokenData* lvalp, JSTokenInfo* llocp, unsigned lexType, bool strictMode)
+    ALWAYS_INLINE JSTokenType Lexer::lexExpectIdentifier(JSTokenData* tokenData, JSTokenInfo* tokenInfo, unsigned lexType, bool strictMode)
     {
         ASSERT((lexType & IgnoreReservedWords));
@@ -213 +213 @@
         // Create the identifier if needed
         if (lexType & DontBuildKeywords)
-            lvalp->ident = 0;
+            tokenData->ident = 0;
         else
-            lvalp->ident = makeIdentifier(start, ptr - start);
-        llocp->line = m_lineNumber;
-        llocp->startOffset = start - m_codeStart;
-        llocp->endOffset = currentOffset();
+            tokenData->ident = makeIdentifier(start, ptr - start);
+        tokenInfo->line = m_lineNumber;
+        tokenInfo->startOffset = start - m_codeStart;
+        tokenInfo->endOffset = currentOffset();
         m_lastToken = IDENT;
         return IDENT;
         
     slowCase:
-        return lex(lvalp, llocp, lexType, strictMode);
+        return lex(tokenData, tokenInfo, lexType, strictMode);
     }