new option j2py --rusthon outputs Rusthon syntax.

hartsantler · hartsantler · commit 04d02c1593ea · 2015-02-12T10:48:41.000-08:00
diff --git a/bin/j2py b/bin/j2py
@@ -17,8 +17,7 @@ from java2python.compiler import Module, buildAST, transformAST
 from java2python.config import Config
 from java2python.lib import escapes
 
-
-version = '0.5.1'
+version = '0.5.2'
 
 
 def logLevel(value):
@@ -87,7 +86,6 @@ def runTransform(options):
     """ Compile the indicated java source with the given options. """
     timed = defaultdict(time)
     timed['overall']
-
     filein = fileout = filedefault = '-'
     if options.inputfile and not isinstance(options.inputfile, file):
         filein = options.inputfile
@@ -116,11 +114,12 @@ def runTransform(options):
         return code
 
     timed['comp']
-    try:
-        tree = buildAST(source)
-    except (Exception, ), exc:
-        exception('exception while parsing')
-        return 1
+    tree = buildAST(source)
+    #try:
+    #    tree = buildAST(source)
+    #except (Exception, ), exc:
+    #    exception('exception while parsing')
+    #    return 1
     timed['comp_finish']
 
     config = Config(configs)
@@ -130,6 +129,7 @@ def runTransform(options):
 
     timed['visit']
     module = Module(config)
+    module.set_global_options(options)
     module.sourceFilename = path.abspath(filein) if filein != '-' else None
     module.name = path.splitext(path.basename(filein))[0] if filein != '-' else '<stdin>'
     module.walk(tree)
@@ -161,7 +161,7 @@ def runTransform(options):
         module.name = path.splitext(filein)[0] if filein != '-' else '<stdin>'
         print >> output, source
 
-    if not options.skipcompile:
+    if not options.skipcompile and not options.rusthon:
         try:
             compile(source, '<string>', 'exec')
         except (SyntaxError, ), ex:
@@ -243,6 +243,7 @@ def configScript(argv):
         help='Print lexer tokens to stderr.',
         default=False, action='store_true')
     add('-v', '--version', action='version', version='%(prog)s ' + version)
+    add('--rusthon', help='output rusthon code', action='store_true')
 
     ns = parser.parse_args(argv)
     if ns.inputfile == '-':
diff --git a/java2python/compiler/template.py b/java2python/compiler/template.py
@@ -20,6 +20,7 @@
 from java2python.lang import tokens
 from java2python.lib import FS, colors
 
+OPTIONS = None
 
 class Factory(object):
     """ Factory -> creates pre-configured callables for new block instances.
@@ -162,6 +163,8 @@ def altIdent(self, name):
                     return name
                 if name in method.variables:
                     return name
+                if OPTIONS and OPTIONS.rusthon:
+                    raise RuntimeError('ooookkk')
                 return ('cls' if method.isStatic else 'self') + '.' + name
         return name
 
@@ -480,7 +483,10 @@ def iterDecl(self):
         def formatParam(p):
             if 'default' in p:
                 return '{0}={1}'.format(p['name'], p['default'])
-            return p['name']
+            if OPTIONS and OPTIONS.rusthon:
+                return '%s:%s' %(p['name'],p['type'])
+            else:
+                return p['name']
         params = ', '.join(formatParam(param) for param in self.iterParams())
         yield 'def {0}({1}):'.format(self.name, params)
 
diff --git a/java2python/compiler/visitor.py b/java2python/compiler/visitor.py
@@ -20,6 +20,7 @@
 from java2python.lang import tokens
 from java2python.lib import FS
 
+OPTIONS = None
 
 class Memo(object):
     """ Memo -> AST walking luggage. """
@@ -33,6 +34,12 @@ class Base(object):
 
     commentSubs = map(recompile, ['^\s*/(\*)+', '(\*)+/\s*$', '^\s*//'])
 
+    def set_global_options(self, cfg):
+        global OPTIONS
+        OPTIONS = cfg
+        import java2python.compiler.template
+        java2python.compiler.template.OPTIONS = cfg
+
     def accept(self, node, memo):
         """ Accept a node, possibly creating a child visitor. """
         tokType = tokens.map.get(node.token.type)
@@ -139,7 +146,6 @@ def acceptInterface(self, node, memo):
 
 class Module(TypeAcceptor, Base):
     """ Module -> accepts AST branches for module-level objects. """
-
     def makeAcceptHandledDecl(part):
         """ Creates an accept function for a decl to be processed by a handler. """
         def acceptDecl(self, node, memo):
@@ -169,6 +175,7 @@ def acceptModifierList(self, node, memo):
 
     def nodesToAnnos(self, branch, memo):
         """ Convert the annotations in the given branch to a decorator. """
+        raise RuntimeError('nodesToAnnos')
         name = branch.firstChildOfType(tokens.IDENT).text
         init = branch.firstChildOfType(tokens.ANNOTATION_INIT_BLOCK)
         if not init:
@@ -196,7 +203,10 @@ def nodesToModifiers(self, branch, root):
         if root.parentType in tokens.methodTypes:
             self.modifiers.extend(n.text for n in root.children)
             if self.isStatic and self.parameters:
-                self.parameters[0]['name'] = 'cls'
+                name = 'cls'
+                #if OPTIONS and OPTIONS.rusthon:
+                #    name = 'cls:self'
+                self.parameters[0]['name'] = name
         self.modifiers.append(branch.text)
 
 
diff --git a/readme.md b/readme.md
@@ -1,6 +1,6 @@
 ## java2python
 
-Simple but effective tool to translate Java source code into Python.
+Simple but effective tool to translate Java source code into Python and Rusthon.
 
 
 The java2python package can translate any syntactically valid Java source code
@@ -30,12 +30,14 @@ class HelloWorld {
 }
 ```
 
-Next we run our program:
-
-
+Convert Java Program To Python
+-----------------------------
 ```bash
 $ j2py HelloWorld.java
 ```
+
+Python Output
+-------------
 ```python
 #!/usr/bin/env python
 """ generated source for module HelloWorld """
@@ -54,6 +56,12 @@ if __name__ == '__main__':
     HelloWorld.main(sys.argv)
 ```
 
+Convert to Rusthon
+--------------
+```bash
+$ j2py --rusthon HelloWorld.java
+```
+
 
 [downloads]: https://github.com/natural/java2python/downloads
 [installation]: https://github.com/natural/java2python/tree/master/doc/install.md
