Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(215)

Unified Diff: tools/json_schema_compiler/h_generator.py

Issue 1982193002: Add enum class support to json_schema_compiler (idl files) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: I accidentally a patchset dependency Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/json_schema_compiler/cpp_type_generator.py ('k') | tools/json_schema_compiler/idl_schema.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/json_schema_compiler/h_generator.py
diff --git a/tools/json_schema_compiler/h_generator.py b/tools/json_schema_compiler/h_generator.py
index c64241cd62d6d66b46230ee62cf84867f0432e08..3f7584d55d5e738574b99960a5b82fd3ef792e19 100644
--- a/tools/json_schema_compiler/h_generator.py
+++ b/tools/json_schema_compiler/h_generator.py
@@ -141,13 +141,17 @@ class _Generator(object):
"""Generate a code object with the declaration of a C++ enum.
"""
c = Code()
- c.Sblock('enum %s {' % enum_name)
- c.Append(self._type_helper.GetEnumNoneValue(type_) + ',')
+ c.Sblock('enum %s%s {' % ('class ' if type_.is_enum_class else '',
+ enum_name))
+ c.Append(self._type_helper.GetEnumNoneValue(
+ type_, is_in_declaration=True) + ',')
for value in type_.enum_values:
- current_enum_string = self._type_helper.GetEnumValue(type_, value)
+ current_enum_string = self._type_helper.GetEnumValue(
+ type_, value, is_in_declaration=True)
c.Append(current_enum_string + ',')
c.Append('%s = %s,' % (
- self._type_helper.GetEnumLastValue(type_), current_enum_string))
+ self._type_helper.GetEnumLastValue(type_, is_in_declaration=True),
+ current_enum_string))
c.Eblock('};')
return c
« no previous file with comments | « tools/json_schema_compiler/cpp_type_generator.py ('k') | tools/json_schema_compiler/idl_schema.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698