cast null

ExprPrimaryNodes.py

@@ -426,7 +426,7 @@ class CastNode(ASTNode):
 
         # only test if not primitive
         if self.right.myType.isArray ==  self.left.myType.isArray:
-            if (not self.left.myType.isPrimitive):
+            if (not self.right.myType.isPrimitive):
                 # cast would've exception if array is casting to non-array and not Object
                 offset = self.left.myType.typePointer.subTypeOffset
                 self.code += p("mov", "ebx", "[eax]", "start subtype test") # access class tag of left object
@@ -703,7 +703,7 @@ class ExprNode(ASTNode):
 
             # only test if non-primitive, both arrays or both non arrays
             if self.right.myType.isArray == self.left.myType.isArray:
-                if not self.right.myType.isPrimitive:
+                if not self.left.myType.isPrimitive:
                     offset = self.right.myType.typePointer.subTypeOffset
                     self.code += p("mov", "eax", "[eax]") # access class tag of left object
                     self.code += p("mov", "eax", "[eax + 4]") # access subtype testing column

TheTypeNode.py

@@ -41,7 +41,7 @@ class TypeStruct():
         self.isPrimitive = False
         self.typePointer = typePointer
         self.name = name
-        if name in ['boolean', 'byte', 'char', 'int', 'short', 'void']:
+        if name in ['boolean', 'byte', 'char', 'int', 'short', 'void', 'null']:
             self.isPrimitive = True
 
     def link(self, env):