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

paren exprs

Browse Source
This commit is contained in:
greg 2017-09-13 03:46:16 -07:00
parent f72e77cbb6
commit 685b579fdd
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/schala_lang/parsing.rs
View File

@ -472,7 +472,17 @@ impl Parser {
} }
fn primary(&mut self) -> ParseResult<Expression> { fn primary(&mut self) -> ParseResult<Expression> {
self.literal() match self.peek() {
LParen => self.paren_expr(),
_ => self.literal(),
}
}
fn paren_expr(&mut self) -> ParseResult<Expression> {
expect!(self, LParen, "Expected '('");
let expr = self.expression()?;
expect!(self, RParen, "Expected ')'");
Ok(expr)
} }
fn identifier(&mut self) -> ParseResult<Rc<String>> { fn identifier(&mut self) -> ParseResult<Rc<String>> {
@ -580,7 +590,7 @@ mod parse_tests {
} }
#[test] #[test]
fn test_parsing() { fn parsing_number_literals_and_binexps() {
parse_test!("8.1", AST(vec![Expression(FloatLiteral(8.1))])); parse_test!("8.1", AST(vec![Expression(FloatLiteral(8.1))]));
parse_test!("0b010", AST(vec![Expression(IntLiteral(2))])); parse_test!("0b010", AST(vec![Expression(IntLiteral(2))]));
parse_test!("3; 4; 4.3", AST( parse_test!("3; 4; 4.3", AST(
@ -599,6 +609,19 @@ mod parse_tests {
parse_test!("1 && 2", AST(vec![Expression(binexp!(op!("&&"), IntLiteral(1), IntLiteral(2)))])); parse_test!("1 && 2", AST(vec![Expression(binexp!(op!("&&"), IntLiteral(1), IntLiteral(2)))]));
parse_test!("1 + 2 * 3 + 4", AST(vec![Expression(
binexp!(op!("+"),
binexp!(op!("+"), IntLiteral(1),
binexp!(op!("*"), IntLiteral(2), IntLiteral(3))
),
IntLiteral(4)
)
)]));
parse_test!("(1 + 2) * 3", AST(vec!
[
Expression(binexp!(op!("*"), binexp!(op!("+"), IntLiteral(1), IntLiteral(2)), IntLiteral(3)))
]));
}
} }
}