added basic support for Perl 5.20 signatures

mojolicious · Sep 20, 2014 · f0ff29c · f0ff29c
1 parent 3b04921
commit f0ff29c
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 7 deletions.
diff --git a/lib/Mojo/Base.pm b/lib/Mojo/Base.pm
@@ -41,6 +41,12 @@ sub import {
   # Mojo modules are strict!
   $_->import for qw(strict warnings utf8);
   feature->import(':5.10');
+
+  # Signatures for Perl 5.20+
+  if ($^V >= 5.020000) {
+    feature->import('signatures');
+    warnings->unimport('experimental::signatures');
+  }
 }
 
 sub attr {
@@ -137,13 +143,21 @@ All three forms save a lot of typing.
   use warnings;
   use utf8;
   use feature ':5.10';
+  if ($^V >= 5.020000) {
+    feature->import('signatures');
+    warnings->unimport('experimental::signatures');
+  }
   use IO::Handle ();
 
   # use Mojo::Base -base;
   use strict;
   use warnings;
   use utf8;
   use feature ':5.10';
+  if ($^V >= 5.020000) {
+    feature->import('signatures');
+    warnings->unimport('experimental::signatures');
+  }
   use IO::Handle ();
   use Mojo::Base;
   push @ISA, 'Mojo::Base';
@@ -154,6 +168,10 @@ All three forms save a lot of typing.
   use warnings;
   use utf8;
   use feature ':5.10';
+  if ($^V >= 5.020000) {
+    feature->import('signatures');
+    warnings->unimport('experimental::signatures');
+  }
   use IO::Handle ();
   require SomeBaseClass;
   push @ISA, 'SomeBaseClass';

diff --git a/lib/Mojo/Util.pm b/lib/Mojo/Util.pm
@@ -11,6 +11,7 @@ use File::Basename 'dirname';
 use File::Spec::Functions 'catfile';
 use List::Util 'min';
 use MIME::Base64 qw(decode_base64 encode_base64);
+use Scalar::Util 'set_prototype';
 use Symbol 'delete_package';
 use Time::HiRes ();
 
@@ -278,11 +279,12 @@ sub squish {
   return $str;
 }
 
-sub steady_time () {
+sub steady_time {
   MONOTONIC
     ? Time::HiRes::clock_gettime(Time::HiRes::CLOCK_MONOTONIC())
     : Time::HiRes::time;
 }
+BEGIN { set_prototype \&steady_time, '' }
 
 sub tablify {
   my $rows = shift;

diff --git a/lib/Mojolicious/Lite.pm b/lib/Mojolicious/Lite.pm
@@ -6,6 +6,7 @@ use File::Basename qw(basename dirname);
 use File::Spec::Functions 'catdir';
 use Mojo::UserAgent::Server;
 use Mojo::Util 'monkey_patch';
+use Scalar::Util 'set_prototype';
 
 sub import {
 
@@ -38,11 +39,13 @@ sub import {
   monkey_patch $caller, $_, sub {$app}
     for qw(new app);
   monkey_patch $caller, del => sub { $routes->delete(@_) };
-  monkey_patch $caller, group => sub (&) {
-    (my $old, $root) = ($root, $routes);
-    shift->();
-    ($routes, $root) = ($root, $old);
-  };
+  monkey_patch $caller, group => set_prototype(
+    sub {
+      (my $old, $root) = ($root, $routes);
+      shift->();
+      ($routes, $root) = ($root, $old);
+    } => '&'
+  );
   monkey_patch $caller,
     helper => sub { $app->helper(@_) },
     hook   => sub { $app->hook(@_) },

diff --git a/lib/ojo.pm b/lib/ojo.pm
@@ -7,6 +7,7 @@ use Mojo::Collection 'c';
 use Mojo::DOM;
 use Mojo::JSON 'j';
 use Mojo::Util qw(dumper monkey_patch);
+use Scalar::Util 'set_prototype';
 
 # Silent one-liners
 $ENV{MOJO_LOG_LEVEL} ||= 'fatal';
@@ -16,6 +17,7 @@ sub import {
   # Mojolicious::Lite
   my $caller = caller;
   eval "package $caller; use Mojolicious::Lite; 1" or die $@;
+  Mojo::Base->import(-strict);
   my $ua = $caller->app->ua;
   $ua->server->app->hook(around_action => sub { local $_ = $_[1]; $_[0]->() });
 
@@ -31,7 +33,7 @@ sub import {
     g => sub { _request($ua, 'GET',    @_) },
     h => sub { _request($ua, 'HEAD',   @_) },
     j => \&j,
-    n => sub (&@) { say STDERR timestr timeit($_[1] // 1, $_[0]) },
+    n => set_prototype(\&_n, '&@'),
     o => sub { _request($ua, 'OPTIONS', @_) },
     p => sub { _request($ua, 'POST',    @_) },
     r => \&dumper,
@@ -40,6 +42,8 @@ sub import {
     x => sub { Mojo::DOM->new(@_) };
 }
 
+sub _n { say STDERR timestr timeit($_[1] // 1, $_[0]) }
+
 sub _request {
   my $ua = shift;