summaryrefslogtreecommitdiff
path: root/gv.c
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2013-04-08 17:05:11 +0200
committerNicholas Clark <nick@ccl4.org>2013-05-03 12:03:04 +0200
commit4f650b80ec9c5c9641951c5c41c2a5ac37012b7d (patch)
tree91d93104d770ded811101309e2746907642297f6 /gv.c
parent5b6da579918d96df1d2cd514c5f756d1d246c723 (diff)
downloadperl-4f650b80ec9c5c9641951c5c41c2a5ac37012b7d.tar.gz
Revert "Change the warning for $* to add ", and will become a syntax error"."
This reverts commit 53213d38f22e9356f489162e494d2ffa46ec2ca2. Conflicts: pod/perldelta.pod
Diffstat (limited to 'gv.c')
-rw-r--r--gv.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/gv.c b/gv.c
index 1e20f99834..23251940a3 100644
--- a/gv.c
+++ b/gv.c
@@ -1647,14 +1647,11 @@ Perl_gv_fetchpvn_flags(pTHX_ const char *nambeg, STRLEN full_len, I32 flags,
else if (*name == '-' || *name == '+')
require_tie_mod(gv, name, newSVpvs("Tie::Hash::NamedCapture"), "TIEHASH", 0);
} else if (sv_type == SVt_PV) {
- if (*name == '*') {
+ if (*name == '*' || *name == '#') {
+ /* diag_listed_as: $* is no longer supported */
Perl_ck_warner_d(aTHX_ packWARN2(WARN_DEPRECATED,
WARN_SYNTAX),
- "$* is no longer supported, and will become a syntax error");
- } else if (*name == '#') {
- Perl_ck_warner_d(aTHX_ packWARN2(WARN_DEPRECATED,
- WARN_SYNTAX),
- "$# is no longer supported");
+ "$%c is no longer supported", *name);
}
}
if (sv_type==SVt_PV || sv_type==SVt_PVGV) {
@@ -1945,14 +1942,11 @@ Perl_gv_fetchpvn_flags(pTHX_ const char *nambeg, STRLEN full_len, I32 flags,
break;
}
case '*': /* $* */
- if (sv_type == SVt_PV)
- Perl_ck_warner_d(aTHX_ packWARN2(WARN_DEPRECATED, WARN_SYNTAX),
- "$* is no longer supported, and will become a syntax error");
- break;
case '#': /* $# */
if (sv_type == SVt_PV)
+ /* diag_listed_as: $* is no longer supported */
Perl_ck_warner_d(aTHX_ packWARN2(WARN_DEPRECATED, WARN_SYNTAX),
- "$# is no longer supported");
+ "$%c is no longer supported", *name);
break;
case '\010': /* $^H */
{