go backend: use dict literal in class body to typedef the attributes of self.

hartsantler · hartsantler · commit 66921bfd8969 · 2014-08-11T05:02:54.000-07:00
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -813,6 +813,8 @@ def _visit_dart_classdef(self, node):
 		methods = {}
 		method_list = []  ## getter/setters can have the same name
 		props = set()
+		struct_types = dict()
+
 		for item in node.body:
 			if isinstance(item, FunctionDef):
 				methods[ item.name ] = item
@@ -830,7 +832,18 @@ def _visit_dart_classdef(self, node):
 					if n.id == 'self':
 						n.id = 'this'
 
-		if props:
+			elif isinstance(item, ast.Expr) and isinstance(item.value, ast.Dict):
+				sdef = []
+				for i in range( len(item.value.keys) ):
+					k = self.visit( item.value.keys[ i ] )
+					v = self.visit( item.value.values[i] )
+					sdef.append( '%s=%s'%(k,v) )
+
+				writer.write('@__struct__(%s)' %','.join(sdef))
+
+		if self._with_go:
+			pass
+		elif props:
 			writer.write('@properties(%s)'%','.join(props))
 			for dec in node.decorator_list:
 				writer.write('@%s'%self.visit(dec))
diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
@@ -24,6 +24,7 @@ def visit_ClassDef(self, node):
 		self._class_stack.append( node )
 		node._parents = set()
 		out = []
+		sdef = dict()
 		props = set()
 		bases = set()
 		base_classes = set()
@@ -32,11 +33,15 @@ def visit_ClassDef(self, 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] )
+				assert decor.func.id=='__struct__'
+				#props.update( [self.visit(a) for a in decor.args] )
+				for kw in decor.keywords:
+					props.add( kw.arg )
+					sdef[ kw.arg ] = kw.value.id
 
 		out.append( 'type %s struct {' %node.name)
-		for name in props:
-			out.append('%s int' %name)
+		for name in sdef:
+			out.append('%s %s' %(name, sdef[name]))
 
 		out.append('}')
 
diff --git a/regtests/go/class.py b/regtests/go/class.py
@@ -1,10 +1,14 @@
 '''
 simple class
 '''
-
 class A:
+	{
+		x:int,
+		y:int,
+	}
 	def __init__(self):
 		self.x = 1
+		self.y = 2
 
 def main():
 	a = A()
