2 files changed, 86 insertions, 0 deletions
diff --git a/qpid/cpp/rubygen/0-10/specification.rb b/qpid/cpp/rubygen/0-10/specification.rb
index a11abdb877..dbb05fb752 100755
--- a/qpid/cpp/rubygen/0-10/specification.rb
+++ b/qpid/cpp/rubygen/0-10/specification.rb
@@ -117,6 +117,7 @@ class Specification < CppGen
     h_file("#{@dir}/specification") {
       include "#{@dir}/built_in_types"
       include "#{@dir}/complex_types"
+      include "#{@dir}/Map.h"
       include "<boost/call_traits.hpp>"
       include "<iosfwd>"
       genl "using boost::call_traits;"
diff --git a/qpid/cpp/rubygen/0-10/typecode.rb b/qpid/cpp/rubygen/0-10/typecode.rb
new file mode 100755
index 0000000000..459516e51c
--- /dev/null
+++ b/qpid/cpp/rubygen/0-10/typecode.rb
@@ -0,0 +1,85 @@
+#!/usr/bin/env ruby
+$: << ".."                      # Include .. in load path
+require 'cppgen'
+
+class TypeCode < CppGen
+  def initialize(outdir, amqp)
+    super(outdir, amqp)
+    @ns="qpid::amqp_#{@amqp.version.bars}"
+    @dir="qpid/amqp_#{@amqp.version.bars}"
+    @types = @amqp.collect_all(AmqpType).select { |t| t.code }
+
+  end
+
+  def type_for_code_h()
+    h_file("#{@dir}/TypeForCode") {
+      include "#{@dir}/UnknownType.h"
+      namespace(@ns) {
+        genl
+        genl "template <uint8_t Code> struct TypeForCode;"
+        genl
+        @types.each { |t|
+          genl "template <> struct TypeForCode<#{t.code}> {  typedef #{t.typename} type; };"
+        }
+        genl
+        genl "template <class V> typename V::result_type"
+        scope("apply_visitor(V& visitor, uint8_t code) {") {
+          scope("switch (code) {", "}") {
+            @types.each { |t|
+              genl "case #{t.code}: return visitor((#{t.typename}*)0);"
+            }
+            genl "default: return visitor((UnknownType*)0);"
+          }
+        }
+        genl
+        genl "std::string typeName(uint8_t code);"
+      }
+    }
+  end
+
+  def type_for_code_cpp()
+    cpp_file("#{@dir}/TypeForCode") {
+      include "<string>"
+      include "<sstream>"
+      namespace(@ns) {
+        namespace("") { 
+          struct("Names") {
+            scope("Names() {") {
+              scope("for (int i =0; i < 256; ++i) {") {
+                genl "std::ostringstream os;"
+                genl "os << \"UnknownType<\" << i << \">\";"
+                genl "names[i] = os.str();"
+              }
+              @types.each { |t| genl "names[#{t.code}] = \"#{t.name}\";" }
+            }  
+            genl "std::string names[256];"
+          }
+          genl "Names names;"
+        }
+        genl "std::string typeName(uint8_t code) { return names.names[code]; }"
+      }}
+  end
+
+  def code_for_type_h()
+    h_file("#{@dir}/CodeForType") {
+      namespace(@ns) {
+        genl
+        genl "template <class T> struct CodeForType;"
+        genl
+        @types.each { |t|
+          genl "template <> struct CodeForType<#{t.typename}> { static const uint8_t value=#{t.code}; };"
+        }
+        genl
+        genl "template <class T> uint8_t codeFor(const T&) { return CodeForType<T>::value; }"
+      }}
+  end
+  
+  def generate
+    type_for_code_h
+    type_for_code_cpp
+    code_for_type_h
+  end
+end
+
+TypeCode.new($outdir, $amqp).generate();
+