callback as attribute in class.

PythonJS · JesterI3D · Sep 12, 2014 · Sep 14, 2014 · Sep 14, 2014 · Sep 14, 2014
commit 932aa1895c651ed6d27e5bb095ce34bb35d3265d
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -1976,14 +1976,17 @@ def visit_Assign(self, node):
 				raise SyntaxError( self.format_error(targets) )
 				raise SyntaxError( self.format_error(xxx) )
 
-		elif self._with_go and isinstance(target, ast.Subscript) and isinstance(target.value, ast.Name) and target.value.id in ('__go__array__', '__go__class__', '__go__pointer__'):
+		elif self._with_go and isinstance(target, ast.Subscript) and isinstance(target.value, ast.Name) and target.value.id in ('__go__array__', '__go__class__', '__go__pointer__', '__go__func__'):
 			if len(targets)==2 and isinstance(targets[1], ast.Attribute) and isinstance(targets[1].value, ast.Name) and targets[1].value.id == 'self' and len(self._class_stack):
 				if target.value.id == '__go__array__':
 					self._class_stack[-1]._struct_vars[ targets[1].attr ] = '__go__array__(%s<<typedef)' %self.visit(target.slice)
 				elif target.value.id == '__go__class__':
 					self._class_stack[-1]._struct_vars[ targets[1].attr ] = self.visit(target.slice)
 				elif target.value.id == '__go__pointer__':
 					self._class_stack[-1]._struct_vars[ targets[1].attr ] = '"*%s"' %self.visit(target.slice)
+				elif target.value.id == '__go__func__':
+					self._class_stack[-1]._struct_vars[ targets[1].attr ] = self.visit(target.slice)
+
 
 			elif target.value.id == '__go__class__':
 				#self._class_stack[-1]._struct_vars[ targets[1].attr ] = self.visit(target.slice)

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
@@ -487,8 +487,10 @@ def visit_BinOp(self, node):
 		elif op == '<<':
 			if left in ('__go__receive__', '__go__send__'):
 				return '<- %s' %right
-			elif isinstance(node.left, ast.Call) and isinstance(node.left.func, ast.Name) and node.left.func.id in ('__go__array__', '__go__arrayfixed__', '__go__map__'):
-				if node.left.func.id == '__go__map__':
+			elif isinstance(node.left, ast.Call) and isinstance(node.left.func, ast.Name) and node.left.func.id in ('__go__array__', '__go__arrayfixed__', '__go__map__', '__go__func__'):
+				if node.left.func.id == '__go__func__':
+					raise SyntaxError('TODO - go.func')
+				elif node.left.func.id == '__go__map__':
 					key_type = self.visit(node.left.args[0])
 					value_type = self.visit(node.left.args[1])
 					if value_type == 'interface': value_type = 'interface{}'

diff --git a/pythonjs/typedpython.py b/pythonjs/typedpython.py
@@ -29,7 +29,8 @@
 	'go.channel' : '__go_make_chan__',
 	'go.array'   : '__go__array__',
 	'go.make'    : '__go_make__',
-	'go.addr'    : '__go__addr__'
+	'go.addr'    : '__go__addr__',
+	'go.func'    : '__go__func__',
 }
 
 OPERATORS = {
@@ -144,7 +145,8 @@ def transform_source( source, strip=False ):
 				b = b.strip()
 				is_class_type = b.startswith('class:') and len(b.split(':'))==2
 				is_pointer = b.startswith('*')
-				if (b in types or is_class_type or is_pointer) and nextchar != '=':
+				is_func = b.startswith('func(')
+				if (b in types or is_class_type or is_pointer or is_func) and nextchar != '=':
 					if strip:
 						a = a[ : -len(b) ]
 					elif is_class_type:
@@ -156,13 +158,18 @@ def transform_source( source, strip=False ):
 						cls = b.split('*')[-1]
 						a = a[ : -len('*')-len(cls)]
 						a.append('__go__pointer__[%s]=\t\t\t\t' %cls)
-
+					elif is_func:
+						u = ''.join(a)
+						u = u.replace('func(', '__go__func__["func(')
+						u += '"]=\t\t\t\t'
+						a = [w for w in u]
 					else:
 						if a[-1]=='*':
 							a.pop()
 							a.append('POINTER')
 						a.append('=\t\t\t\t')
 						#a.append( char )
+
 				else:
 					a.append( char )
 			else:
@@ -370,6 +377,8 @@ def transform_source( source, strip=False ):
 						typedef = '"*%s"' %typedef.strip()
 					elif typedef.startswith('map['):
 						typedef = '"*%s"' %typedef.strip()
+					elif typedef.startswith('func('):
+						typedef = '"%s"' %typedef.strip()
 
 					if chan:
 						output.append('%s@typedef_chan(%s=%s)' %(indent, arg_name, typedef))

diff --git a/regtests/go/callback_in_class.py b/regtests/go/callback_in_class.py
@@ -0,0 +1,29 @@
+'''
+callback in class
+'''
+class A:
+	def __init__(self, cb:func(int)(int), x:int, y:int, z:int=1):
+		int self.x = x
+		int self.y = y
+		int self.z = z
+		func(int)(int) self.callback = cb
+
+	def call(self, a:int ) -> int:
+		return self.callback( a + self.x + self.y + self.z )
+
+def mycb( x:int ) ->int:
+	return x + 1000
+
+def main():
+	a = A(
+		mycb, 
+		100, 
+		200, 
+		z=300
+	)
+	#print( a.x )
+	#print( a.y )
+	#print( a.z )
+
+	TestError( a.call(-600)==1000 )
+