diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 1999-10-06 03:22:46 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1999-10-06 03:22:46 +0000 |
| commit | f5f7a0b482a96221fe45c96ca998d928c8ea7eff (patch) | |
| tree | 3b31f97fa52e2b424a5ad64b9c52a42de51854a5 /toke.c | |
| parent | bf49b057b09bec860588a9b554c3a77683394722 (diff) | |
| parent | 30382c73ff93b57b951492a5a0d1cba2de577e49 (diff) | |
| download | perl-f5f7a0b482a96221fe45c96ca998d928c8ea7eff.tar.gz | |
integrate cfgperl contents into mainline
p4raw-id: //depot/perl@4303
Diffstat (limited to 'toke.c')
| -rw-r--r-- | toke.c | 23 |
1 files changed, 3 insertions, 20 deletions
@@ -3743,13 +3743,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__: @@ -6998,28 +6993,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) |