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

Fix other pattern parsing bugs

This commit is contained in:
greg 2018-08-21 20:02:10 -07:00
parent fa7b6ce96b
commit 2d961d6402
1 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -736,10 +736,18 @@ impl Parser {
_ => Pattern::Literal(PatternLiteral::VarPattern(id)) _ => Pattern::Literal(PatternLiteral::VarPattern(id))
} }
}, },
//TODO I think these are buggy b/c they don't advance the parser Keyword(Kw::True) => {
Keyword(Kw::True) => Pattern::Literal(PatternLiteral::BoolPattern(true)), self.next();
Keyword(Kw::False) => Pattern::Literal(PatternLiteral::BoolPattern(false)), Pattern::Literal(PatternLiteral::BoolPattern(true))
StrLiteral(s) => Pattern::Literal(PatternLiteral::StringPattern(s)), },
Keyword(Kw::False) => {
self.next();
Pattern::Literal(PatternLiteral::BoolPattern(false))
},
StrLiteral(s) => {
self.next();
Pattern::Literal(PatternLiteral::StringPattern(s))
},
DigitGroup(_) | HexLiteral(_) | BinNumberSigil | Period => self.signed_number_literal()?, DigitGroup(_) | HexLiteral(_) | BinNumberSigil | Period => self.signed_number_literal()?,
Operator(ref op) if **op == "-" => self.signed_number_literal()?, Operator(ref op) if **op == "-" => self.signed_number_literal()?,
Underscore => { Underscore => {
@ -1451,6 +1459,10 @@ fn a(x) {
]) ])
} }
}
#[test]
fn pattern_literals() {
parse_test! { parse_test! {
"if x is -1 then 1 else 2", AST(vec![ "if x is -1 then 1 else 2", AST(vec![
exprstatement!( exprstatement!(
@ -1481,6 +1493,34 @@ fn a(x) {
]) ])
} }
parse_test! {
"if x is true then 1 else 2", AST(vec![
exprstatement!(
IfExpression {
discriminator: bx!(Discriminator::Simple(ex!(Value(rc!(x))))),
body: bx!(IfExpressionBody::SimplePatternMatch(
Pattern::Literal(PatternLiteral::BoolPattern(true)),
vec![exprstatement!(NatLiteral(1))],
Some(vec![exprstatement!(NatLiteral(2))]),
))
}
)
])
}
parse_test! {
"if x is \"gnosticism\" then 1 else 2", AST(vec![
exprstatement!(
IfExpression {
discriminator: bx!(Discriminator::Simple(ex!(Value(rc!(x))))),
body: bx!(IfExpressionBody::SimplePatternMatch(
Pattern::Literal(PatternLiteral::StringPattern(rc!(gnosticism))),
vec![exprstatement!(NatLiteral(1))],
Some(vec![exprstatement!(NatLiteral(2))]),
))
}
)
])
}
} }
} }