2008-06-18 Daniel Kraft <d@domob.eu>

	PR fortran/36517, fortran/36492
	* gfortran.dg/array_constructor_25.f03:  New test.
	* gfortran.dg/array_constructor_26.f03:  New test.
	* gfortran.dg/array_constructor_27.f03:  New test.
	* gfortran.dg/array_constructor_28.f03:  New test.
	* gfortran.dg/array_constructor_29.f03:  New test.
	* gfortran.dg/array_constructor_30.f03:  New test.
	* gfortran.dg/array_constructor_type_19.f03:  New test.
	* gfortran.dg/array_constructor_type_20.f03:  New test.
	* gfortran.dg/array_constructor_type_21.f03:  New test.

2008-06-18  Daniel Kraft  <d@domob.eu>

	PR fortran/36517, fortran/36492
	* array.c (gfc_resolve_character_array_constructor):  Call
	gfc_set_constant_character_len with changed length-chec argument.
	* decl.c (gfc_set_constant_character_len):  Changed array argument to
	be a generic length-checking argument that can be used for correct
	checking with typespec and in special cases where the should-be length
	is different from the target length.
	(build_struct):  Call gfc_set_constant_character_len with changed length
	checking argument and introduced additional checks for exceptional
	conditions on invalid code.
	(add_init_expr_to_sym), (do_parm):  Call gfc_set_constant_character_len
	with changed argument.
	* match.h (gfc_set_constant_character_len):  Changed third argument to
	int for the should-be length rather than bool.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@136894 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 23 insertions, 19 deletions

diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c
index 73b78c3f2fc..a34695e4241 100644
--- a/gcc/fortran/array.c
+++ b/gcc/fortran/array.c
@@ -1680,25 +1680,29 @@ got_charlen:
 	 (without typespec) all elements are verified to have the same length
 	 anyway.  */
       if (found_length != -1)
-        for (p = expr->value.constructor; p; p = p->next)
-          if (p->expr->expr_type == EXPR_CONSTANT)
-            {
-              gfc_expr *cl = NULL;
-              int current_length = -1;
-
-              if (p->expr->ts.cl && p->expr->ts.cl->length)
-              {
-                cl = p->expr->ts.cl->length;
-                gfc_extract_int (cl, &current_length);
-              }
-
-              /* If gfc_extract_int above set current_length, we implicitly
-                 know the type is BT_INTEGER and it's EXPR_CONSTANT.  */
-
-              if (! cl
-                  || (current_length != -1 && current_length < found_length))
-                gfc_set_constant_character_len (found_length, p->expr, true);
-            }
+	for (p = expr->value.constructor; p; p = p->next)
+	  if (p->expr->expr_type == EXPR_CONSTANT)
+	    {
+	      gfc_expr *cl = NULL;
+	      int current_length = -1;
+	      bool has_ts;
+
+	      if (p->expr->ts.cl && p->expr->ts.cl->length)
+	      {
+		cl = p->expr->ts.cl->length;
+		gfc_extract_int (cl, &current_length);
+	      }
+
+	      /* If gfc_extract_int above set current_length, we implicitly
+		 know the type is BT_INTEGER and it's EXPR_CONSTANT.  */
+
+	      has_ts = (expr->ts.cl && expr->ts.cl->length_from_typespec);
+
+	      if (! cl
+		  || (current_length != -1 && current_length < found_length))
+		gfc_set_constant_character_len (found_length, p->expr,
+						has_ts ? -1 : found_length);
+	    }
     }
 
   return SUCCESS;