diff options
Diffstat (limited to 'toke.c')
| -rw-r--r-- | toke.c | 23 |
1 files changed, 20 insertions, 3 deletions
@@ -120,6 +120,15 @@ int yyactlevel = -1; #endif #define CLINE (PL_copline = (CopLINE(PL_curcop) < PL_copline ? CopLINE(PL_curcop) : PL_copline)) +/* According to some strict interpretations of ANSI C89 one cannot + * cast void pointers to code pointers or vice versa (as filter_add(), + * filter_del(), and filter_read() will want to do). We should still + * be able to use a union for sneaky "casting". */ +typedef union { + XPVIO* iop; + filter_t filter; +} xpvio_filter_u; + /* * Convenience functions to return different tokens and prime the * lexer for the next token. They all take an argument. @@ -2117,6 +2126,8 @@ S_incl_perldb(pTHX) SV * Perl_filter_add(pTHX_ filter_t funcp, SV *datasv) { + xpvio_filter_u u; + if (!funcp) return Nullsv; @@ -2126,7 +2137,8 @@ Perl_filter_add(pTHX_ filter_t funcp, SV *datasv) datasv = NEWSV(255,0); if (!SvUPGRADE(datasv, SVt_PVIO)) Perl_die(aTHX_ "Can't upgrade filter_add data to SVt_PVIO"); - IoANY(datasv) = (void *)funcp; /* stash funcp into spare field */ + u.filter = funcp; + IoANY(datasv) = u.iop; /* stash funcp into spare field */ IoFLAGS(datasv) |= IOf_FAKE_DIRP; DEBUG_P(PerlIO_printf(Perl_debug_log, "filter_add func %p (%s)\n", (void*)funcp, SvPV_nolen(datasv))); @@ -2141,12 +2153,15 @@ void Perl_filter_del(pTHX_ filter_t funcp) { SV *datasv; + xpvio_filter_u u; + DEBUG_P(PerlIO_printf(Perl_debug_log, "filter_del func %p", (void*)funcp)); if (!PL_rsfp_filters || AvFILLp(PL_rsfp_filters)<0) return; /* if filter is on top of stack (usual case) just pop it off */ datasv = FILTER_DATA(AvFILLp(PL_rsfp_filters)); - if (IoANY(datasv) == (void *)funcp) { + u.iop = IoANY(datasv); + if (u.filter == funcp) { IoFLAGS(datasv) &= ~IOf_FAKE_DIRP; IoANY(datasv) = (void *)NULL; sv_free(av_pop(PL_rsfp_filters)); @@ -2165,6 +2180,7 @@ Perl_filter_read(pTHX_ int idx, SV *buf_sv, int maxlen) { filter_t funcp; SV *datasv = NULL; + xpvio_filter_u u; if (!PL_rsfp_filters) return -1; @@ -2206,7 +2222,8 @@ Perl_filter_read(pTHX_ int idx, SV *buf_sv, int maxlen) return FILTER_READ(idx+1, buf_sv, maxlen); /* recurse */ } /* Get function pointer hidden within datasv */ - funcp = (filter_t)IoANY(datasv); + u.iop = IoANY(datasv); + funcp = u.filter; DEBUG_P(PerlIO_printf(Perl_debug_log, "filter_read %d: via function %p (%s)\n", idx, (void*)funcp, SvPV_nolen(datasv))); |