continue translation even if CommonNodeError is hit.

hartsantler · hartsantler · commit adb46efac3d3 · 2015-02-18T18:42:35.000-08:00
diff --git a/java2python/compiler/template.py b/java2python/compiler/template.py
@@ -164,7 +164,7 @@ def altIdent(self, name):
                 if name in method.variables:
                     return name
                 if OPTIONS and OPTIONS.rusthon:
-                    raise RuntimeError('ooookkk')
+                    pass
                 return ('cls' if method.isStatic else 'self') + '.' + name
         return name
 
diff --git a/java2python/compiler/visitor.py b/java2python/compiler/visitor.py
@@ -42,6 +42,7 @@ def set_global_options(self, cfg):
 
     def accept(self, node, memo):
         """ Accept a node, possibly creating a child visitor. """
+        if node.token is None: return None  ## bug?
         tokType = tokens.map.get(node.token.type)
         missing = lambda node, memo:self
         call = getattr(self, 'accept{0}'.format(tokens.title(tokType)), missing)
@@ -51,6 +52,9 @@ def accept(self, node, memo):
 
     def insertComments(self, tmpl, tree, index, memo):
         """ Add comments to the template from tokens in the tree. """
+        if not hasattr(tree, 'parser'):
+            ## see: lang/selector.py class Type, method __call__
+            return
         prefix = self.config.last('commentPrefix', '# ')
         cache, parser, comTypes = memo.comments, tree.parser, tokens.commentTypes
         comNew = lambda t:t.type in comTypes and (t.index not in cache)
@@ -93,12 +97,13 @@ def walk(self, tree, memo=None):
                 visitor.walk(child, memo)
                 comIns(visitor, child, child.tokenStopIndex, memo)
         comIns(self, tree, tree.tokenStopIndex, memo)
-        if tree.isJavaSource:
-            comIns(self, tree, len(tree.parser.input.tokens), memo)
-        # fixme: we're calling the mutators far too frequently instead
-        # of only once per object after its walk is finished.
-        for handler in self.configHandlers('PostWalk', suffix='Mutators'):
-            handler(self)
+        if hasattr(tree, 'isJavaSource'): ## else CommonNodeError
+            if tree.isJavaSource:
+                comIns(self, tree, len(tree.parser.input.tokens), memo)
+            # fixme: we're calling the mutators far too frequently instead
+            # of only once per object after its walk is finished.
+            for handler in self.configHandlers('PostWalk', suffix='Mutators'):
+                handler(self)
 
     def zipWalk(self, nodes, visitors, memo):
         """ Walk the given nodes zipped with the given visitors. """
diff --git a/java2python/lang/selector.py b/java2python/lang/selector.py
@@ -160,7 +160,9 @@ def __init__(self, key, value=None):
         self.value = value
 
     def __call__(self, tree):
-        if tree.token.type == self.key:
+        if tree.token is None:  ## bug?
+            pass
+        elif tree.token.type == self.key:
             if self.value is None or self.value == tree.token.text:
                 yield tree
 
