rename getFullFilePos -> getFileOffset.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@63097 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Driver/CacheTokens.cpp b/Driver/CacheTokens.cpp
index 5409a64e8bcd24774104091e54bc93fe3cf86e50..c64797ec3835aee01dc3ebe0e232e15b746032de 100644 (file)
--- a/Driver/CacheTokens.cpp
+++ b/Driver/CacheTokens.cpp
@@ -159,7 +159,7 @@ void PTHWriter::EmitToken(const Token& T) {
   else
     Emit32(ResolveID(T.getIdentifierInfo()));
     
-  Emit32(PP.getSourceManager().getFullFilePos(T.getLocation()));
+  Emit32(PP.getSourceManager().getFileOffset(T.getLocation()));
 }
 
 namespace {

diff --git a/Driver/RewriteMacros.cpp b/Driver/RewriteMacros.cpp
index 6ad4a7160cdc3e0f225131ecba2d9be027c0ecfa..809a3b510b2285ded5cdc5cbe2334c6ac2c48915 100644 (file)
--- a/Driver/RewriteMacros.cpp
+++ b/Driver/RewriteMacros.cpp
@@ -130,13 +130,13 @@ void clang::RewriteMacrosInInput(Preprocessor &PP,const std::string &InFileName,
         const IdentifierInfo *II = RawTokens[CurRawTok].getIdentifierInfo();
         if (!strcmp(II->getName(), "warning")) {
           // Comment out #warning.
-          RB.InsertTextAfter(SM.getFullFilePos(RawTok.getLocation()), "//", 2);
+          RB.InsertTextAfter(SM.getFileOffset(RawTok.getLocation()), "//", 2);
         } else if (!strcmp(II->getName(), "pragma") &&
                    RawTokens[CurRawTok+1].is(tok::identifier) &&
                   !strcmp(RawTokens[CurRawTok+1].getIdentifierInfo()->getName(),
                           "mark")){
           // Comment out #pragma mark.
-          RB.InsertTextAfter(SM.getFullFilePos(RawTok.getLocation()), "//", 2);
+          RB.InsertTextAfter(SM.getFileOffset(RawTok.getLocation()), "//", 2);
         }
       }
       
@@ -150,8 +150,8 @@ void clang::RewriteMacrosInInput(Preprocessor &PP,const std::string &InFileName,
     
     // Okay, both tokens are from the same file.  Get their offsets from the
     // start of the file.
-    unsigned PPOffs = SM.getFullFilePos(PPLoc);
-    unsigned RawOffs = SM.getFullFilePos(RawTok.getLocation());
+    unsigned PPOffs = SM.getFileOffset(PPLoc);
+    unsigned RawOffs = SM.getFileOffset(RawTok.getLocation());
 
     // If the offsets are the same and the token kind is the same, ignore them.
     if (PPOffs == RawOffs && isSameToken(RawTok, PPTok)) {
@@ -173,7 +173,7 @@ void clang::RewriteMacrosInInput(Preprocessor &PP,const std::string &InFileName,
         EndPos = RawOffs+RawTok.getLength();
 
         RawTok = GetNextRawTok(RawTokens, CurRawTok, true);
-        RawOffs = SM.getFullFilePos(RawTok.getLocation());
+        RawOffs = SM.getFileOffset(RawTok.getLocation());
         
         if (RawTok.is(tok::comment)) {
           // Skip past the comment.
@@ -197,7 +197,7 @@ void clang::RewriteMacrosInInput(Preprocessor &PP,const std::string &InFileName,
       Expansion += ' ' + PP.getSpelling(PPTok);
       PP.Lex(PPTok);
       PPLoc = SM.getInstantiationLoc(PPTok.getLocation());
-      PPOffs = SM.getFullFilePos(PPLoc);
+      PPOffs = SM.getFileOffset(PPLoc);
     }
     Expansion += ' ';
     RB.InsertTextBefore(InsertPos, &Expansion[0], Expansion.size());

diff --git a/include/clang/Basic/SourceManager.h b/include/clang/Basic/SourceManager.h
index 84aabe1f3103c03b46cca8bbd0780df33cb552ef..dab3badea291c4e2acd20dedc3221a279a278663 100644 (file)
--- a/include/clang/Basic/SourceManager.h
+++ b/include/clang/Basic/SourceManager.h
@@ -468,11 +468,10 @@ public:
     return getDecomposedSpellingLocSlowCase(E, Offset);
   }    
   
-  /// getFullFilePos - This (efficient) method returns the offset from the start
-  /// of the file that the specified spelling SourceLocation represents.  This
-  /// returns the location of the actual character data, not the instantiation
-  /// position.
-  unsigned getFullFilePos(SourceLocation SpellingLoc) const {
+  /// getFileOffset - This method returns the offset from the start
+  /// of the file that the specified SourceLocation represents. This is not very
+  /// meaningful for a macro ID.
+  unsigned getFileOffset(SourceLocation SpellingLoc) const {
     return getDecomposedLoc(SpellingLoc).second;
   }
   

diff --git a/lib/Rewrite/HTMLRewrite.cpp b/lib/Rewrite/HTMLRewrite.cpp
index b5f0fc395118b866833f867108972822373860a5..6e5d1c32b11c04ac3ce317e462359b81f79bbfe0 100644 (file)
--- a/lib/Rewrite/HTMLRewrite.cpp
+++ b/lib/Rewrite/HTMLRewrite.cpp
@@ -36,8 +36,8 @@ void html::HighlightRange(Rewriter &R, SourceLocation B, SourceLocation E,
   FileID FID = SM.getFileID(B);
   assert(SM.getFileID(E) == FID && "B/E not in the same file!");
 
-  unsigned BOffset = SM.getFullFilePos(B);
-  unsigned EOffset = SM.getFullFilePos(E);
+  unsigned BOffset = SM.getFileOffset(B);
+  unsigned EOffset = SM.getFileOffset(E);
   
   // Include the whole end token in the range.
   EOffset += Lexer::MeasureTokenLength(E, R.getSourceMgr());
@@ -359,7 +359,7 @@ void html::SyntaxHighlight(Rewriter &R, FileID FID, Preprocessor &PP) {
   while (Tok.isNot(tok::eof)) {
     // Since we are lexing unexpanded tokens, all tokens are from the main
     // FileID.
-    unsigned TokOffs = SourceMgr.getFullFilePos(Tok.getLocation());
+    unsigned TokOffs = SourceMgr.getFileOffset(Tok.getLocation());
     unsigned TokLen = Tok.getLength();
     switch (Tok.getKind()) {
     default: break;
@@ -397,7 +397,7 @@ void html::SyntaxHighlight(Rewriter &R, FileID FID, Preprocessor &PP) {
       unsigned TokEnd = TokOffs+TokLen;
       L.LexFromRawLexer(Tok);
       while (!Tok.isAtStartOfLine() && Tok.isNot(tok::eof)) {
-        TokEnd = SourceMgr.getFullFilePos(Tok.getLocation())+Tok.getLength();
+        TokEnd = SourceMgr.getFileOffset(Tok.getLocation())+Tok.getLength();
         L.LexFromRawLexer(Tok);
       }