Change PerlIO::Scalar and Via to scalar and via.

[p5sagit/p5-mst-13.2.git] / ext / B / B / Deparse.pm

diff --git a/ext/B/B/Deparse.pm b/ext/B/B/Deparse.pm
index 786c7a4..924f436 100644 (file)
--- a/ext/B/B/Deparse.pm
+++ b/ext/B/B/Deparse.pm
@@ -586,7 +586,7 @@ sub compile {
 sub coderef2text {
     my $self = shift;
     my $sub = shift;
-    croak "Usage: ->coderef2text(CODEREF)" unless ref($sub) eq "CODE";
+    croak "Usage: ->coderef2text(CODEREF)" unless UNIVERSAL::isa($sub, "CODE");
 
     $self->init();
     return $self->indent($self->deparse_sub(svref_2object($sub)));
@@ -2951,14 +2951,6 @@ sub pp_entersub {
        # it back.
        $kid =~ s/^CORE::GLOBAL:://;
 
-        # If the sub name is not a valid identifier, then somebody
-        # (probably Abigail) must have written "foo"->(...). Reproduce
-        # this.
-        if ($kid !~ /^([a-zA-Z_]|::)([a-zA-Z_0-9]|::)*$/) {
-            $kid = single_delim("qq", '"', uninterp(escape_str(unback($kid))));
-            $kid .= "->";
-        }
-
         if (!$declared) {
            return "$kid(" . $args . ")";
        } elsif (defined $proto and $proto eq "") {