svfgit
diff --git a/‎pythonjs/pythonjs_to_go.py‎
Lines changed: 40 additions & 2 deletions b/‎pythonjs/pythonjs_to_go.py‎
Lines changed: 40 additions & 2 deletions
diff --git a/‎regtests/class/mi.py‎
Lines changed: 4 additions & 4 deletions b/‎regtests/class/mi.py‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎regtests/class/mi_override.py‎
Lines changed: 32 additions & 0 deletions b/‎regtests/class/mi_override.py‎
Lines changed: 32 additions & 0 deletions
@@ -32,6 +32,27 @@ def visit_ClassDef(self, node):
 
 		self._classes[ node.name ] = node
 		self._class_props[ node.name ] = props
+
+
+		for base in node.bases:
+			n = self.visit(base)
+			if n == 'object':
+				continue
+			node._parents.add( n )
+
+			bases.add( n )
+			if n in self._class_props:
+				props.update( self._class_props[n] )
+				base_classes.add( self._classes[n] )
+			#else:  ## special case - subclassing a builtin like `list`
+			#	continue
+
+			for p in self._classes[ n ]._parents:
+				bases.add( p )
+				props.update( self._class_props[p] )
+				base_classes.add( self._classes[p] )
+
+
 		for decor in node.decorator_list:  ## class decorators
 			if isinstance(decor, ast.Call):
 				assert decor.func.id=='__struct__'
@@ -47,10 +68,11 @@ def visit_ClassDef(self, node):
 
 
 		init = None
-
+		method_names = set()
 		for b in node.body:
-			out.append( self.visit(b) )
 			assert isinstance(b, ast.FunctionDef)
+			method_names.add( b.name )
+			out.append( self.visit(b) )
 			if b.name == '__init__':
 				init = b
 
@@ -66,6 +88,21 @@ 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)
 
@@ -443,6 +480,7 @@ def visit_While(self, node):
 
 	def _inline_code_helper(self, s):
 		return s
+		#return 'js.Global.Call("eval", "%s")' %s ## TODO inline JS()
 
 
 
 
@@ -2,21 +2,21 @@
 multiple inheritance
 '''
 class A:
-	def foo(self):
+	def foo(self) -> int:
 		return 1
 
 class B:
-	def bar(self):
+	def bar(self) -> int:
 		return 2
 
 class C( A, B ):
-	def call_foo_bar(self):
+	def call_foo_bar(self) -> int:
 		a = self.foo()
 		a += self.bar()
 		return a
 
 	## extend foo ##
-	def foo(self):
+	def foo(self) -> int:
 		a = A.foo(self)
 		a += 100
 		return a
 
@@ -0,0 +1,32 @@
+'''
+multiple inheritance
+'''
+class A:
+	def foo(self) -> int:
+		return 1
+
+class B:
+	def bar(self) -> int:
+		return 2
+
+class C( A, B ):
+	def call_foo_bar(self) -> int:
+		a = self.foo()
+		a += self.bar()
+		return a
+
+	## override foo ##
+	def foo(self) -> int:
+		return 100
+
+def main():
+	a = A()
+	TestError( a.foo()==1 )
+	b = B()
+	TestError( b.bar()==2 )
+
+	c = C()
+	TestError( c.foo()==100 )
+	TestError( c.bar()==2 )
+
+	TestError( c.call_foo_bar()==102 )