commit 0b9e736308af5397f558ffc8e780c438c2fdb563
author Chris Lattner <sabre@nondot.org> Fri Sep 26 21:18:42 2008 +0000
committer Chris Lattner <sabre@nondot.org> Fri Sep 26 21:18:42 2008 +0000
tree dfa0ec391140c8df3be10f2ec3d7d3ec59b823e5
parent 721818304ac462d8c6ce05eecd02884033db78f1

clean up a bunch of fixme's I added, by moving 
DirectoryLookup::DirType into SourceManager.h


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

lib/Lex/PPDirectives.cpp

diff --git a/lib/Lex/PPDirectives.cpp b/lib/Lex/PPDirectives.cpp
index 504bc45..a3aaabd 100644
--- a/lib/Lex/PPDirectives.cpp
+++ b/lib/Lex/PPDirectives.cpp
@@ -675,10 +675,9 @@
   // The #included file will be considered to be a system header if either it is
   // in a system include directory, or if the #includer is a system include
   // header.
-  unsigned FileCharacter = 
-  // FIXME: Casts
-    std::max((unsigned)HeaderInfo.getFileDirFlavor(File),
-          SourceMgr.getDirCharacteristic(getCurrentFileLexer()->getFileLoc()));
+  SrcMgr::Characteristic_t FileCharacter = 
+    std::max(HeaderInfo.getFileDirFlavor(File),
+          SourceMgr.getFileCharacteristic(getCurrentFileLexer()->getFileLoc()));
   
   // Look up the file, create a File ID for it.
   unsigned FileID = SourceMgr.createFileID(File, FilenameTok.getLocation(),

lib/Lex/PPLexerChange.cpp

diff --git a/lib/Lex/PPLexerChange.cpp b/lib/Lex/PPLexerChange.cpp
index 1522bf5..ccaddf5 100644
--- a/lib/Lex/PPLexerChange.cpp
+++ b/lib/Lex/PPLexerChange.cpp
@@ -95,10 +95,8 @@
   
   // Notify the client, if desired, that we are in a new source file.
   if (Callbacks && !CurLexer->Is_PragmaLexer) {
-    DirectoryLookup::DirType FileType =
-     // FIXME:
-      (DirectoryLookup::DirType)
-       SourceMgr.getDirCharacteristic(CurLexer->getFileLoc());
+    SrcMgr::Characteristic_t FileType =
+       SourceMgr.getFileCharacteristic(CurLexer->getFileLoc());
     
     Callbacks->FileChanged(CurLexer->getFileLoc(),
                            PPCallbacks::EnterFile, FileType);
@@ -180,10 +178,8 @@
 
     // Notify the client, if desired, that we are in a new source file.
     if (Callbacks && !isEndOfMacro && CurLexer) {
-      DirectoryLookup::DirType FileType =
-        // FIXME:
-        (DirectoryLookup::DirType)
-        SourceMgr.getDirCharacteristic(CurLexer->getFileLoc());
+      SrcMgr::Characteristic_t FileType =
+        SourceMgr.getFileCharacteristic(CurLexer->getFileLoc());
       
       Callbacks->FileChanged(CurLexer->getSourceLocation(CurLexer->BufferPtr),
                              PPCallbacks::ExitFile, FileType);

lib/Lex/Pragma.cpp

diff --git a/lib/Lex/Pragma.cpp b/lib/Lex/Pragma.cpp
index e6955d7..b6f5ac4 100644
--- a/lib/Lex/Pragma.cpp
+++ b/lib/Lex/Pragma.cpp
@@ -239,8 +239,7 @@
   // Notify the client, if desired, that we are in a new source file.
   if (Callbacks)
     Callbacks->FileChanged(TheLexer->getSourceLocation(TheLexer->BufferPtr),
-                           PPCallbacks::SystemHeaderPragma,
-                           DirectoryLookup::SystemHeaderDir);
+                           PPCallbacks::SystemHeaderPragma, SrcMgr::C_System);
 }
 
 /// HandlePragmaDependency - Handle #pragma GCC dependency "foo" blah.