X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FSub%2FNary.pm;h=ef92fa178aab2f41bef787150aae2aec7b6ffca1;hb=84483a1d32823197ca6c6dcb5e839e8d5650e9e4;hp=50ba378034fa54a17ab6a2e4366926528aa3e52f;hpb=3ad0dc082fd7c56afdc76066a7f8c94c4ae28e69;p=perl%2Fmodules%2FSub-Nary.git

diff --git a/lib/Sub/Nary.pm b/lib/Sub/Nary.pm
index 50ba378..ef92fa1 100644
--- a/lib/Sub/Nary.pm
+++ b/lib/Sub/Nary.pm
@@ -9,8 +9,6 @@ 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.
@@ -26,8 +24,6 @@ BEGIN {
  $VERSION  = '0.02';
 }
 
-our $DEBUG = 0;
-
 =head1 SYNOPSIS
 
     use Sub::Nary;
@@ -243,7 +239,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 +253,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,18 +304,17 @@ sub inspect_kids {
    $op = $op->first;
    redo;
   }
-  diag "> $n ($c)" if $DEBUG;
   my ($rc, $lc) = $self->inspect($op);
+  $c = 1 - count $r;
   $r = add $r, scale $c, $rc if defined $rc;
-  if ($rc and not defined $lc) {
+  if (not defined $lc) {
    @l = ();
    last;
   }
   push @l, scale $c, $lc;
-  $c *= count $lc if defined $lc;
  }
 
- my $l = combine @l;
+ my $l = scale +(1 - count $r), normalize combine @l;
 
  return $r, $l;
 }
@@ -363,7 +355,6 @@ sub pp_entersub {
  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) {
@@ -438,7 +429,7 @@ sub pp_const {
  if ($c eq 'AV') {
   $n = $sv->FILL + 1
  } elsif ($c eq 'HV') {
-  $n = 2 * $sv->FILL
+  $n = 2 * $sv->KEYS
  }
 
  return undef, $n
@@ -478,27 +469,33 @@ sub pp_aassign {
 sub pp_leaveloop {
  my ($self, $op) = @_;
 
- diag "* leaveloop" if $DEBUG;
-
  $op = $op->first;
  my ($r1, $l1);
- if (name($op) eq 'enteriter') {
+ my $for;
+ if (name($op) eq 'enteriter') { # for loop ?
+  $for = 1;
   ($r1, $l1) = $self->inspect($op);
-  return $r1, $l1 if $r1 and zero $l1;
+  return $r1, $l1 if defined $r1 and zero $l1;
  }
 
  $op = $op->sibling;
- my $r;
+ my ($r2, $l2);
  if (name($op->first) eq 'and') {
-  ($r, my $l) = ($self->inspect($op->first->first))[0];
-  return $r, $l if $r and zero $l;
-  $r = ($self->inspect($op->first->first->sibling))[0];
+  ($r2, $l2) = $self->inspect($op->first->first);
+  return $r2, $l2 if defined $r2 and zero $l2;
+  my $c = count $l2;
+  return { list => 1 }, undef if !$for and defined $r2;
+  my ($r3, $l3) = $self->inspect($op->first->first->sibling);
+  return { list => 1 }, undef if defined $r3 and defined $l3;
+  $r2 = add $r2, scale $c, $r3;
  } else {
-  $r = ($self->inspect($op))[0];
+  ($r2, $l2) = $self->inspect($op);
+  return { list => 1 }, undef if defined $r2 and defined $l2;
  }
 
+ 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;
 }
 
@@ -540,12 +537,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;
@@ -564,12 +561,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;