diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 1999-10-02 23:05:50 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 1999-10-02 23:05:50 +0000 |
| commit | 57def98fcb6c98601beaf31e3c48ad681bfdc2a3 (patch) | |
| tree | 1c2ca5d1ae7bb4508bf076e61eda828a50a82f9d /toke.c | |
| parent | ac8eabc1ebb57d426c973b83f7ee5241b2084b4e (diff) | |
| download | perl-57def98fcb6c98601beaf31e3c48ad681bfdc2a3.tar.gz | |
Untangle the IV_IS_QUAD jungle by introduding
macros to be used when doing formatted printing:
IVdf, UVuf, UVxf, UVof. Also introduce Uid_t_SIGN.
p4raw-id: //depot/cfgperl@4288
Diffstat (limited to 'toke.c')
| -rw-r--r-- | toke.c | 23 |
1 files changed, 3 insertions, 20 deletions
@@ -3741,13 +3741,8 @@ Perl_yylex(pTHX) TERM(THING); case KEY___LINE__: -#ifdef IV_IS_QUAD yylval.opval = (OP*)newSVOP(OP_CONST, 0, - Perl_newSVpvf(aTHX_ "%" PERL_PRId64, (IV)PL_curcop->cop_line)); -#else - yylval.opval = (OP*)newSVOP(OP_CONST, 0, - Perl_newSVpvf(aTHX_ "%ld", (long)PL_curcop->cop_line)); -#endif + Perl_newSVpvf(aTHX_ "%"IVdf, (IV)PL_curcop->cop_line)); TERM(THING); case KEY___PACKAGE__: @@ -6995,28 +6990,16 @@ Perl_yyerror(pTHX_ char *s) where = SvPVX(where_sv); } msg = sv_2mortal(newSVpv(s, 0)); -#ifdef IV_IS_QUAD - Perl_sv_catpvf(aTHX_ msg, " at %_ line %" PERL_PRId64 ", ", + Perl_sv_catpvf(aTHX_ msg, " at %_ line %"IVdf", ", GvSV(PL_curcop->cop_filegv), (IV)PL_curcop->cop_line); -#else - Perl_sv_catpvf(aTHX_ msg, " at %_ line %ld, ", - GvSV(PL_curcop->cop_filegv), (long)PL_curcop->cop_line); -#endif if (context) Perl_sv_catpvf(aTHX_ msg, "near \"%.*s\"\n", contlen, context); else Perl_sv_catpvf(aTHX_ msg, "%s\n", where); if (PL_multi_start < PL_multi_end && (U32)(PL_curcop->cop_line - PL_multi_end) <= 1) { -#ifdef IV_IS_QUAD Perl_sv_catpvf(aTHX_ msg, - " (Might be a runaway multi-line %c%c string starting on line %" PERL_\ -PRId64 ")\n", + " (Might be a runaway multi-line %c%c string starting on line %"IVdf")\n", (int)PL_multi_open,(int)PL_multi_close,(IV)PL_multi_start); -#else - Perl_sv_catpvf(aTHX_ msg, - " (Might be a runaway multi-line %c%c string starting on line %ld)\n", - (int)PL_multi_open,(int)PL_multi_close,(long)PL_multi_start); -#endif PL_multi_end = 0; } if (PL_in_eval & EVAL_WARNONLY) |