Merge pull request #761 from herd/asl-xor

Added new XOR token to reflect change in LRM
herd · Jan 22, 2024 · 5586dfe · 5586dfe
2 parents c366840 + 0496017
commit 5586dfe
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/asllib/Lexer.mll b/asllib/Lexer.mll
@@ -51,7 +51,7 @@ let tr_name s = match s with
 | "elsif"         -> ELSIF
 | "end"           -> END
 | "enumeration"   -> ENUMERATION
-| "EOR"           -> EOR
+| "EOR" | "XOR"   -> EOR
 | "exception"     -> EXCEPTION
 | "FALSE"         -> BOOL_LIT false
 | "for"           -> FOR

diff --git a/asllib/tests/ASLTypingReference.t/TypingRule.CheckBinOp.asl b/asllib/tests/ASLTypingReference.t/TypingRule.CheckBinOp.asl
@@ -0,0 +1,7 @@
+func main() => integer
+begin
+  var a: bits(10);
+  var b: bits(10);
+  var c: bits(10) = a XOR b; // Check that XOR operator is recognized by the lexer.
+  return 0;
+end
diff --git a/asllib/tests/ASLTypingReference.t/run.t b/asllib/tests/ASLTypingReference.t/run.t
@@ -17,3 +17,4 @@ ASL Typing Reference:
     0 arguments expected and 1 provided
   [1]
 //  $ aslref TypingRule.EConcatUnresolvableToInteger.asl
+  $ aslref TypingRule.CheckBinOp.asl