Yet even better swig assert.

Added more tests to std::vector for map.
Added dup() function to containers.



git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@9732 626c5289-ae23-0410-ae9c-e8d60b6d4f22

Examples/test-suite/ruby/li_std_vector_runme.rb

@@ -64,7 +64,7 @@ dv = DoubleVector.new(10)
 
 swig_assert( "dv.respond_to? :each_with_index", binding )
 
-dv.each_with_index { |e,i| swig_assert("dv[#{i}] == 0.0", binding) }
+dv.each_with_index { |e,i| swig_assert_equal("dv[#{i}]", 0.0, binding) }
 
 0.upto(9) { |i| dv[i] = i/2.0 }
 
@@ -74,16 +74,19 @@ dv.each_with_index { |e,i| swig_assert("dv[#{i}] == 0.0", binding) }
   "dv[0,3].to_s" => "0.00.51.0",
   "dv[3,3].to_s" => "1.52.02.5",
 }.each do |k,v|
-  swig_assert( "#{k} == #{v.inspect}", binding )
+  swig_assert_equal( k, v.inspect, binding )
 end
 
 swig_assert_each_line(<<'EOF', binding)
 dv.delete_at(2)
-dv.delete_if() { |x| x == 2.0 }
+dv.delete_if { |x| x == 2.0 }
 dv.include? 3.0
-dv.find {|x| x==3.0 }
+dv.find {|x| x == 3.0 }
-halve_in_place(dv) == nil
+dv.kind_of? DoubleVector
-dv = [0.0,0.25,0.75,1.25,1.5,1.75,2.0,2.25]
+halved = []
+halved = dv.map { |x| x / 2 }
+halve_in_place(dv)
+halved == dv.to_a
 sv = StructVector.new
 sv << Li_std_vector::Struct.new
 EOF

Examples/test-suite/ruby/swig_assert.rb

@@ -28,18 +28,23 @@ def swig_assert_equal( a, b, scope = nil, msg = nil )
       ok = eval(check.to_s, scope)
     else
       ok = eval(check.to_s)
-      msg = scope if !msg
+      if !msg
+        msg = scope
+        scope = nil
+      end
     end
   rescue => e
     raise
   end
 
   unless ok
-    raise SwigRubyError.new("FAILED CHECK: #{check} was #{eval(a)} #{msg}")
+    valA = eval(a, scope)
+    valB = eval(b, scope)
+    raise SwigRubyError.new("FAILED EQUALITY: #{check} was #{valA} not #{valB}")
   end
 
   if $VERBOSE
-    $stdout.puts "\tPASSED #{check} #{msg}"
+    $stdout.puts "\tPASSED EQUALITY #{check} #{msg}"
   end
 
   return ok
@@ -54,12 +59,44 @@ end
 
 
 #
-# Asserts whether an expression runs properly
+# Asserts whether an expression runs properly and is true
 #
 # scope - optional Binding where to run the code
 # msg   - optional additional message to print
 #
 def swig_assert( expr, scope = nil, msg = nil )
+  begin
+    if scope.kind_of? Binding
+      ok = eval(expr.to_s, scope)
+    else
+      ok = eval(expr.to_s)
+      msg = scope if !msg
+    end
+  rescue
+    raise
+  end
+
+  raise SwigRubyError.new("FAILED: #{expr.to_s} - #{e}") unless ok
+
+  if $VERBOSE
+    $stdout.puts "\tPASSED #{expr} #{msg}"
+  end
+rescue => e
+  trace = e.backtrace[1..-1]
+  $stderr.puts "#{trace[0,1]}: #{e}"
+  if trace.size > 1
+    $stderr.puts "\tfrom #{trace[1..-1].join("\n\t     ")}"
+  end
+  exit(1)
+end
+
+#
+# Asserts whether an expression runs properly
+#
+# scope - optional Binding where to run the code
+# msg   - optional additional message to print
+#
+def swig_eval( expr, scope = nil, msg = nil )
   begin
     if scope.kind_of? Binding
       eval(expr.to_s, scope)
@@ -87,7 +124,7 @@ end
 # Given a set of lines as text, runs each of them, asserting them.
 # Lines that are of the form:
 #     a == b  are run with swig_assert_equal
-#             others are run with swig_assert.
+#             others are run with swig_eval.
 #
 # scope - optional Binding where to run the code
 # msg   - optional additional message to print
@@ -95,10 +132,10 @@ end
 def swig_assert_each_line( lines, scope = nil, msg = nil )
   lines.split("\n").each do |line|
     next if line.empty? or line =~ /^\s*#.*/
-      if line =~ /(.*)\s*==\s*(.*)/
+      if line =~ /^\s*([^\s]*)\s*==\s*(.*)\s*$/
         swig_assert_equal($1, $2, scope, msg)
       else
-        swig_assert(line, scope, msg)
+        swig_eval(line, scope, msg)
       end
   end
 end

Lib/ruby/rubycontainer.swg

@@ -534,7 +534,7 @@ namespace swig
       for ( ; i != e; ++i, comma = true )
 	{
 	  if (comma) str = rb_str_cat2( str, "," );
-	  tmp = swig::from( *i );
+	  tmp = swig::from<Container::value_type>( *i );
 	  tmp = rb_obj_as_string( tmp );
 	  str = rb_str_buf_append( str, tmp );
 	}
@@ -550,7 +550,7 @@ namespace swig
       VALUE tmp;
       for ( ; i != e; ++i )
 	{
-	  tmp = swig::from( *i );
+	  tmp = swig::from<Container::value_type>( *i );
 	  rb_ary_push( ary, tmp );
 	}
       return ary;
@@ -564,7 +564,7 @@ namespace swig
       VALUE tmp;
       for ( ; i != e; ++i )
 	{
-	  tmp = swig::from( *i );
+	  tmp = swig::from<Container::value_type>( *i );
 	  tmp = rb_obj_as_string( tmp );
 	  str = rb_str_buf_append( str, tmp );
 	}
@@ -575,6 +575,16 @@ namespace swig
 
 %define %swig_container_methods(Container...)
 
+  %extend {
+
+  %newobject dup;
+  Container* dup()
+    {
+      return new Container(*$self);
+    }
+
+  }
+
 %enddef
 
 %define %swig_sequence_methods_common(Sequence...)

Lib/ruby/std_vector.i

@@ -26,11 +26,13 @@
 %define %swig_vector_methods(Type...) 
   %swig_sequence_methods(Type)
   %swig_sequence_front_inserters(Type);
+  %swig_container_printing_methods(Type);
 %enddef
 
 %define %swig_vector_methods_val(Type...) 
   %swig_sequence_methods_val(Type);
   %swig_sequence_front_inserters(Type);
+  %swig_container_printing_methods(Type);
 %enddef