From c26cc9a6a615c77e768eda6d6e42b0c389f6a74f Mon Sep 17 00:00:00 2001 From: Jerry DeLisle Date: Fri, 2 May 2008 01:33:16 +0000 Subject: [PATCH] re PR libfortran/36094 (Runtime error show_locus not working correctly) 2008-05-01 Jerry DeLisle 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 --- libgfortran/ChangeLog | 7 +++++++ libgfortran/io/open.c | 2 +- libgfortran/runtime/error.c | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index dbdaa0decee..63b6ad0ddc8 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,10 @@ +2008-05-01 Jerry DeLisle + + 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 * intrinsics/selected_char_kind.c: New file. diff --git a/libgfortran/io/open.c b/libgfortran/io/open.c index 4e904d37df9..83e37ee22fd 100644 --- 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 f0a4ff2291d..8cd966fa23f 100644 --- 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; } -- 2.30.2