Added support for 'methodPreambleSorter' configuration item.

Troy Melhase · Troy Melhase · commit 315329761a25 · 2007-02-16T00:31:01.000Z
Added extra parens around == expressions in grammar file; removed
trailing space from ternary expression.
diff --git a/java2python/lib/defaultconfig.py b/java2python/lib/defaultconfig.py
@@ -93,6 +93,7 @@
     'double':'float',
     'Vector':'list',
     'boolean':'bool',
+    'char':'str',
 }
 
 ## mapping of java type values to python type values.  user-defined
@@ -159,3 +160,12 @@
     'NoSuchFieldError':'AttributeError',
     'NoSuchMethodException':'AttributeError',
     }
+
+
+## define this name in your configuration modules to sort decorators
+## before they're output.  example follows.
+methodPreambleSorter = None
+
+## use a block like this to sort decorators by name.
+## def methodPreambleSorter(a, b):
+##     return cmp(a, b)
diff --git a/java2python/lib/sourcetypes.py b/java2python/lib/sourcetypes.py
@@ -660,6 +660,7 @@ def addParameter(self, typ, name):
         @return None
         """
         name = self.alternateName(name)
+        typ = Source.alternateName(self, typ, 'typeTypeMap')
         self.parameters.append((typ, name))
 
     def formatDecl(self, indent):
@@ -704,6 +705,10 @@ def writeTo(self, output, indent):
         output.write('\n')
         if self.config.last('writeModifiersComments'):
             output.write('%s## modifiers: %s\n' % (offset, str.join(',', self.modifiers)))
+
+        sorter = self.config.last('methodPreambleSorter')
+        if sorter:
+            self.preamble.sort(sorter)
         for obj in self.preamble:
             output.write('%s%s\n' % (offset, obj))
         output.write('%s\n' % (self.formatDecl(indent), ))
diff --git a/java2python/lib/walker.g b/java2python/lib/walker.g
@@ -526,7 +526,7 @@ returns [exp]
 expr [block]
 returns [exp = block.unknownExpression]
     :   #(QUESTION a0=expr[block] b0=expr[block] c0=expr[block])
-        {exp = ("%s %s ", (("%s", b0), ("%s %s", (("if %s", a0), ("else %s", c0)))))}
+        {exp = ("%s %s", (("%s", b0), ("%s %s", (("if %s", a0), ("else %s", c0)))))}
 
     |   #(ASSIGN left=expr[block] right=expr[block])
         {exp = ("%s = %s", (left, right))}
@@ -588,7 +588,7 @@ returns [exp = block.unknownExpression]
         if right in ("None", (("%s", "None"))):
             exp = ("%s is %s", (left, right))
         else:
-            exp = ("%s == %s", (left, right))
+            exp = ("(%s == %s)", (left, right))
         }
 
     |   #(LT left=expr[block] right=expr[block])
