fixed initialize dict with keys:values

hartsantler · hartsantler · commit 1bdaf9e17866 · 2013-10-09T06:21:01.000-07:00
both init styles work: literal {'x':1} and functional dict(x=1)
diff --git a/pythonscript.js b/pythonscript.js
@@ -1,4 +1,4 @@
-// PythonScript Runtime - regenerated on: Wed Oct  9 02:45:12 2013
+// PythonScript Runtime - regenerated on: Wed Oct  9 06:17:34 2013
 var jsrange = function(num) {
 "Emulates Python's range function";
 var i, r;
diff --git a/pythonscript/python_to_pythonjs.py b/pythonscript/python_to_pythonjs.py
@@ -235,7 +235,8 @@ def visit_Dict(self, node):
         keys = [x.s for x in node.keys]
         values = map(self.visit, node.values)
         a = [ '%s=%s'%x for x in zip(keys, values) ]
-        return 'get_attribute(dict, "__call__")([], JSObject(%s))' % ', '.join(a)
+        b = 'js_object=JSObject(%s)' %', '.join(a)
+        return 'get_attribute(dict, "__call__")([], JSObject(%s))' % b
 
     def visit_Tuple(self, node):
         ## TODO how to deal with tuples
@@ -679,7 +680,10 @@ def visit_Call(self, node):
 
             name = self.visit(node.func)
             if call_has_args:
-                return 'get_attribute(%s, "__call__")(%s, %s)' % (name, args_name, kwargs_name)
+                if name == 'dict':
+                    return 'get_attribute(%s, "__call__")(%s, JSObject(js_object=%s))' % (name, args_name, kwargs_name)
+                else:
+                    return 'get_attribute(%s, "__call__")(%s, %s)' % (name, args_name, kwargs_name)
             elif name in self._classes:
                 return 'get_attribute(%s, "__call__")( JSArray(), JSObject() )' %name
             else:
diff --git a/tests/test_dict.html b/tests/test_dict.html
@@ -6,20 +6,21 @@
 
 def test():
 	global d, l
-	d = dict(a=1, b=2)
+
+	d = dict(a=1, b=2) ## functional style
 	print( d['a'] )
 	print( d['b'] )
 	print( len(d) )
-	print( d )
 
 	d['a'] = 'hello'
 	d['b'] = 'world'
+	d['c'] = 'foobar'
 	print( d['a'] )
 	print( d['b'] )
+	print( d['c'] )
 	print( len(d) )
 
-
-	l = {'x':3, 'y':4}
+	l = {'x':3, 'y':4}  ## literal style
 	print( l['x'] )
 	print( l['y'] )
 	l['x'] = 'XXX'

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// PythonScript Runtime - regenerated on: Wed Oct 9 02:45:12 2013`
	`1`	`+// PythonScript Runtime - regenerated on: Wed Oct 9 06:17:34 2013`
`2`	`2`	`var jsrange = function(num) {`
`3`	`3`	`"Emulates Python's range function";`
`4`	`4`	`var i, r;`