diff options
| author | Nicholas Clark <nick@ccl4.org> | 2013-04-08 16:53:47 +0200 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2013-05-03 12:01:59 +0200 |
| commit | 5b6da579918d96df1d2cd514c5f756d1d246c723 (patch) | |
| tree | 539c3a6cd0370cc8a95bc12ff4da0998692a740f /gv.c | |
| parent | 000947ada5b027f394ee63b5166df8c06b64a74e (diff) | |
| download | perl-5b6da579918d96df1d2cd514c5f756d1d246c723.tar.gz | |
Revert "Add a deprecation warning for all uses of @*, %*, &* and **."
This reverts commit 982110e06e40aad7a538cb788327cca8aaabce22.
Conflicts:
pod/perldelta.pod
Diffstat (limited to 'gv.c')
| -rw-r--r-- | gv.c | 29 |
1 files changed, 7 insertions, 22 deletions
@@ -1646,23 +1646,16 @@ Perl_gv_fetchpvn_flags(pTHX_ const char *nambeg, STRLEN full_len, I32 flags, require_tie_mod(gv, "!", newSVpvs("Errno"), "TIEHASH", 1); else if (*name == '-' || *name == '+') require_tie_mod(gv, name, newSVpvs("Tie::Hash::NamedCapture"), "TIEHASH", 0); - } else if (sv_type == SVt_PV && *name == '#') { - Perl_ck_warner_d(aTHX_ packWARN2(WARN_DEPRECATED, - WARN_SYNTAX), - "$# is no longer supported"); - } - if (*name == '*') { - if (sv_type == SVt_PV) + } else if (sv_type == SVt_PV) { + if (*name == '*') { Perl_ck_warner_d(aTHX_ packWARN2(WARN_DEPRECATED, WARN_SYNTAX), "$* is no longer supported, and will become a syntax error"); - else - Perl_ck_warner_d(aTHX_ packWARN2(WARN_DEPRECATED, WARN_SYNTAX), - "%c* is deprecated, and will become a syntax error", - sv_type == SVt_PVAV ? '@' - : sv_type == SVt_PVCV ? '&' - : sv_type == SVt_PVHV ? '%' - : '*'); + } else if (*name == '#') { + Perl_ck_warner_d(aTHX_ packWARN2(WARN_DEPRECATED, + WARN_SYNTAX), + "$# is no longer supported"); + } } if (sv_type==SVt_PV || sv_type==SVt_PVGV) { switch (*name) { @@ -1955,14 +1948,6 @@ Perl_gv_fetchpvn_flags(pTHX_ const char *nambeg, STRLEN full_len, I32 flags, 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"); - else { - Perl_ck_warner_d(aTHX_ packWARN2(WARN_DEPRECATED, WARN_SYNTAX), - "%c* is deprecated, and will become a syntax error", - sv_type == SVt_PVAV ? '@' - : sv_type == SVt_PVCV ? '&' - : sv_type == SVt_PVHV ? '%' - : '*'); - } break; case '#': /* $# */ if (sv_type == SVt_PV) |