Ruby: Replace all occurences of STR2CSTR macro with calls to StringValuePtr

STR2CSTR was deprecated in Ruby since years and got finally removed
in Ruby 1.9


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

CHANGES.current

@@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 2.0.9 (in progress)
 ===========================
 
+2012-12-14: kkaempf
+            [Ruby] Apply patch 3530439 and finally replace all occurences of the STR2CSTR() macro
+            with StringValuePtr(). STR2CSTR was deprecated since years and got removed in Ruby 1.9
+
 2012-12-14: kkaempf
             [Ruby] Applied patches #3530442 and 3530443 to adapt compile and runtime include
             pathes to match Ruby 1.9+

Doc/Manual/Ruby.html

@@ -4926,7 +4926,7 @@ arguments. For example: </p>
 
 
 <div class="code">
-<pre>%typemap(in) (char *str, int len) {<br> $1 = STR2CSTR($input);<br> $2 = (int) RSTRING($input)-&gt;len;<br>};<br><br>int count(char c, char *str, int len);<br></pre>
+<pre>%typemap(in) (char *str, int len) {<br> $1 = StringValuePtr($input);<br> $2 = (int) RSTRING($input)-&gt;len;<br>};<br><br>int count(char c, char *str, int len);<br></pre>
 
 
 
@@ -7135,7 +7135,7 @@ Ruby_Format_TypeError( "$1_name", "$1_type","$symname", $argnum, $input
     </tr>
 
     <tr>
-      <td style="font-family: monospace;">char * STR2CSTR(String)</td>
+      <td style="font-family: monospace;">char * StringValuePtr(String)</td>
       <td style="font-family: monospace;">SWIG_AsCharPtrAndSize(VALUE, char*, size_t, int* alloc)</td>
     </tr>
 
@@ -7518,7 +7518,7 @@ Array instance to be used as a <tt>char **</tt> object. </p>
 
 
 <div class="code">
-<pre>%module argv<br><br>// This tells SWIG to treat char ** as a special case<br>%typemap(in) char ** {<br> /* Get the length of the array */<br> int size = RARRAY($input)-&gt;len; <br> int i;<br> $1 = (char **) malloc((size+1)*sizeof(char *));<br> /* Get the first element in memory */<br> VALUE *ptr = RARRAY($input)-&gt;ptr; <br> for (i=0; i &lt; size; i++, ptr++)<br> /* Convert Ruby Object String to char* */<br> $1[i]= STR2CSTR(*ptr); <br> $1[i]=NULL; /* End of list */<br>}<br><br>// This cleans up the char ** array created before <br>// the function call<br><br>%typemap(freearg) char ** {<br> free((char *) $1);<br>}<br><br>// Now a test function<br>%inline %{<br>int print_args(char **argv) {<br> int i = 0;<br> while (argv[i]) {<br> printf("argv[%d] = %s\n", i,argv[i]);<br> i++;<br> }<br> return i;<br>}<br>%}<br><br></pre>
+<pre>%module argv<br><br>// This tells SWIG to treat char ** as a special case<br>%typemap(in) char ** {<br> /* Get the length of the array */<br> int size = RARRAY($input)-&gt;len; <br> int i;<br> $1 = (char **) malloc((size+1)*sizeof(char *));<br> /* Get the first element in memory */<br> VALUE *ptr = RARRAY($input)-&gt;ptr; <br> for (i=0; i &lt; size; i++, ptr++)<br> /* Convert Ruby Object String to char* */<br> $1[i]= StringValuePtr(*ptr); <br> $1[i]=NULL; /* End of list */<br>}<br><br>// This cleans up the char ** array created before <br>// the function call<br><br>%typemap(freearg) char ** {<br> free((char *) $1);<br>}<br><br>// Now a test function<br>%inline %{<br>int print_args(char **argv) {<br> int i = 0;<br> while (argv[i]) {<br> printf("argv[%d] = %s\n", i,argv[i]);<br> i++;<br> }<br> return i;<br>}<br>%}<br><br></pre>
 
 
 
@@ -7796,7 +7796,7 @@ equivalents and store them in our local C arrays: </p>
 
 
 <div class="code">
-<pre>%typemap(in) (int nattributes, const char **names, const int *values)<br> (VALUE keys_arr, int i, VALUE key, VALUE val) {<br> Check_Type($input, T_HASH);<br> $1 = NUM2INT(rb_funcall($input, rb_intern("size"), 0, NULL));<br> $2 = NULL;<br> $3 = NULL;<br> if ($1 &gt; 0) {<br> $2 = (char **) malloc($1*sizeof(char *));<br> $3 = (int *) malloc($1*sizeof(int));<br> keys_arr = rb_funcall($input, rb_intern("keys"), 0, NULL);<br> for (i = 0; i &lt; $1; i++) {<br> key = rb_ary_entry(keys_arr, i);<br> val = rb_hash_aref($input, key);<br> Check_Type(key, T_STRING);<br> Check_Type(val, T_FIXNUM);<br> <b>$2[i] = STR2CSTR(key);<br> $3[i] = NUM2INT(val);</b><br>}<br>}<br>}<br></pre>
+<pre>%typemap(in) (int nattributes, const char **names, const int *values)<br> (VALUE keys_arr, int i, VALUE key, VALUE val) {<br> Check_Type($input, T_HASH);<br> $1 = NUM2INT(rb_funcall($input, rb_intern("size"), 0, NULL));<br> $2 = NULL;<br> $3 = NULL;<br> if ($1 &gt; 0) {<br> $2 = (char **) malloc($1*sizeof(char *));<br> $3 = (int *) malloc($1*sizeof(int));<br> keys_arr = rb_funcall($input, rb_intern("keys"), 0, NULL);<br> for (i = 0; i &lt; $1; i++) {<br> key = rb_ary_entry(keys_arr, i);<br> val = rb_hash_aref($input, key);<br> Check_Type(key, T_STRING);<br> Check_Type(val, T_FIXNUM);<br> <b>$2[i] = StringValuePtr(key);<br> $3[i] = NUM2INT(val);</b><br>}<br>}<br>}<br></pre>
 
 
 

Examples/ruby/hashargs/example.i

@@ -14,7 +14,7 @@
       val = rb_hash_aref($input, key);
       Check_Type(key, T_STRING);
       Check_Type(val, T_FIXNUM);
-      $2[i] = STR2CSTR(key);
+      $2[i] = StringValuePtr(key);
       $3[i] = NUM2INT(val);
     }
   }

Examples/ruby/multimap/example.i

@@ -31,7 +31,7 @@ extern int    gcd(int x, int y);
       free($2);
       SWIG_exception(SWIG_ValueError, "List items must be strings");
     }
-    $2[i] = STR2CSTR(s);
+    $2[i] = StringValuePtr(s);
   }
   $2[i] = 0;
 }
@@ -46,7 +46,7 @@ extern int gcdmain(int argc, char *argv[]);
   if (TYPE($input) != T_STRING) {
     SWIG_exception(SWIG_ValueError, "Expected a string");
   }
-  $1 = STR2CSTR($input);
+  $1 = StringValuePtr($input);
   $2 = RSTRING_LEN($input);
 }
 
@@ -60,7 +60,7 @@ extern int count(char *bytes, int len, char c);
   if (TYPE($input) != T_STRING) {
     SWIG_exception(SWIG_ValueError,"Expected a string");
   }
-  temp = STR2CSTR($input);
+  temp = StringValuePtr($input);
   $2 = RSTRING_LEN($input);
   $1 = (char *) malloc($2+1);
   memmove($1,temp,$2);

Examples/test-suite/memberin1.i

@@ -47,7 +47,7 @@ public:
 #ifdef SWIGRUBY
 %typemap(in) String {
   Check_Type($input, T_STRING);
-  $1 = String(STR2CSTR($input));
+  $1 = String(StringValuePtr($input));
 }
 #endif
 

Examples/test-suite/namespace_typemap.i

@@ -100,7 +100,7 @@ namespace test {
 #endif
 #ifdef SWIGRUBY
 	%typemap(in) string_class * {
-	    $1 = new string_class(STR2CSTR($input));
+	    $1 = new string_class(StringValuePtr($input));
 	}
 	%typemap(freearg) string_class * {
 	    delete $1;

Lib/ruby/argcargv.i

@@ -30,7 +30,7 @@
     $2 = (char **) malloc((size+1)*sizeof(char *));
     VALUE *ptr = RARRAY_PTR($input);
     for (i=0; i < size; i++, ptr++) {
-      $2[i]= STR2CSTR(*ptr);
+      $2[i]= StringValuePtr(*ptr);
     }    
     $2[i]=NULL;
   } else {

Lib/ruby/rubystrings.swg

@@ -7,11 +7,7 @@ SWIGINTERN int
 SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
 {
   if (TYPE(obj) == T_STRING) {
-    %#if defined(StringValuePtr)
     char *cstr = StringValuePtr(obj); 
-    %#else
-    char *cstr = STR2CSTR(obj);
-    %#endif
     size_t size = RSTRING_LEN(obj) + 1;
     if (cptr)  {
       if (alloc) {