diff options
| author | Hans-Peter Nilsson <hp@bitrange.com> | 2002-08-22 02:20:43 +0000 |
|---|---|---|
| committer | Hans-Peter Nilsson <hp@gcc.gnu.org> | 2002-08-22 02:20:43 +0000 |
| commit | d7704f76d244390ff0867b4371ff5201a9d95c0c (patch) | |
| tree | cce6268d2a07aba745d731ecbaad376287a3b9a3 /gcc/f/std.c | |
| parent | 44ddc79ad21811b041b844053fe1c6111ba7d075 (diff) | |
| download | gcc-d7704f76d244390ff0867b4371ff5201a9d95c0c.zip gcc-d7704f76d244390ff0867b4371ff5201a9d95c0c.tar.gz gcc-d7704f76d244390ff0867b4371ff5201a9d95c0c.tar.bz2 | |
where.h (struct _ffewhere_file_): Mark GTY.
* where.h (struct _ffewhere_file_): Mark GTY.
(ffewhere_file_kill): Remove prototype.
* where.c: Include ggc.h.
(struct _ffewhere_ll_, struct _ffewhere_root_ll_): Mark GTY.
(ffewhere_root_ll_): Ditto. Change type from struct
_ffewhere_root_ll_ to struct _ffewhere_root_ll_*. All uses
changed.
(ffewhere_file_kill): Remove.
(ffewhere_file_new): Use GC to allocate ffewhereFile objects.
(ffewhere_file_set): Use GC to allocate ffewhereLL_ objects.
(ffewhere_init_1): Use GC to allocate ffewhere_root_ll_ sentinel.
Include gt-f-where.h.
* lex.c (ffelex_current_wf_, ffelex_include_wherefile_): Mark GTY.
Include gt-f-lex.h.
* std.c (ffestd_S3P4): Don't call ffewhere_file_kill.
* config-lang.in (gtfiles): Add f/where.h f/where.c and f/lex.c.
* Make-lang.in (gt-f-lex.h gt-f-where.h): Add to dependents of
s-gtype.
(f/lex.o): Depend on gt-f-lex.h.
(f/where.o): Depend on gt-f-where.h.
From-SVN: r56502
Diffstat (limited to 'gcc/f/std.c')
| -rw-r--r-- | gcc/f/std.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gcc/f/std.c b/gcc/f/std.c index db8c723..bd2add2 100644 --- a/gcc/f/std.c +++ b/gcc/f/std.c @@ -1,5 +1,5 @@ /* std.c -- Implementation File (module.c template V1.0) - Copyright (C) 1995, 1996, 2000 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 2000, 2002 Free Software Foundation, Inc. Contributed by James Craig Burley. This file is part of GNU Fortran. @@ -4774,9 +4774,7 @@ ffestd_S3P4 (ffebld filename) fi = ffecom_open_include (ffewhere_file_name (wf), ffelex_token_where_line (ffesta_tokens[0]), ffelex_token_where_column (ffesta_tokens[0])); - if (fi == NULL) - ffewhere_file_kill (wf); - else + if (fi != NULL) ffelex_set_include (wf, (ffelex_token_type (ffesta_tokens[0]) == FFELEX_typeNAME), fi); } |