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

Fix match expression parsing

Browse Source
This commit is contained in:
greg 2018-06-12 20:58:03 -07:00
parent 196954326e
commit a96fbc9592
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -627,11 +627,13 @@ impl Parser {
parse_method!(match_expr(&mut self) -> ParseResult<Expression> { parse_method!(match_expr(&mut self) -> ParseResult<Expression> {
expect!(self, Keyword(Kw::Match)); expect!(self, Keyword(Kw::Match));
let expr = self.expression()?; let expr = {
//TODO abstract these errors into the delimited macro self.restrictions.no_struct_literal = true;
//expect!(self, LCurlyBrace, "Expected '{'"); let x = self.expression();
self.restrictions.no_struct_literal = false;
x?
};
let body = self.match_body()?; let body = self.match_body()?;
//expect!(self, RCurlyBrace, "Expected '}'");
Ok(Expression(ExpressionType::MatchExpression(bx!(expr), body), None)) Ok(Expression(ExpressionType::MatchExpression(bx!(expr), body), None))
}); });