use Scalar::Util 'blessed';
use Carp 'confess';
-our $VERSION = '0.05';
+our $VERSION = '0.07';
our $AUTHORITY = 'cpan:STEVAN';
use base 'Class::MOP::Object';
(defined $variable)
|| confess "You must pass a variable name";
- my ($sigil, $name) = ($variable =~ /^(.)(.*)$/);
+ my $sigil = substr($variable, 0, 1, '');
(defined $sigil)
|| confess "The variable name must include a sigil";
(exists $SIGIL_MAP{$sigil})
|| confess "I do not recognize that sigil '$sigil'";
- return ($name, $sigil, $SIGIL_MAP{$sigil});
+ return ($variable, $sigil, $SIGIL_MAP{$sigil});
}
}
# this. Which of course means that
# if you put \undef in your scalar
# then this is broken.
-
- if ($type eq 'SCALAR') {
+
+ if (ref($self->namespace->{$name}) eq 'SCALAR') {
+ return ($type eq 'CODE' ? 1 : 0);
+ }
+ elsif ($type eq 'SCALAR') {
my $val = *{$self->namespace->{$name}}{$type};
- defined(${$val}) ? 1 : 0;
+ return defined(${$val}) ? 1 : 0;
}
else {
defined(*{$self->namespace->{$name}}{$type}) ? 1 : 0;
$self->add_package_symbol($variable)
unless exists $self->namespace->{$name};
- return *{$self->namespace->{$name}}{$type};
+
+ if (ref($self->namespace->{$name}) eq 'SCALAR') {
+ if ($type eq 'CODE') {
+ no strict 'refs';
+ return \&{$self->name.'::'.$name};
+ }
+ else {
+ return undef;
+ }
+ }
+ else {
+ return *{$self->namespace->{$name}}{$type};
+ }
}
sub remove_package_symbol {
# type (SCALAR|ARRAY|HASH|CODE)
my $namespace = $self->namespace;
return grep {
- defined(*{$namespace->{$_}}{$type_filter})
+ (ref($namespace->{$_})
+ ? (ref($namespace->{$_}) eq 'SCALAR' && $type_filter eq 'CODE')
+ : (ref(\$namespace->{$_}) eq 'GLOB'
+ && defined(*{$namespace->{$_}}{$type_filter})));
} keys %{$namespace};
}
Stevan Little E<lt>stevan@iinteractive.comE<gt>
-Yuval Kogman E<lt>nothingmuch@woobling.comE<gt>
-
=head1 COPYRIGHT AND LICENSE
-Copyright 2006, 2007 by Infinity Interactive, Inc.
+Copyright 2006-2008 by Infinity Interactive, Inc.
L<http://www.iinteractive.com>
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
-=cut
\ No newline at end of file
+=cut