X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fcpphash.h;h=734d3bba4d93b443c22ca13cd2af193615c6a9ea;hb=0e7bd0dd7612870c454efdfb4ba114894972efe4;hp=a31368396ef72061461dc258702f52c39666e9e1;hpb=c808d0268bcba04615e10fcf39b670f81811d9bd;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/cpphash.h b/gcc/cpphash.h index a31368396ef..734d3bba4d9 100644 --- a/gcc/cpphash.h +++ b/gcc/cpphash.h @@ -1,5 +1,6 @@ /* Part of CPP library. - Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + 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 under the terms of the GNU General Public License as published by the @@ -24,7 +25,32 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "hashtable.h" +#ifdef HAVE_ICONV +#include +#else +#define HAVE_ICONV 0 +typedef int iconv_t; /* dummy */ +#endif + struct directive; /* Deliberately incomplete. */ +struct pending_option; +struct op; +struct _cpp_strbuf; + +typedef bool (*convert_f) (iconv_t, const unsigned char *, size_t, + struct _cpp_strbuf *); +struct cset_converter +{ + convert_f func; + iconv_t cd; +}; + +#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. */ #define VALID_SIGN(c, prevc) \ @@ -35,85 +61,147 @@ struct directive; /* Deliberately incomplete. */ #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 -/* Memory pools. */ -#define POOL_ALIGN(size, align) (((size) + ((align) - 1)) & ~((align) - 1)) -#define POOL_FRONT(p) ((p)->cur->front) -#define POOL_LIMIT(p) ((p)->cur->limit) -#define POOL_BASE(p) ((p)->cur->base) -#define POOL_SIZE(p) ((p)->cur->limit - (p)->cur->base) -#define POOL_ROOM(p) ((p)->cur->limit - (p)->cur->front) -#define POOL_USED(p) ((p)->cur->front - (p)->cur->base) -#define POOL_COMMIT(p, len) do {\ - ((p)->cur->front += POOL_ALIGN (len, (p)->align));\ - if ((p)->cur->front > (p)->cur->limit) abort ();} while (0) - -typedef struct cpp_chunk cpp_chunk; -struct cpp_chunk +/* Host alignment handling. */ +struct dummy { - cpp_chunk *next; - unsigned char *front; - unsigned char *limit; - unsigned char *base; + char c; + union + { + double d; + int *p; + } u; }; -typedef struct cpp_pool cpp_pool; -struct cpp_pool +#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 { - struct cpp_chunk *cur, *locked, *first; - unsigned char *pos; /* Current position. */ - unsigned int align; - unsigned int locks; + /* 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. */ + fileline 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; }; -/* List of directories to look for include files in. */ -struct search_path +#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 { - 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; + struct _cpp_buff *next; + unsigned char *base, *cur, *limit; }; +extern _cpp_buff *_cpp_get_buff (cpp_reader *, size_t); +extern void _cpp_release_buff (cpp_reader *, _cpp_buff *); +extern void _cpp_extend_buff (cpp_reader *, _cpp_buff **, size_t); +extern _cpp_buff *_cpp_append_extend_buff (cpp_reader *, _cpp_buff *, size_t); +extern void _cpp_free_buff (_cpp_buff *); +extern unsigned char *_cpp_aligned_alloc (cpp_reader *, size_t); +extern unsigned char *_cpp_unaligned_alloc (cpp_reader *, size_t); + +#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}; -typedef struct toklist toklist; -struct toklist +union utoken { - cpp_token *first; - cpp_token *limit; + const cpp_token *token; + const cpp_token **ptoken; }; +/* A "run" of tokens; part of a chain of runs. */ +typedef struct tokenrun tokenrun; +struct tokenrun +{ + tokenrun *next, *prev; + 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. */ - struct toklist list; - - /* For a macro context, these are the macro and its arguments. */ - cpp_macro *macro; + 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. */ + _cpp_buff *buff; + + /* For a macro context, the macro node, otherwise NULL. */ + cpp_hashnode *macro; + + /* True if utoken element is token, else ptoken. */ + bool direct_p; }; struct lexer_state @@ -121,19 +209,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; @@ -141,57 +234,63 @@ 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; - /* Nonzero when in a # NUMBER directive. */ - unsigned char line_extension; + /* Nonzero to skip evaluating part of an expression. */ + unsigned int skip_eval; }; /* Special nodes - identifiers with predefined significance. */ struct spec_nodes { - cpp_hashnode *n_L; /* L"str" */ cpp_hashnode *n_defined; /* defined operator */ cpp_hashnode *n_true; /* C++ keyword true */ cpp_hashnode *n_false; /* C++ keyword false */ - cpp_hashnode *n__Pragma; /* _Pragma operator */ - cpp_hashnode *n__STRICT_ANSI__; /* STDC_0_IN_SYSTEM_HEADERS */ - cpp_hashnode *n__CHAR_UNSIGNED__; /* plain char is unsigned */ 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 *rlimit; /* end of valid data */ - const unsigned char *line_base; /* start of current line */ - cppchar_t read_ahead; /* read ahead character */ - cppchar_t extra_char; /* extra read-ahead for long tokens. */ + 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 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; + /* Pointer into the file table; non-NULL if this is a file buffer. + Used for include_next and to record control macros. */ + struct _cpp_file *file; /* Value of if_stack at start of this file. 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, @@ -208,43 +307,40 @@ struct cpp_buffer include files has been calculated and stored in "dir" below. */ unsigned char search_cached; - /* 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. */ - struct search_path dir; + struct cpp_dir 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. Applying cpp_get_token repeatedly yields a stream of pre-processor tokens. Usually, there is only one cpp_reader object active. */ - 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; /* Source line tracking. */ struct line_maps line_maps; const struct line_map *map; - unsigned int line; + fileline 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; + /* The line of the '#' of the current directive. */ + fileline directive_line; - /* Memory pools. */ - cpp_pool ident_pool; /* For all identifiers, and permanent - numbers and strings. */ - cpp_pool macro_pool; /* For macro definitions. Permanent. */ - cpp_pool argument_pool; /* For macro arguments. Temporary. */ + /* Memory buffers. */ + _cpp_buff *a_buff; /* Aligned permanent storage. */ + _cpp_buff *u_buff; /* Unaligned permanent storage. */ + _cpp_buff *free_buffs; /* Free buffer chain. */ /* Context stack. */ struct cpp_context base_context; @@ -253,40 +349,66 @@ struct cpp_reader /* If in_directive, the directive if known. */ const struct directive *directive; - /* Multiple inlcude optimisation. */ + /* Search paths for include files. */ + struct cpp_dir *quote_include; /* "" */ + struct cpp_dir *bracket_include; /* <> */ + struct cpp_dir no_search_path; /* No path. */ + + /* Chain of all hashed _cpp_file instances. */ + struct _cpp_file *all_files; + + struct _cpp_file *main_file; + + /* File and directory hash table. */ + struct htab *file_hash; + struct file_hash_entry *file_hash_entries; + unsigned int file_hash_entries_allocated, file_hash_entries_used; + + /* Nonzero means don't look for #include "foo" the source-file + directory. */ + bool quote_ignores_source_dir; + + /* Nonzero if any file has contained #pragma once or #import has + been used. */ + bool seen_once_only; + + /* Multiple include optimization. */ 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. */ - struct cpp_lookahead *la_write; /* Write to this lookahead. */ - struct cpp_lookahead *la_unused; /* Free store. */ - struct cpp_lookahead *la_saved; /* Backup when entering directive. */ + /* Lexing. */ + cpp_token *cur_token; + tokenrun base_run, *cur_run; + unsigned int lookaheads; + + /* Nonzero prevents the lexer from re-using the token runs. */ + unsigned int keep_tokens; /* Error counter for exit code. */ unsigned int errors; - /* Line and column where a newline was first seen in a string - constant (multi-line strings). */ - cpp_lexer_pos mlstring_pos; - /* Buffer to hold macro definition string. */ unsigned char *macro_buffer; unsigned int macro_buffer_len; - /* Tree of other included files. See cppfiles.c. */ - struct splay_tree_s *all_include_files; + /* Descriptor for converting from the source character set to the + execution character set. */ + struct cset_converter narrow_cset_desc; + + /* Descriptor for converting from the source character set to the + wide execution character set. */ + struct cset_converter wide_cset_desc; - /* Current maximum length of directory names in the search path - for include files. (Altered as we get more of them.) */ - unsigned int max_include_len; + /* Date and time text. Calculated together if either is requested. */ + const uchar *date; + const uchar *time; - /* Date and time tokens. Calculated together if either is requested. */ - cpp_token date; - cpp_token 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. */ + /* Opaque handle to the dependencies of mkdeps.c. */ struct deps *deps; /* Obstack holding all macro hash nodes. This never shrinks. @@ -301,12 +423,15 @@ struct cpp_reader list of recognized pragmas. */ struct pragma_entry *pragmas; - /* Call backs. */ + /* Call backs to cpplib client. */ struct cpp_callbacks cb; - /* Identifier hash table. */ + /* Identifier hash table. */ struct ht *hash_table; + /* Expression parser stack. */ + struct op *op_stack, *op_limit; + /* User visible options. */ struct cpp_options opts; @@ -314,12 +439,25 @@ 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; - /* Whether cpplib owns the hashtable. */ - unsigned char our_hashtable; + bool our_hashtable; + + /* Traditional preprocessing output buffer (a logical line). */ + struct + { + uchar *base; + uchar *limit; + uchar *cur; + fileline 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. @@ -351,79 +489,95 @@ 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) /* 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 cpp_lexer_pos *)); +extern int _cpp_begin_message (cpp_reader *, int, fileline, unsigned int); /* In cppmacro.c */ -extern void _cpp_free_definition PARAMS ((cpp_hashnode *)); -extern int _cpp_create_definition PARAMS ((cpp_reader *, cpp_hashnode *)); -extern void _cpp_pop_context PARAMS ((cpp_reader *)); -extern void _cpp_free_lookaheads PARAMS ((cpp_reader *)); -extern void _cpp_release_lookahead PARAMS ((cpp_reader *)); -extern void _cpp_push_token PARAMS ((cpp_reader *, const cpp_token *, - const cpp_lexer_pos *)); - +extern void _cpp_free_definition (cpp_hashnode *); +extern bool _cpp_create_definition (cpp_reader *, cpp_hashnode *); +extern void _cpp_pop_context (cpp_reader *); +extern void _cpp_push_text_context (cpp_reader *, cpp_hashnode *, + const uchar *, size_t); +extern bool _cpp_save_parameter (cpp_reader *, cpp_macro *, cpp_hashnode *); +extern bool _cpp_arguments_ok (cpp_reader *, cpp_macro *, const cpp_hashnode *, + unsigned int); +extern const uchar *_cpp_builtin_macro_text (cpp_reader *, cpp_hashnode *); +int _cpp_warn_if_unused_macro (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 *)); +extern void _cpp_init_hashtable (cpp_reader *, hash_table *); +extern void _cpp_destroy_hashtable (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 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 *, - struct include_file *)); +typedef struct _cpp_file _cpp_file; +extern _cpp_file *_cpp_find_file (cpp_reader *, const char *fname, + cpp_dir *start_dir, bool fake); +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_include (cpp_reader *, const char *, int, + enum include_type); +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 *); /* In cppexp.c */ -extern int _cpp_parse_expr PARAMS ((cpp_reader *)); +extern bool _cpp_parse_expr (cpp_reader *); +extern struct op *_cpp_expand_op_stack (cpp_reader *); /* In cpplex.c */ -extern void _cpp_lex_token PARAMS ((cpp_reader *, cpp_token *)); -extern int _cpp_equiv_tokens PARAMS ((const cpp_token *, - const cpp_token *)); -extern void _cpp_init_pool PARAMS ((cpp_pool *, unsigned int, - unsigned int, unsigned int)); -extern void _cpp_free_pool PARAMS ((cpp_pool *)); -extern unsigned char *_cpp_pool_reserve PARAMS ((cpp_pool *, unsigned int)); -extern unsigned char *_cpp_pool_alloc PARAMS ((cpp_pool *, unsigned int)); -extern unsigned char *_cpp_next_chunk PARAMS ((cpp_pool *, unsigned int, - unsigned char **)); -extern void _cpp_lock_pool PARAMS ((cpp_pool *)); -extern void _cpp_unlock_pool PARAMS ((cpp_pool *)); +extern void _cpp_process_line_notes (cpp_reader *, int); +extern void _cpp_clean_line (cpp_reader *); +extern bool _cpp_get_fresh_line (cpp_reader *); +extern bool _cpp_skip_block_comment (cpp_reader *); +extern cpp_token *_cpp_temp_token (cpp_reader *); +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); /* In cppinit.c. */ -extern bool _cpp_push_next_buffer PARAMS ((cpp_reader *)); +extern void _cpp_maybe_push_include_file (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_define_builtin PARAMS ((cpp_reader *, const 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 *)); -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 *)); +extern int _cpp_test_assertion (cpp_reader *, unsigned int *); +extern int _cpp_handle_directive (cpp_reader *, int); +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 void _cpp_do__Pragma (cpp_reader *); +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 *, + unsigned int, unsigned int); +extern void _cpp_pop_buffer (cpp_reader *); + +/* In cpptrad.c. */ +extern bool _cpp_scan_out_logical_line (cpp_reader *, cpp_macro *); +extern bool _cpp_read_logical_line_trad (cpp_reader *); +extern void _cpp_overlay_buffer (cpp_reader *pfile, const uchar *, size_t); +extern void _cpp_remove_overlay (cpp_reader *); +extern bool _cpp_create_trad_definition (cpp_reader *, cpp_macro *); +extern bool _cpp_expansions_different_trad (const cpp_macro *, + const cpp_macro *); +extern uchar *_cpp_copy_replacement_text (const cpp_macro *, uchar *); +extern size_t _cpp_replacement_text_len (const cpp_macro *); + +/* In cppcharset.c. */ +extern cppchar_t _cpp_valid_ucn (cpp_reader *, const uchar **, + const uchar *, int); +extern void _cpp_destroy_iconv (cpp_reader *); +extern bool _cpp_interpret_string_notranslate (cpp_reader *, const cpp_string *, + cpp_string *); /* Utility routines and macros. */ -#define DSC(str) (const U_CHAR *)str, sizeof str - 1 +#define DSC(str) (const uchar *)str, sizeof str - 1 #define xnew(T) (T *) xmalloc (sizeof(T)) #define xcnew(T) (T *) xcalloc (1, sizeof(T)) #define xnewvec(T, N) (T *) xmalloc (sizeof(T) * (N)) @@ -432,58 +586,45 @@ extern void _cpp_pop_buffer PARAMS ((cpp_reader *)); /* These are inline functions instead of macros so we can get type checking. */ -typedef unsigned char U_CHAR; -#define U (const U_CHAR *) /* Intended use: U"string" */ - -static inline int ustrcmp PARAMS ((const U_CHAR *, const U_CHAR *)); -static inline int ustrncmp PARAMS ((const U_CHAR *, const U_CHAR *, - size_t)); -static inline size_t ustrlen PARAMS ((const U_CHAR *)); -static inline U_CHAR *uxstrdup PARAMS ((const U_CHAR *)); -static inline U_CHAR *ustrchr PARAMS ((const U_CHAR *, int)); -static inline int ufputs PARAMS ((const U_CHAR *, FILE *)); +static inline int ustrcmp (const uchar *, const uchar *); +static inline int ustrncmp (const uchar *, const uchar *, size_t); +static inline size_t ustrlen (const uchar *); +static inline uchar *uxstrdup (const uchar *); +static inline uchar *ustrchr (const uchar *, int); +static inline int ufputs (const uchar *, FILE *); static inline int -ustrcmp (s1, s2) - const U_CHAR *s1, *s2; +ustrcmp (const uchar *s1, const uchar *s2) { return strcmp ((const char *)s1, (const char *)s2); } static inline int -ustrncmp (s1, s2, n) - const U_CHAR *s1, *s2; - size_t n; +ustrncmp (const uchar *s1, const uchar *s2, size_t n) { return strncmp ((const char *)s1, (const char *)s2, n); } static inline size_t -ustrlen (s1) - const U_CHAR *s1; +ustrlen (const uchar *s1) { return strlen ((const char *)s1); } -static inline U_CHAR * -uxstrdup (s1) - const U_CHAR *s1; +static inline uchar * +uxstrdup (const uchar *s1) { - return (U_CHAR *) xstrdup ((const char *)s1); + return (uchar *) xstrdup ((const char *)s1); } -static inline U_CHAR * -ustrchr (s1, c) - const U_CHAR *s1; - int c; +static inline uchar * +ustrchr (const uchar *s1, int c) { - return (U_CHAR *) strchr ((const char *)s1, c); + return (uchar *) strchr ((const char *)s1, c); } static inline int -ufputs (s, f) - const U_CHAR *s; - FILE *f; +ufputs (const uchar *s, FILE *f) { return fputs ((const char *)s, f); }