Adds type and modifier attributes to expr block objects.

Troy Melhase · Troy Melhase · commit 4ea8366390ea · 2012-02-07T21:19:42.000-05:00
diff --git a/java2python/compiler/template.py b/java2python/compiler/template.py
@@ -309,6 +309,10 @@ def __repr__(self):
         if isinstance(self.right, (basestring, )) and self.right:
             parts.append(colors.white('right:') + colors.yellow(self.right))
             showfs = False
+        if self.modifiers:
+            parts.append(colors.white('modifiers:') + colors.cyan(','.join(self.modifiers)))
+        if self.type:
+            parts.append(colors.white('type:') + colors.cyan(self.type))
         if showfs:
             parts.append(colors.white('format:') + colors.yellow(self.fs))
         if self.tail:
diff --git a/java2python/compiler/visitor.py b/java2python/compiler/visitor.py
@@ -118,7 +118,10 @@ def makeAcceptType(ft):
         """ Creates an accept function for the given factory type. """
         def acceptType(self, node, memo):
             """ Creates and returns a new template for a type. """
-            name = node.firstChildOfType(tokens.IDENT).text
+            try:
+                name = node.firstChildOfType(tokens.IDENT).text
+            except (AttributeError, ):
+                return
             self.variables.append(name)
             return getattr(self.factory, ft)(name=name, parent=self)
         return acceptType
@@ -201,9 +204,15 @@ def acceptVarDeclaration(self, node, memo):
         for varDecl in varDecls.childrenOfType(tokens.VAR_DECLARATOR):
             ident = varDecl.firstChildOfType(tokens.IDENT)
             self.variables.append(ident.text)
+
             identExp = self.factory.expr(left=ident.text, parent=self)
+            identExp.type = self.nodeTypeToString(node)
+            if node.firstChildOfType(tokens.MODIFIER_LIST):
+                identExp.modifiers = [child.text for child in node.firstChildOfType(tokens.MODIFIER_LIST).children]
+
             declExp = varDecl.firstChildOfType(tokens.EXPR)
             assgnExp = identExp.pushRight(' = ')
+
             declArr = varDecl.firstChildOfType(tokens.ARRAY_INITIALIZER)
             if declExp:
                 assgnExp.walk(declExp, memo)
@@ -219,8 +228,7 @@ def acceptVarDeclaration(self, node, memo):
                 if node.firstChildOfType(tokens.TYPE).firstChildOfType(tokens.ARRAY_DECLARATOR_LIST):
                     val = assgnExp.pushRight('[]')
                 else:
-                    typ = self.nodeTypeToString(node)
-                    val = assgnExp.pushRight('{0}()'.format(typ))
+                    val = assgnExp.pushRight('{0}()'.format(identExp.type))
         return self
 
 
