diff options
| author | Zack Weinberg <zack@gcc.gnu.org> | 2000-08-20 21:36:18 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2000-08-20 21:36:18 +0000 |
| commit | 3cb553b4684a17ca436be66895be0aeaee83644f (patch) | |
| tree | d81b589e39b9cc29d2ac00a4c083ae74ae5241d1 /gcc/cppmain.c | |
| parent | 53e687fabb8208f715fd30172c48430eef4e2255 (diff) | |
| download | gcc-3cb553b4684a17ca436be66895be0aeaee83644f.zip gcc-3cb553b4684a17ca436be66895be0aeaee83644f.tar.gz gcc-3cb553b4684a17ca436be66895be0aeaee83644f.tar.bz2 | |
[multiple changes]
2000-08-20 Zack Weinberg <zack@wolery.cumb.org>
* cppinit.c (cpp_init): Set global flag when called.
(cpp_reader_init): Bomb out if cpp_init hasn't been called.
Sun Aug 20 01:41:35 MSD 2000 Dennis Chernoivanov <cdi@sparc.spb.su>
* cpplex.c (cpp_scan_buffer): Move `output_line_command' just
before `process_directive' so that newlines won't be missed
for directives.
(cpp_printf): Increment `print->lineno' when newline is emitted.
* cppmain.c (cb_ident): Likewise.
(cb_define): Likewise.
(cb_undef): Likewise.
(cb_include): Likewise.
(cb_def_pragma): Likewise.
(dump_macros_helper): Likewise.
* gcc.dg/cpp/pragma-1.c: New test.
* gcc.dg/cpp/pragma-2.c: New test.
From-SVN: r35825
Diffstat (limited to 'gcc/cppmain.c')
| -rw-r--r-- | gcc/cppmain.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gcc/cppmain.c b/gcc/cppmain.c index 9dc431e..3e570be 100644 --- a/gcc/cppmain.c +++ b/gcc/cppmain.c @@ -142,6 +142,7 @@ cb_ident (pfile, str, len) unsigned int len; { cpp_printf (pfile, &parse_out, "#ident \"%.*s\"\n", (int) len, str); + parse_out.lineno++; } static void @@ -156,6 +157,7 @@ cb_define (pfile, hash) || CPP_OPTION (pfile, dump_macros) == dump_definitions) cpp_dump_definition (pfile, parse_out.outf, hash); putc ('\n', parse_out.outf); + parse_out.lineno++; } } @@ -165,7 +167,10 @@ cb_undef (pfile, hash) cpp_hashnode *hash; { if (pfile->done_initializing) - cpp_printf (pfile, &parse_out, "#undef %s\n", hash->name); + { + cpp_printf (pfile, &parse_out, "#undef %s\n", hash->name); + parse_out.lineno++; + } } static void @@ -183,6 +188,7 @@ cb_include (pfile, dir, str, len, ab) l = '"', r = '"'; cpp_printf (pfile, &parse_out, "#%s %c%.*s%c\n", dir, l, (int) len, str, r); + parse_out.lineno++; } static void @@ -233,6 +239,7 @@ cb_def_pragma (pfile) cpp_output_list (pfile, parse_out.outf, &pfile->token_list, pfile->first_directive_token + 2); putc ('\n', parse_out.outf); + parse_out.lineno++; } static void @@ -278,6 +285,7 @@ dump_macros_helper (pfile, hp) cpp_printf (pfile, &parse_out, "#define %s", hp->name); cpp_dump_definition (pfile, parse_out.outf, hp); putc ('\n', parse_out.outf); + parse_out.lineno++; } return 1; |