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

Make parserrors have token

Browse Source
This commit is contained in:
greg 2019-01-05 17:32:49 -08:00
parent d0c5dce92b
commit f2f8ac7ee8
1 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
schala-lang/language/src/parsing.rs
View File

@ -848,7 +848,9 @@ impl Parser {
#[recursive_descent_method] #[recursive_descent_method]
fn simple_pattern(&mut self) -> ParseResult<Pattern> { fn simple_pattern(&mut self) -> ParseResult<Pattern> {
Ok(match self.peek() { Ok({
let tok = self.token_handler.peek_token();
match tok.get_kind() {
Identifier(_) => { Identifier(_) => {
let id = self.identifier()?; let id = self.identifier()?;
match self.peek() { match self.peek() {
@ -881,7 +883,8 @@ impl Parser {
self.next(); self.next();
Pattern::Ignored Pattern::Ignored
}, },
other => return ParseError::new(&format!("{:?} is not a valid Pattern", other)) other => return ParseError::new_with_token(&format!("{:?} is not a valid Pattern", other), tok)
}
}) })
} }