- and the DATA argument are passed to it. If it returns zero, this
- file is skipped. If FILE_MATCHER is NULL such file is not skipped.
-
- Otherwise, if KIND does not match this symbol is skipped.
-
- If even KIND matches, then NAME_MATCHER is called for each symbol defined
- in the file. The symbol's "natural" name and DATA are passed to
- NAME_MATCHER.
-
- If NAME_MATCHER returns zero, then this symbol is skipped.
-
- Otherwise, this symbol's symbol table is expanded.
-
- DATA is user data that is passed unmodified to the callback
- functions. */
- void (*expand_symtabs_matching) (struct objfile *objfile,
- int (*file_matcher) (const char *, void *),
- int (*name_matcher) (const char *, void *),
- enum search_domain kind,
- void *data);
-
- /* Return the symbol table from OBJFILE that contains PC and
- SECTION. Return NULL if there is no such symbol table. This
- should return the symbol table that contains a symbol whose
+ is passed to it. If the matcher returns false, the file is
+ skipped. If FILE_MATCHER is NULL the file is not skipped. If
+ BASENAMES is true the matcher should consider only file base
+ names (the passed file name is already only the lbasename'd
+ part).
+
+ Otherwise, if KIND does not match, this symbol is skipped.
+
+ If even KIND matches, SYMBOL_MATCHER is called for each symbol
+ defined in the file. The symbol "search" name is passed to
+ SYMBOL_MATCHER.
+
+ If SYMBOL_MATCHER returns false, then the symbol is skipped.
+
+ Otherwise, the symbol's symbol table is expanded. */
+ void (*expand_symtabs_matching)
+ (struct objfile *objfile,
+ gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher,
+ const lookup_name_info &lookup_name,
+ gdb::function_view<expand_symtabs_symbol_matcher_ftype> symbol_matcher,
+ gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify,
+ enum search_domain kind);
+
+ /* Return the comp unit from OBJFILE that contains PC and
+ SECTION. Return NULL if there is no such compunit. This
+ should return the compunit that contains a symbol whose