diff options
Diffstat (limited to 'clang/lib/Edit')
| -rw-r--r-- | clang/lib/Edit/Commit.cpp | 4 | ||||
| -rw-r--r-- | clang/lib/Edit/RewriteObjCFoundationAPI.cpp | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/clang/lib/Edit/Commit.cpp b/clang/lib/Edit/Commit.cpp index afc1a131eb2..e72b13cf819 100644 --- a/clang/lib/Edit/Commit.cpp +++ b/clang/lib/Edit/Commit.cpp @@ -147,7 +147,7 @@ bool Commit::replaceWithInner(CharSourceRange range, } FileOffset OuterEnd = OuterBegin.getWithOffset(OuterLen); - FileOffset InnerEnd = InnerBegin.getWithOffset(InnerLen); + FileOffset InnerEnd = InnerBegin.getWithOffset(InnerLen); if (OuterBegin.getFID() != InnerBegin.getFID() || InnerBegin < OuterBegin || InnerBegin > OuterEnd || @@ -300,7 +300,7 @@ bool Commit::canRemoveRange(CharSourceRange range, range = Lexer::makeFileCharRange(range, SM, LangOpts); if (range.isInvalid()) return false; - + if (range.getBegin().isMacroID() || range.getEnd().isMacroID()) return false; if (SM.isInSystemHeader(range.getBegin()) || diff --git a/clang/lib/Edit/RewriteObjCFoundationAPI.cpp b/clang/lib/Edit/RewriteObjCFoundationAPI.cpp index f89526a71da..b53a70d8758 100644 --- a/clang/lib/Edit/RewriteObjCFoundationAPI.cpp +++ b/clang/lib/Edit/RewriteObjCFoundationAPI.cpp @@ -82,7 +82,7 @@ bool edit::rewriteObjCRedundantCallWithLiteral(const ObjCMessageExpr *Msg, (NS.getNSDictionarySelector( NSAPI::NSDict_dictionaryWithDictionary) == Sel || NS.getNSDictionarySelector(NSAPI::NSDict_initWithDictionary) == Sel))) { - + commit.replaceWithInner(Msg->getSourceRange(), Msg->getArg(0)->getSourceRange()); return true; @@ -726,7 +726,7 @@ static bool getLiteralInfo(SourceRange literalRange, } else break; } - + if (!UpperU.hasValue() && !UpperL.hasValue()) UpperU = UpperL = true; else if (UpperU.hasValue() && !UpperL.hasValue()) @@ -738,7 +738,7 @@ static bool getLiteralInfo(SourceRange literalRange, Info.L = *UpperL ? "L" : "l"; Info.LL = *UpperL ? "LL" : "ll"; Info.F = UpperF ? "F" : "f"; - + Info.Hex = Info.Octal = false; if (text.startswith("0x")) Info.Hex = true; @@ -851,7 +851,7 @@ static bool rewriteToNumberLiteral(const ObjCMessageExpr *Msg, // Try to modify the literal make it the same type as the method call. // -Modify the suffix, and/or // -Change integer to float - + LiteralInfo LitInfo; bool isIntZero = false; if (const IntegerLiteral *IntE = dyn_cast<IntegerLiteral>(literalE)) @@ -862,7 +862,7 @@ static bool rewriteToNumberLiteral(const ObjCMessageExpr *Msg, // Not easy to do int -> float with hex/octal and uncommon anyway. if (!LitIsFloat && CallIsFloating && (LitInfo.Hex || LitInfo.Octal)) return rewriteToNumericBoxedExpression(Msg, NS, commit); - + SourceLocation LitB = LitInfo.WithoutSuffRange.getBegin(); SourceLocation LitE = LitInfo.WithoutSuffRange.getEnd(); @@ -879,7 +879,7 @@ static bool rewriteToNumberLiteral(const ObjCMessageExpr *Msg, } else { if (CallIsUnsigned) commit.insert(LitE, LitInfo.U); - + if (CallIsLong) commit.insert(LitE, LitInfo.L); else if (CallIsLongLong) @@ -997,7 +997,7 @@ static bool rewriteToNumericBoxedExpression(const ObjCMessageExpr *Msg, uint64_t FinalTySize = Ctx.getTypeSize(FinalTy); uint64_t OrigTySize = Ctx.getTypeSize(OrigTy); - bool isTruncated = FinalTySize < OrigTySize; + bool isTruncated = FinalTySize < OrigTySize; bool needsCast = false; if (const ImplicitCastExpr *ICE = dyn_cast<ImplicitCastExpr>(Arg)) { @@ -1090,7 +1090,7 @@ static bool rewriteToNumericBoxedExpression(const ObjCMessageExpr *Msg, } if (needsCast) { - DiagnosticsEngine &Diags = Ctx.getDiagnostics(); + DiagnosticsEngine &Diags = Ctx.getDiagnostics(); // FIXME: Use a custom category name to distinguish migration diagnostics. unsigned diagID = Diags.getCustomDiagID(DiagnosticsEngine::Warning, "converting to boxing syntax requires casting %0 to %1"); @@ -1145,7 +1145,7 @@ static bool doRewriteToUTF8StringBoxedExpressionHelper( commit.insertBefore(ArgRange.getBegin(), "@"); else commit.insertWrap("@(", ArgRange, ")"); - + return true; } } |
