X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FModule.pm;h=ea1433d2802e38bc210e28ebb048d2191e306b4b;hb=5727267788b643fba31198b6b3753c21e27a85b6;hp=686ce4ad430eb832a7db43c45eda235aaea45af2;hpb=38bf2a2585e26a47c919fd4c286b7716acb51c00;p=gitmo%2FMoose.git diff --git a/lib/Class/MOP/Module.pm b/lib/Class/MOP/Module.pm index 686ce4a..ea1433d 100644 --- a/lib/Class/MOP/Module.pm +++ b/lib/Class/MOP/Module.pm @@ -7,8 +7,6 @@ use warnings; use Carp 'confess'; use Scalar::Util 'blessed'; -our $AUTHORITY = 'cpan:STEVAN'; - use base 'Class::MOP::Package'; sub _new { @@ -18,9 +16,11 @@ sub _new { my $params = @_ == 1 ? $_[0] : {@_}; return bless { + # Need to quote package to avoid a problem with PPI mis-parsing this + # as a package statement. # from Class::MOP::Package - package => $params->{package}, + 'package' => $params->{package}, namespace => \undef, # attributes @@ -49,9 +49,27 @@ sub identifier { } sub create { - confess "The Class::MOP::Module->create method has been made a private object method.\n"; + my $class = shift; + my @args = @_; + + unshift @args, 'package' if @args % 2 == 1; + my %options = @args; + + my $package = delete $options{package}; + my $version = delete $options{version}; + my $authority = delete $options{authority}; + + my $meta = $class->SUPER::create($package => %options); + + $meta->_instantiate_module($version, $authority); + + return $meta; } +sub _anon_package_prefix { 'Class::MOP::Module::__ANON__::SERIAL::' } +sub _anon_cache_key { confess "Modules are not cacheable" } + + sub _instantiate_module { my($self, $version, $authority) = @_; my $package_name = $self->name; @@ -59,10 +77,10 @@ sub _instantiate_module { Class::MOP::_is_valid_class_name($package_name) || confess "creation of $package_name failed: invalid package name"; - no strict 'refs'; - scalar %{ $package_name . '::' }; # touch the stash - ${ $package_name . '::VERSION' } = $version if defined $version; - ${ $package_name . '::AUTHORITY' } = $authority if defined $authority; + $self->add_package_symbol('$VERSION' => $version) + if defined $version; + $self->add_package_symbol('$AUTHORITY' => $authority) + if defined $authority; return; }