summaryrefslogtreecommitdiff
path: root/toke.c
diff options
context:
space:
mode:
authorNick Ing-Simmons <nik@tiuk.ti.com>1997-11-22 16:30:27 +0000
committerNick Ing-Simmons <nik@tiuk.ti.com>1997-11-22 16:30:27 +0000
commitf81342c8ed56420002f9ad172de0b7485a7c6b96 (patch)
tree921a34f0d4476503ddbf328e789517d6cfd07e42 /toke.c
parenta868473fb9213692497e27ae968094b32a41c501 (diff)
parent0da4822f11e97ce202166899552c06d720eb835a (diff)
downloadperl-f81342c8ed56420002f9ad172de0b7485a7c6b96.tar.gz
Resolve ansiperl against win32
p4raw-id: //depot/ansiperl@278
Diffstat (limited to 'toke.c')
-rw-r--r--toke.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/toke.c b/toke.c
index f643732a7f..f10c39fada 100644
--- a/toke.c
+++ b/toke.c
@@ -1122,9 +1122,8 @@ filter_del(filter_t funcp)
if (!rsfp_filters || AvFILL(rsfp_filters)<0)
return;
/* if filter is on top of stack (usual case) just pop it off */
- if (IoDIRP(FILTER_DATA(0)) == (void*)funcp){
- /* sv_free(av_pop(rsfp_filters)); */
- sv_free(av_shift(rsfp_filters));
+ if (IoDIRP(FILTER_DATA(AvFILL(rsfp_filters))) == (void*)funcp){
+ sv_free(av_pop(rsfp_filters));
return;
}
@@ -1246,10 +1245,10 @@ yylex(void)
if (!strchr(tokenbuf,':')) {
#ifdef USE_THREADS
- /* Check for single character per-thread magicals */
+ /* Check for single character per-thread SVs */
if (tokenbuf[0] == '$' && tokenbuf[2] == '\0'
- && !isALPHA(tokenbuf[1]) /* Rule out obvious non-magicals */
- && (tmp = find_thread_magical(&tokenbuf[1])) != NOT_IN_PAD)
+ && !isALPHA(tokenbuf[1]) /* Rule out obvious non-threadsvs */
+ && (tmp = find_threadsv(&tokenbuf[1])) != NOT_IN_PAD)
{
yylval.opval = newOP(OP_THREADSV, 0);
yylval.opval->op_targ = tmp;
@@ -1393,7 +1392,7 @@ yylex(void)
force_next(',');
#ifdef USE_THREADS
nextval[nexttoke].opval = newOP(OP_THREADSV, 0);
- nextval[nexttoke].opval->op_targ = find_thread_magical("\"");
+ nextval[nexttoke].opval->op_targ = find_threadsv("\"");
force_next(PRIVATEREF);
#else
force_ident("\"", '$');