Fixed problem with non-void return types in IDL

tools/json_schema_compiler/idl_schema.py

 #! /usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import itertools
 import json
 import os.path
 import re
 import sys
@@ skipping 70 matching lines @@
     param_comment_start = cur_param.end()
     param_comment_end = next_param.start() if next_param else len(comment)
     params[param_name] = (comment[param_comment_start:param_comment_end
                                   ].strip().replace('\n\n', '<br/><br/>')
                                            .replace('\n', ''))
   return (parent_comment, params)
 
 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 name/value pair, where the value is a tuple of:

[not at google - send to devlin, 2013/02/21 03:46:03]

could you return (name, parameters, return value) instead of a nested tuple?

[sashab, 2013/02/21 22:15:03]

Done.

+      (list of function parameters, return type)
   '''
   def __init__(self, callspec_node, comment):
     self.node = callspec_node
     self.comment = comment
 
   def process(self, callbacks):
     parameters = []
+    return_type = None
+    if self.node.GetProperty('TYPEREF') not in ['void', None]:
+      return_type = Typeref(self.node.GetProperty('TYPEREF'),
+                     self.node,
+                     {'name': self.node.GetName()}).process(callbacks)

[not at google - send to devlin, 2013/02/21 03:46:03]

indentation is wonky

[sashab, 2013/02/21 22:15:03]

Done.

     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):
   '''
   Given a Param node representing a function parameter, converts into a Python
   dictionary that the JSON schema compiler expects to see.
   '''
   def __init__(self, param_node):
     self.node = param_node
 
   def process(self, callbacks):
@@ skipping 39 matching lines @@
       if self.node.GetProperty(property_name):
         properties[property_name.lower()] = True
     is_function = False
     parameter_comments = OrderedDict()
     for node in self.node.children:
       if node.cls == 'Comment':
         (parent_comment, parameter_comments) = ProcessComment(node.GetName())
         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'
     else:
       properties = Typeref(self.node.GetProperty('TYPEREF'),
                            self.node, properties).process(callbacks)
     enum_values = self.node.GetProperty('legalValues')
     if enum_values:
       if properties['type'] == 'integer':
         enum_values = map(int, enum_values)
@@ skipping 197 matching lines @@
   '''
   Dump a json serialization of parse result for the IDL files whose names
   were passed in on the command line.
   '''
   for filename in sys.argv[1:]:
     schema = Load(filename)
     print json.dumps(schema, indent=2)
 
 if __name__ == '__main__':
   Main()