where applicable the Mo package also comes with double-colons

gabimuc · Sep 26, 2011 · 13d8d8c · 13d8d8c
1 parent 81b1988
commit 13d8d8c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/lib/Mo.pm b/lib/Mo.pm
@@ -1,3 +1,3 @@
 package Mo;
 $VERSION=0.24;
-no warnings;my$K=__PACKAGE__;*{$K.'::Object::new'}=sub{my$c=shift;my$s=bless{@_},$c;my@B;do{@B=($c.'::BUILD',@B)}while($c)=@{$c.'::ISA'};exists&$_&&&$_($s)for@B;$s};*{$K.'::import'}=sub{import warnings;$^H|=1538;my$P=caller."::";my%e=(extends=>sub{eval"no $_[0]()";@{$P.'ISA'}=$_[0]},has=>sub{my$n=shift;*{$P.$n}=sub{$#_?$_[0]{$n}=$_[1]:$_[0]{$n}}},);for(@_[1..$#_]){eval"require Mo::$_;1";%e=&{$K."::${_}::e"}($P=>%e)}*{$P.$_}=$e{$_}for keys%e;@{$P.'ISA'}=$K.'::Object'};
+no warnings;my$K=__PACKAGE__."::";*{$K.'Object::new'}=sub{my$c=shift;my$s=bless{@_},$c;my@B;do{@B=($c.'::BUILD',@B)}while($c)=@{$c.'::ISA'};exists&$_&&&$_($s)for@B;$s};*{$K.'import'}=sub{import warnings;$^H|=1538;my$P=caller."::";my%e=(extends=>sub{eval"no $_[0]()";@{$P.'ISA'}=$_[0]},has=>sub{my$n=shift;*{$P.$n}=sub{$#_?$_[0]{$n}=$_[1]:$_[0]{$n}}},);for(@_[1..$#_]){eval"require Mo::$_;1";%e=&{$K."${_}::e"}($P=>%e)}*{$P.$_}=$e{$_}for keys%e;@{$P.'ISA'}=$K.'Object'};
diff --git a/lib/Mo/has.pm b/lib/Mo/has.pm
@@ -1,3 +1,3 @@
-package Mo::has;;package Mo;$K=__PACKAGE__;use Mo::default;use Mo::builder;
+package Mo::has;;package Mo;$K=__PACKAGE__."::";use Mo::default;use Mo::builder;
 $VERSION=0.24;
-*{$K.'::has::e'}=sub{my$P=shift;&{$K.'::builder::e'}($P,&{$K.'::default::e'}($P,@_))};
+*{$K.'has::e'}=sub{my$P=shift;&{$K.'builder::e'}($P,&{$K.'default::e'}($P,@_))};
diff --git a/src/Mo.pm b/src/Mo.pm
@@ -2,9 +2,9 @@ package Mo;
 $VERSION = 0.24;
 
 no warnings;
-my $MoPKG = __PACKAGE__;
+my $MoPKG = __PACKAGE__."::";
 
-*{$MoPKG.'::Object::new'} = sub {
+*{$MoPKG.'Object::new'} = sub {
     my $class = shift;
     my $self = bless {@_}, $class;
     my @build_subs;
@@ -19,7 +19,7 @@ my $MoPKG = __PACKAGE__;
     $self;
 };
 
-*{$MoPKG.'::import'} = sub {
+*{$MoPKG.'import'} = sub {
     import warnings;
     $^H |= 1538;
     my $caller_pkg = caller."::";
@@ -40,8 +40,8 @@ my $MoPKG = __PACKAGE__;
     );
     for (@_[1..$#_]) {
         eval "require Mo::$_;1";
-        %exports = &{$MoPKG."::${_}::e"}($caller_pkg => %exports);
+        %exports = &{$MoPKG."${_}::e"}($caller_pkg => %exports);
     }
     *{ $caller_pkg . $_} = $exports{$_} for keys %exports;
-    @{ $caller_pkg . 'ISA' } = $MoPKG.'::Object';
+    @{ $caller_pkg . 'ISA' } = $MoPKG.'Object';
 };
diff --git a/src/Mo/has.pm b/src/Mo/has.pm
@@ -1,10 +1,10 @@
-package Mo::has;;package Mo;$MoPKG = __PACKAGE__;
+package Mo::has;;package Mo;$MoPKG = __PACKAGE__."::";
 use Mo::default;
 use Mo::builder;
 $VERSION = 0.24;
 
-*{$MoPKG.'::has::e'} = sub {
+*{$MoPKG.'has::e'} = sub {
     my $caller_pkg = shift;
-    &{$MoPKG.'::builder::e'}($caller_pkg,
-    &{$MoPKG.'::default::e'}($caller_pkg, @_));
+    &{$MoPKG.'builder::e'}($caller_pkg,
+    &{$MoPKG.'default::e'}($caller_pkg, @_));
 };