re PR fortran/77584 (Unclassifiable statement error with procedure pointer using…

re PR fortran/77584 (Unclassifiable statement error with procedure pointer using template named "structure_")

2016-09-19  Fritz Reese  <fritzoreese@gmail.com>

	PR fortran/77584
	* gcc/fortran/decl.c (match_record_decl, gfc_match_decl_type_spec):
	Fixes to handling of structure/record from declaration-type-spec.

	* gcc/testsuite/gfortran.dg/dec_structure_15.f90: New testcase.

From-SVN: r240230

gcc/fortran/ChangeLog

+2016-09-19  Fritz Reese  <fritzoreese@gmail.com>
+
+	PR fortran/77584
+	* decl.c (match_record_decl, gfc_match_decl_type_spec): Fixes to
+	handling of structure/record from declaration-type-spec.
+
 2016_09_17  Louis Krupp  <louis.krupp@zoho.com>
 
 	PR fortran/68078

gcc/fortran/decl.c

@@ -2909,12 +2909,14 @@ done:
 /* Matches a RECORD declaration. */
 
 static match
-match_record_decl (const char *name)
+match_record_decl (char *name)
 {
     locus old_loc;
     old_loc = gfc_current_locus;
+    match m;
 
-    if (gfc_match (" record") == MATCH_YES)
+    m = gfc_match (" record /");
+    if (m == MATCH_YES)
       {
           if (!gfc_option.flag_dec_structure)
             {
@@ -2923,17 +2925,20 @@ match_record_decl (const char *name)
                            "-fdec-structure");
                 return MATCH_ERROR;
             }
-          if (gfc_match (" /%n/", name) != MATCH_YES)
-            {
-                gfc_error ("Structure name expected after RECORD at %C");
-                gfc_current_locus = old_loc;
-                return MATCH_ERROR;
-            }
+          m = gfc_match (" %n/", name);
+          if (m == MATCH_YES)
             return MATCH_YES;
       }
 
   gfc_current_locus = old_loc;
+  if (gfc_option.flag_dec_structure
+      && (gfc_match (" record% ") == MATCH_YES
+          || gfc_match (" record%t") == MATCH_YES))
+    gfc_error ("Structure name expected after RECORD at %C");
+  if (m == MATCH_NO)
     return MATCH_NO;
+
+  return MATCH_ERROR;
 }
 
 /* Matches a declaration-type-spec (F03:R502).  If successful, sets the ts
@@ -3129,15 +3134,13 @@ gfc_match_decl_type_spec (gfc_typespec *ts, int implicit_flag)
     {
       /* Match nested STRUCTURE declarations; only valid within another
 	 structure declaration.  */
+      if (gfc_option.flag_dec_structure
+	  && (gfc_current_state () == COMP_STRUCTURE
+	      || gfc_current_state () == COMP_MAP))
+	{
 	  m = gfc_match (" structure");
-      if (m == MATCH_ERROR)
-        return MATCH_ERROR;
-      else if (m == MATCH_YES)
+	  if (m == MATCH_YES)
 	    {
-          if (   gfc_current_state () != COMP_STRUCTURE
-              && gfc_current_state () != COMP_MAP)
-              return MATCH_ERROR;
-
 	      m = gfc_match_structure_decl ();
 	      if (m == MATCH_YES)
 		{
@@ -3146,6 +3149,8 @@ gfc_match_decl_type_spec (gfc_typespec *ts, int implicit_flag)
 		  ts->u.derived = gfc_new_block;
 		  return MATCH_YES;
 		}
+	    }
+	  if (m == MATCH_ERROR)
 	    return MATCH_ERROR;
 	}
 

gcc/testsuite/ChangeLog

+2016-09-19  Fritz Reese  <fritzoreese@gmail.com>
+
+	PR fortran/77584
+	* gfortran.dg/dec_structure_15.f90: New testcase.
+
 2016-09-19  Richard Biener  <rguenther@suse.de>
 
 	PR middle-end/77605