gpu class: fixed method subroutines.

hartsantler · hartsantler · commit 90d29378f1b2 · 2014-06-24T05:24:22.000-07:00
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -830,14 +830,16 @@ def _visit_js_classdef(self, node):
 			else:
 				class_decorators.append( decorator )
 
+		method_names = []  ## write back in order (required by GLSL)
 		methods = {}
 		class_vars = []
 
 		for item in node.body:
 			if isinstance(item, FunctionDef):
+				method_names.append(item.name)
 				methods[ item.name ] = item
 				if self.is_gpu_method( item ):
-					item.args.args[0].id = name  ## change self to the class name
+					item.args.args[0].id = name  ## change self to the class name, pythonjs.py changes it to 'ClassName self'
 				else:
 					item.args.args = item.args.args[1:]  ## remove self
 					finfo = inspect_function( item )
@@ -901,9 +903,9 @@ def _visit_js_classdef(self, node):
 		writer.write('%s.__uid__ = "￼" + _PythonJS_UID' %name)
 		writer.write('_PythonJS_UID += 1')
 
-		keys = methods.keys()
-		keys.sort()
-		for mname in keys:
+		#keys = methods.keys()
+		#keys.sort()
+		for mname in method_names:
 			method = methods[mname]
 			gpu_method = False
 			for dec in method.decorator_list:
@@ -913,8 +915,10 @@ def _visit_js_classdef(self, node):
 
 			if gpu_method:
 				method.name = '%s_%s' %(name, method.name)
+				self._in_gpu_method = name  ## name of class
 				line = self.visit(method)
 				if line: writer.write( line )
+				self._in_gpu_method = None
 
 			else:
 
@@ -2072,13 +2076,18 @@ def visit_Call(self, node):
 					raise SyntaxError( self.format_error(node) )
 
 		elif self._with_ll or name == 'inline' or self._with_glsl:
+			F = self.visit(node.func)
 			args = [self.visit(arg) for arg in node.args]
+			if hasattr(self, '_in_gpu_method') and self._in_gpu_method and isinstance(node.func, ast.Attribute):
+				F = '%s_%s' %(self._in_gpu_method, node.func.attr)
+				args.insert(0, 'self')
+
 			if node.keywords:
 				args.extend( [self.visit(x.value) for x in node.keywords] )
-				return '%s(%s)' %( self.visit(node.func), ','.join(args) )
+				return '%s(%s)' %( F, ','.join(args) )
 
 			else:
-				return '%s(%s)' %( self.visit(node.func), ','.join(args) )
+				return '%s(%s)' %( F, ','.join(args) )
 
 		elif self._with_js or self._with_dart:
 			args = list( map(self.visit, node.args) )
diff --git a/regtests/webclgl/gpu_class.py b/regtests/webclgl/gpu_class.py
@@ -5,16 +5,18 @@ class MyObject:
 	## below `self` is not `this` in javascript
 	## `self` is a GLSL struct of MyObject
 	@gpu.method
-	float def mymethod(self, x,y):
+	float def subroutine(self, x,y):
 		float x
 		float y
-		return self.subroutine(x,y) * self.attr1
+		return x + y * self.attr2
+	## subroutines must be defined ahead of where they are used
 
 	@gpu.method
-	float def subroutine(self, x,y):
+	float def mymethod(self, x,y):
 		float x
 		float y
-		return x + y
+		return self.subroutine(x,y) * self.attr1
+
 
 	## here `self` is javascript's `this`
 	def __init__(self, a, b):
@@ -25,11 +27,8 @@ def __init__(self, a, b):
 
 
 class myclass:
-	def new_struct(self, a, b):
-		return MyObject( a, b )
-
 	def run(self, w):
-		self.array = [ self.new_struct( x, 1.1 ) for x in range(w) ]
+		self.array = [ MyObject( x, 1.1 ) for x in range(w) ]
 
 		@returns( array=64 )
 		@gpu.main
