diff options
author | Paul N. Hilfinger <hilfinger@adacore.com> | 2004-12-21 10:03:55 +0000 |
---|---|---|
committer | Paul N. Hilfinger <hilfinger@adacore.com> | 2004-12-21 10:03:55 +0000 |
commit | 0b48a2912061d39173863a6824470beb73eab2ca (patch) | |
tree | 861e13636f2c82354ee06bc5f2c970892ec318b6 | |
parent | c3d75c30237aafd9aa332b71333b99bb78e4bb3a (diff) | |
download | gdb-0b48a2912061d39173863a6824470beb73eab2ca.zip gdb-0b48a2912061d39173863a6824470beb73eab2ca.tar.gz gdb-0b48a2912061d39173863a6824470beb73eab2ca.tar.bz2 |
* ada-lang.c (ada_print_subexp): Remove i18n markup from Ada code
output.
* ada-typeprint.c (ada_typedef_print): Ditto.
(print_unchecked_union_type): Ditto.
(print_record_type): Ditto, and correct output for non-derived
types that was inadvertently left off during the markup.
-rw-r--r-- | gdb/ChangeLog | 9 | ||||
-rw-r--r-- | gdb/ada-lang.c | 8 | ||||
-rw-r--r-- | gdb/ada-typeprint.c | 24 |
3 files changed, 26 insertions, 15 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cbab622..b55c60a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2004-12-21 Paul N. Hilfinger <hilfingr@otisco.mckusick.com> + + * ada-lang.c (ada_print_subexp): Remove i18n markup from Ada code + output. + * ada-typeprint.c (ada_typedef_print): Ditto. + (print_unchecked_union_type): Ditto. + (print_record_type): Ditto, and correct output for non-derived + types that was inadvertently left off during the markup. + 2004-12-19 Mark Kettenis <kettenis@gnu.org> * hppa-hpux-tdep.c (hppa64_hpux_search_dummy_call_sequence): Check diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 27005f7..c96a0bf 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -8384,9 +8384,9 @@ ada_print_subexp (struct expression *exp, int *pos, /* XXX: sprint_subexp */ *pos += oplen; print_subexp (exp, pos, stream, PREC_SUFFIX); - fputs_filtered (_(" in "), stream); + fputs_filtered (" in ", stream); print_subexp (exp, pos, stream, PREC_SUFFIX); - fputs_filtered (_("'range"), stream); + fputs_filtered ("'range", stream); if (exp->elts[pc + 1].longconst > 1) fprintf_filtered (stream, "(%ld)", (long) exp->elts[pc + 1].longconst); @@ -8398,7 +8398,7 @@ ada_print_subexp (struct expression *exp, int *pos, fputs_filtered ("(", stream); /* XXX: sprint_subexp */ print_subexp (exp, pos, stream, PREC_SUFFIX); - fputs_filtered (_(" in "), stream); + fputs_filtered (" in ", stream); print_subexp (exp, pos, stream, PREC_EQUAL); fputs_filtered (" .. ", stream); print_subexp (exp, pos, stream, PREC_EQUAL); @@ -8451,7 +8451,7 @@ ada_print_subexp (struct expression *exp, int *pos, *pos += oplen; /* XXX: sprint_subexp */ print_subexp (exp, pos, stream, PREC_SUFFIX); - fputs_filtered (_(" in "), stream); + fputs_filtered (" in ", stream); LA_PRINT_TYPE (exp->elts[pc + 1].type, "", stream, 1, 0); return; } diff --git a/gdb/ada-typeprint.c b/gdb/ada-typeprint.c index 0ca44d8..39a47f9 100644 --- a/gdb/ada-typeprint.c +++ b/gdb/ada-typeprint.c @@ -125,7 +125,7 @@ ada_typedef_print (struct type *type, struct symbol *new, struct ui_file *stream) { /* XXX: type_sprint */ - fprintf_filtered (stream, _("type %.*s is "), + fprintf_filtered (stream, "type %.*s is ", ada_name_prefix_len (SYMBOL_PRINT_NAME (new)), SYMBOL_PRINT_NAME (new)); type_print (type, "", stream, 1); @@ -633,13 +633,15 @@ print_record_type (struct type *type0, struct ui_file *stream, int show, parent_type = ada_parent_type (type); if (ada_type_name (parent_type) != NULL) - fprintf_filtered (stream, _("new %s with record"), + fprintf_filtered (stream, "new %s with record", decoded_type_name (parent_type)); else if (parent_type == NULL && ada_is_tagged_type (type, 0)) - fprintf_filtered (stream, _("tagged record")); + fprintf_filtered (stream, "tagged record"); + else + fprintf_filtered (stream, "record"); if (show < 0) - fprintf_filtered (stream, _(" ... end record")); + fprintf_filtered (stream, " ... end record"); else { int flds; @@ -651,11 +653,11 @@ print_record_type (struct type *type0, struct ui_file *stream, int show, flds += print_record_field_types (type, type, stream, show, level); if (flds > 0) - fprintf_filtered (stream, _("\n%*send record"), level, ""); + fprintf_filtered (stream, "\n%*send record", level, ""); else if (flds < 0) fprintf_filtered (stream, _(" <incomplete type> end record")); else - fprintf_filtered (stream, _(" null; end record")); + fprintf_filtered (stream, " null; end record"); } } @@ -668,18 +670,18 @@ print_unchecked_union_type (struct type *type, struct ui_file *stream, int show, int level) { if (show < 0) - fprintf_filtered (stream, _("record (?) is ... end record")); + fprintf_filtered (stream, "record (?) is ... end record"); else if (TYPE_NFIELDS (type) == 0) - fprintf_filtered (stream, _("record (?) is null; end record")); + fprintf_filtered (stream, "record (?) is null; end record"); else { int i; - fprintf_filtered (stream, _("record (?) is\n%*scase ? is"), level + 4, ""); + fprintf_filtered (stream, "record (?) is\n%*scase ? is", level + 4, ""); for (i = 0; i < TYPE_NFIELDS (type); i += 1) { - fprintf_filtered (stream, _("\n%*swhen ? =>\n%*s"), level + 8, "", + fprintf_filtered (stream, "\n%*swhen ? =>\n%*s", level + 8, "", level + 12, ""); ada_print_type (TYPE_FIELD_TYPE (type, i), TYPE_FIELD_NAME (type, i), @@ -687,7 +689,7 @@ print_unchecked_union_type (struct type *type, struct ui_file *stream, fprintf_filtered (stream, ";"); } - fprintf_filtered (stream, _("\n%*send case;\n%*send record"), + fprintf_filtered (stream, "\n%*send case;\n%*send record", level + 4, "", level, ""); } } |