Change some terminology in SourceLocation: instead of referring to

the "physical" location of tokens, refer to the "spelling" location.
This is more concrete and useful, tokens aren't really physical objects!


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

1 files changed, 6 insertions, 6 deletions

diff --git a/lib/Lex/Lexer.cpp b/lib/Lex/Lexer.cpp
index e6030ad1d4..96295d042f 100644
--- a/lib/Lex/Lexer.cpp
+++ b/lib/Lex/Lexer.cpp
@@ -68,7 +68,7 @@ Lexer::Lexer(SourceLocation fileloc, Preprocessor &pp,
     Features(pp.getLangOptions()) {
       
   SourceManager &SourceMgr = PP->getSourceManager();
-  unsigned InputFileID = SourceMgr.getPhysicalLoc(FileLoc).getFileID();
+  unsigned InputFileID = SourceMgr.getSpellingLoc(FileLoc).getFileID();
   const llvm::MemoryBuffer *InputFile = SourceMgr.getBuffer(InputFileID);
       
   Is_PragmaLexer = false;
@@ -281,15 +281,15 @@ static SourceLocation GetMappedTokenLoc(Preprocessor &PP,
                                         unsigned CharNo) {
   // Otherwise, we're lexing "mapped tokens".  This is used for things like
   // _Pragma handling.  Combine the instantiation location of FileLoc with the
-  // physical location.
+  // spelling location.
   SourceManager &SourceMgr = PP.getSourceManager();
   
   // Create a new SLoc which is expanded from logical(FileLoc) but whose
-  // characters come from phys(FileLoc)+Offset.
+  // characters come from spelling(FileLoc)+Offset.
   SourceLocation VirtLoc = SourceMgr.getLogicalLoc(FileLoc);
-  SourceLocation PhysLoc = SourceMgr.getPhysicalLoc(FileLoc);
-  PhysLoc = SourceLocation::getFileLoc(PhysLoc.getFileID(), CharNo);
-  return SourceMgr.getInstantiationLoc(PhysLoc, VirtLoc);
+  SourceLocation SpellingLoc = SourceMgr.getSpellingLoc(FileLoc);
+  SpellingLoc = SourceLocation::getFileLoc(SpellingLoc.getFileID(), CharNo);
+  return SourceMgr.getInstantiationLoc(SpellingLoc, VirtLoc);
 }
 
 /// getSourceLocation - Return a source location identifier for the specified