fix: Set class key of elaborated type specifiers

Author: robertoraggi

src/frontend/cxx/ast_printer.cc

@@ -1608,6 +1608,12 @@ void ASTPrinter::visit(UnderlyingTypeSpecifierAST* ast) {
 
 void ASTPrinter::visit(ElaboratedTypeSpecifierAST* ast) {
   fmt::print(out_, "{}\n", "elaborated-type-specifier");
+  if (ast->classKey != TokenKind::T_EOF_SYMBOL) {
+    ++indent_;
+    fmt::print(out_, "{:{}}", "", indent_ * 2);
+    fmt::print(out_, "class-key: {}\n", Token::spell(ast->classKey));
+    --indent_;
+  }
   if (ast->attributeList) {
     ++indent_;
     fmt::print(out_, "{:{}}", "", indent_ * 2);

src/parser/cxx/ast.fbs

@@ -1306,6 +1306,7 @@ table ElaboratedTypeSpecifier /* SpecifierAST */ {
   attribute_list: [AttributeSpecifier];
   nested_name_specifier: NestedNameSpecifier;
   name: Name;
+  class_key: uint32;
   class_loc: SourceLocation;
 }
 

src/parser/cxx/ast.h

@@ -2680,6 +2680,7 @@ class ElaboratedTypeSpecifierAST final : public SpecifierAST {
   List<AttributeSpecifierAST*>* attributeList = nullptr;
   NestedNameSpecifierAST* nestedNameSpecifier = nullptr;
   NameAST* name = nullptr;
+  TokenKind classKey = TokenKind::T_EOF_SYMBOL;
 
   void accept(ASTVisitor* visitor) override { visitor->visit(this); }
 

src/parser/cxx/ast_cloner.cc

@@ -2992,6 +2992,8 @@ void ASTCloner::visit(ElaboratedTypeSpecifierAST* ast) {
   copy->nestedNameSpecifier = accept(ast->nestedNameSpecifier);
 
   copy->name = accept(ast->name);
+
+  copy->classKey = ast->classKey;
 }
 
 void ASTCloner::visit(DecltypeAutoSpecifierAST* ast) {

src/parser/cxx/ast_decoder.cc

@@ -2913,6 +2913,7 @@ auto ASTDecoder::decodeElaboratedTypeSpecifier(
   ast->nestedNameSpecifier =
       decodeNestedNameSpecifier(node->nested_name_specifier());
   ast->name = decodeName(node->name(), node->name_type());
+  ast->classKey = static_cast<TokenKind>(node->class_key());
   return ast;
 }
 

src/parser/cxx/ast_encoder.cc

@@ -4324,6 +4324,7 @@ void ASTEncoder::visit(ElaboratedTypeSpecifierAST* ast) {
   builder.add_nested_name_specifier(nestedNameSpecifier.o);
   builder.add_name(name);
   builder.add_name_type(static_cast<io::Name>(nameType));
+  builder.add_class_key(static_cast<std::uint32_t>(ast->classKey));
 
   offset_ = builder.Finish().Union();
   type_ = io::Specifier_ElaboratedTypeSpecifier;

src/parser/cxx/parser.cc

@@ -4343,6 +4343,7 @@ auto Parser::parse_elaborated_type_specifier_helper(
       ast->classLoc = classLoc;
       ast->attributeList = attributes;
       ast->name = name;
+      ast->classKey = unit->tokenKind(classLoc);
 
       return true;
     }
@@ -4369,6 +4370,7 @@ auto Parser::parse_elaborated_type_specifier_helper(
     ast->classLoc = classLoc;
     ast->attributeList = attributes;
     ast->name = name;
+    ast->classKey = unit->tokenKind(classLoc);
 
     return true;
   }
@@ -4391,6 +4393,7 @@ auto Parser::parse_elaborated_type_specifier_helper(
     ast->attributeList = attributes;
     ast->nestedNameSpecifier = nestedNameSpecifier;
     ast->name = name;
+    ast->classKey = unit->tokenKind(classLoc);
 
     return true;
   }
@@ -4406,6 +4409,7 @@ auto Parser::parse_elaborated_type_specifier_helper(
     ast->attributeList = attributes;
     ast->nestedNameSpecifier = nestedNameSpecifier;
     ast->name = nullptr;  // error
+    ast->classKey = unit->tokenKind(classLoc);
 
     return true;
   }
@@ -4423,6 +4427,7 @@ auto Parser::parse_elaborated_type_specifier_helper(
   ast->attributeList = attributes;
   ast->nestedNameSpecifier = nestedNameSpecifier;
   ast->name = name;
+  ast->classKey = unit->tokenKind(classLoc);
 
   return true;
 }
@@ -4451,6 +4456,7 @@ auto Parser::parse_elaborated_enum_specifier(ElaboratedTypeSpecifierAST*& yyast,
   ast->classLoc = enumLoc;
   ast->nestedNameSpecifier = nestedNameSpecifier;
   ast->name = name;
+  ast->classKey = TokenKind::T_ENUM;
 
   return true;
 }

tests/unit_tests/ast/using_enum_declaration_01.cc

@@ -28,5 +28,6 @@ struct S {
 // CHECK-NEXT:          declaration-list
 // CHECK-NEXT:            using-enum-declaration
 // CHECK-NEXT:              enum-type-specifier: elaborated-type-specifier
+// CHECK-NEXT:                class-key: enum
 // CHECK-NEXT:                name: simple-name
 // CHECK-NEXT:                  identifier: fruit