Add support for pointers to shared_ptr and null shared_ptr in Ruby containers

Upcasting of pointers to shared_ptr would need some more fundamental
changes, but not done yet ... pointers to shared_ptr are not common.

Examples/test-suite/cpp11_shared_ptr_upcast.i

@@ -36,27 +36,27 @@ typedef std::shared_ptr<Derived> DerivedPtr;
 
 // non-overloaded
 int derived_num1(DerivedPtr v) {
- return (*v).get_n();
+ return v == nullptr ? 999 : (*v).get_n();
 }
 
 int derived_num2(std::vector<DerivedPtr> v) {
- return (*v[0]).get_n();
+ return v[0] == nullptr ? 999 : (*v[0]).get_n();
 }
 
 int derived_num3(std::map<int, DerivedPtr> v) {
- return (*v[0]).get_n();
+ return v[0] == nullptr ? 999 : (*v[0]).get_n();
 }
 
 int base_num1(BasePtr v) {
- return (*v).get_m();
+ return v == nullptr ? 999 : (*v).get_m();
 }
 
 int base_num2(std::vector<BasePtr > v) {
- return (*v[0]).get_m();
+ return v[0] == nullptr ? 999 : (*v[0]).get_m();
 }
 
 int base_num3(std::map<int, BasePtr > v) {
- return (*v[0]).get_m();
+ return v[0] == nullptr ? 999 : (*v[0]).get_m();
 }
 
 // overloaded
@@ -128,3 +128,61 @@ int derived_num(std::map<int, DerivedPtr> v);
 int base_num(BasePtr);
 int base_num(std::vector<std::shared_ptr<Base> > v);
 int base_num(std::map<int, BasePtr > v);
+
+// ptr to shared_ptr
+%shared_ptr(Base2);
+%shared_ptr(Derived2)
+
+%inline %{
+class Base2 {
+public:
+  Base2() : m(-1) {}
+  Base2(int i) : m(i) {}
+  int get_m() { return m; }
+  int m;
+};
+
+
+class Derived2 : public Base2 {
+public:
+  Derived2() : n(0) {}
+  Derived2(int i) : n(i) {}
+  int get_n_2() { return n; }
+  int n;
+};
+%}
+
+%template(Base2List) std::vector<std::shared_ptr<Base2> * >;
+%template(Base2Map) std::map<int, std::shared_ptr<Base2> * >;
+
+%template(Derived2List) std::vector<std::shared_ptr<Derived2> * >;
+%template(Derived2Map) std::map<int, std::shared_ptr<Derived2> * >;
+
+%inline %{
+typedef std::shared_ptr<Derived2> * Derived2Ptr;
+typedef std::shared_ptr<Base2> * Base2Ptr;
+
+int base2_num1(Base2Ptr v) {
+  return v == nullptr ? 999 : *v == nullptr ? 888 : (*v)->get_m();
+}
+
+int base2_num2(std::vector<Base2Ptr> v) {
+  return v[0] == nullptr ? 999 : *v[0] == nullptr ? 888 : (*v[0])->get_m();
+}
+
+int base2_num3(std::map<int, Base2Ptr> v) {
+  return v[0] == nullptr ? 999 : *v[0] == nullptr ? 888 : (*v[0])->get_m();
+}
+
+int derived2_num1(Derived2Ptr v) {
+  return v == nullptr ? 999 : *v == nullptr ? 888 : (*v)->get_n_2();
+}
+
+int derived2_num2(std::vector<Derived2Ptr> v) {
+  return v[0] == nullptr ? 999 : *v[0] == nullptr ? 888 : (*v[0])->get_n_2();
+}
+
+int derived2_num3(std::map<int, Derived2Ptr> v) {
+  return v[0] == nullptr ? 999 : *v[0] == nullptr ? 888 : (*v[0])->get_n_2();
+}
+%}

Examples/test-suite/ruby/cpp11_shared_ptr_upcast_runme.rb

@@ -13,6 +13,14 @@ simple_assert_equal(-1, base_num1(Derived.new(7)) )
 simple_assert_equal(-1, base_num2([Derived.new(7)]) )
 simple_assert_equal(-1, base_num3({0 => Derived.new(7)}) )
 
+simple_assert_equal( 999, derived_num1(nil) )
+simple_assert_equal( 999, derived_num2([nil]) )
+simple_assert_equal( 999, derived_num3({0 => nil}) )
+
+simple_assert_equal( 999, base_num1(nil) )
+simple_assert_equal( 999, base_num2([nil]) )
+simple_assert_equal( 999, base_num3({0 => nil}) )
+
 # overloaded
 simple_assert_equal( 7, derived_num(Derived.new(7)) )
 simple_assert_equal( 7, derived_num([Derived.new(7)]) )
@@ -21,3 +29,32 @@ simple_assert_equal( 7, derived_num({0 => Derived.new(7)}) )
 simple_assert_equal(-1, base_num(Derived.new(7)) )
 simple_assert_equal(-1, base_num([Derived.new(7)]) )
 simple_assert_equal(-1, base_num({0 => Derived.new(7)}) )
+
+# ptr to shared_ptr
+simple_assert_equal( 7, derived2_num1(Derived2.new(7)) )
+simple_assert_equal( 7, derived2_num2([Derived2.new(7)]) )
+simple_assert_equal( 7, derived2_num3({0 => Derived2.new(7)}) )
+
+simple_assert_equal( -1, base2_num1(Derived2.new(7)) )
+
+begin
+    # Upcast for pointers to shared_ptr in this generic framework has not been implemented
+    simple_assert_equal( -1, base2_num2([Derived2.new(7)]) )
+    raise RuntimeError, "Failed to catch TypeError"
+rescue TypeError
+end
+begin
+    # Upcast for pointers to shared_ptr in this generic framework has not been implemented
+    simple_assert_equal( -1, base2_num3({0 => Derived2.new(7)}) )
+    raise RuntimeError, "Failed to catch TypeError"
+rescue TypeError
+end
+
+simple_assert_equal( 888, derived2_num1(nil) )
+simple_assert_equal( 999, derived2_num2([nil]) ) # although 888 would be more consistent
+simple_assert_equal( 999, derived2_num3({0 => nil}) ) # although 888 would be more consistent
+
+simple_assert_equal( 888, base2_num1(nil) )
+simple_assert_equal( 999, base2_num2([nil]) ) # although 888 would be more consistent
+simple_assert_equal( 999, base2_num3({0 => nil}) ) # although 888 would be more consistent
+