Fix problem with non void return types in extension API IDL.

tools/json_schema_compiler/idl_schema.py

Index: tools/json_schema_compiler/idl_schema.py
diff --git a/tools/json_schema_compiler/idl_schema.py b/tools/json_schema_compiler/idl_schema.py
index 8334e7ed8db9b62ca147dd08da568e449f3af3d0..83e68a617f9412902f09083cadd47440d9dfa769 100644
--- a/tools/json_schema_compiler/idl_schema.py
+++ b/tools/json_schema_compiler/idl_schema.py
@@ -88,7 +88,8 @@ def ProcessComment(comment):
 class Callspec(object):
   '''
   Given a Callspec node representing an IDL function declaration, converts into
-  a name/value pair where the value is a list of function parameters.
+  a tuple:
+      (name, list of function parameters, return type)
   '''
   def __init__(self, callspec_node, comment):
     self.node = callspec_node
@@ -96,12 +97,21 @@ class Callspec(object):
 
   def process(self, callbacks):
     parameters = []
+    return_type = None
+    if self.node.GetProperty('TYPEREF') not in ['void', None]:

[asargent_no_longer_on_chrome, 2013/02/26 06:19:47]

tiny nit: I think we typically prefer ('void', None) to ['void', None] for "in"
expressions where the set of items is static

+      return_type = Typeref(self.node.GetProperty('TYPEREF'),
+                            self.node,
+                            {'name': self.node.GetName()}).process(callbacks)
+      # The IDL parser doesn't allow specifying return types as optional.
+      # Instead we infer any object return values to be optional.

[asargent_no_longer_on_chrome, 2013/02/26 06:19:47]

I can whip up a quick CL to add this support to the idl parser - it's just a
matter of supporting a question mark appearing after a type:

 static Foo? myFunc();

Then in the parse tree, in the list of properties for myFunc, there will be
TYPEREF: Foo and OPTIONAL: True.

While I'm there I could also add support for array type return values, so you
could do:

 static long[] myFunc2();

and even optional array types, like:

 static long[]? myFunc3();


It's probably fine to still land this as you currently have it - just add a TODO
comment here saying that we'll want to switch this to looking for an OPTIONAL
entry in the properties. 

+      if return_type.get('type') == 'object' or '$ref' in return_type:
+        return_type['optional'] = True;
     for node in self.node.children:
       parameter = Param(node).process(callbacks)
       if parameter['name'] in self.comment:
         parameter['description'] = self.comment[parameter['name']]
       parameters.append(parameter)
-    return self.node.GetName(), parameters
+    return (self.node.GetName(), parameters, return_type)
 
 class Param(object):
   '''
@@ -161,8 +171,11 @@ class Member(object):
         properties['description'] = parent_comment
       elif node.cls == 'Callspec':
         is_function = True
-        name, parameters = Callspec(node, parameter_comments).process(callbacks)
+        name, parameters, return_type = (Callspec(node, parameter_comments)
+                                         .process(callbacks))
         properties['parameters'] = parameters
+        if return_type is not None:
+          properties['returns'] = return_type
     properties['name'] = name
     if is_function:
       properties['type'] = 'function'
@@ -226,6 +239,12 @@ class Typeref(object):
     elif self.typeref == 'ArrayBuffer':
       properties['type'] = 'binary'
       properties['isInstanceOf'] = 'ArrayBuffer'
+    elif self.typeref == 'FileEntry':
+      properties['type'] = 'object'
+      properties['isInstanceOf'] = 'FileEntry'
+      if 'additionalProperties' not in properties:
+        properties['additionalProperties'] = OrderedDict()
+      properties['additionalProperties']['type'] = 'any'
     elif self.typeref is None:
       properties['type'] = 'function'
     else: