From: Chandler Carruth Date: Mon, 25 Jul 2011 20:57:57 +0000 (+0000) Subject: Rename getInstantiationColumnNumber to getExpansionColumnNumber in both X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a77c031cb66f75d22672070052cc6e0205289ff8;p=clang Rename getInstantiationColumnNumber to getExpansionColumnNumber in both SourceManager and FullSourceLoc. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@135965 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/Basic/SourceLocation.h b/include/clang/Basic/SourceLocation.h index 34620a7ff4..eb8198fcad 100644 --- a/include/clang/Basic/SourceLocation.h +++ b/include/clang/Basic/SourceLocation.h @@ -278,7 +278,7 @@ public: FullSourceLoc getSpellingLoc() const; unsigned getInstantiationLineNumber(bool *Invalid = 0) const; - unsigned getInstantiationColumnNumber(bool *Invalid = 0) const; + unsigned getExpansionColumnNumber(bool *Invalid = 0) const; unsigned getSpellingLineNumber(bool *Invalid = 0) const; unsigned getSpellingColumnNumber(bool *Invalid = 0) const; diff --git a/include/clang/Basic/SourceManager.h b/include/clang/Basic/SourceManager.h index 8d8b5ff17c..de05123ea5 100644 --- a/include/clang/Basic/SourceManager.h +++ b/include/clang/Basic/SourceManager.h @@ -828,7 +828,7 @@ public: unsigned getColumnNumber(FileID FID, unsigned FilePos, bool *Invalid = 0) const; unsigned getSpellingColumnNumber(SourceLocation Loc, bool *Invalid = 0) const; - unsigned getInstantiationColumnNumber(SourceLocation Loc, + unsigned getExpansionColumnNumber(SourceLocation Loc, bool *Invalid = 0) const; unsigned getPresumedColumnNumber(SourceLocation Loc, bool *Invalid = 0) const; diff --git a/lib/ARCMigrate/PlistReporter.cpp b/lib/ARCMigrate/PlistReporter.cpp index 1b487ce8a0..3aa8da505e 100644 --- a/lib/ARCMigrate/PlistReporter.cpp +++ b/lib/ARCMigrate/PlistReporter.cpp @@ -57,7 +57,7 @@ static void EmitLocation(raw_ostream& o, const SourceManager &SM, Indent(o, indent) << " line" << Loc.getInstantiationLineNumber() << "\n"; Indent(o, indent) << " col" - << Loc.getInstantiationColumnNumber() + offset << "\n"; + << Loc.getExpansionColumnNumber() + offset << "\n"; Indent(o, indent) << " file" << GetFID(FM, SM, Loc) << "\n"; Indent(o, indent) << "\n"; diff --git a/lib/Basic/SourceLocation.cpp b/lib/Basic/SourceLocation.cpp index 84f03fb350..f6c604b940 100644 --- a/lib/Basic/SourceLocation.cpp +++ b/lib/Basic/SourceLocation.cpp @@ -90,9 +90,9 @@ unsigned FullSourceLoc::getInstantiationLineNumber(bool *Invalid) const { return SrcMgr->getInstantiationLineNumber(*this, Invalid); } -unsigned FullSourceLoc::getInstantiationColumnNumber(bool *Invalid) const { +unsigned FullSourceLoc::getExpansionColumnNumber(bool *Invalid) const { assert(isValid()); - return SrcMgr->getInstantiationColumnNumber(*this, Invalid); + return SrcMgr->getExpansionColumnNumber(*this, Invalid); } unsigned FullSourceLoc::getSpellingLineNumber(bool *Invalid) const { diff --git a/lib/Basic/SourceManager.cpp b/lib/Basic/SourceManager.cpp index ec97defbb6..2931961618 100644 --- a/lib/Basic/SourceManager.cpp +++ b/lib/Basic/SourceManager.cpp @@ -958,8 +958,8 @@ unsigned SourceManager::getSpellingColumnNumber(SourceLocation Loc, return getColumnNumber(LocInfo.first, LocInfo.second, Invalid); } -unsigned SourceManager::getInstantiationColumnNumber(SourceLocation Loc, - bool *Invalid) const { +unsigned SourceManager::getExpansionColumnNumber(SourceLocation Loc, + bool *Invalid) const { if (isInvalid(Loc, Invalid)) return 0; std::pair LocInfo = getDecomposedExpansionLoc(Loc); return getColumnNumber(LocInfo.first, LocInfo.second, Invalid); diff --git a/lib/Frontend/PrintPreprocessedOutput.cpp b/lib/Frontend/PrintPreprocessedOutput.cpp index 0bfb6a27f3..6f9253d4cd 100644 --- a/lib/Frontend/PrintPreprocessedOutput.cpp +++ b/lib/Frontend/PrintPreprocessedOutput.cpp @@ -419,7 +419,7 @@ bool PrintPPOutputPPCallbacks::HandleFirstTokOnLine(Token &Tok) { // Print out space characters so that the first token on a line is // indented for easy reading. - unsigned ColNo = SM.getInstantiationColumnNumber(Tok.getLocation()); + unsigned ColNo = SM.getExpansionColumnNumber(Tok.getLocation()); // This hack prevents stuff like: // #define HASH # diff --git a/lib/Frontend/TextDiagnosticPrinter.cpp b/lib/Frontend/TextDiagnosticPrinter.cpp index e008dda09d..3ded41c985 100644 --- a/lib/Frontend/TextDiagnosticPrinter.cpp +++ b/lib/Frontend/TextDiagnosticPrinter.cpp @@ -107,14 +107,14 @@ void TextDiagnosticPrinter::HighlightRange(const CharSourceRange &R, // Compute the column number of the start. unsigned StartColNo = 0; if (StartLineNo == LineNo) { - StartColNo = SM.getInstantiationColumnNumber(Begin); + StartColNo = SM.getExpansionColumnNumber(Begin); if (StartColNo) --StartColNo; // Zero base the col #. } // Compute the column number of the end. unsigned EndColNo = CaretLine.size(); if (EndLineNo == LineNo) { - EndColNo = SM.getInstantiationColumnNumber(End); + EndColNo = SM.getExpansionColumnNumber(End); if (EndColNo) { --EndColNo; // Zero base the col #. diff --git a/lib/StaticAnalyzer/Core/BugReporter.cpp b/lib/StaticAnalyzer/Core/BugReporter.cpp index e09519634e..d0fde272b0 100644 --- a/lib/StaticAnalyzer/Core/BugReporter.cpp +++ b/lib/StaticAnalyzer/Core/BugReporter.cpp @@ -990,11 +990,11 @@ bool EdgeBuilder::containsLocation(const PathDiagnosticLocation &Container, return (ContainerBegLine <= ContaineeBegLine && ContainerEndLine >= ContaineeEndLine && (ContainerBegLine != ContaineeBegLine || - SM.getInstantiationColumnNumber(ContainerRBeg) <= - SM.getInstantiationColumnNumber(ContaineeRBeg)) && + SM.getExpansionColumnNumber(ContainerRBeg) <= + SM.getExpansionColumnNumber(ContaineeRBeg)) && (ContainerEndLine != ContaineeEndLine || - SM.getInstantiationColumnNumber(ContainerREnd) >= - SM.getInstantiationColumnNumber(ContainerREnd))); + SM.getExpansionColumnNumber(ContainerREnd) >= + SM.getExpansionColumnNumber(ContainerREnd))); } void EdgeBuilder::rawAddEdge(PathDiagnosticLocation NewLoc) { diff --git a/lib/StaticAnalyzer/Core/ExprEngine.cpp b/lib/StaticAnalyzer/Core/ExprEngine.cpp index 79a6356552..a9189f2f0a 100644 --- a/lib/StaticAnalyzer/Core/ExprEngine.cpp +++ b/lib/StaticAnalyzer/Core/ExprEngine.cpp @@ -3101,7 +3101,7 @@ struct DOTGraphTraits : Out << "\\lline=" << GraphPrintSourceManager->getInstantiationLineNumber(SLoc) << " col=" - << GraphPrintSourceManager->getInstantiationColumnNumber(SLoc) + << GraphPrintSourceManager->getExpansionColumnNumber(SLoc) << "\\l"; } @@ -3154,7 +3154,7 @@ struct DOTGraphTraits : Out << "\\lline=" << GraphPrintSourceManager->getInstantiationLineNumber(SLoc) << " col=" - << GraphPrintSourceManager->getInstantiationColumnNumber(SLoc); + << GraphPrintSourceManager->getExpansionColumnNumber(SLoc); } if (isa(T)) { diff --git a/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp b/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp index 8cbccc9203..a3b8a78858 100644 --- a/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp +++ b/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp @@ -223,7 +223,7 @@ void HTMLDiagnostics::ReportDiag(const PathDiagnostic& D, "line " << (*D.rbegin()).getLocation().asLocation().getInstantiationLineNumber() << ", column " - << (*D.rbegin()).getLocation().asLocation().getInstantiationColumnNumber() + << (*D.rbegin()).getLocation().asLocation().getExpansionColumnNumber() << "\n" "Description:" << D.getDescription() << "\n"; @@ -563,7 +563,7 @@ void HTMLDiagnostics::HighlightRange(Rewriter& R, FileID BugFileID, return; // Compute the column number of the end. - unsigned EndColNo = SM.getInstantiationColumnNumber(InstantiationEnd); + unsigned EndColNo = SM.getExpansionColumnNumber(InstantiationEnd); unsigned OldEndColNo = EndColNo; if (EndColNo) { diff --git a/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp b/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp index 673277e950..d923f30e37 100644 --- a/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp +++ b/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp @@ -144,7 +144,7 @@ static void EmitLocation(raw_ostream& o, const SourceManager &SM, Indent(o, indent) << " line" << Loc.getInstantiationLineNumber() << "\n"; Indent(o, indent) << " col" - << Loc.getInstantiationColumnNumber() + offset << "\n"; + << Loc.getExpansionColumnNumber() + offset << "\n"; Indent(o, indent) << " file" << GetFID(FM, SM, Loc) << "\n"; Indent(o, indent) << "\n"; diff --git a/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp index 90bb78d1b2..6cab2b19e5 100644 --- a/tools/libclang/CIndex.cpp +++ b/tools/libclang/CIndex.cpp @@ -2840,7 +2840,7 @@ void clang_getInstantiationLocation(CXSourceLocation location, if (line) *line = SM.getInstantiationLineNumber(InstLoc); if (column) - *column = SM.getInstantiationColumnNumber(InstLoc); + *column = SM.getExpansionColumnNumber(InstLoc); if (offset) *offset = SM.getDecomposedLoc(InstLoc).second; }