07b3bbf200
2006-12-01 Thomas Koenig <Thomas.Koenig@online.de> PR libfortran/29568 * gfortran.dg/convert_implied_open.f90: Change to new default record length. * gfortran.dg/unf_short_record_1.f90: Adapt to new error message. * gfortran.dg/unformatted_subrecords_1.f90: New test. 2006-12-01 Thomas Koenig <Thomas.Koenig@online.de> PR libfortran/29568 * gfortran.h (gfc_option_t): Add max_subrecord_length. (top level): Define MAX_SUBRECORD_LENGTH. * lang.opt: Add option -fmax-subrecord-length=. * trans-decl.c: Add new function set_max_subrecord_length. (gfc_generate_function_code): If we are within the main program and max_subrecord_length has been set, call set_max_subrecord_length. * options.c (gfc_init_options): Add defaults for max_subrecord_lenght, convert and record_marker. (gfc_handle_option): Add handling for -fmax_subrecord_length. * invoke.texi: Document the new default for -frecord-marker=<n>. 2006-12-01 Thomas Koenig <Thomas.Koenig@online.de> PR libfortran/29568 * libgfortran/libgfortran.h (compile_options_t): Add record_marker. (top level): Define GFC_MAX_SUBRECORD_LENGTH. * runtime/compile_options.c (set_record_marker): Change default to four-byte record marker. (set_max_subrecord_length): New function. * runtime/error.c (translate_error): Change error message for short record on unformatted read. * io/io.h (gfc_unit): Add recl_subrecord, bytes_left_subrecord and continued. * io/file_pos.c (unformatted_backspace): Change default of record marker size to four bytes. Loop over subrecords. * io/open.c: Default recl is max_offset. If compile_options.max_subrecord_length has been set, set set u->recl_subrecord to its value, to the maximum value otherwise. * io/transfer.c (top level): Add prototypes for us_read, us_write, next_record_r_unf and next_record_w_unf. (read_block_direct): Separate codepaths for unformatted direct and unformatted sequential. If a recl has been set by the user, use the number of bytes left for the record if it is smaller than the read request. Loop over subrecords. Set an error if the user has set a recl and the read was short. (write_buf): Separate codepaths for unformatted direct and unformatted sequential. If a recl has been set by the user, use the number of bytes left for the record if it is smaller than the read request. Loop over subrecords. Set an error if the user has set a recl and the read was short. (us_read): Add parameter continued (to indicate that bytes_left should not be intialized). Change default of record marker size to four bytes. Use subrecord. If the subrecord length is smaller than zero, this indicates a continuation. (us_write): Add parameter continued (to indicate that the continued flag should be set). Use subrecord. (pre_position): Use 0 for continued on us_write and us_read calls. (skip_record): New function. (next_record_r_unf): New function. (next_record_r): Use next_record_r_unf. (write_us_marker): Default size for record markers is four bytes. (next_record_w_unf): New function. (next_record_w): Use next_record_w_unf. From-SVN: r119412
115 lines
3.1 KiB
C
115 lines
3.1 KiB
C
/* Handling of compile-time options that influence the library.
|
|
Copyright (C) 2005 Free Software Foundation, Inc.
|
|
|
|
This file is part of the GNU Fortran 95 runtime library (libgfortran).
|
|
|
|
Libgfortran is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
In addition to the permissions in the GNU General Public License, the
|
|
Free Software Foundation gives you unlimited permission to link the
|
|
compiled version of this file into combinations with other programs,
|
|
and to distribute those combinations without any restriction coming
|
|
from the use of this file. (The General Public License restrictions
|
|
do apply in other respects; for example, they cover modification of
|
|
the file, and distribution when not linked into a combine
|
|
executable.)
|
|
|
|
Libgfortran is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with libgfortran; see the file COPYING. If not, write to
|
|
the Free Software Foundation, 51 Franklin Street, Fifth Floor,
|
|
Boston, MA 02110-1301, USA. */
|
|
|
|
#include "config.h"
|
|
|
|
#include "libgfortran.h"
|
|
|
|
|
|
/* Useful compile-time options will be stored in here. */
|
|
compile_options_t compile_options;
|
|
|
|
|
|
/* Prototypes */
|
|
extern void set_std (GFC_INTEGER_4, GFC_INTEGER_4, GFC_INTEGER_4);
|
|
export_proto(set_std);
|
|
|
|
|
|
void
|
|
set_std (GFC_INTEGER_4 warn_std, GFC_INTEGER_4 allow_std,
|
|
GFC_INTEGER_4 pedantic)
|
|
{
|
|
compile_options.pedantic = pedantic;
|
|
compile_options.warn_std = warn_std;
|
|
compile_options.allow_std = allow_std;
|
|
}
|
|
|
|
|
|
/* Default values for the compile-time options. Keep in sync with
|
|
gcc/fortran/options.c (gfc_init_options). */
|
|
void
|
|
init_compile_options (void)
|
|
{
|
|
compile_options.warn_std = GFC_STD_F95_OBS | GFC_STD_F95_DEL
|
|
| GFC_STD_F2003 | GFC_STD_LEGACY;
|
|
compile_options.allow_std = GFC_STD_F95_OBS | GFC_STD_F95_DEL
|
|
| GFC_STD_F2003 | GFC_STD_F95 | GFC_STD_F77 | GFC_STD_GNU | GFC_STD_LEGACY;
|
|
compile_options.pedantic = 0;
|
|
}
|
|
|
|
/* Function called by the front-end to tell us the
|
|
default for unformatted data conversion. */
|
|
|
|
extern void set_convert (int);
|
|
export_proto (set_convert);
|
|
|
|
void
|
|
set_convert (int conv)
|
|
{
|
|
compile_options.convert = conv;
|
|
}
|
|
|
|
extern void set_record_marker (int);
|
|
export_proto (set_record_marker);
|
|
|
|
|
|
void
|
|
set_record_marker (int val)
|
|
{
|
|
|
|
switch(val)
|
|
{
|
|
case 4:
|
|
compile_options.record_marker = sizeof (GFC_INTEGER_4);
|
|
break;
|
|
|
|
case 8:
|
|
compile_options.record_marker = sizeof (GFC_INTEGER_8);
|
|
break;
|
|
|
|
default:
|
|
runtime_error ("Invalid value for record marker");
|
|
break;
|
|
}
|
|
}
|
|
|
|
extern void set_max_subrecord_length (int);
|
|
export_proto (set_max_subrecord_length);
|
|
|
|
void set_max_subrecord_length(int val)
|
|
{
|
|
if (val > GFC_MAX_SUBRECORD_LENGTH || val < 1)
|
|
{
|
|
runtime_error ("Invalid value for maximum subrecord length");
|
|
return;
|
|
}
|
|
|
|
compile_options.max_subrecord_length = val;
|
|
}
|