X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=gcc%2Fcpphash.h;h=210380ed0c209ad926e0a644214cbe28ab8b3a65;hp=7baf8ff0bb0bfc40df11b1773c70129dd452add9;hb=4e84a9475cf7e6be1993534b52cd93556c6cb33b;hpb=13c457e1923eefa04f4b52e5321ef6e2379d6a8b diff --git a/gcc/cpphash.h b/gcc/cpphash.h index 7baf8ff0bb0..210380ed0c2 100644 --- a/gcc/cpphash.h +++ b/gcc/cpphash.h @@ -1,5 +1,5 @@ /* Part of CPP library. - Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 + Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it @@ -29,6 +29,11 @@ struct directive; /* Deliberately incomplete. */ struct pending_option; struct op; +#ifndef HAVE_UCHAR +typedef unsigned char uchar; +#endif +#define U (const uchar *) /* Intended use: U"string" */ + #define BITS_PER_CPPCHAR_T (CHAR_BIT * sizeof (cppchar_t)) /* Test if a sign is valid within a preprocessing number. */ @@ -40,13 +45,70 @@ struct op; #define CPP_OPTION(PFILE, OPTION) ((PFILE)->opts.OPTION) #define CPP_BUFFER(PFILE) ((PFILE)->buffer) -#define CPP_BUF_COLUMN(BUF, CUR) ((CUR) - (BUF)->line_base + (BUF)->col_adjust) +#define CPP_BUF_COLUMN(BUF, CUR) ((CUR) - (BUF)->line_base) #define CPP_BUF_COL(BUF) CPP_BUF_COLUMN(BUF, (BUF)->cur) /* 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; + union + { + double d; + int *p; + } u; +}; + +#define DEFAULT_ALIGNMENT offsetof (struct dummy, u) +#define CPP_ALIGN2(size, align) (((size) + ((align) - 1)) & ~((align) - 1)) +#define CPP_ALIGN(size) CPP_ALIGN2 (size, DEFAULT_ALIGNMENT) + +/* Each macro definition is recorded in a cpp_macro structure. + Variadic macros cannot occur with traditional cpp. */ +struct cpp_macro +{ + /* Parameters, if any. */ + cpp_hashnode **params; + + /* Replacement tokens (ISO) or replacement text (traditional). See + comment at top of cpptrad.c for how traditional function-like + macros are encoded. */ + union + { + cpp_token *tokens; + const uchar *text; + } exp; + + /* Definition line number. */ + unsigned int line; + + /* Number of tokens in expansion, or bytes for traditional macros. */ + unsigned int count; + + /* Number of parameters. */ + unsigned short paramc; + + /* If a function-like macro. */ + unsigned int fun_like : 1; + + /* If a variadic macro. */ + unsigned int variadic : 1; + + /* 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; +}; + +#define _cpp_mark_macro_used(NODE) do { \ + if ((NODE)->type == NT_MACRO && !((NODE)->flags & NODE_BUILTIN)) \ + (NODE)->value.macro->used = 1; } while (0) + /* A generic memory buffer, and operations on it. */ typedef struct _cpp_buff _cpp_buff; struct _cpp_buff @@ -68,26 +130,6 @@ extern unsigned char *_cpp_unaligned_alloc PARAMS ((cpp_reader *, size_t)); #define BUFF_FRONT(BUFF) ((BUFF)->cur) #define BUFF_LIMIT(BUFF) ((BUFF)->limit) -/* List of directories to look for include files in. */ -struct search_path -{ - struct search_path *next; - - /* NOTE: NAME may not be null terminated for the case of the current - file's directory! */ - const char *name; - unsigned int len; - /* We use these to tell if the directory mentioned here is a duplicate - of an earlier directory on the search path. */ - ino_t ino; - dev_t dev; - /* Non-zero if it is a system include directory. */ - int sysp; - /* Mapping of file names for this directory. Only used on MS-DOS - and related platforms. */ - struct file_name_map *name_map; -}; - /* #include types. */ enum include_type {IT_INCLUDE, IT_INCLUDE_NEXT, IT_IMPORT, IT_CMDLINE}; @@ -105,16 +147,36 @@ struct tokenrun cpp_token *base, *limit; }; +/* Accessor macros for struct cpp_context. */ +#define FIRST(c) ((c)->u.iso.first) +#define LAST(c) ((c)->u.iso.last) +#define CUR(c) ((c)->u.trad.cur) +#define RLIMIT(c) ((c)->u.trad.rlimit) + typedef struct cpp_context cpp_context; struct cpp_context { /* Doubly-linked list. */ cpp_context *next, *prev; - /* Contexts other than the base context are contiguous tokens. - e.g. macro expansions, expanded argument tokens. */ - union utoken first; - union utoken last; + union + { + /* For ISO macro expansion. Contexts other than the base context + are contiguous tokens. e.g. macro expansions, expanded + argument tokens. */ + struct + { + union utoken first; + union utoken last; + } iso; + + /* For traditional macro expansion. */ + struct + { + const uchar *cur; + const uchar *rlimit; + } trad; + } u; /* If non-NULL, a buffer used for storage related to this context. When the context is popped, the buffer is released. */ @@ -132,19 +194,24 @@ struct lexer_state /* Nonzero if first token on line is CPP_HASH. */ 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. */ + unsigned char directive_wants_padding; + /* 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; + /* Nonzero if in a #if or #elif directive. */ + unsigned char in_expression; + /* Nonzero to save comments. Turned off if discard_comments, and in all directives apart from #define. */ unsigned char save_comments; - /* Nonzero if we're mid-comment. */ - unsigned char lexing_comment; - /* Nonzero if lexing __VA_ARGS__ is valid. */ unsigned char va_args_ok; @@ -152,7 +219,7 @@ struct lexer_state unsigned char poisoned_ok; /* Nonzero to prevent macro expansion. */ - unsigned char prevent_expansion; + unsigned char prevent_expansion; /* Nonzero when parsing arguments to a function-like macro. */ unsigned char parsing_args; @@ -167,22 +234,38 @@ struct spec_nodes cpp_hashnode *n_defined; /* defined operator */ cpp_hashnode *n_true; /* C++ keyword true */ cpp_hashnode *n_false; /* C++ keyword false */ - cpp_hashnode *n__STRICT_ANSI__; /* STDC_0_IN_SYSTEM_HEADERS */ cpp_hashnode *n__VA_ARGS__; /* C99 vararg macros */ }; +typedef struct _cpp_line_note _cpp_line_note; +struct _cpp_line_note +{ + /* Location in the clean line the note refers to. */ + const uchar *pos; + + /* 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. */ + unsigned int type; +}; + /* Represents the contents of a file cpplib has read in. */ struct cpp_buffer { - const unsigned char *cur; /* current position */ - const unsigned char *backup_to; /* if peeked character is not wanted */ - const unsigned char *rlimit; /* end of valid data */ - const unsigned char *line_base; /* start of current line */ + const uchar *cur; /* Current location. */ + const uchar *line_base; /* Start of current physical line. */ + const uchar *next_line; /* Start of to-be-cleaned logical line. */ + + const uchar *buf; /* Entire character buffer. */ + const uchar *rlimit; /* Writable byte at end of file. */ + + _cpp_line_note *notes; /* Array of notes. */ + unsigned int cur_note; /* Next note to process. */ + unsigned int notes_used; /* Number of notes. */ + unsigned int notes_cap; /* Size of allocated array. */ struct cpp_buffer *prev; - const unsigned char *buf; /* Entire character buffer. */ - /* 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; @@ -191,15 +274,8 @@ struct cpp_buffer Used to prohibit unmatched #endif (etc) in an include file. */ struct if_stack *if_stack; - /* Token column position adjustment owing to tabs in whitespace. */ - unsigned int col_adjust; - - /* Contains PREV_WHITE and/or AVOID_LPASTE. */ - unsigned char saved_flags; - - /* Because of the way the lexer works, -Wtrigraphs can sometimes - warn twice for the same trigraph. This helps prevent that. */ - const unsigned char *last_Wtrigraphs; + /* True if we need to get the next clean line. */ + bool need_line; /* True if we have already warned about C++ comments in this file. The warning happens only for C89 extended mode with -pedantic on, @@ -223,7 +299,10 @@ struct cpp_buffer /* The directory of the this buffer's file. Its NAME member is not allocated, so we don't need to worry about freeing it. */ - struct search_path dir; + struct cpp_path dir; + + /* Used for buffer overlays by cpptrad.c. */ + const uchar *saved_cur, *saved_rlimit; }; /* A cpp_reader encapsulates the "state" of a pre-processor run. @@ -234,6 +313,9 @@ struct cpp_reader /* Top of buffer stack. */ cpp_buffer *buffer; + /* Overlaid buffer (can be different after processing #include). */ + cpp_buffer *overlaid_buffer; + /* Lexer state. */ struct lexer_state state; @@ -257,12 +339,11 @@ struct cpp_reader /* If in_directive, the directive if known. */ const struct directive *directive; - /* The next -include-d file; NULL if they all are done. If it - points to NULL, the last one is in progress, and - _cpp_maybe_push_include_file has yet to restore the line map. */ - struct pending_option **next_include_file; + /* Search paths for include files. */ + struct cpp_path *quote_include; /* "" */ + struct cpp_path *bracket_include; /* <> */ - /* Multiple inlcude optimisation. */ + /* Multiple include optimisation. */ const cpp_hashnode *mi_cmacro; const cpp_hashnode *mi_ind_cmacro; bool mi_valid; @@ -272,7 +353,7 @@ struct cpp_reader tokenrun base_run, *cur_run; unsigned int lookaheads; - /* Non-zero prevents the lexer from re-using the token runs. */ + /* Nonzero prevents the lexer from re-using the token runs. */ unsigned int keep_tokens; /* Error counter for exit code. */ @@ -289,15 +370,19 @@ struct cpp_reader for include files. (Altered as we get more of them.) */ unsigned int max_include_len; - /* Date and time tokens. Calculated together if either is requested. */ - cpp_token date; - cpp_token time; + /* Date and time text. Calculated together if either is requested. */ + const uchar *date; + const uchar *time; /* EOF token, and a token forcing paste avoidance. */ cpp_token avoid_paste; cpp_token eof; - /* Opaque handle to the dependencies of mkdeps.c. Used by -M etc. */ + /* True if we have already warned about dollars in identifiers or + numbers for this buffer. */ + bool warned_dollar; + + /* Opaque handle to the dependencies of mkdeps.c. */ struct deps *deps; /* Obstack holding all macro hash nodes. This never shrinks. @@ -315,7 +400,7 @@ struct cpp_reader /* Call backs. */ struct cpp_callbacks cb; - /* Identifier hash table. */ + /* Identifier hash table. */ struct ht *hash_table; /* Expression parser stack. */ @@ -328,12 +413,29 @@ struct cpp_reader preprocessor. */ struct spec_nodes spec_nodes; - /* Whether to print our version number. Done this way so - we don't get it twice for -v -version. */ - unsigned char print_version; + /* Nonzero means don't look for #include "foo" the source-file + directory. */ + unsigned char quote_ignores_source_dir; /* Whether cpplib owns the hashtable. */ unsigned char our_hashtable; + + /* Traditional preprocessing output buffer (a logical line). */ + struct + { + uchar *base; + uchar *limit; + uchar *cur; + unsigned int first_line; + } out; + + /* Used to save the original line number during traditional + preprocessing. */ + unsigned int saved_line; + + /* A saved list of the defined macros, for dependency checking + of precompiled headers. */ + struct cpp_savedstate *savedstate; }; /* Character classes. Based on the more primitive macros in safe-ctype.h. @@ -365,7 +467,6 @@ extern unsigned char _cpp_trigraph_map[UCHAR_MAX + 1]; /* Macros. */ -#define CPP_PRINT_DEPS(PFILE) CPP_OPTION (PFILE, print_deps) #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) @@ -376,9 +477,19 @@ extern int _cpp_begin_message PARAMS ((cpp_reader *, int, /* In cppmacro.c */ extern void _cpp_free_definition PARAMS ((cpp_hashnode *)); -extern int _cpp_create_definition PARAMS ((cpp_reader *, cpp_hashnode *)); +extern bool _cpp_create_definition PARAMS ((cpp_reader *, cpp_hashnode *)); extern void _cpp_pop_context PARAMS ((cpp_reader *)); - +extern void _cpp_push_text_context PARAMS ((cpp_reader *, cpp_hashnode *, + const uchar *, size_t)); +extern bool _cpp_save_parameter PARAMS ((cpp_reader *, cpp_macro *, + cpp_hashnode *)); +extern bool _cpp_arguments_ok PARAMS ((cpp_reader *, cpp_macro *, + const cpp_hashnode *, + unsigned int)); +extern const uchar *_cpp_builtin_macro_text PARAMS ((cpp_reader *, + cpp_hashnode *)); +int _cpp_warn_if_unused_macro PARAMS ((cpp_reader *, cpp_hashnode *, + void *)); /* In cpphash.c */ extern void _cpp_init_hashtable PARAMS ((cpp_reader *, hash_table *)); extern void _cpp_destroy_hashtable PARAMS ((cpp_reader *)); @@ -386,13 +497,11 @@ extern void _cpp_destroy_hashtable PARAMS ((cpp_reader *)); /* In cppfiles.c */ 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 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 *, - const cpp_token *)); +extern bool _cpp_execute_include PARAMS ((cpp_reader *, const char *, + int, enum include_type)); +extern int _cpp_compare_file_date PARAMS ((cpp_reader *, const char *, + int)); 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 *)); @@ -404,6 +513,10 @@ extern bool _cpp_parse_expr PARAMS ((cpp_reader *)); extern struct op *_cpp_expand_op_stack PARAMS ((cpp_reader *)); /* In cpplex.c */ +extern void _cpp_process_line_notes PARAMS ((cpp_reader *, int)); +extern void _cpp_clean_line PARAMS ((cpp_reader *)); +extern bool _cpp_get_fresh_line PARAMS ((cpp_reader *)); +extern bool _cpp_skip_block_comment PARAMS ((cpp_reader *)); extern cpp_token *_cpp_temp_token PARAMS ((cpp_reader *)); extern const cpp_token *_cpp_lex_token PARAMS ((cpp_reader *)); extern cpp_token *_cpp_lex_direct PARAMS ((cpp_reader *)); @@ -418,6 +531,8 @@ extern void _cpp_maybe_push_include_file PARAMS ((cpp_reader *)); extern int _cpp_test_assertion PARAMS ((cpp_reader *, unsigned int *)); extern int _cpp_handle_directive PARAMS ((cpp_reader *, int)); extern void _cpp_define_builtin PARAMS ((cpp_reader *, const char *)); +extern char ** _cpp_save_pragma_names PARAMS ((cpp_reader *)); +extern void _cpp_restore_pragma_names PARAMS ((cpp_reader *, char **)); 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 *)); @@ -426,6 +541,22 @@ extern void _cpp_do_file_change PARAMS ((cpp_reader *, enum lc_reason, unsigned int, unsigned int)); extern void _cpp_pop_buffer PARAMS ((cpp_reader *)); +/* In cpptrad.c. */ +extern bool scan_out_logical_line PARAMS ((cpp_reader *, cpp_macro *)); +extern bool _cpp_read_logical_line_trad PARAMS ((cpp_reader *)); +extern void _cpp_overlay_buffer PARAMS ((cpp_reader *pfile, const uchar *, + size_t)); +extern void _cpp_remove_overlay PARAMS ((cpp_reader *)); +extern bool _cpp_create_trad_definition PARAMS ((cpp_reader *, cpp_macro *)); +extern bool _cpp_expansions_different_trad PARAMS ((const cpp_macro *, + const cpp_macro *)); +extern uchar *_cpp_copy_replacement_text PARAMS ((const cpp_macro *, uchar *)); +extern size_t _cpp_replacement_text_len PARAMS ((const cpp_macro *)); + +/* In cppcharset.c. */ +cppchar_t _cpp_valid_ucn PARAMS ((cpp_reader *, const uchar **, + int identifer_p)); + /* Utility routines and macros. */ #define DSC(str) (const uchar *)str, sizeof str - 1 #define xnew(T) (T *) xmalloc (sizeof(T)) @@ -436,9 +567,6 @@ extern void _cpp_pop_buffer PARAMS ((cpp_reader *)); /* These are inline functions instead of macros so we can get type checking. */ -typedef unsigned char uchar; -#define U (const uchar *) /* Intended use: U"string" */ - static inline int ustrcmp PARAMS ((const uchar *, const uchar *)); static inline int ustrncmp PARAMS ((const uchar *, const uchar *, size_t));