glsl backend: fixed local variable typedefs, fixed function calls.

hartsantler · hartsantler · commit 15586011ea56 · 2014-06-14T13:09:08.000-07:00
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -1996,7 +1996,7 @@ def visit_Call(self, node):
 				else:
 					raise SyntaxError( self.format_error(node) )
 
-		elif self._with_ll or name == 'inline':
+		elif self._with_ll or name == 'inline' or self._with_glsl:
 			args = [self.visit(arg) for arg in node.args]
 			if node.keywords:
 				args.extend( [self.visit(x.value) for x in node.keywords] )
diff --git a/pythonjs/pythonjs.py b/pythonjs/pythonjs.py
@@ -174,6 +174,14 @@ def visit_FunctionDef(self, node):
 		self._function_stack.pop()
 		return buffer
 
+	def _visit_call_helper_var_glsl(self, node):
+		lines = []
+		for key in node.keywords:
+			lines.append( '%s %s' %(key.value.id, key.arg))
+
+		return ';'.join(lines)
+
+
 	def _visit_function(self, node):
 		glsl = False
 		args_typedefs = {}
@@ -356,7 +364,10 @@ def visit_Call(self, node):
 			return self._visit_call_helper_JSObject( node )
 
 		elif name == 'var':
-			return self._visit_call_helper_var( node )
+			if self._glsl:
+				return self._visit_call_helper_var_glsl( node )
+			else:
+				return self._visit_call_helper_var( node )
 
 		elif name == 'JSArray':
 			return self._visit_call_helper_JSArray( node )
