From 014fbe36f3eef9f308c6f0f14fff881e0fe865c7 Mon Sep 17 00:00:00 2001
From: Xun Yang <x299yang@uwaterloo.ca>
Date: Wed, 4 Mar 2020 00:36:21 -0500
Subject: [PATCH] boolean ops
---
ExprPrimaryNodes.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/ExprPrimaryNodes.py b/ExprPrimaryNodes.py
index b13252a..0dad3ee 100644
--- a/ExprPrimaryNodes.py
+++ b/ExprPrimaryNodes.py
@@ -236,7 +236,11 @@ class ExprNode(ASTNode):
elif self.op in ['+', '-', '*', '/']:
self.myType = TypeStruct("int")
return
- #
+ # Boolean operations:
+ elif self.left.myType.name == 'boolean' and self.right.myType.name == 'boolean':
+ if self.op in ['&&', '&', '|', '||']:
+ self.myType = TypeStruct("boolean")
+ return
# Other Comparisons:
elif self.left.myType.assignable(self.right.myType) or self.right.myType.assignable(self.left.myType):
if self.op == '==' or self.op == '!=':
--
GitLab