This is the mail archive of the
fortran@gcc.gnu.org
mailing list for the GNU Fortran project.
Re: [gofrtran] Fix PR 16465: accept -ffixed-line-length-72
Tobias SchlÃter wrote:
> Bud Davis wrote:
>
>>On Mon, 2004-07-12 at 17:23, Tobias SchlÃter wrote:
>>
>>>I've updated my patch. But before I post it, I want to know: Is support
>>>for arbitrary line lengths with --fixed-line-length-none also a must,
>>
>>yes.
>>
>>i have used this feature in g77, not with human written code, but with
>>code written by programs.
>>
>
>
> Argh! Ok, will do so tomorrow.
>
Updated patch below. There are no changes to invoke.texi because the
functionality is as documented now (except that the case in which no
meaningful Fortran program can be written, -ffixed-line-length-6 and
below, is not documented. I don't think that's a real omission)
There is a bug, but I verified that this is also present before my
patch: newlines inside statements confuse the parser. This is the reason
the g77 testcase ffixed-line-length-7.f doesn't work. I haven't yet
looked into how to fix this, and I think it is fairly orthogonal to this
patch. Apart from that one, I plan to commit the ffixed-line-length
tests from the g77 testsuite alongside this patch.
This also fixes a bug we had in the handling of preprocessor lines:
overlong preprocessor lines would get written to unallocated memory,
this is fixed by appropriately resizing the line buffer along the way.
- Tobi
2004-07-13 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de>
PR fortran/16465
* lang.opt (ffixed-line-length-none, ffixed-line-length-): New
options.
(ffixed-line-length-80, ffixed-line-length-132): Remove.
* options.c (gfc_handle_options): Deal with changed options.
* scanner.c (load_line): Change second arg to 'char **',
allocate if pointing to NULL. Keep track of buffer's length.
Adapt buffer size to overlong lines. Pad lines to full length
in fixed form.
(load_file): Adapt to new interface of load_line.
Index: lang.opt
===================================================================
RCS file: /cvs/gcc/gcc/gcc/fortran/lang.opt,v
retrieving revision 1.6
diff -u -p -r1.6 lang.opt
--- lang.opt 11 Jul 2004 16:55:00 -0000 1.6
+++ lang.opt 13 Jul 2004 13:15:13 -0000
@@ -97,13 +97,13 @@ fimplicit-none
F95
Specify that no implicit typing is allowed, unless overridden by
explicit IMPLICIT statements
-ffixed-line-length-80
+ffixed-line-length-none
F95 RejectNegative
-Use 80 character line width in fixed mode
+Use maximum supported character line width in fixed mode
-ffixed-line-length-132
-F95 RejectNegative
-Use 132 character line width in fixed mode
+ffixed-line-length-
+F95 RejectNegative Joined UInteger
+-ffixed-line-length-<n> Use n as character line width in
fixed mode
fmax-identifier-length=
F95 RejectNegative Joined UInteger
Index: options.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/fortran/options.c,v
retrieving revision 1.7
diff -u -p -r1.7 options.c
--- options.c 11 Jul 2004 16:55:00 -0000 1.7
+++ options.c 13 Jul 2004 13:15:13 -0000
@@ -260,12 +260,14 @@ gfc_handle_option (size_t scode, const c
gfc_option.flag_repack_arrays = value;
break;
- case OPT_ffixed_line_length_80:
- gfc_option.fixed_line_length = 80;
+ case OPT_ffixed_line_length_none:
+ gfc_option.fixed_line_length = 0;
break;
- case OPT_ffixed_line_length_132:
- gfc_option.fixed_line_length = 132;
+ case OPT_ffixed_line_length_:
+ if (value != 0 && value < 7)
+ gfc_fatal_error ("Fixed line length must be at least seven.");
+ gfc_option.fixed_line_length = value;
break;
case OPT_fmax_identifier_length_:
Index: scanner.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/fortran/scanner.c,v
retrieving revision 1.6
diff -u -p -r1.6 scanner.c
--- scanner.c 21 Jun 2004 22:22:32 -0000 1.6
+++ scanner.c 13 Jul 2004 13:15:14 -0000
@@ -671,26 +671,49 @@ gfc_gobble_whitespace (void)
}
-/* Load a single line into the buffer. We truncate lines that are too
- long. In fixed mode, we expand a tab that occurs within the
- statement label region to expand to spaces that leave the next
- character in the source region. */
+/* Load a single line into pbuf.
+
+ If pbuf points to a NULL pointer, it is allocated.
+ We truncate lines that are too long, unless we're dealing with
+ preprocessor lines or if the option -ffixed-line-length-none is set,
+ in which case we reallocate the buffer to fit the entire line, if
+ need be.
+ In fixed mode, we expand a tab that occurs within the statement
+ label region to expand to spaces that leave the next character in
+ the source region. */
static void
-load_line (FILE * input, char *buffer, char *filename, int linenum)
+load_line (FILE * input, char **pbuf, char *filename, int linenum)
{
int c, maxlen, i, trunc_flag, preprocessor_flag;
+ static int buflen = 0;
+ char *buffer;
+
+ /* Detemine the maximum allowed line length. */
+ if (gfc_current_form == FORM_FREE)
+ maxlen = GFC_MAX_LINE;
+ else
+ maxlen = gfc_option.fixed_line_length;
- maxlen = (gfc_current_form == FORM_FREE)
- ? 132
- : gfc_option.fixed_line_length;
+ if (*pbuf == NULL)
+ {
+ /* Allocate the line buffer, storing its length into buflen. */
+ if (maxlen > 0)
+ buflen = maxlen;
+ else
+ buflen = GFC_MAX_LINE;
+
+ *pbuf = gfc_getmem (buflen + 1);
+ }
i = 0;
+ buffer = *pbuf;
preprocessor_flag = 0;
c = fgetc (input);
if (c == '#')
- /* Don't truncate preprocessor lines. */
+ /* In order to not truncate preprocessor lines, we have to
+ remember that this is one. */
preprocessor_flag = 1;
ungetc (c, input);
@@ -729,8 +752,17 @@ load_line (FILE * input, char *buffer, c
*buffer++ = c;
i++;
- if (i >= maxlen && !preprocessor_flag)
- { /* Truncate the rest of the line. */
+ if (i >= buflen && (maxlen == 0 || preprocessor_flag))
+ {
+ /* Reallocate line buffer to double size to hold the
+ overlong line. */
+ buflen = buflen * 2;
+ *pbuf = xrealloc (*pbuf, buflen);
+ buffer = (*pbuf)+i;
+ }
+ else if (i >= buflen)
+ {
+ /* Truncate the rest of the line. */
trunc_flag = 1;
for (;;)
@@ -753,6 +785,14 @@ load_line (FILE * input, char *buffer, c
}
}
+ /* Pad lines to the selected line length in fixed form. */
+ if (gfc_current_form == FORM_FIXED
+ && gfc_option.fixed_line_length > 0
+ && !preprocessor_flag
+ && c != EOF)
+ while (i++ < buflen)
+ *buffer++ = ' ';
+
*buffer = '\0';
}
@@ -925,7 +965,7 @@ include_line (char *line)
static try
load_file (char *filename, bool initial)
{
- char line[GFC_MAX_LINE+1];
+ char *line;
gfc_linebuf *b;
gfc_file *f;
FILE *input;
@@ -963,10 +1003,11 @@ load_file (char *filename, bool initial)
f->up = current_file;
current_file = f;
current_file->line = 1;
+ line = NULL;
for (;;)
{
- load_line (input, line, filename, current_file->line);
+ load_line (input, &line, filename, current_file->line);
len = strlen (line);
if (feof (input) && len == 0)
@@ -1003,6 +1044,9 @@ load_file (char *filename, bool initial)
line_tail = b;
}
+ /* Release the line buffer allocated in load_line. */
+ gfc_free (line);
+
fclose (input);
current_file = current_file->up;