- Replaced some expensive Block.call()s with cheaper Block.runs.

- As a side-effect, the `Array.sort{}` method is now faster, among other methods.
trizen · Jun 20, 2015 · 1a44f27 · 1a44f27
1 parent e950204
commit 1a44f27
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/lib/Sidef/Types/Array/Array.pm b/lib/Sidef/Types/Array/Array.pm
@@ -513,16 +513,14 @@ package Sidef::Types::Array::Array {
 
     sub map {
         my ($self, $code) = @_;
-
-        $self->new(map { $code->run($_->get_value); } @{$self});
+        $self->new(map { $code->run($_->get_value) } @{$self});
     }
 
     *collect = \&map;
 
     sub grep {
         my ($self, $code) = @_;
-
-        $self->new(grep { $code->run($_); } map { $_->get_value } @{$self});
+        $self->new(grep { $code->run($_) } map { $_->get_value } @{$self});
     }
 
     *filter = \&grep;
@@ -697,7 +695,7 @@ package Sidef::Types::Array::Array {
 
         my $x = $self->[0]->get_value;
         foreach my $i (1 .. $offset) {
-            $x = $obj->call($x, $self->[$i]->get_value);
+            $x = $obj->run($x, $self->[$i]->get_value);
         }
         $x;
     }
@@ -835,9 +833,14 @@ package Sidef::Types::Array::Array {
                      my $ref   = delete $hash->{$key};
                      while (my ($key) = CORE::each %{$ref}) {
                          if ($key eq $__END__) {
-                             $__CALL__
-                               ? $code->call($self->new(map { $_->get_value } @{$ref->{$key}}[0 .. $#{$ref->{$key}} - $count]))
-                               : $callback->(@{$ref->{$key}}[0 .. $#{$ref->{$key}} - $count]);
+
+                             if ($__CALL__) {
+                                 $code->run($self->new(map { $_->get_value } @{$ref->{$key}}[0 .. $#{$ref->{$key}} - $count]));
+                             }
+                             else {
+                                 $callback->(@{$ref->{$key}}[0 .. $#{$ref->{$key}} - $count]);
+                             }
+
                              last;
                          }
                          $ref = $ref->{$key};
@@ -1003,9 +1006,8 @@ package Sidef::Types::Array::Array {
         my ($self, $code) = @_;
 
         if (defined $code) {
-
             return
-              $self->new(sort { $code->call($a, $b) }
+              $self->new(sort { $code->run($a, $b) }
                          map { $_->get_value } @{$self});
         }
 

diff --git a/lib/Sidef/Types/Glob/File.pm b/lib/Sidef/Types/Glob/File.pm
@@ -369,7 +369,7 @@ package Sidef::Types::Glob::File {
         my @lines;
         open(my $fh, '+<:utf8', $self->get_value) || return Sidef::Types::Bool::Bool->false;
         while (defined(my $line = <$fh>)) {
-            push @lines, $code->call(Sidef::Types::String::String->new($line));
+            push @lines, $code->run(Sidef::Types::String::String->new($line));
         }
 
         truncate($fh, 0) || do {

diff --git a/lib/Sidef/Types/Hash/Hash.pm b/lib/Sidef/Types/Hash/Hash.pm
@@ -154,7 +154,7 @@ package Sidef::Types::Hash::Hash {
             my $key_obj = Sidef::Types::String::String->new($key);
             my $val_obj = $value->get_value;
 
-            if ($code->call($key_obj, $val_obj)) {
+            if ($code->run($key_obj, $val_obj)) {
                 $callback->($key, $val_obj);
             }
         }
@@ -170,7 +170,7 @@ package Sidef::Types::Hash::Hash {
               Sidef::Variable::Variable->new(
                                              name  => '',
                                              type  => 'var',
-                                             value => $code->call(Sidef::Types::String::String->new($key), $value->get_value)
+                                             value => $code->run(Sidef::Types::String::String->new($key), $value->get_value)
                                             );
         }
 
@@ -305,7 +305,7 @@ package Sidef::Types::Hash::Hash {
 
         my @array;
         while (my ($key, $value) = CORE::each %{$self->{data}}) {
-            push @array, [$key, $code->call(Sidef::Types::String::String->new($key), $value->get_value)];
+            push @array, [$key, $code->run(Sidef::Types::String::String->new($key), $value->get_value)];
         }
 
         my $method = '<=>';

diff --git a/lib/Sidef/Types/String/String.pm b/lib/Sidef/Types/String/String.pm
@@ -508,7 +508,7 @@ package Sidef::Types::String::String {
             return __PACKAGE__->new($self->get_value =~ s{$search}{$code->get_value}eer);
         }
 
-        __PACKAGE__->new($self->get_value =~ s{$search}{$code->call(_get_captures($self->get_value))}er);
+        __PACKAGE__->new($self->get_value =~ s{$search}{$code->run(_get_captures($self->get_value))}er);
     }
 
     sub gesub {
@@ -526,7 +526,7 @@ package Sidef::Types::String::String {
         }
 
         my $value = $self->get_value;
-        __PACKAGE__->new($value =~ s{$search}{$code->call(_get_captures($value))}ger);
+        __PACKAGE__->new($value =~ s{$search}{$code->run(_get_captures($value))}ger);
     }
 
     sub glob {