Moved MQ parsing block tracking to tokenizer

Source/core/css/parser/MediaQueryParser.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/css/parser/MediaQueryParser.h"
 
 #include "MediaTypeNames.h"
 #include "core/css/parser/CSSPropertyParser.h"
 #include "core/css/parser/MediaQueryTokenizer.h"
@@ skipping 21 matching lines @@
 const MediaQueryParser::State MediaQueryParser::ReadFeature = &MediaQueryParser::readFeature;
 const MediaQueryParser::State MediaQueryParser::ReadFeatureColon = &MediaQueryParser::readFeatureColon;
 const MediaQueryParser::State MediaQueryParser::ReadFeatureValue = &MediaQueryParser::readFeatureValue;
 const MediaQueryParser::State MediaQueryParser::ReadFeatureEnd = &MediaQueryParser::readFeatureEnd;
 const MediaQueryParser::State MediaQueryParser::SkipUntilComma = &MediaQueryParser::skipUntilComma;
 const MediaQueryParser::State MediaQueryParser::SkipUntilBlockEnd = &MediaQueryParser::skipUntilBlockEnd;
 const MediaQueryParser::State MediaQueryParser::Done = &MediaQueryParser::done;
 
 MediaQueryParser::MediaQueryParser(ParserType parserType)
     : m_querySet(MediaQuerySet::create())
+    , m_blockLevel(0)
 {
     if (parserType == MediaQuerySetParser)
         m_state = &MediaQueryParser::readRestrictor;
     else // MediaConditionParser
         m_state = &MediaQueryParser::readFeatureStart;
 }
 
 MediaQueryParser::~MediaQueryParser() { };
 
 void MediaQueryParser::setStateAndRestrict(State state, MediaQuery::Restrictor restrictor)
@@ skipping 57 matching lines @@
     if (type == IdentToken) {
         m_mediaQueryData.setMediaFeature(token->value());
         m_state = ReadFeatureColon;
     } else {
         m_state = SkipUntilComma;
     }
 }
 
 void MediaQueryParser::readFeatureColon(MediaQueryTokenType type, TokenIterator& token)
 {
-    if (type == ColonToken) {
+    if (type == ColonToken)
         m_state = ReadFeatureValue;
-    } else if (type == RightParenthesisToken || type == EOFToken) {
-        --token;
-        m_state = ReadFeatureEnd;
-    } else {
+    else if (type == RightParenthesisToken || type == EOFToken)
+        readFeatureEnd(type, token);
+    else
         m_state = SkipUntilBlockEnd;
-    }
 }
 
 void MediaQueryParser::readFeatureValue(MediaQueryTokenType type, TokenIterator& token)
 {
     if (type == DimensionToken && token->unitType() == CSSPrimitiveValue::CSS_UNKNOWN) {
         m_state = SkipUntilComma;
     } else {
         m_mediaQueryData.addParserValue(type, *token);
         m_state = ReadFeatureEnd;
     }
 }
 
 void MediaQueryParser::readFeatureEnd(MediaQueryTokenType type, TokenIterator& token)
 {
     if (type == RightParenthesisToken || type == EOFToken) {
         if (m_mediaQueryData.addExpression())
             m_state = ReadAnd;
         else
             m_state = SkipUntilComma;
     } else if (type == DelimiterToken && token->delimiter() == '/') {
         m_mediaQueryData.addParserValue(type, *token);
         m_state = ReadFeatureValue;
     } else {
         m_state = SkipUntilBlockEnd;
     }
 }
 
 void MediaQueryParser::skipUntilComma(MediaQueryTokenType type, TokenIterator& token)
 {
-    if ((type == CommaToken && m_blockStack.isEmpty()) || type == EOFToken) {
+    if ((type == CommaToken && !m_blockLevel) || type == EOFToken) {
         m_state = ReadRestrictor;
         m_mediaQueryData.clear();
         m_querySet->addMediaQuery(MediaQuery::createNotAll());
     }
 }
 
 void MediaQueryParser::skipUntilBlockEnd(MediaQueryTokenType type, TokenIterator& token)
 {
-    if (m_blockStack.isEmpty())
+    if (!m_blockLevel)
         m_state = SkipUntilComma;
 }
 
 void MediaQueryParser::done(MediaQueryTokenType type, TokenIterator& token) { }
 
-void MediaQueryParser::popIfBlockMatches(Vector<BlockType>& blockStack, BlockType type)
+void MediaQueryParser::observeBlocks(TokenIterator& token)
 {
-    if (!blockStack.isEmpty() && blockStack.last() == type)
-        blockStack.removeLast();
-}
-
-bool MediaQueryParser::observeBlock(BlockParameters& parameters, MediaQueryTokenType type)
-{
-    if (type == parameters.leftToken) {
-        if (parameters.stateChange == ModifyState)
+    if (token->blockToken() == MediaQueryToken::BlockStart) {
+        if (token->type() != LeftParenthesisToken || m_blockLevel)
             m_state = SkipUntilBlockEnd;
-        m_blockStack.append(parameters.blockType);
-    } else if (type == parameters.rightToken) {
-        popIfBlockMatches(m_blockStack, parameters.blockType);
-    } else {
-        return false;
-    }
-    return true;
-}
-
-void MediaQueryParser::observeBlocks(MediaQueryTokenType type)
-{
-    enum { BlockParametersCount = 4 };
-    BlockParameters blockParameterSet[BlockParametersCount] = {
-        { LeftParenthesisToken, RightParenthesisToken, ParenthesisBlock, DoNotModifyState },
-        { FunctionToken, RightParenthesisToken, ParenthesisBlock, ModifyState },
-        { LeftBracketToken, RightBracketToken, BracketsBlock, ModifyState },
-        { LeftBraceToken, RightBraceToken, BracesBlock, ModifyState }
-    };
-
-    for (unsigned i = 0; i < BlockParametersCount; ++i) {
-        if (observeBlock(blockParameterSet[i], type))
-            break;
+        ++m_blockLevel;

[eseidel, 2014/04/08 16:58:49]

Should the tokenizer just have a blockLevel() accessor?  In general it's fine
for Parsers to read from the Tokenizer just not the other way around. :)

+    } else if (token->blockToken() == MediaQueryToken::BlockEnd) {
+        ASSERT(m_blockLevel);
+        --m_blockLevel;
     }
 }
 
 void MediaQueryParser::processToken(TokenIterator& token)
 {
     MediaQueryTokenType type = token->type();
 
-    observeBlocks(type);
+    observeBlocks(token);
 
     // Call the function that handles current state
     if (type != WhitespaceToken && type != CommentToken)
         ((this)->*(m_state))(type, token);
 }
 
 // The state machine loop
 PassRefPtrWillBeRawPtr<MediaQuerySet> MediaQueryParser::parseImpl(TokenIterator token, TokenIterator endToken)
 {
     for (; token != endToken; ++token)
@@ skipping 61 matching lines @@
     m_valueList.addValue(value);
 }
 
 void MediaQueryData::setMediaType(const String& mediaType)
 {
     m_mediaType = mediaType;
     m_mediaTypeSet = true;
 }
 
 } // namespace WebCore