Update comment for last commit.

[pf3gnuchains/gcc-fork.git] / libcpp / internal.h

diff --git a/libcpp/internal.h b/libcpp/internal.h
index 38a80c6..9209b55 100644 (file)
--- a/libcpp/internal.h
+++ b/libcpp/internal.h
@@ -4,7 +4,7 @@
 
 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
 
 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 2, or (at your option) any
+Free Software Foundation; either version 3, or (at your option) any

 later version.
 
 This program is distributed in the hope that it will be useful,
 later version.
 
 This program is distributed in the hope that it will be useful,


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

-along with this program; if not, write to the Free Software
-Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+along with this program; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */

 
 /* This header defines all the internal data structures and functions
    that need to be visible across files.  It should not be used outside
 
 /* This header defines all the internal data structures and functions
    that need to be visible across files.  It should not be used outside


@@ -33,6 +33,10 @@ Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 typedef int iconv_t;  /* dummy */
 #endif
 
 typedef int iconv_t;  /* dummy */
 #endif
 

+#ifdef __cplusplus
+extern "C" {
+#endif
+

 struct directive;              /* Deliberately incomplete.  */
 struct pending_option;
 struct op;
 struct directive;              /* Deliberately incomplete.  */
 struct pending_option;
 struct op;


@@ -236,7 +240,8 @@ struct _cpp_line_note
 
   /* Type of note.  The 9 'from' trigraph characters represent those
      trigraphs, '\\' an escaped newline, ' ' an escaped newline with
 
   /* Type of note.  The 9 'from' trigraph characters represent those
      trigraphs, '\\' an escaped newline, ' ' an escaped newline with

-     intervening space, and anything else is invalid.  */
+     intervening space, 0 represents a note that has already been handled,
+     and anything else is invalid.  */

   unsigned int type;
 };
 
   unsigned int type;
 };
 


@@ -301,6 +306,16 @@ struct cpp_buffer
   struct cset_converter input_cset_desc;
 };
 
   struct cset_converter input_cset_desc;
 };
 

+/* The list of saved macros by push_macro pragma.  */
+struct def_pragma_macro {
+  /* Chain element to previous saved macro.  */
+  struct def_pragma_macro *next;
+  /* Name of the macro.  */
+  char *name;
+  /* The stored macro content.  */
+  cpp_macro *value;
+};
+

 /* A cpp_reader encapsulates the "state" of a pre-processor run.
    Applying cpp_get_token repeatedly yields a stream of pre-processor
    tokens.  Usually, there is only one cpp_reader object active.  */
 /* A cpp_reader encapsulates the "state" of a pre-processor run.
    Applying cpp_get_token repeatedly yields a stream of pre-processor
    tokens.  Usually, there is only one cpp_reader object active.  */


@@ -393,6 +408,10 @@ struct cpp_reader
   struct cset_converter narrow_cset_desc;
 
   /* Descriptor for converting from the source character set to the
   struct cset_converter narrow_cset_desc;
 
   /* Descriptor for converting from the source character set to the

+     UTF-8 execution character set.  */
+  struct cset_converter utf8_cset_desc;
+
+  /* Descriptor for converting from the source character set to the

      UTF-16 execution character set.  */
   struct cset_converter char16_cset_desc;
 
      UTF-16 execution character set.  */
   struct cset_converter char16_cset_desc;
 


@@ -467,6 +486,9 @@ struct cpp_reader
 
   /* Table of comments, when state.save_comments is true.  */
   cpp_comment_table comments;
 
   /* Table of comments, when state.save_comments is true.  */
   cpp_comment_table comments;

+
+  /* List of saved macros by push_macro.  */
+  struct def_pragma_macro *pushed_macros;

 };
 
 /* Character classes.  Based on the more primitive macros in safe-ctype.h.
 };
 
 /* Character classes.  Based on the more primitive macros in safe-ctype.h.


@@ -567,9 +589,11 @@ extern const cpp_token *_cpp_lex_token (cpp_reader *);
 extern cpp_token *_cpp_lex_direct (cpp_reader *);
 extern int _cpp_equiv_tokens (const cpp_token *, const cpp_token *);
 extern void _cpp_init_tokenrun (tokenrun *, unsigned int);
 extern cpp_token *_cpp_lex_direct (cpp_reader *);
 extern int _cpp_equiv_tokens (const cpp_token *, const cpp_token *);
 extern void _cpp_init_tokenrun (tokenrun *, unsigned int);

+extern cpp_hashnode *_cpp_lex_identifier (cpp_reader *, const char *);

 
 /* In init.c.  */
 extern void _cpp_maybe_push_include_file (cpp_reader *);
 
 /* In init.c.  */
 extern void _cpp_maybe_push_include_file (cpp_reader *);

+extern const char *cpp_named_operator2name (enum cpp_ttype type);

 
 /* In directives.c */
 extern int _cpp_test_assertion (cpp_reader *, unsigned int *);
 
 /* In directives.c */
 extern int _cpp_test_assertion (cpp_reader *, unsigned int *);


@@ -701,4 +725,8 @@ ufputs (const unsigned char *s, FILE *f)
   return fputs ((const char *)s, f);
 }
 
   return fputs ((const char *)s, f);
 }
 

+#ifdef __cplusplus
+}
+#endif
+

 #endif /* ! LIBCPP_INTERNAL_H */
 #endif /* ! LIBCPP_INTERNAL_H */