[cfe-commits] r46155 - in /cfe/trunk/Driver: ASTConsumers.h RewriteTest.cpp clang.cpp

[Fariborz Jahanian]

Author: fjahanian
Date: Thu Jan 17 19:15:54 2008
New Revision: 46155

URL: http://llvm.org/viewvc/llvm-project?rev=46155&view=rev
Log:
Insert #pragma once when rewriting a header file.

Modified:
    cfe/trunk/Driver/ASTConsumers.h
    cfe/trunk/Driver/RewriteTest.cpp
    cfe/trunk/Driver/clang.cpp

Modified: cfe/trunk/Driver/ASTConsumers.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Driver/ASTConsumers.h?rev=46155&r1=46154&r2=46155&view=diff

==============================================================================
--- cfe/trunk/Driver/ASTConsumers.h (original)
+++ cfe/trunk/Driver/ASTConsumers.h Thu Jan 17 19:15:54 2008
@@ -48,7 +48,8 @@
                             Diagnostic &Diags,
                             const LangOptions &LOpts);
 
-ASTConsumer *CreateCodeRewriterTest(Diagnostic &Diags);
+ASTConsumer *CreateCodeRewriterTest(const std::string& InFile,
+                                    Diagnostic &Diags);
 
 ASTConsumer *CreateSerializationTest(Diagnostic &Diags,
                                      FileManager& FMgr, 

Modified: cfe/trunk/Driver/RewriteTest.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Driver/RewriteTest.cpp?rev=46155&r1=46154&r2=46155&view=diff

==============================================================================
--- cfe/trunk/Driver/RewriteTest.cpp (original)
+++ cfe/trunk/Driver/RewriteTest.cpp Thu Jan 17 19:15:54 2008
@@ -65,6 +65,9 @@
     ObjCMethodDecl *CurMethodDecl;
     RecordDecl *SuperStructDecl;
     
+    // Needed for header files being rewritten
+    bool IsHeader;
+    
     static const int OBJC_ABI_VERSION =7 ;
   public:
     void Initialize(ASTContext &context) {
@@ -96,7 +99,8 @@
       Rewrite.setSourceMgr(Context->getSourceManager());
       // declaring objc_selector outside the parameter list removes a silly
       // scope related warning...
-      const char *s = "struct objc_selector; struct objc_class;\n"
+      const char *s = "#pragma once\n"
+                      "struct objc_selector; struct objc_class;\n"
                       "#ifndef OBJC_SUPER\n"
                       "struct objc_super { struct objc_object *o; "
                       "struct objc_object *superClass; };\n"
@@ -136,15 +140,23 @@
                       "unsigned long extra[5];\n};\n"
                       "#define __FASTENUMERATIONSTATE\n"
                       "#endif\n";
-                      
-      Rewrite.InsertText(SourceLocation::getFileLoc(MainFileID, 0), 
-                         s, strlen(s));
+      if (IsHeader) {
+        // insert the whole string when rewriting a header file
+        Rewrite.InsertText(SourceLocation::getFileLoc(MainFileID, 0), 
+                           s, strlen(s));
+      }
+      else {
+        // Not rewriting header, exclude the #pragma once pragma
+        const char *p = s + strlen("#pragma once\n");
+        Rewrite.InsertText(SourceLocation::getFileLoc(MainFileID, 0), 
+                           p, strlen(p));
+      }
     }
 
     // Top Level Driver code.
     virtual void HandleTopLevelDecl(Decl *D);
     void HandleDeclInMainFile(Decl *D);
-    RewriteTest(Diagnostic &D) : Diags(D) {}
+    RewriteTest(bool isHeader, Diagnostic &D) : Diags(D) {IsHeader = isHeader;}
     ~RewriteTest();
 
     // Syntactic Rewriting.
@@ -226,8 +238,23 @@
   };
 }
 
-ASTConsumer *clang::CreateCodeRewriterTest(Diagnostic &Diags) {
-  return new RewriteTest(Diags);
+static bool IsHeaderFile(const std::string &Filename) {
+  std::string::size_type DotPos = Filename.rfind('.');
+  
+  if (DotPos == std::string::npos) {
+    // no file extension
+    return false; 
+  }
+  
+  std::string Ext = std::string(Filename.begin()+DotPos+1, Filename.end());
+  // C header: .h
+  // C++ header: .hh or .H;
+  return Ext == "h" || Ext == "hh" || Ext == "H";
+}    
+
+ASTConsumer *clang::CreateCodeRewriterTest(const std::string& InFile,
+                                           Diagnostic &Diags) {
+  return new RewriteTest(IsHeaderFile(InFile), Diags);
 }
 
 //===----------------------------------------------------------------------===//

Modified: cfe/trunk/Driver/clang.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Driver/clang.cpp?rev=46155&r1=46154&r2=46155&view=diff

==============================================================================
--- cfe/trunk/Driver/clang.cpp (original)
+++ cfe/trunk/Driver/clang.cpp Thu Jan 17 19:15:54 2008
@@ -964,7 +964,7 @@
       return CreateASTSerializer(InFile, OutputFile, Diag, LangOpts);
       
     case RewriteTest:
-      return CreateCodeRewriterTest(Diag);
+      return CreateCodeRewriterTest(InFile, Diag);
   }
 }