Skip to content

Continuation PR for #256: Implement std::error::Error for errors #262

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.

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

Closed
wants to merge 10 commits into from
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
target
/Cargo.lock
/.cargo/config
.idea
49 changes: 49 additions & 0 deletions src/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
use crate::cow_rc_str::CowRcStr;
use crate::tokenizer::{SourceLocation, SourcePosition, Token, Tokenizer};
use smallvec::SmallVec;
use std::error::Error;
use std::fmt;
use std::ops::BitOr;
use std::ops::Range;

Expand Down Expand Up @@ -53,6 +55,20 @@ pub enum BasicParseErrorKind<'i> {
QualifiedRuleInvalid,
}

impl<'i> BasicParseErrorKind<'i> {
fn description(&self) -> String {
match self {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we move this to Display::fmt?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed in the last commit

BasicParseErrorKind::UnexpectedToken(token) => {
format!("Unexpected token: {:?}", token)
}
BasicParseErrorKind::EndOfInput => "End of input".to_owned(),
BasicParseErrorKind::AtRuleInvalid(message) => format!("Invalid @ rule: {}", message),
BasicParseErrorKind::AtRuleBodyInvalid => "Invalid @ rule body".to_owned(),
BasicParseErrorKind::QualifiedRuleInvalid => "Invalid qualified rule".to_owned(),
}
}
}

/// The funamental parsing errors that can be triggered by built-in parsing routines.
#[derive(Clone, Debug, PartialEq)]
pub struct BasicParseError<'i> {
Expand All @@ -62,6 +78,18 @@ pub struct BasicParseError<'i> {
pub location: SourceLocation,
}

impl<'i> fmt::Display for BasicParseError<'i> {
fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
formatter.write_str(self.kind.description().as_str())
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That way this doesn't need the extra allocation.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, it may be nice to expose self.location, but that may be fine as a follow-up.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in c962d4a

}
}

impl<'i> Error for BasicParseError<'i> {
fn description(&self) -> &str {
"A BasicParseError has occurred, please use the Display trait to determine it's kind"
}
}

impl<'i, T> From<BasicParseError<'i>> for ParseError<'i, T> {
#[inline]
fn from(this: BasicParseError<'i>) -> ParseError<'i, T> {
Expand Down Expand Up @@ -156,6 +184,27 @@ impl<'i, T> ParseError<'i, T> {
}
}

impl<'i, T> fmt::Display for ParseError<'i, T>
where
T: fmt::Display,
{
fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
match &self.kind {
ParseErrorKind::Basic(basic_kind) => formatter.write_str(&basic_kind.description()),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can just use basic_kind.fmt(formatter)

ParseErrorKind::Custom(custom_type) => custom_type.fmt(formatter),
}
}
}

impl<'i, T> Error for ParseError<'i, T>
where
T: Error,
{
fn description(&self) -> &str {
"A ParseError has occurred, please use the Display trait to determine it's kind"
}
}

/// The owned input for a parser.
pub struct ParserInput<'i> {
tokenizer: Tokenizer<'i>,
Expand Down