* line-map.h (fileline): New typedef.

[pf3gnuchains/gcc-fork.git] / gcc / input.h

diff --git a/gcc/input.h b/gcc/input.h
index 39590e2..7d08e11 100644 (file)
--- a/gcc/input.h
+++ b/gcc/input.h
@@ -1,42 +1,51 @@
 /* Declarations for variables relating to reading the source file.
    Used by parsers, lexical analyzers, and error message routines.
+   Copyright (C) 1993, 1997, 1998, 2000, 2003 Free Software Foundation, Inc.
 
-   Copyright (C) 1993 Free Software Foundation, Inc.
+This file is part of GCC.
 
-This file is part of GNU CC.
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
 
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-/* Source file current line is coming from.  */
-extern char *input_filename;
+along with GCC; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.  */
 
-/* Top-level source file.  */
-extern char *main_input_filename;
+#ifndef GCC_INPUT_H
+#define GCC_INPUT_H
 
-/* Line number in current source file.  */
-extern int lineno;
+/* The data structure used to record a location in a translation unit.  */
+/* Long-term, we want to get rid of this and typedef fileline location_t. */
+struct location_s GTY (())
+{
+  /* The name of the source file involved.  */
+  const char *file;
 
-/* Stream for reading from input file.  */
-extern FILE *finput;
+  /* The line-location in the source file.  */
+  int line;
+};
+typedef struct location_s location_t;
 
 struct file_stack
-  {
-    char *name;
-    struct file_stack *next;
-    int line;
-  };
+{
+  struct file_stack *next;
+  location_t location;
+};
+
+/* Top-level source file.  */
+extern const char *main_input_filename;
+
+extern location_t input_location;
+#define input_line (input_location.line)
+#define input_filename (input_location.file)
 
 /* Stack of currently pending input files.
    The line member is not accurate for the innermost file on the stack.  */
@@ -44,3 +53,8 @@ extern struct file_stack *input_file_stack;
 
 /* Incremented on each change to input_file_stack.  */
 extern int input_file_stack_tick;
+
+extern void push_srcloc (const char *name, int line);
+extern void pop_srcloc (void);
+
+#endif