Merge branch 'goatshriek-ruby-alias'

* goatshriek-ruby-alias:
  Fix ruby %alias directive for native c functions

Examples/test-suite/ruby/Makefile.in

@@ -22,6 +22,7 @@ CPP_TEST_CASES = \
 	li_std_stack \
 	li_std_wstring \
 	primitive_types \
+	ruby_alias_method \
 	ruby_keywords \
 	ruby_minherit_shared_ptr \
 	ruby_naming \
@@ -44,6 +45,8 @@ CPP11_TEST_CASES = \
 
 C_TEST_CASES += \
 	li_cstring \
+	ruby_alias_global_function \
+	ruby_alias_module_function \
 	ruby_manual_proxy \
 
 include $(srcdir)/../common.mk
@@ -52,6 +55,7 @@ include $(srcdir)/../common.mk
 SWIGOPT += -w801 -noautorename -features autodoc=4
 
 # Custom tests - tests with additional commandline options
+ruby_alias_global_function.ctest: SWIGOPT += -globalmodule
 ruby_naming.cpptest: SWIGOPT += -autorename
 
 # Rules for the different types of tests

Examples/test-suite/ruby/ruby_alias_global_function_runme.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+#
+# Runtime tests for ruby_alias_global_function.i
+#
+
+require 'swig_assert'
+require 'ruby_alias_global_function'
+
+expected_name = get_my_name
+
+swig_assert(fullname == expected_name, msg: "nickname not working as expected")
+swig_assert(nickname == expected_name, msg: "fullname not working as expected")
+
+if method(:nickname).respond_to?(:original_name)
+  swig_assert_equal_simple(method(:nickname).original_name, :get_my_name)
+  swig_assert_equal_simple(method(:fullname).original_name, :get_my_name)
+else
+  swig_assert(method(:nickname) == method(:get_my_name), msg: "nickname is not an alias of get_my_name")
+  swig_assert(method(:fullname) == method(:get_my_name), msg: "fullname is not an alias of get_my_name")
+end

Examples/test-suite/ruby/ruby_alias_method_runme.rb

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+#
+# Runtime tests for ruby_alias_method.i
+#
+
+require 'swig_assert'
+require 'ruby_alias_method'
+
+include Ruby_alias_method
+
+expected_name = "Chester Tester"
+syn = Synonym.new(expected_name)
+
+swig_assert(syn.getMyName() == expected_name, msg: "getMyName not working as expected")
+swig_assert(syn.nickname() == expected_name, msg: "nickname not working as expected")
+swig_assert(syn.fullname() == expected_name, msg: "fullname not working as expected")
+
+if syn.method(:nickname).respond_to?(:original_name)
+  swig_assert_equal_simple(syn.method(:nickname).original_name, :getMyName)
+  swig_assert_equal_simple(syn.method(:fullname).original_name, :getMyName)
+else
+  swig_assert(syn.method(:nickname) == syn.method(:getMyName))
+  swig_assert(syn.method(:fullname) == syn.method(:getMyName))
+end

Examples/test-suite/ruby/ruby_alias_module_function_runme.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+#
+# Runtime tests for ruby_alias_module_function.i
+#
+
+require 'swig_assert'
+require 'ruby_alias_module_function'
+
+include Ruby_alias_module_function
+
+expected_name = Ruby_alias_module_function.get_my_name
+
+swig_assert(Ruby_alias_module_function.nickname == expected_name, msg: "nickname returned a different result than get_my_name")
+swig_assert(Ruby_alias_module_function.fullname == expected_name, msg: "fullname returned a different result than get_my_name")
+
+nickname_method =  Ruby_alias_module_function.method(:nickname)
+fullname_method =  Ruby_alias_module_function.method(:fullname)
+
+if nickname_method.respond_to?(:original_name)
+  swig_assert_equal_simple(nickname_method.original_name, :get_my_name)
+  swig_assert_equal_simple(fullname_method.original_name, :get_my_name)
+else
+  original_method = Ruby_alias_module_function.method(:get_my_name)
+  swig_assert(nickname_method == original_method, msg: "nickname is not an alias of get_my_name")
+  swig_assert(fullname_method == original_method, msg: "fullname is not an alias of get_my_name")
+end

Examples/test-suite/ruby_alias_global_function.i

@@ -0,0 +1,11 @@
+%module ruby_alias_global_function
+
+%alias get_my_name "nickname,fullname";
+
+%inline %{
+
+const char *get_my_name(){
+  return "Chester Tester";
+}
+
+%}

Examples/test-suite/ruby_alias_method.i

@@ -0,0 +1,26 @@
+%module ruby_alias_method
+%include <std_string.i>
+
+%alias Synonym::getMyName "nickname,fullname"
+
+%inline %{
+
+class Synonym {
+private:
+  std::string myName;
+
+public:
+  Synonym(std::string myName);
+
+  std::string getMyName();
+};
+
+Synonym::Synonym(std::string myName){
+  this->myName = myName;
+};
+
+std::string Synonym::getMyName(){
+  return this->myName;
+};
+
+%}

Examples/test-suite/ruby_alias_module_function.i

@@ -0,0 +1,11 @@
+%module ruby_alias_module_function
+
+%alias get_my_name "nickname,fullname";
+
+%inline %{
+
+const char *get_my_name(){
+  return "Chester Tester";
+}
+
+%}

Source/Modules/ruby.cxx

@@ -1316,7 +1316,13 @@ public:
 	Iterator alias = First(aliases);
 	while (alias.item) {
 	  if (Len(alias.item) > 0) {
-	    if (multipleInheritance) {
+	    if (current == NO_CPP) {
+	      if (useGlobalModule) {
+	        Printv(f_init, tab4, "rb_define_alias(rb_cObject, \"", alias.item, "\", \"", iname, "\");\n", NIL);
+	      } else {
+	        Printv(f_init, tab4, "rb_define_alias(rb_singleton_class(", modvar, "), \"", alias.item, "\", \"", iname, "\");\n", NIL);
+	      }
+	    } else if (multipleInheritance) {
 	      Printv(klass->init, tab4, "rb_define_alias(", klass->mImpl, ", \"", alias.item, "\", \"", iname, "\");\n", NIL);
 	    } else {
 	      Printv(klass->init, tab4, "rb_define_alias(", klass->vname, ", \"", alias.item, "\", \"", iname, "\");\n", NIL);