summaryrefslogtreecommitdiffstats
path: root/tools/json_schema_compiler
diff options
context:
space:
mode:
authorcduvall@chromium.org <cduvall@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-20 01:03:13 +0000
committercduvall@chromium.org <cduvall@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-20 01:03:13 +0000
commit491e60d36afad9da800569d8546ec1f06b273299 (patch)
tree19d3af73065b0e8cb19a83d48eaf9171a6cf24b1 /tools/json_schema_compiler
parent86d1be95f5844f098cc77181902d76f783a7e5ad (diff)
downloadchromium_src-491e60d36afad9da800569d8546ec1f06b273299.zip
chromium_src-491e60d36afad9da800569d8546ec1f06b273299.tar.gz
chromium_src-491e60d36afad9da800569d8546ec1f06b273299.tar.bz2
Extensions Docs Server: Functions with return values
Docs now handle functions with return values. See extension.html. BUG=131095 Review URL: https://chromiumcodereview.appspot.com/10809028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147583 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/json_schema_compiler')
-rw-r--r--tools/json_schema_compiler/model.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/json_schema_compiler/model.py b/tools/json_schema_compiler/model.py
index 33c0bc5..42d38b0 100644
--- a/tools/json_schema_compiler/model.py
+++ b/tools/json_schema_compiler/model.py
@@ -92,6 +92,7 @@ class Type(object):
self.from_json = True
self.from_client = True
self.parent = parent
+ self.instance_of = json.get('isInstanceOf', None)
_AddFunctions(self, json)
_AddProperties(self, json, from_json=True, from_client=True)
@@ -133,6 +134,9 @@ class Function(object):
else:
self.params.append(Property(self, param['name'], param,
from_json=from_json, from_client=from_client))
+ self.returns = None
+ if 'returns' in json:
+ self.returns = Property(self, 'return', json['returns'])
class Property(object):
"""A property of a type OR a parameter to a function.
@@ -168,6 +172,7 @@ class Property(object):
self.parent = parent
self.from_json = from_json
self.from_client = from_client
+ self.instance_of = json.get('isInstanceOf', None)
_AddProperties(self, json)
if is_additional_properties:
self.type_ = PropertyType.ADDITIONAL_PROPERTIES