diff options
Diffstat (limited to 'cpp/rubygen/templates')
| -rwxr-xr-x | cpp/rubygen/templates/ClassBodyVariant.rb | 6 | ||||
| -rwxr-xr-x | cpp/rubygen/templates/Proxy.rb | 18 | ||||
| -rw-r--r-- | cpp/rubygen/templates/Session.rb | 8 | ||||
| -rw-r--r-- | cpp/rubygen/templates/frame_body_lists.rb | 2 | ||||
| -rwxr-xr-x | cpp/rubygen/templates/method_variants.rb | 12 |
5 files changed, 23 insertions, 23 deletions
diff --git a/cpp/rubygen/templates/ClassBodyVariant.rb b/cpp/rubygen/templates/ClassBodyVariant.rb index a1dada40a5..dce14c5652 100755 --- a/cpp/rubygen/templates/ClassBodyVariant.rb +++ b/cpp/rubygen/templates/ClassBodyVariant.rb @@ -10,18 +10,18 @@ class ClassBodyVariant < CppGen def class_body(c) h_file (c.body_name) { - c.methods.each { |m| genl "#include \"#{m.body_name}.h\""; } + c.amqp_methods.each { |m| genl "#include \"#{m.body_name}.h\""; } genl genl "#include <boost/visitor.hpp>" genl gen "typedef boost::variant<" - indent { genl c.methods().collect { |m| m.body_name }.join(",\n") } + indent { genl c.amqp_methods().collect { |m| m.body_name }.join(",\n") } genl "> #{c.body_name};" } end def generate() - @amqp.classes.each{ |c| class_body c } + @amqp.amqp_classes.each{ |c| class_body c } end end diff --git a/cpp/rubygen/templates/Proxy.rb b/cpp/rubygen/templates/Proxy.rb index 16824b3083..40eaa2baa3 100755 --- a/cpp/rubygen/templates/Proxy.rb +++ b/cpp/rubygen/templates/Proxy.rb @@ -36,7 +36,7 @@ class ProxyGen < CppGen // Protocol methods EOS - indent(2) { c.methods_on(@chassis).each { |m| inner_method_decl(m) } } + indent(2) { c.amqp_methods_on(@chassis).each { |m| inner_method_decl(m) } } gen "\n }; // class #{cname}\n\n" end @@ -48,7 +48,7 @@ EOS def inner_class_defn(c) cname=c.cppname gen "// ==================== class #{cname} ====================\n" - c.methods_on(@chassis).each { |m| inner_method_defn(m, cname) } + c.amqp_methods_on(@chassis).each { |m| inner_method_defn(m, cname) } end def inner_method_defn(m,cname) @@ -90,14 +90,14 @@ public: // Inner class definitions EOS - @amqp.classes.each{ |c| inner_class_decl(c) } + @amqp.amqp_classes.each{ |c| inner_class_decl(c) } gen " // Inner class instance get methods\n" - @amqp.classes.each{ |c| get_decl(c) } + @amqp.amqp_classes.each{ |c| get_decl(c) } gen <<EOS private: // Inner class instances EOS - indent { @amqp.classes.each{ |c| gen c.cppname+" "+proxy_member(c)+";\n" } } + indent { @amqp.amqp_classes.each{ |c| gen c.cppname+" "+proxy_member(c)+";\n" } } gen <<EOS }; /* class #{@classname} */ @@ -112,7 +112,7 @@ EOS include "#{@classname}.h" include "qpid/framing/ChannelAdapter.h" include "qpid/framing/amqp_types_full.h" - @amqp.methods_on(@chassis).each { + @amqp.amqp_methods_on(@chassis).each { |m| include "qpid/framing/#{m.body_name}.h" } gen <<EOS namespace qpid { @@ -121,15 +121,15 @@ namespace framing { #{@classname}::#{@classname}(ChannelAdapter& ch) : EOS gen " Proxy(ch)" - @amqp.classes.each { |c| gen ",\n "+proxy_member(c)+"(channel)" } + @amqp.amqp_classes.each { |c| gen ",\n "+proxy_member(c)+"(channel)" } gen <<EOS {} // Inner class instance get methods EOS - @amqp.classes.each { |c| get_defn(c) } + @amqp.amqp_classes.each { |c| get_defn(c) } gen " // Inner class implementation\n\n" - @amqp.classes.each { |c| inner_class_defn(c) } + @amqp.amqp_classes.each { |c| inner_class_defn(c) } genl "}} // namespae qpid::framing" } end diff --git a/cpp/rubygen/templates/Session.rb b/cpp/rubygen/templates/Session.rb index 5289a6af30..fd861b7a4e 100644 --- a/cpp/rubygen/templates/Session.rb +++ b/cpp/rubygen/templates/Session.rb @@ -24,7 +24,7 @@ class SessionGen < CppGen end def declare_class(c) - c.methods_on(@chassis).each { |m| declare_method(m) } + c.amqp_methods_on(@chassis).each { |m| declare_method(m) } end def define_method (m) @@ -55,7 +55,7 @@ class SessionGen < CppGen end def define_class(c) - c.methods_on(@chassis).each { |m| define_method(m) } + c.amqp_methods_on(@chassis).each { |m| define_method(m) } end def generate() @@ -92,7 +92,7 @@ public: void close() { impl->close(); parent->released(impl); } EOS - indent { @amqp.classes.each { |c| declare_class(c) if !excludes.include?(c.name) } } + indent { @amqp.amqp_classes.each { |c| declare_class(c) if !excludes.include?(c.name) } } gen <<EOS }; /* class #{@classname} */ } @@ -122,7 +122,7 @@ namespace client { EOS - @amqp.classes.each { |c| define_class(c) if !excludes.include?(c.name) } + @amqp.amqp_classes.each { |c| define_class(c) if !excludes.include?(c.name) } gen <<EOS }} // namespace qpid::client diff --git a/cpp/rubygen/templates/frame_body_lists.rb b/cpp/rubygen/templates/frame_body_lists.rb index 33c416fe84..25231e7e1a 100644 --- a/cpp/rubygen/templates/frame_body_lists.rb +++ b/cpp/rubygen/templates/frame_body_lists.rb @@ -15,7 +15,7 @@ class FrameBodyListsGen < CppGen */ EOS gen "#define METHOD_BODIES() " - @amqp.methods.each { |m| gen "\\\n (#{m.body_name}) " } + @amqp.amqp_methods.each { |m| gen "\\\n (#{m.body_name}) " } gen <<EOS diff --git a/cpp/rubygen/templates/method_variants.rb b/cpp/rubygen/templates/method_variants.rb index 0787657089..886c7559bb 100755 --- a/cpp/rubygen/templates/method_variants.rb +++ b/cpp/rubygen/templates/method_variants.rb @@ -24,10 +24,10 @@ class AmqpCppModelGen < CppGen def gen_class(c) varname="#{c.name.caps}Variant" - mtypes=c.methods.map { |m| m.body_name } + mtypes=c.amqp_methods.map { |m| m.body_name } typedef(blank_variant(mtypes), varname) genl - pairs=c.methods.map { |m| [m.index.to_i,m.body_name] } + pairs=c.amqp_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| @@ -38,8 +38,8 @@ class AmqpCppModelGen < CppGen 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"] } + types=@amqp.amqp_classes.map { |c| "#{c.name.caps}Variant" } + pairs=@amqp.amqp_classes.map { |c| [c.index.to_i,"#{c.name.caps}Variant"] } typedef(blank_variant(types), varname) genl gen_set_variant(varname, "ClassId", pairs, @@ -48,7 +48,7 @@ class AmqpCppModelGen < CppGen def generate() h_file("qpid/framing/method_variants.h") { - @amqp.methods.each { |m| include "qpid/framing/#{m.body_name}.h"} + @amqp.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" @@ -58,7 +58,7 @@ class AmqpCppModelGen < CppGen genl "// Metafunction returns class variant containing method T." genl "template <class T> struct ClassVariant {};" genl - @amqp.classes.each { |c| gen_class c } + @amqp.amqp_classes.each { |c| gen_class c } } namespace("qpid::framing") { gen_all |