X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ext%2FB%2FB%2FDeparse.pm;h=eb8eb60f20749c6a7c3585fc7903ef0f6a50e5d8;hb=76ef7183b725f0ef3e642f805cb4d676a5263201;hp=b0a5eaeb38ddb5fc3bcfa71053cc17e966092df5;hpb=0e06870bf080a38cda51c06c6612359afc2334e1;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/ext/B/B/Deparse.pm b/ext/B/B/Deparse.pm
index b0a5eae..eb8eb60 100644
--- a/ext/B/B/Deparse.pm
+++ b/ext/B/B/Deparse.pm
@@ -573,7 +573,11 @@ sub maybe_local {
     my $self = shift;
     my($op, $cx, $text) = @_;
     if ($op->private & OPpLVAL_INTRO and not $self->{'avoid_local'}{$$op}) {
-	return $self->maybe_parens_func("local", $text, $cx, 16);
+        if (want_scalar($op)) {
+	    return "local $text";
+	} else {
+	    return $self->maybe_parens_func("local", $text, $cx, 16);
+	}
     } else {
 	return $text;
     }
@@ -601,7 +605,11 @@ sub maybe_my {
     my $self = shift;
     my($op, $cx, $text) = @_;
     if ($op->private & OPpLVAL_INTRO and not $self->{'avoid_local'}{$$op}) {
-	return $self->maybe_parens_func("my", $text, $cx, 16);
+	if (want_scalar($op)) {
+	    return "my $text";
+	} else {
+	    return $self->maybe_parens_func("my", $text, $cx, 16);
+	}
     } else {
 	return $text;
     }
@@ -774,8 +782,9 @@ sub gv_name {
     } else {
 	$stash = $stash . "::";
     }
-    if ($name =~ /^([\cA-\cZ])$/) {
-	$name = "^" . chr(64 + ord($1));
+    if ($name =~ /^([\cA-\cZ])(.*)$/) {
+	$name = "^" . chr(64 + ord($1)) . $2;
+	$name = "{$name}" if length($2);	# ${^WARNING_BITS} etc
     }
     return $stash . $name;
 }
@@ -2408,7 +2417,9 @@ sub pp_const {
 #	return $self->const_sv($op)->PV;
 #    }
     my $sv = $self->const_sv($op);
-    return const($sv);
+#    return const($sv);
+    my $c = const $sv; 
+    return $c =~ /^-\d/ ? $self->maybe_parens($c, $cx, 21) : $c;
 }
 
 sub dq {