lua backend: fixed augassignment a += 1

hartsantler · hartsantler · commit 0161dd5aba6c · 2014-05-14T18:26:08.000-07:00
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -554,13 +554,13 @@ def visit_AugAssign(self, node):
 
 		if self._with_lua:
 			if op == '+=':
-				a = '__add__(%s,%s)' %(target, self.visit(node.value))
+				a = '__add_op(%s,%s)' %(target, self.visit(node.value))
 			elif op == '-=':
-				a = '__sub__(%s,%s)' %(target, self.visit(node.value))
+				a = '(%s - %s)' %(target, self.visit(node.value))
 			elif op == '*=':
-				a = '__mul__(%s,%s)' %(target, self.visit(node.value))
+				a = '(%s * %s)' %(target, self.visit(node.value))
 			elif op == '/=' or op == '//=':
-				a = '__div__(%s,%s)' %(target, self.visit(node.value))
+				a = '(%s / %s)' %(target, self.visit(node.value))
 			elif op == '%=':
 				a = '__mod__(%s,%s)' %(target, self.visit(node.value))
 			elif op == '&=':
@@ -1268,6 +1268,15 @@ def visit_USub(self, node):
 
 
 	def visit_Attribute(self, node):
+		## TODO - in some cases the translator knows what type a node is and what attribute's it has, in those cases the call to `__get__` can be optimized away,
+		## this is disabled because if the user wants the best performance, they should instead use javascript-mode.
+		#typedef = None
+		#if isinstance(node.value, Name):
+		#	typedef = self.get_typedef( instance=node.value )
+		#elif hasattr(node.value, 'returns_type'):
+		#	typedef = self.get_typedef( class_name=node.value.returns_type )
+
+
 		node_value = self.visit(node.value)
 
 		if self._with_dart or self._with_ll:
@@ -1280,15 +1289,10 @@ def visit_Attribute(self, node):
 			#else:
 			#	return '__ternary_operator__(%s.%s is not undefined, %s.%s, __getattr__(%s, "%s"))' %(node_value, node.attr, node_value, node.attr, node_value, node.attr)
 
-		## TODO - in some cases the translator knows what type a node is and what attribute's it has, in those cases the call to `__get__` can be optimized away,
-		## this is disabled because if the user wants the best performance, they should instead use javascript-mode.
-		#typedef = None
-		#if isinstance(node.value, Name):
-		#	typedef = self.get_typedef( instance=node.value )
-		#elif hasattr(node.value, 'returns_type'):
-		#	typedef = self.get_typedef( class_name=node.value.returns_type )
+		elif self._with_lua and self._in_assign_target:  ## this is required because lua has no support for inplace assignment ops like "+="
+			return '%s.%s' %(node_value, node.attr)
 
-		if hasattr(node, 'lineno'):
+		elif hasattr(node, 'lineno'):
 			src = self._source[ node.lineno-1 ]
 			src = src.replace('"', '\\"')
 			err = 'missing attribute `%s` - line %s: %s'	%(node.attr, node.lineno, src.strip())
diff --git a/pythonjs/translator.py b/pythonjs/translator.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-import sys
+import sys, traceback
 
 from python_to_pythonjs import main as python_to_pythonjs
 from pythonjs import main as pythonjs_to_javascript
@@ -14,22 +14,27 @@ def main(script):
         import python_to_visjs
         return python_to_visjs.main( script )
     else:
+        code = ''
         if '--dart' in sys.argv:
             a = python_to_pythonjs(script, dart=True)
-            return pythonjs_to_dart( a )
+            code = pythonjs_to_dart( a )
         elif '--coffee' in sys.argv:
             a = python_to_pythonjs(script, coffee=True)
-            return pythonjs_to_coffee( a )
+            code = pythonjs_to_coffee( a )
         elif '--lua' in sys.argv:
             a = python_to_pythonjs(script, lua=True)
-            return pythonjs_to_lua( a )
+            try: code = pythonjs_to_lua( a )
+            except SyntaxError:
+                sys.stderr.write( '\n'.join([traceback.format_exc(),a]) )
+                
         elif '--luajs' in sys.argv:
             a = python_to_pythonjs(script, lua=True)
-            return pythonjs_to_luajs( a )
+            code = pythonjs_to_luajs( a )
         else:
             a = python_to_pythonjs(script)
-            return pythonjs_to_javascript( a )
+            code = pythonjs_to_javascript( a )
 
+        return code
 
 def command():
     scripts = []
diff --git a/regtests/bench/float.py b/regtests/bench/float.py
@@ -37,7 +37,8 @@ def maximize(points):
 def benchmark(n):
 	points = [None] * n
 	for i in range(n):
-		points[i] = Point(i)
+		a = Point(i)
+		points[i] = a #Point(i)
 	for p in points:
 		p.normalize()
 	return maximize(points)
@@ -54,6 +55,11 @@ def test(arg):
 	return times
 	
 def main():
+	if PYTHON=='PYTHONJS':  ## about 25% faster with normal and javascript backends
+		pythonjs.configure( direct_operator='+' )
+		pass
+
+
 	times = test( 3 )
 	avg = sum(times) / len(times)
 	print( avg )
diff --git a/regtests/run.py b/regtests/run.py
@@ -101,9 +101,8 @@ def run_command(command, returns_stdout_stderr=False):
 
     #########################
 
-    if stdout:
-        if show_details:
-            print(stdout)
+    if show_details and stdout:
+        print(stdout)
 
     unknown = []
     for line in stdout.splitlines():
