From 46b0da1738df4a49025f1674a67cd841688dd3d9 Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Thu, 18 Dec 2014 01:10:34 -0800 Subject: [PATCH] language_lookup_primitive_type: Renamed from language_lookup_primitive_type_by_name. gdb/ChangeLog: * language.c (language_lookup_primitive_type): Renamed from language_lookup_primitive_type_by_name. All callers updated. --- gdb/ChangeLog | 5 +++++ gdb/ada-exp.y | 12 ++++++------ gdb/c-exp.y | 6 +++--- gdb/d-exp.y | 4 ++-- gdb/f-exp.y | 4 ++-- gdb/gdbtypes.c | 2 +- gdb/go-exp.y | 6 +++--- gdb/language.c | 9 ++++----- gdb/language.h | 6 +++--- gdb/p-exp.y | 4 ++-- 10 files changed, 31 insertions(+), 27 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a9656691eb0..c7b4b21fc87 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2014-12-18 Doug Evans + + * language.c (language_lookup_primitive_type): Renamed from + language_lookup_primitive_type_by_name. All callers updated. + 2014-12-17 Jan Kratochvil Fix MinGW compilation. diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y index 0a4995202ae..c02f6a161bb 100644 --- a/gdb/ada-exp.y +++ b/gdb/ada-exp.y @@ -1086,9 +1086,9 @@ static struct type* find_primitive_type (struct parser_state *par_state, char *name) { struct type *type; - type = language_lookup_primitive_type_by_name (parse_language (par_state), - parse_gdbarch (par_state), - name); + type = language_lookup_primitive_type (parse_language (par_state), + parse_gdbarch (par_state), + name); if (type == NULL && strcmp ("system__address", name) == 0) type = type_system_address (par_state); @@ -1525,9 +1525,9 @@ static struct type * type_system_address (struct parser_state *par_state) { struct type *type - = language_lookup_primitive_type_by_name (parse_language (par_state), - parse_gdbarch (par_state), - "system__address"); + = language_lookup_primitive_type (parse_language (par_state), + parse_gdbarch (par_state), + "system__address"); return type != NULL ? type : parse_type (par_state)->builtin_data_ptr; } diff --git a/gdb/c-exp.y b/gdb/c-exp.y index 9d1c4c7755e..707e504ebe2 100644 --- a/gdb/c-exp.y +++ b/gdb/c-exp.y @@ -2942,9 +2942,9 @@ classify_name (struct parser_state *par_state, const struct block *block, } yylval.tsym.type - = language_lookup_primitive_type_by_name (parse_language (par_state), - parse_gdbarch (par_state), - copy); + = language_lookup_primitive_type (parse_language (par_state), + parse_gdbarch (par_state), + copy); if (yylval.tsym.type != NULL) return TYPENAME; diff --git a/gdb/d-exp.y b/gdb/d-exp.y index 5e4c10dfe70..00d3a26ab2b 100644 --- a/gdb/d-exp.y +++ b/gdb/d-exp.y @@ -1577,8 +1577,8 @@ yylex (void) return DOLLAR_VARIABLE; yylval.tsym.type - = language_lookup_primitive_type_by_name (parse_language (pstate), - parse_gdbarch (pstate), copy); + = language_lookup_primitive_type (parse_language (pstate), + parse_gdbarch (pstate), copy); if (yylval.tsym.type != NULL) return TYPENAME; diff --git a/gdb/f-exp.y b/gdb/f-exp.y index f229afa0f96..ab3801a36af 100644 --- a/gdb/f-exp.y +++ b/gdb/f-exp.y @@ -1230,8 +1230,8 @@ yylex (void) } yylval.tsym.type - = language_lookup_primitive_type_by_name (parse_language (pstate), - parse_gdbarch (pstate), tmp); + = language_lookup_primitive_type (parse_language (pstate), + parse_gdbarch (pstate), tmp); if (yylval.tsym.type != NULL) return TYPENAME; diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index c5a390a9533..0048f6a1a5f 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -1310,7 +1310,7 @@ lookup_typename (const struct language_defn *language, if (sym != NULL && SYMBOL_CLASS (sym) == LOC_TYPEDEF) return SYMBOL_TYPE (sym); - type = language_lookup_primitive_type_by_name (language, gdbarch, name); + type = language_lookup_primitive_type (language, gdbarch, name); if (type) return type; diff --git a/gdb/go-exp.y b/gdb/go-exp.y index f9ffbf97dbb..51781783c40 100644 --- a/gdb/go-exp.y +++ b/gdb/go-exp.y @@ -1455,9 +1455,9 @@ classify_name (struct parser_state *par_state, const struct block *block) copy = copy_name (yylval.sval); /* Try primitive types first so they win over bad/weird debug info. */ - type = language_lookup_primitive_type_by_name (parse_language (par_state), - parse_gdbarch (par_state), - copy); + type = language_lookup_primitive_type (parse_language (par_state), + parse_gdbarch (par_state), + copy); if (type != NULL) { /* NOTE: We take advantage of the fact that yylval coming in was a diff --git a/gdb/language.c b/gdb/language.c index 8d476d398c1..df45ddd97c0 100644 --- a/gdb/language.c +++ b/gdb/language.c @@ -988,9 +988,9 @@ language_bool_type (const struct language_defn *la, } struct type * -language_lookup_primitive_type_by_name (const struct language_defn *la, - struct gdbarch *gdbarch, - const char *name) +language_lookup_primitive_type (const struct language_defn *la, + struct gdbarch *gdbarch, + const char *name) { struct language_gdbarch *ld = gdbarch_data (gdbarch, language_gdbarch_data); @@ -999,8 +999,7 @@ language_lookup_primitive_type_by_name (const struct language_defn *la, if (symbol_lookup_debug) { fprintf_unfiltered (gdb_stdlog, - "language_lookup_primitive_type_by_name" - " (%s, %s, %s)", + "language_lookup_primitive_type (%s, %s, %s)", la->la_name, host_address_to_string (gdbarch), name); } diff --git a/gdb/language.h b/gdb/language.h index 9ed7e22ac3e..aa07d8dada0 100644 --- a/gdb/language.h +++ b/gdb/language.h @@ -435,9 +435,9 @@ struct type *language_bool_type (const struct language_defn *l, struct type *language_string_char_type (const struct language_defn *l, struct gdbarch *gdbarch); -struct type *language_lookup_primitive_type_by_name (const struct language_defn *l, - struct gdbarch *gdbarch, - const char *name); +struct type *language_lookup_primitive_type (const struct language_defn *l, + struct gdbarch *gdbarch, + const char *name); /* These macros define the behaviour of the expression diff --git a/gdb/p-exp.y b/gdb/p-exp.y index 1c966ccdaf3..675514ca8cc 100644 --- a/gdb/p-exp.y +++ b/gdb/p-exp.y @@ -1710,8 +1710,8 @@ yylex (void) return TYPENAME; } yylval.tsym.type - = language_lookup_primitive_type_by_name (parse_language (pstate), - parse_gdbarch (pstate), tmp); + = language_lookup_primitive_type (parse_language (pstate), + parse_gdbarch (pstate), tmp); if (yylval.tsym.type != NULL) { free (uptokstart); -- 2.30.2