Skip to content

Parser changes for Gecko integration #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jul 5, 2017
Merged

Parser changes for Gecko integration #168

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5bab829
Add API to retrieve contents of current line being parsed.
jdm Jul 4, 2017
f71a5a2
Differentiate between default errors for at-rule parsing.
jdm Jul 4, 2017
0c8a8a9
parse_entirely should not prioritize EndOfInput errors.
jdm Jul 4, 2017
b0c8cdf
Style cleanup for existing parser code.
jdm Jul 4, 2017
0d93af0
Report actual unexpected token in declarations.
jdm Jul 4, 2017
c4c8f78
Propagate error from parsing at rules.
jdm Jul 4, 2017
5a2d392
Store bad string and url values.
jdm Jul 4, 2017
a8e2252
Make column and line numbers match Gecko's CSS parser.
jdm Jul 4, 2017
c6156c0
Increase package version.
jdm Jul 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Style cleanup for existing parser code.
  • Loading branch information
@jdm
jdm committed Jul 5, 2017
commit b0c8cdf2a90a27c48ae63706bb40e6c5890be37a
5 changes: 2 additions & 3 deletions src/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,8 +489,7 @@ impl<'i: 't, 't> Parser<'i, 't> {
match self.next()? {
Token::UnquotedUrl(value) => Ok(value),
Token::Function(ref name) if name.eq_ignore_ascii_case("url") => {
self.parse_nested_block(|input| input.expect_string()
.map_err(|e| ParseError::Basic(e)))
self.parse_nested_block(|input| input.expect_string().map_err(ParseError::Basic))
.map_err(ParseError::<()>::basic)
},
t => Err(BasicParseError::UnexpectedToken(t))
Expand All @@ -504,7 +503,7 @@ impl<'i: 't, 't> Parser<'i, 't> {
Token::UnquotedUrl(value) => Ok(value),
Token::QuotedString(value) => Ok(value),
Token::Function(ref name) if name.eq_ignore_ascii_case("url") => {
self.parse_nested_block(|input| input.expect_string().map_err(|e| ParseError::Basic(e)))
self.parse_nested_block(|input| input.expect_string().map_err(ParseError::Basic))
.map_err(ParseError::<()>::basic)
},
t => Err(BasicParseError::UnexpectedToken(t))
Expand Down