CbC/CbC_gcc: libcpp/internal.h comparison

comparison libcpp/internal.h @ 145:1830386684a0

gcc-9.2.0

author	anatofuz
date	Thu, 13 Feb 2020 11:34:05 +0900
parents	84e7813d76e9
children

comparison

equal deleted inserted replaced

-:84e7813d76e9
+:1830386684a0
 /* Part of CPP library.
-Copyright (C) 1997-2018 Free Software Foundation, Inc.
+Copyright (C) 1997-2020 Free Software Foundation, Inc.
 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, or (at your option) any
 later version.
 #define CPP_BUFFER(PFILE) ((PFILE)->buffer)
 #define CPP_BUF_COLUMN(BUF, CUR) ((CUR) - (BUF)->line_base)
 #define CPP_BUF_COL(BUF) CPP_BUF_COLUMN(BUF, (BUF)->cur)
 #define CPP_INCREMENT_LINE(PFILE, COLS_HINT) do { \
-const struct line_maps *line_table = PFILE->line_table; \
+const class line_maps *line_table = PFILE->line_table; \
 const struct line_map_ordinary *map = \
 LINEMAPS_LAST_ORDINARY_MAP (line_table); \
 linenum_type line = SOURCE_LINE (map, line_table->highest_line); \
 linemap_line_start (PFILE->line_table, line + 1, COLS_HINT); \
 } while (0)
-/* Maximum nesting of cpp_buffers.  We use a static limit, partly for
-efficiency, and partly to limit runaway recursion.  */
-#define CPP_STACK_MAX 200
 /* Host alignment handling.  */
 struct dummy
 {
 char c;
 #define BUFF_ROOM(BUFF) (size_t) ((BUFF)->limit - (BUFF)->cur)
 #define BUFF_FRONT(BUFF) ((BUFF)->cur)
 #define BUFF_LIMIT(BUFF) ((BUFF)->limit)
 /* #include types.  */
-enum include_type {IT_INCLUDE, IT_INCLUDE_NEXT, IT_IMPORT, IT_CMDLINE, IT_DEFAULT};
+enum include_type
+{
+/* Directive-based including mechanisms.  */
+IT_INCLUDE,  /* #include */
+IT_INCLUDE_NEXT,  /* #include_next */
+IT_IMPORT,   /* #import  */
+/* Non-directive including mechanisms.  */
+IT_CMDLINE,  /* -include */
+IT_DEFAULT,  /* forced header  */
+IT_MAIN,     /* main  */
+IT_DIRECTIVE_HWM = IT_IMPORT + 1,  /* Directives below this.  */
+IT_HEADER_HWM = IT_DEFAULT + 1     /* Header files below this.  */
+};
 union utoken
 {
 const cpp_token *token;
 const cpp_token **ptoken;
 cpp_hashnode *macro_node;
 /* This buffer contains an array of virtual locations.  The virtual
 location at index 0 is the virtual location of the token at index
 0 in the current instance of cpp_context; similarly for all the
 other virtual locations.  */
-source_location *virt_locs;
+location_t *virt_locs;
 /* This is a pointer to the current virtual location.  This is used
 to iterate over the virtual locations while we iterate over the
 tokens they belong to.  */
-source_location *cur_virt_loc;
+location_t *cur_virt_loc;
 } macro_context;
 /* The kind of tokens carried by a cpp_context.  */
 enum context_tokens_kind {
 /* This is the value of cpp_context::tokens_kind if u.iso.first
 enum context_tokens_kind tokens_kind;
 };
 struct lexer_state
 {
-/* Nonzero if first token on line is CPP_HASH.  */
+/* 1 if we're handling a directive.  2 if it's an include-like
+directive.  */
 unsigned char in_directive;
 /* Nonzero if in a directive that will handle padding tokens itself.
 #include needs this to avoid problems with computed include and
 spacing between tokens.  */
 /* Nonzero to prevent macro expansion.  */
 unsigned char prevent_expansion;
 /* Nonzero when parsing arguments to a function-like macro.  */
 unsigned char parsing_args;
-/* Nonzero if in a __has_include__ or __has_include_next__ statement.  */
-unsigned char in__has_include__;
 /* Nonzero if prevent_expansion is true only because output is
 being discarded.  */
 unsigned char discarding_output;
 cpp_hashnode *n_defined;		/* defined operator */
 cpp_hashnode *n_true;			/* C++ keyword true */
 cpp_hashnode *n_false;		/* C++ keyword false */
 cpp_hashnode *n__VA_ARGS__;		/* C99 vararg macros */
 cpp_hashnode *n__VA_OPT__;		/* C++ vararg macros */
-cpp_hashnode *n__has_include__;	/* __has_include__ operator */
-cpp_hashnode *n__has_include_next__;	/* __has_include_next__ operator */
 };
 typedef struct _cpp_line_note _cpp_line_note;
 struct _cpp_line_note
 {
 /* Value of if_stack at start of this file.
 Used to prohibit unmatched #endif (etc) in an include file.  */
 struct if_stack *if_stack;
 /* True if we need to get the next clean line.  */
-bool need_line;
+bool need_line : 1;
 /* True if we have already warned about C++ comments in this file.
 The warning happens only for C89 extended mode with -pedantic on,
 or for -Wtraditional, and only once per file (otherwise it would
 be far too noisy).  */
-unsigned int warned_cplusplus_comments : 1;
+bool warned_cplusplus_comments : 1;
 /* True if we don't process trigraphs and escaped newlines.  True
 for preprocessed input, command line directives, and _Pragma
 buffers.  */
-unsigned int from_stage3 : 1;
+bool from_stage3 : 1;
 /* At EOF, a buffer is automatically popped.  If RETURN_AT_EOF is
 true, a CPP_EOF token is then returned.  Otherwise, the next
 token from the enclosing buffer is returned.  */
-unsigned int return_at_eof : 1;
+bool return_at_eof : 1;
 /* One for a system header, two for a C system header file that therefore
 needs to be extern "C" protected in C++, and zero otherwise.  */
 unsigned char sysp;
 char *name;
 /* The stored macro content.  */
 unsigned char *definition;
 /* Definition line number.  */
-source_location line;
+location_t line;
 /* If macro defined in system header.  */
 unsigned int syshdr   : 1;
 /* Nonzero if it has been expanded or had its existence tested.  */
 unsigned int used     : 1;
 /* Mark if we save an undefined macro.  */
 unsigned int is_undef : 1;
+/* Nonzero if it was a builtin macro.  */
+unsigned int is_builtin : 1;
 };
 /* 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.  */
 /* Lexer state.  */
 struct lexer_state state;
 /* Source line tracking.  */
-struct line_maps *line_table;
+class line_maps *line_table;
 /* The line of the '#' of the current directive.  */
-source_location directive_line;
+location_t directive_line;
 /* Memory buffers.  */
 _cpp_buff *a_buff;		/* Aligned permanent storage.  */
 _cpp_buff *u_buff;		/* Unaligned permanent storage.  */
 _cpp_buff *free_buffs;	/* Free buffer chain.  */
 /* Token generated while handling a directive, if any. */
 cpp_token directive_result;
 /* When expanding a macro at top-level, this is the location of the
 macro invocation.  */
-source_location invocation_location;
+location_t invocation_location;
 /* This is the node representing the macro being expanded at
 top-level.  The value of this data member is valid iff
-in_macro_expansion_p() returns TRUE.  */
+cpp_in_macro_expansion_p() returns TRUE.  */
 cpp_hashnode *top_most_macro_node;
 /* Nonzero if we are about to expand a macro.  Note that if we are
 really expanding a macro, the function macro_of_context returns
 the macro being expanded and this flag is set to false.  Client
-code should use the function in_macro_expansion_p to know if we
+code should use the function cpp_in_macro_expansion_p to know if we
 are either about to expand a macro, or are actually expanding
 one.  */
 bool about_to_expand_macro_p;
 /* Search paths for include files.  */
 /* EOF token, and a token forcing paste avoidance.  */
 cpp_token avoid_paste;
 cpp_token eof;
 /* Opaque handle to the dependencies of mkdeps.c.  */
-struct deps *deps;
+class mkdeps *deps;
 /* Obstack holding all macro hash nodes.  This never shrinks.
 See identifiers.c */
 struct obstack hash_ob;
 struct
 {
 unsigned char *base;
 unsigned char *limit;
 unsigned char *cur;
-source_location first_line;
+location_t first_line;
 } out;
 /* Used for buffer overlays by traditional.c.  */
 const unsigned char *saved_cur, *saved_rlimit, *saved_line_base;
 cpp_comment_table comments;
 /* List of saved macros by push_macro.  */
 struct def_pragma_macro *pushed_macros;
-/* If non-null, the lexer will use this location for the next token
+/* If non-zero, the lexer will use this location for the next token
 instead of getting a location from the linemap.  */
-source_location *forced_token_location_p;
+location_t forced_token_location;
 };
 /* Character classes.  Based on the more primitive macros in safe-ctype.h.
 If the definition of `numchar' looks odd to you, please look up the
 definition of a pp-number in the C standard [section 6.4.8 of C99].
 #define is_hspace(x)	ISBLANK(x)
 #define is_vspace(x)	IS_VSPACE(x)
 #define is_nvspace(x)	IS_NVSPACE(x)
 #define is_space(x)	IS_SPACE_OR_NUL(x)
+#define SEEN_EOL() (pfile->cur_token[-1].type == CPP_EOF)
 /* This table is constant if it can be initialized at compile time,
 which is the case if cpp was compiled with GCC >=2.7, or another
 compiler that supports C99.  */
 #if HAVE_DESIGNATED_INITIALIZERS
 extern const unsigned char _cpp_trigraph_map[UCHAR_MAX + 1];
 static inline int cpp_in_primary_file (cpp_reader *);
 static inline int
 cpp_in_primary_file (cpp_reader *pfile)
 {
 return pfile->line_table->depth == 1;
+}
+/* True if NODE is a macro for the purposes of ifdef, defined etc.  */
+inline bool _cpp_defined_macro_p (cpp_hashnode *node)
+{
+/* Do not treat conditional macros as being defined.  This is due to
+the powerpc port using conditional macros for 'vector', 'bool',
+and 'pixel' to act as conditional keywords.  This messes up tests
+like #ifndef bool.  */
+return cpp_macro_p (node) && !(node->flags & NODE_CONDITIONAL);
 }
 /* In macro.c */
 extern void _cpp_notify_macro_use (cpp_reader *pfile, cpp_hashnode *node);
 inline void _cpp_maybe_notify_macro_use (cpp_reader *pfile, cpp_hashnode *node)
 extern void _cpp_unsave_parameters (cpp_reader *, unsigned);
 extern bool _cpp_arguments_ok (cpp_reader *, cpp_macro *, const cpp_hashnode *,
 			       unsigned int);
 extern const unsigned char *_cpp_builtin_macro_text (cpp_reader *,
 						     cpp_hashnode *,
-						     source_location = 0);
+						     location_t = 0);
 extern int _cpp_warn_if_unused_macro (cpp_reader *, cpp_hashnode *, void *);
 extern void _cpp_push_token_context (cpp_reader *, cpp_hashnode *,
 				     const cpp_token *, unsigned int);
 extern void _cpp_backup_tokens_direct (cpp_reader *, unsigned int);
 extern void _cpp_destroy_hashtable (cpp_reader *);
 /* In files.c */
 typedef struct _cpp_file _cpp_file;
 extern _cpp_file *_cpp_find_file (cpp_reader *, const char *, cpp_dir *,
-				  bool, int, bool, source_location);
+				  int angle, bool fake, bool preinclude,
+				  bool has_include, location_t);
 extern bool _cpp_find_failed (_cpp_file *);
 extern void _cpp_mark_file_once_only (cpp_reader *, struct _cpp_file *);
 extern void _cpp_fake_include (cpp_reader *, const char *);
-extern bool _cpp_stack_file (cpp_reader *, _cpp_file*, bool,
+extern bool _cpp_stack_file (cpp_reader *, _cpp_file*, include_type, location_t);
-			     source_location);
 extern bool _cpp_stack_include (cpp_reader *, const char *, int,
-				enum include_type, source_location);
+				enum include_type, location_t);
 extern int _cpp_compare_file_date (cpp_reader *, const char *, int);
 extern void _cpp_report_missing_guards (cpp_reader *);
 extern void _cpp_init_files (cpp_reader *);
 extern void _cpp_cleanup_files (cpp_reader *);
 extern void _cpp_pop_file_buffer (cpp_reader *, struct _cpp_file *,
 extern void *_cpp_commit_buff (cpp_reader *pfile, size_t size);
 /* In init.c.  */
 extern void _cpp_maybe_push_include_file (cpp_reader *);
 extern const char *cpp_named_operator2name (enum cpp_ttype type);
+extern void _cpp_restore_special_builtin (cpp_reader *pfile,
+					  struct def_pragma_macro *);
 /* In directives.c */
 extern int _cpp_test_assertion (cpp_reader *, unsigned int *);
-extern int _cpp_handle_directive (cpp_reader *, int);
+extern int _cpp_handle_directive (cpp_reader *, bool);
 extern void _cpp_define_builtin (cpp_reader *, const char *);
 extern char ** _cpp_save_pragma_names (cpp_reader *);
 extern void _cpp_restore_pragma_names (cpp_reader *, char **);
-extern int _cpp_do__Pragma (cpp_reader *, source_location);
+extern int _cpp_do__Pragma (cpp_reader *, location_t);
 extern void _cpp_init_directives (cpp_reader *);
 extern void _cpp_init_internal_pragmas (cpp_reader *);
 extern void _cpp_do_file_change (cpp_reader *, enum lc_reason, const char *,
 				 linenum_type, unsigned int);
 extern void _cpp_pop_buffer (cpp_reader *);
 /* In directives.c */
 struct _cpp_dir_only_callbacks
 {
 /* Called to print a block of lines. */
 void (*print_lines) (int, const void *, size_t);
-bool (*maybe_print_line) (source_location);
+bool (*maybe_print_line) (location_t);
 };
 extern void _cpp_preprocess_dir_only (cpp_reader *,
 				      const struct _cpp_dir_only_callbacks *);
 			    const unsigned char *, int,
 			    struct normalize_state *state,
 			    cppchar_t *,
 			    source_range *char_range,
 			    cpp_string_location_reader *loc_reader);
+extern bool _cpp_valid_utf8 (cpp_reader *pfile,
+			     const uchar **pstr,
+			     const uchar *limit,
+			     int identifier_pos,
+			     struct normalize_state *nst,
+			     cppchar_t *cp);
 extern void _cpp_destroy_iconv (cpp_reader *);
 extern unsigned char *_cpp_convert_input (cpp_reader *, const char *,
 					  unsigned char *, size_t, size_t,
 					  const unsigned char **, off_t *);
 extern const char *_cpp_default_encoding (void);
 of the expansion point of MACRO. For function-like macros
 invocations, it's best to make it point to the closing parenthesis
 of the macro, rather than the the location of the first character
 of the macro.  NUM_TOKENS is the number of tokens that are part of
 the replacement-list of MACRO.  */
-const line_map_macro *linemap_enter_macro (struct line_maps *,
+const line_map_macro *linemap_enter_macro (class line_maps *,
 					   struct cpp_hashnode*,
-					   source_location,
+					   location_t,
 					   unsigned int);
 /* Create and return a virtual location for a token that is part of a
 macro expansion-list at a macro expansion point.  See the comment
 inside struct line_map_macro to see what an expansion-list exactly
 itself a macro expansion or not).
 MACRO_DEFINITION_LOC is the location in the macro definition,
 either of the token itself or of a macro parameter that it
 replaces.  */
-source_location linemap_add_macro_token (const line_map_macro *,
+location_t linemap_add_macro_token (const line_map_macro *,
-					 unsigned int,
+				    unsigned int,
-					 source_location,
+				    location_t,
-					 source_location);
+				    location_t);
 /* Return the source line number corresponding to source location
 LOCATION.  SET is the line map set LOCATION comes from.  If
 LOCATION is the location of token that is part of the
 expansion-list of a macro expansion return the line number of the
 macro expansion point.  */
-int linemap_get_expansion_line (struct line_maps *,
+int linemap_get_expansion_line (class line_maps *,
-				source_location);
+				location_t);
 /* Return the path of the file corresponding to source code location
 LOCATION.
 If LOCATION is the location of a token that is part of the
 replacement-list of a macro expansion return the file path of the
 macro expansion point.
 SET is the line map set LOCATION comes from.  */
-const char* linemap_get_expansion_filename (struct line_maps *,
+const char* linemap_get_expansion_filename (class line_maps *,
-					    source_location);
+					    location_t);
 #ifdef __cplusplus
 }
 #endif

Mercurial > hg > CbC > CbC_gcc

comparison libcpp/internal.h @ 145:1830386684a0