Remove unused data member from Lexer class

https://bugs.webkit.org/show_bug.cgi?id=83429

Reviewed by Kentaro Hara.

I noticed that m_delimited was "write-only", so I deleted it.

* parser/Lexer.cpp:
(JSC::Lexer::setCode): Removed code to set m_delimited.
(JSC::Lexer::parseIdentifier): Ditto.
(JSC::Lexer::parseIdentifierSlowCase): Ditto.
(JSC::Lexer::lex): Ditto.
* parser/Lexer.h: Deleted m_delimited.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@113765 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index aca52c05ec2e0d667671a5f0d44fc405c249fb60..2e9d6b87be9efe261bcf4e6d278347698ae57955 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,19 @@
+2012-04-10  Darin Adler  <darin@apple.com>
+
+        Remove unused data member from Lexer class
+        https://bugs.webkit.org/show_bug.cgi?id=83429
+
+        Reviewed by Kentaro Hara.
+
+        I noticed that m_delimited was "write-only", so I deleted it.
+
+        * parser/Lexer.cpp:
+        (JSC::Lexer::setCode): Removed code to set m_delimited.
+        (JSC::Lexer::parseIdentifier): Ditto.
+        (JSC::Lexer::parseIdentifierSlowCase): Ditto.
+        (JSC::Lexer::lex): Ditto.
+        * parser/Lexer.h: Deleted m_delimited.
+
 2012-04-10  Patrick Gansterer  <paroga@webkit.org>
 
         [CMake] Enable USE_FOLDERS property

diff --git a/Source/JavaScriptCore/parser/Lexer.cpp b/Source/JavaScriptCore/parser/Lexer.cpp
index 452230b4e26aedba930914b96a1f440f082a8a96..833e16f22468095f0427ce1c0966d7679060e003 100644 (file)
--- a/Source/JavaScriptCore/parser/Lexer.cpp
+++ b/Source/JavaScriptCore/parser/Lexer.cpp
@@ -403,7 +403,6 @@ void Lexer<T>::setCode(const SourceCode& source, ParserArena* arena)
     m_arena = &arena->identifierArena();
     
     m_lineNumber = source.firstLine();
-    m_delimited = false;
     m_lastToken = -1;
     
     const StringImpl* sourceString = source.provider()->data();
@@ -665,8 +664,6 @@ template <>
     } else
         tokenData->ident = 0;
 
-    m_delimited = false;
-
     if (UNLIKELY((remaining < maxTokenLength) && !(lexerFlags & LexerFlagsIgnoreReservedWords))) {
         ASSERT(shouldCreateIdentifier);
         if (remaining < maxTokenLength) {
@@ -726,8 +723,6 @@ template <bool shouldCreateIdentifier> ALWAYS_INLINE JSTokenType Lexer<UChar>::p
     } else
         tokenData->ident = 0;
     
-    m_delimited = false;
-    
     if (UNLIKELY((remaining < maxTokenLength) && !(lexerFlags & LexerFlagsIgnoreReservedWords))) {
         ASSERT(shouldCreateIdentifier);
         if (remaining < maxTokenLength) {
@@ -794,8 +789,6 @@ template <bool shouldCreateIdentifier> JSTokenType Lexer<T>::parseIdentifierSlow
     } else
         tokenData->ident = 0;
 
-    m_delimited = false;
-
     if (LIKELY(!bufferRequired && !(lexerFlags & LexerFlagsIgnoreReservedWords))) {
         ASSERT(shouldCreateIdentifier);
         // Keywords must not be recognized if there was an \uXXXX in the identifier.
@@ -1192,8 +1185,6 @@ start:
     if (UNLIKELY(m_current == -1))
         return EOFTOK;
 
-    m_delimited = false;
-
     CharacterType type;
     if (LIKELY(isLatin1(static_cast<T>(m_current))))
         type = static_cast<CharacterType>(typesOfLatin1Characters[m_current]);
@@ -1425,7 +1416,6 @@ start:
         shift();
         break;
     case CharacterSemicolon:
-        m_delimited = true;
         shift();
         token = SEMICOLON;
         break;
@@ -1436,7 +1426,6 @@ start:
         break;
     case CharacterCloseBrace:
         tokenData->intValue = currentOffset();
-        m_delimited = true;
         shift();
         token = CLOSEBRACE;
         break;
@@ -1491,7 +1480,6 @@ inNumberAfterDecimalPoint:
             goto returnError;
         }
         m_buffer8.resize(0);
-        m_delimited = false;
         break;
     case CharacterQuote:
         if (lexerFlags & LexerFlagsDontBuildStrings) {
@@ -1502,7 +1490,6 @@ inNumberAfterDecimalPoint:
                 goto returnError;
         }
         shift();
-        m_delimited = false;
         token = STRING;
         break;
     case CharacterIdentifierStart:
@@ -1545,7 +1532,6 @@ inSingleLineComment:
         goto start;
 
     token = SEMICOLON;
-    m_delimited = true;
     // Fall through into returnToken.
 
 returnToken:

diff --git a/Source/JavaScriptCore/parser/Lexer.h b/Source/JavaScriptCore/parser/Lexer.h
index 81558fa9680f9071a764d445c0acf787cea93813..879336ca3de770003fa738841df0da2ece1a8613 100644 (file)
--- a/Source/JavaScriptCore/parser/Lexer.h
+++ b/Source/JavaScriptCore/parser/Lexer.h
@@ -171,7 +171,6 @@ private:
     Vector<LChar> m_buffer8;
     Vector<UChar> m_buffer16;
     bool m_terminator;
-    bool m_delimited; // encountered delimiter like "'" and "}" on last run
     int m_lastToken;
 
     const SourceCode* m_source;