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

Some more guard arm stuff + dealing with split binexp

Browse Source 
... in if-blocks. Need to do some re-architecture I think
This commit is contained in:
greg 2018-07-13 22:12:30 -07:00
parent 837a180b09
commit c2db212c78
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,13 +120,13 @@ tuple_struct_pattern := IDENTIFIER '(' (pattern, ',')* ')'
/* Expression - If */ /* Expression - If */
if_expr := 'if' discriminator ('then' condititional | 'is' simple_pattern_match | guard_block) if_expr := 'if' discriminator ('then' condititional | 'is' simple_pattern_match | guard_block)
discriminator := modified_precedence_expression discriminator := modified_precedence_expression
modified_precedence_expression := ??? modified_precedence_expression := precedence_expr (operator)+ //TODO this is currently hard, rearchitect things
conditional := block else_clause conditional := block else_clause
simple_pattern_match := pattern 'then' conditional simple_pattern_match := pattern 'then' conditional
else_clause := ε | 'else' block else_clause := ε | 'else' block
guard_block := '{' (guard_arm, ',')* '}' guard_block := '{' (guard_arm, ',')* '}'
guard_arm := guard '->' block guard_arm := guard '->' block
guard := ?? guard := 'is' pattern | (operator)+ precedence_expr
/* Expression - While */ /* Expression - While */
while_expr := 'while' while_cond '{' (statement delimiter)* '}' while_expr := 'while' while_cond '{' (statement delimiter)* '}'
@ -714,7 +714,14 @@ impl Parser {
}); });
parse_method!(guard(&mut self) -> ParseResult<Guard> { parse_method!(guard(&mut self) -> ParseResult<Guard> {
unimplemented!() Ok(match self.peek() {
Keyword(Kw::Is) => {
self.next();
let pat = self.pattern()?;
Guard::Pat(pat)
},
_ => unimplemented!() //TODO fix
})
}); });
parse_method!(pattern(&mut self) -> ParseResult<Pattern> { parse_method!(pattern(&mut self) -> ParseResult<Pattern> {