Commit ee07457b by Francois-Xavier Coudert Committed by François-Xavier Coudert

re PR fortran/33528 (Wrong locations emitted with mapped locations and included files)

	PR fortran/33528
	* scanner.c (preprocessor_line): Call linemap_add when exiting
	a file.
	(gfc_new_file): Adjust debug code for USE_MAPPED_LOCATION.

From-SVN: r128676
parent b6efedac
2007-09-23 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
PR fortran/33528
* scanner.c (preprocessor_line): Call linemap_add when exiting
a file.
(gfc_new_file): Adjust debug code for USE_MAPPED_LOCATION.
2007-09-22 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> 2007-09-22 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
PR fortran/33522 PR fortran/33522
......
...@@ -1341,7 +1341,12 @@ preprocessor_line (char *c) ...@@ -1341,7 +1341,12 @@ preprocessor_line (char *c)
gfc_free (filename); gfc_free (filename);
return; return;
} }
current_file = current_file->up; current_file = current_file->up;
#ifdef USE_MAPPED_LOCATION
linemap_add (line_table, LC_RENAME, false, current_file->filename,
current_file->line);
#endif
} }
/* The name of the file can be a temporary file produced by /* The name of the file can be a temporary file produced by
...@@ -1620,10 +1625,12 @@ gfc_new_file (void) ...@@ -1620,10 +1625,12 @@ gfc_new_file (void)
#if 0 /* Debugging aid. */ #if 0 /* Debugging aid. */
for (; line_head; line_head = line_head->next) for (; line_head; line_head = line_head->next)
gfc_status ("%s:%3d %s\n", line_head->file->filename, gfc_status ("%s:%3d %s\n",
#ifdef USE_MAPPED_LOCATION #ifdef USE_MAPPED_LOCATION
LOCATION_FILE (line_head->location),
LOCATION_LINE (line_head->location), LOCATION_LINE (line_head->location),
#else #else
line_head->file->filename,
line_head->linenum, line_head->linenum,
#endif #endif
line_head->line); line_head->line);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment