summaryrefslogtreecommitdiff
path: root/toke.c
diff options
context:
space:
mode:
authorChip Salzenberg <chip@pobox.com>1998-03-03 04:39:49 +0000
committerGurusamy Sarathy <gsar@cpan.org>1998-03-03 04:39:49 +0000
commit93233ece75d8fe98a77377e72c4d6004c5ea8691 (patch)
treed9de53b8b818671b4e52497a2397cde5a6e8950e /toke.c
parent2c4aebbdec0f7c22369f4986d7cad0139e4dd272 (diff)
downloadperl-93233ece75d8fe98a77377e72c4d6004c5ea8691.tar.gz
[win32] merge problematic maintpatch to op.c
#77: "Eliminate double warnings under C<package;>" Files: gv.c op.c toke.c p4raw-id: //depot/win32/perl@641
Diffstat (limited to 'toke.c')
-rw-r--r--toke.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/toke.c b/toke.c
index ad423642a6..39382c9cf1 100644
--- a/toke.c
+++ b/toke.c
@@ -555,7 +555,7 @@ force_ident(register char *s, int kind)
/* XXX see note in pp_entereval() for why we forgo typo
warnings if the symbol must be introduced in an eval.
GSAR 96-10-12 */
- gv_fetchpv(s, in_eval ? GV_ADDMULTI : TRUE,
+ gv_fetchpv(s, in_eval ? (GV_ADDMULTI | 8) : TRUE,
kind == '$' ? SVt_PV :
kind == '@' ? SVt_PVAV :
kind == '%' ? SVt_PVHV :
@@ -1509,7 +1509,7 @@ yylex(void)
/* build ops for a bareword */
yylval.opval = (OP*)newSVOP(OP_CONST, 0, newSVpv(tokenbuf+1, 0));
yylval.opval->op_private = OPpCONST_ENTERED;
- gv_fetchpv(tokenbuf+1, in_eval ? GV_ADDMULTI : TRUE,
+ gv_fetchpv(tokenbuf+1, in_eval ? (GV_ADDMULTI | 8) : TRUE,
((tokenbuf[0] == '$') ? SVt_PV
: (tokenbuf[0] == '@') ? SVt_PVAV
: SVt_PVHV));