greg/schala
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add some debugging info around parse error

Browse Source
This commit is contained in:
greg 2018-07-11 02:32:29 -07:00
parent 00692aa89e
commit 43ff08b04c
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
schala-lang/src/parsing.rs
View File

@ -140,14 +140,18 @@ enumerator := identifier '<-' expression | identifier '=' expression //TODO add
type TokenIter = Peekable<IntoIter<Token>>; type TokenIter = Peekable<IntoIter<Token>>;
#[derive(Debug, PartialEq)] #[derive(Debug)]
pub struct ParseError { pub struct ParseError {
pub msg: String, pub msg: String,
pub token: Option<Token>
} }
impl ParseError { impl ParseError {
fn new<T>(msg: &str) -> ParseResult<T> { fn new<T>(msg: &str) -> ParseResult<T> {
Err(ParseError { msg: msg.to_string() }) Err(ParseError {
msg: msg.to_string(),
token: None
})
} }
} }
@ -203,7 +207,7 @@ macro_rules! expect {
$token_type if $cond => $self.next(), $token_type if $cond => $self.next(),
tok => { tok => {
let msg = format!("Expected {}, got {:?}", print_token_pattern!($token_type), tok); let msg = format!("Expected {}, got {:?}", print_token_pattern!($token_type), tok);
return Err(ParseError { msg }) return ParseError::new(&msg);
} }
} }
} }
@ -226,7 +230,11 @@ macro_rules! parse_method {
if $self.parse_level != 0 { if $self.parse_level != 0 {
$self.parse_level -= 1; $self.parse_level -= 1;
} }
result match result {
Err(ParseError { token: None, msg }) =>
Err(ParseError { token: Some(next_token), msg }),
_ => result
}
} }
}; };
} }