amqp_0_10: Encoding for packed structs.

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

3 files changed, 27 insertions, 20 deletions

diff --git a/cpp/rubygen/0-10/specification.rb b/cpp/rubygen/0-10/specification.rb
index 020cb63c89..7e73d1c91e 100755
--- a/cpp/rubygen/0-10/specification.rb
+++ b/cpp/rubygen/0-10/specification.rb
@@ -38,10 +38,13 @@ class Specification < CppGen
     genl "const char* NAME=\"#{c.fqname}\";"
   end
 
+  def visitable?(x) x.code and x.size=="4"  end
+  
   # Used by structs, commands and controls.
   def action_struct_h(x, base, consts, &block)
     genl
-    struct(x.classname, "public #{base}") {
+    base = visitable?(x) ? ["public #{base}"] : []
+    struct(x.classname, *base) { 
       x.fields.each { |f| genl "#{f.amqp2cpp} #{f.cppname};" }
       genl
       genl "static const char* NAME;"
@@ -50,10 +53,13 @@ class Specification < CppGen
       }
       genl "static const uint8_t CLASS_CODE=#{x.containing_class.nsname}::CODE;"
       genl "static const char* CLASS_NAME;"
-      ctor_decl(x.classname,[])
-      ctor_decl(x.classname, x.parameters) unless x.fields.empty?
-      genl "void accept(Visitor&);" 
-      genl "void accept(ConstVisitor&) const;"
+      ctor_decl("explicit #{x.classname}", x.parameters(true))
+
+      if visitable? x
+        genl "void accept(Visitor&);" 
+        genl "void accept(ConstVisitor&) const;"
+      end
+
       if (x.fields.empty?)
         genl "template <class S> void serialize(S&) {}"
       else
@@ -75,13 +81,9 @@ class Specification < CppGen
     genl "const char* #{x.classname}::CLASS_NAME=#{x.containing_class.nsname}::NAME;"
     genl
     ctor=x.classname+"::"+x.classname
-    ctor_defn(ctor) {}
-    ctor_defn(ctor, x.parameters, x.initializers) {} if not x.fields.empty?
-    # FIXME aconway 2008-03-04: struct visitors
-    if x.is_a? AmqpStruct
-      genl "void #{x.classname}::accept(Visitor&) { assert(0); }"
-      genl "void #{x.classname}::accept(ConstVisitor&) const { assert(0); }"
-    else
+    ctor_defn(ctor, x.parameters, x.initializers) {}
+
+    if visitable? x
       genl "void #{x.classname}::accept(Visitor& v) {  v.visit(*this); }"
       genl "void #{x.classname}::accept(ConstVisitor& v) const { v.visit(*this); }"
     end
@@ -169,9 +171,7 @@ class Specification < CppGen
       include "#{@dir}/specification_fwd"
       include "#{@dir}/all_built_in_types"
       include "#{@dir}/Packer.h"
-      include "<boost/call_traits.hpp>"
       include "<iosfwd>"
-      genl "using boost::call_traits;"
       namespace(@ns) {
         # Structs that must be generated early because
         # they are used by other definitions:
@@ -190,8 +190,7 @@ class Specification < CppGen
       include "#{@dir}/specification"
       include "#{@dir}/exceptions"
       include "<iostream>"
-      # FIXME aconway 2008-03-04: add Struct visitors.
-      ["Command","Control"].each { |x| include "#{@dir}/Apply#{x}" }
+      ["Command","Control", "Struct"].each { |x| include "#{@dir}/Apply#{x}" }
       namespace(@ns) { 
         each_class_ns { |c|
           class_cpp c
@@ -328,8 +327,7 @@ class Specification < CppGen
     gen_proxy
     gen_visitable("Command", @amqp.collect_all(AmqpCommand))
     gen_visitable("Control", @amqp.collect_all(AmqpControl))
-    # FIXME aconway 2008-03-04: sort out visitable structs.
-    # gen_visitable("Struct", @amqp.collect_all(AmqpStruct))
+    gen_visitable("Struct", @amqp.collect_all(AmqpStruct).select { |s| s.code})
   end
 end
 
diff --git a/cpp/rubygen/amqpgen.rb b/cpp/rubygen/amqpgen.rb
index 9e4bb7c22c..bf473506d4 100755
--- a/cpp/rubygen/amqpgen.rb
+++ b/cpp/rubygen/amqpgen.rb
@@ -312,6 +312,7 @@ class AmqpAction < AmqpElement
   def initialize(xml,amqp) super; end
   amqp_child_reader :implement, :field, :response
   amqp_attr_reader :code
+  def size() "4" end              # Encoded as a size 4 Struct
 end
 
 class AmqpControl < AmqpAction
diff --git a/cpp/rubygen/cppgen.rb b/cpp/rubygen/cppgen.rb
index 0c17b68335..757894163d 100755
--- a/cpp/rubygen/cppgen.rb
+++ b/cpp/rubygen/cppgen.rb
@@ -133,7 +133,10 @@ class AmqpField
     end
     return amqp2cpp
   end
-  def paramtype() "call_traits<#{fqtypename}>::param_type";  end
+  def paramtype()
+    /^(int|uint|char|boolean|bit)/ === type_ ? fqtypename : "const #{fqtypename}&"
+  end
+  def param_default() "=#{fqtypename}()"  end
 end
 
 class AmqpMethod
@@ -151,7 +154,11 @@ class AmqpMethod
 end
 
 module AmqpHasFields
-  def parameters() fields.map { |f| "#{f.paramtype} #{f.cppname}_"} end
+  def parameters(with_default=nil)
+    fields.map { |f|
+      "#{f.paramtype} #{f.cppname}_#{f.param_default if with_default}"
+    }
+  end
   def unused_parameters() fields.map { |f| "#{f.paramtype} /*#{f.cppname}_*/"} end
   def arguments() fields.map { |f| "#{f.cppname}_"} end
   def values() fields.map { |f| "#{f.cppname}"} end
@@ -239,6 +246,7 @@ class AmqpStruct
   def cppname() cpptype.name;  end # preview
   def fqclassname() containing_class.nsname+"::"+name.typename;  end
   def classname() name.typename; end
+  def full_code() (containing_class.code.hex << 8)+code.hex; end
 end
 
 class CppGen < Generator