re PR libfortran/36094 (Runtime error show_locus not working correctly)

2008-05-01  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR libfortran/36094
	* runtime/error.c (show_locus): Provide modified error message when
	filename has not yet been associated with a unit number.
	* io/open.c (encoding_opt[]): Comment out "utf-8" option and add TODO.

From-SVN: r134876

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index dbdaa0decee467a4c64d48aa32f8a27d9bcf7d6f..63b6ad0ddc88b4a02133c6ab7525497a0d11a7a9 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-01  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+       PR libfortran/36094
+       * runtime/error.c (show_locus): Provide modified error message when
+       filename has not yet been associated with a unit number.
+       * io/open.c (encoding_opt[]): Comment out "utf-8" option and add TODO.
+
 2008-04-30  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
        * intrinsics/selected_char_kind.c: New file.

diff --git a/libgfortran/io/open.c b/libgfortran/io/open.c
index 4e904d37df9443e3cd68442d8774899b4ab53576..83e37ee22fdff0f0ce73c9b2916ac5e084e8f613 100644 (file)
--- a/libgfortran/io/open.c
+++ b/libgfortran/io/open.c
@@ -107,7 +107,7 @@ static const st_option decimal_opt[] =
 
 static const st_option encoding_opt[] =
 {
-  { "utf-8", ENCODING_UTF8},
+  /* TODO { "utf-8", ENCODING_UTF8}, */
   { "default", ENCODING_DEFAULT},
   { NULL, 0}
 };

diff --git a/libgfortran/runtime/error.c b/libgfortran/runtime/error.c
index f0a4ff2291dc6476ba8f977de6bf75624de6f7ea..8cd966fa23f64382c2838fc61faf2bc471ac8f48 100644 (file)
--- a/libgfortran/runtime/error.c
+++ b/libgfortran/runtime/error.c
@@ -202,6 +202,11 @@ show_locus (st_parameter_common *cmp)
                   (int) cmp->line, cmp->filename, cmp->unit, filename);
          free_mem (filename);
        }
+      else
+       {
+         st_printf ("At line %d of file %s (unit = %d)\n",
+                  (int) cmp->line, cmp->filename, cmp->unit);
+       }
       return;
     }