THRIFT-1040 Can't end typedef lines with a semicolon
Client: Compiler (General)
Patch: Konrad Grochowski
diff --git a/compiler/cpp/src/thrifty.yy b/compiler/cpp/src/thrifty.yy
index 3755d13..40e7a06 100644
--- a/compiler/cpp/src/thrifty.yy
+++ b/compiler/cpp/src/thrifty.yy
@@ -545,8 +545,16 @@
}
}
+CommaOrSemicolonOptional:
+ ','
+ {}
+| ';'
+ {}
+|
+ {}
+
Typedef:
- tok_typedef FieldType tok_identifier TypeAnnotations
+ tok_typedef FieldType tok_identifier TypeAnnotations CommaOrSemicolonOptional
{
pdebug("TypeDef -> tok_typedef FieldType tok_identifier");
validate_simple_identifier( $3);
@@ -558,14 +566,6 @@
}
}
-CommaOrSemicolonOptional:
- ','
- {}
-| ';'
- {}
-|
- {}
-
Enum:
tok_enum tok_identifier '{' EnumDefList '}' TypeAnnotations
{