Author: aconway
Date: Thu Aug 9 07:39:07 2007
New Revision: 564225
URL: http://svn.apache.org/viewvc?view=rev&rev=564225
Log:
Avoid clash with built-in ruby function Object.methods():n
- Renamed methods*() to amqp_methods, classes*() to amqp_classes.
- Renamed CppGen.class_() to cpp_class.
Modified:
incubator/qpid/trunk/qpid/cpp/rubygen/amqpgen.rb
incubator/qpid/trunk/qpid/cpp/rubygen/cppgen.rb
incubator/qpid/trunk/qpid/cpp/rubygen/samples/Operations.rb
incubator/qpid/trunk/qpid/cpp/rubygen/templates/ClassBodyVariant.rb
incubator/qpid/trunk/qpid/cpp/rubygen/templates/Proxy.rb
incubator/qpid/trunk/qpid/cpp/rubygen/templates/Session.rb
incubator/qpid/trunk/qpid/cpp/rubygen/templates/frame_body_lists.rb
incubator/qpid/trunk/qpid/cpp/rubygen/templates/method_variants.rb
Modified: incubator/qpid/trunk/qpid/cpp/rubygen/amqpgen.rb
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/rubygen/amqpgen.rb?view=diff&rev=564225&r1=564224&r2=564225
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/rubygen/amqpgen.rb (original)
+++ incubator/qpid/trunk/qpid/cpp/rubygen/amqpgen.rb Thu Aug 9 07:39:07 2007
@@ -106,16 +106,16 @@
class AmqpClass < AmqpElement
def initialize(xml,amqp) super; end
def index() attributes["index"]; end
- def methods()
- @cache_methods ||= elements.collect("method") { |el|
+ def amqp_methods()
+ @cache_amqp_methods ||= elements.collect("method") { |el|
AmqpMethod.new(el,self)
}.sort_by_name
end
# chassis should be "client" or "server"
- def methods_on(chassis)
- @cache_methods_on ||= { }
- @cache_methods_on[chassis] ||= elements.collect("method/[EMAIL
PROTECTED]'#{chassis}']/..") { |m|
+ def amqp_methods_on(chassis)
+ @cache_amqp_methods_on ||= { }
+ @cache_amqp_methods_on[chassis] ||= elements.collect("method/[EMAIL
PROTECTED]'#{chassis}']/..") { |m|
AmqpMethod.new(m,self)
}.sort_by_name
end
@@ -139,17 +139,17 @@
attributes["major"]+"-"+attributes["minor"]
end
- def classes()
- @cache_classes ||= elements.collect("class") { |c| AmqpClass.new(c,self)
}.sort_by_name
+ def amqp_classes()
+ @cache_amqp_classes ||= elements.collect("class") { |c|
AmqpClass.new(c,self) }.sort_by_name
end
# Return all methods on all classes.
- def methods() classes.collect { |c| c.methods }.flatten; end
+ def amqp_methods() amqp_classes.collect { |c| c.amqp_methods }.flatten; end
# Return all methods on chassis for all classes.
- def methods_on(chassis)
- @cache_methods_on ||= { }
- @cache_methods_on[chassis] ||= classes.collect { |c| c.methods_on(chassis)
}.flatten
+ def amqp_methods_on(chassis)
+ @cache_amqp_methods_on ||= { }
+ @cache_amqp_methods_on[chassis] ||= amqp_classes.collect { |c|
c.amqp_methods_on(chassis) }.flatten
end
# Merge contents of elements.
Modified: incubator/qpid/trunk/qpid/cpp/rubygen/cppgen.rb
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/rubygen/cppgen.rb?view=diff&rev=564225&r1=564224&r2=564225
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/rubygen/cppgen.rb (original)
+++ incubator/qpid/trunk/qpid/cpp/rubygen/cppgen.rb Thu Aug 9 07:39:07 2007
@@ -162,7 +162,7 @@
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 cpp_class(name, *bases, &block) struct_class("class", name, bases,
&block); end
def typedef(type, name) genl "typedef #{type} #{name};\n" end
Modified: incubator/qpid/trunk/qpid/cpp/rubygen/samples/Operations.rb
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/rubygen/samples/Operations.rb?view=diff&rev=564225&r1=564224&r2=564225
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/rubygen/samples/Operations.rb (original)
+++ incubator/qpid/trunk/qpid/cpp/rubygen/samples/Operations.rb Thu Aug 9
07:39:07 2007
@@ -31,7 +31,7 @@
virtual ~#{handlerclass}() {}
// Protocol methods
EOS
- c.methods_on(@chassis).each { |m| handler_method(m) }
+ c.amqp_methods_on(@chassis).each { |m| handler_method(m) }
gen <<EOS
}; // class #{handlerclass}
@@ -65,13 +65,13 @@
// Inner classes
EOS
- indent { @amqp.classes.each { |c| handler_class(c) } }
+ indent { @amqp.amqp_classes.each { |c| handler_class(c) } }
gen <<EOS
// Method handler get methods
EOS
- indent { @amqp.classes.each { |c| handler_get(c) } }
+ indent { @amqp.amqp_classes.each { |c| handler_get(c) } }
gen <<EOS
}; /* class [EMAIL PROTECTED] */
}
Modified: incubator/qpid/trunk/qpid/cpp/rubygen/templates/ClassBodyVariant.rb
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/rubygen/templates/ClassBodyVariant.rb?view=diff&rev=564225&r1=564224&r2=564225
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/rubygen/templates/ClassBodyVariant.rb
(original)
+++ incubator/qpid/trunk/qpid/cpp/rubygen/templates/ClassBodyVariant.rb Thu Aug
9 07:39:07 2007
@@ -10,18 +10,18 @@
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
Modified: incubator/qpid/trunk/qpid/cpp/rubygen/templates/Proxy.rb
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/rubygen/templates/Proxy.rb?view=diff&rev=564225&r1=564224&r2=564225
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/rubygen/templates/Proxy.rb (original)
+++ incubator/qpid/trunk/qpid/cpp/rubygen/templates/Proxy.rb Thu Aug 9
07:39:07 2007
@@ -36,7 +36,7 @@
// 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 @@
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 @@
// 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 [EMAIL PROTECTED] */
@@ -112,7 +112,7 @@
include "[EMAIL PROTECTED]"
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 @@
[EMAIL PROTECTED]::[EMAIL PROTECTED](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
Modified: incubator/qpid/trunk/qpid/cpp/rubygen/templates/Session.rb
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/rubygen/templates/Session.rb?view=diff&rev=564225&r1=564224&r2=564225
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/rubygen/templates/Session.rb (original)
+++ incubator/qpid/trunk/qpid/cpp/rubygen/templates/Session.rb Thu Aug 9
07:39:07 2007
@@ -24,7 +24,7 @@
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 @@
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 @@
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 [EMAIL PROTECTED] */
}
@@ -122,7 +122,7 @@
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
Modified: incubator/qpid/trunk/qpid/cpp/rubygen/templates/frame_body_lists.rb
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/rubygen/templates/frame_body_lists.rb?view=diff&rev=564225&r1=564224&r2=564225
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/rubygen/templates/frame_body_lists.rb
(original)
+++ incubator/qpid/trunk/qpid/cpp/rubygen/templates/frame_body_lists.rb Thu Aug
9 07:39:07 2007
@@ -15,7 +15,7 @@
*/
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
Modified: incubator/qpid/trunk/qpid/cpp/rubygen/templates/method_variants.rb
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/rubygen/templates/method_variants.rb?view=diff&rev=564225&r1=564224&r2=564225
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/rubygen/templates/method_variants.rb
(original)
+++ incubator/qpid/trunk/qpid/cpp/rubygen/templates/method_variants.rb Thu Aug
9 07:39:07 2007
@@ -24,10 +24,10 @@
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 @@
def gen_all()
varname="MethodVariant"
- [EMAIL PROTECTED] { |c| "#{c.name.caps}Variant" }
- [EMAIL PROTECTED] { |c| [c.index.to_i,"#{c.name.caps}Variant"] }
+ [EMAIL PROTECTED] { |c| "#{c.name.caps}Variant" }
+ [EMAIL PROTECTED] { |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 @@
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 @@
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
