From 89658955e592792b3bac0fc5207cb28112cb4440 Mon Sep 17 00:00:00 2001 From: Bernardo Innocenti Date: Sun, 25 Jul 2004 21:32:47 +0200 Subject: [PATCH] c-decl.c (groktypename, [...]): Rename variable typename to type_name. * c-decl.c (groktypename, groktypename_in_param_context): Rename variable typename to type_name. * c-lex.c (interpret_float): Likewise. From-SVN: r85161 --- gcc/ChangeLog | 6 ++++++ gcc/c-decl.c | 24 ++++++++++++------------ gcc/c-lex.c | 12 ++++++------ 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5bf60dede09..d3f99783cbe 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2004-07-25 Bernardo Innocenti + + * c-decl.c (groktypename, groktypename_in_param_context): Rename + variable typename to type_name. + * c-lex.c (interpret_float): Likewise. + 2004-07-25 Roger Sayle * convert.c (convert_to_real, convert_to_integer, diff --git a/gcc/c-decl.c b/gcc/c-decl.c index 31927a456a9..475ce6c7c8f 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -2646,33 +2646,33 @@ set_array_declarator_type (tree decl, tree type, int abstract_p) /* Decode a "typename", such as "int **", returning a ..._TYPE node. */ tree -groktypename (tree typename) +groktypename (tree type_name) { tree specs, attrs; - if (TREE_CODE (typename) != TREE_LIST) - return typename; + if (TREE_CODE (type_name) != TREE_LIST) + return type_name; - split_specs_attrs (TREE_PURPOSE (typename), &specs, &attrs); + split_specs_attrs (TREE_PURPOSE (type_name), &specs, &attrs); - typename = grokdeclarator (TREE_VALUE (typename), specs, TYPENAME, 0, + type_name = grokdeclarator (TREE_VALUE (type_name), specs, TYPENAME, 0, NULL); /* Apply attributes. */ - decl_attributes (&typename, attrs, 0); + decl_attributes (&type_name, attrs, 0); - return typename; + return type_name; } /* Return a PARM_DECL node for a given pair of specs and declarator. */ tree -groktypename_in_parm_context (tree typename) +groktypename_in_parm_context (tree type_name) { - if (TREE_CODE (typename) != TREE_LIST) - return typename; - return grokdeclarator (TREE_VALUE (typename), - TREE_PURPOSE (typename), + if (TREE_CODE (type_name) != TREE_LIST) + return type_name; + return grokdeclarator (TREE_VALUE (type_name), + TREE_PURPOSE (type_name), PARM, 0, NULL); } diff --git a/gcc/c-lex.c b/gcc/c-lex.c index 61f39d09b3e..c7d03fb47e4 100644 --- a/gcc/c-lex.c +++ b/gcc/c-lex.c @@ -597,24 +597,24 @@ interpret_float (const cpp_token *token, unsigned int flags) REAL_VALUE_TYPE real; char *copy; size_t copylen; - const char *typename; + const char *type_name; - /* FIXME: make %T work in error/warning, then we don't need typename. */ + /* FIXME: make %T work in error/warning, then we don't need type_name. */ if ((flags & CPP_N_WIDTH) == CPP_N_LARGE) { type = long_double_type_node; - typename = "long double"; + type_name = "long double"; } else if ((flags & CPP_N_WIDTH) == CPP_N_SMALL || flag_single_precision_constant) { type = float_type_node; - typename = "float"; + type_name = "float"; } else { type = double_type_node; - typename = "double"; + type_name = "double"; } /* Copy the constant to a nul-terminated buffer. If the constant @@ -641,7 +641,7 @@ interpret_float (const cpp_token *token, unsigned int flags) ??? That's a dubious reason... is this a mandatory diagnostic or isn't it? -- zw, 2001-08-21. */ if (REAL_VALUE_ISINF (real) && pedantic) - warning ("floating constant exceeds range of \"%s\"", typename); + warning ("floating constant exceeds range of \"%s\"", type_name); /* Create a node with determined type and value. */ value = build_real (type, real); -- 2.30.2