Jason Merrill <ja...@redhat.com> writes: > On 05/24/2012 12:03 PM, Dodji Seketeli wrote: >> + if (macro != NULL) >> + pfile->about_to_expand_macro_p = false; > > The approach sounds good, but why do this in the push_token_context > functions rather than in enter_macro_context?
Because, it's not only in enter_macro_context that I'd have to put it, but also in replace_args, called from enter_macro_context, for instance. Another way of seeing it is to say that, from the beginning of enter_macro_context, we are in a state of "about to expand a macro" until we actually push the macro context. So it seems to make sense to flip the flag where the the macro context push happens, IMHO. -- Dodji