svn commit: r919325 - in /incubator/thrift/trunk: compiler/cpp/src/parse/t_field.h compiler/cpp/src/thrifty.yy test/AnnotationTest.thrift

[dr...@apache.org]

Author: dreiss
Date: Fri Mar  5 07:51:51 2010
New Revision: 919325

URL: http://svn.apache.org/viewvc?rev=919325&view=rev
Log:
THRIFT-564. Support arbitrary annotations on struct fields

This is subtly different from a type annotation, since some bits of
metadata only make sense in the context of a single structure field,
like whether the field is required, or whether the C++ code should use
a pointer for it.

This change doesn't define any meaningful annotations.  It just sets up
the parsing infrastructure.

I have no idea if $10 will work with older versions of yacc.  It seems
to work fine with bison.

Modified:
    incubator/thrift/trunk/compiler/cpp/src/parse/t_field.h
    incubator/thrift/trunk/compiler/cpp/src/thrifty.yy
    incubator/thrift/trunk/test/AnnotationTest.thrift

Modified: incubator/thrift/trunk/compiler/cpp/src/parse/t_field.h
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/compiler/cpp/src/parse/t_field.h?rev=919325&r1=919324&r2=919325&view=diff
==============================================================================
--- incubator/thrift/trunk/compiler/cpp/src/parse/t_field.h (original)
+++ incubator/thrift/trunk/compiler/cpp/src/parse/t_field.h Fri Mar  5 07:51:51 2010
@@ -133,6 +133,7 @@
     }
   };
 
+  std::map<std::string, std::string> annotations_;
 
  private:
   t_type* type_;

Modified: incubator/thrift/trunk/compiler/cpp/src/thrifty.yy
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/compiler/cpp/src/thrifty.yy?rev=919325&r1=919324&r2=919325&view=diff
==============================================================================
--- incubator/thrift/trunk/compiler/cpp/src/thrifty.yy (original)
+++ incubator/thrift/trunk/compiler/cpp/src/thrifty.yy Fri Mar  5 07:51:51 2010
@@ -853,7 +853,7 @@
     }
 
 Field:
-  CaptureDocText FieldIdentifier FieldRequiredness FieldType tok_identifier FieldValue XsdOptional XsdNillable XsdAttributes CommaOrSemicolonOptional
+  CaptureDocText FieldIdentifier FieldRequiredness FieldType tok_identifier FieldValue XsdOptional XsdNillable XsdAttributes TypeAnnotations CommaOrSemicolonOptional
     {
       pdebug("tok_int_constant : Field -> FieldType tok_identifier");
       if ($2 < 0) {
@@ -878,6 +878,10 @@
       if ($9 != NULL) {
         $$->set_xsd_attrs($9);
       }
+      if ($10 != NULL) {
+        $$->annotations_ = $10->annotations_;
+        delete $10;
+      }
     }
 
 FieldIdentifier:

Modified: incubator/thrift/trunk/test/AnnotationTest.thrift
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/test/AnnotationTest.thrift?rev=919325&r1=919324&r2=919325&view=diff
==============================================================================
--- incubator/thrift/trunk/test/AnnotationTest.thrift (original)
+++ incubator/thrift/trunk/test/AnnotationTest.thrift Fri Mar  5 07:51:51 2010
@@ -20,8 +20,8 @@
 typedef list<i32> ( cpp.template = "std::list" ) int_linked_list
 
 struct foo {
-  1: i32 bar;
-  2: i32 baz;
+  1: i32 bar ( presence = "required" );
+  2: i32 baz ( presence = "manual", cpp.use_pointer = "", );
   3: i32 qux;
   4: i32 bop;
 } (