Skip to content

Added Logical operators to the list of supported operators. #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amerishk wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added Logical operators to the list of supported operators. #33

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6322f06
Added Logical operators to the list of supported operators.
Mar 22, 2017
4f30683
Added logical operator and expression
Mar 22, 2017
fd8f83b
Merge pull request #1 from amerishk/addlogicaloperator
amerishk Mar 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions lib/conditionHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ var ConditionHandler;
return this.evaluateExpression(parent, mexp.property);
case 'Literal':
return exp.value;
//added Logical Expression
case 'LogicalExpression':
var lexp = exp;
var value1 = this.evaluateExpression(object, lexp.left);
var value2 = this.evaluateExpression(object, lexp.right);
var b = this.calculateExpression(lexp.operator, value1, value2);
return b;
default:
throw new Error('condition type ' + exp.type + ' is not recognized');
}
Expand Down Expand Up @@ -66,6 +73,11 @@ var ConditionHandler;
return value1 / value2;
case '%':
return value1 % value2;
//added logical operators
case '&&':
return value1 && value2;
case '||':
return value1 || value2;
default:
break;
}
Expand Down