From 6060edcbe24aaa467d5be6fe35bd52a6eecc72b3 Mon Sep 17 00:00:00 2001
From: Nathan Sidwell <nathan@codesourcery.com>
Date: Fri, 2 May 2003 11:33:06 +0000
Subject: Makefile.in (TREE_H): Replace location.h with input.h.

	* Makefile.in (TREE_H): Replace location.h with input.h.
	(GTFILES) Remove location.h
	(gt-lists.h): Replace gt-location.h with gt-input.h
	* input.h (input_filename, input_line): Remove variables.
	(location_s, location_t): Move from location.h.
	(input_location): New.
	(input_filename, input_line): New #defines.
	* location.h: Remove.
	* tree.h: Replace location.h with input.h.
	(input_filename, input_line): Remove.
	* diagnostic.h: Replace location.h with input.h.
	* gcc.h (input_filename, input_filename_length): Remove declarations.
	* toplev.c (input_filename, input_line): Remove.
	(input_location): Define.
	(push_srcloc, pop_srcloc): Adjust.
	* diagnostic.c (diagnostic_report_current_module): Adjust.
f:
	* lex.c (ffelex_file_pop_): Adjust file_stack member use.
	(ffelex_file_push_): Likewise.
	(ffelex_hash_): Likewise.
java:
	* lex.h (input_lineno): Remove declaration.
	* parse-scan.y: #include input.h.
	(input_filename): Remove declaration.
	(input_location): Add definition.
	(input_line): Remove definition.

From-SVN: r66378
---
 gcc/f/lex.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'gcc/f/lex.c')

diff --git a/gcc/f/lex.c b/gcc/f/lex.c
index f1e2e97..abdea33 100644
--- a/gcc/f/lex.c
+++ b/gcc/f/lex.c
@@ -796,7 +796,7 @@ ffelex_file_pop_ (const char *filename)
       input_file_stack = p->next;
       free (p);
       input_file_stack_tick++;
-      (*debug_hooks->end_source_file) (input_file_stack->line);
+      (*debug_hooks->end_source_file) (input_file_stack->location.line);
     }
   else
     error ("#-lines for entering and leaving files don't match");
@@ -804,7 +804,7 @@ ffelex_file_pop_ (const char *filename)
   /* Now that we've pushed or popped the input stack,
      update the name in the top element.  */
   if (input_file_stack)
-    input_file_stack->name = filename;
+    input_file_stack->location.file = filename;
 }
 
 static void
@@ -813,9 +813,9 @@ ffelex_file_push_ (int old_lineno, const char *filename)
   struct file_stack *p
     = (struct file_stack *) xmalloc (sizeof (struct file_stack));
 
-  input_file_stack->line = old_lineno;
+  input_file_stack->location.line = old_lineno;
   p->next = input_file_stack;
-  p->name = filename;
+  p->location.file = filename;
   input_file_stack = p;
   input_file_stack_tick++;
 
@@ -824,7 +824,7 @@ ffelex_file_push_ (int old_lineno, const char *filename)
   /* Now that we've pushed or popped the input stack,
      update the name in the top element.  */
   if (input_file_stack)
-    input_file_stack->name = filename;
+    input_file_stack->location.file = filename;
 }
 
 /* Prepare to finish a statement-in-progress by sending the current
@@ -1260,7 +1260,7 @@ ffelex_hash_ (FILE *finput)
 	    {
 	      /* Update the name in the top element of input_file_stack.  */
 	      if (input_file_stack)
-		input_file_stack->name = input_filename;
+		input_file_stack->location.file = input_filename;
 
 	      if (token != NULL)
 		ffelex_token_kill (token);
-- 
cgit v1.1