Merge branch 'master' of github.com:ingydotnet/mo-pm

Conflicts: lib/Mo/import.pm
dams · Oct 3, 2011 · 854fd28 · 854fd28
2 parents 1bf91bc + bce0a42
commit 854fd28
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/Mo/Golf.pm b/lib/Mo/Golf.pm
@@ -76,6 +76,9 @@ sub _finder_subs {
         duplicate_whitespace => sub {
             my ( $top, $current ) = @_;
             return 0 if !$current->isa( tok 'Whitespace' );
+
+            $current->set_content(' ') if 1 < length $current->content;
+
             return 0 if !$current->next_token;
             return 0 if !$current->next_token->isa( tok 'Whitespace' );
             return 1;

diff --git a/lib/Mo/import.pm b/lib/Mo/import.pm
@@ -1,3 +1,3 @@
 package Mo::import;my$M="Mo::";
 $VERSION=0.26;
-my$i=\&import;*{$M.import}=sub{(@_==2 and not $_[1])?pop@_:@_==1        ?push@_,grep!/import/,@f:();goto&$i};
+my$i=\&import;*{$M.import}=sub{(@_==2 and not $_[1])?pop@_:@_==1 ?push@_,grep!/import/,@f:();goto&$i};