re PR fortran/33957 (gfortran rejects valid initialization expression)

	PR fortran/33957

	* gfortran.dg/initialization_15.f90 : New test.

	* expr.c (check_inquiry): Don't call gfc_error now.

From-SVN: r130246

gcc/fortran/ChangeLog

 2007-11-16  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
+	PR fortran/33957
+	* expr.c (check_inquiry): Don't call gfc_error now.
+
+2007-11-16  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+
 	PR fortran/33739
 	PR fortran/34084
 	* scanner.c (start_source_file, end_source_file,

gcc/fortran/expr.c

@@ -1981,11 +1981,7 @@ check_inquiry (gfc_expr *e, int not_restricted)
       break;
 
   if (functions[i] == NULL)
-    {
-      gfc_error ("Inquiry function '%s' at %L is not permitted "
-		 "in an initialization expression", name, &e->where);
     return MATCH_ERROR;
-    }
 
   /* At this point we have an inquiry function with a variable argument.  The
      type of the variable might be undefined, but we need it now, because the

gcc/testsuite/ChangeLog

+2007-11-16  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+
+	PR fortran/33957
+	* gfortran.dg/initialization_15.f90 : New test.
+
 2007-11-16  Richard Guenther  <rguenther@suse.de>
 
 	PR middle-end/34030

gcc/testsuite/gfortran.dg/initialization_15.f90

+! { dg-do compile }
+! Test by Dominique d'Humieres (PR 33957)
+function bug(i) result(c)
+  integer, pointer :: i
+  character(len=merge(1,2, associated(i))) :: c
+  c = ""
+end function bug