#define CPP_OPTION(PFILE, OPTION) ((PFILE)->opts.OPTION)
#define CPP_BUFFER(PFILE) ((PFILE)->buffer)
-#define CPP_BUF_LINE(BUF) ((BUF)->lineno)
#define CPP_BUF_COLUMN(BUF, CUR) ((CUR) - (BUF)->line_base + (BUF)->col_adjust)
#define CPP_BUF_COL(BUF) CPP_BUF_COLUMN(BUF, (BUF)->cur)
typedef struct cpp_pool cpp_pool;
struct cpp_pool
{
- struct cpp_chunk *cur, *locked;
+ struct cpp_chunk *cur, *locked, *first;
unsigned char *pos; /* Current position. */
unsigned int align;
unsigned int locks;
struct file_name_map *name_map;
};
-/* Multiple-include optimisation. */
-enum mi_state {MI_FAILED = 0, MI_OUTSIDE};
-enum mi_ind {MI_IND_NONE = 0, MI_IND_NOT};
-
/* #include types. */
enum include_type {IT_INCLUDE, IT_INCLUDE_NEXT, IT_IMPORT, IT_CMDLINE};
/* Nonzero if first token on line is CPP_HASH. */
unsigned char in_directive;
+ /* True if we are skipping a failed conditional group. */
+ unsigned char skipping;
+
/* Nonzero if in a directive that takes angle-bracketed headers. */
unsigned char angled_headers;
all directives apart from #define. */
unsigned char save_comments;
- /* If nonzero the next token is at the beginning of the line. */
- unsigned char next_bol;
-
/* Nonzero if we're mid-comment. */
unsigned char lexing_comment;
cppchar_t read_ahead; /* read ahead character */
cppchar_t extra_char; /* extra read-ahead for long tokens. */
- struct cpp_reader *pfile; /* Owns this buffer. */
struct cpp_buffer *prev;
- const unsigned char *buf; /* entire buffer */
+ const unsigned char *buf; /* Entire buffer. */
- /* Filename specified with #line command. */
- const char *nominal_fname;
-
- /* Pointer into the include table. Used for include_next and
- to record control macros. */
+ /* Pointer into the include table; non-NULL if this is a file
+ buffer. Used for include_next and to record control macros. */
struct include_file *inc;
/* Value of if_stack at start of this file.
/* Token column position adjustment owing to tabs in whitespace. */
unsigned int col_adjust;
- /* Line number at line_base (above). */
- unsigned int lineno;
-
/* Contains PREV_WHITE and/or AVOID_LPASTE. */
unsigned char saved_flags;
buffers. */
unsigned char from_stage3;
- /* Temporary storage for pfile->skipping whilst in a directive. */
- unsigned char was_skipping;
-
- /* 1 = system header file, 2 = C system header file used for C++. */
- unsigned char sysp;
-
- /* Nonzero means we have printed (while error reporting) a list of
- containing files that matches the current status. */
- unsigned char include_stack_listed;
-
/* Nonzero means that the directory to start searching for ""
include files has been calculated and stored in "dir" below. */
unsigned char search_cached;
- /* Buffer type. */
- ENUM_BITFIELD (cpp_buffer_type) type : 8;
+ /* 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. */
+ bool return_at_eof;
/* The directory of the this buffer's file. Its NAME member is not
allocated, so we don't need to worry about freeing it. */
/* Lexer state. */
struct lexer_state state;
+ /* Source line tracking. */
+ struct line_maps line_maps;
+ const struct line_map *map;
+ unsigned int line;
+
/* The position of the last lexed token and last lexed directive. */
cpp_lexer_pos lexer_pos;
cpp_lexer_pos directive_pos;
+ unsigned int directive_line;
/* Memory pools. */
cpp_pool ident_pool; /* For all identifiers, and permanent
const struct directive *directive;
/* Multiple inlcude optimisation. */
- enum mi_state mi_state;
- enum mi_ind mi_if_not_defined;
- unsigned int mi_lexed;
const cpp_hashnode *mi_cmacro;
const cpp_hashnode *mi_ind_cmacro;
+ bool mi_valid;
/* Token lookahead. */
struct cpp_lookahead *la_read; /* Read from this lookahead. */
unsigned char *macro_buffer;
unsigned int macro_buffer_len;
- /* Current depth in #include directives that use <...>. */
- unsigned int system_include_depth;
-
- /* Current depth of buffer stack. */
- unsigned int buffer_stack_depth;
-
- /* Current depth in #include directives. */
- unsigned int include_depth;
-
/* Tree of other included files. See cppfiles.c. */
struct splay_tree_s *all_include_files;
preprocessor. */
struct spec_nodes spec_nodes;
- /* We're printed a warning recommending against using #import. */
- unsigned char import_warning;
-
- /* True if we are skipping a failed conditional group. */
- unsigned char skipping;
-
/* Whether to print our version number. Done this way so
we don't get it twice for -v -version. */
unsigned char print_version;
/* Macros. */
#define CPP_PRINT_DEPS(PFILE) CPP_OPTION (PFILE, print_deps)
-#define CPP_IN_SYSTEM_HEADER(PFILE) \
- (CPP_BUFFER (PFILE) && CPP_BUFFER (PFILE)->sysp)
+#define CPP_IN_SYSTEM_HEADER(PFILE) ((PFILE)->map && (PFILE)->map->sysp)
#define CPP_PEDANTIC(PF) CPP_OPTION (PF, pedantic)
#define CPP_WTRADITIONAL(PF) CPP_OPTION (PF, warn_traditional)
/* In cpperror.c */
enum error_type { WARNING = 0, WARNING_SYSHDR, PEDWARN, ERROR, FATAL, ICE };
extern int _cpp_begin_message PARAMS ((cpp_reader *, enum error_type,
- const char *, const cpp_lexer_pos *));
+ const cpp_lexer_pos *));
/* In cppmacro.c */
extern void _cpp_free_definition PARAMS ((cpp_hashnode *));
extern void _cpp_fake_include PARAMS ((cpp_reader *, const char *));
extern void _cpp_never_reread PARAMS ((struct include_file *));
extern char *_cpp_simplify_pathname PARAMS ((char *));
-extern int _cpp_read_file PARAMS ((cpp_reader *, const char *));
-extern int _cpp_execute_include PARAMS ((cpp_reader *,
+extern bool _cpp_read_file PARAMS ((cpp_reader *, const char *));
+extern bool _cpp_execute_include PARAMS ((cpp_reader *,
const cpp_token *,
enum include_type));
extern int _cpp_compare_file_date PARAMS ((cpp_reader *,
extern void _cpp_report_missing_guards PARAMS ((cpp_reader *));
extern void _cpp_init_includes PARAMS ((cpp_reader *));
extern void _cpp_cleanup_includes PARAMS ((cpp_reader *));
-extern void _cpp_pop_file_buffer PARAMS ((cpp_reader *, cpp_buffer *));
+extern void _cpp_pop_file_buffer PARAMS ((cpp_reader *,
+ struct include_file *));
/* In cppexp.c */
extern int _cpp_parse_expr PARAMS ((cpp_reader *));
extern void _cpp_lock_pool PARAMS ((cpp_pool *));
extern void _cpp_unlock_pool PARAMS ((cpp_pool *));
+/* In cppinit.c. */
+extern bool _cpp_push_next_buffer PARAMS ((cpp_reader *));
+
/* In cpplib.c */
extern int _cpp_test_assertion PARAMS ((cpp_reader *, int *));
extern int _cpp_handle_directive PARAMS ((cpp_reader *, int));
extern void _cpp_do__Pragma PARAMS ((cpp_reader *));
extern void _cpp_init_directives PARAMS ((cpp_reader *));
extern void _cpp_init_internal_pragmas PARAMS ((cpp_reader *));
-extern void _cpp_do_file_change PARAMS ((cpp_reader *, enum cpp_fc_reason,
- const char *, unsigned int));
+extern void _cpp_do_file_change PARAMS ((cpp_reader *, enum lc_reason,
+ const char *,
+ unsigned int, unsigned int));
+extern void _cpp_pop_buffer PARAMS ((cpp_reader *));
/* Utility routines and macros. */
#define DSC(str) (const U_CHAR *)str, sizeof str - 1
OSDN Git Service
