X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Finput.h;h=f15ce6688bf5f6ab4d90d65220ad8811947b9f10;hb=1e5fcbe2009a34584768d8b8833756bc8de97dc3;hp=9d238dcfdaaf96667bf8c74022f6f7bb8d93098b;hpb=3406b2e23e1b5799705b90379b74e2f2f76420a3;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/input.h b/gcc/input.h
index 9d238dcfdaa..f15ce6688bf 100644
--- a/gcc/input.h
+++ b/gcc/input.h
@@ -1,25 +1,95 @@
-/* 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 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 2, 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 COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.  */
+
+#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)
+
+#ifdef USE_MAPPED_LOCATION
+
+typedef struct
+{
+  /* The name of the source file involved.  */
+  const char *file;
+
+  /* The line-location in the source file.  */
+  int line;
+
+  int column;
+} expanded_location;
+
+extern expanded_location expand_location (source_location);
 
-/* Line number in current source file.  */
-extern int lineno;
+#define UNKNOWN_LOCATION ((source_location) 0)
+typedef source_location location_t; /* deprecated typedef */
+typedef source_location source_locus; /* to be removed */
 
-/* Stream for reading from input file.  */
-extern FILE *finput;
+#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
-  {
-    char *name;
-    struct file_stack *next;
-    int line;
-    /* This is for front ends that do include processing
-       internally rather than having a preprocessor do it.
-       Modula 2 needs this.  */
-    FILE *fd;
-  };
+{
+  struct file_stack *next;
+  location_t 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);
+
+#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.  */
@@ -27,3 +97,5 @@ extern struct file_stack *input_file_stack;
 
 /* Incremented on each change to input_file_stack.  */
 extern int input_file_stack_tick;
+
+#endif