commit b31757b68afe06ba442a05775d08fe7aa0f6f889
author Chris Lattner <sabre@nondot.org> Tue Jan 06 05:06:21 2009 +0000
committer Chris Lattner <sabre@nondot.org> Tue Jan 06 05:06:21 2009 +0000
tree 27be8c2aee21b33df61f25ee90f352dfa020ad12
parent c792f1fa9d2c4d16dbccd34e2b57868a75f3d009

rename tok::annot_qualtypename -> tok::annot_typename, which is both
shorter and  more accurate.  The type name might not be qualified.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@61788 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Parse/ParseDecl.cpp

diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index a2fdf41..5e753a2 100644
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -728,7 +728,7 @@
     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 @@
   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 @@
   case tok::kw_explicit:
 
     // typedef-name
-  case tok::annot_qualtypename:
+  case tok::annot_typename:
 
     // GNU typeof support.
   case tok::kw_typeof:

lib/Parse/ParseExpr.cpp

diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp
index 94e686b..230abf8 100644
--- a/lib/Parse/ParseExpr.cpp
+++ b/lib/Parse/ParseExpr.cpp
@@ -498,7 +498,7 @@
   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 @@
   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();

lib/Parse/ParseExprCXX.cpp

diff --git a/lib/Parse/ParseExprCXX.cpp b/lib/Parse/ParseExprCXX.cpp
index 5731f1f..f73bbca 100644
--- a/lib/Parse/ParseExprCXX.cpp
+++ b/lib/Parse/ParseExprCXX.cpp
@@ -449,7 +449,7 @@
     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 @@
     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());

lib/Parse/ParseTemplate.cpp

diff --git a/lib/Parse/ParseTemplate.cpp b/lib/Parse/ParseTemplate.cpp
index f21854d..ed5e224 100644
--- a/lib/Parse/ParseTemplate.cpp
+++ b/lib/Parse/ParseTemplate.cpp
@@ -178,7 +178,7 @@
   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);
   }
   

lib/Parse/ParseTentative.cpp

diff --git a/lib/Parse/ParseTentative.cpp b/lib/Parse/ParseTentative.cpp
index a76c5c6..dd75319 100644
--- a/lib/Parse/ParseTentative.cpp
+++ b/lib/Parse/ParseTentative.cpp
@@ -654,7 +654,7 @@
   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();
 

lib/Parse/Parser.cpp

diff --git a/lib/Parse/Parser.cpp b/lib/Parse/Parser.cpp
index 4984eba..e06d80e 100644
--- a/lib/Parse/Parser.cpp
+++ b/lib/Parse/Parser.cpp
@@ -761,7 +761,7 @@
                                         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.