diff options
| -rw-r--r-- | dissect.c | 13 | ||||
| -rw-r--r-- | test-dissect.c | 3 |
2 files changed, 14 insertions, 2 deletions
@@ -610,6 +610,11 @@ static struct symbol *do_initializer(struct symbol *type, struct expression *exp return type; } +static inline bool is_macro(struct symbol *sym) +{ + return (sym->namespace == NS_MACRO || sym->namespace == NS_UNDEF); +} + static inline struct symbol *do_symbol(struct symbol *sym) { struct symbol *type = base_type(sym); @@ -654,7 +659,7 @@ static void do_sym_list(struct symbol_list *list) static inline bool valid_namespace(enum namespace ns) { - return (ns == NS_STRUCT || ns == NS_SYMBOL); + return (ns == NS_MACRO || ns == NS_UNDEF || ns == NS_STRUCT || ns == NS_SYMBOL); } static void do_file(char *file) @@ -668,6 +673,12 @@ static void do_file(char *file) DO_LIST(file_scope->symbols, sym, if (input_streams[sym->pos.stream].fd != -1 && valid_namespace(sym->namespace)) { + if (is_macro(sym)) { + sym->kind = 'd'; + reporter->r_symdef(sym); + continue; + } + if (sym->type == SYM_STRUCT || sym->type == SYM_UNION) { sym->ctype.base_type = sym; examine_sym_node(sym, NULL); diff --git a/test-dissect.c b/test-dissect.c index 58b3e633..3d870a97 100644 --- a/test-dissect.c +++ b/test-dissect.c @@ -57,11 +57,12 @@ static void r_symbol(unsigned mode, struct position *pos, struct symbol *sym) show_typename(sym->ctype.base_type)); switch (sym->kind) { + case 'd': + break; case 's': if (sym->type == SYM_STRUCT || sym->type == SYM_UNION) break; goto err; - case 'f': if (sym->type != SYM_BAD && sym->ctype.base_type->type != SYM_FN) goto err; |