Add missing attributes to BaseSpecifierAST

Author: robertoraggi

packages/cxx-frontend/src/AST.ts

@@ -7667,25 +7667,39 @@ export class BaseSpecifierAST extends AST {
     );
   }
 
+  /**
+   * Returns the location of the ellipsis token in this node
+   */
+  getEllipsisToken(): Token | undefined {
+    return Token.from(cxx.getASTSlot(this.getHandle(), 6), this.parser);
+  }
+
   /**
    * Returns the isTemplateIntroduced attribute of this node
    */
   getIsTemplateIntroduced(): boolean {
-    return cxx.getASTSlot(this.getHandle(), 6) !== 0;
+    return cxx.getASTSlot(this.getHandle(), 7) !== 0;
   }
 
   /**
    * Returns the isVirtual attribute of this node
    */
   getIsVirtual(): boolean {
-    return cxx.getASTSlot(this.getHandle(), 7) !== 0;
+    return cxx.getASTSlot(this.getHandle(), 8) !== 0;
+  }
+
+  /**
+   * Returns the isVariadic attribute of this node
+   */
+  getIsVariadic(): boolean {
+    return cxx.getASTSlot(this.getHandle(), 9) !== 0;
   }
 
   /**
    * Returns the accessSpecifier attribute of this node
    */
   getAccessSpecifier(): TokenKind {
-    return cxx.getASTSlot(this.getHandle(), 8);
+    return cxx.getASTSlot(this.getHandle(), 10);
   }
 }
 

src/parser/cxx/ast.cc

@@ -1979,10 +1979,12 @@ auto BaseSpecifierAST::firstSourceLocation() -> SourceLocation {
   if (auto loc = cxx::firstSourceLocation(nestedNameSpecifier)) return loc;
   if (auto loc = cxx::firstSourceLocation(templateLoc)) return loc;
   if (auto loc = cxx::firstSourceLocation(unqualifiedId)) return loc;
+  if (auto loc = cxx::firstSourceLocation(ellipsisLoc)) return loc;
   return {};
 }
 
 auto BaseSpecifierAST::lastSourceLocation() -> SourceLocation {
+  if (auto loc = cxx::lastSourceLocation(ellipsisLoc)) return loc;
   if (auto loc = cxx::lastSourceLocation(unqualifiedId)) return loc;
   if (auto loc = cxx::lastSourceLocation(templateLoc)) return loc;
   if (auto loc = cxx::lastSourceLocation(nestedNameSpecifier)) return loc;

src/parser/cxx/ast.fbs

@@ -422,6 +422,7 @@ table BaseSpecifier /* AST */ {
   virtual_or_access_loc: uint32;
   other_virtual_or_access_loc: uint32;
   template_loc: uint32;
+  ellipsis_loc: uint32;
 }
 
 table RequiresClause /* AST */ {

src/parser/cxx/ast.h

@@ -2429,8 +2429,10 @@ class BaseSpecifierAST final : public AST {
   NestedNameSpecifierAST* nestedNameSpecifier = nullptr;
   SourceLocation templateLoc;
   UnqualifiedIdAST* unqualifiedId = nullptr;
+  SourceLocation ellipsisLoc;
   bool isTemplateIntroduced = false;
   bool isVirtual = false;
+  bool isVariadic = false;
   TokenKind accessSpecifier = TokenKind::T_EOF_SYMBOL;
   BaseClassSymbol* symbol = nullptr;
 

src/parser/cxx/ast_pretty_printer.cc

@@ -1044,6 +1044,9 @@ void ASTPrettyPrinter::operator()(BaseSpecifierAST* ast) {
     writeToken(ast->templateLoc);
   }
   operator()(ast->unqualifiedId);
+  if (ast->ellipsisLoc) {
+    writeToken(ast->ellipsisLoc);
+  }
 }
 
 void ASTPrettyPrinter::operator()(RequiresClauseAST* ast) {

src/parser/cxx/ast_printer.cc

@@ -1729,6 +1729,12 @@ void ASTPrinter::visit(BaseSpecifierAST* ast) {
     out_ << std::format("is-virtual: {}\n", ast->isVirtual);
     --indent_;
   }
+  if (ast->isVariadic) {
+    ++indent_;
+    out_ << std::format("{:{}}", "", indent_ * 2);
+    out_ << std::format("is-variadic: {}\n", ast->isVariadic);
+    --indent_;
+  }
   if (ast->accessSpecifier != TokenKind::T_EOF_SYMBOL) {
     ++indent_;
     out_ << std::format("{:{}}", "", indent_ * 2);

src/parser/cxx/ast_slot.cc

@@ -3803,24 +3803,34 @@ void ASTSlot::visit(BaseSpecifierAST* ast) {
       slotKind_ = ASTSlotKind::kNode;
       slotNameIndex_ = SlotNameIndex{219};
       break;
-    case 6:  // isTemplateIntroduced
+    case 6:  // ellipsisLoc
+      value_ = ast->ellipsisLoc.index();
+      slotKind_ = ASTSlotKind::kToken;
+      slotNameIndex_ = SlotNameIndex{63};
+      break;
+    case 7:  // isTemplateIntroduced
       value_ = std::intptr_t(ast->isTemplateIntroduced != 0);
       slotKind_ = ASTSlotKind::kBoolAttribute;
       slotNameIndex_ = SlotNameIndex{115};
       break;
-    case 7:  // isVirtual
+    case 8:  // isVirtual
       value_ = std::intptr_t(ast->isVirtual != 0);
       slotKind_ = ASTSlotKind::kBoolAttribute;
       slotNameIndex_ = SlotNameIndex{119};
       break;
-    case 8:  // accessSpecifier
+    case 9:  // isVariadic
+      value_ = std::intptr_t(ast->isVariadic != 0);
+      slotKind_ = ASTSlotKind::kBoolAttribute;
+      slotNameIndex_ = SlotNameIndex{118};
+      break;
+    case 10:  // accessSpecifier
       value_ = std::intptr_t(ast->accessSpecifier);
       slotKind_ = ASTSlotKind::kIntAttribute;
       slotNameIndex_ = SlotNameIndex{2};
       break;
   }  // switch
 
-  slotCount_ = 9;
+  slotCount_ = 11;
 }
 
 void ASTSlot::visit(RequiresClauseAST* ast) {

src/parser/cxx/binder.cc

@@ -55,11 +55,13 @@ void Binder::setReportErrors(bool reportErrors) {
 
 void Binder::error(SourceLocation loc, std::string message) {
   if (!reportErrors_) return;
+  if (!unit_->config().checkTypes) return;
   unit_->error(loc, std::move(message));
 }
 
 void Binder::warning(SourceLocation loc, std::string message) {
   if (!reportErrors_) return;
+  if (!unit_->config().checkTypes) return;
   unit_->warning(loc, std::move(message));
 }
 

src/parser/cxx/binder.h

@@ -157,7 +157,7 @@ class Binder {
   TranslationUnit* unit_ = nullptr;
   Scope* scope_ = nullptr;
   bool inTemplate_ = false;
-  bool reportErrors_ = false;
+  bool reportErrors_ = true;
 };
 
 }  // namespace cxx

src/parser/cxx/flatbuffers/ast_decoder.cc

@@ -2924,6 +2924,7 @@ auto ASTDecoder::decodeBaseSpecifier(const io::BaseSpecifier* node)
   ast->templateLoc = SourceLocation(node->template_loc());
   ast->unqualifiedId =
       decodeUnqualifiedId(node->unqualified_id(), node->unqualified_id_type());
+  ast->ellipsisLoc = SourceLocation(node->ellipsis_loc());
   ast->accessSpecifier = static_cast<TokenKind>(node->access_specifier());
   return ast;
 }