Rename statement actions (from Parse-prefix to ActOn-prefix).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@42000 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Sema/Sema.h b/Sema/Sema.h
index 900a913..a6ce9cf 100644
--- a/Sema/Sema.h
+++ b/Sema/Sema.h
@@ -203,47 +203,47 @@
//===--------------------------------------------------------------------===//
// Statement Parsing Callbacks: SemaStmt.cpp.
public:
- virtual StmtResult ParseExprStmt(ExprTy *Expr);
+ virtual StmtResult ActOnExprStmt(ExprTy *Expr);
- virtual StmtResult ParseNullStmt(SourceLocation SemiLoc);
- virtual StmtResult ParseCompoundStmt(SourceLocation L, SourceLocation R,
+ virtual StmtResult ActOnNullStmt(SourceLocation SemiLoc);
+ virtual StmtResult ActOnCompoundStmt(SourceLocation L, SourceLocation R,
StmtTy **Elts, unsigned NumElts,
bool isStmtExpr);
- virtual StmtResult ParseDeclStmt(DeclTy *Decl);
- virtual StmtResult ParseCaseStmt(SourceLocation CaseLoc, ExprTy *LHSVal,
+ virtual StmtResult ActOnDeclStmt(DeclTy *Decl);
+ virtual StmtResult ActOnCaseStmt(SourceLocation CaseLoc, ExprTy *LHSVal,
SourceLocation DotDotDotLoc, ExprTy *RHSVal,
SourceLocation ColonLoc, StmtTy *SubStmt);
- virtual StmtResult ParseDefaultStmt(SourceLocation DefaultLoc,
+ virtual StmtResult ActOnDefaultStmt(SourceLocation DefaultLoc,
SourceLocation ColonLoc, StmtTy *SubStmt,
Scope *CurScope);
- virtual StmtResult ParseLabelStmt(SourceLocation IdentLoc, IdentifierInfo *II,
+ virtual StmtResult ActOnLabelStmt(SourceLocation IdentLoc, IdentifierInfo *II,
SourceLocation ColonLoc, StmtTy *SubStmt);
- virtual StmtResult ParseIfStmt(SourceLocation IfLoc, ExprTy *CondVal,
+ virtual StmtResult ActOnIfStmt(SourceLocation IfLoc, ExprTy *CondVal,
StmtTy *ThenVal, SourceLocation ElseLoc,
StmtTy *ElseVal);
- virtual StmtResult StartSwitchStmt(ExprTy *Cond);
- virtual StmtResult FinishSwitchStmt(SourceLocation SwitchLoc, StmtTy *Switch,
+ virtual StmtResult ActOnStartOfSwitchStmt(ExprTy *Cond);
+ virtual StmtResult ActOnFinishSwitchStmt(SourceLocation SwitchLoc, StmtTy *Switch,
ExprTy *Body);
- virtual StmtResult ParseWhileStmt(SourceLocation WhileLoc, ExprTy *Cond,
+ virtual StmtResult ActOnWhileStmt(SourceLocation WhileLoc, ExprTy *Cond,
StmtTy *Body);
- virtual StmtResult ParseDoStmt(SourceLocation DoLoc, StmtTy *Body,
+ virtual StmtResult ActOnDoStmt(SourceLocation DoLoc, StmtTy *Body,
SourceLocation WhileLoc, ExprTy *Cond);
- virtual StmtResult ParseForStmt(SourceLocation ForLoc,
+ virtual StmtResult ActOnForStmt(SourceLocation ForLoc,
SourceLocation LParenLoc,
StmtTy *First, ExprTy *Second, ExprTy *Third,
SourceLocation RParenLoc, StmtTy *Body);
- virtual StmtResult ParseGotoStmt(SourceLocation GotoLoc,
+ virtual StmtResult ActOnGotoStmt(SourceLocation GotoLoc,
SourceLocation LabelLoc,
IdentifierInfo *LabelII);
- virtual StmtResult ParseIndirectGotoStmt(SourceLocation GotoLoc,
+ virtual StmtResult ActOnIndirectGotoStmt(SourceLocation GotoLoc,
SourceLocation StarLoc,
ExprTy *DestExp);
- virtual StmtResult ParseContinueStmt(SourceLocation ContinueLoc,
+ virtual StmtResult ActOnContinueStmt(SourceLocation ContinueLoc,
Scope *CurScope);
- virtual StmtResult ParseBreakStmt(SourceLocation GotoLoc, Scope *CurScope);
+ virtual StmtResult ActOnBreakStmt(SourceLocation GotoLoc, Scope *CurScope);
- virtual StmtResult ParseReturnStmt(SourceLocation ReturnLoc,
+ virtual StmtResult ActOnReturnStmt(SourceLocation ReturnLoc,
ExprTy *RetValExp);
//===--------------------------------------------------------------------===//
@@ -309,39 +309,39 @@
SourceLocation ColonLoc,
ExprTy *Cond, ExprTy *LHS, ExprTy *RHS);
- /// ParseAddrLabel - Parse the GNU address of label extension: "&&foo".
- virtual ExprResult ParseAddrLabel(SourceLocation OpLoc, SourceLocation LabLoc,
+ /// ActOnAddrLabel - Parse the GNU address of label extension: "&&foo".
+ virtual ExprResult ActOnAddrLabel(SourceLocation OpLoc, SourceLocation LabLoc,
IdentifierInfo *LabelII);
- virtual ExprResult ParseStmtExpr(SourceLocation LPLoc, StmtTy *SubStmt,
+ virtual ExprResult ActOnStmtExpr(SourceLocation LPLoc, StmtTy *SubStmt,
SourceLocation RPLoc); // "({..})"
/// __builtin_offsetof(type, a.b[123][456].c)
- virtual ExprResult ParseBuiltinOffsetOf(SourceLocation BuiltinLoc,
+ virtual ExprResult ActOnBuiltinOffsetOf(SourceLocation BuiltinLoc,
SourceLocation TypeLoc, TypeTy *Arg1,
OffsetOfComponent *CompPtr,
unsigned NumComponents,
SourceLocation RParenLoc);
// __builtin_types_compatible_p(type1, type2)
- virtual ExprResult ParseTypesCompatibleExpr(SourceLocation BuiltinLoc,
+ virtual ExprResult ActOnTypesCompatibleExpr(SourceLocation BuiltinLoc,
TypeTy *arg1, TypeTy *arg2,
SourceLocation RPLoc);
// __builtin_choose_expr(constExpr, expr1, expr2)
- virtual ExprResult ParseChooseExpr(SourceLocation BuiltinLoc,
+ virtual ExprResult ActOnChooseExpr(SourceLocation BuiltinLoc,
ExprTy *cond, ExprTy *expr1, ExprTy *expr2,
SourceLocation RPLoc);
- /// ParseCXXCasts - Parse {dynamic,static,reinterpret,const}_cast's.
- virtual ExprResult ParseCXXCasts(SourceLocation OpLoc, tok::TokenKind Kind,
+ /// ActOnCXXCasts - Parse {dynamic,static,reinterpret,const}_cast's.
+ virtual ExprResult ActOnCXXCasts(SourceLocation OpLoc, tok::TokenKind Kind,
SourceLocation LAngleBracketLoc, TypeTy *Ty,
SourceLocation RAngleBracketLoc,
SourceLocation LParenLoc, ExprTy *E,
SourceLocation RParenLoc);
- /// ParseCXXBoolLiteral - Parse {true,false} literals.
- virtual ExprResult ParseCXXBoolLiteral(SourceLocation OpLoc,
+ /// ActOnCXXBoolLiteral - Parse {true,false} literals.
+ virtual ExprResult ActOnCXXBoolLiteral(SourceLocation OpLoc,
tok::TokenKind Kind);
// ParseObjCStringLiteral - Parse Objective-C string literals.
@@ -406,7 +406,7 @@
AssignmentCheckResult CheckAssignmentConstraints(QualType lhs, QualType rhs);
// CheckSingleAssignmentConstraints - Currently used by ActOnCallExpr,
- // CheckAssignmentOperands, and ParseReturnStmt. Prior to type checking,
+ // CheckAssignmentOperands, and ActOnReturnStmt. Prior to type checking,
// this routine performs the default function/array converions.
AssignmentCheckResult CheckSingleAssignmentConstraints(QualType lhs,
Expr *&rExpr);
diff --git a/Sema/SemaExpr.cpp b/Sema/SemaExpr.cpp
index b08508b..b479c0a 100644
--- a/Sema/SemaExpr.cpp
+++ b/Sema/SemaExpr.cpp
@@ -1685,8 +1685,8 @@
return new UnaryOperator(Input, Opc, resultType, OpLoc);
}
-/// ParseAddrLabel - Parse the GNU address of label extension: "&&foo".
-Sema::ExprResult Sema::ParseAddrLabel(SourceLocation OpLoc,
+/// ActOnAddrLabel - Parse the GNU address of label extension: "&&foo".
+Sema::ExprResult Sema::ActOnAddrLabel(SourceLocation OpLoc,
SourceLocation LabLoc,
IdentifierInfo *LabelII) {
// Look up the record for this label identifier.
@@ -1701,7 +1701,7 @@
Context.getPointerType(Context.VoidTy));
}
-Sema::ExprResult Sema::ParseStmtExpr(SourceLocation LPLoc, StmtTy *substmt,
+Sema::ExprResult Sema::ActOnStmtExpr(SourceLocation LPLoc, StmtTy *substmt,
SourceLocation RPLoc) { // "({..})"
Stmt *SubStmt = static_cast<Stmt*>(substmt);
assert(SubStmt && isa<CompoundStmt>(SubStmt) && "Invalid action invocation!");
@@ -1725,7 +1725,7 @@
return new StmtExpr(Compound, Ty, LPLoc, RPLoc);
}
-Sema::ExprResult Sema::ParseBuiltinOffsetOf(SourceLocation BuiltinLoc,
+Sema::ExprResult Sema::ActOnBuiltinOffsetOf(SourceLocation BuiltinLoc,
SourceLocation TypeLoc,
TypeTy *argty,
OffsetOfComponent *CompPtr,
@@ -1799,7 +1799,7 @@
}
-Sema::ExprResult Sema::ParseTypesCompatibleExpr(SourceLocation BuiltinLoc,
+Sema::ExprResult Sema::ActOnTypesCompatibleExpr(SourceLocation BuiltinLoc,
TypeTy *arg1, TypeTy *arg2,
SourceLocation RPLoc) {
QualType argT1 = QualType::getFromOpaquePtr(arg1);
@@ -1810,7 +1810,7 @@
return new TypesCompatibleExpr(Context.IntTy, BuiltinLoc, argT1, argT2,RPLoc);
}
-Sema::ExprResult Sema::ParseChooseExpr(SourceLocation BuiltinLoc, ExprTy *cond,
+Sema::ExprResult Sema::ActOnChooseExpr(SourceLocation BuiltinLoc, ExprTy *cond,
ExprTy *expr1, ExprTy *expr2,
SourceLocation RPLoc) {
Expr *CondExpr = static_cast<Expr*>(cond);
diff --git a/Sema/SemaExprCXX.cpp b/Sema/SemaExprCXX.cpp
index be1d551..0e3c968 100644
--- a/Sema/SemaExprCXX.cpp
+++ b/Sema/SemaExprCXX.cpp
@@ -16,9 +16,9 @@
#include "clang/AST/ASTContext.h"
using namespace clang;
-/// ParseCXXCasts - Parse {dynamic,static,reinterpret,const}_cast's.
+/// ActOnCXXCasts - Parse {dynamic,static,reinterpret,const}_cast's.
Action::ExprResult
-Sema::ParseCXXCasts(SourceLocation OpLoc, tok::TokenKind Kind,
+Sema::ActOnCXXCasts(SourceLocation OpLoc, tok::TokenKind Kind,
SourceLocation LAngleBracketLoc, TypeTy *Ty,
SourceLocation RAngleBracketLoc,
SourceLocation LParenLoc, ExprTy *E,
@@ -36,9 +36,9 @@
return new CXXCastExpr(Op, QualType::getFromOpaquePtr(Ty), (Expr*)E, OpLoc);
}
-/// ParseCXXBoolLiteral - Parse {true,false} literals.
+/// ActOnCXXBoolLiteral - Parse {true,false} literals.
Action::ExprResult
-Sema::ParseCXXBoolLiteral(SourceLocation OpLoc, tok::TokenKind Kind) {
+Sema::ActOnCXXBoolLiteral(SourceLocation OpLoc, tok::TokenKind Kind) {
assert((Kind != tok::kw_true || Kind != tok::kw_false) &&
"Unknown C++ Boolean value!");
return new CXXBoolLiteralExpr(Kind == tok::kw_true, Context.BoolTy, OpLoc);
diff --git a/Sema/SemaStmt.cpp b/Sema/SemaStmt.cpp
index 7dac601..0522996 100644
--- a/Sema/SemaStmt.cpp
+++ b/Sema/SemaStmt.cpp
@@ -21,28 +21,28 @@
#include "clang/Lex/IdentifierTable.h"
using namespace clang;
-Sema::StmtResult Sema::ParseExprStmt(ExprTy *expr) {
+Sema::StmtResult Sema::ActOnExprStmt(ExprTy *expr) {
Expr *E = static_cast<Expr*>(expr);
- assert(E && "ParseExprStmt(): missing expression");
+ assert(E && "ActOnExprStmt(): missing expression");
return E;
}
-Sema::StmtResult Sema::ParseNullStmt(SourceLocation SemiLoc) {
+Sema::StmtResult Sema::ActOnNullStmt(SourceLocation SemiLoc) {
return new NullStmt(SemiLoc);
}
-Sema::StmtResult Sema::ParseDeclStmt(DeclTy *decl) {
+Sema::StmtResult Sema::ActOnDeclStmt(DeclTy *decl) {
if (decl) {
ScopedDecl *SD = dyn_cast<ScopedDecl>(static_cast<Decl *>(decl));
- assert(SD && "Sema::ParseDeclStmt(): expected ScopedDecl");
+ assert(SD && "Sema::ActOnDeclStmt(): expected ScopedDecl");
return new DeclStmt(SD);
} else
return true; // error
}
Action::StmtResult
-Sema::ParseCompoundStmt(SourceLocation L, SourceLocation R,
+Sema::ActOnCompoundStmt(SourceLocation L, SourceLocation R,
StmtTy **elts, unsigned NumElts, bool isStmtExpr) {
Stmt **Elts = reinterpret_cast<Stmt**>(elts);
// If we're in C89 mode, check that we don't have any decls after stmts. If
@@ -93,7 +93,7 @@
}
Action::StmtResult
-Sema::ParseCaseStmt(SourceLocation CaseLoc, ExprTy *lhsval,
+Sema::ActOnCaseStmt(SourceLocation CaseLoc, ExprTy *lhsval,
SourceLocation DotDotDotLoc, ExprTy *rhsval,
SourceLocation ColonLoc, StmtTy *subStmt) {
Stmt *SubStmt = static_cast<Stmt*>(subStmt);
@@ -126,7 +126,7 @@
}
Action::StmtResult
-Sema::ParseDefaultStmt(SourceLocation DefaultLoc, SourceLocation ColonLoc,
+Sema::ActOnDefaultStmt(SourceLocation DefaultLoc, SourceLocation ColonLoc,
StmtTy *subStmt, Scope *CurScope) {
Stmt *SubStmt = static_cast<Stmt*>(subStmt);
@@ -142,7 +142,7 @@
}
Action::StmtResult
-Sema::ParseLabelStmt(SourceLocation IdentLoc, IdentifierInfo *II,
+Sema::ActOnLabelStmt(SourceLocation IdentLoc, IdentifierInfo *II,
SourceLocation ColonLoc, StmtTy *subStmt) {
Stmt *SubStmt = static_cast<Stmt*>(subStmt);
// Look up the record for this label identifier.
@@ -170,11 +170,11 @@
}
Action::StmtResult
-Sema::ParseIfStmt(SourceLocation IfLoc, ExprTy *CondVal,
+Sema::ActOnIfStmt(SourceLocation IfLoc, ExprTy *CondVal,
StmtTy *ThenVal, SourceLocation ElseLoc,
StmtTy *ElseVal) {
Expr *condExpr = (Expr *)CondVal;
- assert(condExpr && "ParseIfStmt(): missing expression");
+ assert(condExpr && "ActOnIfStmt(): missing expression");
DefaultFunctionArrayConversion(condExpr);
QualType condType = condExpr->getType();
@@ -187,7 +187,7 @@
}
Action::StmtResult
-Sema::StartSwitchStmt(ExprTy *cond) {
+Sema::ActOnStartOfSwitchStmt(ExprTy *cond) {
Expr *Cond = static_cast<Expr*>(cond);
// C99 6.8.4.2p5 - Integer promotions are performed on the controlling expr.
@@ -260,7 +260,7 @@
}
Action::StmtResult
-Sema::FinishSwitchStmt(SourceLocation SwitchLoc, StmtTy *Switch, ExprTy *Body) {
+Sema::ActOnFinishSwitchStmt(SourceLocation SwitchLoc, StmtTy *Switch, ExprTy *Body) {
Stmt *BodyStmt = (Stmt*)Body;
SwitchStmt *SS = SwitchStack.back();
@@ -440,9 +440,9 @@
}
Action::StmtResult
-Sema::ParseWhileStmt(SourceLocation WhileLoc, ExprTy *Cond, StmtTy *Body) {
+Sema::ActOnWhileStmt(SourceLocation WhileLoc, ExprTy *Cond, StmtTy *Body) {
Expr *condExpr = (Expr *)Cond;
- assert(condExpr && "ParseWhileStmt(): missing expression");
+ assert(condExpr && "ActOnWhileStmt(): missing expression");
DefaultFunctionArrayConversion(condExpr);
QualType condType = condExpr->getType();
@@ -455,10 +455,10 @@
}
Action::StmtResult
-Sema::ParseDoStmt(SourceLocation DoLoc, StmtTy *Body,
+Sema::ActOnDoStmt(SourceLocation DoLoc, StmtTy *Body,
SourceLocation WhileLoc, ExprTy *Cond) {
Expr *condExpr = (Expr *)Cond;
- assert(condExpr && "ParseDoStmt(): missing expression");
+ assert(condExpr && "ActOnDoStmt(): missing expression");
DefaultFunctionArrayConversion(condExpr);
QualType condType = condExpr->getType();
@@ -471,7 +471,7 @@
}
Action::StmtResult
-Sema::ParseForStmt(SourceLocation ForLoc, SourceLocation LParenLoc,
+Sema::ActOnForStmt(SourceLocation ForLoc, SourceLocation LParenLoc,
StmtTy *first, ExprTy *second, ExprTy *third,
SourceLocation RParenLoc, StmtTy *body) {
Stmt *First = static_cast<Stmt*>(first);
@@ -505,7 +505,7 @@
Action::StmtResult
-Sema::ParseGotoStmt(SourceLocation GotoLoc, SourceLocation LabelLoc,
+Sema::ActOnGotoStmt(SourceLocation GotoLoc, SourceLocation LabelLoc,
IdentifierInfo *LabelII) {
// Look up the record for this label identifier.
LabelStmt *&LabelDecl = LabelMap[LabelII];
@@ -518,7 +518,7 @@
}
Action::StmtResult
-Sema::ParseIndirectGotoStmt(SourceLocation GotoLoc,SourceLocation StarLoc,
+Sema::ActOnIndirectGotoStmt(SourceLocation GotoLoc,SourceLocation StarLoc,
ExprTy *DestExp) {
// FIXME: Verify that the operand is convertible to void*.
@@ -526,7 +526,7 @@
}
Action::StmtResult
-Sema::ParseContinueStmt(SourceLocation ContinueLoc, Scope *CurScope) {
+Sema::ActOnContinueStmt(SourceLocation ContinueLoc, Scope *CurScope) {
Scope *S = CurScope->getContinueParent();
if (!S) {
// C99 6.8.6.2p1: A break shall appear only in or as a loop body.
@@ -538,7 +538,7 @@
}
Action::StmtResult
-Sema::ParseBreakStmt(SourceLocation BreakLoc, Scope *CurScope) {
+Sema::ActOnBreakStmt(SourceLocation BreakLoc, Scope *CurScope) {
Scope *S = CurScope->getBreakParent();
if (!S) {
// C99 6.8.6.3p1: A break shall appear only in or as a switch/loop body.
@@ -551,7 +551,7 @@
Action::StmtResult
-Sema::ParseReturnStmt(SourceLocation ReturnLoc, ExprTy *rex) {
+Sema::ActOnReturnStmt(SourceLocation ReturnLoc, ExprTy *rex) {
Expr *RetValExp = static_cast<Expr *>(rex);
QualType lhsType = CurFunctionDecl->getResultType();