From d8bfa78c42e84d9c2cce3153a588166b690053ef Mon Sep 17 00:00:00 2001 From: Richard Kenner Date: Fri, 3 Jan 1997 08:19:34 -0500 Subject: [PATCH] (macroexpand): Delete any no-reexpansion marker that follows an identifier at... (macroexpand): Delete any no-reexpansion marker that follows an identifier at the beginning of an argument that is concatenated with what precedes it. From-SVN: r13356 --- gcc/cpplib.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gcc/cpplib.c b/gcc/cpplib.c index 07c44e2fb18..7bc5c8c3756 100644 --- a/gcc/cpplib.c +++ b/gcc/cpplib.c @@ -1,7 +1,7 @@ /* CPP Library. - Copyright (C) 1986, 87, 89, 92-5, 1996 Free Software Foundation, Inc. + Copyright (C) 1986, 87, 89, 92-6, 1997 Free Software Foundation, Inc. Written by Per Bothner, 1994-95. - Based on CCCP program by by Paul Rubin, June 1986 + Based on CCCP program by Paul Rubin, June 1986 Adapted to ANSI C, Richard Stallman, Jan 1987 This program is free software; you can redistribute it and/or modify it @@ -2892,6 +2892,11 @@ macroexpand (pfile, hp) while (p1 != l1 && is_space[*p1]) p1++; while (p1 != l1 && is_idchar[*p1]) xbuf[totlen++] = *p1++; + /* Delete any no-reexpansion marker that follows + an identifier at the beginning of the argument + if the argument is concatenated with what precedes it. */ + if (p1[0] == '@' && p1[1] == '-') + p1 += 2; } if (ap->raw_after) { -- 2.30.2