Fixed slice2matlab generated code type for dictionary data members

Close #256

2 files changed, 34 insertions, 0 deletions

diff --git a/ruby/test/Ice/objects/AllTests.rb b/ruby/test/Ice/objects/AllTests.rb
index a41df03cb91..ec2ebd0603f 100644
--- a/ruby/test/Ice/objects/AllTests.rb
+++ b/ruby/test/Ice/objects/AllTests.rb
@@ -370,5 +370,24 @@ def allTests(helper, communicator)
     test(communicator.getValueFactoryManager().find('TestOF') != nil)
     puts "ok"
 
+    print "testing class containing complex dictionary... "
+    STDOUT.flush
+    m = Test::M.new
+    m.v = {}
+    k1 = Test::StructKey.new(1, "1")
+    m.v[k1] = Test::L.new("one")
+    k2 = Test::StructKey.new(2, "2")
+    m.v[k2] = Test::L.new("two")
+    m1, m2 = initial.opM(m)
+    test(m1.v.length == 2)
+    test(m2.v.length == 2)
+
+    test(m1.v[k1].data == "one")
+    test(m2.v[k1].data == "one")
+
+    test(m1.v[k2].data == "two")
+    test(m2.v[k2].data == "two")
+    puts "ok"
+
     return initial
 end
diff --git a/ruby/test/Ice/objects/Test.ice b/ruby/test/Ice/objects/Test.ice
index 2f31f0f930d..41af54b8b5c 100644
--- a/ruby/test/Ice/objects/Test.ice
+++ b/ruby/test/Ice/objects/Test.ice
@@ -155,6 +155,19 @@ class L
 sequence<Value> ValueSeq;
 dictionary<string, Value> ValueMap;
 
+struct StructKey
+{
+    int i;
+    string s;
+}
+
+dictionary<StructKey, L> LMap;
+
+class M
+{
+    LMap v;
+}
+
 class Initial
 {
     void shutdown();
@@ -192,6 +205,8 @@ class Initial
     BaseSeq opBaseSeq(BaseSeq inSeq, out BaseSeq outSeq);
 
     Compact getCompact();
+
+    M opM(M v1, out M v2);
 }
 
 }