aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/expressions.cpp
diff options
context:
space:
mode:
authorRobin Haberkorn <robin.haberkorn@googlemail.com>2014-11-14 03:21:42 +0100
committerRobin Haberkorn <robin.haberkorn@googlemail.com>2014-11-14 03:21:42 +0100
commit468cb19bce9caf11b027da791b1d6f0aa1b41602 (patch)
treef0d4e68911df3fd412fb2428fcdffed4f7e2dfbd /src/expressions.cpp
parent3006be5c5a6655e6f125f33628e6f182bcd61e5e (diff)
downloadsciteco-468cb19bce9caf11b027da791b1d6f0aa1b41602.tar.gz
added ^# (XOR) operator
also changed precedence of + operator (higher than minus). the effects of this should be minimal
Diffstat (limited to 'src/expressions.cpp')
-rw-r--r--src/expressions.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/expressions.cpp b/src/expressions.cpp
index a528f16..5a389fd 100644
--- a/src/expressions.cpp
+++ b/src/expressions.cpp
@@ -170,6 +170,9 @@ Expressions::calc(void)
case OP_AND:
result = vleft & vright;
break;
+ case OP_XOR:
+ result = vleft ^ vright;
+ break;
case OP_OR:
result = vleft | vright;
break;