Merge GDB 7.5.1

gdb/macrotab.h

 /* Interface to C preprocessor macro tables for GDB.
    Copyright (C) 2002, 2007-2012 Free Software Foundation, Inc.
    Contributed by Red Hat, Inc.
 
    This file is part of GDB.
 
    This program 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 of the License, or
    (at your option) any later version.
@@ skipping 194 matching lines @@
    the same structure we created last time.
 
    The first line of the source file has a line number of 1, not 0.
 
    The macro table makes its own copy of INCLUDED; the caller is
    responsible for freeing INCLUDED when it is no longer needed.  */
 struct macro_source_file *macro_include (struct macro_source_file *source,
                                          int line,
                                          const char *included);
 
+/* Define any special macros, like __FILE__ or __LINE__.  This should
+   be called once, on the main source file.  */
+
+void macro_define_special (struct macro_table *table);
 
 /* Find any source file structure for a file named NAME, either
    included into SOURCE, or SOURCE itself.  Return zero if we have
    none.  NAME is only the final portion of the filename, not the full
    path.  e.g., `stdio.h', not `/usr/include/stdio.h'.  If NAME
    appears more than once in the inclusion tree, return the
    least-nested inclusion --- the one closest to the main source file.  */
 struct macro_source_file *(macro_lookup_inclusion
                            (struct macro_source_file *source,
                             const char *name));
@@ skipping 29 matching lines @@
 void macro_undef (struct macro_source_file *source, int line,
                   const char *name);
 
 /* Different kinds of macro definitions.  */
 enum macro_kind
 {
   macro_object_like,
   macro_function_like
 };
 
+/* Different kinds of special macros.  */
+
+enum macro_special_kind
+{
+  /* Ordinary.  */
+  macro_ordinary,
+  /* The special macro __FILE__.  */
+  macro_FILE,
+  /* The special macro __LINE__.  */
+  macro_LINE
+};
 
 /* A preprocessor symbol definition.  */
 struct macro_definition
 {
   /* The table this definition lives in.  */
   struct macro_table *table;
 
   /* What kind of macro it is.  */
   ENUM_BITFIELD (macro_kind) kind : 1;
 
   /* If `kind' is `macro_function_like', the number of arguments it
      takes, and their names.  The names, and the array of pointers to
-     them, are in the table's bcache, if it has one.  */
-  int argc : 31;
+     them, are in the table's bcache, if it has one.  If `kind' is
+     `macro_object_like', then this is actually a `macro_special_kind'
+     describing the macro.  */
+  int argc : 30;
   const char * const *argv;
 
-  /* The replacement string (body) of the macro.  This is in the
-     table's bcache, if it has one.  */
+  /* The replacement string (body) of the macro.  For ordinary macros,
+     this is in the table's bcache, if it has one.  For special macros
+     like __FILE__, this value is only valid until the next use of any
+     special macro definition; that is, it is reset each time any
+     special macro is looked up or iterated over.  */
   const char *replacement;
 };
 
 
 /* Return a pointer to the macro definition for NAME in scope at line
    number LINE of SOURCE.  If LINE is -1, return the definition in
    effect at the end of the file.  The macro table owns the structure;
    the caller need not free it.  Return zero if NAME is not #defined
    at that point.  */
 struct macro_definition *(macro_lookup_definition
@@ skipping 30 matching lines @@
 
 /* Call the function FN for each macro that is visible in a given
    scope.  The scope is represented by FILE and LINE.  USER_DATA is
    passed, untranslated, to FN.  */
 void macro_for_each_in_scope (struct macro_source_file *file, int line,
                               macro_callback_fn fn,
                               void *user_data);
 
 
 #endif /* MACROTAB_H */