JSON Schema Compiler supports Enums as types.

Changes:

1) IsEnumOrEnumRef is refactored to be in the cpp_type_generator.
2) Refactored GeneratePopulatePropertyFromValue to call private methods (it was getting to be unwieldy.)
3) Refactored most of the unittests to put values on the stack instead of scoped_ptrs.
4) Implemented Enums as types. Enums all have the ENUMERATION_NONE.

BUG=141940
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=153849

[Yoyo Zhou, 2012-08-27 23:56:04]

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
File tools/json_schema_compiler/cc_generator.py (right):

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
tools/json_schema_compiler/cc_generator.py:590: type_var =
'%(dst)s->%(name)s_type'
nit: indent is 2

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
tools/json_schema_compiler/cc_generator.py:609: def
_GenerateEnumTypePopulate(self, c, prop, value_var):
Is this ever called?

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
tools/json_schema_compiler/cc_generator.py:612:
self._cpp_type_generator.GetReferencedProperty(prop).enum_values)
indentation is either 4 spaces after an open paren if no args after the paren,
or aligned with the paren.

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
tools/json_schema_compiler/cc_generator.py:622:
self._cpp_type_generator.GetReferencedProperty(prop).enum_values)
Seems like you can use this inside GenerateStringToEnumConversion and not have
to pass in the enum_values on the side.

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
tools/json_schema_compiler/cc_generator.py:658: 'enum_temp',
prop.item_type.enum_values)
same comment about indent.

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
tools/json_schema_compiler/cc_generator.py:669: Leaves failure_value
unsubstituded.
typo: unsubstituted

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
tools/json_schema_compiler/cc_generator.py:749: """Generates CreateEnumValue()
that returns the base::StringValue
Sorry, but I'm confused as to how this function differs from
_GenerateCreateEnumValue below -- both generate functions with the same name and
signature, yet are different.

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
File tools/json_schema_compiler/cpp_type_generator.py (right):

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
tools/json_schema_compiler/cpp_type_generator.py:276: def _IsEnumRef(self,
prop):
If you made this public, you wouldn't need to duplicate it in cc_generator.

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
tools/json_schema_compiler/cpp_type_generator.py:277: """Returns true if the
property is an ENUM or a reference to an ENUM.
no

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
tools/json_schema_compiler/cpp_type_generator.py:280: prop.type_ !=
PropertyType.ENUM)
I'd put prop.type_ == PropertyType.REF here instead, and actually as the first
condition in the and.

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
File tools/json_schema_compiler/h_generator.py (right):

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
tools/json_schema_compiler/h_generator.py:161: prop_name = prop.unix_name
Is this needed?

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
tools/json_schema_compiler/h_generator.py:162: wrap_optional = not
self._cpp_type_generator.IsEnumOrEnumRef(prop)
Can you document the reason for this in a comment?

[chebert, 2012-08-28 21:31:14]

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
File tools/json_schema_compiler/cc_generator.py (right):

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
tools/json_schema_compiler/cc_generator.py:590: type_var =
'%(dst)s->%(name)s_type'
On 2012/08/27 23:56:04, Yoyo Zhou wrote:
> nit: indent is 2

Done.

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
tools/json_schema_compiler/cc_generator.py:609: def
_GenerateEnumTypePopulate(self, c, prop, value_var):
Nope. Deleting it.
On 2012/08/27 23:56:04, Yoyo Zhou wrote:
> Is this ever called?

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
tools/json_schema_compiler/cc_generator.py:612:
self._cpp_type_generator.GetReferencedProperty(prop).enum_values)
On 2012/08/27 23:56:04, Yoyo Zhou wrote:
> indentation is either 4 spaces after an open paren if no args after the paren,
> or aligned with the paren.

Done.

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
tools/json_schema_compiler/cc_generator.py:622:
self._cpp_type_generator.GetReferencedProperty(prop).enum_values)
On 2012/08/27 23:56:04, Yoyo Zhou wrote:
> Seems like you can use this inside GenerateStringToEnumConversion and not have
> to pass in the enum_values on the side.

Done.

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
tools/json_schema_compiler/cc_generator.py:658: 'enum_temp',
prop.item_type.enum_values)
On 2012/08/27 23:56:04, Yoyo Zhou wrote:
> same comment about indent.

Done.

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
tools/json_schema_compiler/cc_generator.py:669: Leaves failure_value
unsubstituded.
On 2012/08/27 23:56:04, Yoyo Zhou wrote:
> typo: unsubstituted

Done.

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
tools/json_schema_compiler/cc_generator.py:749: """Generates CreateEnumValue()
that returns the base::StringValue
The plan I believe is to phase out the old-style of enums.

They are similar, but there are a few differences:
1) this one is not static
2) The enum type, since it is a PropertyType.TYPE, cannot be optional
3) the cpp_type_generator.GetEnumValue() does not differentiate between Types
and properties, so it doesn't know to use the classname instead of the
prop.unix_name

I was going to try to merge these two, but I haven't come up with a good way to
do it.

On 2012/08/27 23:56:04, Yoyo Zhou wrote:
> Sorry, but I'm confused as to how this function differs from
> _GenerateCreateEnumValue below -- both generate functions with the same name
and
> signature, yet are different.

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
File tools/json_schema_compiler/cpp_type_generator.py (right):

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
tools/json_schema_compiler/cpp_type_generator.py:276: def _IsEnumRef(self,
prop):
On 2012/08/27 23:56:04, Yoyo Zhou wrote:
> If you made this public, you wouldn't need to duplicate it in cc_generator.

Done.

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
tools/json_schema_compiler/cpp_type_generator.py:277: """Returns true if the
property is an ENUM or a reference to an ENUM.
Dang. I need to work on my editing.
On 2012/08/27 23:56:04, Yoyo Zhou wrote:
> no

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
tools/json_schema_compiler/cpp_type_generator.py:280: prop.type_ !=
PropertyType.ENUM)
On 2012/08/27 23:56:04, Yoyo Zhou wrote:
> I'd put prop.type_ == PropertyType.REF here instead, and actually as the first
> condition in the and.

Done.

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
File tools/json_schema_compiler/h_generator.py (right):

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
tools/json_schema_compiler/h_generator.py:161: prop_name = prop.unix_name
On 2012/08/27 23:56:04, Yoyo Zhou wrote:
> Is this needed?

Done.

https://chromiumcodereview.appspot.com/10828407/diff/6002/tools/json_schema_c...
tools/json_schema_compiler/h_generator.py:162: wrap_optional = not
self._cpp_type_generator.IsEnumOrEnumRef(prop)
Better yet, I will just get rid of it.
On 2012/08/27 23:56:04, Yoyo Zhou wrote:
> Can you document the reason for this in a comment?

[Yoyo Zhou, 2012-08-28 22:54:51]

LGTM
although I still don't like that there are different CreateEnumValues being
generated with the same name.

[commit-bot: I haz the power, 2012-08-28 23:35:55]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/hebert.christopherj@chromium.org/10828...

[commit-bot: I haz the power, 2012-08-29 04:07:14]

Change committed as 153849