Go backend: fixed subclasses without __init__.

hartsantler · hartsantler · commit 1bc0b9dea97e · 2014-09-07T11:34:15.000-07:00
diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
@@ -24,6 +24,7 @@ def __init__(self, requirejs=False, insert_runtime=False):
 	def visit_ClassDef(self, node):
 		self._class_stack.append( node )
 		node._parents = set()
+		node._struct_def = dict()
 		out = []
 		sdef = dict()
 		props = set()
@@ -61,7 +62,13 @@ def visit_ClassDef(self, node):
 					props.add( kw.arg )
 					sdef[ kw.arg ] = kw.value.id
 
+		node._struct_def.update( sdef )
 		out.append( 'type %s struct {' %node.name)
+		if base_classes:
+			for bnode in base_classes:
+				## Go only needs the name of the parent struct and all its items are inserted automatically ##
+				out.append('%s' %bnode.name)
+
 		for name in sdef:
 			out.append('%s %s' %(name, sdef[name]))
 		out.append('}')
@@ -76,7 +83,25 @@ def visit_ClassDef(self, node):
 			if b.name == '__init__':
 				init = b
 
-		if init:
+
+		parent_init = None
+		if base_classes:
+			for bnode in base_classes:
+				for b in bnode.body:
+					if isinstance(b, ast.FunctionDef):
+						if b.name in method_names:
+							continue
+						if b.name == '__init__':
+							parent_init = {'class':bnode, 'init':b}
+							#continue
+						out.append( self.visit(b) )
+
+		if init or parent_init:
+			if parent_init:
+				classname = parent_init['class'].name
+				init = parent_init['init']
+			else:
+				classname = node.name
 
 			out.append( 'func __new__%s( %s ) *%s {' %(node.name, init._args_signature, node.name))
 			out.append( '  ob := %s{}' %node.name )
@@ -88,21 +113,6 @@ def visit_ClassDef(self, node):
 			out.append( 'func __new__%s() *%s { return &%s{} }' %(node.name, node.name, node.name))
 
 
-		if base_classes:
-			for bnode in base_classes:
-				for b in bnode.body:
-					if isinstance(b, ast.FunctionDef):
-						if b.name == '__init__': continue
-						if b.name in method_names: continue
-						out.append( self.visit(b) )
-						#args = [self.visit(a) for a in b.args.args][1:]
-						#args = ','.join(args)
-						#if args:
-						#	out.append(self.indent()+ '%s(%s) { return %s.__%s(this,%s); }'%(b.name, args, bnode.name, b.name, args) )
-						#else:
-						#	out.append(self.indent()+ '%s() { return %s.__%s(this); }'%(b.name, bnode.name, b.name) )
-
-
 		self._class_stack.pop()
 		return '\n'.join(out)
 
diff --git a/regtests/go/subclass.py b/regtests/go/subclass.py
@@ -0,0 +1,43 @@
+'''
+simple class
+'''
+class A:
+	{
+		x:int,
+		y:int,
+		z:int,
+	}
+	def __init__(self, x:int, y:int, z:int=1):
+		self.x = x
+		self.y = y
+		self.z = z
+
+	def mymethod(self, m:int) -> int:
+		return self.x * m
+
+class B(A):
+	{
+		w:string
+	}
+
+	def method2(self, v:string) ->string:
+		self.w = v
+		return self.w
+
+def call_method( cb:func(int)(int), mx:int ) ->int:
+	return cb(mx)
+
+def main():
+	a = A( 100, 200, z=9999 )
+	print( a.x )
+	print( a.y )
+	print( a.z )
+
+	b = a.mymethod(3)
+	print( b )
+
+	c = call_method( a.mymethod, 4 )
+	print( c )
+
+	x = B(1,2,z=3)
+	print( x.method2('hello world') )
