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

Start using HalfExp

Browse Source
This commit is contained in:
greg 2018-08-22 16:41:31 -07:00
parent 2d961d6402
commit b85725125c
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -695,7 +695,6 @@ impl Parser {
parse_method!(guard_arm(&mut self) -> ParseResult<GuardArm> { parse_method!(guard_arm(&mut self) -> ParseResult<GuardArm> {
let guard = self.guard()?; let guard = self.guard()?;
expect!(self, Operator(ref c) if **c == "->"); expect!(self, Operator(ref c) if **c == "->");
println!("WE HIIII? {:?}", self.peek());
let body = self.expr_or_block()?; let body = self.expr_or_block()?;
Ok(GuardArm { guard, body }) Ok(GuardArm { guard, body })
}); });
@ -707,7 +706,15 @@ impl Parser {
let pat = self.pattern()?; let pat = self.pattern()?;
Guard::Pat(pat) Guard::Pat(pat)
}, },
e => return ParseError::new(&format!("{:?} not valid in pattern guard", e)), ref tok if BinOp::from_sigil_token(tok).is_some() => {
let op = BinOp::from_sigil_token(&self.next()).unwrap();
let Expression(expr, _) = self.expression()?;
Guard::HalfExpr(HalfExpr { op: Some(op), expr })
},
_ => {
let Expression(expr, _) = self.expression()?;
Guard::HalfExpr(HalfExpr { op: None, expr })
}
}) })
}); });