* Summary: new Frame type to replace AMQFrame. Instead of holding

	  a shared_ptr to a heap-allocated AMQBody subclass, it holds the
	  body in-line in a boost::variant of all the concrete AMQBody
	  subclasses. Actually there are nested variants, the compiler
	  does not cope well with a single variant of 130-some types.

	  Creating, encoding and decoding a local Frame doess 0 heap
	  allocation apart from that done by the concrete
	  AMQBody::encode/decode - e.g. method bodies with std::string
	  fields.  for method bodies

	  All variants contain type boost::blank. This guarantees 0 heap
	  alloocation by the variant and represents the "uninitialized"
	  state. variant.h provides NoBlankVisitor to help write visitors
	  for variants containing blank. 
	
	* src/qpid/framing/MethodHolder.h, .cpp: Holds a variant
	  containing a method body. 

	* src/qpid/framing/Frame.h, .cpp: New Frame holds body in a
	  variant rather than via heap allocation.

	* src/qpid/framing/variant.h: Utilities for using boost::variant.

	* src/qpid/framing/amqp_types.h: Added FrameType typedef.

	* src/qpid/framing/AMQMethodBody.h: Friends with MethodHolder.

	* src/Makefile.am:
	 - Improved ruby generation rule.
	 - Run method_variants template.
	 - Added new source files
	 - Pre-compiled header rule for method_variants.h

	* rubygen/templates/method_variants.rb: Generate variants
	  to hold methods of each class, and MethodVariant to hold all
	  the class variants.

	* rubygen/cppgen.rb: variant, tuple methods.

	* MethodBodyClass.h.tmpl: Added default constructor to method bodies.

	* amqpgen.rb (AmqpRoot::merge): fix bug in merge.


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

1 files changed, 10 insertions, 5 deletions

diff --git a/cpp/rubygen/cppgen.rb b/cpp/rubygen/cppgen.rb
index d369d23da1..371cc7cd05 100755
--- a/cpp/rubygen/cppgen.rb
+++ b/cpp/rubygen/cppgen.rb
@@ -128,6 +128,7 @@ class CppGen < Generator
 
   # Write a .cpp file.
   def cpp_file(path)
+    path = (/\.cpp$/ === path ? path : path+".cpp")
     file(path) do
       gen Copyright
       yield
@@ -157,14 +158,18 @@ class CppGen < Generator
     genl
     gen "#{type} #{name}"
     gen ": #{bases.join(', ')}" unless bases.empty?
-    genl "{"
-    yield
-    genl "};"
-    genl
+    scope(" {","};", &block)
   end
 
   def struct(name, *bases, &block) struct_class("struct", name, bases, &block); end
   def class_(name, *bases, &block) struct_class("class", name, bases, &block); end
-  def typedef(type, name) genl "typedef #{type} #{name};" end
+
+  def typedef(type, name) genl "typedef #{type} #{name};\n" end
+
+  def variant(types) "boost::variant<#{types.join(", ")}>"; end
+  def variantl(types) "boost::variant<#{types.join(", \n")}>"; end
+  def blank_variant(types) variant(["boost::blank"]+types); end
+  def tuple(types) "boost::tuple<#{types.join(', ')}>"; end
+  
 end