Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update parser state only after rule is successfully parsed

Browse source
This commit is contained in:
Xidorn Quan 2017-08-18 15:27:39 +10:00
parent c1b196b7cb
commit c15ae3b6b4
5 changed files with 4 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/style/stylesheets/rule_parser.rs
View file

@ -169,7 +169,6 @@ impl<'a, 'i> AtRuleParser<'i> for TopLevelRuleParser<'a> {
return Err(StyleParseError::UnexpectedImportRule.into()) return Err(StyleParseError::UnexpectedImportRule.into())
} }
self.state = State::Imports;
let url_string = input.expect_url_or_string()?.as_ref().to_owned(); let url_string = input.expect_url_or_string()?.as_ref().to_owned();
let specified_url = SpecifiedUrl::parse_from_string(url_string, &self.context)?; let specified_url = SpecifiedUrl::parse_from_string(url_string, &self.context)?;
@ -187,6 +186,7 @@ impl<'a, 'i> AtRuleParser<'i> for TopLevelRuleParser<'a> {
media, media,
); );
self.state = State::Imports;
return Ok(AtRuleType::WithoutBlock(CssRule::Import(import_rule))) return Ok(AtRuleType::WithoutBlock(CssRule::Import(import_rule)))
}, },
"namespace" => { "namespace" => {
@ -195,7 +195,6 @@ impl<'a, 'i> AtRuleParser<'i> for TopLevelRuleParser<'a> {
self.had_hierarchy_error = true; self.had_hierarchy_error = true;
return Err(StyleParseError::UnexpectedNamespaceRule.into()) return Err(StyleParseError::UnexpectedNamespaceRule.into())
} }
self.state = State::Namespaces;
let prefix_result = input.try(|i| i.expect_ident_cloned()); let prefix_result = input.try(|i| i.expect_ident_cloned());
let maybe_namespace = match input.expect_url_or_string() { let maybe_namespace = match input.expect_url_or_string() {
@ -220,6 +219,7 @@ impl<'a, 'i> AtRuleParser<'i> for TopLevelRuleParser<'a> {
None None
}; };
self.state = State::Namespaces;
return Ok(AtRuleType::WithoutBlock(CssRule::Namespace(Arc::new( return Ok(AtRuleType::WithoutBlock(CssRule::Namespace(Arc::new(
self.shared_lock.wrap(NamespaceRule { self.shared_lock.wrap(NamespaceRule {
prefix: opt_prefix, prefix: opt_prefix,
@ -236,7 +236,6 @@ impl<'a, 'i> AtRuleParser<'i> for TopLevelRuleParser<'a> {
} }
_ => {} _ => {}
} }
self.state = State::Body;
AtRuleParser::parse_prelude(&mut self.nested(), name, input) AtRuleParser::parse_prelude(&mut self.nested(), name, input)
} }
@ -248,6 +247,7 @@ impl<'a, 'i> AtRuleParser<'i> for TopLevelRuleParser<'a> {
input: &mut Parser<'i, 't> input: &mut Parser<'i, 't>
) -> Result<CssRule, ParseError<'i>> { ) -> Result<CssRule, ParseError<'i>> {
AtRuleParser::parse_block(&mut self.nested(), prelude, input) AtRuleParser::parse_block(&mut self.nested(), prelude, input)
.map(|rule| { self.state = State::Body; rule })
} }
} }
@ -266,7 +266,6 @@ impl<'a, 'i> QualifiedRuleParser<'i> for TopLevelRuleParser<'a> {
&mut self, &mut self,
input: &mut Parser<'i, 't>, input: &mut Parser<'i, 't>,
) -> Result<QualifiedRuleParserPrelude, ParseError<'i>> { ) -> Result<QualifiedRuleParserPrelude, ParseError<'i>> {
self.state = State::Body;
QualifiedRuleParser::parse_prelude(&mut self.nested(), input) QualifiedRuleParser::parse_prelude(&mut self.nested(), input)
} }
@ -277,6 +276,7 @@ impl<'a, 'i> QualifiedRuleParser<'i> for TopLevelRuleParser<'a> {
input: &mut Parser<'i, 't> input: &mut Parser<'i, 't>
) -> Result<CssRule, ParseError<'i>> { ) -> Result<CssRule, ParseError<'i>> {
QualifiedRuleParser::parse_block(&mut self.nested(), prelude, input) QualifiedRuleParser::parse_block(&mut self.nested(), prelude, input)
.map(|result| { self.state = State::Body; result })
} }
} }

3
tests/wpt/metadata-css/css21_dev/html4/at-import-009.htm.ini
View file

@ -1,3 +0,0 @@
[at-import-009.htm]
type: reftest
expected: FAIL

3
tests/wpt/metadata-css/css21_dev/html4/at-import-010.htm.ini
View file

@ -1,3 +0,0 @@
[at-import-010.htm]
type: reftest
expected: FAIL

3
tests/wpt/metadata-css/css21_dev/html4/at-rule-008.htm.ini
View file

@ -1,3 +0,0 @@
[at-rule-008.htm]
type: reftest
expected: FAIL

3
tests/wpt/metadata-css/css21_dev/html4/at-rule-009.htm.ini
View file

@ -1,3 +0,0 @@
[at-rule-009.htm]
type: reftest
expected: FAIL