OSDN Git Service

PR fortran/34359
authorjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Sat, 8 Dec 2007 21:00:06 +0000 (21:00 +0000)
committerjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Sat, 8 Dec 2007 21:00:06 +0000 (21:00 +0000)
commitce6a87f898b1ea4fc9678bc703727441f99ad864
treebc4bbaa3da451b54fe5c683b72d4f4f715b56e79
parentaaf166234fff42ba7aa5af8f3b1151e01d8b806f
PR fortran/34359
* gfortran.h (gfc_file): Remove sibling and down fields.
* scanner.c (file_changes, file_changes_cur, file_changes_count,
file_changes_allocated): New variables.
(add_file_change, report_file_change): New functions.
(change_file): Remove.
(gfc_start_source_files, gfc_end_source_files): Call
report_file_change instead of change_file.
(gfc_advance_line): Call report_file_change instead of change_file,
call it even if lb->file == lb->next->file.
(get_file): Revert last changes.
(preprocessor_line): Call add_file_change when entering or leaving
a file.
(load_file): Likewise.  Set file_change[...].lb for all newly added
file changes.

* gfortran.dg/include_1.f90: New test.
* gfortran.dg/include_1.inc: New.
* gfortran.dg/include_2.f90: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@130712 138bc75d-0d04-0410-961f-82ee72b054a4
gcc/fortran/ChangeLog
gcc/fortran/gfortran.h
gcc/fortran/scanner.c
gcc/testsuite/ChangeLog
gcc/testsuite/gfortran.dg/include_1.f90 [new file with mode: 0644]
gcc/testsuite/gfortran.dg/include_1.inc [new file with mode: 0644]
gcc/testsuite/gfortran.dg/include_2.f90 [new file with mode: 0644]