fixed dict.keys(), and fixed functional style list/tuple creation using backdoor list(js_object=Array)

hartsantler · hartsantler · commit 3668cba7a6d8 · 2013-10-27T19:55:07.000-07:00
diff --git a/bindings/blockly.py b/bindings/blockly.py
@@ -162,6 +162,8 @@ def callback(self, jsfunc):  ## decorator
 		with javascript:
 			arr = jsfunc.args_signature
 			defs = jsfunc.kwargs_signature
+		print 'jsfunc', jsfunc
+		print 'arr', arr
 		for i in range(arr.length):
 			name = arr[i]
 			if defs[name] is null:  ## special case: null creates a non-dynamic "slot" input statement
@@ -420,12 +422,12 @@ def generator(block):
 					## TODO what about pure javascript functions?
 					if is_statement and block.parentBlock_:  ## TODO request Blockly API change: "parentBlock_" to "parentBlock"
 						print 'is_statement with parent block - OK'
-						code += external_javascript_function + '( [' + ','.join(args) + '] )'  ## calling from js a pyjs function
+						code += external_javascript_function + '( [' + ','.join(args) + '], {} )'  ## calling from js a pyjs function
 						print code
 
 					elif block.parentBlock_:  ## TODO request Blockly API change: "parentBlock_" to "parentBlock"
 						print 'with parent block - OK'
-						code += external_javascript_function + '( [' + ','.join(args) + '] )'  ## calling from js a pyjs function
+						code += external_javascript_function + '( [' + ','.join(args) + '], {} )'  ## calling from js a pyjs function
 						print code
 
 				else:  ## TODO this should be a simple series of statements?
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -952,7 +952,11 @@ def visit_Call(self, node):
                 self.identifier += 1
 
                 if name in ('list', 'tuple'):
-                    writer.append( '%s = JS("%s.__dict__.js_object")' % (args_name, args))
+                    #writer.append( '%s = JS("%s.__dict__.js_object")' % (args_name, args))
+                    if args:
+                        writer.append( '%s = %s.__dict__.js_object' % (args_name, args))  ## test this
+                    else:
+                        writer.append( '%s = []' %args_name )
                 else:
                     writer.append('%s = JSArray(%s)' % (args_name, args))
 
@@ -972,7 +976,10 @@ def visit_Call(self, node):
                 if name == 'dict':
                     return 'get_attribute(%s, "__call__")(%s, JSObject(js_object=%s))' % (name, args_name, kwargs_name)
                 elif name in ('list', 'tuple'):
-                    return 'get_attribute(%s, "__call__")([], JSObject(js_object=%s))' % (name, args_name)
+                    if len(node.args):
+                        return 'get_attribute(%s, "__call__")([], JSObject(js_object=%s))' % (name, args_name)
+                    else:
+                        return 'get_attribute(%s, "__call__")([], %s)' % (name, kwargs_name)
                 else:
                     return 'get_attribute(%s, "__call__")(%s, %s)' % (name, args_name, kwargs_name)
 
diff --git a/runtime/builtins.py b/runtime/builtins.py
@@ -462,11 +462,14 @@ def __setitem__(self, key, value):
             JS('__dict[key] = value')
 
     def keys(self):
-        __dict = self.js_object
-        __keys = JS('Object.keys(__dict)')  ## the problem with this is that keys are coerced into strings
-        out = list()
-        out.js_object = __keys
-        return out
+        #__dict = self.js_object
+        #__keys = JS('Object.keys(__dict)')  ## the problem with this is that keys are coerced into strings
+        #out = list( js_object=__keys )  ## some bug in the translator prevents this
+        #out.js_object = __keys  ## this style is deprecated
+        #return out
+        with javascript:
+            arr = Object.keys( self[...] )
+        return list( js_object=arr )
 
     def pop(self, key, d=None):
         v = self.get(key, None)
diff --git a/tests/blockly_custom_blocks.html b/tests/blockly_custom_blocks.html
@@ -138,24 +138,29 @@
 myblock1.set_external_function('func1')
 myblock1.add_input_value('a', type='Number')
 myblock1.add_input_value('b', type='String')
-
+print( myblock1 )
 def func1(a,b):
 	print 'a', a
 	print 'b', b
 
-myblock2 = ValueBlock('myblock2', output='Number')
+print 'testing myblock2'
+#myblock2 = ValueBlock('myblock2', output='Number')
+myblock2 = StatementBlock('myblock2')
+print 'myblock2', myblock2
 @myblock2.callback
 def my_extern_func(x,y,z, w=None):
 	print 'hello extern func'
 	return x+y+z
 
+print 'OK'
 def show_code():
 	with javascript:
 		code = Blockly.Python.workspaceToCode()
 		print( code )
 
+print 'init blockly'
 initialize_blockly( on_changed_callback=show_code )
-
+print 'DONE'
 </script>
 
 </body>
