[cfe-commits] r46787 - in /cfe/trunk: Sema/ParseAST.cpp Sema/Sema.cpp Sema/Sema.h clang.xcodeproj/project.pbxproj include/clang/AST/ASTConsumer.h
Chris Lattner
sabre at nondot.org
Tue Feb 5 16:47:00 PST 2008
Author: lattner
Date: Tue Feb 5 18:46:58 2008
New Revision: 46787
URL: http://llvm.org/viewvc/llvm-project?rev=46787&view=rev
Log:
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.
Modified:
cfe/trunk/Sema/ParseAST.cpp
cfe/trunk/Sema/Sema.cpp
cfe/trunk/Sema/Sema.h
cfe/trunk/clang.xcodeproj/project.pbxproj
cfe/trunk/include/clang/AST/ASTConsumer.h
Modified: cfe/trunk/Sema/ParseAST.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Sema/ParseAST.cpp?rev=46787&r1=46786&r2=46787&view=diff
==============================================================================
--- cfe/trunk/Sema/ParseAST.cpp (original)
+++ cfe/trunk/Sema/ParseAST.cpp Tue Feb 5 18:46:58 2008
@@ -38,7 +38,7 @@
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.
Modified: cfe/trunk/Sema/Sema.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Sema/Sema.cpp?rev=46787&r1=46786&r2=46787&view=diff
==============================================================================
--- cfe/trunk/Sema/Sema.cpp (original)
+++ cfe/trunk/Sema/Sema.cpp Tue Feb 5 18:46:58 2008
@@ -42,43 +42,44 @@
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();
+ 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");
+ 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;"
Modified: cfe/trunk/Sema/Sema.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Sema/Sema.h?rev=46787&r1=46786&r2=46787&view=diff
==============================================================================
--- cfe/trunk/Sema/Sema.h (original)
+++ cfe/trunk/Sema/Sema.h Tue Feb 5 18:46:58 2008
@@ -29,6 +29,7 @@
namespace clang {
class ASTContext;
+ class ASTConsumer;
class Preprocessor;
class Decl;
class ScopedDecl;
@@ -60,8 +61,8 @@
/// 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 @@
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;
Modified: cfe/trunk/clang.xcodeproj/project.pbxproj
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/clang.xcodeproj/project.pbxproj?rev=46787&r1=46786&r2=46787&view=diff
==============================================================================
--- cfe/trunk/clang.xcodeproj/project.pbxproj (original)
+++ cfe/trunk/clang.xcodeproj/project.pbxproj Tue Feb 5 18:46:58 2008
@@ -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 */,
Modified: cfe/trunk/include/clang/AST/ASTConsumer.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/ASTConsumer.h?rev=46787&r1=46786&r2=46787&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/ASTConsumer.h (original)
+++ cfe/trunk/include/clang/AST/ASTConsumer.h Tue Feb 5 18:46:58 2008
@@ -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 @@
/// 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 @@
/// 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() {
More information about the cfe-commits
mailing list