forked from OSchip/llvm-project
rename tok::annot_qualtypename -> tok::annot_typename, which is both
shorter and more accurate. The type name might not be qualified. llvm-svn: 61788
This commit is contained in:
parent
913e797257
commit
a8a3f73a47
|
@ -397,7 +397,7 @@ OBJC2_AT_KEYWORD(dynamic)
|
|||
// bycopy/byref/in/inout/oneway/out?
|
||||
|
||||
ANNOTATION(cxxscope) // annotation for a C++ scope spec, e.g. "::foo::bar::"
|
||||
ANNOTATION(qualtypename) // annotation for a C typedef name, a C++ (possibly
|
||||
ANNOTATION(typename) // annotation for a C typedef name, a C++ (possibly
|
||||
// qualified) typename, e.g. "foo::MyClass", or
|
||||
// template-id that names a type ("std::vector<int>")
|
||||
ANNOTATION(template_id) // annotation for a C++ template-id that names a
|
||||
|
|
|
@ -78,7 +78,7 @@ public:
|
|||
bool isNot(tok::TokenKind K) const { return Kind != (unsigned) K; }
|
||||
|
||||
bool isAnnotationToken() const {
|
||||
return is(tok::annot_qualtypename) ||
|
||||
return is(tok::annot_typename) ||
|
||||
is(tok::annot_cxxscope) ||
|
||||
is(tok::annot_template_id);
|
||||
}
|
||||
|
|
|
@ -728,7 +728,7 @@ bool Parser::MaybeParseTypeSpecifier(DeclSpec &DS, int& isInvalid,
|
|||
return false;
|
||||
|
||||
// simple-type-specifier:
|
||||
case tok::annot_qualtypename: {
|
||||
case tok::annot_typename: {
|
||||
isInvalid = DS.SetTypeSpecType(DeclSpec::TST_typedef, Loc, PrevSpec,
|
||||
Tok.getAnnotationValue());
|
||||
DS.SetRangeEnd(Tok.getAnnotationEndLoc());
|
||||
|
@ -1255,7 +1255,7 @@ bool Parser::isTypeSpecifierQualifier() {
|
|||
case tok::kw_restrict:
|
||||
|
||||
// typedef-name
|
||||
case tok::annot_qualtypename:
|
||||
case tok::annot_typename:
|
||||
return true;
|
||||
|
||||
// GNU ObjC bizarre protocol extension: <proto1,proto2> with implicit 'id'.
|
||||
|
@ -1340,7 +1340,7 @@ bool Parser::isDeclarationSpecifier() {
|
|||
case tok::kw_explicit:
|
||||
|
||||
// typedef-name
|
||||
case tok::annot_qualtypename:
|
||||
case tok::annot_typename:
|
||||
|
||||
// GNU typeof support.
|
||||
case tok::kw_typeof:
|
||||
|
|
|
@ -498,7 +498,7 @@ Parser::OwningExprResult Parser::ParseCastExpression(bool isUnaryExpression) {
|
|||
case tok::identifier: { // primary-expression: identifier
|
||||
// unqualified-id: identifier
|
||||
// constant: enumeration-constant
|
||||
// Turn a potentially qualified name into a annot_qualtypename or
|
||||
// Turn a potentially qualified name into a annot_typename or
|
||||
// annot_cxxscope if it would be valid. This handles things like x::y, etc.
|
||||
if (getLang().CPlusPlus) {
|
||||
// If TryAnnotateTypeOrScopeToken annotates the token, tail recurse.
|
||||
|
@ -622,7 +622,7 @@ Parser::OwningExprResult Parser::ParseCastExpression(bool isUnaryExpression) {
|
|||
case tok::kw_double:
|
||||
case tok::kw_void:
|
||||
case tok::kw_typeof:
|
||||
case tok::annot_qualtypename: {
|
||||
case tok::annot_typename: {
|
||||
if (!getLang().CPlusPlus) {
|
||||
Diag(Tok, diag::err_expected_expression);
|
||||
return ExprError();
|
||||
|
|
|
@ -449,7 +449,7 @@ void Parser::ParseCXXSimpleTypeSpecifier(DeclSpec &DS) {
|
|||
abort();
|
||||
|
||||
// type-name
|
||||
case tok::annot_qualtypename: {
|
||||
case tok::annot_typename: {
|
||||
DS.SetTypeSpecType(DeclSpec::TST_typedef, Loc, PrevSpec,
|
||||
Tok.getAnnotationValue());
|
||||
break;
|
||||
|
@ -496,7 +496,7 @@ void Parser::ParseCXXSimpleTypeSpecifier(DeclSpec &DS) {
|
|||
DS.Finish(Diags, PP.getSourceManager(), getLang());
|
||||
return;
|
||||
}
|
||||
if (Tok.is(tok::annot_qualtypename))
|
||||
if (Tok.is(tok::annot_typename))
|
||||
DS.SetRangeEnd(Tok.getAnnotationEndLoc());
|
||||
else
|
||||
DS.SetRangeEnd(Tok.getLocation());
|
||||
|
|
|
@ -178,7 +178,7 @@ Parser::ParseTemplateParameter(unsigned Depth, unsigned Position) {
|
|||
if(Tok.is(tok::kw_class) ||
|
||||
(Tok.is(tok::kw_typename) &&
|
||||
// FIXME: Next token has not been annotated!
|
||||
NextToken().isNot(tok::annot_qualtypename))) {
|
||||
NextToken().isNot(tok::annot_typename))) {
|
||||
return ParseTypeParameter(Depth, Position);
|
||||
}
|
||||
|
||||
|
|
|
@ -654,7 +654,7 @@ Parser::TPResult Parser::isCXXDeclarationSpecifier() {
|
|||
case tok::kw_float:
|
||||
case tok::kw_double:
|
||||
case tok::kw_void:
|
||||
case tok::annot_qualtypename:
|
||||
case tok::annot_typename:
|
||||
if (NextToken().is(tok::l_paren))
|
||||
return TPResult::Ambiguous();
|
||||
|
||||
|
|
|
@ -761,7 +761,7 @@ bool Parser::TryAnnotateTypeOrScopeToken() {
|
|||
CurScope, &SS)) {
|
||||
// This is a typename. Replace the current token in-place with an
|
||||
// annotation type token.
|
||||
Tok.setKind(tok::annot_qualtypename);
|
||||
Tok.setKind(tok::annot_typename);
|
||||
Tok.setAnnotationValue(Ty);
|
||||
Tok.setAnnotationEndLoc(Tok.getLocation());
|
||||
if (SS.isNotEmpty()) // it was a C++ qualified type name.
|
||||
|
|
Loading…
Reference in New Issue