Start converting Action methods from Parse-prefix to ActOn-prefix.
The previous naming scheme was confusing, since it resulted in both the Parser and Action modules having methods with the same name. In addition, the Action module never does any parsing...
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@41986 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Parse/MinimalAction.cpp b/Parse/MinimalAction.cpp
index 377a2e7..019e652 100644
--- a/Parse/MinimalAction.cpp
+++ b/Parse/MinimalAction.cpp
@@ -39,11 +39,11 @@
return 0;
}
-/// ParseDeclarator - If this is a typedef declarator, we modify the
+/// ActOnDeclarator - If this is a typedef declarator, we modify the
/// IdentifierInfo::FETokenInfo field to keep track of this fact, until S is
/// popped.
Action::DeclTy *
-MinimalAction::ParseDeclarator(Scope *S, Declarator &D, DeclTy *LastInGroup) {
+MinimalAction::ActOnDeclarator(Scope *S, Declarator &D, DeclTy *LastInGroup) {
IdentifierInfo *II = D.getIdentifier();
// If there is no identifier associated with this declarator, bail out.
diff --git a/Parse/ParseDecl.cpp b/Parse/ParseDecl.cpp
index 9dd0d95..7fbab64 100644
--- a/Parse/ParseDecl.cpp
+++ b/Parse/ParseDecl.cpp
@@ -33,7 +33,7 @@
Declarator DeclaratorInfo(DS, Declarator::TypeNameContext);
ParseDeclarator(DeclaratorInfo);
- return Actions.ParseTypeName(CurScope, DeclaratorInfo).Val;
+ return Actions.ActOnTypeName(CurScope, DeclaratorInfo).Val;
}
/// ParseAttributes - Parse a non-empty attributes list.
@@ -265,7 +265,7 @@
// Inform the current actions module that we just parsed this declarator.
// FIXME: pass asm & attributes.
- LastDeclInGroup = Actions.ParseDeclarator(CurScope, D, LastDeclInGroup);
+ LastDeclInGroup = Actions.ActOnDeclarator(CurScope, D, LastDeclInGroup);
// Parse declarator '=' initializer.
ExprResult Init;
@@ -589,7 +589,7 @@
TK = Action::TK_Declaration;
else
TK = Action::TK_Reference;
- Decl = Actions.ParseTag(CurScope, TagType, TK, StartLoc, Name, NameLoc, Attr);
+ Decl = Actions.ActOnTag(CurScope, TagType, TK, StartLoc, Name, NameLoc, Attr);
return false;
}
@@ -686,7 +686,7 @@
DeclaratorInfo.AddAttributes(ParseAttributes());
// Install the declarator into the current TagDecl.
- DeclTy *Field = Actions.ParseField(CurScope, TagDecl, SpecQualLoc,
+ DeclTy *Field = Actions.ActOnField(CurScope, TagDecl, SpecQualLoc,
DeclaratorInfo, BitfieldSize);
FieldDecls.push_back(Field);
@@ -757,7 +757,7 @@
MatchRHSPunctuation(tok::r_brace, LBraceLoc);
- Actions.ProcessFieldDecls(RecordLoc,TagDecl,&FieldDecls[0],FieldDecls.size());
+ Actions.ActOnFields(RecordLoc,TagDecl,&FieldDecls[0],FieldDecls.size());
AttributeList *AttrList = 0;
// If attributes exist after struct contents, parse them.
@@ -830,7 +830,7 @@
}
// Install the enumerator constant into EnumDecl.
- DeclTy *EnumConstDecl = Actions.ParseEnumConstant(CurScope, EnumDecl,
+ DeclTy *EnumConstDecl = Actions.ActOnEnumConstant(CurScope, EnumDecl,
LastEnumConstDecl,
IdentLoc, Ident,
EqualLoc, AssignedVal);
@@ -848,7 +848,7 @@
// Eat the }.
MatchRHSPunctuation(tok::r_brace, LBraceLoc);
- Actions.ParseEnumBody(StartLoc, EnumDecl, &EnumConstantDecls[0],
+ Actions.ActOnEnumBody(StartLoc, EnumDecl, &EnumConstantDecls[0],
EnumConstantDecls.size());
DeclTy *AttrList = 0;
@@ -1322,7 +1322,7 @@
// Inform the actions module about the parameter declarator, so it gets
// added to the current scope.
Action::TypeResult ParamTy =
- Actions.ParseParamDeclaratorType(CurScope, ParmDecl);
+ Actions.ActOnParamDeclaratorType(CurScope, ParmDecl);
// Remember this parsed parameter in ParamInfo.
IdentifierInfo *ParmII = ParmDecl.getIdentifier();
diff --git a/Parse/ParseExpr.cpp b/Parse/ParseExpr.cpp
index f030e5d..95c305e 100644
--- a/Parse/ParseExpr.cpp
+++ b/Parse/ParseExpr.cpp
@@ -200,7 +200,7 @@
// primary-expression: identifier
// Let the actions module handle the identifier.
- ExprResult Res = Actions.ParseIdentifierExpr(CurScope, IdTok.getLocation(),
+ ExprResult Res = Actions.ActOnIdentifierExpr(CurScope, IdTok.getLocation(),
*IdTok.getIdentifierInfo(),
Tok.getKind() == tok::l_paren);
@@ -231,7 +231,7 @@
// primary-expression: identifier
// Let the actions module handle the identifier.
- ExprResult Res = Actions.ParseIdentifierExpr(CurScope, IdTok.getLocation(),
+ ExprResult Res = Actions.ActOnIdentifierExpr(CurScope, IdTok.getLocation(),
*IdTok.getIdentifierInfo(),
Tok.getKind() == tok::l_paren);
@@ -513,7 +513,7 @@
// not.
IdentifierInfo &II = *Tok.getIdentifierInfo();
SourceLocation L = ConsumeToken();
- Res = Actions.ParseIdentifierExpr(CurScope, L, II,
+ Res = Actions.ActOnIdentifierExpr(CurScope, L, II,
Tok.getKind() == tok::l_paren);
// These can be followed by postfix-expr pieces.
return ParsePostfixExpressionSuffix(Res);
diff --git a/Parse/ParseObjc.cpp b/Parse/ParseObjc.cpp
index 791057b..8fa071a 100644
--- a/Parse/ParseObjc.cpp
+++ b/Parse/ParseObjc.cpp
@@ -659,9 +659,9 @@
}
}
if (AllIvarDecls.size()) { // Check for {} - no ivars in braces
- Actions.ProcessFieldDecls(LBraceLoc, interfaceDecl,
- &AllIvarDecls[0], AllIvarDecls.size(),
- &AllVisibilities[0]);
+ Actions.ActOnFields(LBraceLoc, interfaceDecl,
+ &AllIvarDecls[0], AllIvarDecls.size(),
+ &AllVisibilities[0]);
}
MatchRHSPunctuation(tok::r_brace, LBraceLoc);
return;
diff --git a/Parse/Parser.cpp b/Parse/Parser.cpp
index 21ef54d..b9bcc92 100644
--- a/Parse/Parser.cpp
+++ b/Parse/Parser.cpp
@@ -242,7 +242,7 @@
Declarator D(DS, Declarator::FileContext);
D.SetIdentifier(PP.getIdentifierInfo("__builtin_va_list"),SourceLocation());
- Actions.ParseDeclarator(CurScope, D, 0);
+ Actions.ActOnDeclarator(CurScope, D, 0);
}
if (Tok.getKind() == tok::eof &&
@@ -547,7 +547,7 @@
// Ask the actions module to compute the type for this declarator.
Action::TypeResult TR =
- Actions.ParseParamDeclaratorType(CurScope, ParmDeclarator);
+ Actions.ActOnParamDeclaratorType(CurScope, ParmDeclarator);
if (!TR.isInvalid &&
// A missing identifier has already been diagnosed.