[multiple changes]

2007-02-21  Bernhard Fischer  <aldot@gcc.gnu.org>

	* parse.c (next_free): Gooble spaces after OpenMP sentinel.

2007-02-21  Jakub Jelinek  <jakub@redhat.com>

	* gfortran.dg/gomp/omp_parse1.f90: New test.
	* gfortran.dg/gomp/omp_parse2.f: New test.

From-SVN: r122190

gcc/fortran/ChangeLog

+2007-02-21  Bernhard Fischer  <aldot@gcc.gnu.org>
+
+	* parse.c (next_free): Gooble spaces after OpenMP sentinel.
+
 2007-02-20  Thomas Koenig  <Thomas.Koenig@online.de>
 
 	PR fortran/30869
-	* match.c(gfc_match_iterator):  Remove conflict between
+	* match.c (gfc_match_iterator): Remove conflict between
 	loop variable and pointer.
 
 2007-02-20  Tobias Burnus  <burnus@net-b.de>
@@ -22,7 +26,7 @@
 2007-02-19  Thomas Koenig  <Thomas.Koenig@online.de>
 
 	PR libfortran/30533
-	* fortran/iresolve.c(gfc_resolve_maxloc):  Remove coercion of
+	* fortran/iresolve.c (gfc_resolve_maxloc): Remove coercion of
 	argument to default integer.
 	(gfc_resolve_minloc): Likewise.
 
@@ -328,12 +332,12 @@
 	PR libfortran/30389
 	* gfortran.h: Remove gfc_simplify_init_1.
 	* arith.h: Remove third argument from gfc_compare_string.
-	* arith.c(gfc_compare_expression):  Remove third argument
+	* arith.c (gfc_compare_expression): Remove third argument
 	from call to gfc_compare_string.
 	(gfc_compare_string): Remove third argument xcoll_table.
 	Remove use of xcoll_table.
-	* misc.c(gfc_init_1):  Remove call to gfc_simplify_init_1.
-	* simplify.c(ascii_table):  Remove.
+	* misc.c (gfc_init_1): Remove call to gfc_simplify_init_1.
+	* simplify.c (ascii_table): Remove.
 	(xascii_table): Likewise.
 	(gfc_simplify_achar): ICE if extract_int fails.  Remove use of
 	ascii_table.  Warn if -Wsurprising and value < 0 or > 127.

gcc/fortran/parse.c

@@ -485,6 +485,7 @@ next_free (void)
 	    gcc_assert (c == "!$omp"[i]);
 
 	  gcc_assert (c == ' ');
+	  gfc_gobble_whitespace ();
 	  return decode_omp_directive ();
 	}
     }

gcc/testsuite/ChangeLog

+2007-02-21  Jakub Jelinek  <jakub@redhat.com>
+
+	* gfortran.dg/gomp/omp_parse1.f90: New test.
+	* gfortran.dg/gomp/omp_parse2.f: New test.
+
 2007-02-20  Thomas Koenig  <Thomas.Koenig@online.de>
 
 	PR fortran/30869

gcc/testsuite/gfortran.dg/gomp/omp_parse1.f90

+! { dg-do compile }
+! { dg-options "-fopenmp -fdump-tree-omplower" }
+  !$omp  parallel
+call bar
+	!$omp end parallel
+  !$omp 	 	p&
+!$omp&arallel
+call bar
+!$omp e&
+!$omp&ndparallel
+!$omp  &
+!$omp  &  &
+!$omp pa&
+!$omp rallel
+call bar
+!$omp end parallel
+! Non-continuation !$omp must be followed by space, and my reading
+! doesn't seem to allow tab there.  So such lines should be completely
+! ignored.
+!$omp	strange
+end
+
+! { dg-final { scan-tree-dump-times "pragma omp parallel" 3 "omplower" } }
+! { dg-final { cleanup-tree-dump "omplower" } }

gcc/testsuite/gfortran.dg/gomp/omp_parse2.f

+c { dg-do compile }
+c { dg-options "-fopenmp -fdump-tree-omplower" }
+!$omp  parallel
+      call bar
+c$omp	end parallel
+C$omp 	 	p
+*$omp+arallel
+      call bar
+!$omp e
+!$omp+ndparallel
+      end
+
+! { dg-final { scan-tree-dump-times "pragma omp parallel" 2 "omplower" } }
+! { dg-final { cleanup-tree-dump "omplower" } }