[cfe-commits] r50105 - in /cfe/trunk: include/clang/AST/Decl.h lib/AST/Decl.cpp lib/AST/DeclSerialization.cpp lib/Sema/Sema.h lib/Sema/SemaDecl.cpp
Chris Lattner
sabre at nondot.org
Tue Apr 22 11:39:58 PDT 2008
Author: lattner
Date: Tue Apr 22 13:39:57 2008
New Revision: 50105
URL: http://llvm.org/viewvc/llvm-project?rev=50105&view=rev
Log:
"This patch renames
DeclContext *CtxDecl -> DeclContext *DeclCtx
DeclContext *CD -> DeclContext *DC
It makes the code more consistent."
Patch by Zhongxing Xu!
Modified:
cfe/trunk/include/clang/AST/Decl.h
cfe/trunk/lib/AST/Decl.cpp
cfe/trunk/lib/AST/DeclSerialization.cpp
cfe/trunk/lib/Sema/Sema.h
cfe/trunk/lib/Sema/SemaDecl.cpp
Modified: cfe/trunk/include/clang/AST/Decl.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/Decl.h?rev=50105&r1=50104&r2=50105&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/Decl.h (original)
+++ cfe/trunk/include/clang/AST/Decl.h Tue Apr 22 13:39:57 2008
@@ -82,15 +82,15 @@
///
ScopedDecl *Next;
- DeclContext *CtxDecl;
+ DeclContext *DeclCtx;
protected:
- ScopedDecl(Kind DK, DeclContext *CD, SourceLocation L,
+ ScopedDecl(Kind DK, DeclContext *DC, SourceLocation L,
IdentifierInfo *Id, ScopedDecl *PrevDecl)
- : NamedDecl(DK, L, Id), NextDeclarator(PrevDecl), Next(0), CtxDecl(CD) {}
+ : NamedDecl(DK, L, Id), NextDeclarator(PrevDecl), Next(0), DeclCtx(DC) {}
public:
- DeclContext *getDeclContext() const { return CtxDecl; }
+ DeclContext *getDeclContext() const { return DeclCtx; }
ScopedDecl *getNext() const { return Next; }
void setNext(ScopedDecl *N) { Next = N; }
@@ -134,9 +134,9 @@
QualType DeclType;
protected:
- ValueDecl(Kind DK, DeclContext *CD, SourceLocation L,
+ ValueDecl(Kind DK, DeclContext *DC, SourceLocation L,
IdentifierInfo *Id, QualType T, ScopedDecl *PrevDecl)
- : ScopedDecl(DK, CD, L, Id, PrevDecl), DeclType(T) {}
+ : ScopedDecl(DK, DC, L, Id, PrevDecl), DeclType(T) {}
public:
QualType getType() const { return DeclType; }
void setType(QualType newType) { DeclType = newType; }
@@ -166,11 +166,11 @@
friend class StmtIteratorBase;
protected:
- VarDecl(Kind DK, DeclContext *CD, SourceLocation L, IdentifierInfo *Id, QualType T,
+ VarDecl(Kind DK, DeclContext *DC, SourceLocation L, IdentifierInfo *Id, QualType T,
StorageClass SC, ScopedDecl *PrevDecl)
- : ValueDecl(DK, CD, L, Id, T, PrevDecl), Init(0) { SClass = SC; }
+ : ValueDecl(DK, DC, L, Id, T, PrevDecl), Init(0) { SClass = SC; }
public:
- static VarDecl *Create(ASTContext &C, DeclContext *CD,
+ static VarDecl *Create(ASTContext &C, DeclContext *DC,
SourceLocation L, IdentifierInfo *Id,
QualType T, StorageClass S, ScopedDecl *PrevDecl);
@@ -252,14 +252,14 @@
/// Default argument, if any. [C++ Only]
Expr *DefaultArg;
- ParmVarDecl(DeclContext *CD, SourceLocation L,
+ ParmVarDecl(DeclContext *DC, SourceLocation L,
IdentifierInfo *Id, QualType T, StorageClass S,
Expr *DefArg, ScopedDecl *PrevDecl)
- : VarDecl(ParmVar, CD, L, Id, T, S, PrevDecl),
+ : VarDecl(ParmVar, DC, L, Id, T, S, PrevDecl),
objcDeclQualifier(OBJC_TQ_None), DefaultArg(DefArg) {}
public:
- static ParmVarDecl *Create(ASTContext &C, DeclContext *CD,
+ static ParmVarDecl *Create(ASTContext &C, DeclContext *DC,
SourceLocation L,IdentifierInfo *Id,
QualType T, StorageClass S, Expr *DefArg,
ScopedDecl *PrevDecl);
@@ -333,17 +333,17 @@
/// int f(int x, int y) { return x + y; }
FunctionDecl *PreviousDeclaration;
- FunctionDecl(DeclContext *CD, SourceLocation L,
+ FunctionDecl(DeclContext *DC, SourceLocation L,
IdentifierInfo *Id, QualType T,
StorageClass S, bool isInline, ScopedDecl *PrevDecl)
- : ValueDecl(Function, CD, L, Id, T, PrevDecl),
+ : ValueDecl(Function, DC, L, Id, T, PrevDecl),
DeclContext(Function),
ParamInfo(0), Body(0), DeclChain(0), SClass(S),
IsInline(isInline), IsImplicit(0), PreviousDeclaration(0) {}
virtual ~FunctionDecl();
public:
- static FunctionDecl *Create(ASTContext &C, DeclContext *CD, SourceLocation L,
+ static FunctionDecl *Create(ASTContext &C, DeclContext *DC, SourceLocation L,
IdentifierInfo *Id, QualType T,
StorageClass S = None, bool isInline = false,
ScopedDecl *PrevDecl = 0);
@@ -475,14 +475,14 @@
Expr *Init; // an integer constant expression
llvm::APSInt Val; // The value.
protected:
- EnumConstantDecl(DeclContext *CD, SourceLocation L,
+ EnumConstantDecl(DeclContext *DC, SourceLocation L,
IdentifierInfo *Id, QualType T, Expr *E,
const llvm::APSInt &V, ScopedDecl *PrevDecl)
- : ValueDecl(EnumConstant, CD, L, Id, T, PrevDecl), Init(E), Val(V) {}
+ : ValueDecl(EnumConstant, DC, L, Id, T, PrevDecl), Init(E), Val(V) {}
~EnumConstantDecl() {}
public:
- static EnumConstantDecl *Create(ASTContext &C, EnumDecl *CD,
+ static EnumConstantDecl *Create(ASTContext &C, EnumDecl *DC,
SourceLocation L, IdentifierInfo *Id,
QualType T, Expr *E,
const llvm::APSInt &V, ScopedDecl *PrevDecl);
@@ -521,9 +521,9 @@
Type *TypeForDecl;
friend class ASTContext;
protected:
- TypeDecl(Kind DK, DeclContext *CD, SourceLocation L,
+ TypeDecl(Kind DK, DeclContext *DC, SourceLocation L,
IdentifierInfo *Id, ScopedDecl *PrevDecl)
- : ScopedDecl(DK, CD, L, Id, PrevDecl), TypeForDecl(0) {}
+ : ScopedDecl(DK, DC, L, Id, PrevDecl), TypeForDecl(0) {}
public:
// Implement isa/cast/dyncast/etc.
static bool classof(const Decl *D) {
@@ -536,13 +536,13 @@
class TypedefDecl : public TypeDecl {
/// UnderlyingType - This is the type the typedef is set to.
QualType UnderlyingType;
- TypedefDecl(DeclContext *CD, SourceLocation L,
+ TypedefDecl(DeclContext *DC, SourceLocation L,
IdentifierInfo *Id, QualType T, ScopedDecl *PD)
- : TypeDecl(Typedef, CD, L, Id, PD), UnderlyingType(T) {}
+ : TypeDecl(Typedef, DC, L, Id, PD), UnderlyingType(T) {}
~TypedefDecl() {}
public:
- static TypedefDecl *Create(ASTContext &C, DeclContext *CD,
+ static TypedefDecl *Create(ASTContext &C, DeclContext *DC,
SourceLocation L,IdentifierInfo *Id,
QualType T, ScopedDecl *PD);
@@ -571,9 +571,9 @@
/// it is a declaration ("struct foo;").
bool IsDefinition : 1;
protected:
- TagDecl(Kind DK, DeclContext *CD, SourceLocation L,
+ TagDecl(Kind DK, DeclContext *DC, SourceLocation L,
IdentifierInfo *Id, ScopedDecl *PrevDecl)
- : TypeDecl(DK, CD, L, Id, PrevDecl) {
+ : TypeDecl(DK, DC, L, Id, PrevDecl) {
IsDefinition = false;
}
public:
@@ -614,14 +614,14 @@
/// have a different type than this does.
QualType IntegerType;
- EnumDecl(DeclContext *CD, SourceLocation L,
+ EnumDecl(DeclContext *DC, SourceLocation L,
IdentifierInfo *Id, ScopedDecl *PrevDecl)
- : TagDecl(Enum, CD, L, Id, PrevDecl), DeclContext(Enum) {
+ : TagDecl(Enum, DC, L, Id, PrevDecl), DeclContext(Enum) {
ElementList = 0;
IntegerType = QualType();
}
public:
- static EnumDecl *Create(ASTContext &C, DeclContext *CD,
+ static EnumDecl *Create(ASTContext &C, DeclContext *DC,
SourceLocation L, IdentifierInfo *Id,
ScopedDecl *PrevDecl);
@@ -674,8 +674,8 @@
FieldDecl **Members; // Null if not defined.
int NumMembers; // -1 if not defined.
- RecordDecl(Kind DK, DeclContext *CD, SourceLocation L, IdentifierInfo *Id,
- ScopedDecl *PrevDecl) : TagDecl(DK, CD, L, Id, PrevDecl) {
+ RecordDecl(Kind DK, DeclContext *DC, SourceLocation L, IdentifierInfo *Id,
+ ScopedDecl *PrevDecl) : TagDecl(DK, DC, L, Id, PrevDecl) {
HasFlexibleArrayMember = false;
assert(classof(static_cast<Decl*>(this)) && "Invalid Kind!");
Members = 0;
@@ -683,7 +683,7 @@
}
public:
- static RecordDecl *Create(ASTContext &C, Kind DK, DeclContext *CD,
+ static RecordDecl *Create(ASTContext &C, Kind DK, DeclContext *DC,
SourceLocation L, IdentifierInfo *Id,
ScopedDecl *PrevDecl);
Modified: cfe/trunk/lib/AST/Decl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/Decl.cpp?rev=50105&r1=50104&r2=50105&view=diff
==============================================================================
--- cfe/trunk/lib/AST/Decl.cpp (original)
+++ cfe/trunk/lib/AST/Decl.cpp Tue Apr 22 13:39:57 2008
@@ -211,29 +211,29 @@
return new (Mem) TranslationUnitDecl();
}
-VarDecl *VarDecl::Create(ASTContext &C, DeclContext *CD,
+VarDecl *VarDecl::Create(ASTContext &C, DeclContext *DC,
SourceLocation L,
IdentifierInfo *Id, QualType T,
StorageClass S, ScopedDecl *PrevDecl) {
void *Mem = C.getAllocator().Allocate<VarDecl>();
- return new (Mem) VarDecl(Var, CD, L, Id, T, S, PrevDecl);
+ return new (Mem) VarDecl(Var, DC, L, Id, T, S, PrevDecl);
}
-ParmVarDecl *ParmVarDecl::Create(ASTContext &C, DeclContext *CD,
+ParmVarDecl *ParmVarDecl::Create(ASTContext &C, DeclContext *DC,
SourceLocation L, IdentifierInfo *Id,
QualType T, StorageClass S,
Expr *DefArg, ScopedDecl *PrevDecl) {
void *Mem = C.getAllocator().Allocate<ParmVarDecl>();
- return new (Mem) ParmVarDecl(CD, L, Id, T, S, DefArg, PrevDecl);
+ return new (Mem) ParmVarDecl(DC, L, Id, T, S, DefArg, PrevDecl);
}
-FunctionDecl *FunctionDecl::Create(ASTContext &C, DeclContext *CD,
+FunctionDecl *FunctionDecl::Create(ASTContext &C, DeclContext *DC,
SourceLocation L,
IdentifierInfo *Id, QualType T,
StorageClass S, bool isInline,
ScopedDecl *PrevDecl) {
void *Mem = C.getAllocator().Allocate<FunctionDecl>();
- return new (Mem) FunctionDecl(CD, L, Id, T, S, isInline, PrevDecl);
+ return new (Mem) FunctionDecl(DC, L, Id, T, S, isInline, PrevDecl);
}
FieldDecl *FieldDecl::Create(ASTContext &C, SourceLocation L,
@@ -252,26 +252,26 @@
return new (Mem) EnumConstantDecl(CD, L, Id, T, E, V, PrevDecl);
}
-TypedefDecl *TypedefDecl::Create(ASTContext &C, DeclContext *CD,
+TypedefDecl *TypedefDecl::Create(ASTContext &C, DeclContext *DC,
SourceLocation L,
IdentifierInfo *Id, QualType T,
ScopedDecl *PD) {
void *Mem = C.getAllocator().Allocate<TypedefDecl>();
- return new (Mem) TypedefDecl(CD, L, Id, T, PD);
+ return new (Mem) TypedefDecl(DC, L, Id, T, PD);
}
-EnumDecl *EnumDecl::Create(ASTContext &C, DeclContext *CD, SourceLocation L,
+EnumDecl *EnumDecl::Create(ASTContext &C, DeclContext *DC, SourceLocation L,
IdentifierInfo *Id,
ScopedDecl *PrevDecl) {
void *Mem = C.getAllocator().Allocate<EnumDecl>();
- return new (Mem) EnumDecl(CD, L, Id, PrevDecl);
+ return new (Mem) EnumDecl(DC, L, Id, PrevDecl);
}
-RecordDecl *RecordDecl::Create(ASTContext &C, Kind DK, DeclContext *CD,
+RecordDecl *RecordDecl::Create(ASTContext &C, Kind DK, DeclContext *DC,
SourceLocation L, IdentifierInfo *Id,
ScopedDecl *PrevDecl) {
void *Mem = C.getAllocator().Allocate<RecordDecl>();
- return new (Mem) RecordDecl(DK, CD, L, Id, PrevDecl);
+ return new (Mem) RecordDecl(DK, DC, L, Id, PrevDecl);
}
FileScopeAsmDecl *FileScopeAsmDecl::Create(ASTContext &C,
Modified: cfe/trunk/lib/AST/DeclSerialization.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/DeclSerialization.cpp?rev=50105&r1=50104&r2=50105&view=diff
==============================================================================
--- cfe/trunk/lib/AST/DeclSerialization.cpp (original)
+++ cfe/trunk/lib/AST/DeclSerialization.cpp Tue Apr 22 13:39:57 2008
@@ -115,7 +115,7 @@
D.ReadPtr(Next); // From ScopedDecl.
Decl *TmpD;
D.ReadPtr(TmpD); // From ScopedDecl.
- CtxDecl = cast_or_null<DeclContext>(TmpD);
+ DeclCtx = cast_or_null<DeclContext>(TmpD);
}
//===------------------------------------------------------------===//
Modified: cfe/trunk/lib/Sema/Sema.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/Sema.h?rev=50105&r1=50104&r2=50105&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/Sema.h (original)
+++ cfe/trunk/lib/Sema/Sema.h Tue Apr 22 13:39:57 2008
@@ -258,7 +258,7 @@
DeclTy **Elements, unsigned NumElements);
private:
/// Set the current declaration context until it gets popped.
- void PushDeclContext(DeclContext *CD);
+ void PushDeclContext(DeclContext *DC);
void PopDeclContext();
/// Add this decl to the scope shadowed decl chains.
Modified: cfe/trunk/lib/Sema/SemaDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=50105&r1=50104&r2=50105&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDecl.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDecl.cpp Tue Apr 22 13:39:57 2008
@@ -42,11 +42,11 @@
return 0;
}
-void Sema::PushDeclContext(DeclContext *CD) {
- assert( ( (CD->isFunctionOrMethod() && isa<TranslationUnitDecl>(CurContext))
- || CD->getParent() == CurContext ) &&
+void Sema::PushDeclContext(DeclContext *DC) {
+ assert( ( (DC->isFunctionOrMethod() && isa<TranslationUnitDecl>(CurContext))
+ || DC->getParent() == CurContext ) &&
"The next DeclContext should be directly contained in the current one.");
- CurContext = CD;
+ CurContext = DC;
}
void Sema::PopDeclContext() {
More information about the cfe-commits
mailing list