Another step in the process of making the parser depend on Sema:

  - move DeclSpec &c into the Sema library
  - move ParseAST into the Parse library
Reflect this change in a thousand different includes.
Reflect this change in the link orders.

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

diff --git a/include/clang/Sema/ParseAST.h b/include/clang/Parse/ParseAST.h
similarity index 95%
rename from include/clang/Sema/ParseAST.h
rename to include/clang/Parse/ParseAST.h
index 57d7d0637f4f6405a6b769ff0bf229d7ea516447..0d37e21becd35f441220956ed8462d61f4412228 100644 (file)
--- a/include/clang/Sema/ParseAST.h
+++ b/include/clang/Parse/ParseAST.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_SEMA_PARSEAST_H
-#define LLVM_CLANG_SEMA_PARSEAST_H
+#ifndef LLVM_CLANG_PARSE_PARSEAST_H
+#define LLVM_CLANG_PARSE_PARSEAST_H
 
 namespace clang {
   class Preprocessor;

diff --git a/include/clang/Parse/Parser.h b/include/clang/Parse/Parser.h
index 9a166a1e98ef4b297f31bfc8af730ef706b11081..23e7f39bd00babfafa551514ea3a7261f9c091ed 100644 (file)
--- a/include/clang/Parse/Parser.h
+++ b/include/clang/Parse/Parser.h
@@ -16,8 +16,8 @@
 
 #include "clang/Basic/Specifiers.h"
 #include "clang/Lex/Preprocessor.h"
-#include "clang/Parse/Action.h"
-#include "clang/Parse/DeclSpec.h"
+#include "clang/Sema/Action.h"
+#include "clang/Sema/DeclSpec.h"
 #include "llvm/ADT/OwningPtr.h"
 #include <stack>
 #include <list>

diff --git a/include/clang/Parse/Action.h b/include/clang/Sema/Action.h
similarity index 99%
rename from include/clang/Parse/Action.h
rename to include/clang/Sema/Action.h
index 263dacb43d244306138f136869473461cb5f6ee4..8f1772efbea21644443c614ccd73a990f6e04e16 100644 (file)
--- a/include/clang/Parse/Action.h
+++ b/include/clang/Sema/Action.h
@@ -11,16 +11,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_PARSE_ACTION_H
-#define LLVM_CLANG_PARSE_ACTION_H
+#ifndef LLVM_CLANG_SEMA_ACTION_H
+#define LLVM_CLANG_SEMA_ACTION_H
 
 #include "clang/Basic/IdentifierTable.h"
 #include "clang/Basic/SourceLocation.h"
 #include "clang/Basic/Specifiers.h"
 #include "clang/Basic/TemplateKinds.h"
 #include "clang/Basic/TypeTraits.h"
-#include "clang/Parse/DeclSpec.h"
-#include "clang/Parse/Ownership.h"
+#include "clang/Sema/DeclSpec.h"
+#include "clang/Sema/Ownership.h"
 #include "llvm/Support/PrettyStackTrace.h"
 #include "llvm/ADT/PointerUnion.h"
 

diff --git a/include/clang/Parse/AttributeList.h b/include/clang/Sema/AttributeList.h
similarity index 96%
rename from include/clang/Parse/AttributeList.h
rename to include/clang/Sema/AttributeList.h
index e6bf9b6cc62a34b7193ea075bf444dd823879bca..dcb8d1fd67baa82d03f2f9385c0ac20aeac37926 100644 (file)
--- a/include/clang/Parse/AttributeList.h
+++ b/include/clang/Sema/AttributeList.h
@@ -1,4 +1,4 @@
-//===--- AttributeList.h ----------------------------------------*- C++ -*-===//
+//===--- AttributeList.h - Parsed attribute sets ----------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,14 +7,15 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// This file defines the AttributeList class interface.
+// This file defines the AttributeList class, which is used to collect
+// parsed attributes.
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ATTRLIST_H
-#define LLVM_CLANG_ATTRLIST_H
+#ifndef LLVM_CLANG_SEMA_ATTRLIST_H
+#define LLVM_CLANG_SEMA_ATTRLIST_H
 
-#include "clang/Parse/Ownership.h"
+#include "clang/Sema/Ownership.h"
 #include "clang/Basic/SourceLocation.h"
 #include <cassert>
 

diff --git a/include/clang/Parse/DeclSpec.h b/include/clang/Sema/DeclSpec.h
similarity index 98%
rename from include/clang/Parse/DeclSpec.h
rename to include/clang/Sema/DeclSpec.h
index b9fa6503b44bb3af0e71fbdccb2eac4e14bfa075..5f70c53f6e085668e46d11d39a1f478e0d1c6c3d 100644 (file)
--- a/include/clang/Parse/DeclSpec.h
+++ b/include/clang/Sema/DeclSpec.h
@@ -1,4 +1,4 @@
-//===--- SemaDeclSpec.h - Declaration Specifier Semantic Analys -*- C++ -*-===//
+//===--- DeclSpec.h - Parsed declaration specifiers -------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,14 +7,20 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// This file defines interfaces used for Declaration Specifiers and Declarators.
+// This file defines the classes used to store parsed information about
+// declaration-specifiers and declarators.
+//
+//   static const int volatile x, *y, *(*(*z)[10])(const void *x);
+//   ------------------------- -  --  ---------------------------
+//     declaration-specifiers  \  |   /
+//                            declarators
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_PARSE_DECLSPEC_H
-#define LLVM_CLANG_PARSE_DECLSPEC_H
+#ifndef LLVM_CLANG_SEMA_DECLSPEC_H
+#define LLVM_CLANG_SEMA_DECLSPEC_H
 
-#include "clang/Parse/AttributeList.h"
+#include "clang/Sema/AttributeList.h"
 #include "clang/Lex/Token.h"
 #include "clang/Basic/OperatorKinds.h"
 #include "clang/Basic/Specifiers.h"

diff --git a/include/clang/Parse/Designator.h b/include/clang/Sema/Designator.h
similarity index 98%
rename from include/clang/Parse/Designator.h
rename to include/clang/Sema/Designator.h
index 255af5901819243eec3e98c2fd7726be92cf0a4d..43cfc0b75ed49c3dd0909213721dd9c6d4df170c 100644 (file)
--- a/include/clang/Parse/Designator.h
+++ b/include/clang/Sema/Designator.h
@@ -12,10 +12,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_PARSE_DESIGNATOR_H
-#define LLVM_CLANG_PARSE_DESIGNATOR_H
+#ifndef LLVM_CLANG_SEMA_DESIGNATOR_H
+#define LLVM_CLANG_SEMA_DESIGNATOR_H
 
-#include "clang/Parse/Action.h"
+#include "clang/Sema/Action.h"
 
 namespace clang {
 

diff --git a/include/clang/Sema/IdentifierResolver.h b/include/clang/Sema/IdentifierResolver.h
index e494792c54dfcf41fe9e87528d5fb6261bcbf8c4..540d6987d07e8ffd6d93a74283c40fb8fe0dcfeb 100644 (file)
--- a/include/clang/Sema/IdentifierResolver.h
+++ b/include/clang/Sema/IdentifierResolver.h
@@ -16,7 +16,7 @@
 #define LLVM_CLANG_AST_SEMA_IDENTIFIERRESOLVER_H
 
 #include "clang/Basic/IdentifierTable.h"
-#include "clang/Parse/Scope.h"
+#include "clang/Sema/Scope.h"
 #include "clang/AST/Decl.h"
 #include "clang/AST/DeclarationName.h"
 #include "clang/AST/DeclCXX.h"

diff --git a/include/clang/Sema/Initialization.h b/include/clang/Sema/Initialization.h
index 2696960b57b7736a39eed3f834640ef6bce8ca58..29581ebef3504ab0cc17a42c92d9b75881f90f06 100644 (file)
--- a/include/clang/Sema/Initialization.h
+++ b/include/clang/Sema/Initialization.h
@@ -13,10 +13,10 @@
 #ifndef LLVM_CLANG_SEMA_INITIALIZATION_H
 #define LLVM_CLANG_SEMA_INITIALIZATION_H
 
+#include "clang/Sema/Action.h"
 #include "clang/Sema/Overload.h"
 #include "clang/AST/Type.h"
 #include "clang/AST/UnresolvedSet.h"
-#include "clang/Parse/Action.h"
 #include "clang/Basic/SourceLocation.h"
 #include "llvm/ADT/PointerIntPair.h"
 #include "llvm/ADT/SmallVector.h"

diff --git a/include/clang/Parse/Ownership.h b/include/clang/Sema/Ownership.h
similarity index 99%
rename from include/clang/Parse/Ownership.h
rename to include/clang/Sema/Ownership.h
index 45b8046e1a022b460476abf681b3e0b2457b6041..b7e69628fa942644860dac9d14b2f41a444919c2 100644 (file)
--- a/include/clang/Parse/Ownership.h
+++ b/include/clang/Sema/Ownership.h
@@ -1,4 +1,4 @@
-//===--- Ownership.h - Parser Ownership Helpers -----------------*- C++ -*-===//
+//===--- Ownership.h - Parser ownership helpers -----------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_PARSE_OWNERSHIP_H
-#define LLVM_CLANG_PARSE_OWNERSHIP_H
+#ifndef LLVM_CLANG_SEMA_OWNERSHIP_H
+#define LLVM_CLANG_SEMA_OWNERSHIP_H
 
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/PointerIntPair.h"

diff --git a/include/clang/Parse/Template.h b/include/clang/Sema/ParsedTemplate.h
similarity index 96%
rename from include/clang/Parse/Template.h
rename to include/clang/Sema/ParsedTemplate.h
index ba291b0c7482455ab39e56973f24eb3e4d3104e8..8a3a96136e1894c5314a7fcf02a590170eb5d2fc 100644 (file)
--- a/include/clang/Parse/Template.h
+++ b/include/clang/Sema/ParsedTemplate.h
@@ -1,4 +1,4 @@
-//===--- Template.h - Template Parsing Data Types -------------------------===//
+//===--- ParsedTemplate.h - Template Parsing Data Types -------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -11,11 +11,11 @@
 //  templates.
 //
 //===----------------------------------------------------------------------===//
-#ifndef LLVM_CLANG_PARSE_TEMPLATE_H
-#define LLVM_CLANG_PARSE_TEMPLATE_H
+#ifndef LLVM_CLANG_SEMA_PARSEDTEMPLATE_H
+#define LLVM_CLANG_SEMA_PARSEDTEMPLATE_H
 
-#include "clang/Parse/DeclSpec.h"
-#include "clang/Parse/Ownership.h"
+#include "clang/Sema/DeclSpec.h"
+#include "clang/Sema/Ownership.h"
 #include <cassert>
 
 namespace clang {  

diff --git a/include/clang/Parse/Scope.h b/include/clang/Sema/Scope.h
similarity index 99%
rename from include/clang/Parse/Scope.h
rename to include/clang/Sema/Scope.h
index f4f0cb72066aeedf835963ec3e8e9397642efb89..16fe642d2403f24d40df7bac9ac051201c86a3df 100644 (file)
--- a/include/clang/Parse/Scope.h
+++ b/include/clang/Sema/Scope.h
@@ -11,10 +11,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_PARSE_SCOPE_H
-#define LLVM_CLANG_PARSE_SCOPE_H
+#ifndef LLVM_CLANG_SEMA_SCOPE_H
+#define LLVM_CLANG_SEMA_SCOPE_H
 
-#include "clang/Parse/Action.h"
+#include "clang/Sema/Action.h"
 #include "llvm/ADT/SmallPtrSet.h"
 
 namespace clang {

diff --git a/include/clang/Sema/Sema.h b/include/clang/Sema/Sema.h
index 68ca7a17feb04f09b87a566ec7005fa4f8401d64..4940216d88a8cfb737ffde4b44ea8311041f5a09 100644 (file)
--- a/include/clang/Sema/Sema.h
+++ b/include/clang/Sema/Sema.h
@@ -15,6 +15,7 @@
 #ifndef LLVM_CLANG_AST_SEMA_H
 #define LLVM_CLANG_AST_SEMA_H
 
+#include "clang/Sema/Action.h"
 #include "clang/Sema/IdentifierResolver.h"
 #include "clang/Sema/CodeCompleteConsumer.h"
 #include "clang/Sema/CXXFieldCollector.h"
@@ -28,7 +29,6 @@
 #include "clang/AST/DeclTemplate.h"
 #include "clang/AST/ExprCXX.h"
 #include "clang/AST/FullExpr.h"
-#include "clang/Parse/Action.h"
 #include "clang/Sema/SemaDiagnostic.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/DenseSet.h"

diff --git a/lib/Frontend/DiagChecker.cpp b/lib/Frontend/DiagChecker.cpp
index a50cc99ab79e9cf9a1046049b8d8f65622521f0a..66d7ed7cf40a0679f8d43f7852ac83e94058619a 100644 (file)
--- a/lib/Frontend/DiagChecker.cpp
+++ b/lib/Frontend/DiagChecker.cpp
@@ -13,7 +13,7 @@
 
 #include "clang/Frontend/Utils.h"
 #include "clang/Frontend/TextDiagnosticBuffer.h"
-#include "clang/Sema/ParseAST.h"
+#include "clang/Parse/ParseAST.h"
 #include "clang/AST/ASTConsumer.h"
 #include "clang/Basic/SourceManager.h"
 #include "clang/Lex/Preprocessor.h"

diff --git a/lib/Frontend/FrontendAction.cpp b/lib/Frontend/FrontendAction.cpp
index 531213bf1b164c46b573c62d045142acc1018d75..b244c5ce0225a2ad7c4c148c2c6d4d7d9590effb 100644 (file)
--- a/lib/Frontend/FrontendAction.cpp
+++ b/lib/Frontend/FrontendAction.cpp
@@ -15,7 +15,7 @@
 #include "clang/Frontend/ASTUnit.h"
 #include "clang/Frontend/CompilerInstance.h"
 #include "clang/Frontend/FrontendDiagnostic.h"
-#include "clang/Sema/ParseAST.h"
+#include "clang/Parse/ParseAST.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/Timer.h"
 #include "llvm/Support/ErrorHandling.h"

diff --git a/lib/Parse/CMakeLists.txt b/lib/Parse/CMakeLists.txt
index ca62f1558d16ce87a7b40f6e463bba83fa355772..cb0c186f5b839974ca7f07e2923ea8c8d959a1f3 100644 (file)
--- a/lib/Parse/CMakeLists.txt
+++ b/lib/Parse/CMakeLists.txt
@@ -1,9 +1,7 @@
 set(LLVM_NO_RTTI 1)
 
 add_clang_library(clangParse
-  Action.cpp
-  AttributeList.cpp
-  DeclSpec.cpp
+  ParseAST.cpp
   ParseCXXInlineMethods.cpp
   ParseDecl.cpp
   ParseDeclCXX.cpp

diff --git a/lib/Sema/ParseAST.cpp b/lib/Parse/ParseAST.cpp
similarity index 99%
rename from lib/Sema/ParseAST.cpp
rename to lib/Parse/ParseAST.cpp
index 8f2f097ec55e4e246cd188de356c12c67a55793c..0279bb9e06cac4712f05baa7a9e15af4661dc65e 100644 (file)
--- a/lib/Sema/ParseAST.cpp
+++ b/lib/Parse/ParseAST.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Sema/ParseAST.h"
+#include "clang/Parse/ParseAST.h"
 #include "clang/Sema/Sema.h"
 #include "clang/Sema/CodeCompleteConsumer.h"
 #include "clang/Sema/SemaConsumer.h"

diff --git a/lib/Parse/ParseCXXInlineMethods.cpp b/lib/Parse/ParseCXXInlineMethods.cpp
index fbb8a7369d959f9f216e580322852126810d86fe..6b3374db4fda7539e1bbeb94f2e8e57a199fbcec 100644 (file)
--- a/lib/Parse/ParseCXXInlineMethods.cpp
+++ b/lib/Parse/ParseCXXInlineMethods.cpp
@@ -13,8 +13,8 @@
 
 #include "clang/Parse/ParseDiagnostic.h"
 #include "clang/Parse/Parser.h"
-#include "clang/Parse/DeclSpec.h"
-#include "clang/Parse/Scope.h"
+#include "clang/Sema/DeclSpec.h"
+#include "clang/Sema/Scope.h"
 using namespace clang;
 
 /// ParseCXXInlineMethodDef - We parsed and verified that the specified

diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index 928c2a9b5124d03d9fc7dfcf1efeb058631d5ca9..3f976362cd42b00bd8ac41cb0592241e0400d399 100644 (file)
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -13,8 +13,8 @@
 
 #include "clang/Parse/Parser.h"
 #include "clang/Parse/ParseDiagnostic.h"
-#include "clang/Parse/Scope.h"
-#include "clang/Parse/Template.h"
+#include "clang/Sema/Scope.h"
+#include "clang/Sema/ParsedTemplate.h"
 #include "RAIIObjectsForParser.h"
 #include "llvm/ADT/SmallSet.h"
 using namespace clang;

diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp
index 5f404ac43001051e35c3ca2fa4556c4c9232830d..0772450867d5fe903acb7483c23e4b1272d9b129 100644 (file)
--- a/lib/Parse/ParseDeclCXX.cpp
+++ b/lib/Parse/ParseDeclCXX.cpp
@@ -14,9 +14,9 @@
 #include "clang/Basic/OperatorKinds.h"
 #include "clang/Parse/Parser.h"
 #include "clang/Parse/ParseDiagnostic.h"
-#include "clang/Parse/DeclSpec.h"
-#include "clang/Parse/Scope.h"
-#include "clang/Parse/Template.h"
+#include "clang/Sema/DeclSpec.h"
+#include "clang/Sema/Scope.h"
+#include "clang/Sema/ParsedTemplate.h"
 #include "RAIIObjectsForParser.h"
 using namespace clang;
 

diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp
index 844dd3f873bb2a2587115d37d103f92e10531787..21033b4d1930b4cad0f5e590481a642c887bf7a8 100644 (file)
--- a/lib/Parse/ParseExpr.cpp
+++ b/lib/Parse/ParseExpr.cpp
@@ -20,9 +20,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/Parse/Parser.h"
-#include "clang/Parse/DeclSpec.h"
-#include "clang/Parse/Scope.h"
-#include "clang/Parse/Template.h"
+#include "clang/Sema/DeclSpec.h"
+#include "clang/Sema/Scope.h"
+#include "clang/Sema/ParsedTemplate.h"
 #include "clang/Basic/PrettyStackTrace.h"
 #include "RAIIObjectsForParser.h"
 #include "llvm/ADT/SmallVector.h"

diff --git a/lib/Parse/ParseExprCXX.cpp b/lib/Parse/ParseExprCXX.cpp
index f5ade8a8fb5e28e7aca06f51ccd1c5f71d33ee94..67b109c833a79fc467fef7cf47c8b310789c7443 100644 (file)
--- a/lib/Parse/ParseExprCXX.cpp
+++ b/lib/Parse/ParseExprCXX.cpp
@@ -13,8 +13,8 @@
 
 #include "clang/Parse/ParseDiagnostic.h"
 #include "clang/Parse/Parser.h"
-#include "clang/Parse/DeclSpec.h"
-#include "clang/Parse/Template.h"
+#include "clang/Sema/DeclSpec.h"
+#include "clang/Sema/ParsedTemplate.h"
 #include "llvm/Support/ErrorHandling.h"
 
 using namespace clang;

diff --git a/lib/Parse/ParseInit.cpp b/lib/Parse/ParseInit.cpp
index 8451aebc04bd67fde314b60775a71d191250a423..138058545f98ebf8a13dcb1dde4cda810373e03d 100644 (file)
--- a/lib/Parse/ParseInit.cpp
+++ b/lib/Parse/ParseInit.cpp
@@ -11,10 +11,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Parse/Designator.h"
 #include "clang/Parse/Parser.h"
 #include "clang/Parse/ParseDiagnostic.h"
-#include "clang/Parse/Scope.h"
+#include "clang/Sema/Designator.h"
+#include "clang/Sema/Scope.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/Support/raw_ostream.h"
 using namespace clang;

diff --git a/lib/Parse/ParseObjc.cpp b/lib/Parse/ParseObjc.cpp
index 00df5a2c5aba358fc212576eea651018e3728d56..ddfc7c014a182227d515282386651e7e24fa2618 100644 (file)
--- a/lib/Parse/ParseObjc.cpp
+++ b/lib/Parse/ParseObjc.cpp
@@ -11,10 +11,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Parse/Parser.h"
-#include "clang/Parse/DeclSpec.h"
-#include "clang/Parse/Scope.h"
 #include "clang/Parse/ParseDiagnostic.h"
+#include "clang/Parse/Parser.h"
+#include "clang/Sema/DeclSpec.h"
+#include "clang/Sema/Scope.h"
 #include "llvm/ADT/SmallVector.h"
 using namespace clang;
 

diff --git a/lib/Parse/ParsePragma.cpp b/lib/Parse/ParsePragma.cpp
index c53b2e4d27ccbbf31a466d5e67cd85d13e824499..c468869e5b48c2f2775e85a7004dbc82aea0cfce 100644 (file)
--- a/lib/Parse/ParsePragma.cpp
+++ b/lib/Parse/ParsePragma.cpp
@@ -13,9 +13,9 @@
 
 #include "ParsePragma.h"
 #include "clang/Parse/ParseDiagnostic.h"
-#include "clang/Lex/Preprocessor.h"
-#include "clang/Parse/Action.h"
 #include "clang/Parse/Parser.h"
+#include "clang/Lex/Preprocessor.h"
+#include "clang/Sema/Action.h"
 using namespace clang;
 
 

diff --git a/lib/Parse/ParseStmt.cpp b/lib/Parse/ParseStmt.cpp
index ccd56e98aa11e3925175d5abe5fbbe27b36de92c..d4c83a73fb7ba023915b9f04591ddb043db50516 100644 (file)
--- a/lib/Parse/ParseStmt.cpp
+++ b/lib/Parse/ParseStmt.cpp
@@ -14,8 +14,8 @@
 
 #include "clang/Parse/Parser.h"
 #include "RAIIObjectsForParser.h"
-#include "clang/Parse/DeclSpec.h"
-#include "clang/Parse/Scope.h"
+#include "clang/Sema/DeclSpec.h"
+#include "clang/Sema/Scope.h"
 #include "clang/Basic/Diagnostic.h"
 #include "clang/Basic/PrettyStackTrace.h"
 #include "clang/Basic/SourceManager.h"

diff --git a/lib/Parse/ParseTemplate.cpp b/lib/Parse/ParseTemplate.cpp
index ccf953d2824a8a4312a702d5f37ea97a2d020234..a8faee3b439091a420d2a226ed106dc4cbb48792 100644 (file)
--- a/lib/Parse/ParseTemplate.cpp
+++ b/lib/Parse/ParseTemplate.cpp
@@ -13,9 +13,9 @@
 
 #include "clang/Parse/Parser.h"
 #include "clang/Parse/ParseDiagnostic.h"
-#include "clang/Parse/DeclSpec.h"
-#include "clang/Parse/Scope.h"
-#include "clang/Parse/Template.h"
+#include "clang/Sema/DeclSpec.h"
+#include "clang/Sema/ParsedTemplate.h"
+#include "clang/Sema/Scope.h"
 #include "RAIIObjectsForParser.h"
 using namespace clang;
 

diff --git a/lib/Parse/ParseTentative.cpp b/lib/Parse/ParseTentative.cpp
index dfd866ff841bfdc490cfe6695816e8f04aae454a..dcf1d40628994f64798fb766ca84b4d3b0754ccc 100644 (file)
--- a/lib/Parse/ParseTentative.cpp
+++ b/lib/Parse/ParseTentative.cpp
@@ -14,7 +14,7 @@
 
 #include "clang/Parse/Parser.h"
 #include "clang/Parse/ParseDiagnostic.h"
-#include "clang/Parse/Template.h"
+#include "clang/Sema/ParsedTemplate.h"
 using namespace clang;
 
 /// isCXXDeclarationStatement - C++-specialized function that disambiguates

diff --git a/lib/Parse/Parser.cpp b/lib/Parse/Parser.cpp
index 4e0ae872345934ad8d8a03c2e332b006ace7994b..2864bf28bae7cd88af2712dea553d52318f8fad5 100644 (file)
--- a/lib/Parse/Parser.cpp
+++ b/lib/Parse/Parser.cpp
@@ -13,9 +13,9 @@
 
 #include "clang/Parse/Parser.h"
 #include "clang/Parse/ParseDiagnostic.h"
-#include "clang/Parse/DeclSpec.h"
-#include "clang/Parse/Scope.h"
-#include "clang/Parse/Template.h"
+#include "clang/Sema/DeclSpec.h"
+#include "clang/Sema/Scope.h"
+#include "clang/Sema/ParsedTemplate.h"
 #include "llvm/Support/raw_ostream.h"
 #include "RAIIObjectsForParser.h"
 #include "ParsePragma.h"

diff --git a/lib/Parse/Action.cpp b/lib/Sema/Action.cpp
similarity index 97%
rename from lib/Parse/Action.cpp
rename to lib/Sema/Action.cpp
index b34d14f50a01150c9b668c661fd06f53e7309b12..db0779f8b362270bf94e2aef498bc8d5a4e317e1 100644 (file)
--- a/lib/Parse/Action.cpp
+++ b/lib/Sema/Action.cpp
@@ -11,9 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Parse/Parser.h"
-#include "clang/Parse/DeclSpec.h"
-#include "clang/Parse/Scope.h"
+#include "clang/Sema/DeclSpec.h"
+#include "clang/Sema/Scope.h"
 #include "clang/Basic/TargetInfo.h"
 #include "llvm/Support/Allocator.h"
 #include "llvm/Support/RecyclingAllocator.h"

diff --git a/lib/Parse/AttributeList.cpp b/lib/Sema/AttributeList.cpp
similarity index 99%
rename from lib/Parse/AttributeList.cpp
rename to lib/Sema/AttributeList.cpp
index 8263923fe257f565f7dcb90202f44ecc0c33ee3b..cf99227a8dbbfe607779e227bfdf6ff0e8429016 100644 (file)
--- a/lib/Parse/AttributeList.cpp
+++ b/lib/Sema/AttributeList.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Parse/AttributeList.h"
+#include "clang/Sema/AttributeList.h"
 #include "clang/Basic/IdentifierTable.h"
 #include "llvm/ADT/StringSwitch.h"
 using namespace clang;

diff --git a/lib/Sema/CMakeLists.txt b/lib/Sema/CMakeLists.txt
index 70b4792f3ba519bdd7cda18372c1e983eb5603df..2144bfefb1a16302a31b5efda757f9f994479277 100644 (file)
--- a/lib/Sema/CMakeLists.txt
+++ b/lib/Sema/CMakeLists.txt
@@ -1,11 +1,13 @@
 set(LLVM_NO_RTTI 1)
 
 add_clang_library(clangSema
+  Action.cpp
   AnalysisBasedWarnings.cpp
+  AttributeList.cpp
   CodeCompleteConsumer.cpp
+  DeclSpec.cpp
   IdentifierResolver.cpp
   JumpDiagnostics.cpp
-  ParseAST.cpp
   Sema.cpp
   SemaAccess.cpp
   SemaAttr.cpp

diff --git a/lib/Sema/CodeCompleteConsumer.cpp b/lib/Sema/CodeCompleteConsumer.cpp
index c1b666a792ad279b389844b286952a0d95d98dd1..29d97a24145e0eddabbc8a016baf7e2f609d98fd 100644 (file)
--- a/lib/Sema/CodeCompleteConsumer.cpp
+++ b/lib/Sema/CodeCompleteConsumer.cpp
@@ -11,9 +11,9 @@
 //
 //===----------------------------------------------------------------------===//
 #include "clang/Sema/CodeCompleteConsumer.h"
+#include "clang/Sema/Scope.h"
 #include "clang/Sema/Sema.h"
 #include "clang/AST/DeclCXX.h"
-#include "clang/Parse/Scope.h"
 #include "clang/Lex/Preprocessor.h"
 #include "clang-c/Index.h"
 #include "llvm/ADT/STLExtras.h"

diff --git a/lib/Parse/DeclSpec.cpp b/lib/Sema/DeclSpec.cpp
similarity index 99%
rename from lib/Parse/DeclSpec.cpp
rename to lib/Sema/DeclSpec.cpp
index c5072276bc1497879eb0638f41784c6b47f2ac9e..417f8978c79dbb1ba3a97ab05e58e7deee43466c 100644 (file)
--- a/lib/Parse/DeclSpec.cpp
+++ b/lib/Sema/DeclSpec.cpp
@@ -11,9 +11,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Parse/DeclSpec.h"
-#include "clang/Parse/ParseDiagnostic.h"
-#include "clang/Parse/Template.h"
+#include "clang/Parse/ParseDiagnostic.h" // FIXME: remove this back-dependency!
+#include "clang/Sema/DeclSpec.h"
+#include "clang/Sema/ParsedTemplate.h"
 #include "clang/Lex/Preprocessor.h"
 #include "clang/Basic/LangOptions.h"
 #include "llvm/ADT/STLExtras.h"

diff --git a/lib/Sema/SemaCXXScopeSpec.cpp b/lib/Sema/SemaCXXScopeSpec.cpp
index 0525dec002f078a89914ad895b417bce87996454..9794ec613a98e9c798aa138175c4aba45f3c92f9 100644 (file)
--- a/lib/Sema/SemaCXXScopeSpec.cpp
+++ b/lib/Sema/SemaCXXScopeSpec.cpp
@@ -18,7 +18,7 @@
 #include "clang/AST/ExprCXX.h"
 #include "clang/AST/NestedNameSpecifier.h"
 #include "clang/Basic/PartialDiagnostic.h"
-#include "clang/Parse/DeclSpec.h"
+#include "clang/Sema/DeclSpec.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/Support/raw_ostream.h"
 using namespace clang;

diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index f6d6e6b3995398136ec0a3737bfba5dc70a65036..339cb6632de1c0b6efcc7deffb14244a070b0b5f 100644 (file)
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -21,9 +21,9 @@
 #include "clang/AST/DeclTemplate.h"
 #include "clang/AST/ExprCXX.h"
 #include "clang/AST/StmtCXX.h"
-#include "clang/Parse/DeclSpec.h"
+#include "clang/Sema/DeclSpec.h"
+#include "clang/Sema/ParsedTemplate.h"
 #include "clang/Parse/ParseDiagnostic.h"
-#include "clang/Parse/Template.h"
 #include "clang/Basic/PartialDiagnostic.h"
 #include "clang/Basic/SourceManager.h"
 #include "clang/Basic/TargetInfo.h"

diff --git a/lib/Sema/SemaDeclAttr.cpp b/lib/Sema/SemaDeclAttr.cpp
index e423c35f52779f3487e53824985d16aece0eb9cb..8a9870916e974c8392807263dd8a8b89a08e7530 100644 (file)
--- a/lib/Sema/SemaDeclAttr.cpp
+++ b/lib/Sema/SemaDeclAttr.cpp
@@ -17,7 +17,7 @@
 #include "clang/AST/DeclObjC.h"
 #include "clang/AST/Expr.h"
 #include "clang/Basic/TargetInfo.h"
-#include "clang/Parse/DeclSpec.h"
+#include "clang/Sema/DeclSpec.h"
 #include "llvm/ADT/StringExtras.h"
 using namespace clang;
 

diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp
index 19580957832a594b2fa84b01fde26742e7e27a4a..fa87b77957141c5cab7a5188c91be35cce113bbe 100644 (file)
--- a/lib/Sema/SemaDeclCXX.cpp
+++ b/lib/Sema/SemaDeclCXX.cpp
@@ -23,8 +23,8 @@
 #include "clang/AST/StmtVisitor.h"
 #include "clang/AST/TypeLoc.h"
 #include "clang/AST/TypeOrdering.h"
-#include "clang/Parse/DeclSpec.h"
-#include "clang/Parse/Template.h"
+#include "clang/Sema/DeclSpec.h"
+#include "clang/Sema/ParsedTemplate.h"
 #include "clang/Basic/PartialDiagnostic.h"
 #include "clang/Lex/Preprocessor.h"
 #include "llvm/ADT/STLExtras.h"

diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index 0abc4a91528254e8580dcfaf0f283745bca2006d..2d3da3c9aaae8bf17a316295e8cf4459d2ff8c26 100644 (file)
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -17,7 +17,7 @@
 #include "clang/AST/Expr.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/DeclObjC.h"
-#include "clang/Parse/DeclSpec.h"
+#include "clang/Sema/DeclSpec.h"
 using namespace clang;
 
 /// ActOnStartOfObjCMethodDef - This routine sets up parameters; invisible

diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index 42d1599e2e9a1aa7e6f790dc6fa7b964089bcd4e..15e0f7f1c772aa97d08aa88e6e2b2599d5d6ec2a 100644 (file)
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -29,10 +29,10 @@
 #include "clang/Basic/TargetInfo.h"
 #include "clang/Lex/LiteralSupport.h"
 #include "clang/Lex/Preprocessor.h"
-#include "clang/Parse/DeclSpec.h"
-#include "clang/Parse/Designator.h"
-#include "clang/Parse/Scope.h"
-#include "clang/Parse/Template.h"
+#include "clang/Sema/DeclSpec.h"
+#include "clang/Sema/Designator.h"
+#include "clang/Sema/Scope.h"
+#include "clang/Sema/ParsedTemplate.h"
 using namespace clang;
 
 

diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp
index 2267e0c757926f458642d45506c030e1ea2346bb..0a3ec0d053e86efc4f647d921fd46150bf1357ac 100644 (file)
--- a/lib/Sema/SemaExprCXX.cpp
+++ b/lib/Sema/SemaExprCXX.cpp
@@ -22,8 +22,8 @@
 #include "clang/Basic/PartialDiagnostic.h"
 #include "clang/Basic/TargetInfo.h"
 #include "clang/Lex/Preprocessor.h"
-#include "clang/Parse/DeclSpec.h"
-#include "clang/Parse/Template.h"
+#include "clang/Sema/DeclSpec.h"
+#include "clang/Sema/ParsedTemplate.h"
 #include "llvm/ADT/STLExtras.h"
 using namespace clang;
 

diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp
index 13ba8ee5f9700a4c72b69130068deb06dbf2ab4d..c26932b5906e3a9a3462cf39b3589ed1fef16005 100644 (file)
--- a/lib/Sema/SemaInit.cpp
+++ b/lib/Sema/SemaInit.cpp
@@ -15,11 +15,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "clang/Sema/Designator.h"
 #include "clang/Sema/Initialization.h"
 #include "clang/Sema/Lookup.h"
 #include "clang/Sema/Sema.h"
 #include "clang/Lex/Preprocessor.h"
-#include "clang/Parse/Designator.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/ExprCXX.h"
 #include "clang/AST/ExprObjC.h"

diff --git a/lib/Sema/SemaLookup.cpp b/lib/Sema/SemaLookup.cpp
index 994b633db8edd540266a09cc4ada32602dd06622..6067cf9de2c46b3a95da91f21ad79b8f2ac0314d 100644 (file)
--- a/lib/Sema/SemaLookup.cpp
+++ b/lib/Sema/SemaLookup.cpp
@@ -13,6 +13,7 @@
 //===----------------------------------------------------------------------===//
 #include "clang/Sema/Sema.h"
 #include "clang/Sema/Lookup.h"
+#include "clang/Sema/DeclSpec.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/CXXInheritance.h"
 #include "clang/AST/Decl.h"
@@ -21,7 +22,6 @@
 #include "clang/AST/DeclTemplate.h"
 #include "clang/AST/Expr.h"
 #include "clang/AST/ExprCXX.h"
-#include "clang/Parse/DeclSpec.h"
 #include "clang/Basic/Builtins.h"
 #include "clang/Basic/LangOptions.h"
 #include "llvm/ADT/STLExtras.h"

diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp
index 5cfacf78b577cc863309aa4b1fc605fe64b2672f..74ee218c3e483c1899b8c2fc11ae990352be75b3 100644 (file)
--- a/lib/Sema/SemaTemplate.cpp
+++ b/lib/Sema/SemaTemplate.cpp
@@ -17,8 +17,8 @@
 #include "clang/AST/ExprCXX.h"
 #include "clang/AST/DeclFriend.h"
 #include "clang/AST/DeclTemplate.h"
-#include "clang/Parse/DeclSpec.h"
-#include "clang/Parse/Template.h"
+#include "clang/Sema/DeclSpec.h"
+#include "clang/Sema/ParsedTemplate.h"
 #include "clang/Basic/LangOptions.h"
 #include "clang/Basic/PartialDiagnostic.h"
 #include "llvm/ADT/StringExtras.h"

diff --git a/lib/Sema/SemaTemplateDeduction.cpp b/lib/Sema/SemaTemplateDeduction.cpp
index 97ad6bea336c35e9956d4363713633b4899a7045..ee631b05891e89bb064e1fb3c66a7fec52d7d3d1 100644 (file)
--- a/lib/Sema/SemaTemplateDeduction.cpp
+++ b/lib/Sema/SemaTemplateDeduction.cpp
@@ -11,12 +11,12 @@
 //===----------------------------------------------------------------------===/
 
 #include "clang/Sema/Sema.h"
+#include "clang/Sema/DeclSpec.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/DeclTemplate.h"
 #include "clang/AST/StmtVisitor.h"
 #include "clang/AST/Expr.h"
 #include "clang/AST/ExprCXX.h"
-#include "clang/Parse/DeclSpec.h"
 #include <algorithm>
 
 namespace clang {

diff --git a/lib/Sema/SemaTemplateInstantiate.cpp b/lib/Sema/SemaTemplateInstantiate.cpp
index a7df4c12bf1ab2b7d82646f20fc97b0d54c4e5d7..1deac54b2be86e65bdd0a6c142c40df690427bb5 100644 (file)
--- a/lib/Sema/SemaTemplateInstantiate.cpp
+++ b/lib/Sema/SemaTemplateInstantiate.cpp
@@ -12,12 +12,12 @@
 
 #include "clang/Sema/Sema.h"
 #include "TreeTransform.h"
+#include "clang/Sema/DeclSpec.h"
 #include "clang/Sema/Lookup.h"
 #include "clang/AST/ASTConsumer.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/Expr.h"
 #include "clang/AST/DeclTemplate.h"
-#include "clang/Parse/DeclSpec.h"
 #include "clang/Basic/LangOptions.h"
 
 using namespace clang;

diff --git a/lib/Sema/SemaType.cpp b/lib/Sema/SemaType.cpp
index 1fdb17f4d2a719629372005d9a8b46be86f9bb6e..8751a76482b5a4fe1406b99c929657ca76e13ae6 100644 (file)
--- a/lib/Sema/SemaType.cpp
+++ b/lib/Sema/SemaType.cpp
@@ -21,7 +21,7 @@
 #include "clang/AST/Expr.h"
 #include "clang/Basic/PartialDiagnostic.h"
 #include "clang/Basic/TargetInfo.h"
-#include "clang/Parse/DeclSpec.h"
+#include "clang/Sema/DeclSpec.h"
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/Support/ErrorHandling.h"
 using namespace clang;

diff --git a/lib/Sema/TreeTransform.h b/lib/Sema/TreeTransform.h
index 9fa34f984fb852e305516464cc2f6ea90cc0debc..1ad76792a062cd31a35c3b0b02cbd72bbca188b0 100644 (file)
--- a/lib/Sema/TreeTransform.h
+++ b/lib/Sema/TreeTransform.h
@@ -24,8 +24,8 @@
 #include "clang/AST/StmtCXX.h"
 #include "clang/AST/StmtObjC.h"
 #include "clang/AST/TypeLocBuilder.h"
-#include "clang/Parse/Ownership.h"
-#include "clang/Parse/Designator.h"
+#include "clang/Sema/Ownership.h"
+#include "clang/Sema/Designator.h"
 #include "clang/Lex/Preprocessor.h"
 #include "llvm/Support/ErrorHandling.h"
 #include <algorithm>

diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt
index 9426899e7bcd80f6a9acb645ac56d71451cf4797..5cf2cd6ebf3445642e6b33c4016c7900d84ca5b3 100644 (file)
--- a/tools/c-index-test/CMakeLists.txt
+++ b/tools/c-index-test/CMakeLists.txt
@@ -6,10 +6,10 @@ set( LLVM_USED_LIBS
   clangFrontend
   clangDriver
   clangSerialization
+  clangParse
   clangSema
   clangAnalysis
   clangAST
-  clangParse
   clangLex
   clangBasic
   )

diff --git a/tools/c-index-test/Makefile b/tools/c-index-test/Makefile
index 516a298ab317c9a5aaa5b482fed365778095cd22..f41aa8098155a7e9f32e4d34264f4be59365e3ee 100644 (file)
--- a/tools/c-index-test/Makefile
+++ b/tools/c-index-test/Makefile
@@ -15,7 +15,7 @@ TOOL_NO_EXPORTS = 1
 
 LINK_COMPONENTS := bitreader mc core
 USEDLIBS = clang.a clangIndex.a clangFrontend.a clangDriver.a \
-          clangSerialization.a clangSema.a clangAnalysis.a clangAST.a \
-          clangParse.a clangLex.a clangBasic.a
+          clangSerialization.a clangParse.a clangSema.a clangAnalysis.a \
+          clangAST.a clangLex.a clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile

diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
index 47345239e89cf8121e27aab3d39e0b629a31613b..5ca6fa1993e8edd89265a019908cdbbf7c21dbc0 100644 (file)
--- a/tools/driver/CMakeLists.txt
+++ b/tools/driver/CMakeLists.txt
@@ -5,13 +5,13 @@ set( LLVM_USED_LIBS
   clangDriver
   clangSerialization
   clangCodeGen
+  clangParse
   clangSema
   clangChecker
   clangAnalysis
   clangIndex
   clangRewrite
   clangAST
-  clangParse
   clangLex
   clangBasic
   )

diff --git a/tools/driver/Makefile b/tools/driver/Makefile
index 8cb63607261b47fb38cfaa86390c66ca0ea16389..0fc0d6597c3c8c6cb6b2c1749c1cac1721128ddc 100644 (file)
--- a/tools/driver/Makefile
+++ b/tools/driver/Makefile
@@ -28,8 +28,8 @@ include $(CLANG_LEVEL)/../../Makefile.config
 LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter codegen \
                    ipo selectiondag
 USEDLIBS = clangFrontend.a clangDriver.a clangSerialization.a clangCodeGen.a \
-           clangSema.a clangChecker.a clangAnalysis.a clangIndex.a \
-          clangRewrite.a clangAST.a clangParse.a clangLex.a clangBasic.a
+           clangParse.a clangSema.a clangChecker.a clangAnalysis.a \
+          clangIndex.a clangRewrite.a clangAST.a clangLex.a clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile
 

diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt
index 635fca35bd1aac3c16fd220e95ef32a812efe7ee..e06eecfb14940b617291317db5e6080d9cc6ffed 100644 (file)
--- a/tools/libclang/CMakeLists.txt
+++ b/tools/libclang/CMakeLists.txt
@@ -6,10 +6,10 @@ set(LLVM_USED_LIBS
   clangFrontend
   clangDriver
   clangSerialization
+  clangParse
   clangSema
   clangAnalysis
   clangAST
-  clangParse
   clangLex
   clangBasic)
 

diff --git a/tools/libclang/Makefile b/tools/libclang/Makefile
index 2fa8c44558c8d0573f0f34545f7de78011a15561..6d2a13cfc0b4d2ec67ab198965cc7b33d02a2f66 100644 (file)
--- a/tools/libclang/Makefile
+++ b/tools/libclang/Makefile
@@ -16,8 +16,8 @@ LINK_LIBS_IN_SHARED = 1
 SHARED_LIBRARY = 1
 
 LINK_COMPONENTS := bitreader mc core
-USEDLIBS = clangFrontend.a clangDriver.a clangSerialization.a clangSema.a \
-          clangAnalysis.a clangAST.a clangParse.a clangLex.a clangBasic.a
+USEDLIBS = clangFrontend.a clangDriver.a clangSerialization.a clangParse.a \
+          clangSema.a clangAnalysis.a clangAST.a clangLex.a clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile