X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Finput.h;h=7f00dc7cd0a7c4a866e3896e405efefaf7bc250e;hb=73faef308beb68f43956ec108d6dc61a4ed1b3d6;hp=8c326f9e6a7505454f6451166d3bdddc34d5f5b1;hpb=4b5446d126ce33e92fac4381c15cece13fd328a4;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/input.h b/gcc/input.h
index 8c326f9e6a7..7f00dc7cd0a 100644
--- a/gcc/input.h
+++ b/gcc/input.h
@@ -1,25 +1,73 @@
-/* Source file current line is coming from.  */
-extern char *input_filename;
+/* 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, 2004, 2007, 2008, 2009
+   Free Software Foundation, Inc.
 
-/* Top-level source file.  */
-extern char *main_input_filename;
+This file is part of GCC.
+
+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 3, or (at your option) any later
+version.
+
+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 GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
+
+#ifndef GCC_INPUT_H
+#define GCC_INPUT_H
+
+#include "line-map.h"
+
+extern GTY(()) struct line_maps *line_table;
+
+/* A value which will never be used to represent a real location.  */
+#define UNKNOWN_LOCATION ((source_location) 0)
+
+/* The location for declarations in "<built-in>" */
+#define BUILTINS_LOCATION ((source_location) 1)
 
-/* Line number in current source file.  */
-extern int lineno;
+/* line-map.c reserves RESERVED_LOCATION_COUNT to the user.  Ensure
+   both UNKNOWN_LOCATION and BUILTINS_LOCATION fit into that.  */
+extern char builtins_location_check[(BUILTINS_LOCATION
+				     < RESERVED_LOCATION_COUNT) ? 1 : -1];
+
+typedef struct GTY (())
+{
+  /* The name of the source file involved.  */
+  const char *file;
+
+  /* The line-location in the source file.  */
+  int line;
+
+  int column;
+
+  /* In a system header?. */
+  bool sysp;
+} expanded_location;
+
+extern expanded_location expand_location (source_location);
+
+/* Historically GCC used location_t, while cpp used source_location.
+   This could be removed but it hardly seems worth the effort.  */
+typedef source_location location_t;
+
+/* Top-level source file.  */
+extern const char *main_input_filename;
 
-/* Stream for reading from input file.  */
-extern FILE *finput;
+extern location_t input_location;
 
-struct file_stack
-  {
-    char *name;
-    struct file_stack *next;
-    int line;
-  };
+#define LOCATION_FILE(LOC) ((expand_location (LOC)).file)
+#define LOCATION_LINE(LOC) ((expand_location (LOC)).line)
 
-/* Stack of currently pending input files.
-   The line member is not accurate for the innermost file on the stack.  */
-extern struct file_stack *input_file_stack;
+#define input_line LOCATION_LINE (input_location)
+#define input_filename LOCATION_FILE (input_location)
+#define in_system_header_at(LOC) ((expand_location (LOC)).sysp != 0)
+#define in_system_header (in_system_header_at (input_location))
 
-/* Incremented on each change to input_file_stack.  */
-extern int input_file_stack_tick;
+#endif