diff options
| -rw-r--r-- | Driver/PrintPreprocessedOutput.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Driver/PrintPreprocessedOutput.cpp b/Driver/PrintPreprocessedOutput.cpp index 923439c070..deb005ca4f 100644 --- a/Driver/PrintPreprocessedOutput.cpp +++ b/Driver/PrintPreprocessedOutput.cpp @@ -438,7 +438,8 @@ bool PrintPPOutputPPCallbacks::AvoidConcat(const Token &PrevTok, return isalnum(FirstChar) || Tok.is(tok::numeric_constant) || FirstChar == '+' || FirstChar == '-' || FirstChar == '.'; case tok::period: // ..., .*, .1234 - return FirstChar == '.' || FirstChar == '*' || isdigit(FirstChar); + return FirstChar == '.' || isdigit(FirstChar) || + (FirstChar == '*' && PP.getLangOptions().CPlusPlus); case tok::amp: // && return FirstChar == '&'; case tok::plus: // ++ @@ -454,9 +455,11 @@ bool PrintPPOutputPPCallbacks::AvoidConcat(const Token &PrevTok, case tok::pipe: // || return FirstChar == '|'; case tok::percent: // %>, %: - return FirstChar == '>' || FirstChar == ':'; + return (FirstChar == '>' || FirstChar == ':') && + PP.getLangOptions().Digraphs; case tok::colon: // ::, :> - return FirstChar == ':' || FirstChar == '>'; + return (FirstChar == ':' && PP.getLangOptions().CPlusPlus) || + (FirstChar == '>' && PP.getLangOptions().Digraphs); case tok::hash: // ##, #@, %:%: return FirstChar == '#' || FirstChar == '@' || FirstChar == '%'; case tok::arrow: // ->* |