Get the good count in aassign. Fixes successive arrays assignments and goatse operato...

[perl/modules/Sub-Nary.git] / lib / Sub / Nary.pm

diff --git a/lib/Sub/Nary.pm b/lib/Sub/Nary.pm
index c7792d5c3f782f1fd302526d0eab0c9aabf560a1..a6b97e0f401d0ab56a0b47281c7cc817ce22eff7 100644 (file)
--- a/lib/Sub/Nary.pm
+++ b/lib/Sub/Nary.pm
@@ -198,17 +198,28 @@ sub add {
 }
 
 my %ops;
+
 $ops{$_} = 1      for scalops;
 $ops{$_} = 0      for qw/stub nextstate/;
 $ops{$_} = 1      for qw/padsv/;
 $ops{$_} = 'list' for qw/padav/;
 $ops{$_} = 'list' for qw/padhv rv2hv/;
-$ops{$_} = 'list' for qw/padany flip match entereval readline/;
-$ops{stat}      = 13;
+$ops{$_} = 'list' for qw/padany match entereval readline/;
+
+$ops{each}      = { 0 => 0.5, 2 => 0.5 };
+$ops{stat}      = { 0 => 0.5, 13 => 0.5 };
+
 $ops{caller}    = sub { my @a = caller 0; scalar @a }->();
 $ops{localtime} = do { my @a = localtime; scalar @a };
 $ops{gmtime}    = do { my @a = gmtime; scalar @a };
 
+$ops{$_} = { 0 => 0.5, 10 => 0.5 } for map "gpw$_", qw/nam uid ent/;
+$ops{$_} = { 0 => 0.5, 4 => 0.5 }  for map "ggr$_", qw/nam gid ent/;
+$ops{$_} = 'list'                  for qw/ghbyname ghbyaddr ghostent/;
+$ops{$_} = { 0 => 0.5, 4 => 0.5 }  for qw/gnbyname gnbyaddr gnetent/;
+$ops{$_} = { 0 => 0.5, 3 => 0.5 }  for qw/gpbyname gpbynumber gprotoent/;
+$ops{$_} = { 0 => 0.5, 4 => 0.5 }  for qw/gsbyname gsbyport gservent/;
+
 sub enter {
  my ($self, $cv) = @_;
 
@@ -255,7 +266,11 @@ sub expect_list {
  my $n = name($op);
  my $meth = $self->can('pp_' . $n);
  return $self->$meth($op) if $meth;
- return $ops{$n} => 0 if exists $ops{$n};
+ if (exists $ops{$n}) {
+  my $r = $ops{$n};
+  $r = { %$r } if ref $r eq 'HASH';
+  return $r => 0;
+ }
 
  if ($op->flags & OPf_KIDS) {
   my @res = (0);
@@ -401,13 +416,12 @@ sub pp_goto {
 sub pp_const {
  my ($self, $op) = @_;
 
- if (class($op) eq 'SVOP' and (my $sv = $self->const_sv($op))) {
-  my $c = class($sv);
-  if ($c eq 'AV') {
-   return $sv->FILL + 1;
-  } elsif ($c eq 'HV') {
-   return 2 * $sv->FILL;
-  }
+ my $sv = $self->const_sv($op);
+ my $c = class($sv);
+ if ($c eq 'AV') {
+  return $sv->FILL + 1;
+ } elsif ($c eq 'HV') {
+  return 2 * $sv->FILL;
  }
 
  return 1;
@@ -427,10 +441,46 @@ sub pp_rv2av {
  return (name($op) eq 'const') ? $self->expect_any($op) : 'list';
 }
 
-sub pp_aassign { $_[0]->expect_any($_[1]->first) }
+sub pp_aassign {
+ my ($self, $op) = @_;
+
+ $op = $op->first;
+
+ # Can't assign to return
+ my ($p, $r) = $self->expect_list($op->sibling);
+ return $p => 0 if not exists $p->{list};
+
+ $self->expect_any($op);
+}
 
 sub pp_leaveloop { $_[0]->expect_return($_[1]->first->sibling) }
 
+sub pp_flip {
+ my ($self, $op) = @_;
+
+ $op = $op->first;
+ return 'list' if name($op) ne 'range';
+
+ my $begin = $op->first;
+ if (name($begin) eq 'const') {
+  my $end = $begin->sibling;
+  if (name($end) eq 'const') {
+   $begin  = $self->const_sv($begin);
+   $end    = $self->const_sv($end);
+   no warnings 'numeric';
+   return int(${$end->object_2svref}) - int(${$begin->object_2svref}) + 1;
+  } else {
+   my ($p, $r) = $self->expect_return($end);
+   return $p => 1 if $r;
+  }
+ } else {
+  my ($p, $r) = $self->expect_return($begin);
+  return $p => 1 if $r;
+ }
+
+ return 'list'
+}
+
 =head1 EXPORT
 
 An object-oriented module shouldn't export any function, and so does this one.