test and fix using T_SV as an OUTPUT parameter

Perl · Sep 9, 2021 · 0b71342 · 0b71342
1 parent ac88bdf
commit 0b71342
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/ext/XS-Typemap/Typemap.pm b/ext/XS-Typemap/Typemap.pm
@@ -38,6 +38,7 @@ our $VERSION = '0.18';
 
 our @EXPORT = (qw/
 	   T_SV
+           T_SV_output
 	   T_SVREF
 	   T_SVREF_REFCOUNT_FIXED
 	   T_AVREF

diff --git a/ext/XS-Typemap/Typemap.xs b/ext/XS-Typemap/Typemap.xs
@@ -267,6 +267,13 @@ T_SV( sv )
  OUTPUT:
   RETVAL
 
+void
+T_SV_output(sv)
+  SV *sv
+ CODE:
+ sv = sv_2mortal(newSVpvn("test", 4));
+ OUTPUT:
+  sv
 
 ## T_SVREF
 

diff --git a/ext/XS-Typemap/t/Typemap.t b/ext/XS-Typemap/t/Typemap.t
@@ -6,7 +6,7 @@ BEGIN {
     }
 }
 
-use Test::More tests => 156;
+use Test::More tests => 158;
 
 use strict;
 #catch WARN_INTERNAL type errors, and anything else unexpected
@@ -33,6 +33,10 @@ note("T_SV");
 my $sv = "Testing T_SV";
 is( T_SV($sv), $sv);
 
+# T_SV with output
+is_deeply([ T_SV_output($sv) ], [], "T_SV_output: no return value");
+is($sv, "test", "T_SV_output: output written to");
+
 # T_SVREF - reference to Scalar
 note("T_SVREF");
 $sv .= "REF";

diff --git a/lib/ExtUtils/typemap b/lib/ExtUtils/typemap
@@ -315,7 +315,7 @@ T_OUT
 #############################################################################
 OUTPUT
 T_SV
-	$arg = $var;
+	${ "$var" eq "RETVAL" ? \"$arg = $var;" : \"sv_setsv_mg($arg, $var);" }
 T_SVREF
 	$arg = newRV((SV*)$var);
 T_SVREF_REFCOUNT_FIXED