diff options
| author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2008-05-02 01:33:16 +0000 |
|---|---|---|
| committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2008-05-02 01:33:16 +0000 |
| commit | c26cc9a6a615c77e768eda6d6e42b0c389f6a74f (patch) | |
| tree | 82b7da964ed54742a86325c50e8da514f0edffbf /libgfortran | |
| parent | 7cbb32e76988a3a9c790751864e409a01db63fe4 (diff) | |
| download | gcc-c26cc9a6a615c77e768eda6d6e42b0c389f6a74f.zip gcc-c26cc9a6a615c77e768eda6d6e42b0c389f6a74f.tar.gz gcc-c26cc9a6a615c77e768eda6d6e42b0c389f6a74f.tar.bz2 | |
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
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 7 | ||||
| -rw-r--r-- | libgfortran/io/open.c | 2 | ||||
| -rw-r--r-- | libgfortran/runtime/error.c | 5 |
3 files changed, 13 insertions, 1 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index dbdaa0d..63b6ad0 100644 --- 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 4e904d3..83e37ee 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 f0a4ff2..8cd966f 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; } |