3 files changed, 83 insertions, 6 deletions

diff --git a/qpid/cpp/rubygen/amqpgen.rb b/qpid/cpp/rubygen/amqpgen.rb
index 0da1bfe824..31f7544011 100755
--- a/qpid/cpp/rubygen/amqpgen.rb
+++ b/qpid/cpp/rubygen/amqpgen.rb
@@ -155,7 +155,7 @@ class AmqpRoot < AmqpElement
     from.elements.each { |from_child|
       tag,name = from_child.name, from_child.attributes["name"]
       to_child=to.elements["./#{tag}[@name='#{name}']"]
-      to_child ? merge(to_child, from_child) : to.add(from_child.clone) }
+      to_child ? merge(to_child, from_child) : to.add(from_child.deep_clone) }
   end
 
   private :merge
diff --git a/qpid/cpp/rubygen/cppgen.rb b/qpid/cpp/rubygen/cppgen.rb
index d369d23da1..371cc7cd05 100755
--- a/qpid/cpp/rubygen/cppgen.rb
+++ b/qpid/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
 
diff --git a/qpid/cpp/rubygen/templates/method_variants.rb b/qpid/cpp/rubygen/templates/method_variants.rb
new file mode 100755
index 0000000000..0787657089
--- /dev/null
+++ b/qpid/cpp/rubygen/templates/method_variants.rb
@@ -0,0 +1,72 @@
+#!/usr/bin/env ruby
+$: << ".."                      # Include .. in load path
+require 'cppgen'
+
+# Generate the full AMQP class/method model as C++ types.
+class AmqpCppModelGen < CppGen
+  
+  def initialize(outdir, amqp)
+    super(outdir, amqp)
+  end
+
+  def gen_set_variant(varname, idtype, pairs, errmsg)
+    pairs.sort!
+    scope("inline void setVariant(#{varname}& var, #{idtype} id) {") {
+      scope("switch (id) {") {
+        pairs.each { |i,t| 
+          genl "case #{i}: var=#{t}(); break;";
+        }
+        genl "default: THROW_QPID_ERROR(FRAMING_ERROR, (boost::format(\"#{errmsg}\")%id).str());"
+      }
+    }
+    genl
+  end
+
+  def gen_class(c)
+    varname="#{c.name.caps}Variant"
+    mtypes=c.methods.map { |m| m.body_name }
+    typedef(blank_variant(mtypes), varname)
+    genl
+    pairs=c.methods.map { |m| [m.index.to_i,m.body_name] }
+    gen_set_variant(varname, "MethodId", pairs,
+                    "%d is not a valid method index in class #{c.name}")
+    mtypes.each { |t|
+      genl "template<> struct ClassVariant<#{t}> { typedef #{varname} value; };"
+    }
+    genl
+  end
+
+  def gen_all()
+    varname="MethodVariant"
+    types=@amqp.classes.map { |c| "#{c.name.caps}Variant" }
+    pairs=@amqp.classes.map { |c| [c.index.to_i,"#{c.name.caps}Variant"] }
+    typedef(blank_variant(types), varname) 
+    genl
+    gen_set_variant(varname, "ClassId", pairs,
+                    "%d is not a valid class index.")
+  end
+
+  def generate()
+    h_file("qpid/framing/method_variants.h") {
+      @amqp.methods.each { |m| include "qpid/framing/#{m.body_name}.h"}
+      include "qpid/framing/amqp_types.h"
+      include "qpid/QpidError.h"
+      include "qpid/framing/variant.h"
+      include "<boost/format.hpp>"
+      genl
+      namespace("qpid::framing") {
+        genl "// Metafunction returns class variant containing method T."
+        genl "template <class T> struct ClassVariant {};"
+        genl
+        @amqp.classes.each { |c| gen_class c }
+      }
+      namespace("qpid::framing") {
+        gen_all
+        genl
+      }
+    }
+  end
+end
+
+AmqpCppModelGen.new(Outdir, Amqp).generate();
+