diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2000-09-04 09:51:58 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2000-09-04 09:51:58 +0200 |
| commit | 29844fa7c724106adef78cb758ae1a57461758ae (patch) | |
| tree | c8f56f6b0d1c0f0dd9bb8b652744f962731af294 /gcc | |
| parent | e4e37381cab92b10ae601218bf461b2c904b4d6d (diff) | |
| download | gcc-29844fa7c724106adef78cb758ae1a57461758ae.zip gcc-29844fa7c724106adef78cb758ae1a57461758ae.tar.gz gcc-29844fa7c724106adef78cb758ae1a57461758ae.tar.bz2 | |
cpplex.c (ON_REST_ARG): Check VAR_ARGS flag of current context, use posn - 1 to index into tokens array.
* cpplex.c (ON_REST_ARG): Check VAR_ARGS flag of current context,
use posn - 1 to index into tokens array.
(maybe_paste_with_next): Adjust caller.
* gcc.dg/cpp/paste8.c: New test.
From-SVN: r36128
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cpplex.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/cpp/paste8.c | 15 |
4 files changed, 28 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6d6474d..2e23d6e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2000-09-04 Jakub Jelinek <jakub@redhat.com> + + * cpplex.c (ON_REST_ARG): Check VAR_ARGS flag of current context, + use posn - 1 to index into tokens array. + (maybe_paste_with_next): Adjust caller. + 2000-09-03 Geoff Keating <geoffk@cygnus.com> * invoke.texi: Document the -mvxworks option for rs6000 ELF. diff --git a/gcc/cpplex.c b/gcc/cpplex.c index 37d1de8..ab5a987 100644 --- a/gcc/cpplex.c +++ b/gcc/cpplex.c @@ -202,8 +202,8 @@ TOKEN_LEN (token) #define CURRENT_CONTEXT(pfile) ((pfile)->contexts + (pfile)->cur_context) #define ON_REST_ARG(c) \ (((c)->flags & VAR_ARGS) \ - && (c)->u.list->tokens[(c)->posn].val.aux \ - == (unsigned int) ((c)->u.list->paramc - 1)) + && ((c)-1)->u.list->tokens[((c)-1)->posn - 1].val.aux \ + == (unsigned int) (((c)-1)->u.list->paramc - 1)) #define ASSIGN_FLAGS_AND_POS(d, s) \ do {(d)->flags = (s)->flags & (PREV_WHITE | BOL | PASTE_LEFT); \ @@ -2773,7 +2773,7 @@ maybe_paste_with_next (pfile, token) the special extended semantics (see above). */ if (token->type == CPP_COMMA && IS_ARG_CONTEXT (CURRENT_CONTEXT (pfile)) - && ON_REST_ARG (CURRENT_CONTEXT (pfile) - 1)) + && ON_REST_ARG (CURRENT_CONTEXT (pfile))) /* no warning */; else cpp_warning (pfile, diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 58e1aea..202ad8f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2000-09-04 Jakub Jelinek <jakub@redhat.com> + + * gcc.dg/cpp/paste8.c: New test. + 2000-09-01 Alexandre Oliva <aoliva@redhat.com> * gcc.c-torture/compile/20000827-1.c: New test. diff --git a/gcc/testsuite/gcc.dg/cpp/paste8.c b/gcc/testsuite/gcc.dg/cpp/paste8.c new file mode 100644 index 0000000..dc5fe83 --- /dev/null +++ b/gcc/testsuite/gcc.dg/cpp/paste8.c @@ -0,0 +1,15 @@ +/* { dg-do preprocess } */ +/* { dg-options "" } */ + +int foo(int, ...); + +#define a(x, y...) foo(x, ##y) +a(1) +a(1, 2, 3) +#define b(x, y, z...) foo(x, ##y) +b(1, 2, 3) /* { dg-warning "pasting would not" } */ +#define c(x, y, z...) foo(x, ##z) +c(1, 2) +c(1, 2, 3) +#define d(x) foo(##x) /* { dg-warning "nothing can be pasted" } */ +d(1) |