This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
RFA: replace typedef_print with a language method
- From: Tom Tromey <tromey at redhat dot com>
- To: gdb-patches at sourceware dot org
- Date: Wed, 10 Sep 2008 09:14:33 -0600
- Subject: RFA: replace typedef_print with a language method
- Reply-to: Tom Tromey <tromey at redhat dot com>
I happened to notice a FIXME comment and some strange defines (e.g.,
_LANG_pascal) in language.h, and this led me to typedef_print, a
strange piece of code.
It seemed to me that rather than switching on the current language and
having this code know about all the possible languages, it would be
better replaced with a language-specific function.
So, that is what this patch implements. This patch actually does
change behavior slightly -- before this patch, I think ObjC did not
print typedefs but instead errored out.
Built and regtested on x86-64 (compile farm).
Please review.
thanks,
Tom
:ADDPATCH types:
2008-09-10 Tom Tromey <tromey@redhat.com>
* value.h (typedef_print): Remove.
* symtab.c (print_symbol_info): Use la_print_typedef.
* scm-lang.c (scm_language_defn): Update.
* p-typeprint.c (pascal_print_typedef): New function.
* p-lang.h: (pascal_print_typedef): Declare.
* p-lang.c (pascal_language_defn): Update.
* objc-lang.c (objc_language_defn): Update.
* m2-typeprint.c (m2_print_typedef): New function.
* m2-lang.h (m2_print_typedef): Declare.
* m2-lang.c (m2_language_defn): Update.
* language.h (_LANG_c, _LANG_m2, _LANG_fortran, _LANG_pascal):
Remove.
(struct language_defn) <la_print_typedef>: New field.
(default_print_typedef): Declare.
* language.c (unknown_language_defn): Update.
(auto_language_defn): Update.
(local_language_defn): Update.
* jv-lang.c (java_language_defn): Update.
* f-lang.c (f_language_defn): Update.
* c-typeprint.c (c_print_typedef): New function.
* c-lang.h (c_print_typedef): Declare.
* c-lang.c (c_language_defn): Update.
(cplus_language_defn): Update.
(asm_language_defn): Update.
(minimal_language_defn): Update.
* ada-lang.c (ada_language_defn): Update.
* typeprint.c (typedef_print): Remove.
(default_print_typedef): New function.
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 643cbec..0a8d441 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -10943,6 +10943,7 @@ const struct language_defn ada_language_defn = {
ada_printstr, /* Function to print string constant */
emit_char, /* Function to print single char (not used) */
ada_print_type, /* Print a type using appropriate syntax */
+ default_print_typedef, /* Print a typedef using appropriate syntax */
ada_val_print, /* Print a value using appropriate syntax */
ada_value_print, /* Print a top-level value */
NULL, /* Language specific skip_trampoline */
diff --git a/gdb/c-lang.c b/gdb/c-lang.c
index 9ce4bb9..7294c6c 100644
--- a/gdb/c-lang.c
+++ b/gdb/c-lang.c
@@ -398,6 +398,7 @@ const struct language_defn c_language_defn =
c_printstr, /* Function to print string constant */
c_emit_char, /* Print a single char */
c_print_type, /* Print a type using appropriate syntax */
+ c_print_typedef, /* Print a typedef using appropriate syntax */
c_val_print, /* Print a value using appropriate syntax */
c_value_print, /* Print a top-level value */
NULL, /* Language specific skip_trampoline */
@@ -511,6 +512,7 @@ const struct language_defn cplus_language_defn =
c_printstr, /* Function to print string constant */
c_emit_char, /* Print a single char */
c_print_type, /* Print a type using appropriate syntax */
+ c_print_typedef, /* Print a typedef using appropriate syntax */
c_val_print, /* Print a value using appropriate syntax */
c_value_print, /* Print a top-level value */
cplus_skip_trampoline, /* Language specific skip_trampoline */
@@ -546,6 +548,7 @@ const struct language_defn asm_language_defn =
c_printstr, /* Function to print string constant */
c_emit_char, /* Print a single char */
c_print_type, /* Print a type using appropriate syntax */
+ c_print_typedef, /* Print a typedef using appropriate syntax */
c_val_print, /* Print a value using appropriate syntax */
c_value_print, /* Print a top-level value */
NULL, /* Language specific skip_trampoline */
@@ -586,6 +589,7 @@ const struct language_defn minimal_language_defn =
c_printstr, /* Function to print string constant */
c_emit_char, /* Print a single char */
c_print_type, /* Print a type using appropriate syntax */
+ c_print_typedef, /* Print a typedef using appropriate syntax */
c_val_print, /* Print a value using appropriate syntax */
c_value_print, /* Print a top-level value */
NULL, /* Language specific skip_trampoline */
diff --git a/gdb/c-lang.h b/gdb/c-lang.h
index 58d99ce..fe1939a 100644
--- a/gdb/c-lang.h
+++ b/gdb/c-lang.h
@@ -37,6 +37,8 @@ extern void c_error (char *); /* Defined in c-exp.y */
extern void c_print_type (struct type *, char *, struct ui_file *, int,
int);
+extern void c_print_typedef (struct type *, struct symbol *, struct ui_file *);
+
extern int c_val_print (struct type *, const gdb_byte *, int, CORE_ADDR,
struct ui_file *, int, int, int,
enum val_prettyprint);
diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
index 56d12f9..31a98ea 100644
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -97,6 +97,24 @@ c_print_type (struct type *type, char *varstring, struct ui_file *stream,
}
}
+/* Print a typedef using C syntax. TYPE is the underlying type.
+ NEW_SYMBOL is the symbol naming the type. STREAM is the stream on
+ which to print. */
+
+void
+c_print_typedef (struct type *type, struct symbol *new_symbol,
+ struct ui_file *stream)
+{
+ CHECK_TYPEDEF (type);
+ fprintf_filtered (stream, "typedef ");
+ type_print (type, "", stream, 0);
+ if (TYPE_NAME ((SYMBOL_TYPE (new_symbol))) == 0
+ || strcmp (TYPE_NAME ((SYMBOL_TYPE (new_symbol))),
+ SYMBOL_LINKAGE_NAME (new_symbol)) != 0)
+ fprintf_filtered (stream, " %s", SYMBOL_PRINT_NAME (new_symbol));
+ fprintf_filtered (stream, ";\n");
+}
+
/* If TYPE is a derived type, then print out derivation information.
Print only the actual base classes of this type, not the base classes
of the base classes. I.E. for the derivation hierarchy:
diff --git a/gdb/f-lang.c b/gdb/f-lang.c
index 5dcbd33..35391c9 100644
--- a/gdb/f-lang.c
+++ b/gdb/f-lang.c
@@ -321,6 +321,7 @@ const struct language_defn f_language_defn =
f_printstr, /* function to print string constant */
f_emit_char, /* Function to print a single character */
f_print_type, /* Print a type using appropriate syntax */
+ default_print_typedef, /* Print a typedef using appropriate syntax */
f_val_print, /* Print a value using appropriate syntax */
c_value_print, /* FIXME */
NULL, /* Language specific skip_trampoline */
diff --git a/gdb/jv-lang.c b/gdb/jv-lang.c
index ecce237..f778ddc 100644
--- a/gdb/jv-lang.c
+++ b/gdb/jv-lang.c
@@ -1065,6 +1065,7 @@ const struct language_defn java_language_defn =
c_printstr, /* Function to print string constant */
java_emit_char, /* Function to print a single character */
java_print_type, /* Print a type using appropriate syntax */
+ default_print_typedef, /* Print a typedef using appropriate syntax */
java_val_print, /* Print a value using appropriate syntax */
java_value_print, /* Print a top-level value */
NULL, /* Language specific skip_trampoline */
diff --git a/gdb/language.c b/gdb/language.c
index 66e5542..cdd520f 100644
--- a/gdb/language.c
+++ b/gdb/language.c
@@ -1189,6 +1189,7 @@ const struct language_defn unknown_language_defn =
unk_lang_printstr,
unk_lang_emit_char,
unk_lang_print_type, /* Print a type using appropriate syntax */
+ default_print_typedef, /* Print a typedef using appropriate syntax */
unk_lang_val_print, /* Print a value using appropriate syntax */
unk_lang_value_print, /* Print a top-level value */
unk_lang_trampoline, /* Language specific skip_trampoline */
@@ -1225,6 +1226,7 @@ const struct language_defn auto_language_defn =
unk_lang_printstr,
unk_lang_emit_char,
unk_lang_print_type, /* Print a type using appropriate syntax */
+ default_print_typedef, /* Print a typedef using appropriate syntax */
unk_lang_val_print, /* Print a value using appropriate syntax */
unk_lang_value_print, /* Print a top-level value */
unk_lang_trampoline, /* Language specific skip_trampoline */
@@ -1260,6 +1262,7 @@ const struct language_defn local_language_defn =
unk_lang_printstr,
unk_lang_emit_char,
unk_lang_print_type, /* Print a type using appropriate syntax */
+ default_print_typedef, /* Print a typedef using appropriate syntax */
unk_lang_val_print, /* Print a value using appropriate syntax */
unk_lang_value_print, /* Print a top-level value */
unk_lang_trampoline, /* Language specific skip_trampoline */
diff --git a/gdb/language.h b/gdb/language.h
index 8bdc212..6f82d10 100644
--- a/gdb/language.h
+++ b/gdb/language.h
@@ -31,14 +31,6 @@ struct frame_info;
struct expression;
struct ui_file;
-/* This used to be included to configure GDB for one or more specific
- languages. Now it is left out to configure for all of them. FIXME. */
-/* #include "lang_def.h" */
-#define _LANG_c
-#define _LANG_m2
-#define _LANG_fortran
-#define _LANG_pascal
-
#define MAX_FORTRAN_DIMS 7 /* Maximum number of F77 array dims */
/* range_mode ==
@@ -187,6 +179,13 @@ struct language_defn
void (*la_print_type) (struct type *, char *, struct ui_file *, int,
int);
+ /* Print a typedef using syntax appropriate for this language.
+ TYPE is the underlying type. NEW_SYMBOL is the symbol naming
+ the type. STREAM is the output stream on which to print. */
+
+ void (*la_print_typedef) (struct type *type, struct symbol *new_symbol,
+ struct ui_file *stream);
+
/* Print a value using syntax appropriate for this language. */
int (*la_val_print) (struct type *, const gdb_byte *, int, CORE_ADDR,
@@ -465,4 +464,8 @@ int language_pass_by_reference (struct type *type);
independent of this. */
int default_pass_by_reference (struct type *type);
+/* The default implementation of la_print_typedef. */
+void default_print_typedef (struct type *type, struct symbol *new_symbol,
+ struct ui_file *stream);
+
#endif /* defined (LANGUAGE_H) */
diff --git a/gdb/m2-lang.c b/gdb/m2-lang.c
index bb205ad..8cb1cf7 100644
--- a/gdb/m2-lang.c
+++ b/gdb/m2-lang.c
@@ -372,6 +372,7 @@ const struct language_defn m2_language_defn =
m2_printstr, /* function to print string constant */
m2_emit_char, /* Function to print a single character */
m2_print_type, /* Print a type using appropriate syntax */
+ m2_print_typedef, /* Print a typedef using appropriate syntax */
m2_val_print, /* Print a value using appropriate syntax */
c_value_print, /* Print a top-level value */
NULL, /* Language specific skip_trampoline */
diff --git a/gdb/m2-lang.h b/gdb/m2-lang.h
index 12165ad..94ef411 100644
--- a/gdb/m2-lang.h
+++ b/gdb/m2-lang.h
@@ -26,6 +26,9 @@ extern void m2_error (char *); /* Defined in m2-exp.y */
extern void m2_print_type (struct type *, char *, struct ui_file *, int,
int);
+extern void m2_print_typedef (struct type *, struct symbol *,
+ struct ui_file *);
+
extern int m2_is_long_set (struct type *type);
extern int m2_is_unbounded_array (struct type *type);
diff --git a/gdb/m2-typeprint.c b/gdb/m2-typeprint.c
index 335f8c3..efe0df2 100644
--- a/gdb/m2-typeprint.c
+++ b/gdb/m2-typeprint.c
@@ -154,6 +154,26 @@ m2_print_type (struct type *type, char *varstring, struct ui_file *stream,
}
}
+/* Print a typedef using M2 syntax. TYPE is the underlying type.
+ NEW_SYMBOL is the symbol naming the type. STREAM is the stream on
+ which to print. */
+
+void
+m2_print_typedef (struct type *type, struct symbol *new_symbol,
+ struct ui_file *stream)
+{
+ CHECK_TYPEDEF (type);
+ fprintf_filtered (stream, "TYPE ");
+ if (!TYPE_NAME (SYMBOL_TYPE (new_symbol))
+ || strcmp (TYPE_NAME ((SYMBOL_TYPE (new_symbol))),
+ SYMBOL_LINKAGE_NAME (new_symbol)) != 0)
+ fprintf_filtered (stream, "%s = ", SYMBOL_PRINT_NAME (new_symbol));
+ else
+ fprintf_filtered (stream, "<builtin> = ");
+ type_print (type, "", stream, 0);
+ fprintf_filtered (stream, ";\n");
+}
+
/* m2_type_name - if a, type, has a name then print it. */
void
diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c
index 56871e3..7077eb5 100644
--- a/gdb/objc-lang.c
+++ b/gdb/objc-lang.c
@@ -505,6 +505,7 @@ const struct language_defn objc_language_defn = {
objc_printstr, /* Function to print string constant */
objc_emit_char,
c_print_type, /* Print a type using appropriate syntax */
+ c_print_typedef, /* Print a typedef using appropriate syntax */
c_val_print, /* Print a value using appropriate syntax */
c_value_print, /* Print a top-level value */
objc_skip_trampoline, /* Language specific skip_trampoline */
diff --git a/gdb/p-lang.c b/gdb/p-lang.c
index 2accf35..291d3b4 100644
--- a/gdb/p-lang.c
+++ b/gdb/p-lang.c
@@ -411,6 +411,7 @@ const struct language_defn pascal_language_defn =
pascal_printstr, /* Function to print string constant */
pascal_emit_char, /* Print a single char */
pascal_print_type, /* Print a type using appropriate syntax */
+ pascal_print_typedef, /* Print a typedef using appropriate syntax */
pascal_val_print, /* Print a value using appropriate syntax */
pascal_value_print, /* Print a top-level value */
NULL, /* Language specific skip_trampoline */
diff --git a/gdb/p-lang.h b/gdb/p-lang.h
index b840041..a4f878f 100644
--- a/gdb/p-lang.h
+++ b/gdb/p-lang.h
@@ -31,6 +31,9 @@ extern void pascal_error (char *); /* Defined in p-exp.y */
/* Defined in p-typeprint.c */
extern void pascal_print_type (struct type *, char *, struct ui_file *, int, int);
+extern void pascal_print_typedef (struct type *, struct symbol *,
+ struct ui_file *);
+
extern int pascal_val_print (struct type *, const gdb_byte *, int,
CORE_ADDR, struct ui_file *, int, int,
int, enum val_prettyprint);
diff --git a/gdb/p-typeprint.c b/gdb/p-typeprint.c
index e2c34e5..676498b 100644
--- a/gdb/p-typeprint.c
+++ b/gdb/p-typeprint.c
@@ -87,6 +87,21 @@ pascal_print_type (struct type *type, char *varstring, struct ui_file *stream,
}
+/* Print a typedef using Pascal syntax. TYPE is the underlying type.
+ NEW_SYMBOL is the symbol naming the type. STREAM is the stream on
+ which to print. */
+
+void
+pascal_print_typedef (struct type *type, struct symbol *new_symbol,
+ struct ui_file *stream)
+{
+ CHECK_TYPEDEF (type);
+ fprintf_filtered (stream, "type ");
+ fprintf_filtered (stream, "%s = ", SYMBOL_PRINT_NAME (new_symbol));
+ type_print (type, "", stream, 0);
+ fprintf_filtered (stream, ";\n");
+}
+
/* If TYPE is a derived type, then print out derivation information.
Print only the actual base classes of this type, not the base classes
of the base classes. I.E. for the derivation hierarchy:
diff --git a/gdb/scm-lang.c b/gdb/scm-lang.c
index 991e4b4..cef5010 100644
--- a/gdb/scm-lang.c
+++ b/gdb/scm-lang.c
@@ -248,6 +248,7 @@ const struct language_defn scm_language_defn =
scm_printstr, /* Function to print string constant */
NULL, /* Function to print a single character */
c_print_type, /* Print a type using appropriate syntax */
+ default_print_typedef, /* Print a typedef using appropriate syntax */
scm_val_print, /* Print a value using appropriate syntax */
scm_value_print, /* Print a top-level value */
NULL, /* Language specific skip_trampoline */
diff --git a/gdb/symtab.c b/gdb/symtab.c
index 1a0dcba..331fc53 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -3312,7 +3312,7 @@ print_symbol_info (domain_enum kind, struct symtab *s, struct symbol *sym,
/* Typedef that is not a C++ class */
if (kind == TYPES_DOMAIN
&& SYMBOL_DOMAIN (sym) != STRUCT_DOMAIN)
- typedef_print (SYMBOL_TYPE (sym), sym, gdb_stdout);
+ current_language->la_print_typedef (SYMBOL_TYPE (sym), sym, gdb_stdout);
/* variable, func, or typedef-that-is-c++-class */
else if (kind < TYPES_DOMAIN ||
(kind == TYPES_DOMAIN &&
diff --git a/gdb/typeprint.c b/gdb/typeprint.c
index 0ec0e26..7ca9cb2 100644
--- a/gdb/typeprint.c
+++ b/gdb/typeprint.c
@@ -47,48 +47,14 @@ static void whatis_command (char *, int);
static void whatis_exp (char *, int);
-/* Print a description of a type in the format of a
- typedef for the current language.
- NEW is the new name for a type TYPE. */
+
+/* The default way to print a typedef. */
void
-typedef_print (struct type *type, struct symbol *new, struct ui_file *stream)
+default_print_typedef (struct type *type, struct symbol *new_symbol,
+ struct ui_file *stream)
{
- CHECK_TYPEDEF (type);
- switch (current_language->la_language)
- {
-#ifdef _LANG_c
- case language_c:
- case language_cplus:
- fprintf_filtered (stream, "typedef ");
- type_print (type, "", stream, 0);
- if (TYPE_NAME ((SYMBOL_TYPE (new))) == 0
- || strcmp (TYPE_NAME ((SYMBOL_TYPE (new))), SYMBOL_LINKAGE_NAME (new)) != 0)
- fprintf_filtered (stream, " %s", SYMBOL_PRINT_NAME (new));
- break;
-#endif
-#ifdef _LANG_m2
- case language_m2:
- fprintf_filtered (stream, "TYPE ");
- if (!TYPE_NAME (SYMBOL_TYPE (new))
- || strcmp (TYPE_NAME ((SYMBOL_TYPE (new))), SYMBOL_LINKAGE_NAME (new)) != 0)
- fprintf_filtered (stream, "%s = ", SYMBOL_PRINT_NAME (new));
- else
- fprintf_filtered (stream, "<builtin> = ");
- type_print (type, "", stream, 0);
- break;
-#endif
-#ifdef _LANG_pascal
- case language_pascal:
- fprintf_filtered (stream, "type ");
- fprintf_filtered (stream, "%s = ", SYMBOL_PRINT_NAME (new));
- type_print (type, "", stream, 0);
- break;
-#endif
- default:
- error (_("Language not supported."));
- }
- fprintf_filtered (stream, ";\n");
+ error (_("Language not supported."));
}
/* Print a description of a type TYPE in the form of a declaration of a
diff --git a/gdb/value.h b/gdb/value.h
index 2aac9b2..c0046bf 100644
--- a/gdb/value.h
+++ b/gdb/value.h
@@ -543,9 +543,6 @@ extern void print_variable_value (struct symbol *var,
extern int check_field (struct type *, const char *);
-extern void typedef_print (struct type *type, struct symbol *news,
- struct ui_file *stream);
-
extern char *internalvar_name (struct internalvar *var);
extern void preserve_values (struct objfile *);