Changeset 88724 in webkit for trunk/Source/JavaScriptCore/parser/Lexer.h

Timestamp:

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

Author:

[email protected]

Message:

2011-06-13 Oliver Hunt <​[email protected]>

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):

File:

• trunk/Source/JavaScriptCore/parser/Lexer.h (modified) (5 diffs)

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);
     }