commit 2e78db3510b136b3f961af202e6a1a3df4839172
author Chris Lattner <sabre@nondot.org> Sun Apr 13 18:59:07 2008 +0000
committer Chris Lattner <sabre@nondot.org> Sun Apr 13 18:59:07 2008 +0000
tree 8d0b3af85da37304735f22f9b4bd104942176906
parent 34e1388a431e97d29b1cba4925adcd77655e7540

This patch is just the easy part of the class names patch, which
allows the parsing of "class" in addition to "struct" and "union" to
declare a record.  So this patch allows:

 class C { };
 class C c1;

But it does not contain the lookup bits, so this won't work yet:

 C c2;

Patch by Doug Gregor!



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

lib/AST/Type.cpp

diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp
index 637061c..5040b95 100644
--- a/lib/AST/Type.cpp
+++ b/lib/AST/Type.cpp
@@ -60,6 +60,12 @@
   }
 }
 
+bool Type::isClassType() const {
+  if (const RecordType *RT = dyn_cast<RecordType>(CanonicalType))
+    if (RT->getDecl()->getKind() == Decl::Class)
+      return true;
+  return false;
+}
 bool Type::isStructureType() const {
   if (const RecordType *RT = dyn_cast<RecordType>(CanonicalType))
     if (RT->getDecl()->getKind() == Decl::Struct)

lib/Parse/DeclSpec.cpp

diff --git a/lib/Parse/DeclSpec.cpp b/lib/Parse/DeclSpec.cpp
index 1cd3508..52c6a33 100644
--- a/lib/Parse/DeclSpec.cpp
+++ b/lib/Parse/DeclSpec.cpp
@@ -95,6 +95,7 @@
   case DeclSpec::TST_decimal64:   return "_Decimal64";
   case DeclSpec::TST_decimal128:  return "_Decimal128";
   case DeclSpec::TST_enum:        return "enum";
+  case DeclSpec::TST_class:       return "class";
   case DeclSpec::TST_union:       return "union";
   case DeclSpec::TST_struct:      return "struct";
   case DeclSpec::TST_typedef:     return "typedef";

lib/Parse/ParseDecl.cpp

diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index 7eeb64d..8a0dcce 100644
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -515,7 +515,8 @@
     case tok::kw__Decimal128:
       isInvalid = DS.SetTypeSpecType(DeclSpec::TST_decimal128, Loc, PrevSpec);
       break;
-      
+
+    case tok::kw_class:
     case tok::kw_struct:
     case tok::kw_union:
       ParseStructUnionSpecifier(DS);
@@ -620,9 +621,12 @@
 ///         'union'
 ///
 void Parser::ParseStructUnionSpecifier(DeclSpec &DS) {
-  assert((Tok.is(tok::kw_struct) || Tok.is(tok::kw_union)) &&
-         "Not a struct/union specifier");
+  assert((Tok.is(tok::kw_class) || 
+          Tok.is(tok::kw_struct) || 
+          Tok.is(tok::kw_union)) &&
+         "Not a class/struct/union specifier");
   DeclSpec::TST TagType =
+    Tok.is(tok::kw_class) ? DeclSpec::TST_class :
     Tok.is(tok::kw_union) ? DeclSpec::TST_union : DeclSpec::TST_struct;
   SourceLocation StartLoc = ConsumeToken();
 
@@ -923,7 +927,8 @@
   case tok::kw__Decimal64:
   case tok::kw__Decimal128:
     
-    // struct-or-union-specifier
+    // struct-or-union-specifier (C99) or class-specifier (C++)
+  case tok::kw_class:
   case tok::kw_struct:
   case tok::kw_union:
     // enum-specifier
@@ -973,7 +978,8 @@
   case tok::kw__Decimal64:
   case tok::kw__Decimal128:
   
-    // struct-or-union-specifier
+    // struct-or-union-specifier (C99) or class-specifier (C++)
+  case tok::kw_class:
   case tok::kw_struct:
   case tok::kw_union:
     // enum-specifier

lib/Sema/SemaDecl.cpp

diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 7a86a8e..c47a027 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -1299,7 +1299,7 @@
   default: assert(0 && "Unknown tag type!");
   case DeclSpec::TST_struct: Kind = Decl::Struct; break;
   case DeclSpec::TST_union:  Kind = Decl::Union; break;
-//case DeclSpec::TST_class:  Kind = Decl::Class; break;
+  case DeclSpec::TST_class:  Kind = Decl::Class; break;
   case DeclSpec::TST_enum:   Kind = Decl::Enum; break;
   }
   

lib/Sema/SemaType.cpp

diff --git a/lib/Sema/SemaType.cpp b/lib/Sema/SemaType.cpp
index 5e155f8..223cb56 100644
--- a/lib/Sema/SemaType.cpp
+++ b/lib/Sema/SemaType.cpp
@@ -95,11 +95,12 @@
   case DeclSpec::TST_decimal64:    // _Decimal64
   case DeclSpec::TST_decimal128:   // _Decimal128
     assert(0 && "FIXME: GNU decimal extensions not supported yet!"); 
+  case DeclSpec::TST_class:
   case DeclSpec::TST_enum:
   case DeclSpec::TST_union:
   case DeclSpec::TST_struct: {
     Decl *D = static_cast<Decl *>(DS.getTypeRep());
-    assert(D && "Didn't get a decl for a enum/union/struct?");
+    assert(D && "Didn't get a decl for a class/enum/union/struct?");
     assert(DS.getTypeSpecWidth() == 0 && DS.getTypeSpecComplex() == 0 &&
            DS.getTypeSpecSign() == 0 &&
            "Can't handle qualifiers on typedef names yet!");