Changeset 21350

Timestamp:

10/15/08 11:51:42 (5 years ago)

Author:

yappo

Message:

merge from List::RubyLike? (http://github.com/naoya/list-rubylike/tree/master)

Files:

• lang/perl/List-Rubyish/trunk/lib/List/Rubyish.pm (modified) (5 diffs)

lang/perl/List-Rubyish/trunk/lib/List/Rubyish.pm

@@ -2 +2 @@
 use strict;
 use warnings;
+use overload
+    '<<'     => 'push',
+    '+'      => 'add',
+    fallback => 1;
+
 our $VERSION = '0.01';
 
@@ -10 +15 @@
 sub new {
     my ($class, $array) = @_;
-    $class = ref $class || $class;
+    $class = ref $class if ref $class;
     $array ||= [];
     croak sprintf("Argument must be an array reference (%s)", ref $array)
@@ -47 +52 @@
 sub slice {
     my $self = CORE::shift;
-    my ($s, $e) = @_;
+    my ($start, $end) = @_;
     my $last = $#{$self};
-    # warn "s: $s, e: $e, last: $last";
-    if (defined $e) {
-        if ($s == 0 && $last <= $e) {
+    if (defined $end) {
+        if ($start == 0 && $last <= $end) {
             return $self;
         } else {
-            $e = $last if ($last < $e);
-            return $self->new([ @$self[ $s .. $e ] ]);
+            $end = $last if $last < $end;
+            return $self->new([ @$self[ $start .. $end ] ]);
         }
-    } elsif (defined $s && 0 < $s && $last <= $s) {
-        # warn $self->first . "s: $s, e: $e, self:" . $#{$self};
+    } elsif (defined $start && 0 < $start && $last <= $start) {
         return $self->new([]);
     } else {
@@ -203 +206 @@
 
 sub find {
-    my ($self, $code) = @_;
-    croak "Argument must be a code" unless ref $code eq 'CODE';
+    my ($self, $cond) = @_;
+    my $code = (ref $cond and ref $cond eq 'CODE')
+        ? $cond
+        : sub { $_ eq $cond };
+
     for (@$self) { &$code and return $_ }
+    return;
 }
 
@@ -211 +218 @@
     my ($self, $target) = @_;
     my $code = (ref $target eq 'CODE') ? $target : sub { CORE::shift eq $target };
+
     for (my $i = 0; $i < $self->length; $i++) {
-        &$code($self->[$i]) and return $i;
+        $code->($self->[$i]) and return $i;
     }
+    return;
 }