From b09f6e15c59b89d5820db8ef40598eb1d1323c1f Mon Sep 17 00:00:00 2001 From: Eli Friedman Date: Tue, 19 May 2009 04:14:29 +0000 Subject: [PATCH] Move clang-cc.h to lib/Frontend/Utils.h, and move the associated .cpp files to lib/Frontend. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@72099 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../clang-cc/clang-cc.h => include/clang/Frontend/Utils.h | 8 ++++---- {tools/clang-cc => lib/Frontend}/CacheTokens.cpp | 2 +- {tools/clang-cc => lib/Frontend}/DependencyFile.cpp | 2 +- {tools/clang-cc => lib/Frontend}/DiagChecker.cpp | 2 +- {tools/clang-cc => lib/Frontend}/PrintParserCallbacks.cpp | 2 +- .../clang-cc => lib/Frontend}/PrintPreprocessedOutput.cpp | 3 +-- {tools/clang-cc => lib/Frontend}/RewriteMacros.cpp | 2 +- {tools/clang-cc => lib/Frontend}/RewriteTest.cpp | 2 +- {tools/clang-cc => lib/Frontend}/Warnings.cpp | 2 +- tools/clang-cc/clang-cc.cpp | 2 +- 10 files changed, 13 insertions(+), 14 deletions(-) rename tools/clang-cc/clang-cc.h => include/clang/Frontend/Utils.h (92%) rename {tools/clang-cc => lib/Frontend}/CacheTokens.cpp (99%) rename {tools/clang-cc => lib/Frontend}/DependencyFile.cpp (99%) rename {tools/clang-cc => lib/Frontend}/DiagChecker.cpp (99%) rename {tools/clang-cc => lib/Frontend}/PrintParserCallbacks.cpp (99%) rename {tools/clang-cc => lib/Frontend}/PrintPreprocessedOutput.cpp (99%) rename {tools/clang-cc => lib/Frontend}/RewriteMacros.cpp (99%) rename {tools/clang-cc => lib/Frontend}/RewriteTest.cpp (97%) rename {tools/clang-cc => lib/Frontend}/Warnings.cpp (99%) diff --git a/tools/clang-cc/clang-cc.h b/include/clang/Frontend/Utils.h similarity index 92% rename from tools/clang-cc/clang-cc.h rename to include/clang/Frontend/Utils.h index 354d73b9ac..41eb31a0fc 100644 --- a/tools/clang-cc/clang-cc.h +++ b/include/clang/Frontend/Utils.h @@ -1,4 +1,4 @@ -//===--- clang-cc.h - C-Language Front-end --------------------------------===// +//===--- Utils.h - Misc utilities for the front-end------------------------===// // // The LLVM Compiler Infrastructure // @@ -7,12 +7,12 @@ // //===----------------------------------------------------------------------===// // -// This is the header file that pulls together the top-level driver. +// This header contains miscellaneous utilities for various front-end actions. // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_CLANG_CC_H -#define LLVM_CLANG_CLANG_CC_H +#ifndef LLVM_CLANG_FRONTEND_UTILS_H +#define LLVM_CLANG_FRONTEND_UTILS_H #include #include diff --git a/tools/clang-cc/CacheTokens.cpp b/lib/Frontend/CacheTokens.cpp similarity index 99% rename from tools/clang-cc/CacheTokens.cpp rename to lib/Frontend/CacheTokens.cpp index 53352360fb..0065828c6d 100644 --- a/tools/clang-cc/CacheTokens.cpp +++ b/lib/Frontend/CacheTokens.cpp @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -#include "clang-cc.h" +#include "clang/Frontend/Utils.h" #include "clang/Basic/FileManager.h" #include "clang/Basic/SourceManager.h" #include "clang/Basic/IdentifierTable.h" diff --git a/tools/clang-cc/DependencyFile.cpp b/lib/Frontend/DependencyFile.cpp similarity index 99% rename from tools/clang-cc/DependencyFile.cpp rename to lib/Frontend/DependencyFile.cpp index 3306f82aea..4cee280ebf 100644 --- a/tools/clang-cc/DependencyFile.cpp +++ b/lib/Frontend/DependencyFile.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "clang-cc.h" +#include "clang/Frontend/Utils.h" #include "clang/Basic/SourceManager.h" #include "clang/Basic/FileManager.h" #include "clang/Lex/Preprocessor.h" diff --git a/tools/clang-cc/DiagChecker.cpp b/lib/Frontend/DiagChecker.cpp similarity index 99% rename from tools/clang-cc/DiagChecker.cpp rename to lib/Frontend/DiagChecker.cpp index 5e964dcfb7..2eaf2fe62f 100644 --- a/tools/clang-cc/DiagChecker.cpp +++ b/lib/Frontend/DiagChecker.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "clang-cc.h" +#include "clang/Frontend/Utils.h" #include "clang/Frontend/TextDiagnosticBuffer.h" #include "clang/Sema/ParseAST.h" #include "clang/AST/ASTConsumer.h" diff --git a/tools/clang-cc/PrintParserCallbacks.cpp b/lib/Frontend/PrintParserCallbacks.cpp similarity index 99% rename from tools/clang-cc/PrintParserCallbacks.cpp rename to lib/Frontend/PrintParserCallbacks.cpp index e5b7d0455c..e9aece968f 100644 --- a/tools/clang-cc/PrintParserCallbacks.cpp +++ b/lib/Frontend/PrintParserCallbacks.cpp @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -#include "clang-cc.h" +#include "clang/Frontend/Utils.h" #include "clang/Parse/Action.h" #include "clang/Parse/DeclSpec.h" #include "llvm/Support/raw_ostream.h" diff --git a/tools/clang-cc/PrintPreprocessedOutput.cpp b/lib/Frontend/PrintPreprocessedOutput.cpp similarity index 99% rename from tools/clang-cc/PrintPreprocessedOutput.cpp rename to lib/Frontend/PrintPreprocessedOutput.cpp index 429b829649..6a7ad31b53 100644 --- a/tools/clang-cc/PrintPreprocessedOutput.cpp +++ b/lib/Frontend/PrintPreprocessedOutput.cpp @@ -12,8 +12,7 @@ // //===----------------------------------------------------------------------===// -#include "clang/Basic/SourceManager.h" -#include "clang-cc.h" +#include "clang/Frontend/Utils.h" #include "clang/Lex/MacroInfo.h" #include "clang/Lex/PPCallbacks.h" #include "clang/Lex/Preprocessor.h" diff --git a/tools/clang-cc/RewriteMacros.cpp b/lib/Frontend/RewriteMacros.cpp similarity index 99% rename from tools/clang-cc/RewriteMacros.cpp rename to lib/Frontend/RewriteMacros.cpp index c9c4444ad4..5ef4892e5b 100644 --- a/tools/clang-cc/RewriteMacros.cpp +++ b/lib/Frontend/RewriteMacros.cpp @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -#include "clang-cc.h" +#include "clang/Frontend/Utils.h" #include "clang/Rewrite/Rewriter.h" #include "clang/Lex/Preprocessor.h" #include "clang/Basic/SourceManager.h" diff --git a/tools/clang-cc/RewriteTest.cpp b/lib/Frontend/RewriteTest.cpp similarity index 97% rename from tools/clang-cc/RewriteTest.cpp rename to lib/Frontend/RewriteTest.cpp index c4b3a77956..f9eb58f867 100644 --- a/tools/clang-cc/RewriteTest.cpp +++ b/lib/Frontend/RewriteTest.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "clang-cc.h" +#include "clang/Frontend/Utils.h" #include "clang/Lex/Preprocessor.h" #include "clang/Rewrite/TokenRewriter.h" #include "llvm/Support/raw_ostream.h" diff --git a/tools/clang-cc/Warnings.cpp b/lib/Frontend/Warnings.cpp similarity index 99% rename from tools/clang-cc/Warnings.cpp rename to lib/Frontend/Warnings.cpp index b3e21e1052..8d6ca68de9 100644 --- a/tools/clang-cc/Warnings.cpp +++ b/lib/Frontend/Warnings.cpp @@ -20,7 +20,7 @@ // Given a warning option 'foo', the following are valid: // -Wfoo, -Wno-foo, -Werror=foo // -#include "clang-cc.h" +#include "clang/Frontend/Utils.h" #include "clang/Basic/Diagnostic.h" #include "clang/Sema/SemaDiagnostic.h" #include "clang/Lex/LexDiagnostic.h" diff --git a/tools/clang-cc/clang-cc.cpp b/tools/clang-cc/clang-cc.cpp index 40333d22d3..51b3ffda27 100644 --- a/tools/clang-cc/clang-cc.cpp +++ b/tools/clang-cc/clang-cc.cpp @@ -22,7 +22,6 @@ // //===----------------------------------------------------------------------===// -#include "clang-cc.h" #include "AnalysisConsumer.h" #include "clang/Frontend/ASTConsumers.h" #include "clang/Frontend/CompileOptions.h" @@ -34,6 +33,7 @@ #include "clang/Frontend/PCHReader.h" #include "clang/Frontend/TextDiagnosticBuffer.h" #include "clang/Frontend/TextDiagnosticPrinter.h" +#include "clang/Frontend/Utils.h" #include "clang/Analysis/PathDiagnostic.h" #include "clang/CodeGen/ModuleBuilder.h" #include "clang/Sema/ParseAST.h" -- 2.50.1