Fix interaction of skip_whitespace and nested blocks #185
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This fixes (at least some of) the test failures at servo/servo#18171
|
@bors-servo r=emilio |
|
📌 Commit 0acff3b has been approved by |
bors-servo
pushed a commit
that referenced
this pull request
Aug 25, 2017
Fix interaction of skip_whitespace and nested blocks This fixes (at least some of) the test failures at servo/servo#18171 In code like this: ```css unsupported selector ! { stuff } valid selector { color: green } ``` `rules_and_declarations::parse_qualified_rule` would leave the parser just after the first `{` with `Parser::at_start_of == Some(BlockType::CurlyBracket)`. The latter means that, unless `Parser::parse_nested_block` is called, the parser needs to skip over this block until the matching `}` before doing anything else. This PR makes `Parser::skip_whitespace` and `Parser::skip_cdc_and_cdo` (both added recently in #181) take care of `Parser::at_start_of` correctly the same way `Parser::next` does. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-cssparser/185) <!-- Reviewable:end -->
|
@bors-servo r+ |
|
💡 This pull request was already approved, no need to approve it again.
|
|
📌 Commit 0acff3b has been approved by |
bors-servo
pushed a commit
that referenced
this pull request
Aug 25, 2017
Fix interaction of skip_whitespace and nested blocks This fixes (at least some of) the test failures at servo/servo#18171 In code like this: ```css unsupported selector ! { stuff } valid selector { color: green } ``` `rules_and_declarations::parse_qualified_rule` would leave the parser just after the first `{` with `Parser::at_start_of == Some(BlockType::CurlyBracket)`. The latter means that, unless `Parser::parse_nested_block` is called, the parser needs to skip over this block until the matching `}` before doing anything else. This PR makes `Parser::skip_whitespace` and `Parser::skip_cdc_and_cdo` (both added recently in #181) take care of `Parser::at_start_of` correctly the same way `Parser::next` does. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-cssparser/185) <!-- Reviewable:end -->
|
☀️ Test successful - status-travis |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes (at least some of) the test failures at servo/servo#18171
In code like this:
rules_and_declarations::parse_qualified_rulewould leave the parser just after the first{withParser::at_start_of == Some(BlockType::CurlyBracket). The latter means that, unlessParser::parse_nested_blockis called, the parser needs to skip over this block until the matching}before doing anything else. This PR makesParser::skip_whitespaceandParser::skip_cdc_and_cdo(both added recently in #181) take care ofParser::at_start_ofcorrectly the same wayParser::nextdoes.This change is