Save the virtual and access specifier location of base class specifiers

Author: robertoraggi

packages/cxx-frontend/src/AST.ts

@@ -7626,12 +7626,26 @@ export class BaseSpecifierAST extends AST {
     };
   }
 
+  /**
+   * Returns the location of the virtualOrAccess token in this node
+   */
+  getVirtualOrAccessToken(): Token | undefined {
+    return Token.from(cxx.getASTSlot(this.getHandle(), 1), this.parser);
+  }
+
+  /**
+   * Returns the location of the otherVirtualOrAccess token in this node
+   */
+  getOtherVirtualOrAccessToken(): Token | undefined {
+    return Token.from(cxx.getASTSlot(this.getHandle(), 2), this.parser);
+  }
+
   /**
    * Returns the nestedNameSpecifier of this node
    */
   getNestedNameSpecifier(): NestedNameSpecifierAST | undefined {
     return AST.from<NestedNameSpecifierAST>(
-      cxx.getASTSlot(this.getHandle(), 1),
+      cxx.getASTSlot(this.getHandle(), 3),
       this.parser,
     );
   }
@@ -7640,15 +7654,15 @@ export class BaseSpecifierAST extends AST {
    * Returns the location of the template token in this node
    */
   getTemplateToken(): Token | undefined {
-    return Token.from(cxx.getASTSlot(this.getHandle(), 2), this.parser);
+    return Token.from(cxx.getASTSlot(this.getHandle(), 4), this.parser);
   }
 
   /**
    * Returns the unqualifiedId of this node
    */
   getUnqualifiedId(): UnqualifiedIdAST | undefined {
     return AST.from<UnqualifiedIdAST>(
-      cxx.getASTSlot(this.getHandle(), 3),
+      cxx.getASTSlot(this.getHandle(), 5),
       this.parser,
     );
   }
@@ -7657,21 +7671,21 @@ export class BaseSpecifierAST extends AST {
    * Returns the isTemplateIntroduced attribute of this node
    */
   getIsTemplateIntroduced(): boolean {
-    return cxx.getASTSlot(this.getHandle(), 4) !== 0;
+    return cxx.getASTSlot(this.getHandle(), 6) !== 0;
   }
 
   /**
    * Returns the isVirtual attribute of this node
    */
   getIsVirtual(): boolean {
-    return cxx.getASTSlot(this.getHandle(), 5) !== 0;
+    return cxx.getASTSlot(this.getHandle(), 7) !== 0;
   }
 
   /**
    * Returns the accessSpecifier attribute of this node
    */
   getAccessSpecifier(): TokenKind {
-    return cxx.getASTSlot(this.getHandle(), 6);
+    return cxx.getASTSlot(this.getHandle(), 8);
   }
 }
 

packages/cxx-frontend/src/ASTSlot.ts

@@ -171,79 +171,81 @@ export enum ASTSlot {
   openLoc = 149,
   operatorFunctionId = 150,
   operatorLoc = 151,
-  outputOperandList = 152,
-  parameterDeclarationClause = 153,
-  parameterDeclarationList = 154,
-  privateLoc = 155,
-  privateModuleFragment = 156,
-  ptrOpList = 157,
-  qualifier = 158,
-  qualifierLoc = 159,
-  questionLoc = 160,
-  rangeDeclaration = 161,
-  rangeInitializer = 162,
-  rbraceLoc = 163,
-  rbracket2Loc = 164,
-  rbracketLoc = 165,
-  refLoc = 166,
-  refOp = 167,
-  refQualifierLoc = 168,
-  requirementList = 169,
-  requiresClause = 170,
-  requiresLoc = 171,
-  restrictLoc = 172,
-  returnLoc = 173,
-  rightExpression = 174,
-  rparen2Loc = 175,
-  rparenLoc = 176,
-  scopeLoc = 177,
-  secondColonLoc = 178,
-  semicolonLoc = 179,
-  sizeExpression = 180,
-  sizeofLoc = 181,
-  specifier = 182,
-  specifierLoc = 183,
-  splicer = 184,
-  starLoc = 185,
-  statement = 186,
-  statementList = 187,
-  staticAssertLoc = 188,
-  staticLoc = 189,
-  stringLiteral = 190,
-  stringliteralLoc = 191,
-  switchLoc = 192,
-  symbolicName = 193,
-  symbolicNameLoc = 194,
-  templateArgumentList = 195,
-  templateId = 196,
-  templateLoc = 197,
-  templateParameterList = 198,
-  templateRequiresClause = 199,
-  thisLoc = 200,
-  threadLoc = 201,
-  threadLocalLoc = 202,
-  throwLoc = 203,
-  tildeLoc = 204,
-  trailingReturnType = 205,
-  tryLoc = 206,
-  typeConstraint = 207,
-  typeId = 208,
-  typeIdList = 209,
-  typeLoc = 210,
-  typeSpecifier = 211,
-  typeSpecifierList = 212,
-  typeTraitLoc = 213,
-  typedefLoc = 214,
-  typeidLoc = 215,
-  typenameLoc = 216,
-  underlyingTypeLoc = 217,
-  unqualifiedId = 218,
-  usingDeclaratorList = 219,
-  usingLoc = 220,
-  vaArgLoc = 221,
-  virtualLoc = 222,
-  voidLoc = 223,
-  volatileLoc = 224,
-  whileLoc = 225,
-  yieldLoc = 226,
+  otherVirtualOrAccessLoc = 152,
+  outputOperandList = 153,
+  parameterDeclarationClause = 154,
+  parameterDeclarationList = 155,
+  privateLoc = 156,
+  privateModuleFragment = 157,
+  ptrOpList = 158,
+  qualifier = 159,
+  qualifierLoc = 160,
+  questionLoc = 161,
+  rangeDeclaration = 162,
+  rangeInitializer = 163,
+  rbraceLoc = 164,
+  rbracket2Loc = 165,
+  rbracketLoc = 166,
+  refLoc = 167,
+  refOp = 168,
+  refQualifierLoc = 169,
+  requirementList = 170,
+  requiresClause = 171,
+  requiresLoc = 172,
+  restrictLoc = 173,
+  returnLoc = 174,
+  rightExpression = 175,
+  rparen2Loc = 176,
+  rparenLoc = 177,
+  scopeLoc = 178,
+  secondColonLoc = 179,
+  semicolonLoc = 180,
+  sizeExpression = 181,
+  sizeofLoc = 182,
+  specifier = 183,
+  specifierLoc = 184,
+  splicer = 185,
+  starLoc = 186,
+  statement = 187,
+  statementList = 188,
+  staticAssertLoc = 189,
+  staticLoc = 190,
+  stringLiteral = 191,
+  stringliteralLoc = 192,
+  switchLoc = 193,
+  symbolicName = 194,
+  symbolicNameLoc = 195,
+  templateArgumentList = 196,
+  templateId = 197,
+  templateLoc = 198,
+  templateParameterList = 199,
+  templateRequiresClause = 200,
+  thisLoc = 201,
+  threadLoc = 202,
+  threadLocalLoc = 203,
+  throwLoc = 204,
+  tildeLoc = 205,
+  trailingReturnType = 206,
+  tryLoc = 207,
+  typeConstraint = 208,
+  typeId = 209,
+  typeIdList = 210,
+  typeLoc = 211,
+  typeSpecifier = 212,
+  typeSpecifierList = 213,
+  typeTraitLoc = 214,
+  typedefLoc = 215,
+  typeidLoc = 216,
+  typenameLoc = 217,
+  underlyingTypeLoc = 218,
+  unqualifiedId = 219,
+  usingDeclaratorList = 220,
+  usingLoc = 221,
+  vaArgLoc = 222,
+  virtualLoc = 223,
+  virtualOrAccessLoc = 224,
+  voidLoc = 225,
+  volatileLoc = 226,
+  whileLoc = 227,
+  yieldLoc = 228,
 }

src/parser/cxx/ast.cc

@@ -1974,6 +1974,8 @@ auto HandlerAST::lastSourceLocation() -> SourceLocation {
 
 auto BaseSpecifierAST::firstSourceLocation() -> SourceLocation {
   if (auto loc = cxx::firstSourceLocation(attributeList)) return loc;
+  if (auto loc = cxx::firstSourceLocation(virtualOrAccessLoc)) return loc;
+  if (auto loc = cxx::firstSourceLocation(otherVirtualOrAccessLoc)) return loc;
   if (auto loc = cxx::firstSourceLocation(nestedNameSpecifier)) return loc;
   if (auto loc = cxx::firstSourceLocation(templateLoc)) return loc;
   if (auto loc = cxx::firstSourceLocation(unqualifiedId)) return loc;
@@ -1984,6 +1986,8 @@ auto BaseSpecifierAST::lastSourceLocation() -> SourceLocation {
   if (auto loc = cxx::lastSourceLocation(unqualifiedId)) return loc;
   if (auto loc = cxx::lastSourceLocation(templateLoc)) return loc;
   if (auto loc = cxx::lastSourceLocation(nestedNameSpecifier)) return loc;
+  if (auto loc = cxx::lastSourceLocation(otherVirtualOrAccessLoc)) return loc;
+  if (auto loc = cxx::lastSourceLocation(virtualOrAccessLoc)) return loc;
   if (auto loc = cxx::lastSourceLocation(attributeList)) return loc;
   return {};
 }

src/parser/cxx/ast.fbs

@@ -419,6 +419,8 @@ table BaseSpecifier /* AST */ {
   nested_name_specifier: NestedNameSpecifier;
   unqualified_id: UnqualifiedId;
   access_specifier: uint32;
+  virtual_or_access_loc: uint32;
+  other_virtual_or_access_loc: uint32;
   template_loc: uint32;
 }
 

src/parser/cxx/ast.h

@@ -2424,6 +2424,8 @@ class BaseSpecifierAST final : public AST {
   BaseSpecifierAST() : AST(Kind) {}
 
   List<AttributeSpecifierAST*>* attributeList = nullptr;
+  SourceLocation virtualOrAccessLoc;
+  SourceLocation otherVirtualOrAccessLoc;
   NestedNameSpecifierAST* nestedNameSpecifier = nullptr;
   SourceLocation templateLoc;
   UnqualifiedIdAST* unqualifiedId = nullptr;

src/parser/cxx/ast_pretty_printer.cc

@@ -1032,6 +1032,12 @@ void ASTPrettyPrinter::operator()(BaseSpecifierAST* ast) {
     operator()(it->value);
   }
 
+  if (ast->virtualOrAccessLoc) {
+    writeToken(ast->virtualOrAccessLoc);
+  }
+  if (ast->otherVirtualOrAccessLoc) {
+    writeToken(ast->otherVirtualOrAccessLoc);
+  }
   operator()(ast->nestedNameSpecifier);
   if (ast->templateLoc) {
     writeToken(ast->templateLoc);

src/parser/cxx/ast_rewriter.cc

@@ -1125,6 +1125,8 @@ auto ASTRewriter::operator()(BaseSpecifierAST* ast) -> BaseSpecifierAST* {
     attributeList = &(*attributeList)->next;
   }
 
+  copy->virtualOrAccessLoc = ast->virtualOrAccessLoc;
+  copy->otherVirtualOrAccessLoc = ast->otherVirtualOrAccessLoc;
   copy->nestedNameSpecifier = operator()(ast->nestedNameSpecifier);
   copy->templateLoc = ast->templateLoc;
   copy->unqualifiedId = operator()(ast->unqualifiedId);