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

Parse list literals

Browse Source
This commit is contained in:
greg 2018-03-08 12:01:24 -08:00
parent 59d621ed75
commit 1eeafb80dc
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/schala_lang/parsing.rs
View File

@ -56,12 +56,14 @@ prefix_expr := prefix_op call_expr
prefix_op := '+' | '-' | '!' | '~' prefix_op := '+' | '-' | '!' | '~'
call_expr := index_expr ( '(' expr_list ')' )* call_expr := index_expr ( '(' expr_list ')' )*
index_expr := primary ( '[' (expression (',' (expression)* | ε) ']' )* index_expr := primary ( '[' (expression (',' (expression)* | ε) ']' )*
primary := literal | paren_expr | if_expr | match_expr | for_expr | identifier_expr | curly_brace_expr primary := literal | paren_expr | if_expr | match_expr | for_expr | identifier_expr | curly_brace_expr | list_expr
curly_brace_expr := lambda_expr | anonymous_struct //TODO curly_brace_expr := lambda_expr | anonymous_struct //TODO
list_expr := '[' (expression, ',')* ']'
lambda_expr := '{' '|' (formal_param ',')* '|' (type_anno)* (statement)* '}' lambda_expr := '{' '|' (formal_param ',')* '|' (type_anno)* (statement)* '}'
paren_expr := LParen paren_inner RParen paren_expr := LParen paren_inner RParen
paren_inner := (expression ',')* paren_inner := (expression ',')*
identifier_expr := named_struct | IDENTIFIER identifier_expr := named_struct | IDENTIFIER
literal := 'true' | 'false' | number_literal | STR_LITERAL literal := 'true' | 'false' | number_literal | STR_LITERAL
named_struct := IDENTIFIER record_block named_struct := IDENTIFIER record_block
@ -254,6 +256,7 @@ pub enum ExpressionType {
params: Vec<FormalParam>, params: Vec<FormalParam>,
body: Vec<Statement>, body: Vec<Statement>,
}, },
ListLiteral(Vec<Expression>),
} }
#[derive(Debug, PartialEq, Clone)] #[derive(Debug, PartialEq, Clone)]
@ -610,6 +613,7 @@ impl Parser {
match self.peek() { match self.peek() {
LCurlyBrace => self.curly_brace_expr(), LCurlyBrace => self.curly_brace_expr(),
LParen => self.paren_expr(), LParen => self.paren_expr(),
LSquareBracket => self.list_expr(),
Keyword(Kw::If) => self.if_expr(), Keyword(Kw::If) => self.if_expr(),
Keyword(Kw::Match) => self.match_expr(), Keyword(Kw::Match) => self.match_expr(),
Keyword(Kw::For) => self.for_expr(), Keyword(Kw::For) => self.for_expr(),
@ -618,6 +622,11 @@ impl Parser {
} }
}); });
parse_method!(list_expr(&mut self) -> ParseResult<Expression> {
let exprs = delimited!(self, LSquareBracket, '[', expression, Comma, RSquareBracket, ']');
Ok(Expression(ExpressionType::ListLiteral(exprs), None))
});
parse_method!(curly_brace_expr(&mut self) -> ParseResult<Expression> { parse_method!(curly_brace_expr(&mut self) -> ParseResult<Expression> {
self.lambda_expr() self.lambda_expr()
}); });
@ -1214,4 +1223,12 @@ fn a(x) {
Lambda { params: vec![(rc!(x), None)], body: vec![exprstatement!(val!("y"))] })), Lambda { params: vec![(rc!(x), None)], body: vec![exprstatement!(val!("y"))] })),
arguments: vec![ex!(IntLiteral(1))] })])); arguments: vec![ex!(IntLiteral(1))] })]));
} }
#[test]
fn list_literals() {
parse_test! {
"[1,2]", AST(vec![
exprstatement!(ListLiteral(vec![ex!(IntLiteral(1)), ex!(IntLiteral(2))]))])
};
}
} }