kjuulh/rhai
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Short-curcuit boolean operators.

Browse Source
This commit is contained in:
Stephen Chung
2020-03-02 12:08:03 +08:00
parent bedfe55005
commit 22a505b57b
6 changed files with 187 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/parser.rs
View File

@@ -179,6 +179,8 @@ pub enum Expr {
Dot(Box<Expr>, Box<Expr>),
Index(String, Box<Expr>),
Array(Vec<Expr>),
And(Box<Expr>, Box<Expr>),
Or(Box<Expr>, Box<Expr>),
True,
False,
Unit,
@@ -618,7 +620,7 @@ impl<'a> TokenIterator<'a> {
let out: String = result.iter().cloned().collect();
return Some((
match out.as_ref() {
match out.as_str() {
"true" => Token::True,
"false" => Token::False,
"let" => Token::Let,
@@ -1189,8 +1191,8 @@ fn parse_binop<'a>(
Token::LessThanEqualsTo => Expr::FunctionCall("<=".into(), vec![lhs_curr, rhs]),
Token::GreaterThan => Expr::FunctionCall(">".into(), vec![lhs_curr, rhs]),
Token::GreaterThanEqualsTo => Expr::FunctionCall(">=".into(), vec![lhs_curr, rhs]),
Token::Or => Expr::FunctionCall("||".into(), vec![lhs_curr, rhs]),
Token::And => Expr::FunctionCall("&&".into(), vec![lhs_curr, rhs]),
Token::Or => Expr::Or(Box::new(lhs_curr), Box::new(rhs)),
Token::And => Expr::And(Box::new(lhs_curr), Box::new(rhs)),
Token::XOr => Expr::FunctionCall("^".into(), vec![lhs_curr, rhs]),
Token::OrAssign => {
let lhs_copy = lhs_curr.clone();