From 1a834774f61dd738481e087e3fa30000c2f644a0 Mon Sep 17 00:00:00 2001
From: Xun Yang <x299yang@uwaterloo.ca>
Date: Mon, 13 Apr 2020 13:23:20 -0400
Subject: [PATCH] resolve merge
---
NameNode.py | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/NameNode.py b/NameNode.py
index fcfe485..cb727d3 100644
--- a/NameNode.py
+++ b/NameNode.py
@@ -242,11 +242,7 @@ class NameNode(ASTNode):
self.methodClass = meth.env.getNode(meth.typeName, 'type')
self.methodName = self.IDs[0]
-
- if self.name == 'length':
- cNameNode = genNameNode(self.typeName)
- cNameNode.isThis = True
- self.prefixNodes.append(cNameNode)
+
else:
if curType.myType and curType.myType.isArray and self.IDs[0] == 'length':
self.myType = TypeStruct("int", None)
--
GitLab