Re: [C++ Patch] Small grokdeclarator clean up

[Jason Merrill]

OK.

Jason

[C++ Patch] Small grokdeclarator clean up

[Paolo Carlini]

Hi again,

this one adds a typedef_p to grokdeclarator and uses it everywhere.

Paolo.

//
2013-03-25  Paolo Carlini  

* decl.c (grokdeclarator): Declare typedef_p and use it everywhere.
Index: decl.c
===
--- decl.c  (revision 196374)
+++ decl.c  (working copy)
@@ -8652,6 +8652,7 @@ grokdeclarator (const cp_declarator *declarator,
   bool parameter_pack_p = declarator? declarator->parameter_pack_p : false;
   bool template_type_arg = false;
   bool template_parm_flag = false;
+  bool typedef_p = decl_spec_seq_has_spec_p (declspecs, ds_typedef);
   bool constexpr_p = decl_spec_seq_has_spec_p (declspecs, ds_constexpr);
   const char *errmsg;
 
@@ -8862,7 +8863,7 @@ grokdeclarator (const cp_declarator *declarator,
 
   if (dname && IDENTIFIER_OPNAME_P (dname))
 {
-  if (decl_spec_seq_has_spec_p (declspecs, ds_typedef))
+  if (typedef_p)
{
  error ("declaration of %qD as %", dname);
  return error_mark_node;
@@ -8900,7 +8901,7 @@ grokdeclarator (const cp_declarator *declarator,
   if (name == NULL)
 name = decl_context == PARM ? "parameter" : "type name";
 
-  if (constexpr_p && decl_spec_seq_has_spec_p (declspecs, ds_typedef))
+  if (constexpr_p && typedef_p)
 {
   error ("% cannot appear in a typedef declaration");
   return error_mark_node;
@@ -9198,7 +9199,7 @@ grokdeclarator (const cp_declarator *declarator,
   /* Issue errors about use of storage classes for parameters.  */
   if (decl_context == PARM)
 {
-  if (decl_spec_seq_has_spec_p (declspecs, ds_typedef))
+  if (typedef_p)
{
  error ("typedef declaration invalid in parameter declaration");
  return error_mark_node;
@@ -9242,7 +9243,7 @@ grokdeclarator (const cp_declarator *declarator,
   && ((storage_class
   && storage_class != sc_extern
   && storage_class != sc_static)
- || decl_spec_seq_has_spec_p (declspecs, ds_typedef)))
+ || typedef_p))
 {
   error ("multiple storage classes in declaration of %qs", name);
   thread_p = false;
@@ -9256,7 +9257,7 @@ grokdeclarator (const cp_declarator *declarator,
  && (storage_class == sc_register
  || storage_class == sc_auto))
;
-  else if (decl_spec_seq_has_spec_p (declspecs, ds_typedef))
+  else if (typedef_p)
;
   else if (decl_context == FIELD
   /* C++ allows static class elements.  */
@@ -9866,8 +9867,7 @@ grokdeclarator (const cp_declarator *declarator,
  return error_mark_node;
}
}
-  else if (decl_spec_seq_has_spec_p (declspecs, ds_typedef)
-  && current_class_type)
+  else if (typedef_p && current_class_type)
{
  error ("cannot declare member %<%T::%s%> within %qT",
 ctype, name, current_class_type);
@@ -9944,8 +9944,7 @@ grokdeclarator (const cp_declarator *declarator,
  error ("non-member %qs cannot be declared %", name);
  storage_class = sc_none;
}
-  else if (decl_context == TYPENAME
-  || decl_spec_seq_has_spec_p (declspecs, ds_typedef))
+  else if (decl_context == TYPENAME || typedef_p)
{
  error ("non-object member %qs cannot be declared %", name);
  storage_class = sc_none;
@@ -9975,7 +9974,7 @@ grokdeclarator (const cp_declarator *declarator,
 }
 
   /* If this is declaring a typedef name, return a TYPE_DECL.  */
-  if (decl_spec_seq_has_spec_p (declspecs, ds_typedef) && decl_context != 
TYPENAME)
+  if (typedef_p && decl_context != TYPENAME)
 {
   tree decl;