commit 782abbb75692d4cc582e60e88da5e58c049e4bfd
author Mark Slee <mcslee@apache.org> Fri Jan 19 00:17:02 2007 +0000
committer Mark Slee <mcslee@apache.org> Fri Jan 19 00:17:02 2007 +0000
tree 4f83560247a2b06756ae58b6460b50dce5d7bbf1
parent 0e0ff7e00353fc4a9a1b5a6f49069d05b64604f2

Add xsd_all keyword to Thrift

Summary: Makes a struct an xsd_all instead of a sequence

Reviewed By: dave


git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@664929 13f79535-47bb-0310-9956-ffa450edef68

compiler/cpp/src/thrift.y

diff --git a/compiler/cpp/src/thrift.y b/compiler/cpp/src/thrift.y
index 8dbe621..cfb3e44 100644
--- a/compiler/cpp/src/thrift.y
+++ b/compiler/cpp/src/thrift.y
@@ -66,6 +66,7 @@
 %token tok_cpp_type
 %token tok_php_namespace
 %token tok_java_package
+%token tok_xsd_all
 
 /**
  * Base datatype keywords
@@ -144,6 +145,7 @@
 %type<tstruct>   ThrowsOptional
 %type<tservice>  ExtendsOptional
 %type<tbool>     AsyncOptional
+%type<tbool>     XsdAllOptional
 %type<id>        CppTypeOptional
 
 %%
@@ -440,14 +442,25 @@
     }
 
 Struct:
-  tok_struct tok_identifier '{' FieldList '}'
+  tok_struct tok_identifier XsdAllOptional '{' FieldList '}'
     {
       pdebug("Struct -> tok_struct tok_identifier { FieldList }");
-      $4->set_name($2);
-      $$ = $4;
+      $5->set_name($2);
+      $5->set_xsd_all($3);
+      $$ = $5;
       y_field_val = -1;
     }
 
+XsdAllOptional:
+  tok_xsd_all
+    {
+      $$ = true;
+    }
+|
+    {
+      $$ = false;
+    }
+
 Xception:
   tok_xception tok_identifier '{' FieldList '}'
     {