aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gcc/fortran/ChangeLog27
-rw-r--r--gcc/fortran/f95-lang.c6
-rw-r--r--gcc/fortran/gfortran.h6
-rw-r--r--gcc/fortran/invoke.texi14
-rw-r--r--gcc/fortran/lang.opt16
-rw-r--r--gcc/fortran/options.c109
-rw-r--r--gcc/fortran/scanner.c120
-rw-r--r--gcc/fortran/trans-const.c2
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gfortran.dg/d_lines_1.f5
-rw-r--r--gcc/testsuite/gfortran.dg/d_lines_2.f6
-rw-r--r--gcc/testsuite/gfortran.dg/d_lines_3.f10
-rw-r--r--gcc/testsuite/gfortran.dg/d_lines_4.f3
-rw-r--r--gcc/testsuite/gfortran.dg/d_lines_5.f3
14 files changed, 218 insertions, 114 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 56292fe..90697ab 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,30 @@
+2005-08-21 Tobias Schl"uter <tobias.schlueter@physik.uni-muenchen.de>
+
+ * gfortran.h (gfc_option_t): Remove source field. Add
+ flag_d_lines field.
+ (gfc_new_file): Remove arguments in prototype.
+ (gfc_source_file): Make 'const char *'.
+ * f95-lang.c (gfc_init): Use gfc_source_file instead of
+ gfc_option.source. Call gfc_new_file without arguments.
+ * invoke.texi: Document new options '-fd-lines-as-code' and
+ '-fd-lines-as-comment'.
+ * lang.opt: Add new options. Alphabetize.
+ * options.c (gfc_init_options): Initialize gfc_source_file instead
+ of gfc_option.source. Initialize gfc_option.flag_d_lines.
+ (form_from_filename): Move here from scanner.c. Make
+ 'filename' argument 'const'.
+ (gfc_post_options): Set gfc_source_file. Determine source form.
+ Warn if 'd-lines*' are used in free form.
+ * scanner.c (gfc_source_file): Constify.
+ (skip_fixed_comments): Deal with d-lines.
+ (get_file): Constify argument 'name'.
+ (load_file): Constify argument 'filename'.
+ (form_from_filename): Moved to options.c.
+ (gfc_new_file): Remove arguments. Don't initialize
+ gfc_source_file, don't determine source form.
+ * trans-const.c (gfc_init_constants): Use gfc_source_file instead
+ of gfc_option.source.
+
2005-08-19 Steven G. Kargl <kargls@comcast.net>
PR fortran/23065
diff --git a/gcc/fortran/f95-lang.c b/gcc/fortran/f95-lang.c
index 1c16bb4..6e607e9 100644
--- a/gcc/fortran/f95-lang.c
+++ b/gcc/fortran/f95-lang.c
@@ -271,7 +271,7 @@ static bool
gfc_init (void)
{
#ifdef USE_MAPPED_LOCATION
- linemap_add (&line_table, LC_ENTER, false, gfc_option.source, 1);
+ linemap_add (&line_table, LC_ENTER, false, gfc_source_file, 1);
linemap_add (&line_table, LC_RENAME, false, "<built-in>", 0);
#endif
@@ -282,8 +282,8 @@ gfc_init (void)
/* Then the frontend. */
gfc_init_1 ();
- if (gfc_new_file (gfc_option.source, gfc_option.source_form) != SUCCESS)
- fatal_error ("can't open input file: %s", gfc_option.source);
+ if (gfc_new_file () != SUCCESS)
+ fatal_error ("can't open input file: %s", gfc_source_file);
return true;
}
diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h
index 8c33274..c692ce2 100644
--- a/gcc/fortran/gfortran.h
+++ b/gcc/fortran/gfortran.h
@@ -1407,7 +1407,6 @@ gfc_data;
/* Structure for holding compile options */
typedef struct
{
- const char *source;
char *module_dir;
gfc_source_form source_form;
int fixed_line_length;
@@ -1436,6 +1435,7 @@ typedef struct
int flag_repack_arrays;
int flag_f2c;
int flag_backslash;
+ int flag_d_lines;
int q_kind;
@@ -1507,10 +1507,10 @@ int gfc_next_char (void);
int gfc_peek_char (void);
void gfc_error_recovery (void);
void gfc_gobble_whitespace (void);
-try gfc_new_file (const char *, gfc_source_form);
+try gfc_new_file (void);
extern gfc_source_form gfc_current_form;
-extern char *gfc_source_file;
+extern const char *gfc_source_file;
extern locus gfc_current_locus;
/* misc.c */
diff --git a/gcc/fortran/invoke.texi b/gcc/fortran/invoke.texi
index 1d14698..945c9f1 100644
--- a/gcc/fortran/invoke.texi
+++ b/gcc/fortran/invoke.texi
@@ -117,7 +117,7 @@ by type. Explanations are in the following sections.
@gccoptlist{
-ffree-form -fno-fixed-form @gol
-fdollar-ok -fimplicit-none -fmax-identifier-length @gol
--std=@var{std}
+-std=@var{std} -fd-lines-as-code -fd-lines-as-comments @gol
-ffixed-line-length-@var{n} -ffixed-line-length-none @gol
-fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 }
@@ -183,6 +183,18 @@ Specify the layout used by the source file. The free form layout
was introduced in Fortran 90. Fixed form was traditionally used in
older Fortran programs.
+@cindex option, -fd-lines-as-code
+@cindex -fd-lines-as-code, option
+@cindex option, -fd-lines-as-comments
+@cindex -fd-lines-as-comments, option
+@item -fd-lines-as-code
+@item -fd-lines-as-comment
+Enables special treating for lines with @samp{d} or @samp{D} in fixed
+form sources. If the @option{-fd-lines-as-code} option is given
+they are treated as if the first column contained a blank. If the
+@option{-fd-lines-as-comments} option is given, they are treated as
+comment lines.
+
@cindex option, -fdefault-double-8
@cindex -fdefault-double-8, option
@item -fdefault-double-8
diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt
index edc8a75..29d4317 100644
--- a/gcc/fortran/lang.opt
+++ b/gcc/fortran/lang.opt
@@ -69,6 +69,10 @@ Wunused-labels
F95
Warn when a label is unused
+fbackslash
+F95
+Specify that backslash in string introduces an escape character
+
fdefault-double-8
F95
Set the default double precision kind to an 8 byte wide type
@@ -81,14 +85,18 @@ fdefault-real-8
F95
Set the default real kind to an 8 byte wide type
+fd-lines-as-code
+F95 RejectNegative
+Ignore 'D' in column one in fixed form
+
+fd-lines-as-comments
+F95 RejectNegative
+Treat lines with 'D' in column one as comments
+
fdollar-ok
F95
Allow dollar signs in entity names
-fbackslash
-F95
-Specify that backslash in string introduces an escape character
-
fdump-parse-tree
F95
Display the code tree after parsing
diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
index b6121db..c980499 100644
--- a/gcc/fortran/options.c
+++ b/gcc/fortran/options.c
@@ -42,7 +42,7 @@ unsigned int
gfc_init_options (unsigned int argc ATTRIBUTE_UNUSED,
const char **argv ATTRIBUTE_UNUSED)
{
- gfc_option.source = NULL;
+ gfc_source_file = NULL;
gfc_option.module_dir = NULL;
gfc_option.source_form = FORM_UNKNOWN;
gfc_option.fixed_line_length = 72;
@@ -71,6 +71,7 @@ gfc_init_options (unsigned int argc ATTRIBUTE_UNUSED,
gfc_option.flag_pack_derived = 0;
gfc_option.flag_repack_arrays = 0;
gfc_option.flag_backslash = 1;
+ gfc_option.flag_d_lines = -1;
gfc_option.q_kind = gfc_default_double_kind;
@@ -89,6 +90,74 @@ gfc_init_options (unsigned int argc ATTRIBUTE_UNUSED,
}
+/* Determine the source form from the filename extension. We assume
+ case insensitivity. */
+
+static gfc_source_form
+form_from_filename (const char *filename)
+{
+
+ static const struct
+ {
+ const char *extension;
+ gfc_source_form form;
+ }
+ exttype[] =
+ {
+ {
+ ".f90", FORM_FREE}
+ ,
+ {
+ ".f95", FORM_FREE}
+ ,
+ {
+ ".f", FORM_FIXED}
+ ,
+ {
+ ".for", FORM_FIXED}
+ ,
+ {
+ "", FORM_UNKNOWN}
+ }; /* sentinel value */
+
+ gfc_source_form f_form;
+ const char *fileext;
+ int i;
+
+ /* Find end of file name. Note, filename is either a NULL pointer or
+ a NUL terminated string. */
+ i = 0;
+ while (filename[i] != '\0')
+ i++;
+
+ /* Find last period. */
+ while (i >= 0 && (filename[i] != '.'))
+ i--;
+
+ /* Did we see a file extension? */
+ if (i < 0)
+ return FORM_UNKNOWN; /* Nope */
+
+ /* Get file extension and compare it to others. */
+ fileext = &(filename[i]);
+
+ i = -1;
+ f_form = FORM_UNKNOWN;
+ do
+ {
+ i++;
+ if (strcasecmp (fileext, exttype[i].extension) == 0)
+ {
+ f_form = exttype[i].form;
+ break;
+ }
+ }
+ while (exttype[i].form != FORM_UNKNOWN);
+
+ return f_form;
+}
+
+
/* Finalize commandline options. */
bool
@@ -102,7 +171,35 @@ gfc_post_options (const char **pfilename)
filename = "";
}
- gfc_option.source = filename;
+ gfc_source_file = filename;
+
+ /* Decide which form the file will be read in as. */
+
+ if (gfc_option.source_form != FORM_UNKNOWN)
+ gfc_current_form = gfc_option.source_form;
+ else
+ {
+ gfc_current_form = form_from_filename (filename);
+
+ if (gfc_current_form == FORM_UNKNOWN)
+ {
+ gfc_current_form = FORM_FREE;
+ gfc_warning_now ("Reading file '%s' as free form.",
+ (filename[0] == '\0') ? "<stdin>" : filename);
+ }
+ }
+
+ /* If the user specified -fd-lines-as-{code|comments} verify that we're
+ in fixed form. */
+ if (gfc_current_form == FORM_FREE)
+ {
+ if (gfc_option.flag_d_lines == 0)
+ gfc_warning_now ("'-fd-lines-as-comments' has no effect "
+ "in free form.");
+ else if (gfc_option.flag_d_lines == 1)
+ gfc_warning_now ("'-fd-lines-as-code' has no effect "
+ "in free form.");
+ }
flag_inline_trees = 1;
@@ -238,6 +335,14 @@ gfc_handle_option (size_t scode, const char *arg, int value)
gfc_option.flag_backslash = value;
break;
+ case OPT_fd_lines_as_code:
+ gfc_option.flag_d_lines = 1;
+ break;
+
+ case OPT_fd_lines_as_comments:
+ gfc_option.flag_d_lines = 0;
+ break;
+
case OPT_fdump_parse_tree:
gfc_option.verbose = value;
break;
diff --git a/gcc/fortran/scanner.c b/gcc/fortran/scanner.c
index 68af79d..738e172 100644
--- a/gcc/fortran/scanner.c
+++ b/gcc/fortran/scanner.c
@@ -65,7 +65,7 @@ gfc_source_form gfc_current_form;
static gfc_linebuf *line_head, *line_tail;
locus gfc_current_locus;
-char *gfc_source_file;
+const char *gfc_source_file;
/* Main scanner initialization. */
@@ -355,7 +355,8 @@ skip_free_comments (void)
/* Skip comment lines in fixed source mode. We have the same rules as
in skip_free_comment(), except that we can have a 'c', 'C' or '*'
- in column 1, and a '!' cannot be in column 6. */
+ in column 1, and a '!' cannot be in column 6. Also, we deal with
+ lines with 'd' or 'D' in column 1, if the user requested this. */
static void
skip_fixed_comments (void)
@@ -383,13 +384,24 @@ skip_fixed_comments (void)
continue;
}
+ if (gfc_option.flag_d_lines != -1 && (c == 'd' || c == 'D'))
+ {
+ if (gfc_option.flag_d_lines == 0)
+ {
+ skip_comment_line ();
+ continue;
+ }
+ else
+ *start.nextc = c = ' ';
+ }
+
col = 1;
- do
+
+ while (gfc_is_whitespace (c))
{
c = next_char ();
col++;
}
- while (gfc_is_whitespace (c));
if (c == '\n')
{
@@ -796,7 +808,7 @@ load_line (FILE * input, char **pbuf, int *pbuflen)
the file stack. */
static gfc_file *
-get_file (char *name, enum lc_reason reason ATTRIBUTE_UNUSED)
+get_file (const char *name, enum lc_reason reason ATTRIBUTE_UNUSED)
{
gfc_file *f;
@@ -938,7 +950,7 @@ preprocessor_line (char *c)
}
-static try load_file (char *, bool);
+static try load_file (const char *, bool);
/* include_line()-- Checks a line buffer to see if it is an include
line. If so, we call load_file() recursively to load the included
@@ -996,7 +1008,7 @@ include_line (char *line)
/* Load a file into memory by calling load_line until the file ends. */
static try
-load_file (char *filename, bool initial)
+load_file (const char *filename, bool initial)
{
char *line;
gfc_linebuf *b;
@@ -1097,108 +1109,16 @@ load_file (char *filename, bool initial)
}
-/* Determine the source form from the filename extension. We assume
- case insensitivity. */
-
-static gfc_source_form
-form_from_filename (const char *filename)
-{
-
- static const struct
- {
- const char *extension;
- gfc_source_form form;
- }
- exttype[] =
- {
- {
- ".f90", FORM_FREE}
- ,
- {
- ".f95", FORM_FREE}
- ,
- {
- ".f", FORM_FIXED}
- ,
- {
- ".for", FORM_FIXED}
- ,
- {
- "", FORM_UNKNOWN}
- }; /* sentinel value */
-
- gfc_source_form f_form;
- const char *fileext;
- int i;
-
- /* Find end of file name. Note, filename is either a NULL pointer or
- a NUL terminated string. */
- i = 0;
- while (filename[i] != '\0')
- i++;
-
- /* Find last period. */
- while (i >= 0 && (filename[i] != '.'))
- i--;
-
- /* Did we see a file extension? */
- if (i < 0)
- return FORM_UNKNOWN; /* Nope */
-
- /* Get file extension and compare it to others. */
- fileext = &(filename[i]);
-
- i = -1;
- f_form = FORM_UNKNOWN;
- do
- {
- i++;
- if (strcasecmp (fileext, exttype[i].extension) == 0)
- {
- f_form = exttype[i].form;
- break;
- }
- }
- while (exttype[i].form != FORM_UNKNOWN);
-
- return f_form;
-}
-
-
/* Open a new file and start scanning from that file. Returns SUCCESS
if everything went OK, FAILURE otherwise. If form == FORM_UKNOWN
it tries to determine the source form from the filename, defaulting
to free form. */
try
-gfc_new_file (const char *filename, gfc_source_form form)
+gfc_new_file (void)
{
try result;
- if (filename != NULL)
- {
- gfc_source_file = gfc_getmem (strlen (filename) + 1);
- strcpy (gfc_source_file, filename);
- }
- else
- gfc_source_file = NULL;
-
- /* Decide which form the file will be read in as. */
-
- if (form != FORM_UNKNOWN)
- gfc_current_form = form;
- else
- {
- gfc_current_form = form_from_filename (filename);
-
- if (gfc_current_form == FORM_UNKNOWN)
- {
- gfc_current_form = FORM_FREE;
- gfc_warning_now ("Reading file '%s' as free form.",
- (filename[0] == '\0') ? "<stdin>" : filename);
- }
- }
-
result = load_file (gfc_source_file, true);
gfc_current_locus.lb = line_head;
diff --git a/gcc/fortran/trans-const.c b/gcc/fortran/trans-const.c
index ae7c271..bab1869 100644
--- a/gcc/fortran/trans-const.c
+++ b/gcc/fortran/trans-const.c
@@ -163,7 +163,7 @@ gfc_init_constants (void)
gfc_build_cstring_const ("Incorrect function return value");
gfc_strconst_current_filename =
- gfc_build_cstring_const (gfc_option.source);
+ gfc_build_cstring_const (gfc_source_file);
}
/* Converts a GMP integer into a backend tree node. */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 310c782..1fb2989 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-21 Tobias Schl"uter <tobias.schlueter@physik.uni-muenchen.de>
+
+ * d_lines_1.f, d_lines_2.f, d_lines_3.f, d_lines_4.f,
+ d_lines_5.f: New.
+
2005-08-21 Jakub Jelinek <jakub@redhat.com>
* gcc.target/i386/sse-4.c: New test.
diff --git a/gcc/testsuite/gfortran.dg/d_lines_1.f b/gcc/testsuite/gfortran.dg/d_lines_1.f
new file mode 100644
index 0000000..04909b1
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/d_lines_1.f
@@ -0,0 +1,5 @@
+! { dg-do compile }
+! { dg-options "-fd-lines-as-comments" }
+d This is a comment.
+D This line, too.
+ end
diff --git a/gcc/testsuite/gfortran.dg/d_lines_2.f b/gcc/testsuite/gfortran.dg/d_lines_2.f
new file mode 100644
index 0000000..b2e4df5
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/d_lines_2.f
@@ -0,0 +1,6 @@
+! { dg-do compile }
+c { dg-options "-fd-lines-as-code" }
+ i = 0
+d end
+ subroutine s
+D end
diff --git a/gcc/testsuite/gfortran.dg/d_lines_3.f b/gcc/testsuite/gfortran.dg/d_lines_3.f
new file mode 100644
index 0000000..53b75ad
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/d_lines_3.f
@@ -0,0 +1,10 @@
+C { dg-do compile }
+C { dg-options "-fd-lines-as-code" }
+C Verifies that column numbers are dealt with correctly when handling D lines.
+C234567890
+d i = 0 ! this may not move to the left
+d 1 + 1 ! this should be a continuation line
+ goto 2345
+d23450continue ! statement labels are correctly identified
+ end
+
diff --git a/gcc/testsuite/gfortran.dg/d_lines_4.f b/gcc/testsuite/gfortran.dg/d_lines_4.f
new file mode 100644
index 0000000..224ca13
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/d_lines_4.f
@@ -0,0 +1,3 @@
+! { dg-do compile }
+c verify that debug lines are rejected if none of -fd-lines-as-* are given.
+d ! { dg-error "Non-numeric character" }
diff --git a/gcc/testsuite/gfortran.dg/d_lines_5.f b/gcc/testsuite/gfortran.dg/d_lines_5.f
new file mode 100644
index 0000000..8b0e2d8
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/d_lines_5.f
@@ -0,0 +1,3 @@
+! { dg-do compile }
+c { dg-options "-fd-lines-as-code" }
+d ! This didn't work in an early version of the support for -fd-lines*
generated by cgit v1.1 at 2025-05-28 19:52:00 +0000