Skip to content

Commit b0d4aa9

Browse files
SimonSapinSimonSapin
committed
Include a SourceLocation in all error types
1 parent 1408bd2 commit b0d4aa9

File tree

9 files changed

+263
-183
lines changed

9 files changed

+263
-183
lines changed

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cssparser"
3-
version = "0.21.3"
3+
version = "0.22.0"
44
authors = [ "Simon Sapin <simon.sapin@exyr.org>" ]
55

66
description = "Rust implementation of CSS Syntax Level 3"

‎src/color.rs‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ impl Color {
150150
/// FIXME(#2) Deprecated CSS2 System Colors are not supported yet.
151151
pub fn parse<'i, 't>(input: &mut Parser<'i, 't>) -> Result<Color, BasicParseError<'i>> {
152152
// FIXME: remove clone() when lifetimes are non-lexical
153+
let location = input.current_source_location();
153154
let token = input.next()?.clone();
154155
match token {
155156
Token::Hash(ref value) | Token::IDHash(ref value) => {
@@ -158,12 +159,11 @@ impl Color {
158159
Token::Ident(ref value) => parse_color_keyword(&*value),
159160
Token::Function(ref name) => {
160161
return input.parse_nested_block(|arguments| {
161-
parse_color_function(&*name, arguments)
162-
.map_err(|e| ParseError::Basic(e))
162+
parse_color_function(&*name, arguments).map_err(|e| e.into())
163163
}).map_err(ParseError::<()>::basic);
164164
}
165165
_ => Err(())
166-
}.map_err(|()| BasicParseError::UnexpectedToken(token))
166+
}.map_err(|()| location.new_basic_unexpected_token_error(token))
167167
}
168168

169169
/// Parse a color hash, without the leading '#' character.
@@ -424,7 +424,7 @@ fn parse_color_function<'i, 't>(name: &str, arguments: &mut Parser<'i, 't>) -> R
424424
let (red, green, blue, uses_commas) = match_ignore_ascii_case! { name,
425425
"rgb" | "rgba" => parse_rgb_components_rgb(arguments)?,
426426
"hsl" | "hsla" => parse_rgb_components_hsl(arguments)?,
427-
_ => return Err(BasicParseError::UnexpectedToken(Token::Ident(name.to_owned().into()))),
427+
_ => return Err(arguments.new_basic_unexpected_token_error(Token::Ident(name.to_owned().into()))),
428428
};
429429

430430
let alpha = if !arguments.is_exhausted() {
@@ -433,6 +433,7 @@ fn parse_color_function<'i, 't>(name: &str, arguments: &mut Parser<'i, 't>) -> R
433433
} else {
434434
arguments.expect_delim('/')?;
435435
};
436+
let location = arguments.current_source_location();
436437
match *arguments.next()? {
437438
Token::Number { value: v, .. } => {
438439
clamp_unit_f32(v)
@@ -441,7 +442,7 @@ fn parse_color_function<'i, 't>(name: &str, arguments: &mut Parser<'i, 't>) -> R
441442
clamp_unit_f32(v)
442443
}
443444
ref t => {
444-
return Err(BasicParseError::UnexpectedToken(t.clone()))
445+
return Err(location.new_basic_unexpected_token_error(t.clone()))
445446
}
446447
}
447448
} else {
@@ -462,6 +463,8 @@ fn parse_rgb_components_rgb<'i, 't>(arguments: &mut Parser<'i, 't>) -> Result<(u
462463

463464
// Either integers or percentages, but all the same type.
464465
// https://drafts.csswg.org/css-color/#rgb-functions
466+
// FIXME: remove .clone() when lifetimes are non-lexical.
467+
let location = arguments.current_source_location();
465468
match arguments.next()?.clone() {
466469
Token::Number { value: v, .. } => {
467470
red = clamp_floor_256_f32(v);
@@ -471,7 +474,7 @@ fn parse_rgb_components_rgb<'i, 't>(arguments: &mut Parser<'i, 't>) -> Result<(u
471474
uses_commas = true;
472475
arguments.expect_number()?
473476
}
474-
t => return Err(BasicParseError::UnexpectedToken(t))
477+
t => return Err(location.new_basic_unexpected_token_error(t))
475478
});
476479
if uses_commas {
477480
arguments.expect_comma()?;
@@ -486,14 +489,14 @@ fn parse_rgb_components_rgb<'i, 't>(arguments: &mut Parser<'i, 't>) -> Result<(u
486489
uses_commas = true;
487490
arguments.expect_percentage()?
488491
}
489-
t => return Err(BasicParseError::UnexpectedToken(t))
492+
t => return Err(location.new_basic_unexpected_token_error(t))
490493
});
491494
if uses_commas {
492495
arguments.expect_comma()?;
493496
}
494497
blue = clamp_unit_f32(arguments.expect_percentage()?);
495498
}
496-
t => return Err(BasicParseError::UnexpectedToken(t))
499+
t => return Err(location.new_basic_unexpected_token_error(t))
497500
};
498501
return Ok((red, green, blue, uses_commas));
499502
}
@@ -503,6 +506,7 @@ fn parse_rgb_components_hsl<'i, 't>(arguments: &mut Parser<'i, 't>) -> Result<(u
503506
let mut uses_commas = false;
504507
// Hue given as an angle
505508
// https://drafts.csswg.org/css-values/#angles
509+
let location = arguments.current_source_location();
506510
let hue_degrees = match *arguments.next()? {
507511
Token::Number { value: v, .. } => v,
508512
Token::Dimension { value: v, ref unit, .. } => {
@@ -511,24 +515,25 @@ fn parse_rgb_components_hsl<'i, 't>(arguments: &mut Parser<'i, 't>) -> Result<(u
511515
"grad" => v * 360. / 400.,
512516
"rad" => v * 360. / (2. * PI),
513517
"turn" => v * 360.,
514-
_ => return Err(BasicParseError::UnexpectedToken(Token::Ident(unit.clone()))),
518+
_ => return Err(location.new_basic_unexpected_token_error(Token::Ident(unit.clone()))),
515519
}
516520
}
517-
ref t => return Err(BasicParseError::UnexpectedToken(t.clone()))
521+
ref t => return Err(location.new_basic_unexpected_token_error(t.clone()))
518522
};
519523
// Subtract an integer before rounding, to avoid some rounding errors:
520524
let hue_normalized_degrees = hue_degrees - 360. * (hue_degrees / 360.).floor();
521525
let hue = hue_normalized_degrees / 360.;
522526

523527
// Saturation and lightness are clamped to 0% ... 100%
524528
// https://drafts.csswg.org/css-color/#the-hsl-notation
529+
let location = arguments.current_source_location();
525530
let saturation = match arguments.next()?.clone() {
526531
Token::Percentage { unit_value, .. } => unit_value,
527532
Token::Comma => {
528533
uses_commas = true;
529534
arguments.expect_percentage()?
530535
}
531-
t => return Err(BasicParseError::UnexpectedToken(t))
536+
t => return Err(location.new_basic_unexpected_token_error(t))
532537
};
533538
let saturation = saturation.max(0.).min(1.);
534539

‎src/lib.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,14 @@ pub use cssparser_macros::*;
8686
pub use tokenizer::{Token, SourcePosition, SourceLocation};
8787
pub use rules_and_declarations::{parse_important};
8888
pub use rules_and_declarations::{DeclarationParser, DeclarationListParser, parse_one_declaration};
89-
pub use rules_and_declarations::{RuleListParser, parse_one_rule, PreciseParseError};
89+
pub use rules_and_declarations::{RuleListParser, parse_one_rule};
9090
pub use rules_and_declarations::{AtRuleType, QualifiedRuleParser, AtRuleParser};
9191
pub use from_bytes::{stylesheet_encoding, EncodingSupport};
9292
pub use color::{RGBA, Color, parse_color_keyword};
9393
pub use nth::parse_nth;
9494
pub use serializer::{ToCss, CssStringWriter, serialize_identifier, serialize_string, TokenSerializationType};
95-
pub use parser::{Parser, Delimiter, Delimiters, ParserState, ParseError, BasicParseError, ParserInput};
95+
pub use parser::{Parser, Delimiter, Delimiters, ParserState, ParserInput};
96+
pub use parser::{ParseError, ParseErrorKind, BasicParseError, BasicParseErrorKind};
9697
pub use unicode_range::UnicodeRange;
9798
pub use cow_rc_str::CowRcStr;
9899

‎src/nth.rs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub fn parse_nth<'i, 't>(input: &mut Parser<'i, 't>) -> Result<(i32, i32), Basic
2424
"n-" => Ok(try!(parse_signless_b(input, a, -1))),
2525
_ => match parse_n_dash_digits(&*unit) {
2626
Ok(b) => Ok((a, b)),
27-
Err(()) => Err(BasicParseError::UnexpectedToken(Token::Ident(unit.clone())))
27+
Err(()) => Err(input.new_basic_unexpected_token_error(Token::Ident(unit.clone())))
2828
}
2929
}
3030
}
@@ -44,7 +44,7 @@ pub fn parse_nth<'i, 't>(input: &mut Parser<'i, 't>) -> Result<(i32, i32), Basic
4444
};
4545
match parse_n_dash_digits(slice) {
4646
Ok(b) => Ok((a, b)),
47-
Err(()) => Err(BasicParseError::UnexpectedToken(Token::Ident(value.clone())))
47+
Err(()) => Err(input.new_basic_unexpected_token_error(Token::Ident(value.clone())))
4848
}
4949
}
5050
}
@@ -57,13 +57,13 @@ pub fn parse_nth<'i, 't>(input: &mut Parser<'i, 't>) -> Result<(i32, i32), Basic
5757
"n-" => parse_signless_b(input, 1, -1),
5858
_ => match parse_n_dash_digits(&*value) {
5959
Ok(b) => Ok((1, b)),
60-
Err(()) => Err(BasicParseError::UnexpectedToken(Token::Ident(value.clone())))
60+
Err(()) => Err(input.new_basic_unexpected_token_error(Token::Ident(value.clone())))
6161
}
6262
}
6363
}
64-
token => Err(BasicParseError::UnexpectedToken(token)),
64+
token => Err(input.new_basic_unexpected_token_error(token)),
6565
},
66-
token => Err(BasicParseError::UnexpectedToken(token)),
66+
token => Err(input.new_basic_unexpected_token_error(token)),
6767
}
6868
}
6969

@@ -82,9 +82,10 @@ fn parse_b<'i, 't>(input: &mut Parser<'i, 't>, a: i32) -> Result<(i32, i32), Bas
8282
}
8383

8484
fn parse_signless_b<'i, 't>(input: &mut Parser<'i, 't>, a: i32, b_sign: i32) -> Result<(i32, i32), BasicParseError<'i>> {
85-
match *input.next()? {
85+
// FIXME: remove .clone() when lifetimes are non-lexical.
86+
match input.next()?.clone() {
8687
Token::Number { has_sign: false, int_value: Some(b), .. } => Ok((a, b_sign * b)),
87-
ref token => Err(BasicParseError::UnexpectedToken(token.clone()))
88+
token => Err(input.new_basic_unexpected_token_error(token))
8889
}
8990
}
9091

0 commit comments

Comments
 (0)