From 1cf5e1f987480bcab3cee241df0224632dea2272 Mon Sep 17 00:00:00 2001
From: Xun Yang <x299yang@uwaterloo.ca>
Date: Fri, 6 Mar 2020 23:53:55 -0500
Subject: [PATCH] string minus
---
ExprPrimaryNodes.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ExprPrimaryNodes.py b/ExprPrimaryNodes.py
index 687be3d..c00680a 100644
--- a/ExprPrimaryNodes.py
+++ b/ExprPrimaryNodes.py
@@ -393,8 +393,8 @@ class ExprNode(ASTNode):
return
# String concat:
- if (self.left.myType.name =='java.lang.String' and self.right.myType.name not in ['void']) \
- or (self.right.myType.name =='java.lang.String' and self.left.myType.name not in ['void']):
+ if ((self.left.myType.name =='java.lang.String' and self.right.myType.name not in ['void']) \
+ or (self.right.myType.name =='java.lang.String' and self.left.myType.name not in ['void'])) and self.op == '+':
self.myType = TypeStruct('java.lang.String', self.env.getNode('java.lang.String', 'type'))
self.myType.link(self.env)
return
--
GitLab