fix: Renamed DeclaratorModifierAST to DeclaratorChunkAST

Author: robertoraggi

packages/cxx-frontend/src/AST.ts

@@ -87,7 +87,7 @@ export abstract class AttributeSpecifierAST extends AST {}
 export abstract class AttributeTokenAST extends AST {}
 export abstract class CoreDeclaratorAST extends AST {}
 export abstract class DeclarationAST extends AST {}
-export abstract class DeclaratorModifierAST extends AST {}
+export abstract class DeclaratorChunkAST extends AST {}
 export abstract class ExceptionDeclarationAST extends AST {}
 export abstract class ExceptionSpecifierAST extends AST {}
 export abstract class ExpressionAST extends AST {}
@@ -259,13 +259,13 @@ export class DeclaratorAST extends AST {
       this.parser,
     );
   }
-  *getModifiers(): Generator<DeclaratorModifierAST | undefined> {
+  *getDeclaratorChunkList(): Generator<DeclaratorChunkAST | undefined> {
     for (
       let it = cxx.getASTSlot(this.getHandle(), 2);
       it;
       it = cxx.getListNext(it)
     ) {
-      yield AST.from<DeclaratorModifierAST>(cxx.getListValue(it), this.parser);
+      yield AST.from<DeclaratorChunkAST>(cxx.getListValue(it), this.parser);
     }
   }
 }
@@ -376,13 +376,16 @@ export class NewDeclaratorAST extends AST {
       yield AST.from<PtrOperatorAST>(cxx.getListValue(it), this.parser);
     }
   }
-  *getModifiers(): Generator<ArrayDeclaratorAST | undefined> {
+  *getDeclaratorChunkList(): Generator<ArrayDeclaratorChunkAST | undefined> {
     for (
       let it = cxx.getASTSlot(this.getHandle(), 1);
       it;
       it = cxx.getListNext(it)
     ) {
-      yield AST.from<ArrayDeclaratorAST>(cxx.getListValue(it), this.parser);
+      yield AST.from<ArrayDeclaratorChunkAST>(
+        cxx.getListValue(it),
+        this.parser,
+      );
     }
   }
 }
@@ -5336,12 +5339,12 @@ export class PtrToMemberOperatorAST extends PtrOperatorAST {
   }
 }
 
-export class FunctionDeclaratorAST extends DeclaratorModifierAST {
+export class FunctionDeclaratorChunkAST extends DeclaratorChunkAST {
   accept<Context, Result>(
     visitor: ASTVisitor<Context, Result>,
     context: Context,
   ): Result {
-    return visitor.visitFunctionDeclarator(this, context);
+    return visitor.visitFunctionDeclaratorChunk(this, context);
   }
   getParametersAndQualifiers(): ParametersAndQualifiersAST | undefined {
     return AST.from<ParametersAndQualifiersAST>(
@@ -5366,12 +5369,12 @@ export class FunctionDeclaratorAST extends DeclaratorModifierAST {
   }
 }
 
-export class ArrayDeclaratorAST extends DeclaratorModifierAST {
+export class ArrayDeclaratorChunkAST extends DeclaratorChunkAST {
   accept<Context, Result>(
     visitor: ASTVisitor<Context, Result>,
     context: Context,
   ): Result {
-    return visitor.visitArrayDeclarator(this, context);
+    return visitor.visitArrayDeclaratorChunk(this, context);
   }
   getLbracketToken(): Token | undefined {
     return Token.from(cxx.getASTSlot(this.getHandle(), 0), this.parser);
@@ -5760,8 +5763,8 @@ const AST_CONSTRUCTORS: Array<
   PointerOperatorAST,
   ReferenceOperatorAST,
   PtrToMemberOperatorAST,
-  FunctionDeclaratorAST,
-  ArrayDeclaratorAST,
+  FunctionDeclaratorChunkAST,
+  ArrayDeclaratorChunkAST,
   CxxAttributeAST,
   GccAttributeAST,
   AlignasAttributeAST,

packages/cxx-frontend/src/ASTKind.ts

@@ -262,9 +262,9 @@ export enum ASTKind {
   ReferenceOperator,
   PtrToMemberOperator,
 
-  // DeclaratorModifierAST
-  FunctionDeclarator,
-  ArrayDeclarator,
+  // DeclaratorChunkAST
+  FunctionDeclaratorChunk,
+  ArrayDeclaratorChunk,
 
   // AttributeSpecifierAST
   CxxAttribute,

packages/cxx-frontend/src/ASTSlot.ts

@@ -70,80 +70,80 @@ export enum ASTSlot {
   declaration = 48,
   declarationList = 49,
   declarator = 50,
-  declaratorId = 51,
-  decltypeLoc = 52,
-  decltypeSpecifier = 53,
-  defaultLoc = 54,
-  deleteLoc = 55,
-  designator = 56,
-  doLoc = 57,
-  dotLoc = 58,
-  ellipsisLoc = 59,
-  elseLoc = 60,
-  elseStatement = 61,
-  emicolonLoc = 62,
-  enumBase = 63,
-  enumLoc = 64,
-  enumTypeSpecifier = 65,
-  enumeratorList = 66,
-  equalLoc = 67,
-  exceptionDeclaration = 68,
-  exceptionSpecifier = 69,
-  explicitLoc = 70,
-  explicitSpecifier = 71,
-  exportLoc = 72,
-  expression = 73,
-  expressionList = 74,
-  externLoc = 75,
-  extraAttributeList = 76,
-  finalLoc = 77,
-  foldOp = 78,
-  foldOpLoc = 79,
-  forLoc = 80,
-  friendLoc = 81,
-  functionBody = 82,
-  globalModuleFragment = 83,
-  gotoLoc = 84,
-  greaterLoc = 85,
-  handlerList = 86,
-  headerLoc = 87,
-  id = 88,
-  idExpression = 89,
-  identifier = 90,
-  identifierLoc = 91,
-  ifLoc = 92,
-  iffalseExpression = 93,
-  iftrueExpression = 94,
-  importLoc = 95,
-  importName = 96,
-  indexExpression = 97,
-  initDeclaratorList = 98,
-  initializer = 99,
-  inlineLoc = 100,
-  isFinal = 101,
-  isInline = 102,
-  isOverride = 103,
-  isPure = 104,
-  isTemplateIntroduced = 105,
-  isTrue = 106,
-  isVariadic = 107,
-  isVirtual = 108,
-  lambdaDeclarator = 109,
-  lambdaIntroducer = 110,
-  lbraceLoc = 111,
-  lbracket2Loc = 112,
-  lbracketLoc = 113,
-  leftExpression = 114,
-  lessLoc = 115,
-  literal = 116,
-  literalLoc = 117,
-  literalOperatorId = 118,
-  lparen2Loc = 119,
-  lparenLoc = 120,
-  memInitializerList = 121,
-  memberId = 122,
-  minusGreaterLoc = 123,
-  modifiers = 124,
+  declaratorChunkList = 51,
+  declaratorId = 52,
+  decltypeLoc = 53,
+  decltypeSpecifier = 54,
+  defaultLoc = 55,
+  deleteLoc = 56,
+  designator = 57,
+  doLoc = 58,
+  dotLoc = 59,
+  ellipsisLoc = 60,
+  elseLoc = 61,
+  elseStatement = 62,
+  emicolonLoc = 63,
+  enumBase = 64,
+  enumLoc = 65,
+  enumTypeSpecifier = 66,
+  enumeratorList = 67,
+  equalLoc = 68,
+  exceptionDeclaration = 69,
+  exceptionSpecifier = 70,
+  explicitLoc = 71,
+  explicitSpecifier = 72,
+  exportLoc = 73,
+  expression = 74,
+  expressionList = 75,
+  externLoc = 76,
+  extraAttributeList = 77,
+  finalLoc = 78,
+  foldOp = 79,
+  foldOpLoc = 80,
+  forLoc = 81,
+  friendLoc = 82,
+  functionBody = 83,
+  globalModuleFragment = 84,
+  gotoLoc = 85,
+  greaterLoc = 86,
+  handlerList = 87,
+  headerLoc = 88,
+  id = 89,
+  idExpression = 90,
+  identifier = 91,
+  identifierLoc = 92,
+  ifLoc = 93,
+  iffalseExpression = 94,
+  iftrueExpression = 95,
+  importLoc = 96,
+  importName = 97,
+  indexExpression = 98,
+  initDeclaratorList = 99,
+  initializer = 100,
+  inlineLoc = 101,
+  isFinal = 102,
+  isInline = 103,
+  isOverride = 104,
+  isPure = 105,
+  isTemplateIntroduced = 106,
+  isTrue = 107,
+  isVariadic = 108,
+  isVirtual = 109,
+  lambdaDeclarator = 110,
+  lambdaIntroducer = 111,
+  lbraceLoc = 112,
+  lbracket2Loc = 113,
+  lbracketLoc = 114,
+  leftExpression = 115,
+  lessLoc = 116,
+  literal = 117,
+  literalLoc = 118,
+  literalOperatorId = 119,
+  lparen2Loc = 120,
+  lparenLoc = 121,
+  memInitializerList = 122,
+  memberId = 123,
+  minusGreaterLoc = 124,
   moduleDeclaration = 125,
   moduleLoc = 126,
   moduleName = 127,

packages/cxx-frontend/src/ASTVisitor.ts

@@ -839,13 +839,13 @@ export abstract class ASTVisitor<Context, Result> {
     context: Context,
   ): Result;
 
-  // DeclaratorModifierAST
-  abstract visitFunctionDeclarator(
-    node: ast.FunctionDeclaratorAST,
+  // DeclaratorChunkAST
+  abstract visitFunctionDeclaratorChunk(
+    node: ast.FunctionDeclaratorChunkAST,
     context: Context,
   ): Result;
-  abstract visitArrayDeclarator(
-    node: ast.ArrayDeclaratorAST,
+  abstract visitArrayDeclaratorChunk(
+    node: ast.ArrayDeclaratorChunkAST,
     context: Context,
   ): Result;
 

packages/cxx-frontend/src/RecursiveASTVisitor.ts

@@ -65,7 +65,7 @@ export class RecursiveASTVisitor<Context> extends ASTVisitor<Context, void> {
       this.accept(element, context);
     }
     this.accept(node.getCoreDeclarator(), context);
-    for (const element of node.getModifiers()) {
+    for (const element of node.getDeclaratorChunkList()) {
       this.accept(element, context);
     }
   }
@@ -94,7 +94,7 @@ export class RecursiveASTVisitor<Context> extends ASTVisitor<Context, void> {
     for (const element of node.getPtrOpList()) {
       this.accept(element, context);
     }
-    for (const element of node.getModifiers()) {
+    for (const element of node.getDeclaratorChunkList()) {
       this.accept(element, context);
     }
   }
@@ -1418,15 +1418,18 @@ export class RecursiveASTVisitor<Context> extends ASTVisitor<Context, void> {
     }
   }
 
-  visitFunctionDeclarator(
-    node: ast.FunctionDeclaratorAST,
+  visitFunctionDeclaratorChunk(
+    node: ast.FunctionDeclaratorChunkAST,
     context: Context,
   ): void {
     this.accept(node.getParametersAndQualifiers(), context);
     this.accept(node.getTrailingReturnType(), context);
   }
 
-  visitArrayDeclarator(node: ast.ArrayDeclaratorAST, context: Context): void {
+  visitArrayDeclaratorChunk(
+    node: ast.ArrayDeclaratorChunkAST,
+    context: Context,
+  ): void {
     this.accept(node.getExpression(), context);
     for (const element of node.getAttributeList()) {
       this.accept(element, context);

src/frontend/cxx/ast_printer.cc

@@ -121,11 +121,11 @@ void ASTPrinter::visit(DeclaratorAST* ast) {
     --indent_;
   }
   accept(ast->coreDeclarator, "core-declarator");
-  if (ast->modifiers) {
+  if (ast->declaratorChunkList) {
     ++indent_;
     fmt::print(out_, "{:{}}", "", indent_ * 2);
-    fmt::print(out_, "{}\n", "modifiers");
-    for (auto it = ast->modifiers; it; it = it->next) {
+    fmt::print(out_, "{}\n", "declarator-chunk-list");
+    for (auto it = ast->declaratorChunkList; it; it = it->next) {
       accept(it->value);
     }
     --indent_;
@@ -197,11 +197,11 @@ void ASTPrinter::visit(NewDeclaratorAST* ast) {
     }
     --indent_;
   }
-  if (ast->modifiers) {
+  if (ast->declaratorChunkList) {
     ++indent_;
     fmt::print(out_, "{:{}}", "", indent_ * 2);
-    fmt::print(out_, "{}\n", "modifiers");
-    for (auto it = ast->modifiers; it; it = it->next) {
+    fmt::print(out_, "{}\n", "declarator-chunk-list");
+    for (auto it = ast->declaratorChunkList; it; it = it->next) {
       accept(it->value);
     }
     --indent_;
@@ -2078,8 +2078,8 @@ void ASTPrinter::visit(PtrToMemberOperatorAST* ast) {
   }
 }
 
-void ASTPrinter::visit(FunctionDeclaratorAST* ast) {
-  fmt::print(out_, "{}\n", "function-declarator");
+void ASTPrinter::visit(FunctionDeclaratorChunkAST* ast) {
+  fmt::print(out_, "{}\n", "function-declarator-chunk");
   if (ast->isFinal) {
     ++indent_;
     fmt::print(out_, "{:{}}", "", indent_ * 2);
@@ -2102,8 +2102,8 @@ void ASTPrinter::visit(FunctionDeclaratorAST* ast) {
   accept(ast->trailingReturnType, "trailing-return-type");
 }
 
-void ASTPrinter::visit(ArrayDeclaratorAST* ast) {
-  fmt::print(out_, "{}\n", "array-declarator");
+void ASTPrinter::visit(ArrayDeclaratorChunkAST* ast) {
+  fmt::print(out_, "{}\n", "array-declarator-chunk");
   accept(ast->expression, "expression");
   if (ast->attributeList) {
     ++indent_;

src/frontend/cxx/ast_printer.h

@@ -267,8 +267,8 @@ class ASTPrinter : ASTVisitor {
   void visit(ReferenceOperatorAST* ast) override;
   void visit(PtrToMemberOperatorAST* ast) override;
 
-  void visit(FunctionDeclaratorAST* ast) override;
-  void visit(ArrayDeclaratorAST* ast) override;
+  void visit(FunctionDeclaratorChunkAST* ast) override;
+  void visit(ArrayDeclaratorChunkAST* ast) override;
 
   void visit(CxxAttributeAST* ast) override;
   void visit(GccAttributeAST* ast) override;