* call.c (struct z_candidate): Add explicit_targs field.

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

diff --git a/gcc/input.h b/gcc/input.h
index efdfbd3..7f00dc7 100644 (file)
--- a/gcc/input.h
+++ b/gcc/input.h
@@ -1,12 +1,13 @@
 /* Declarations for variables relating to reading the source file.
    Used by parsers, lexical analyzers, and error message routines.
 /* 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 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 2000, 2003, 2004, 2007, 2008, 2009
+   Free Software Foundation, Inc.

 
 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
 
 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 2, or (at your option) any later
+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
 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY


@@ -15,25 +16,28 @@ 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
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA.  */
+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"
 
 #ifndef GCC_INPUT_H
 #define GCC_INPUT_H
 
 #include "line-map.h"

-extern struct line_maps line_table;

 
 

-/* The location for declarations in "<built-in>" */
-#define BUILTINS_LOCATION ((source_location) 2)
+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)

 
 

-/* Note: if any of the types defined inside this #ifdef are changed,
-   gengtype.c:define_location_structures must be updated to match.  */
+/* The location for declarations in "<built-in>" */
+#define BUILTINS_LOCATION ((source_location) 1)

 
 

-#ifdef USE_MAPPED_LOCATION
+/* 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
+typedef struct GTY (())

 {
   /* The name of the source file involved.  */
   const char *file;
 {
   /* The name of the source file involved.  */
   const char *file;


@@ -42,67 +46,28 @@ typedef struct
   int line;
 
   int column;
   int line;
 
   int column;

+
+  /* In a system header?. */
+  bool sysp;

 } expanded_location;
 
 extern expanded_location expand_location (source_location);
 
 } expanded_location;
 
 extern expanded_location expand_location (source_location);
 

-#define UNKNOWN_LOCATION ((source_location) 0)
-typedef source_location location_t; /* deprecated typedef */
-typedef source_location source_locus; /* to be removed */
-
-#else /* ! USE_MAPPED_LOCATION */
-
-struct location_s GTY(())
-{
-  /* The name of the source file involved.  */
-  const char *file;
-
-  /* The line-location in the source file.  */
-  int line;
-};
-
-typedef struct location_s expanded_location;
-typedef struct location_s location_t;
-typedef location_t *source_locus;
-
-#define expand_location(FILELINE) (FILELINE)
-extern location_t unknown_location;
-#define UNKNOWN_LOCATION unknown_location
-
-#endif /* ! USE_MAPPED_LOCATION */
-
-struct file_stack
-{
-  struct file_stack *next;
-  location_t 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;
 
 extern location_t input_location;
 
 /* Top-level source file.  */
 extern const char *main_input_filename;
 
 extern location_t input_location;

-#ifdef USE_MAPPED_LOCATION
-extern void push_srcloc (location_t);
-#else /* ! USE_MAPPED_LOCATION */
-extern void push_srcloc (const char *name, int line);
-#endif /* ! USE_MAPPED_LOCATION */
-extern void pop_srcloc (void);
-extern void restore_input_file_stack (int);

 
 #define LOCATION_FILE(LOC) ((expand_location (LOC)).file)
 #define LOCATION_LINE(LOC) ((expand_location (LOC)).line)
 
 
 #define LOCATION_FILE(LOC) ((expand_location (LOC)).file)
 #define LOCATION_LINE(LOC) ((expand_location (LOC)).line)
 

-#define input_line LOCATION_LINE(input_location)
-#define input_filename LOCATION_FILE(input_location)
-
-/* 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;
-
-/* Incremented on each change to input_file_stack.  */
-extern int input_file_stack_tick;
-
-/* The number of bits available for input_file_stack_tick.  */
-#define INPUT_FILE_STACK_BITS  31
+#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))

 
 #endif
 
 #endif