Added top-level Makefile.

epowers · epowers · commit d10f8c82d346 · 2012-02-01T01:43:08.000-08:00
Temp fix for crashes in compiler.
diff --git a/Makefile b/Makefile
@@ -0,0 +1,17 @@
+.PHONY: all install clean
+.SILENT: clean
+
+all:
+	$(MAKE) -C java2python/lang
+	python setup.py build
+
+install: all
+	python setup.py install
+
+clean:
+	$(MAKE) -C java2python/lang clean
+	rm -f *.pyo
+	rm -f *.pyc
+	rm -f *Parser.py
+	rm -f *Lexer.py
+	rm -f *.tokens
diff --git a/java2python/compiler/visitor.py b/java2python/compiler/visitor.py
@@ -117,9 +117,12 @@ 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
-            self.variables.append(name)
-            return getattr(self.factory, ft)(name=name, parent=self)
+            try:
+                name = node.firstChildOfType(tokens.IDENT).text
+                self.variables.append(name)
+                return getattr(self.factory, ft)(name=name, parent=self)
+            except:
+                return None
         return acceptType
 
     acceptAt = makeAcceptType('at')
diff --git a/java2python/lang/.gitignore b/java2python/lang/.gitignore
@@ -0,0 +1,3 @@
+JavaLexer.py
+JavaParser.py
+Java.tokens
diff --git a/setup.py b/setup.py
@@ -12,5 +12,6 @@
         'java2python.lang',
         'java2python.compiler',
         ],
+      package_data={'java2python.lang': ['Java.tokens']},
       scripts=['bin/j2py'],
       )

Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,6 @@`
`12`	`12`	`'java2python.lang',`
`13`	`13`	`'java2python.compiler',`
`14`	`14`	`],`
	`15`	`+ package_data={'java2python.lang': ['Java.tokens']},`
`15`	`16`	`scripts=['bin/j2py'],`
`16`	`17`	`)`