merge master

CompNode.py

@@ -26,9 +26,9 @@ class CompNode(ASTNode):
                 typeNode = getParseTreeNodes('classDcl', node)
                 if not typeNode:
                     typeNode = getParseTreeNodes('interfaceDcl', node)
-                    self.typeDcl = InterNode(typeNode[0])
+                    self.typeDcl = InterNode(typeNode[0], self.packageName)
                 else:
-                    self.typeDcl = ClassNode(typeNode[0])
+                    self.typeDcl = ClassNode(typeNode[0], self.packageName)
 
         # always populate the children list
         self.children.append(self.typeDcl)

Test.py

@@ -38,29 +38,42 @@ def a2Multiple():
         # All files in the test directory
         testDirectory = "./Tests/A2/"
         testCases = [f.path for f in scandir(testDirectory) if f.is_dir()]
+        testCases += [f.path for f in scandir(testDirectory) if not f.is_dir()]
+
+    total = 0
+    correct = 0
 
     for c in testCases:
-        # print("**********************************************************")
-        # print("DIRECTORY")
-        # print(c)
-        # print("**********************************************************")
         # get all files from stdlib folder
         testFiles = [join(dp, f) for dp, dn, filenames in walk('stdlib/2.0/java/') for f in filenames]
-        # get all files in the folder recursively
-        testFiles += [join(dp, f) for dp, dn, filenames in walk(c) for f in filenames]
+        
+        if '.java' in c:
+            # add this one file
+            testFiles.append(c)
+        else:
+            # get all files in the folder recursively
+            testFiles += [join(dp, f) for dp, dn, filenames in walk(c) for f in filenames]
+
         ret = run(testFiles)
+        total += 1
+
         if ret == "":
             # print(c)
             if 'Je_' in c:
                 print(c)
                 print("JE Passed without error")
                 print("**********************************************************")
+            else:
+                correct += 1
         else:
             if not 'Je_' in c:
                 print(c)
                 print(ret)
                 print("**********************************************************")
-        # print("\n \n\n ")
+            else:
+                correct += 1
+
+    print("\nSCORE: {} / {} -> {}%".format(correct, total, (correct/total)*100))
 
 
 

TypeNodes.py

@@ -31,15 +31,15 @@ class ClassInterNode(ASTNode):
 
     def getContains(self, hierarchy):
         # check if not acyclic
-        if self.name in hierarchy:
-            raise Exception("ERROR: The hierarchy is not acyclic '{}', saw '{}'".format(hierarchy, self.name))
-        hierarchy.append(self.name)
+        canonName = self.packageName + '.' + self.name
+        if canonName in hierarchy:
+            raise Exception("ERROR: The hierarchy is not acyclic '{}', saw '{}'".format(hierarchy, canonName))
 
         # get contains
         contains = self.methods
 
         for inter in self.superInter:
-            superContains = inter.getContains(hierarchy)
+            superContains = inter.getContains(hierarchy + [canonName])
             for con in superContains:
                 conOverwritten = False
                 for method in self.methods:
@@ -63,8 +63,9 @@ class ClassInterNode(ASTNode):
 # class
 class ClassNode(ClassInterNode):
     # always list all fields in the init method to show the class structure
-    def __init__(self, parseTree):
+    def __init__(self, parseTree, packageName):
         self.parseTree = parseTree
+        self.packageName = packageName
         self.name = ''
         self.fields = []
         self.methods = []
@@ -166,11 +167,12 @@ class ClassNode(ClassInterNode):
     def getContains(self, hierarchy):
         # centralized logic
         contains = super().getContains(hierarchy)
+        canonName = self.packageName + '.' + self.name
 
         # get contains from extends class
         if self.superClass:
             addToContains = []
-            superContains = self.superClass.getContains(hierarchy)
+            superContains = self.superClass.getContains(hierarchy + [canonName])
             for con in superContains:
                 conOverwritten = False
                 for method in contains:
@@ -203,8 +205,9 @@ class ClassNode(ClassInterNode):
 # interface
 class InterNode(ClassInterNode):
     # always list all fields in the init method to show the class structure
-    def __init__(self, parseTree):
+    def __init__(self, parseTree, packageName):
         self.parseTree = parseTree
+        self.packageName = packageName
         self.name = ''
         self.methods = []
         self.superInter = [] # list of strings of extendInterface's name, then stores a pointer to the node after type linking