Merge pull request #57 from ftsrg/xor

Support XOR in the CFA DSL
ftsrg · Jul 16, 2020 · 766f08f · 766f08f
2 parents 39d76d0 + bbc4271
commit 766f08f
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,7 +10,7 @@ buildscript {
 
 allprojects {
     group = "hu.bme.mit.inf.theta"
-    version = "1.2.0"
+    version = "1.2.1"
 
     apply(from = rootDir.resolve("gradle/shared-with-buildSrc/mirrors.gradle.kts"))
 }

diff --git a/subprojects/cfa/README.md b/subprojects/cfa/README.md
@@ -45,7 +45,7 @@ Expressions of the CFA include the following.
 - Literals, e.g., `true`, `false` (Bool), `0`, `123` (integer), `4 % 5` (rational).
   - Array literals can be given by listing the key-value pairs and the (mandatory) default element, e.g., `[0 <- 182, 1 <- 41, default <- 75]`. If there are no elements, the key type has to be given before the default element, e.g., `[<int>default <- 75]`.
 - Comparison, e.g., `=`, `/=`, `<`, `>`, `<=`, `>=`.
-- Boolean operators, e.g., `and`, `or`, `not`, `imply`, `iff`.
+- Boolean operators, e.g., `and`, `or`, `xor`, `not`, `imply`, `iff`.
 - Arithmetic, e.g., `+`, `-`, `/`, `*`, `mod`, `rem`.
 - Conditional: `if . then . else .`
 - Array read (`a[i]`) and write (`a[i <- v]`).

diff --git a/subprojects/cfa/src/main/antlr/CfaDsl.g4 b/subprojects/cfa/src/main/antlr/CfaDsl.g4
@@ -160,7 +160,11 @@ existsExpr
 	;
 
 orExpr
-	:	ops+=andExpr (OR ops+=andExpr)*
+	:	ops+=xorExpr (OR ops+=xorExpr)*
+	;
+
+xorExpr
+	:	leftOp=andExpr (XOR rightOp=xorExpr)?
 	;
 
 andExpr
@@ -225,7 +229,7 @@ primaryExpr
 	|	falseExpr
 	|	intLitExpr
 	|	ratLitExpr
-	|   arrLitExpr
+	|	arrLitExpr
 	|	idExpr
 	|	parenExpr
 	;
@@ -291,6 +295,9 @@ OR	:	'or'
 AND	:	'and'
 	;
 
+XOR	:	'xor'
+	;
+
 NOT	:	'not'
 	;
 

diff --git a/subprojects/cfa/src/main/java/hu/bme/mit/theta/cfa/dsl/CfaExpression.java b/subprojects/cfa/src/main/java/hu/bme/mit/theta/cfa/dsl/CfaExpression.java
@@ -226,6 +226,17 @@ public Expr<?> visitOrExpr(final OrExprContext ctx) {
 			}
 		}
 
+		@Override
+		public Expr<?> visitXorExpr(final XorExprContext ctx) {
+			if (ctx.rightOp != null) {
+				final Expr<BoolType> leftOp = TypeUtils.cast(ctx.leftOp.accept(this), Bool());
+				final Expr<BoolType> rightOp = TypeUtils.cast(ctx.rightOp.accept(this), Bool());
+				return Xor(leftOp, rightOp);
+			} else {
+				return visitChildren(ctx);
+			}
+		}
+
 		@Override
 		public Expr<?> visitAndExpr(final AndExprContext ctx) {
 			if (ctx.ops.size() > 1) {