From: Peter Rabbitson Date: Tue, 31 Jul 2012 03:49:22 +0000 (+0200) Subject: Standardize on 2-space tab X-Git-Tag: Devel-GlobalDestruction-0.09~7 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=53daa8381ac1962b80e5becbffc1d1a2017c9df5;p=p5sagit%2FDevel-GlobalDestruction.git Standardize on 2-space tab --- diff --git a/lib/Devel/GlobalDestruction.pm b/lib/Devel/GlobalDestruction.pm index 0519b40..99e3eec 100644 --- a/lib/Devel/GlobalDestruction.pm +++ b/lib/Devel/GlobalDestruction.pm @@ -6,36 +6,38 @@ use warnings; our $VERSION = '0.08'; use Sub::Exporter::Progressive -setup => { - exports => [ qw(in_global_destruction) ], - groups => { default => [ -all ] }, + exports => [ qw(in_global_destruction) ], + groups => { default => [ -all ] }, }; # we run 5.14+ - everything is in core # if (defined ${^GLOBAL_PHASE}) { - eval 'sub in_global_destruction () { ${^GLOBAL_PHASE} eq q[DESTRUCT] }'; + eval 'sub in_global_destruction () { ${^GLOBAL_PHASE} eq q[DESTRUCT] }'; } # try to load the xs version if it was compiled # elsif (eval { - require XSLoader; - XSLoader::load(__PACKAGE__, $VERSION); - 1; + require XSLoader; + XSLoader::load(__PACKAGE__, $VERSION); + 1; }) { - # the eval already installed everything, nothing to do + # the eval already installed everything, nothing to do } # Not core nor XS +# The whole thing is in an eval to prevent perl from parsing it in the +# first place under perls where none of this is needed # else { + eval <<'PP_IGD' or die $@; - # SpeedyCGI runs END blocks every cycle but somehow keeps object instances - # hence DIAF - die("The pure-perl version of @{[__PACKAGE__]} can not function correctly under CGI::SpeedyCGI. " - . "Please ensure you have a working compiler, and reinstall @{[__PACKAGE__]} to enable the XS " - . "codepath.\n" - ) if $CGI::SpeedyCGI::i_am_speedy; +# SpeedyCGI runs END blocks every cycle but somehow keeps object instances +# hence DIAF +die("The pure-perl version of @{[__PACKAGE__]} can not function correctly under CGI::SpeedyCGI. " + . "Please ensure you have a working compiler, and reinstall @{[__PACKAGE__]} to enable the XS " + . "codepath.\n" +) if $CGI::SpeedyCGI::i_am_speedy; - eval <<'PP_IGD' or die $@; my ($in_global_destruction, $before_is_installed); diff --git a/t/01_basic.t b/t/01_basic.t index ac7f07a..b156506 100644 --- a/t/01_basic.t +++ b/t/01_basic.t @@ -2,21 +2,21 @@ use strict; use warnings; BEGIN { - if ($ENV{DEVEL_GLOBALDESTRUCTION_PP_TEST}) { - require DynaLoader; - no warnings 'redefine'; - my $orig = \&DynaLoader::bootstrap; - *DynaLoader::bootstrap = sub { - die 'no XS' if $_[0] eq 'Devel::GlobalDestruction'; - goto $orig; - }; - } + if ($ENV{DEVEL_GLOBALDESTRUCTION_PP_TEST}) { + require DynaLoader; + no warnings 'redefine'; + my $orig = \&DynaLoader::bootstrap; + *DynaLoader::bootstrap = sub { + die 'no XS' if $_[0] eq 'Devel::GlobalDestruction'; + goto $orig; + }; + } } BEGIN { - package Test::Scope::Guard; - sub new { my ($class, $code) = @_; bless [$code], $class; } - sub DESTROY { my $self = shift; $self->[0]->() } + package Test::Scope::Guard; + sub new { my ($class, $code) = @_; bless [$code], $class; } + sub DESTROY { my $self = shift; $self->[0]->() } } print "1..6\n"; @@ -24,10 +24,10 @@ print "1..6\n"; my $had_error = 0; END { $? = $had_error }; sub ok ($$) { - $had_error++, print "not " if !$_[0]; - print "ok"; - print " - $_[1]" if defined $_[1]; - print "\n"; + $had_error++, print "not " if !$_[0]; + print "ok"; + print " - $_[1]" if defined $_[1]; + print "\n"; } ok( eval "use Devel::GlobalDestruction; 1", "use Devel::GlobalDestruction" ); diff --git a/t/02_thread.t b/t/02_thread.t index ee4cf33..0b51704 100644 --- a/t/02_thread.t +++ b/t/02_thread.t @@ -18,15 +18,15 @@ use warnings; use strict; BEGIN { - if ($ENV{DEVEL_GLOBALDESTRUCTION_PP_TEST}) { - require DynaLoader; - no warnings 'redefine'; - my $orig = \&DynaLoader::bootstrap; - *DynaLoader::bootstrap = sub { - die 'no XS' if $_[0] eq 'Devel::GlobalDestruction'; - goto $orig; - }; - } + if ($ENV{DEVEL_GLOBALDESTRUCTION_PP_TEST}) { + require DynaLoader; + no warnings 'redefine'; + my $orig = \&DynaLoader::bootstrap; + *DynaLoader::bootstrap = sub { + die 'no XS' if $_[0] eq 'Devel::GlobalDestruction'; + goto $orig; + }; + } } my $t = threads->create(sub { do 't/01_basic.t' });