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

Starting on halfexprs / binops

Browse Source
This commit is contained in:
greg 2018-08-19 18:44:54 -07:00
parent f9181b5786
commit d1c3b4a81b
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,8 +244,7 @@ expr_or_block := '{' (statement delimiter)* '}' | expr
/* 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 := precedence_expr (operator)+
modified_precedence_expression := precedence_expr (operator)+ //TODO this is currently hard, rearchitect things
conditional := expr_or_block else_clause conditional := expr_or_block else_clause
simple_pattern_match := pattern 'then' conditional simple_pattern_match := pattern 'then' conditional
else_clause := ε | 'else' expr_or_block else_clause := ε | 'else' expr_or_block
@ -660,7 +659,14 @@ impl Parser {
}); });
parse_method!(discriminator(&mut self) -> ParseResult<Discriminator> { parse_method!(discriminator(&mut self) -> ParseResult<Discriminator> {
Ok(Discriminator::Simple(self.expression()?)) //TODO make proper let lhs = self.prefix_expr()?;
Ok(match self.peek() {
//TODO make this whole process nicer
Operator(_) | Period | Pipe | Slash => {
unimplemented!()
},
_ => Discriminator::Simple(lhs)
})
}); });
parse_method!(conditional(&mut self) -> ParseResult<IfExpressionBody> { parse_method!(conditional(&mut self) -> ParseResult<IfExpressionBody> {