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

Starting work on literal non-primitve values

Browse Source
This commit is contained in:
greg 2017-10-13 18:56:02 -07:00
parent 26c9c72bcc
commit 688e1c7f5d
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/schala_lang/parsing.rs
View File

@ -293,9 +293,14 @@ primary := literal | paren_expr | if_expr | match_expr | for_expr | identifier_e
paren_expr := LParen paren_inner RParen paren_expr := LParen paren_inner RParen
paren_inner := (expression ',')* paren_inner := (expression ',')*
identifier_expr := call_expr | index_expr | IDENTIFIER identifier_expr := named_struct | call_expr | index_expr | IDENTIFIER
literal := 'true' | 'false' | number_literal | STR_LITERAL literal := 'true' | 'false' | number_literal | STR_LITERAL
named_struct := IDENTIFIER record_block
record_block := '{' record_entry* | '}' //TODO support anonymus structs, update syntax
record_entry := IDENTIFIER ':' expression ','+
if_expr := 'if' expression block else_clause if_expr := 'if' expression block else_clause
else_clause := ε | 'else' block else_clause := ε | 'else' block
@ -809,6 +814,10 @@ impl Parser {
use self::ExpressionType::*; use self::ExpressionType::*;
let identifier = self.identifier()?; let identifier = self.identifier()?;
Ok(match self.peek() { Ok(match self.peek() {
LCurlyBrace => {
self.named_struct()?;
},
LParen => { LParen => {
let arguments = self.call_expr()?; let arguments = self.call_expr()?;
//TODO make this be more general //TODO make this be more general
@ -1089,6 +1098,8 @@ mod parse_tests {
//parse_test!("a[]", <- TODO THIS NEEDS TO FAIL //parse_test!("a[]", <- TODO THIS NEEDS TO FAIL
//parse_test!(damn()[a] ,<- TODO needs to succeed //parse_test!(damn()[a] ,<- TODO needs to succeed
parse_test!("a[b,c]", AST(vec![exprstatement!(Index { indexee: Box::new(ex!(val!("a"))), indexers: vec![ex!(val!("b")), ex!(val!("c"))]} )])); parse_test!("a[b,c]", AST(vec![exprstatement!(Index { indexee: Box::new(ex!(val!("a"))), indexers: vec![ex!(val!("b")), ex!(val!("c"))]} )]));
parse_test!("None", AST(vec![exprstatement!(val!("None"))]));
} }
#[test] #[test]