use Eval::Closure rather than doing string eval directly

[gitmo/Moose.git] / lib / Moose / Meta / TypeConstraint / Enum.pm

diff --git a/lib/Moose/Meta/TypeConstraint/Enum.pm b/lib/Moose/Meta/TypeConstraint/Enum.pm
index e27eb46..b19c59b 100644 (file)
--- a/lib/Moose/Meta/TypeConstraint/Enum.pm
+++ b/lib/Moose/Meta/TypeConstraint/Enum.pm
@@ -4,20 +4,38 @@ use strict;
 use warnings;
 use metaclass;
 
+use B;
 use Moose::Util::TypeConstraints ();
 
-our $AUTHORITY = 'cpan:STEVAN';
-
 use base 'Moose::Meta::TypeConstraint';
 
 __PACKAGE__->meta->add_attribute('values' => (
     accessor => 'values',
 ));
 
+our %ENUMS;
+
+my $inliner = sub {
+    my $self = shift;
+    my $val  = shift;
+
+    my $name = $self->name();
+    $ENUMS{$name} ||= { map { $_ => 1 } @{ $self->values() } };
+
+    return
+          "defined $val"
+        . "&& ! ref $val" . '&& $'
+        . __PACKAGE__
+        . '::ENUMS{'
+        . B::perlstring($name)
+        . "}{ $val }";
+};
+
 sub new {
     my ( $class, %args ) = @_;
 
     $args{parent} = Moose::Util::TypeConstraints::find_type_constraint('Str');
+    $args{inlined} = $inliner;
 
     if ( scalar @{ $args{values} } < 2 ) {
         require Moose;
@@ -35,6 +53,9 @@ sub new {
         }
     }
 
+    my %values = map { $_ => 1 } @{ $args{values} };
+    $args{constraint} = sub { $values{ $_[0] } };
+
     my $self = $class->_new(\%args);
 
     $self->compile_type_constraint()
@@ -73,14 +94,6 @@ sub constraint {
     return sub { exists $values{$_[0]} };
 }
 
-sub _compile_hand_optimized_type_constraint {
-    my $self  = shift;
-
-    my %values = map { $_ => undef } @{ $self->values };
-
-    sub { defined($_[0]) && !ref($_[0]) && exists $values{$_[0]} };
-}
-
 sub create_child_type {
     my ($self, @args) = @_;
     return Moose::Meta::TypeConstraint->new(@args, parent => $self);