pass the astconsumer into Sema's ctor, clean up some stuff in

Sema::ActOnTranslationUnitScope.  The various ObjC pieces at the top
of Sema.cpp should be moved into SemaObjC or something.

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

diff --git a/Sema/ParseAST.cpp b/Sema/ParseAST.cpp
index 92e8d247e657ec84dc43189d1e7aa1b5e64d6de8..8fd14d17d1a64e99d1d28786722c537ad02dc14b 100644 (file)
--- a/Sema/ParseAST.cpp
+++ b/Sema/ParseAST.cpp
@@ -38,7 +38,7 @@ void clang::ParseAST(Preprocessor &PP, ASTConsumer *Consumer, bool PrintStats) {
   ASTContext Context(PP.getSourceManager(), PP.getTargetInfo(),
                      PP.getIdentifierTable(), PP.getSelectorTable());
   
-  Parser P(PP, *new Sema(PP, Context));
+  Parser P(PP, *new Sema(PP, Context, *Consumer));
   PP.EnterMainSourceFile();
     
   // Initialize the parser.

diff --git a/Sema/Sema.cpp b/Sema/Sema.cpp
index b53147f6eb7d6016817894287bcb2078ba457116..ffa81a2736e6b96cf96f27937d97c1d31b1515ee 100644 (file)
--- a/Sema/Sema.cpp
+++ b/Sema/Sema.cpp
@@ -42,43 +42,44 @@ bool Sema::isObjCObjectPointerType(QualType type) const {
 
 void Sema::ActOnTranslationUnitScope(SourceLocation Loc, Scope *S) {
   TUScope = S;
-  if (PP.getLangOptions().ObjC1) {
-    TypedefType *t;
-    
-    // Add the built-in ObjC types.
-    t = dyn_cast<TypedefType>(Context.getObjCIdType().getTypePtr());
-    t->getDecl()->getIdentifier()->setFETokenInfo(t->getDecl());
-    TUScope->AddDecl(t->getDecl());
-    t = dyn_cast<TypedefType>(Context.getObjCClassType().getTypePtr());
-    t->getDecl()->getIdentifier()->setFETokenInfo(t->getDecl());
-    TUScope->AddDecl(t->getDecl());
-    ObjCInterfaceType *it = dyn_cast<ObjCInterfaceType>(Context.getObjCProtoType());
-    ObjCInterfaceDecl *IDecl = it->getDecl();
-    IDecl->getIdentifier()->setFETokenInfo(IDecl);
-    TUScope->AddDecl(IDecl);
-    t = dyn_cast<TypedefType>(Context.getObjCSelType().getTypePtr());
-    t->getDecl()->getIdentifier()->setFETokenInfo(t->getDecl());
-    TUScope->AddDecl(t->getDecl());
-  }
-}
-
-Sema::Sema(Preprocessor &pp, ASTContext &ctxt)
-  : PP(pp), Context(ctxt), CurFunctionDecl(0), CurMethodDecl(0) {
+  if (!PP.getLangOptions().ObjC1) return;
+  
+  TypedefType *t;
+  
+  // Add the built-in ObjC types.
+  t = cast<TypedefType>(Context.getObjCIdType().getTypePtr());
+  t->getDecl()->getIdentifier()->setFETokenInfo(t->getDecl());
+  TUScope->AddDecl(t->getDecl());
+  t = cast<TypedefType>(Context.getObjCClassType().getTypePtr());
+  t->getDecl()->getIdentifier()->setFETokenInfo(t->getDecl());
+  TUScope->AddDecl(t->getDecl());
+  ObjCInterfaceType *it = cast<ObjCInterfaceType>(Context.getObjCProtoType());
+  ObjCInterfaceDecl *IDecl = it->getDecl();
+  IDecl->getIdentifier()->setFETokenInfo(IDecl);
+  TUScope->AddDecl(IDecl);
+  t = cast<TypedefType>(Context.getObjCSelType().getTypePtr());
+  t->getDecl()->getIdentifier()->setFETokenInfo(t->getDecl());
+  TUScope->AddDecl(t->getDecl());
+}
+
+Sema::Sema(Preprocessor &pp, ASTContext &ctxt, ASTConsumer &consumer)
+  : PP(pp), Context(ctxt), Consumer(consumer), 
+    CurFunctionDecl(0), CurMethodDecl(0) {
   
   // Get IdentifierInfo objects for known functions for which we
   // do extra checking.  
-  IdentifierTable& IT = PP.getIdentifierTable();  
-
-  KnownFunctionIDs[ id_printf  ] = &IT.get("printf");
-  KnownFunctionIDs[ id_fprintf ] = &IT.get("fprintf");
-  KnownFunctionIDs[ id_sprintf ] = &IT.get("sprintf");
-  KnownFunctionIDs[ id_snprintf ] = &IT.get("snprintf");
-  KnownFunctionIDs[ id_asprintf ] = &IT.get("asprintf");
-  KnownFunctionIDs[ id_vsnprintf ] = &IT.get("vsnprintf");
-  KnownFunctionIDs[ id_vasprintf ] = &IT.get("vasprintf");
-  KnownFunctionIDs[ id_vfprintf ] = &IT.get("vfprintf");
-  KnownFunctionIDs[ id_vsprintf ] = &IT.get("vsprintf");
-  KnownFunctionIDs[ id_vprintf ] = &IT.get("vprintf");
+  IdentifierTable &IT = PP.getIdentifierTable();  
+
+  KnownFunctionIDs[id_printf]    = &IT.get("printf");
+  KnownFunctionIDs[id_fprintf]   = &IT.get("fprintf");
+  KnownFunctionIDs[id_sprintf]   = &IT.get("sprintf");
+  KnownFunctionIDs[id_snprintf]  = &IT.get("snprintf");
+  KnownFunctionIDs[id_asprintf]  = &IT.get("asprintf");
+  KnownFunctionIDs[id_vsnprintf] = &IT.get("vsnprintf");
+  KnownFunctionIDs[id_vasprintf] = &IT.get("vasprintf");
+  KnownFunctionIDs[id_vfprintf]  = &IT.get("vfprintf");
+  KnownFunctionIDs[id_vsprintf]  = &IT.get("vsprintf");
+  KnownFunctionIDs[id_vprintf]   = &IT.get("vprintf");
 
   if (PP.getLangOptions().ObjC1) {
     // Synthesize "typedef struct objc_class *Class;"

diff --git a/Sema/Sema.h b/Sema/Sema.h
index 3b463eb407967abd0a3917b06bdaad2cd96865d5..06a12e4f7f402f3e24b92546ccba4775d0ea8148 100644 (file)
--- a/Sema/Sema.h
+++ b/Sema/Sema.h
@@ -29,6 +29,7 @@ namespace llvm {
 
 namespace clang {
   class ASTContext;
+  class ASTConsumer;
   class Preprocessor;
   class Decl;
   class ScopedDecl;
@@ -60,8 +61,8 @@ namespace clang {
 /// Sema - This implements semantic analysis and AST building for C.
 class Sema : public Action {
   Preprocessor &PP;
-  
   ASTContext &Context;
+  ASTConsumer &Consumer;
   
   /// CurFunctionDecl - If inside of a function body, this contains a pointer to
   /// the function decl for the function being parsed.
@@ -139,7 +140,7 @@ class Sema : public Action {
   llvm::DenseMap<Selector, ObjCMethodList> InstanceMethodPool;
   llvm::DenseMap<Selector, ObjCMethodList> FactoryMethodPool;
 public:
-  Sema(Preprocessor &pp, ASTContext &ctxt);
+  Sema(Preprocessor &pp, ASTContext &ctxt, ASTConsumer &consumer);
   
   const LangOptions &getLangOptions() const;
   

diff --git a/clang.xcodeproj/project.pbxproj b/clang.xcodeproj/project.pbxproj
index e89449280828c021fa36a4d76523574c02d5732b..a6bff1111d0e37f43e0d7e0be65548ee34d9b53e 100644 (file)
--- a/clang.xcodeproj/project.pbxproj
+++ b/clang.xcodeproj/project.pbxproj
@@ -624,8 +624,8 @@
                DEC8D98B0A9433BC00353FCA /* AST */ = {
                        isa = PBXGroup;
                        children = (
-                               35BFBD2B0C9EDE1E006CB644 /* ASTConsumer.h */,
                                DEC8D9A30A94346E00353FCA /* AST.h */,
+                               35BFBD2B0C9EDE1E006CB644 /* ASTConsumer.h */,
                                DE75ED280B044DC90020CF81 /* ASTContext.h */,
                                DED676D00B6C786700AAD4A3 /* Builtins.def */,
                                DED676F90B6C797B00AAD4A3 /* Builtins.h */,

diff --git a/include/clang/AST/ASTConsumer.h b/include/clang/AST/ASTConsumer.h
index 5e0ed75bbf363c668dcb01279a2d86756895fef9..bfaa141573ee7fb1500343131f80062fe6abb581 100644 (file)
--- a/include/clang/AST/ASTConsumer.h
+++ b/include/clang/AST/ASTConsumer.h
@@ -17,6 +17,8 @@
 namespace clang {
   class ASTContext;
   class Decl;
+  class TagDecl;
+  class HandleTagDeclDefinition;
   
 /// ASTConsumer - This is an abstract interface that should be implemented by
 /// clients that read ASTs.  This abstraction layer allows the client to be
@@ -31,7 +33,7 @@ public:
   
   /// HandleTopLevelDecl - Handle the specified top-level declaration.  This is
   ///  called by HandleTopLevelDeclaration to process every top-level Decl*.
-  virtual void HandleTopLevelDecl(Decl *D) {};
+  virtual void HandleTopLevelDecl(Decl *D) {}
     
   
   /// HandleTopLevelDeclaration - Handle the specified top-level declaration.
@@ -40,6 +42,13 @@ public:
   ///  can override its behavior; by default it calls HandleTopLevelDecl
   ///  for every Decl* in a decl chain.
   virtual void HandleTopLevelDeclaration(Decl *D);
+
+  
+  /// HandleTagDeclDefinition - This callback is invoked each time a TagDecl
+  /// (e.g. struct, union, enum, class) is completed.  This allows the client to
+  /// hack on the type, which can occur at any point in the file (because these
+  /// can be defined in declspecs).
+  virtual void HandleTagDeclDefinition(TagDecl *D) {}
   
   /// PrintStats - If desired, print any statistics.
   virtual void PrintStats() {