Added "getLogicalLineNumber" and "getLogicalColumnNumber" to FullSourceLoc.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@49177 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/Basic/SourceLocation.h b/include/clang/Basic/SourceLocation.h
index faa5dc6..83633eb 100644
--- a/include/clang/Basic/SourceLocation.h
+++ b/include/clang/Basic/SourceLocation.h
@@ -234,8 +234,11 @@
FullSourceLoc getLogicalLoc();
FullSourceLoc getIncludeLoc();
- unsigned getLineNumber();
- unsigned getColumnNumber();
+ unsigned getLineNumber() const;
+ unsigned getColumnNumber() const;
+
+ unsigned getLogicalLineNumber() const;
+ unsigned getLogicalColumnNumber() const;
const char *getCharacterData() const;
diff --git a/lib/Basic/SourceLocation.cpp b/lib/Basic/SourceLocation.cpp
index eaf129f..c014475 100644
--- a/lib/Basic/SourceLocation.cpp
+++ b/lib/Basic/SourceLocation.cpp
@@ -48,16 +48,27 @@
return FullSourceLoc(SrcMgr->getIncludeLoc(Loc),*SrcMgr);
}
-unsigned FullSourceLoc::getLineNumber() {
+unsigned FullSourceLoc::getLineNumber() const {
assert (isValid());
return SrcMgr->getLineNumber(Loc);
}
-unsigned FullSourceLoc::getColumnNumber() {
+unsigned FullSourceLoc::getColumnNumber() const {
assert (isValid());
return SrcMgr->getColumnNumber(Loc);
}
+
+unsigned FullSourceLoc::getLogicalLineNumber() const {
+ assert (isValid());
+ return SrcMgr->getLogicalLineNumber(Loc);
+}
+
+unsigned FullSourceLoc::getLogicalColumnNumber() const {
+ assert (isValid());
+ return SrcMgr->getLogicalColumnNumber(Loc);
+}
+
const char* FullSourceLoc::getSourceName() const {
assert (isValid());
return SrcMgr->getSourceName(Loc);