diff options
author | Mark Mitchell <mark@codesourcery.com> | 2000-04-18 18:52:16 +0000 |
---|---|---|
committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2000-04-18 18:52:16 +0000 |
commit | cbccf5e80325d6d1289675160e858f2d89662a21 (patch) | |
tree | 95c9d554751159dc13f0e6b7122735d8425be229 /gcc | |
parent | cd89c2966486a807d1c9b5ff6ed6403bbf61e320 (diff) | |
download | gcc-cbccf5e80325d6d1289675160e858f2d89662a21.zip gcc-cbccf5e80325d6d1289675160e858f2d89662a21.tar.gz gcc-cbccf5e80325d6d1289675160e858f2d89662a21.tar.bz2 |
cpplex.c (_cpp_lex_token): Don't call CPP_BUMP_LINE when the mark is active.
* cpplex.c (_cpp_lex_token): Don't call CPP_BUMP_LINE when the
mark is active.
From-SVN: r33228
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ChangeLog | 5 | ||||
-rw-r--r-- | gcc/cpplex.c | 3 | ||||
-rw-r--r-- | gcc/testsuite/g++.old-deja/g++.other/lineno4.C | 7 |
3 files changed, 14 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7c53d5b..0ba9d8b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2000-04-18 Mark Mitchell <mark@codesourcery.com> + + * cpplex.c (_cpp_lex_token): Don't call CPP_BUMP_LINE when the + mark is active. + Tue Apr 18 14:16:47 2000 Richard Kenner <kenner@vlsi1.ultra.nyu.edu> * c-decl.c (mark_binding_level): Use 'for' instead of `while'. diff --git a/gcc/cpplex.c b/gcc/cpplex.c index 1340b9c..06bee99 100644 --- a/gcc/cpplex.c +++ b/gcc/cpplex.c @@ -1218,7 +1218,8 @@ _cpp_lex_token (pfile) else { /* Backslash newline is ignored. */ - CPP_BUMP_LINE (pfile); + if (!ACTIVE_MARK_P (pfile)) + CPP_BUMP_LINE (pfile); goto get_next; } diff --git a/gcc/testsuite/g++.old-deja/g++.other/lineno4.C b/gcc/testsuite/g++.old-deja/g++.other/lineno4.C new file mode 100644 index 0000000..9767262 --- /dev/null +++ b/gcc/testsuite/g++.old-deja/g++.other/lineno4.C @@ -0,0 +1,7 @@ +// Build don't link: + +#define x \ + y + +int; // ERROR - invalid declaration + |