Use X macros to simplify ASTVisitor inheritance

gcc/rust/ast/rust-ast-collector.h

@@ -202,8 +202,6 @@ class TokenCollector : public ASTVisitor
 
   void visit (Literal &lit, location_t locus = UNDEF_LOCATION);
 
-  void visit (FunctionParam &param);
-  void visit (VariadicParam &param);
   void visit (Attribute &attrib);
   void visit (Visibility &vis);
   void visit (std::vector<std::unique_ptr<GenericParam>> &params);
@@ -219,190 +217,21 @@ class TokenCollector : public ASTVisitor
   void visit (GenericArgsBinding &binding);
   void visit (GenericArg &arg);
 
-  // rust-ast.h
-  void visit (Token &tok);
-  void visit (DelimTokenTree &delim_tok_tree);
-  void visit (AttrInputMetaItemContainer &input);
-  void visit (IdentifierExpr &ident_expr);
-  void visit (Lifetime &lifetime);
-  void visit (LifetimeParam &lifetime_param);
-  void visit (ConstGenericParam &const_param);
-
-  // rust-path.h
   void visit (SimplePath &path);
   void visit (PathExprSegment &segment);
   void visit (PathIdentSegment &segment);
-  void visit (PathInExpression &path);
-  void visit (TypePathSegment &segment);
-  void visit (TypePathSegmentGeneric &segment);
-  void visit (TypePathSegmentFunction &segment);
-  void visit (TypePath &path);
   void visit (QualifiedPathType &path);
-  void visit (QualifiedPathInExpression &path);
-  void visit (QualifiedPathInType &path);
-
-  // rust-expr.h
-  void visit (LiteralExpr &expr);
-  void visit (AttrInputLiteral &attr_input);
-  void visit (AttrInputMacro &attr_input);
-  void visit (MetaItemLitExpr &meta_item);
-  void visit (MetaItemPathLit &meta_item);
-  void visit (BorrowExpr &expr);
-  void visit (DereferenceExpr &expr);
-  void visit (ErrorPropagationExpr &expr);
-  void visit (NegationExpr &expr);
-  void visit (ArithmeticOrLogicalExpr &expr);
-  void visit (ComparisonExpr &expr);
-  void visit (LazyBooleanExpr &expr);
-  void visit (TypeCastExpr &expr);
-  void visit (AssignmentExpr &expr);
-  void visit (CompoundAssignmentExpr &expr);
-  void visit (GroupedExpr &expr);
-  void visit (ArrayElemsValues &elems);
-  void visit (ArrayElemsCopied &elems);
-  void visit (ArrayExpr &expr);
-  void visit (ArrayIndexExpr &expr);
-  void visit (TupleExpr &expr);
-  void visit (TupleIndexExpr &expr);
-  void visit (StructExprStruct &expr);
-  void visit (StructExprFieldIdentifier &field);
-  void visit (StructExprFieldIdentifierValue &field);
-  void visit (StructExprFieldIndexValue &field);
+
   void visit (StructBase &base);
-  void visit (StructExprStructFields &expr);
-  void visit (StructExprStructBase &expr);
-  void visit (CallExpr &expr);
-  void visit (MethodCallExpr &expr);
-  void visit (FieldAccessExpr &expr);
   void visit (ClosureParam &param);
-  void visit (ClosureExprInner &expr);
-  void visit (BlockExpr &expr);
-  void visit (AnonConst &expr);
-  void visit (ConstBlock &expr);
-  void visit (ClosureExprInnerTyped &expr);
-  void visit (ContinueExpr &expr);
-  void visit (BreakExpr &expr);
-  void visit (RangeFromToExpr &expr);
-  void visit (RangeFromExpr &expr);
-  void visit (RangeToExpr &expr);
-  void visit (RangeFullExpr &expr);
-  void visit (RangeFromToInclExpr &expr);
-  void visit (RangeToInclExpr &expr);
-  void visit (ReturnExpr &expr);
-  void visit (TryExpr &expr);
-  void visit (BoxExpr &expr);
-  void visit (UnsafeBlockExpr &expr);
-  void visit (LoopExpr &expr);
-  void visit (WhileLoopExpr &expr);
-  void visit (WhileLetLoopExpr &expr);
-  void visit (ForLoopExpr &expr);
-  void visit (IfExpr &expr);
-  void visit (IfExprConseqElse &expr);
-  void visit (IfLetExpr &expr);
-  void visit (IfLetExprConseqElse &expr);
   void visit (MatchArm &arm);
   void visit (MatchCase &arm);
-  void visit (MatchExpr &expr);
-  void visit (AwaitExpr &expr);
-  void visit (AsyncBlockExpr &expr);
-  void visit (InlineAsm &expr);
-  void visit (LlvmInlineAsm &expr);
-  // rust-item.h
-  void visit (TypeParam &param);
-  void visit (LifetimeWhereClauseItem &item);
-  void visit (TypeBoundWhereClauseItem &item);
-  void visit (Module &module);
-  void visit (ExternCrate &crate);
-  void visit (UseTreeGlob &use_tree);
-  void visit (UseTreeList &use_tree);
-  void visit (UseTreeRebind &use_tree);
-  void visit (UseDeclaration &use_decl);
-  void visit (Function &function);
-  void visit (TypeAlias &type_alias);
-  void visit (StructStruct &struct_item);
-  void visit (TupleStruct &tuple_struct);
-  void visit (EnumItem &item);
-  void visit (EnumItemTuple &item);
-  void visit (EnumItemStruct &item);
-  void visit (EnumItemDiscriminant &item);
-  void visit (Enum &enumeration);
-  void visit (Union &union_item);
-  void visit (ConstantItem &const_item);
-  void visit (StaticItem &static_item);
-  void visit (SelfParam &param);
-  void visit (TraitItemConst &item);
-  void visit (TraitItemType &item);
-  void visit (Trait &trait);
-  void visit (InherentImpl &impl);
-  void visit (TraitImpl &impl);
-  void visit (ExternalTypeItem &item);
-  void visit (ExternalStaticItem &item);
-  void visit (ExternBlock &block);
-
-  // rust-macro.h
-  void visit (MacroMatchFragment &match);
-  void visit (MacroMatchRepetition &match);
-  void visit (MacroMatcher &matcher);
-  void visit (MacroRulesDefinition &rules_def);
+
   void visit (MacroInvocData &invoc_data);
-  void visit (MacroInvocation &macro_invoc);
-  void visit (MetaItemPath &meta_item);
-  void visit (MetaItemSeq &meta_item);
-  void visit (MetaWord &meta_item);
-  void visit (MetaNameValueStr &meta_item);
-  void visit (MetaListPaths &meta_item);
-  void visit (MetaListNameValueStr &meta_item);
-
-  // rust-pattern.h
-  void visit (LiteralPattern &pattern);
-  void visit (IdentifierPattern &pattern);
-  void visit (WildcardPattern &pattern);
-  void visit (RestPattern &pattern);
-  // void visit(RangePatternBound& bound);
-  void visit (RangePatternBoundLiteral &bound);
-  void visit (RangePatternBoundPath &bound);
-  void visit (RangePatternBoundQualPath &bound);
-  void visit (RangePattern &pattern);
-  void visit (ReferencePattern &pattern);
-  // void visit(StructPatternField& field);
-  void visit (StructPatternFieldTuplePat &field);
-  void visit (StructPatternFieldIdentPat &field);
-  void visit (StructPatternFieldIdent &field);
-  void visit (StructPattern &pattern);
-  // void visit(TupleStructItems& tuple_items);
-  void visit (TupleStructItemsNoRange &tuple_items);
-  void visit (TupleStructItemsRange &tuple_items);
-  void visit (TupleStructPattern &pattern);
-  // void visit(TuplePatternItems& tuple_items);
-  void visit (TuplePatternItemsMultiple &tuple_items);
-  void visit (TuplePatternItemsRanged &tuple_items);
-  void visit (TuplePattern &pattern);
-  void visit (GroupedPattern &pattern);
-  void visit (SlicePattern &pattern);
-  void visit (AltPattern &pattern);
-
-  // rust-stmt.h
-  void visit (EmptyStmt &stmt);
-  void visit (LetStmt &stmt);
-  void visit (ExprStmt &stmt);
-
-  // rust-type.h
-  void visit (TraitBound &bound);
-  void visit (ImplTraitType &type);
-  void visit (TraitObjectType &type);
-  void visit (ParenthesisedType &type);
-  void visit (ImplTraitTypeOneBound &type);
-  void visit (TraitObjectTypeOneBound &type);
-  void visit (TupleType &type);
-  void visit (NeverType &type);
-  void visit (RawPointerType &type);
-  void visit (ReferenceType &type);
-  void visit (ArrayType &type);
-  void visit (SliceType &type);
-  void visit (InferredType &type);
-  void visit (BareFunctionType &type);
-
-  void visit (FormatArgs &fmt);
+
+#define VISIT(X) void visit (X &) override;
+#include "rust-ast-visitable.h"
+#undef VISIT
 };
 } // namespace AST