r65730 - in /branches/upstream/libaspect-perl/current: ./ lib/ lib/Aspect/ lib/Aspect/Advice/ lib/Aspect/Library/ lib/Aspect/Library/Listenable/ lib/Aspect/Point/ lib/Aspect/Pointcut/ t/
angelabad-guest at users.alioth.debian.org
angelabad-guest at users.alioth.debian.org
Sat Dec 11 12:28:22 UTC 2010
Author: angelabad-guest
Date: Sat Dec 11 12:28:10 2010
New Revision: 65730
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=65730
Log:
[svn-upgrade] new version libaspect-perl (0.94)
Modified:
branches/upstream/libaspect-perl/current/Changes
branches/upstream/libaspect-perl/current/META.yml
branches/upstream/libaspect-perl/current/lib/Aspect.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Advice.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Advice/After.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Advice/AfterReturning.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Advice/AfterThrowing.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Advice/Around.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Advice/Before.pm
branches/upstream/libaspect-perl/current/lib/Aspect/AdviceContext.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Hook.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Library.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Library/Breakpoint.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Library/Listenable.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Library/Listenable/Event.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Library/Singleton.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Library/Wormhole.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Modular.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Point.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Point/After.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Point/AfterReturning.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Point/AfterThrowing.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Point/Around.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Point/Before.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/And.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Call.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Cflow.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Highest.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/If.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Logic.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Not.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Or.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Throwing.pm
branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Wantarray.pm
branches/upstream/libaspect-perl/current/t/21_advice_around.t
branches/upstream/libaspect-perl/current/t/24_advice_after.t
branches/upstream/libaspect-perl/current/t/25_advice_after_returning.t
Modified: branches/upstream/libaspect-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/Changes?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/Changes (original)
+++ branches/upstream/libaspect-perl/current/Changes Sat Dec 11 12:28:10 2010
@@ -1,4 +1,18 @@
Revision history for Perl extension Aspect
+
+0.94 Fri 10 Dec 2010
+ - CPAN Testers is happy, moving to production release
+
+0.93_02 Fri 10 Dec 2010
+ - Applied the fix from 0.93_01 to an additional place it was
+ occuring in Aspect::Pointcut::Throwing.
+ - Corrected the Aspect::Advice::Around documentation to refer to
+ $_->run_original instead of $_->proceed until the proceed method
+ actually works like that.
+
+0.93_01 Thu 9 Dec 2010
+ - This contains a potential fix for the 5.13.6 breakage to be
+ confirmed by CPAN Testers.
0.92 Wed 21 Jul 2010
- Correcting bad link to search.cpan
Modified: branches/upstream/libaspect-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/META.yml?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/META.yml (original)
+++ branches/upstream/libaspect-perl/current/META.yml Sat Dec 11 12:28:10 2010
@@ -33,4 +33,4 @@
ChangeLog: http://fisheye2.atlassian.com/changelog/cpan/trunk/Aspect
license: http://dev.perl.org/licenses/
repository: http://svn.ali.as/cpan/trunk/Aspect
-version: 0.92
+version: 0.94
Modified: branches/upstream/libaspect-perl/current/lib/Aspect.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect.pm Sat Dec 11 12:28:10 2010
@@ -31,7 +31,7 @@
use Aspect::Advice::AfterThrowing ();
use Aspect::AdviceContext ();
-our $VERSION = '0.92';
+our $VERSION = '0.94';
# Track the location of exported functions so that pointcuts
# can avoid accidentally binding them.
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Advice.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Advice.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Advice.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Advice.pm Sat Dec 11 12:28:10 2010
@@ -3,7 +3,7 @@
use strict;
use warnings;
-our $VERSION = '0.92';
+our $VERSION = '0.94';
sub new {
my $class = shift;
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Advice/After.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Advice/After.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Advice/After.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Advice/After.pm Sat Dec 11 12:28:10 2010
@@ -12,7 +12,7 @@
use Aspect::Advice ();
use Aspect::Point::After ();
-our $VERSION = '0.92';
+our $VERSION = '0.94';
our @ISA = 'Aspect::Advice';
# NOTE: To simplify debugging of the generated code, all injected string
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Advice/AfterReturning.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Advice/AfterReturning.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Advice/AfterReturning.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Advice/AfterReturning.pm Sat Dec 11 12:28:10 2010
@@ -12,7 +12,7 @@
use Aspect::Advice ();
use Aspect::Point::AfterReturning ();
-our $VERSION = '0.92';
+our $VERSION = '0.94';
our @ISA = 'Aspect::Advice';
# NOTE: To simplify debugging of the generated code, all injected string
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Advice/AfterThrowing.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Advice/AfterThrowing.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Advice/AfterThrowing.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Advice/AfterThrowing.pm Sat Dec 11 12:28:10 2010
@@ -12,7 +12,7 @@
use Aspect::Advice ();
use Aspect::Point::AfterThrowing ();
-our $VERSION = '0.92';
+our $VERSION = '0.94';
our @ISA = 'Aspect::Advice';
# NOTE: To simplify debugging of the generated code, all injected string
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Advice/Around.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Advice/Around.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Advice/Around.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Advice/Around.pm Sat Dec 11 12:28:10 2010
@@ -12,7 +12,7 @@
use Aspect::Advice ();
use Aspect::Point::Around ();
-our $VERSION = '0.92';
+our $VERSION = '0.94';
our @ISA = 'Aspect::Advice';
sub _install {
@@ -120,7 +120,6 @@
1;
-
=pod
=head1 NAME
@@ -139,12 +138,12 @@
local $MyModule::MAXSIZE = 1000;
# Continue and execute the function
- $_->proceed;
-
+ $_->run_original;
+
# Suppress exceptions for the call
$_->return_value(1) if $_->exception;
- } call qr/^ MyModule::\w+ $/
+ } call qr/^ MyModule::\w+ $/;
=head1 DESCRIPTION
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Advice/Before.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Advice/Before.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Advice/Before.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Advice/Before.pm Sat Dec 11 12:28:10 2010
@@ -11,7 +11,7 @@
use Aspect::Advice ();
use Aspect::Point::Before ();
-our $VERSION = '0.92';
+our $VERSION = '0.94';
our @ISA = 'Aspect::Advice';
sub _install {
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/AdviceContext.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/AdviceContext.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/AdviceContext.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/AdviceContext.pm Sat Dec 11 12:28:10 2010
@@ -4,7 +4,7 @@
use warnings;
use Aspect::Point ();
-our $VERSION = '0.92';
+our $VERSION = '0.94';
our @ISA = 'Aspect::Point';
1;
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Hook.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Hook.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Hook.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Hook.pm Sat Dec 11 12:28:10 2010
@@ -3,7 +3,7 @@
use strict;
use warnings;
-our $VERSION = '0.92';
+our $VERSION = '0.94';
1;
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Library.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Library.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Library.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Library.pm Sat Dec 11 12:28:10 2010
@@ -3,7 +3,7 @@
use strict;
use warnings;
-our $VERSION = '0.92';
+our $VERSION = '0.94';
1;
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Library/Breakpoint.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Library/Breakpoint.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Library/Breakpoint.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Library/Breakpoint.pm Sat Dec 11 12:28:10 2010
@@ -5,7 +5,7 @@
use Aspect::Library ();
use Aspect::Advice::Before ();
-our $VERSION = '0.92';
+our $VERSION = '0.94';
our @ISA = 'Aspect::Library';
sub get_advice {
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Library/Listenable.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Library/Listenable.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Library/Listenable.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Library/Listenable.pm Sat Dec 11 12:28:10 2010
@@ -12,7 +12,7 @@
use Aspect::Advice::Before ();
use Aspect::Library::Listenable::Event ();
-our $VERSION = '0.92';
+our $VERSION = '0.94';
our @ISA = 'Aspect::Modular';
sub import {
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Library/Listenable/Event.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Library/Listenable/Event.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Library/Listenable/Event.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Library/Listenable/Event.pm Sat Dec 11 12:28:10 2010
@@ -3,7 +3,7 @@
use strict;
use warnings;
-our $VERSION = '0.92';
+our $VERSION = '0.94';
sub new {
my $class = shift;
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Library/Singleton.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Library/Singleton.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Library/Singleton.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Library/Singleton.pm Sat Dec 11 12:28:10 2010
@@ -6,7 +6,7 @@
use Aspect::Advice::Before ();
use Aspect::Pointcut::Call ();
-our $VERSION = '0.92';
+our $VERSION = '0.94';
our @ISA = 'Aspect::Modular';
my %CACHE = ();
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Library/Wormhole.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Library/Wormhole.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Library/Wormhole.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Library/Wormhole.pm Sat Dec 11 12:28:10 2010
@@ -8,7 +8,7 @@
use Aspect::Pointcut::Call ();
use Aspect::Pointcut::Cflow ();
-our $VERSION = '0.92';
+our $VERSION = '0.94';
our @ISA = 'Aspect::Modular';
sub get_advice {
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Modular.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Modular.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Modular.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Modular.pm Sat Dec 11 12:28:10 2010
@@ -4,7 +4,7 @@
use warnings;
use Aspect::Library ();
-our $VERSION = '0.92';
+our $VERSION = '0.94';
our @ISA = 'Aspect::Library';
sub new {
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Point.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Point.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Point.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Point.pm Sat Dec 11 12:28:10 2010
@@ -5,7 +5,7 @@
use Carp ();
use Sub::Uplevel ();
-our $VERSION = '0.92';
+our $VERSION = '0.94';
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Point/After.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Point/After.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Point/After.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Point/After.pm Sat Dec 11 12:28:10 2010
@@ -4,7 +4,7 @@
use warnings;
use Aspect::Point ();
-our $VERSION = '0.92';
+our $VERSION = '0.94';
our @ISA = 'Aspect::Point';
1;
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Point/AfterReturning.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Point/AfterReturning.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Point/AfterReturning.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Point/AfterReturning.pm Sat Dec 11 12:28:10 2010
@@ -4,7 +4,7 @@
use warnings;
use Aspect::Point ();
-our $VERSION = '0.92';
+our $VERSION = '0.94';
our @ISA = 'Aspect::Point';
1;
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Point/AfterThrowing.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Point/AfterThrowing.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Point/AfterThrowing.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Point/AfterThrowing.pm Sat Dec 11 12:28:10 2010
@@ -4,7 +4,7 @@
use warnings;
use Aspect::Point ();
-our $VERSION = '0.92';
+our $VERSION = '0.94';
our @ISA = 'Aspect::Point';
1;
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Point/Around.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Point/Around.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Point/Around.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Point/Around.pm Sat Dec 11 12:28:10 2010
@@ -4,7 +4,7 @@
use warnings;
use Aspect::Point ();
-our $VERSION = '0.92';
+our $VERSION = '0.94';
our @ISA = 'Aspect::Point';
1;
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Point/Before.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Point/Before.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Point/Before.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Point/Before.pm Sat Dec 11 12:28:10 2010
@@ -4,7 +4,7 @@
use warnings;
use Aspect::Point ();
-our $VERSION = '0.92';
+our $VERSION = '0.94';
our @ISA = 'Aspect::Point';
1;
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut.pm Sat Dec 11 12:28:10 2010
@@ -40,7 +40,7 @@
use Aspect::Pointcut::And ();
use Aspect::Pointcut::Not ();
-our $VERSION = '0.92';
+our $VERSION = '0.94';
use overload (
# Keep traditional Perl boolification and stringification
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/And.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/And.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/And.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/And.pm Sat Dec 11 12:28:10 2010
@@ -5,7 +5,7 @@
use Aspect::Pointcut ();
use Aspect::Pointcut::Logic ();
-our $VERSION = '0.92';
+our $VERSION = '0.94';
our @ISA = qw{
Aspect::Pointcut::Logic
Aspect::Pointcut
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Call.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Call.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Call.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Call.pm Sat Dec 11 12:28:10 2010
@@ -6,7 +6,7 @@
use Params::Util ();
use Aspect::Pointcut ();
-our $VERSION = '0.92';
+our $VERSION = '0.94';
our @ISA = 'Aspect::Pointcut';
use constant ORIGINAL => 0;
@@ -56,8 +56,15 @@
}
if ( Params::Util::_REGEX($spec) ) {
# Special case serialisation of regexs
- my $regex = "$spec";
- $regex =~ s|^\(\?([xism]*)-[xism]*:(.*)\)\z|/$2/$1|s;
+ # In Perl 5.13.6 the format of a serialised regex changed
+ # incompatibly. Worse, the optimisation trick that worked
+ # before no longer works after, as there are now modifiers
+ # that are ONLY value inside and can't be moved to the end.
+ # So we first serialise to a form that will be valid code
+ # under the new system, and then do the replace that will
+ # only match (and only be valid) under the old system.
+ my $regex = "/$spec/";
+ $regex =~ s|^/\(\?([xism]*)-[xism]*:(.*)\)/\z|/$2/$1|s;
return bless [
$spec,
eval "sub () { \$_[0] =~ $regex }",
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Cflow.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Cflow.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Cflow.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Cflow.pm Sat Dec 11 12:28:10 2010
@@ -8,7 +8,7 @@
use Aspect::Pointcut::Call ();
use Aspect::AdviceContext ();
-our $VERSION = '0.92';
+our $VERSION = '0.94';
our @ISA = 'Aspect::Pointcut';
use constant KEY => 0;
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Highest.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Highest.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Highest.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Highest.pm Sat Dec 11 12:28:10 2010
@@ -6,7 +6,7 @@
use Params::Util ();
use Aspect::Pointcut ();
-our $VERSION = '0.92';
+our $VERSION = '0.94';
our @ISA = 'Aspect::Pointcut';
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/If.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/If.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/If.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/If.pm Sat Dec 11 12:28:10 2010
@@ -4,7 +4,7 @@
use warnings;
use Aspect::Pointcut ();
-our $VERSION = '0.92';
+our $VERSION = '0.94';
our @ISA = 'Aspect::Pointcut';
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Logic.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Logic.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Logic.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Logic.pm Sat Dec 11 12:28:10 2010
@@ -5,7 +5,7 @@
use strict;
use warnings;
-our $VERSION = '0.92';
+our $VERSION = '0.94';
sub match_runtime {
return 0;
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Not.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Not.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Not.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Not.pm Sat Dec 11 12:28:10 2010
@@ -5,7 +5,7 @@
use Aspect::Pointcut ();
use Aspect::Pointcut::Logic ();
-our $VERSION = '0.92';
+our $VERSION = '0.94';
our @ISA = qw{
Aspect::Pointcut::Logic
Aspect::Pointcut
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Or.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Or.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Or.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Or.pm Sat Dec 11 12:28:10 2010
@@ -5,7 +5,7 @@
use Aspect::Pointcut ();
use Aspect::Pointcut::Logic ();
-our $VERSION = '0.92';
+our $VERSION = '0.94';
our @ISA = qw{
Aspect::Pointcut::Logic
Aspect::Pointcut
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Throwing.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Throwing.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Throwing.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Throwing.pm Sat Dec 11 12:28:10 2010
@@ -6,7 +6,7 @@
use Params::Util ();
use Aspect::Pointcut ();
-our $VERSION = '0.92';
+our $VERSION = '0.94';
our @ISA = 'Aspect::Pointcut';
@@ -26,8 +26,8 @@
], $class;
}
if ( Params::Util::_REGEX($spec) ) {
- my $regex = "$spec";
- $regex =~ s|^\(\?([xism]*)-[xism]*:(.*)\)\z|/$2/$1|s;
+ my $regex = "/$spec/";
+ $regex =~ s|^/\(\?([xism]*)-[xism]*:(.*)\)/\z|/$2/$1|s;
return bless [
$spec,
"defined \$_->{exception} and not ref \$_->{exception} and \$_->{exception} =~ $regex",
Modified: branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Wantarray.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Wantarray.pm?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Wantarray.pm (original)
+++ branches/upstream/libaspect-perl/current/lib/Aspect/Pointcut/Wantarray.pm Sat Dec 11 12:28:10 2010
@@ -5,7 +5,7 @@
use Carp ();
use Aspect::Pointcut ();
-our $VERSION = '0.92';
+our $VERSION = '0.94';
our @ISA = 'Aspect::Pointcut';
use constant VOID => 1;
Modified: branches/upstream/libaspect-perl/current/t/21_advice_around.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/t/21_advice_around.t?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/t/21_advice_around.t (original)
+++ branches/upstream/libaspect-perl/current/t/21_advice_around.t Sat Dec 11 12:28:10 2010
@@ -8,7 +8,7 @@
$^W = 1;
}
-use Test::More tests => 26;
+use Test::More tests => 28;
use Test::NoWarnings;
use Aspect;
@@ -118,3 +118,21 @@
is( $baz, 1, '->baz was called once' );
is( $around, 18, 'Advice code was called three times' );
}
+
+# Regression test for RT #63781 Could not get the return value
+SCOPE: {
+ around {
+ $_->run_original;
+ is( $_->return_value, 'James Bond', '->return_value ok' );
+ } call qr/query_person/;
+
+ is(
+ query_person('007'),
+ 'James Bond',
+ 'Function returns ok',
+ );
+
+ sub query_person {
+ return 'James Bond';
+ }
+}
Modified: branches/upstream/libaspect-perl/current/t/24_advice_after.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/t/24_advice_after.t?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/t/24_advice_after.t (original)
+++ branches/upstream/libaspect-perl/current/t/24_advice_after.t Sat Dec 11 12:28:10 2010
@@ -6,7 +6,7 @@
$^W = 1;
}
-use Test::More tests => 101;
+use Test::More tests => 103;
use Test::NoWarnings;
use Test::Exception;
use Aspect;
@@ -498,6 +498,23 @@
}
}
+# Regression test for RT #63781 Could not get the return value
+SCOPE: {
+ after {
+ is( $_->return_value, 'James Bond', '->return_value ok' );
+ } call qr/query_person/;
+
+ is(
+ query_person(),
+ 'James Bond',
+ 'Function returns ok',
+ );
+
+ sub query_person {
+ return 'James Bond';
+ }
+}
+
Modified: branches/upstream/libaspect-perl/current/t/25_advice_after_returning.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libaspect-perl/current/t/25_advice_after_returning.t?rev=65730&op=diff
==============================================================================
--- branches/upstream/libaspect-perl/current/t/25_advice_after_returning.t (original)
+++ branches/upstream/libaspect-perl/current/t/25_advice_after_returning.t Sat Dec 11 12:28:10 2010
@@ -6,7 +6,7 @@
$^W = 1;
}
-use Test::More tests => 57;
+use Test::More tests => 59;
use Test::NoWarnings;
use Test::Exception;
use Aspect;
@@ -329,6 +329,25 @@
}
}
+# Regression test for RT #63781 Could not get the return value
+SCOPE: {
+ after_returning {
+ is( $_->return_value, 'James Bond', '->return_value ok' );
+ } call qr/query_person/;
+
+ is(
+ query_person('007'),
+ 'James Bond',
+ 'Function returns ok',
+ );
+
+ sub query_person {
+ my ($id) = @_;
+ my $person = 'James Bond';
+ return $person;
+ }
+}
+
More information about the Pkg-perl-cvs-commits
mailing list