X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FSub%2FNary.pm;h=4b87e45bc779c0fd4a9c9a3e110b2816c95b8a1b;hb=19271bbd36d8b5346d323f6e47038b9abff33a91;hp=14b882285723a2e3d20bbb7472c8502df1166d8a;hpb=3b10ab9a7a01f579892a98a1ffc53202d6adc8d6;p=perl%2Fmodules%2FSub-Nary.git diff --git a/lib/Sub/Nary.pm b/lib/Sub/Nary.pm index 14b8822..4b87e45 100644 --- a/lib/Sub/Nary.pm +++ b/lib/Sub/Nary.pm @@ -9,30 +9,26 @@ use Carp qw/croak/; use B qw/class ppname svref_2object OPf_KIDS/; -use Test::More; use Data::Dumper; - =head1 NAME Sub::Nary - Try to count how many elements a subroutine can return in list context. =head1 VERSION -Version 0.02 +Version 0.03 =cut our $VERSION; BEGIN { - $VERSION = '0.02'; + $VERSION = '0.03'; } -our $DEBUG = 0; - =head1 SYNOPSIS use Sub::Nary; - my $sn = Sub::Nary->new(); + my $sn = Sub::Nary->new; my $r = $sn->nary(\&hlagh); =head1 DESCRIPTION @@ -43,11 +39,15 @@ This module uses the L framework to walk into subroutines and try to guess ho =head2 C + my $sn = Sub::Nary->new; + The usual constructor. Currently takes no argument. -=head2 C +=head2 C + + my $res = $sn->nary($coderef); -Takes a code reference to a named or anonymous subroutine, and returns a hash reference whose keys are the possible numbers of returning scalars, and the corresponding values the "probability" to get them. The special key C<'list'> is used to denote a possibly infinite number of returned arguments. The return value hence would look at +Takes a reference to a named or anonymous subroutine, and returns a hash reference whose keys are the possible numbers of returning scalars, and the corresponding values the "probability" to get them. The special key C<'list'> is used to denote a possibly infinite number of returned arguments. The return value hence would look at { 1 => 0.2, 2 => 0.4, 4 => 0.3, list => 0.1 } @@ -63,7 +63,9 @@ The probability is computed as such : =over 4 -=item * When branching, each branch is considered equally possible. +=item * + +When branching, each branch is considered equally possible. For example, the subroutine @@ -89,9 +91,11 @@ As for it is considered to return C<3> scalars with probability C<1/2>, C<2> with probability C<1/2 * 1/2 = 1/4> and C<1> (when the two tests fail, the last computed value is returned, which here is C<< $x > 0.9 >> evaluated in the scalar context of the test) with remaining probability C<1/4>. -=item * The total probability law for a given returning point is the convolution product of the probabilities of its list elements. +=item * + +The total probability law for a given returning point is the convolution product of the probabilities of its list elements. -As such, +As such, sub notsosimple { return 1, simple(), 2 @@ -105,11 +109,15 @@ returns C<3> or C<4> arguments with probability C<1/2> ; and never returns C<1> argument but returns C<2> with probability C<1/2 * 1/2 = 1/4>, C<3> with probability C<1/2 * 1/2 + 1/2 * 1/2 = 1/2> and C<4> with probability C<1/4> too. -=item * If a core function may return different numbers of scalars, each kind is considered equally possible. +=item * + +If a core function may return different numbers of scalars, each kind is considered equally possible. For example, C returns C<13> elements on success and C<0> on error. The according probability will then be C<< { 0 => 0.5, 13 => 0.5 } >>. -=item * The C state is absorbing in regard of all the other ones. +=item * + +The C state is absorbing in regard of all the other ones. This is just a pedantic way to say that "list + fixed length = list". That's why @@ -234,7 +242,6 @@ sub enter { my $r = add $self->inspect($op->first); shift @{$self->{cv}}; - $r = { $r => 1 } unless ref $r; $self->{cache}->{$tag} = { %$r }; return undef, $r; } @@ -243,7 +250,6 @@ sub inspect { my ($self, $op) = @_; my $n = name($op); - diag "@ $n" if $DEBUG; return add($self->inspect_kids($op)), undef if $n eq 'return'; my $meth = $self->can('pp_' . $n); @@ -258,11 +264,9 @@ sub inspect { if (class($op) eq 'LOGOP' and not null $op->first) { my @res; - diag "? logop\n" if $DEBUG; - my $op = $op->first; my ($r1, $l1) = $self->inspect($op); - return $r1, $l1 if $r1 and zero $l1; + return $r1, $l1 if defined $r1 and zero $l1; my $c = count $l1; $op = $op->sibling; @@ -311,10 +315,8 @@ sub inspect_kids { $op = $op->first; redo; } - diag "> $n" if $DEBUG; my ($rc, $lc) = $self->inspect($op); $c = 1 - count $r; - diag Dumper [ $c, $r, \@l, $rc, $lc ] if $DEBUG; $r = add $r, scale $c, $rc if defined $rc; if (not defined $lc) { @l = (); @@ -323,7 +325,6 @@ sub inspect_kids { push @l, scale $c, $lc; } -# diag Dumper \@l if $DEBUG; my $l = scale +(1 - count $r), normalize combine @l; return $r, $l; @@ -354,24 +355,16 @@ sub pp_entersub { my ($self, $op) = @_; $op = $op->first while $op->flags & OPf_KIDS; - return undef, 0 if null $op; - if (name($op) eq 'pushmark') { - $op = $op->sibling; - return undef, 0 if null $op; - } + # First must be a pushmark + $op = $op->sibling; + # Next must be non null - at worse it's the rv2cv my $r; my $c = 1; for (; not null $op->sibling; $op = $op->sibling) { - my $n = name($op); - next if $n eq 'nextstate'; - diag "* $n" if $DEBUG; my ($rc, $lc) = $self->inspect($op); - $r = add $r, scale $c, $rc if defined $rc; - if (zero $lc) { - $c = 1 - count $r; - return $r, $c ? { 0 => $c } : undef - } + return $rc, $lc if defined $rc and not defined $lc; + $r = add $r, scale $c, $rc; $c *= count $lc; } @@ -457,12 +450,20 @@ sub pp_rv2av { my ($self, $op) = @_; $op = $op->first; - my ($r, $l) = $self->inspect($op); - if (name($op) ne 'const') { - my $c = 1 - count $r; - $l = $c ? { list => $c } : 0; + if (name($op) eq 'gv') { + return undef, { list => 1 }; } - return $r, $l; + + $self->inspect($op); +} + +sub pp_sassign { + my ($self, $op) = @_; + + my $r = ($self->inspect($op->first))[0]; + + my $c = 1 - count $r; + return $r, $c ? { 1 => $c } : undef } sub pp_aassign { @@ -480,8 +481,6 @@ sub pp_aassign { sub pp_leaveloop { my ($self, $op) = @_; - diag "* leaveloop" if $DEBUG; - $op = $op->first; my ($r1, $l1); my $for; @@ -509,7 +508,6 @@ sub pp_leaveloop { my $r = (defined $r1) ? add $r1, scale +(1 - count $r1), $r2 : $r2; my $c = 1 - count $r; - diag "& leaveloop $c" if $DEBUG; return $r, $c ? { 0 => $c } : undef; } @@ -551,12 +549,12 @@ sub pp_grepwhile { $op = $op->first->sibling; my ($r2, $l2) = $self->inspect($op->sibling); - return $r2, $l2 if $r2 and zero $l2; + return $r2, $l2 if defined $r2 and zero $l2; my $c2 = count $l2; # First one to happen my ($r1, $l1) = $self->inspect($op); - return (add $r2, scale $c2, $r1), undef if $r1 and zero $l1 and not zero $l2; - diag Dumper [ [ $r1, $l1 ], [ $r2, $l2 ] ] if $DEBUG; + return (add $r2, scale $c2, $r1), undef if defined $r1 and zero $l1 + and not zero $l2; my $c1 = count $l1; $l2 = { $l2 => 1 } unless ref $l2; @@ -575,12 +573,12 @@ sub pp_mapwhile { $op = $op->first->sibling; my ($r2, $l2) = $self->inspect($op->sibling); - return $r2, $l2 if $r2 and zero $l2; + return $r2, $l2 if defined $r2 and zero $l2; my $c2 = count $l2; # First one to happen my ($r1, $l1) = $self->inspect($op); - return (add $r2, scale $c2, $r1), undef if $r1 and zero $l1 and not zero $l2; - diag Dumper [ [ $r1, $l1 ], [ $r2, $l2 ] ] if $DEBUG; + return (add $r2, scale $c2, $r1), undef if defined $r1 and zero $l1 + and not zero $l2; my $c1 = count $l1; $l2 = { $l2 => 1 } unless ref $l2; @@ -612,11 +610,11 @@ L (standard since perl 5), L (since perl 5.005) and L (since Vincent Pit, C<< >>, L. -You can contact me by mail or on #perl @ FreeNode (vincent or Prof_Vince). +You can contact me by mail or on C (vincent). =head1 BUGS -Please report any bugs or feature requests to C, or through the web interface at L. I will be notified, and then you'll automatically be notified of progress on your bug as I make changes. +Please report any bugs or feature requests to C, or through the web interface at L. I will be notified, and then you'll automatically be notified of progress on your bug as I make changes. =head1 SUPPORT