diff options
author | James E. Keenan <jkeenan@cpan.org> | 2010-04-01 08:20:02 -0400 |
---|---|---|
committer | Steffen Mueller <smueller@cpan.org> | 2011-07-12 20:53:54 +0200 |
commit | 6e449812d414a24872b9ed7c2436aa73b2b7f383 (patch) | |
tree | a8f1850b700ea15761b70815fc25410ee19163b2 | |
parent | ca406d0865853a4cc8be9804c89c49b783a92093 (diff) | |
download | perl-6e449812d414a24872b9ed7c2436aa73b2b7f383.tar.gz |
Move $proto into $self;
-rw-r--r-- | dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm index 5bdf93efb1..c31a16c43c 100644 --- a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm +++ b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm @@ -38,7 +38,7 @@ our ( # The scalars in the line below remain (for the time being) 'our' variables # because I suspect they will pose the same problems as those in the statement # above. -our ($newXS, $proto, ); +our ($newXS, ); our $self = {}; @@ -887,7 +887,7 @@ EOF EOF $newXS = "newXS"; - $proto = ""; + $self->{proto} = ""; # Build the prototype string for the xsub if ($self->{ProtoThisXSUB}) { @@ -905,13 +905,13 @@ EOF push @{ $self->{proto_arg} }, "$s\@" if $ellipsis; - $proto = join ("", grep defined, @{ $self->{proto_arg} } ); + $self->{proto} = join ("", grep defined, @{ $self->{proto_arg} } ); } else { # User has specified a prototype - $proto = $self->{ProtoThisXSUB}; + $self->{proto} = $self->{ProtoThisXSUB}; } - $proto = qq{, "$proto"}; + $self->{proto} = qq{, "$self->{proto}"}; } if (%{ $self->{XsubAliases} }) { @@ -919,14 +919,14 @@ EOF unless defined $self->{XsubAliases}->{$pname}; while ( my ($xname, $value) = each %{ $self->{XsubAliases} }) { push(@{ $self->{InitFileCode} }, Q(<<"EOF")); -# cv = ${newXS}(\"$xname\", XS_$Full_func_name, file$proto); +# cv = ${newXS}(\"$xname\", XS_$Full_func_name, file$self->{proto}); # XSANY.any_i32 = $value; EOF } } elsif (@{ $self->{Attributes} }) { push(@{ $self->{InitFileCode} }, Q(<<"EOF")); -# cv = ${newXS}(\"$pname\", XS_$Full_func_name, file$proto); +# cv = ${newXS}(\"$pname\", XS_$Full_func_name, file$self->{proto}); # apply_attrs_string("$Package", cv, "@{ $self->{Attributes} }", 0); EOF } @@ -934,18 +934,18 @@ EOF while ( my ($yname, $value) = each %{ $self->{Interfaces} }) { $yname = "$Package\::$yname" unless $yname =~ /::/; push(@{ $self->{InitFileCode} }, Q(<<"EOF")); -# cv = ${newXS}(\"$yname\", XS_$Full_func_name, file$proto); +# cv = ${newXS}(\"$yname\", XS_$Full_func_name, file$self->{proto}); # $self->{interface_macro_set}(cv,$value); EOF } } elsif($newXS eq 'newXS'){ # work around P5NCI's empty newXS macro push(@{ $self->{InitFileCode} }, - " ${newXS}(\"$pname\", XS_$Full_func_name, file$proto);\n"); + " ${newXS}(\"$pname\", XS_$Full_func_name, file$self->{proto});\n"); } else { push(@{ $self->{InitFileCode} }, - " (void)${newXS}(\"$pname\", XS_$Full_func_name, file$proto);\n"); + " (void)${newXS}(\"$pname\", XS_$Full_func_name, file$self->{proto});\n"); } } # END 'PARAGRAPH' 'while' loop @@ -963,7 +963,7 @@ EOF /* Making a sub named "${Package}::()" allows the package */ /* to be findable via fetchmethod(), and causes */ /* overload::Overloaded("${Package}") to return true. */ - (void)${newXS}("${Package}::()", XS_${Packid}_nil, file$proto); + (void)${newXS}("${Package}::()", XS_${Packid}_nil, file$self->{proto}); MAKE_FETCHMETHOD_WORK } @@ -1349,7 +1349,7 @@ sub OVERLOAD_handler() { $self->{Overload} = 1 unless $self->{Overload}; my $overload = "$Package\::(".$1; push(@{ $self->{InitFileCode} }, - " (void)${newXS}(\"$overload\", XS_$Full_func_name, file$proto);\n"); + " (void)${newXS}(\"$overload\", XS_$Full_func_name, file$self->{proto});\n"); } } } |