[cfe-commits] r168265 - in /cfe/trunk: lib/Lex/PPMacroExpansion.cpp test/Preprocessor/invalid-__has_warning1.c test/Preprocessor/invalid-__has_warning2.c test/Preprocessor/warning_tests.c

[Andy Gibbs]

On Saturday, November 17, 2012 10:46 PM, Chandler Carruth wrote:
> On Sat, Nov 17, 2012 at 11:14 AM, Andy Gibbs wrote:
>> --- cfe/trunk/lib/Lex/PPMacroExpansion.cpp (original)
>> +++ cfe/trunk/lib/Lex/PPMacroExpansion.cpp Sat Nov 17 13:14:53 2012
>> @@ -1291,7 +1291,10 @@
>>            StartLoc = Tok.getLocation();
>>            IsValid = false;
>>            // Eat tokens until ')'.
>> -          do Lex(Tok); while (!(Tok.is(tok::r_paren) || 
>> Tok.is(tok::eod)));
>> +          while (Tok.isNot(tok::r_paren)
>> +                   && Tok.isNot(tok::eod)
>> +                   && Tok.isNot(tok::eof))
>
> It is much more common to put the '&&' at the end of the prior line
> within the LLVM and Clang codebases. even better would be to put this
> all on one line...

Ok, done: r168274.

Thanks
Andy