go backend: starting on translation of class into struct and methods.

hartsantler · hartsantler · commit b4517fcbf1e3 · 2014-08-10T21:30:34.000-07:00
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -853,7 +853,8 @@ def _visit_dart_classdef(self, node):
 		## constructor
 		if init:
 			methods.pop( '__init__' )
-			init.name = node.name
+			if not self._with_go:
+				init.name = node.name
 			self.visit(init)
 
 		## methods
@@ -1027,7 +1028,7 @@ def _visit_js_classdef(self, node):
 		self._in_js_class = False
 
 	def visit_ClassDef(self, node):
-		if self._with_dart:
+		if self._with_dart or self._with_go:
 			self._visit_dart_classdef(node)
 			return
 		elif self._with_js:
diff --git a/pythonjs/pythonjs.py b/pythonjs/pythonjs.py
@@ -53,6 +53,10 @@ def push(self): self._indent += 1
 	def pull(self):
 		if self._indent > 0: self._indent -= 1
 
+	def visit_ClassDef(self, node):
+		raise NotImplementedError(node)
+
+
 	def visit_Global(self, node):
 		return '/*globals: %s */' %','.join(node.names)
 
diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
@@ -12,11 +12,41 @@ class GoGenerator( pythonjs.JSGenerator ):
 
 	def __init__(self, requirejs=False, insert_runtime=False):
 		pythonjs.JSGenerator.__init__(self, requirejs=False, insert_runtime=False)
-		#self._classes = dict()
-		#self._class_props = dict()
+
+		self._class_stack = list()
+		self._classes = dict()
+		self._class_props = dict()
+
 		self._vars = set()
 		self._kwargs_type_ = dict()
 
+	def visit_ClassDef(self, node):
+		self._class_stack.append( node )
+		node._parents = set()
+		out = []
+		props = set()
+		bases = set()
+		base_classes = set()
+
+		self._classes[ node.name ] = node
+		self._class_props[ node.name ] = props
+		for decor in node.decorator_list:  ## class decorators
+			if isinstance(decor, ast.Call):
+				props.update( [self.visit(a) for a in decor.args] )
+
+		out.append( 'type %s struct {' %node.name)
+		for name in props:
+			out.append('%s int' %name)
+
+		out.append('}')
+
+		for b in node.body:
+			out.append( self.visit(b) )
+
+		self._class_stack.pop()
+		return '\n'.join(out)
+
+
 	def visit_Print(self, node):
 		r = [ 'fmt.Println(%s);' %self.visit(e) for e in node.values]
 		return ''.join(r)
@@ -48,7 +78,7 @@ def visit_Module(self, node):
 					else:
 						lines.append( sub )
 			else:
-				raise SyntaxError(line)
+				raise SyntaxError(b)
 
 		lines.append('type _kwargs_type_ struct {')
 		for name in self._kwargs_type_:
@@ -167,12 +197,17 @@ def _visit_function(self, node):
 		offset = len(node.args.args) - len(node.args.defaults)
 		varargs = False
 		varargs_name = None
+		is_method = False
 		for i, arg in enumerate(node.args.args):
 			arg_name = arg.id
 			if arg_name not in args_typedefs:
-				err = 'error in function: %s' %node.name
-				err += '\n  missing typedef: %s' %arg.id
-				raise SyntaxError(err)
+				if arg_name=='self':
+					is_method = True
+					continue
+				else:
+					err = 'error in function: %s' %node.name
+					err += '\n  missing typedef: %s' %arg.id
+					raise SyntaxError(err)
 
 			arg_type = args_typedefs[arg_name]
 			a = '%s %s' %(arg_name, arg_type)
@@ -202,11 +237,16 @@ def _visit_function(self, node):
 			args.append( '%s ...%s' %(starargs, args_typedefs[starargs]))
 
 		####
+		if is_method:
+			assert self._class_stack
+			method = '(self *%s)  ' %self._class_stack[-1].name
+		else:
+			method = ''
 		out = []
 		if return_type:
-			out.append( self.indent() + 'func %s(%s) %s {\n' % (node.name, ', '.join(args), return_type) )
+			out.append( self.indent() + 'func %s%s(%s) %s {\n' % (method, node.name, ', '.join(args), return_type) )
 		else:
-			out.append( self.indent() + 'func %s(%s) {\n' % (node.name, ', '.join(args)) )
+			out.append( self.indent() + 'func %s%s(%s) {\n' % (method, node.name, ', '.join(args)) )
 		self.push()
 
 		if oargs:
@@ -283,6 +323,10 @@ def visit_While(self, node):
 	def _inline_code_helper(self, s):
 		return s
 
+
+
+
+
 def main(script, insert_runtime=True):
 	if insert_runtime:
 		dirname = os.path.dirname(os.path.abspath(__file__))
@@ -291,6 +335,7 @@ def main(script, insert_runtime=True):
 		script = runtime + '\n' + script
 
 	tree = ast.parse(script)
+	#return GoGenerator().visit(tree)
 	try:
 		return GoGenerator().visit(tree)
 	except SyntaxError as err:
diff --git a/regtests/go/class.py b/regtests/go/class.py
@@ -0,0 +1,11 @@
+'''
+simple class
+'''
+
+class A:
+	def __init__(self):
+		self.x = 1
+
+def main():
+	a = A()
+	print( a.x )
