THRIFT-632. java: Constants of enum types don't behave well
This patch causes constants of all types to be resolved differently by the compiler, and makes it so that constants of enum types contain a reference to the enum type so that code generators can produce the correct names.
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@892358 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/compiler/cpp/src/thrifty.yy b/compiler/cpp/src/thrifty.yy
index 987dd8d..0fc90da 100644
--- a/compiler/cpp/src/thrifty.yy
+++ b/compiler/cpp/src/thrifty.yy
@@ -504,6 +504,7 @@
pdebug("Enum -> tok_enum tok_identifier { EnumDefList }");
$$ = $4;
$$->set_name($2);
+ $$->resolve_values();
}
EnumDefList:
@@ -583,6 +584,7 @@
{
pdebug("Const -> tok_const FieldType tok_identifier = ConstValue");
if (g_parse_mode == PROGRAM) {
+ g_scope->resolve_const_value($5, $2);
$$ = new t_const($2, $3, $5);
validate_const_type($$);
@@ -590,7 +592,6 @@
if (g_parent_scope != NULL) {
g_parent_scope->add_constant(g_parent_prefix + $3, $$);
}
-
} else {
$$ = NULL;
}
@@ -620,15 +621,8 @@
| tok_identifier
{
pdebug("ConstValue => tok_identifier");
- t_const* constant = g_scope->get_constant($1);
- if (constant != NULL) {
- $$ = constant->get_value();
- } else {
- if (g_parse_mode == PROGRAM) {
- pwarning(1, "Constant strings should be quoted: %s\n", $1);
- }
- $$ = new t_const_value($1);
- }
+ $$ = new t_const_value();
+ $$->set_identifier($1);
}
| ConstList
{
@@ -872,6 +866,7 @@
$$ = new t_field($4, $5, $2);
$$->set_req($3);
if ($6 != NULL) {
+ g_scope->resolve_const_value($6, $4);
validate_field_value($$, $6);
$$->set_value($6);
}