Allow json_schema_compiler to handle dictionaries with no fields.

In addition, removes a dummy field from the CreateOptions dictionary the Socket
API's IDL file.

R=miket@chromium.org,asargent@chromium.org
BUG=none
TEST=none


Review URL: http://codereview.chromium.org/10244008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134277 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 17 insertions, 15 deletions

diff --git a/tools/json_schema_compiler/cc_generator.py b/tools/json_schema_compiler/cc_generator.py
index af81b5a..eaf6fb3 100644
--- a/tools/json_schema_compiler/cc_generator.py
+++ b/tools/json_schema_compiler/cc_generator.py
@@ -181,23 +181,25 @@ class CCGenerator(object):
               '(const Value& value, %(name)s* out) {')
         .Append('if (!value.IsType(Value::TYPE_DICTIONARY))')
         .Append('  return false;')
-        .Append('const DictionaryValue* dict = '
+    )
+    if type_.properties:
+      (c.Append('const DictionaryValue* dict = '
                 'static_cast<const DictionaryValue*>(&value);')
         .Append()
-    )
-    for prop in type_.properties.values():
-      c.Concat(self._InitializePropertyToDefault(prop, 'out'))
-    for prop in type_.properties.values():
-      if prop.type_ == PropertyType.ADDITIONAL_PROPERTIES:
-        c.Append('out->additional_properties.MergeDictionary(dict);')
-        # remove all keys that are actual properties
-        for cur_prop in type_.properties.values():
-          if prop != cur_prop:
-            c.Append('out->additional_properties'
-                '.RemoveWithoutPathExpansion("%s", NULL);' % cur_prop.name)
-        c.Append()
-      else:
-        c.Concat(self._GenerateTypePopulateProperty(prop, 'dict', 'out'))
+      )
+      for prop in type_.properties.values():
+        c.Concat(self._InitializePropertyToDefault(prop, 'out'))
+      for prop in type_.properties.values():
+        if prop.type_ == PropertyType.ADDITIONAL_PROPERTIES:
+          c.Append('out->additional_properties.MergeDictionary(dict);')
+          # remove all keys that are actual properties
+          for cur_prop in type_.properties.values():
+            if prop != cur_prop:
+              c.Append('out->additional_properties'
+                  '.RemoveWithoutPathExpansion("%s", NULL);' % cur_prop.name)
+          c.Append()
+        else:
+          c.Concat(self._GenerateTypePopulateProperty(prop, 'dict', 'out'))
     (c.Append('return true;')
       .Eblock('}')
     )