summaryrefslogtreecommitdiffstats
path: root/clang/lib/AST
diff options
context:
space:
mode:
Diffstat (limited to 'clang/lib/AST')
-rw-r--r--clang/lib/AST/Expr.cpp14
-rw-r--r--clang/lib/AST/StmtDumper.cpp12
-rw-r--r--clang/lib/AST/StmtPrinter.cpp10
-rw-r--r--clang/lib/AST/StmtSerialization.cpp10
4 files changed, 23 insertions, 23 deletions
diff --git a/clang/lib/AST/Expr.cpp b/clang/lib/AST/Expr.cpp
index 2f12c4e0b4b..8cf3b37e85d 100644
--- a/clang/lib/AST/Expr.cpp
+++ b/clang/lib/AST/Expr.cpp
@@ -439,9 +439,9 @@ Expr::isLvalueResult Expr::isLvalue(ASTContext &Ctx) const {
return LV_Valid;
case ObjCPropertyRefExprClass: // FIXME: check if read-only property.
return LV_Valid;
- case PreDefinedExprClass:
- return (cast<PreDefinedExpr>(this)->getIdentType()
- == PreDefinedExpr::CXXThis
+ case PredefinedExprClass:
+ return (cast<PredefinedExpr>(this)->getIdentType()
+ == PredefinedExpr::CXXThis
? LV_InvalidExpression : LV_Valid);
case CXXDefaultArgExprClass:
return cast<CXXDefaultArgExpr>(this)->getExpr()->isLvalue(Ctx);
@@ -510,7 +510,7 @@ bool Expr::hasGlobalStorage() const {
}
case ArraySubscriptExprClass:
return cast<ArraySubscriptExpr>(this)->getBase()->hasGlobalStorage();
- case PreDefinedExprClass:
+ case PredefinedExprClass:
return true;
case CXXDefaultArgExprClass:
return cast<CXXDefaultArgExpr>(this)->getExpr()->hasGlobalStorage();
@@ -1263,9 +1263,9 @@ Stmt::child_iterator ObjCPropertyRefExpr::child_end() { return &Base+1; }
Stmt::child_iterator ObjCSuperRefExpr::child_begin() { return child_iterator();}
Stmt::child_iterator ObjCSuperRefExpr::child_end() { return child_iterator(); }
-// PreDefinedExpr
-Stmt::child_iterator PreDefinedExpr::child_begin() { return child_iterator(); }
-Stmt::child_iterator PreDefinedExpr::child_end() { return child_iterator(); }
+// PredefinedExpr
+Stmt::child_iterator PredefinedExpr::child_begin() { return child_iterator(); }
+Stmt::child_iterator PredefinedExpr::child_end() { return child_iterator(); }
// IntegerLiteral
Stmt::child_iterator IntegerLiteral::child_begin() { return child_iterator(); }
diff --git a/clang/lib/AST/StmtDumper.cpp b/clang/lib/AST/StmtDumper.cpp
index a710e233af7..6d0569ecd5c 100644
--- a/clang/lib/AST/StmtDumper.cpp
+++ b/clang/lib/AST/StmtDumper.cpp
@@ -116,7 +116,7 @@ namespace {
// Exprs
void VisitExpr(Expr *Node);
void VisitDeclRefExpr(DeclRefExpr *Node);
- void VisitPreDefinedExpr(PreDefinedExpr *Node);
+ void VisitPredefinedExpr(PredefinedExpr *Node);
void VisitCharacterLiteral(CharacterLiteral *Node);
void VisitIntegerLiteral(IntegerLiteral *Node);
void VisitFloatingLiteral(FloatingLiteral *Node);
@@ -308,14 +308,14 @@ void StmtDumper::VisitObjCIvarRefExpr(ObjCIvarRefExpr *Node) {
fprintf(F, " isFreeIvar");
}
-void StmtDumper::VisitPreDefinedExpr(PreDefinedExpr *Node) {
+void StmtDumper::VisitPredefinedExpr(PredefinedExpr *Node) {
DumpExpr(Node);
switch (Node->getIdentType()) {
default: assert(0 && "unknown case");
- case PreDefinedExpr::Func: fprintf(F, " __func__"); break;
- case PreDefinedExpr::Function: fprintf(F, " __FUNCTION__"); break;
- case PreDefinedExpr::PrettyFunction: fprintf(F, " __PRETTY_FUNCTION__");break;
- case PreDefinedExpr::ObjCSuper: fprintf(F, "super"); break;
+ case PredefinedExpr::Func: fprintf(F, " __func__"); break;
+ case PredefinedExpr::Function: fprintf(F, " __FUNCTION__"); break;
+ case PredefinedExpr::PrettyFunction: fprintf(F, " __PRETTY_FUNCTION__");break;
+ case PredefinedExpr::ObjCSuper: fprintf(F, "super"); break;
}
}
diff --git a/clang/lib/AST/StmtPrinter.cpp b/clang/lib/AST/StmtPrinter.cpp
index 0984ca068b8..a9818f8fcd8 100644
--- a/clang/lib/AST/StmtPrinter.cpp
+++ b/clang/lib/AST/StmtPrinter.cpp
@@ -496,20 +496,20 @@ void StmtPrinter::VisitObjCPropertyRefExpr(ObjCPropertyRefExpr *Node) {
// FIXME: OS << Node->getDecl()->getName();
}
-void StmtPrinter::VisitPreDefinedExpr(PreDefinedExpr *Node) {
+void StmtPrinter::VisitPredefinedExpr(PredefinedExpr *Node) {
switch (Node->getIdentType()) {
default:
assert(0 && "unknown case");
- case PreDefinedExpr::Func:
+ case PredefinedExpr::Func:
OS << "__func__";
break;
- case PreDefinedExpr::Function:
+ case PredefinedExpr::Function:
OS << "__FUNCTION__";
break;
- case PreDefinedExpr::PrettyFunction:
+ case PredefinedExpr::PrettyFunction:
OS << "__PRETTY_FUNCTION__";
break;
- case PreDefinedExpr::ObjCSuper:
+ case PredefinedExpr::ObjCSuper:
OS << "super";
break;
}
diff --git a/clang/lib/AST/StmtSerialization.cpp b/clang/lib/AST/StmtSerialization.cpp
index 03091fe51fb..cc26b278c3c 100644
--- a/clang/lib/AST/StmtSerialization.cpp
+++ b/clang/lib/AST/StmtSerialization.cpp
@@ -130,8 +130,8 @@ Stmt* Stmt::Create(Deserializer& D, ASTContext& C) {
case ParenExprClass:
return ParenExpr::CreateImpl(D, C);
- case PreDefinedExprClass:
- return PreDefinedExpr::CreateImpl(D, C);
+ case PredefinedExprClass:
+ return PredefinedExpr::CreateImpl(D, C);
case ReturnStmtClass:
return ReturnStmt::CreateImpl(D, C);
@@ -741,17 +741,17 @@ ParenExpr* ParenExpr::CreateImpl(Deserializer& D, ASTContext& C) {
return new ParenExpr(L,R,val);
}
-void PreDefinedExpr::EmitImpl(Serializer& S) const {
+void PredefinedExpr::EmitImpl(Serializer& S) const {
S.Emit(Loc);
S.EmitInt(getIdentType());
S.Emit(getType());
}
-PreDefinedExpr* PreDefinedExpr::CreateImpl(Deserializer& D, ASTContext& C) {
+PredefinedExpr* PredefinedExpr::CreateImpl(Deserializer& D, ASTContext& C) {
SourceLocation Loc = SourceLocation::ReadVal(D);
IdentType it = static_cast<IdentType>(D.ReadInt());
QualType Q = QualType::ReadVal(D);
- return new PreDefinedExpr(Loc,Q,it);
+ return new PredefinedExpr(Loc,Q,it);
}
void ReturnStmt::EmitImpl(Serializer& S) const {
OpenPOWER on IntegriCloud