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

Tuple literals

This commit is contained in:
greg 2017-10-06 20:28:07 -07:00
parent 184a2ae03a
commit 87cfe854ac
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/schala_lang/parsing.rs
View File

@ -307,7 +307,8 @@ prefix_expr := prefix_op primary
prefix_op := '+' | '-' | '!' | '~' prefix_op := '+' | '-' | '!' | '~'
primary := literal | paren_expr | if_expr | match_expr | identifier_expr primary := literal | paren_expr | if_expr | match_expr | identifier_expr
paren_expr := LParen expression RParen paren_expr := LParen paren_inner RParen
paren_inner := (expression ',')*
identifier_expr := call_expr | index_expr | IDENTIFIER identifier_expr := call_expr | index_expr | IDENTIFIER
literal := 'true' | 'false' | number_literal | STR_LITERAL literal := 'true' | 'false' | number_literal | STR_LITERAL
@ -452,6 +453,7 @@ pub enum ExpressionType {
BoolLiteral(bool), BoolLiteral(bool),
BinExp(Operation, Box<Expression>, Box<Expression>), BinExp(Operation, Box<Expression>, Box<Expression>),
PrefixExp(Operation, Box<Expression>), PrefixExp(Operation, Box<Expression>),
TupleLiteral(Vec<Expression>),
Variable(Rc<String>), Variable(Rc<String>),
Call { Call {
name: Rc<String>, name: Rc<String>,
@ -740,10 +742,13 @@ impl Parser {
}); });
parse_method!(paren_expr(&mut self) -> ParseResult<Expression> { parse_method!(paren_expr(&mut self) -> ParseResult<Expression> {
expect!(self, LParen, "'('"); use self::ExpressionType::*;
let expr = self.expression()?; let mut inner = delimited!(self, LParen, '(', expression, Comma, RParen, ')');
expect!(self, RParen, "')'"); match inner.len() {
Ok(expr) 0 => Ok(Expression(TupleLiteral(vec![]), None)),
1 => Ok(inner.pop().unwrap()),
_ => Ok(Expression(TupleLiteral(inner), None)),
}
}); });
parse_method!(identifier_expr(&mut self) -> ParseResult<Expression> { parse_method!(identifier_expr(&mut self) -> ParseResult<Expression> {
@ -1002,6 +1007,20 @@ mod parse_tests {
parse_test!(".1 + .2", AST(vec![exprstatement!(binexp!("+", FloatLiteral(0.1), FloatLiteral(0.2)))])); parse_test!(".1 + .2", AST(vec![exprstatement!(binexp!("+", FloatLiteral(0.1), FloatLiteral(0.2)))]));
} }
#[test]
fn parsing_tuples() {
parse_test!("()", AST(vec![exprstatement!(TupleLiteral(vec![]))]));
parse_test!("(\"hella\", 34)", AST(vec![exprstatement!(
TupleLiteral(
vec![ex!(StringLiteral(rc!(hella))), ex!(IntLiteral(34))]
)
)]));
parse_test!("((1+2), \"slough\")", AST(vec![exprstatement!(TupleLiteral(vec![
ex!(binexp!("+", IntLiteral(1), IntLiteral(2))),
ex!(StringLiteral(rc!(slough))),
]))]))
}
#[test] #[test]
fn parsing_identifiers() { fn parsing_identifiers() {
parse_test!("a", AST(vec![exprstatement!(var!("a"))])); parse_test!("a", AST(vec![exprstatement!(var!("a"))]));