X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fcpplib.c;h=c64e682f8881e158cc61bd035d3f0eef6a6050dc;hb=eb3948d14fb48860754f84cdc8c0d507d89899fa;hp=32b70e6ed370d486b567b0a63dbfd050f114a36d;hpb=b8e56967d103e267ab3cc99cbbdba99d369c5607;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/cpplib.c b/gcc/cpplib.c index 32b70e6ed37..c64e682f888 100644 --- a/gcc/cpplib.c +++ b/gcc/cpplib.c @@ -1,5 +1,5 @@ /* CPP Library. - Copyright (C) 1986, 87, 89, 92-98, 1999 Free Software Foundation, Inc. + Copyright (C) 1986, 87, 89, 92-99, 2000 Free Software Foundation, Inc. Contributed by Per Bothner, 1994-95. Based on CCCP program by Paul Rubin, June 1986 Adapted to ANSI C, Richard Stallman, Jan 1987 @@ -21,206 +21,35 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "config.h" #include "system.h" -#ifndef STDC_VALUE -#define STDC_VALUE 1 -#endif - #include "cpplib.h" #include "cpphash.h" -#include "output.h" #include "intl.h" -#include "prefix.h" - -#ifndef GET_ENV_PATH_LIST -#define GET_ENV_PATH_LIST(VAR,NAME) do { (VAR) = getenv (NAME); } while (0) -#endif - -/* By default, colon separates directories in a path. */ -#ifndef PATH_SEPARATOR -#define PATH_SEPARATOR ':' -#endif - -#ifndef STANDARD_INCLUDE_DIR -#define STANDARD_INCLUDE_DIR "/usr/include" -#endif - -/* Symbols to predefine. */ - -#ifdef CPP_PREDEFINES -static char *predefs = CPP_PREDEFINES; -#else -static char *predefs = ""; -#endif - -/* We let tm.h override the types used here, to handle trivial differences - such as the choice of unsigned int or long unsigned int for size_t. - When machines start needing nontrivial differences in the size type, - it would be best to do something here to figure out automatically - from other information what type to use. */ - -/* The string value for __SIZE_TYPE__. */ - -#ifndef SIZE_TYPE -#define SIZE_TYPE "long unsigned int" -#endif - -/* The string value for __PTRDIFF_TYPE__. */ -#ifndef PTRDIFF_TYPE -#define PTRDIFF_TYPE "long int" -#endif - -/* The string value for __WCHAR_TYPE__. */ - -#ifndef WCHAR_TYPE -#define WCHAR_TYPE "int" -#endif -#define CPP_WCHAR_TYPE(PFILE) \ - (CPP_OPTIONS (PFILE)->cplusplus ? "__wchar_t" : WCHAR_TYPE) - -/* The string value for __USER_LABEL_PREFIX__ */ - -#ifndef USER_LABEL_PREFIX -#define USER_LABEL_PREFIX "" -#endif - -/* The string value for __REGISTER_PREFIX__ */ - -#ifndef REGISTER_PREFIX -#define REGISTER_PREFIX "" -#endif - -#define SKIP_WHITE_SPACE(p) do { while (is_hor_space[*p]) p++; } while (0) -#define SKIP_ALL_WHITE_SPACE(p) do { while (is_space[*p]) p++; } while (0) +#define SKIP_WHITE_SPACE(p) do { while (is_hspace(*p)) p++; } while (0) #define PEEKN(N) (CPP_BUFFER (pfile)->rlimit - CPP_BUFFER (pfile)->cur >= (N) ? CPP_BUFFER (pfile)->cur[N] : EOF) #define FORWARD(N) CPP_FORWARD (CPP_BUFFER (pfile), (N)) #define GETC() CPP_BUF_GET (CPP_BUFFER (pfile)) #define PEEKC() CPP_BUF_PEEK (CPP_BUFFER (pfile)) /* CPP_IS_MACRO_BUFFER is true if the buffer contains macro expansion. - (Note that it is false while we're expanding marco *arguments*.) */ -#define CPP_IS_MACRO_BUFFER(PBUF) ((PBUF)->cleanup == macro_cleanup) - -/* Move all backslash-newline pairs out of embarrassing places. - Exchange all such pairs following BP - with any potentially-embarrassing characters that follow them. - Potentially-embarrassing characters are / and * - (because a backslash-newline inside a comment delimiter - would cause it not to be recognized). */ - -#define NEWLINE_FIX \ - do {while (PEEKC() == '\\' && PEEKN(1) == '\n') FORWARD(2); } while(0) - -/* Same, but assume we've already read the potential '\\' into C. */ -#define NEWLINE_FIX1(C) do { \ - while ((C) == '\\' && PEEKC() == '\n') { FORWARD(1); (C) = GETC(); }\ - } while(0) - -struct cpp_pending { - struct cpp_pending *next; - char *cmd; - char *arg; -}; - -/* Forward declarations. */ - -extern void cpp_hash_cleanup PARAMS ((cpp_reader *)); - -static char *my_strerror PROTO ((int)); -static void path_include PROTO ((cpp_reader *, char *)); -static void initialize_builtins PROTO ((cpp_reader *)); -static void validate_else PROTO ((cpp_reader *, char *)); -static int comp_def_part PROTO ((int, U_CHAR *, int, U_CHAR *, - int, int)); -#ifdef abort -extern void fancy_abort (); -#endif -static int check_macro_name PROTO ((cpp_reader *, U_CHAR *, int)); -static int compare_defs PROTO ((cpp_reader *, - DEFINITION *, DEFINITION *)); -static HOST_WIDE_INT eval_if_expression PROTO ((cpp_reader *)); -static int change_newlines PROTO ((U_CHAR *, int)); -static void push_macro_expansion PARAMS ((cpp_reader *, - U_CHAR *, int, HASHNODE *)); -static struct cpp_pending *nreverse_pending PARAMS ((struct cpp_pending *)); - -static void conditional_skip PROTO ((cpp_reader *, int, - enum node_type, U_CHAR *)); -static void skip_if_group PROTO ((cpp_reader *)); -static int parse_name PARAMS ((cpp_reader *, int)); -static void print_help PROTO ((void)); + (Note that it is false while we're expanding macro *arguments*.) */ +#define CPP_IS_MACRO_BUFFER(PBUF) ((PBUF)->data != NULL) -/* Last arg to output_line_command. */ -enum file_change_code {same_file, enter_file, leave_file}; +/* ACTIVE_MARK_P is true if there's a live mark in the buffer, in which + case CPP_BUMP_LINE must not be called. */ +#define ACTIVE_MARK_P() (CPP_BUFFER (pfile)->mark != -1) /* External declarations. */ -extern HOST_WIDE_INT cpp_parse_expr PARAMS ((cpp_reader *)); -extern char *version_string; - -/* #include "file" looks in source file dir, then stack. */ -/* #include just looks in the stack. */ -/* -I directories are added to the end, then the defaults are added. */ -/* The */ -static struct default_include { - char *fname; /* The name of the directory. */ - char *component; /* The component containing the directory */ - int cplusplus; /* Only look here if we're compiling C++. */ - int cxx_aware; /* Includes in this directory don't need to - be wrapped in extern "C" when compiling - C++. */ -} include_defaults_array[] -#ifdef INCLUDE_DEFAULTS - = INCLUDE_DEFAULTS; -#else - = { - /* Pick up GNU C++ specific include files. */ - { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 }, -#ifdef CROSS_COMPILE - /* This is the dir for fixincludes. Put it just before - the files that we fix. */ - { GCC_INCLUDE_DIR, "GCC", 0, 0 }, - /* For cross-compilation, this dir name is generated - automatically in Makefile.in. */ - { CROSS_INCLUDE_DIR, "GCC",0, 0 }, -#ifdef TOOL_INCLUDE_DIR - /* This is another place that the target system's headers might be. */ - { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1 }, -#endif -#else /* not CROSS_COMPILE */ -#ifdef LOCAL_INCLUDE_DIR - /* This should be /usr/local/include and should come before - the fixincludes-fixed header files. */ - { LOCAL_INCLUDE_DIR, 0, 0, 1 }, -#endif -#ifdef TOOL_INCLUDE_DIR - /* This is here ahead of GCC_INCLUDE_DIR because assert.h goes here. - Likewise, behind LOCAL_INCLUDE_DIR, where glibc puts its assert.h. */ - { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1 }, -#endif - /* This is the dir for fixincludes. Put it just before - the files that we fix. */ - { GCC_INCLUDE_DIR, "GCC", 0, 0 }, - /* Some systems have an extra dir of include files. */ -#ifdef SYSTEM_INCLUDE_DIR - { SYSTEM_INCLUDE_DIR, 0, 0, 0 }, -#endif -#ifndef STANDARD_INCLUDE_COMPONENT -#define STANDARD_INCLUDE_COMPONENT 0 -#endif - { STANDARD_INCLUDE_DIR, STANDARD_INCLUDE_COMPONENT, 0, 0 }, -#endif /* not CROSS_COMPILE */ - { 0, 0, 0, 0 } - }; -#endif /* no INCLUDE_DEFAULTS */ +extern HOST_WIDEST_INT cpp_parse_expr PARAMS ((cpp_reader *)); /* `struct directive' defines one #-directive, including how to handle it. */ struct directive { int length; /* Length of name */ int (*func) /* Function to handle directive */ - PARAMS ((cpp_reader *, struct directive *)); - char *name; /* Name of directive */ + PARAMS ((cpp_reader *, const struct directive *)); + const char *name; /* Name of directive */ enum node_type type; /* Code which describes which directive. */ }; @@ -228,63 +57,98 @@ struct directive { are going to be placed in a table and some old compilers have trouble with pointers to functions returning void. */ -static int do_define PARAMS ((cpp_reader *, struct directive *)); -static int do_line PARAMS ((cpp_reader *, struct directive *)); -static int do_include PARAMS ((cpp_reader *, struct directive *)); -static int do_undef PARAMS ((cpp_reader *, struct directive *)); -static int do_error PARAMS ((cpp_reader *, struct directive *)); -static int do_pragma PARAMS ((cpp_reader *, struct directive *)); -static int do_ident PARAMS ((cpp_reader *, struct directive *)); -static int do_if PARAMS ((cpp_reader *, struct directive *)); -static int do_xifdef PARAMS ((cpp_reader *, struct directive *)); -static int do_else PARAMS ((cpp_reader *, struct directive *)); -static int do_elif PARAMS ((cpp_reader *, struct directive *)); -static int do_endif PARAMS ((cpp_reader *, struct directive *)); +static int do_define PARAMS ((cpp_reader *, const struct directive *)); +static int do_line PARAMS ((cpp_reader *, const struct directive *)); +static int do_include PARAMS ((cpp_reader *, const struct directive *)); +static int do_undef PARAMS ((cpp_reader *, const struct directive *)); +static int do_error PARAMS ((cpp_reader *, const struct directive *)); +static int do_pragma PARAMS ((cpp_reader *, const struct directive *)); +static int do_ident PARAMS ((cpp_reader *, const struct directive *)); +static int do_if PARAMS ((cpp_reader *, const struct directive *)); +static int do_xifdef PARAMS ((cpp_reader *, const struct directive *)); +static int do_else PARAMS ((cpp_reader *, const struct directive *)); +static int do_elif PARAMS ((cpp_reader *, const struct directive *)); +static int do_endif PARAMS ((cpp_reader *, const struct directive *)); #ifdef SCCS_DIRECTIVE -static int do_sccs PARAMS ((cpp_reader *, struct directive *)); +static int do_sccs PARAMS ((cpp_reader *, const struct directive *)); #endif -static int do_assert PARAMS ((cpp_reader *, struct directive *)); -static int do_unassert PARAMS ((cpp_reader *, struct directive *)); -static int do_warning PARAMS ((cpp_reader *, struct directive *)); - -#define IS_INCLUDE_DIRECTIVE_TYPE(t) \ -((int) T_INCLUDE <= (int) (t) && (int) (t) <= (int) T_IMPORT) - -/* Here is the actual list of #-directives, most-often-used first. - The initialize_builtins function assumes #define is the very first. */ - -static struct directive directive_table[] = { - { 6, do_define, "define", T_DEFINE }, - { 5, do_xifdef, "ifdef", T_IFDEF }, - { 6, do_xifdef, "ifndef", T_IFNDEF }, - { 7, do_include, "include", T_INCLUDE }, - { 12, do_include, "include_next", T_INCLUDE_NEXT }, - { 6, do_include, "import", T_IMPORT }, - { 5, do_endif, "endif", T_ENDIF }, - { 4, do_else, "else", T_ELSE }, - { 2, do_if, "if", T_IF }, - { 4, do_elif, "elif", T_ELIF }, - { 5, do_undef, "undef", T_UNDEF }, - { 5, do_error, "error", T_ERROR }, - { 7, do_warning, "warning", T_WARNING }, - { 6, do_pragma, "pragma", T_PRAGMA }, - { 4, do_line, "line", T_LINE }, - { 5, do_ident, "ident", T_IDENT }, +static int do_assert PARAMS ((cpp_reader *, const struct directive *)); +static int do_unassert PARAMS ((cpp_reader *, const struct directive *)); +static int do_warning PARAMS ((cpp_reader *, const struct directive *)); + +/* Forward declarations. */ + +static void validate_else PARAMS ((cpp_reader *, const char *)); +static HOST_WIDEST_INT eval_if_expression PARAMS ((cpp_reader *)); +static void conditional_skip PARAMS ((cpp_reader *, int, + enum node_type, U_CHAR *)); +static void skip_if_group PARAMS ((cpp_reader *)); +static void parse_name PARAMS ((cpp_reader *, int)); +static void parse_string PARAMS ((cpp_reader *, int)); +static int parse_assertion PARAMS ((cpp_reader *)); +static const char *if_directive_name PARAMS ((cpp_reader *, + struct if_stack *)); +static enum cpp_token null_underflow PARAMS ((cpp_reader *)); +static int null_cleanup PARAMS ((cpp_buffer *, cpp_reader *)); +static int skip_comment PARAMS ((cpp_reader *, int)); +static int copy_comment PARAMS ((cpp_reader *, int)); +static void copy_rest_of_line PARAMS ((cpp_reader *)); +static void skip_rest_of_line PARAMS ((cpp_reader *)); +static void cpp_skip_hspace PARAMS ((cpp_reader *)); +static int handle_directive PARAMS ((cpp_reader *)); +static void pass_thru_directive PARAMS ((const U_CHAR *, size_t, + cpp_reader *, + const struct directive *)); +static int read_line_number PARAMS ((cpp_reader *, int *)); +static U_CHAR *detect_if_not_defined PARAMS ((cpp_reader *)); +static int consider_directive_while_skipping PARAMS ((cpp_reader *, + IF_STACK_FRAME *)); +static void skip_block_comment PARAMS ((cpp_reader *)); +static void skip_line_comment PARAMS ((cpp_reader *)); +static void parse_set_mark PARAMS ((cpp_reader *)); +static void parse_goto_mark PARAMS ((cpp_reader *)); + +/* Here is the actual list of #-directives. + This table is ordered by frequency of occurrence; the numbers + at the end are directive counts from all the source code I have + lying around (egcs and libc CVS as of 1999-05-18, plus grub-0.5.91, + linux-2.2.9, and pcmcia-cs-3.0.9). */ + +static const struct directive directive_table[] = { + /* In C89 */ + { 6, do_define, "define", T_DEFINE }, /* 270554 */ + { 7, do_include, "include", T_INCLUDE }, /* 52262 */ + { 5, do_endif, "endif", T_ENDIF }, /* 45855 */ + { 5, do_xifdef, "ifdef", T_IFDEF }, /* 22000 */ + { 2, do_if, "if", T_IF }, /* 18162 */ + { 4, do_else, "else", T_ELSE }, /* 9863 */ + { 6, do_xifdef, "ifndef", T_IFNDEF }, /* 9675 */ + { 5, do_undef, "undef", T_UNDEF }, /* 4837 */ + { 4, do_line, "line", T_LINE }, /* 2465 */ + { 4, do_elif, "elif", T_ELIF }, /* 610 */ + { 5, do_error, "error", T_ERROR }, /* 475 */ + { 6, do_pragma, "pragma", T_PRAGMA }, /* 195 */ + + /* Extensions. All deprecated except #warning and #include_next. */ + { 7, do_warning, "warning", T_WARNING }, /* 22 - GNU */ + { 12, do_include, "include_next", T_INCLUDE_NEXT }, /* 19 - GNU */ + { 5, do_ident, "ident", T_IDENT }, /* 11 - SVR4 */ + { 6, do_include, "import", T_IMPORT }, /* 0 - ObjC */ + { 6, do_assert, "assert", T_ASSERT }, /* 0 - SVR4 */ + { 8, do_unassert, "unassert", T_UNASSERT }, /* 0 - SVR4 */ #ifdef SCCS_DIRECTIVE - { 4, do_sccs, "sccs", T_SCCS }, + { 4, do_sccs, "sccs", T_SCCS }, /* 0 - SVR2? */ #endif - { 6, do_assert, "assert", T_ASSERT }, - { 8, do_unassert, "unassert", T_UNASSERT }, { -1, 0, "", T_UNUSED } }; /* Place into PFILE a quoted string representing the string SRC. Caller must reserve enough space in pfile->token_buffer. */ -static void +void quote_string (pfile, src) cpp_reader *pfile; - char *src; + const char *src; { U_CHAR c; @@ -329,7 +193,7 @@ cpp_grow_buffer (pfile, n) CPP_SET_WRITTEN (pfile, old_written); } -/* Process the string STR as if it appeared as the body of a #define +/* Process the string STR as if it appeared as the body of a #define. If STR is just an identifier, define it with value 1. If STR has anything after the identifier, then it should be identifier=definition. */ @@ -342,21 +206,28 @@ cpp_define (pfile, str) U_CHAR *buf, *p; size_t count; - /* Copy the entire option so we can modify it. */ - count = strlen (str) + 3; - buf = (U_CHAR *) alloca (count); - memcpy (buf, str, count - 2); - /* Change the first "=" in the string to a space. If there is none, - tack " 1" on the end. */ - p = strchr (buf, '='); + p = strchr (str, '='); + /* Copy the entire option so we can modify it. + Change the first "=" in the string to a space. If there is none, + tack " 1" on the end. Then add a newline and a NUL. */ + if (p) { - *p = ' '; - count -= 2; + count = strlen (str) + 2; + buf = (U_CHAR *) alloca (count); + memcpy (buf, str, count - 2); + buf[p - str] = ' '; + buf[count - 2] = '\n'; + buf[count - 1] = '\0'; } else - strcpy (&buf[count-3], " 1"); - + { + count = strlen (str) + 4; + buf = (U_CHAR *) alloca (count); + memcpy (buf, str, count - 4); + strcpy (&buf[count-4], " 1\n"); + } + if (cpp_push_buffer (pfile, buf, count - 1) != NULL) { do_define (pfile, NULL); @@ -377,68 +248,30 @@ cpp_assert (pfile, str) } } -/* Given a colon-separated list of file names PATH, - add all the names to the search path for include files. */ - -static void -path_include (pfile, path) +/* Determine whether the identifier ID, of length LEN, is a defined macro. */ +int +cpp_defined (pfile, id, len) cpp_reader *pfile; - char *path; + const U_CHAR *id; + int len; { - char *p; - - p = path; - - if (*p) - while (1) { - char *q = p; - char *name; - - /* Find the end of this name. */ - while (*q != 0 && *q != PATH_SEPARATOR) q++; - if (p == q) { - /* An empty name in the path stands for the current directory. */ - name = (char *) xmalloc (2); - name[0] = '.'; - name[1] = 0; - } else { - /* Otherwise use the directory that is named. */ - name = (char *) xmalloc (q - p + 1); - bcopy (p, name, q - p); - name[q - p] = 0; - } - - append_include_chain (pfile, - &(CPP_OPTIONS (pfile)->bracket_include), name, 0); - - /* Advance past this name. */ - p = q; - if (*p == 0) - break; - /* Skip the colon. */ - p++; + HASHNODE *hp = cpp_lookup (pfile, id, len); + if (hp && hp->type == T_POISON) + { + cpp_error (pfile, "attempt to use poisoned `%s'", hp->name); + return 0; } -} - -void -cpp_options_init (opts) - cpp_options *opts; -{ - bzero ((char *) opts, sizeof *opts); - - opts->dollars_in_ident = 1; - opts->cplusplus_comments = 1; - opts->warn_import = 1; + return (hp != NULL); } -enum cpp_token +static enum cpp_token null_underflow (pfile) cpp_reader *pfile ATTRIBUTE_UNUSED; { return CPP_EOF; } -int +static int null_cleanup (pbuf, pfile) cpp_buffer *pbuf ATTRIBUTE_UNUSED; cpp_reader *pfile ATTRIBUTE_UNUSED; @@ -446,120 +279,185 @@ null_cleanup (pbuf, pfile) return 0; } -int -macro_cleanup (pbuf, pfile) - cpp_buffer *pbuf; - cpp_reader *pfile ATTRIBUTE_UNUSED; +/* Skip a C-style block comment. We know it's a comment, and point is + at the second character of the starter. */ +static void +skip_block_comment (pfile) + cpp_reader *pfile; { - HASHNODE *macro = (HASHNODE *) pbuf->data; - if (macro->type == T_DISABLED) - macro->type = T_MACRO; - if (macro->type != T_MACRO || pbuf->buf != macro->value.defn->expansion) - free (pbuf->buf); - return 0; + int c, prev_c = -1; + long line, col; + + FORWARD(1); + cpp_buf_line_and_col (CPP_BUFFER (pfile), &line, &col); + for (;;) + { + c = GETC (); + if (c == EOF) + { + cpp_error_with_line (pfile, line, col, "unterminated comment"); + return; + } + else if (c == '\n' || c == '\r') + { + /* \r cannot be a macro escape marker here. */ + if (!ACTIVE_MARK_P()) + CPP_BUMP_LINE (pfile); + } + else if (c == '/' && prev_c == '*') + return; + else if (c == '*' && prev_c == '/' + && CPP_OPTIONS (pfile)->warn_comments) + cpp_warning (pfile, "`/*' within comment"); + + prev_c = c; + } +} + +/* Skip a C++/Chill line comment. We know it's a comment, and point + is at the second character of the initiator. */ +static void +skip_line_comment (pfile) + cpp_reader *pfile; +{ + FORWARD(1); + for (;;) + { + int c = GETC (); + + /* We don't have to worry about EOF in here. */ + if (c == '\n') + { + /* Don't consider final '\n' to be part of comment. */ + FORWARD(-1); + return; + } + else if (c == '\r') + { + /* \r cannot be a macro escape marker here. */ + if (!ACTIVE_MARK_P()) + CPP_BUMP_LINE (pfile); + if (CPP_OPTIONS (pfile)->warn_comments) + cpp_warning (pfile, "backslash-newline within line comment"); + } + } } -/* Assuming we have read '/'. - If this is the start of a comment (followed by '*' or '/'), - skip to the end of the comment, and return ' '. - Return EOF if we reached the end of file before the end of the comment. - If not the start of a comment, return '/'. */ +/* Skip a comment - C, C++, or Chill style. M is the first character + of the comment marker. If this really is a comment, skip to its + end and return ' '. If this is not a comment, return M (which will + be '/' or '-'). */ static int -skip_comment (pfile, linep) +skip_comment (pfile, m) cpp_reader *pfile; - long *linep; + int m; { - int c = 0; - while (PEEKC() == '\\' && PEEKN(1) == '\n') + if (m == '/' && PEEKC() == '*') { - if (linep) - (*linep)++; - FORWARD(2); + skip_block_comment (pfile); + return ' '; } - if (PEEKC() == '*') + else if (m == '/' && PEEKC() == '/') { - FORWARD(1); - for (;;) + if (CPP_BUFFER (pfile)->system_header_p) { - int prev_c = c; - c = GETC (); - if (c == EOF) - return EOF; - while (c == '\\' && PEEKC() == '\n') - { - if (linep) - (*linep)++; - FORWARD(1), c = GETC(); - } - if (prev_c == '*' && c == '/') - return ' '; - if (c == '\n' && linep) - (*linep)++; + /* We silently allow C++ comments in system headers, irrespective + of conformance mode, because lots of busted systems do that + and trying to clean it up in fixincludes is a nightmare. */ + skip_line_comment (pfile); + return ' '; } - } - else if (PEEKC() == '/' && CPP_OPTIONS (pfile)->cplusplus_comments) - { - FORWARD(1); - for (;;) + else if (CPP_OPTIONS (pfile)->cplusplus_comments) { - c = GETC (); - if (c == EOF) - return ' '; /* Allow // to be terminated by EOF. */ - while (c == '\\' && PEEKC() == '\n') - { - FORWARD(1); - c = GETC(); - if (linep) - (*linep)++; - } - if (c == '\n') + if (CPP_OPTIONS (pfile)->c89 + && CPP_PEDANTIC (pfile) + && ! CPP_BUFFER (pfile)->warned_cplusplus_comments) { - /* Don't consider final '\n' to be part of comment. */ - FORWARD(-1); - return ' '; + cpp_pedwarn (pfile, + "C++ style comments are not allowed in ISO C89"); + cpp_pedwarn (pfile, + "(this will be reported only once per input file)"); + CPP_BUFFER (pfile)->warned_cplusplus_comments = 1; } + skip_line_comment (pfile); + return ' '; } + else + return m; + } + else if (m == '-' && PEEKC() == '-' + && CPP_OPTIONS (pfile)->chill) + { + skip_line_comment (pfile); + return ' '; } else - return '/'; -} + return m; +} + +/* Identical to skip_comment except that it copies the comment into the + token_buffer. This is used if !discard_comments. */ +static int +copy_comment (pfile, m) + cpp_reader *pfile; + int m; +{ + U_CHAR *start = CPP_BUFFER (pfile)->cur; /* XXX Layering violation */ + U_CHAR *limit; + + if (skip_comment (pfile, m) == m) + return m; + + CPP_PUTC (pfile, m); + for (limit = CPP_BUFFER (pfile)->cur; start <= limit; start++) + if (*start != '\r') + CPP_PUTC (pfile, *start); + return ' '; +} /* Skip whitespace \-newline and comments. Does not macro-expand. */ -void +static void cpp_skip_hspace (pfile) cpp_reader *pfile; { + int c; while (1) { - int c = PEEKC(); + c = GETC(); if (c == EOF) - return; /* FIXME */ - if (is_hor_space[c]) + return; + else if (is_hspace(c)) { if ((c == '\f' || c == '\v') && CPP_PEDANTIC (pfile)) cpp_pedwarn (pfile, "%s in preprocessing directive", c == '\f' ? "formfeed" : "vertical tab"); - FORWARD(1); } - else if (c == '/') + else if (c == '\r') { - FORWARD (1); - c = skip_comment (pfile, NULL); - if (c == '/') - FORWARD(-1); - if (c == EOF || c == '/') - return; + /* \r is a backslash-newline marker if !has_escapes, and + a deletable-whitespace or no-reexpansion marker otherwise. */ + if (CPP_BUFFER (pfile)->has_escapes) + { + if (PEEKC() == ' ') + FORWARD(1); + else + break; + } + else + CPP_BUFFER (pfile)->lineno++; } - else if (c == '\\' && PEEKN(1) == '\n') { - FORWARD(2); - } - else if (c == '@' && CPP_BUFFER (pfile)->has_escapes - && is_hor_space[PEEKN(1)]) - FORWARD(2); - else return; + else if (c == '/' || c == '-') + { + c = skip_comment (pfile, c); + if (c != ' ') + break; + } + else + break; } + FORWARD(-1); } /* Read the rest of the current line. @@ -569,30 +467,42 @@ static void copy_rest_of_line (pfile) cpp_reader *pfile; { - struct cpp_options *opts = CPP_OPTIONS (pfile); for (;;) { int c = GETC(); - int nextc; switch (c) { + case '\n': + FORWARD(-1); case EOF: - goto end_directive; - case '\\': - if (PEEKC() == '\n') + CPP_NUL_TERMINATE (pfile); + return; + + case '\r': + if (CPP_BUFFER (pfile)->has_escapes) + break; + else { - FORWARD (1); + CPP_BUFFER (pfile)->lineno++; continue; } case '\'': case '\"': - goto scan_directive_token; - break; + parse_string (pfile, c); + continue; case '/': - nextc = PEEKC(); - if (nextc == '*' || (opts->cplusplus_comments && nextc == '/')) - goto scan_directive_token; + if (PEEKC() == '*') + { + if (CPP_TRADITIONAL (pfile)) + CPP_PUTS (pfile, "/**/", 4); + skip_block_comment (pfile); + continue; + } + /* else fall through */ + case '-': + c = skip_comment (pfile, c); break; + case '\f': case '\v': if (CPP_PEDANTIC (pfile)) @@ -600,21 +510,16 @@ copy_rest_of_line (pfile) c == '\f' ? "formfeed" : "vertical tab"); break; - case '\n': - FORWARD(-1); - goto end_directive; - scan_directive_token: - FORWARD(-1); - cpp_get_token (pfile); - continue; } CPP_PUTC (pfile, c); } - end_directive: ; - CPP_NUL_TERMINATE (pfile); } -void +/* FIXME: It is almost definitely a performance win to make this do + the scan itself. >75% of calls to copy_r_o_l are from here or + skip_if_group, which means the common case is to copy stuff into the + token_buffer only to discard it. */ +static void skip_rest_of_line (pfile) cpp_reader *pfile; { @@ -626,11 +531,12 @@ skip_rest_of_line (pfile) /* Handle a possible # directive. '#' has already been read. */ -int +static int handle_directive (pfile) cpp_reader *pfile; -{ int c; - register struct directive *kt; +{ + int c; + register const struct directive *kt; int ident_length; U_CHAR *ident; long old_written = CPP_WRITTEN (pfile); @@ -638,835 +544,202 @@ handle_directive (pfile) cpp_skip_hspace (pfile); c = PEEKC (); + /* # followed by a number is equivalent to #line. Do not recognize + this form in assembly language source files. Complain about this + form if we're being pedantic, but not if this is regurgitated + input (preprocessed or fed back in by the C++ frontend). */ if (c >= '0' && c <= '9') { - /* Handle # followed by a line number. */ - if (CPP_PEDANTIC (pfile)) + if (CPP_OPTIONS (pfile)->lang_asm) + return 0; + + if (CPP_PEDANTIC (pfile) + && ! CPP_PREPROCESSED (pfile) + && ! CPP_BUFFER (pfile)->manual_pop) cpp_pedwarn (pfile, "`#' followed by integer"); do_line (pfile, NULL); - goto done_a_directive; + return 1; } + /* If we are rescanning preprocessed input, don't obey any directives + other than # nnn. */ + if (CPP_PREPROCESSED (pfile)) + return 0; + /* Now find the directive name. */ CPP_PUTC (pfile, '#'); parse_name (pfile, GETC()); ident = pfile->token_buffer + old_written + 1; ident_length = CPP_PWRITTEN (pfile) - ident; - if (ident_length == 0 && PEEKC() == '\n') + if (ident_length == 0) { - /* A line of just `#' becomes blank. */ - goto done_a_directive; + /* A line of just `#' becomes blank. A line with something + other than an identifier after the # is reparsed as a non- + directive line. */ + CPP_SET_WRITTEN (pfile, old_written); + return (PEEKC() == '\n'); } -#if 0 - if (ident_length == 0 || !is_idstart[*ident]) { - U_CHAR *p = ident; - while (is_idchar[*p]) { - if (*p < '0' || *p > '9') + /* Decode the keyword and call the appropriate expansion routine. */ + for (kt = directive_table; ; kt++) + { + if (kt->length <= 0) + /* # identifier, but not a legit directive. Pass onward as a + CPP_DIRECTIVE token anyway - let the consumer worry about it. */ + return 1; + if (kt->length == ident_length + && !strncmp (kt->name, ident, ident_length)) break; - p++; - } - /* Avoid error for `###' and similar cases unless -pedantic. */ - if (p == ident) { - while (*p == '#' || is_hor_space[*p]) p++; - if (*p == '\n') { - if (pedantic && !lang_asm) - cpp_warning (pfile, "invalid preprocessor directive"); - return 0; - } } - if (!lang_asm) - cpp_error (pfile, "invalid preprocessor directive name"); - - return 0; - } -#endif - /* - * Decode the keyword and call the appropriate expansion - * routine, after moving the input pointer up to the next line. - */ - for (kt = directive_table; ; kt++) { - if (kt->length <= 0) - goto not_a_directive; - if (kt->length == ident_length - && !strncmp (kt->name, ident, ident_length)) - break; - } - - /* We may want to pass through #define, #undef, #pragma, and #include. - Other directives may create output, but we don't want the directive - itself out, so we pop it now. For example conditionals may emit - #failed ... #endfailed stuff. */ - - if (! (kt->type == T_DEFINE - || kt->type == T_PRAGMA - || (IS_INCLUDE_DIRECTIVE_TYPE (kt->type) - && CPP_OPTIONS (pfile)->dump_includes))) - CPP_SET_WRITTEN (pfile, old_written); - - (*kt->func) (pfile, kt); + CPP_SET_WRITTEN (pfile, old_written); - if (kt->type == T_DEFINE) + if (pfile->no_directives) { - if (CPP_OPTIONS (pfile)->dump_macros == dump_names) - { - /* Skip "#define". */ - U_CHAR *p = pfile->token_buffer + old_written + 7; - - SKIP_WHITE_SPACE (p); - while (is_idchar[*p]) p++; - pfile->limit = p; - CPP_PUTC (pfile, '\n'); - } - else if (CPP_OPTIONS (pfile)->dump_macros != dump_definitions) - CPP_SET_WRITTEN (pfile, old_written); + cpp_error (pfile, "`#%s' may not be used inside a macro argument", + kt->name); + skip_rest_of_line (pfile); } + else + (*kt->func) (pfile, kt); - done_a_directive: return 1; - - not_a_directive: - return 0; } /* Pass a directive through to the output file. BUF points to the contents of the directive, as a contiguous string. -m LIMIT points to the first character past the end of the directive. + LEN is the length of the string pointed to by BUF. KEYWORD is the keyword-table entry for the directive. */ static void -pass_thru_directive (buf, limit, pfile, keyword) - U_CHAR *buf, *limit; +pass_thru_directive (buf, len, pfile, keyword) + const U_CHAR *buf; + size_t len; cpp_reader *pfile; - struct directive *keyword; + const struct directive *keyword; { register unsigned keyword_length = keyword->length; - CPP_RESERVE (pfile, 1 + keyword_length + (limit - buf)); + CPP_RESERVE (pfile, 1 + keyword_length + len); CPP_PUTC_Q (pfile, '#'); CPP_PUTS_Q (pfile, keyword->name, keyword_length); - if (limit != buf && buf[0] != ' ') + if (len != 0 && buf[0] != ' ') CPP_PUTC_Q (pfile, ' '); - CPP_PUTS_Q (pfile, buf, limit - buf); -#if 0 - CPP_PUTS_Q (pfile, '\n'); - /* Count the line we have just made in the output, - to get in sync properly. */ - pfile->lineno++; -#endif + CPP_PUTS_Q (pfile, buf, len); } - -/* The arglist structure is built by do_define to tell - collect_definition where the argument names begin. That - is, for a define like "#define f(x,y,z) foo+x-bar*y", the arglist - would contain pointers to the strings x, y, and z. - Collect_definition would then build a DEFINITION node, - with reflist nodes pointing to the places x, y, and z had - appeared. So the arglist is just convenience data passed - between these two routines. It is not kept around after - the current #define has been processed and entered into the - hash table. */ - -struct arglist { - struct arglist *next; - U_CHAR *name; - int length; - int argno; - char rest_args; -}; -/* Read a replacement list for a macro with parameters. - Build the DEFINITION structure. - Reads characters of text starting at BUF until END. - ARGLIST specifies the formal parameters to look for - in the text of the definition; NARGS is the number of args - in that list, or -1 for a macro name that wants no argument list. - MACRONAME is the macro name itself (so we can avoid recursive expansion) - and NAMELEN is its length in characters. - - Note that comments, backslash-newlines, and leading white space - have already been deleted from the argument. */ - -static DEFINITION * -collect_expansion (pfile, buf, limit, nargs, arglist) +/* Check a purported macro name SYMNAME, and yield its length. */ + +int +check_macro_name (pfile, symname) cpp_reader *pfile; - U_CHAR *buf, *limit; - int nargs; - struct arglist *arglist; + const U_CHAR *symname; { - DEFINITION *defn; - register U_CHAR *p, *lastp, *exp_p; - struct reflist *endpat = NULL; - /* Pointer to first nonspace after last ## seen. */ - U_CHAR *concat = 0; - /* Pointer to first nonspace after last single-# seen. */ - U_CHAR *stringify = 0; - int maxsize; - int expected_delimiter = '\0'; - - /* Scan thru the replacement list, ignoring comments and quoted - strings, picking up on the macro calls. It does a linear search - thru the arg list on every potential symbol. Profiling might say - that something smarter should happen. */ - - if (limit < buf) - abort (); - - /* Find the beginning of the trailing whitespace. */ - p = buf; - while (p < limit && is_space[limit[-1]]) limit--; - - /* Allocate space for the text in the macro definition. - Leading and trailing whitespace chars need 2 bytes each. - Each other input char may or may not need 1 byte, - so this is an upper bound. The extra 5 are for invented - leading and trailing newline-marker and final null. */ - maxsize = (sizeof (DEFINITION) - + (limit - p) + 5); - /* Occurrences of '@' get doubled, so allocate extra space for them. */ - while (p < limit) - if (*p++ == '@') - maxsize++; - defn = (DEFINITION *) xcalloc (1, maxsize); - - defn->nargs = nargs; - exp_p = defn->expansion = (U_CHAR *) defn + sizeof (DEFINITION); - lastp = exp_p; - - p = buf; - - /* Add one initial space escape-marker to prevent accidental - token-pasting (often removed by macroexpand). */ - *exp_p++ = '@'; - *exp_p++ = ' '; - - if (limit - p >= 2 && p[0] == '#' && p[1] == '#') { - cpp_error (pfile, "`##' at start of macro definition"); - p += 2; + const U_CHAR *p; + int sym_length; + + for (p = symname; is_idchar(*p); p++) + ; + sym_length = p - symname; + if (sym_length == 0 + || (sym_length == 1 && *symname == 'L' && (*p == '\'' || *p == '"'))) + cpp_error (pfile, "invalid macro name"); + else if (!is_idstart(*symname) + || (! strncmp (symname, "defined", 7) && sym_length == 7)) { + U_CHAR *msg; /* what pain... */ + msg = (U_CHAR *) alloca (sym_length + 1); + bcopy (symname, msg, sym_length); + msg[sym_length] = 0; + cpp_error (pfile, "invalid macro name `%s'", msg); } + return sym_length; +} - /* Process the main body of the definition. */ - while (p < limit) { - int skipped_arg = 0; - register U_CHAR c = *p++; +/* Process a #define command. + KEYWORD is the keyword-table entry for #define, + or NULL for a "predefined" macro, + or the keyword-table entry for #pragma in the case of a #pragma poison. */ - *exp_p++ = c; +static int +do_define (pfile, keyword) + cpp_reader *pfile; + const struct directive *keyword; +{ + MACRODEF mdef; + HASHNODE *hp; + long here; + U_CHAR *macro, *buf, *end; + enum node_type new_type; - if (!CPP_TRADITIONAL (pfile)) { - switch (c) { - case '\'': - case '\"': - if (expected_delimiter != '\0') { - if (c == expected_delimiter) - expected_delimiter = '\0'; - } else - expected_delimiter = c; - break; + here = CPP_WRITTEN (pfile); + copy_rest_of_line (pfile); - case '\\': - if (p < limit && expected_delimiter) { - /* In a string, backslash goes through - and makes next char ordinary. */ - *exp_p++ = *p++; - } - break; + if (keyword == NULL || keyword->type == T_DEFINE) + new_type = T_MACRO; + else + new_type = T_POISON; - case '@': - /* An '@' in a string or character constant stands for itself, - and does not need to be escaped. */ - if (!expected_delimiter) - *exp_p++ = c; - break; + /* Copy out the line so we can pop the token buffer. */ + buf = pfile->token_buffer + here; + end = CPP_PWRITTEN (pfile); + macro = (U_CHAR *) alloca (end - buf + 1); + memcpy (macro, buf, end - buf + 1); + end = macro + (end - buf); - case '#': - /* # is ordinary inside a string. */ - if (expected_delimiter) - break; - if (p < limit && *p == '#') { - /* ##: concatenate preceding and following tokens. */ - /* Take out the first #, discard preceding whitespace. */ - exp_p--; - while (exp_p > lastp && is_hor_space[exp_p[-1]]) - --exp_p; - /* Skip the second #. */ - p++; - /* Discard following whitespace. */ - SKIP_WHITE_SPACE (p); - concat = p; - if (p == limit) - cpp_error (pfile, "`##' at end of macro definition"); - } else if (nargs >= 0) { - /* Single #: stringify following argument ref. - Don't leave the # in the expansion. */ - exp_p--; - SKIP_WHITE_SPACE (p); - if (p == limit || ! is_idstart[*p] - || (*p == 'L' && p + 1 < limit && (p[1] == '\'' || p[1] == '"'))) - cpp_error (pfile, - "`#' operator is not followed by a macro argument name"); - else - stringify = p; - } - break; - } - } else { - /* In -traditional mode, recognize arguments inside strings and - character constants, and ignore special properties of #. - Arguments inside strings are considered "stringified", but no - extra quote marks are supplied. */ - switch (c) { - case '\'': - case '\"': - if (expected_delimiter != '\0') { - if (c == expected_delimiter) - expected_delimiter = '\0'; - } else - expected_delimiter = c; - break; + CPP_SET_WRITTEN (pfile, here); - case '\\': - /* Backslash quotes delimiters and itself, but not macro args. */ - if (expected_delimiter != 0 && p < limit - && (*p == expected_delimiter || *p == '\\')) { - *exp_p++ = *p++; - continue; - } - break; + mdef = create_definition (macro, end, pfile); + if (mdef.defn == 0) + return 0; - case '/': - if (expected_delimiter != '\0') /* No comments inside strings. */ - break; - if (*p == '*') { - /* If we find a comment that wasn't removed by handle_directive, - this must be -traditional. So replace the comment with - nothing at all. */ - exp_p--; - p += 1; - while (p < limit && !(p[-2] == '*' && p[-1] == '/')) - p++; -#if 0 - /* Mark this as a concatenation-point, as if it had been ##. */ - concat = p; -#endif - } - break; - } - } - - /* Handle the start of a symbol. */ - if (is_idchar[c] && nargs > 0) { - U_CHAR *id_beg = p - 1; - int id_len; - - --exp_p; - while (p != limit && is_idchar[*p]) p++; - id_len = p - id_beg; - - if (is_idstart[c] - && ! (id_len == 1 && c == 'L' && (*p == '\'' || *p == '"'))) { - register struct arglist *arg; - - for (arg = arglist; arg != NULL; arg = arg->next) { - struct reflist *tpat; - - if (arg->name[0] == c - && arg->length == id_len - && strncmp (arg->name, id_beg, id_len) == 0) { - if (expected_delimiter && CPP_OPTIONS (pfile)->warn_stringify) { - if (CPP_TRADITIONAL (pfile)) { - cpp_warning (pfile, "macro argument `%.*s' is stringified.", - id_len, arg->name); - } else { - cpp_warning (pfile, - "macro arg `%.*s' would be stringified with -traditional.", - id_len, arg->name); - } - } - /* If ANSI, don't actually substitute inside a string. */ - if (!CPP_TRADITIONAL (pfile) && expected_delimiter) - break; - /* make a pat node for this arg and append it to the end of - the pat list */ - tpat = (struct reflist *) xmalloc (sizeof (struct reflist)); - tpat->next = NULL; - tpat->raw_before = concat == id_beg; - tpat->raw_after = 0; - tpat->rest_args = arg->rest_args; - tpat->stringify = (CPP_TRADITIONAL (pfile) - ? expected_delimiter != '\0' - : stringify == id_beg); - - if (endpat == NULL) - defn->pattern = tpat; - else - endpat->next = tpat; - endpat = tpat; - - tpat->argno = arg->argno; - tpat->nchars = exp_p - lastp; - { - register U_CHAR *p1 = p; - SKIP_WHITE_SPACE (p1); - if (p1 + 2 <= limit && p1[0] == '#' && p1[1] == '#') - tpat->raw_after = 1; - } - lastp = exp_p; /* place to start copying from next time */ - skipped_arg = 1; - break; - } - } - } - - /* If this was not a macro arg, copy it into the expansion. */ - if (! skipped_arg) { - register U_CHAR *lim1 = p; - p = id_beg; - while (p != lim1) - *exp_p++ = *p++; - if (stringify == id_beg) - cpp_error (pfile, - "`#' operator should be followed by a macro argument name"); - } - } - } - - if (!CPP_TRADITIONAL (pfile) && expected_delimiter == 0) - { - /* If ANSI, put in a "@ " marker to prevent token pasting. - But not if "inside a string" (which in ANSI mode - happens only for -D option). */ - *exp_p++ = '@'; - *exp_p++ = ' '; - } - - *exp_p = '\0'; - - defn->length = exp_p - defn->expansion; - - /* Crash now if we overrun the allocated size. */ - if (defn->length + 1 > maxsize) - abort (); - -#if 0 -/* This isn't worth the time it takes. */ - /* give back excess storage */ - defn->expansion = (U_CHAR *) xrealloc (defn->expansion, defn->length + 1); -#endif - - return defn; -} - -/* - * special extension string that can be added to the last macro argument to - * allow it to absorb the "rest" of the arguments when expanded. Ex: - * #define wow(a, b...) process (b, a, b) - * { wow (1, 2, 3); } -> { process (2, 3, 1, 2, 3); } - * { wow (one, two); } -> { process (two, one, two); } - * if this "rest_arg" is used with the concat token '##' and if it is not - * supplied then the token attached to with ## will not be outputted. Ex: - * #define wow (a, b...) process (b ## , a, ## b) - * { wow (1, 2); } -> { process (2, 1, 2); } - * { wow (one); } -> { process (one); { - */ -static char rest_extension[] = "..."; -#define REST_EXTENSION_LENGTH (sizeof (rest_extension) - 1) - -/* Create a DEFINITION node from a #define directive. Arguments are - as for do_define. */ - -static MACRODEF -create_definition (buf, limit, pfile, predefinition) - U_CHAR *buf, *limit; - cpp_reader *pfile; - int predefinition; -{ - U_CHAR *bp; /* temp ptr into input buffer */ - U_CHAR *symname; /* remember where symbol name starts */ - int sym_length; /* and how long it is */ - int rest_args = 0; - long line, col; - char *file = CPP_BUFFER (pfile) ? CPP_BUFFER (pfile)->nominal_fname : ""; - DEFINITION *defn; - int arglengths = 0; /* Accumulate lengths of arg names - plus number of args. */ - MACRODEF mdef; - cpp_buf_line_and_col (CPP_BUFFER (pfile), &line, &col); - - bp = buf; - - while (is_hor_space[*bp]) - bp++; - - symname = bp; /* remember where it starts */ - - sym_length = check_macro_name (pfile, bp, 0); - bp += sym_length; - - /* Lossage will occur if identifiers or control keywords are broken - across lines using backslash. This is not the right place to take - care of that. */ - - if (*bp == '(') { - struct arglist *arg_ptrs = NULL; - int argno = 0; - - bp++; /* skip '(' */ - SKIP_WHITE_SPACE (bp); - - /* Loop over macro argument names. */ - while (*bp != ')') { - struct arglist *temp; - - temp = (struct arglist *) alloca (sizeof (struct arglist)); - temp->name = bp; - temp->next = arg_ptrs; - temp->argno = argno++; - temp->rest_args = 0; - arg_ptrs = temp; - - if (rest_args) - cpp_pedwarn (pfile, "another parameter follows `%s'", rest_extension); - - if (!is_idstart[*bp]) - cpp_pedwarn (pfile, "invalid character in macro parameter name"); - - /* Find the end of the arg name. */ - while (is_idchar[*bp]) { - bp++; - /* do we have a "special" rest-args extension here? */ - if ((size_t)(limit - bp) > REST_EXTENSION_LENGTH - && strncmp (rest_extension, bp, REST_EXTENSION_LENGTH) == 0) { - rest_args = 1; - temp->rest_args = 1; - break; - } - } - temp->length = bp - temp->name; - if (rest_args == 1) - bp += REST_EXTENSION_LENGTH; - arglengths += temp->length + 2; - SKIP_WHITE_SPACE (bp); - if (temp->length == 0 || (*bp != ',' && *bp != ')')) { - cpp_error (pfile, "badly punctuated parameter list in `#define'"); - goto nope; - } - if (*bp == ',') { - bp++; - SKIP_WHITE_SPACE (bp); - } - if (bp >= limit) { - cpp_error (pfile, "unterminated parameter list in `#define'"); - goto nope; - } - { - struct arglist *otemp; - - for (otemp = temp->next; otemp != NULL; otemp = otemp->next) - if (temp->length == otemp->length - && strncmp (temp->name, otemp->name, temp->length) == 0) { - U_CHAR *name; - - name = (U_CHAR *) alloca (temp->length + 1); - (void) strncpy (name, temp->name, temp->length); - name[temp->length] = '\0'; - cpp_error (pfile, - "duplicate argument name `%s' in `#define'", name); - goto nope; - } - } - } - - ++bp; /* skip paren */ - SKIP_WHITE_SPACE (bp); - /* now everything from bp before limit is the definition. */ - defn = collect_expansion (pfile, bp, limit, argno, arg_ptrs); - defn->rest_args = rest_args; - - /* Now set defn->args.argnames to the result of concatenating - the argument names in reverse order - with comma-space between them. */ - defn->args.argnames = (U_CHAR *) xmalloc (arglengths + 1); - { - struct arglist *temp; - int i = 0; - for (temp = arg_ptrs; temp; temp = temp->next) { - bcopy (temp->name, &defn->args.argnames[i], temp->length); - i += temp->length; - if (temp->next != 0) { - defn->args.argnames[i++] = ','; - defn->args.argnames[i++] = ' '; - } - } - defn->args.argnames[i] = 0; - } - } else { - /* Simple expansion or empty definition. */ - - if (bp < limit) - { - if (is_hor_space[*bp]) { - bp++; - SKIP_WHITE_SPACE (bp); - } else { - switch (*bp) { - case '!': case '"': case '#': case '%': case '&': case '\'': - case ')': case '*': case '+': case ',': case '-': case '.': - case '/': case ':': case ';': case '<': case '=': case '>': - case '?': case '[': case '\\': case ']': case '^': case '{': - case '|': case '}': case '~': - cpp_warning (pfile, "missing white space after `#define %.*s'", - sym_length, symname); - break; - - default: - cpp_pedwarn (pfile, "missing white space after `#define %.*s'", - sym_length, symname); - break; - } - } - } - /* now everything from bp before limit is the definition. */ - defn = collect_expansion (pfile, bp, limit, -1, NULL_PTR); - defn->args.argnames = (U_CHAR *) ""; - } - - defn->line = line; - defn->file = file; - - /* OP is null if this is a predefinition */ - defn->predefined = predefinition; - mdef.defn = defn; - mdef.symnam = symname; - mdef.symlen = sym_length; - - return mdef; - - nope: - mdef.defn = 0; - return mdef; -} - -/* Check a purported macro name SYMNAME, and yield its length. - ASSERTION is nonzero if this is really for an assertion name. */ - -static int -check_macro_name (pfile, symname, assertion) - cpp_reader *pfile; - U_CHAR *symname; - int assertion; -{ - U_CHAR *p; - int sym_length; - - for (p = symname; is_idchar[*p]; p++) - ; - sym_length = p - symname; - if (sym_length == 0 - || (sym_length == 1 && *symname == 'L' && (*p == '\'' || *p == '"'))) - cpp_error (pfile, - assertion ? "invalid assertion name" : "invalid macro name"); - else if (!is_idstart[*symname] - || (! strncmp (symname, "defined", 7) && sym_length == 7)) { - U_CHAR *msg; /* what pain... */ - msg = (U_CHAR *) alloca (sym_length + 1); - bcopy (symname, msg, sym_length); - msg[sym_length] = 0; - cpp_error (pfile, - (assertion - ? "invalid assertion name `%s'" - : "invalid macro name `%s'"), - msg); - } - return sym_length; -} - -/* Return zero if two DEFINITIONs are isomorphic. */ - -static int -compare_defs (pfile, d1, d2) - cpp_reader *pfile; - DEFINITION *d1, *d2; -{ - register struct reflist *a1, *a2; - register U_CHAR *p1 = d1->expansion; - register U_CHAR *p2 = d2->expansion; - int first = 1; - - if (d1->nargs != d2->nargs) - return 1; - if (CPP_PEDANTIC (pfile) - && strcmp ((char *)d1->args.argnames, (char *)d2->args.argnames)) - return 1; - for (a1 = d1->pattern, a2 = d2->pattern; a1 && a2; - a1 = a1->next, a2 = a2->next) { - if (!((a1->nchars == a2->nchars && ! strncmp (p1, p2, a1->nchars)) - || ! comp_def_part (first, p1, a1->nchars, p2, a2->nchars, 0)) - || a1->argno != a2->argno - || a1->stringify != a2->stringify - || a1->raw_before != a2->raw_before - || a1->raw_after != a2->raw_after) - return 1; - first = 0; - p1 += a1->nchars; - p2 += a2->nchars; - } - if (a1 != a2) - return 1; - if (comp_def_part (first, p1, d1->length - (p1 - d1->expansion), - p2, d2->length - (p2 - d2->expansion), 1)) - return 1; - return 0; -} - -/* Return 1 if two parts of two macro definitions are effectively different. - One of the parts starts at BEG1 and has LEN1 chars; - the other has LEN2 chars at BEG2. - Any sequence of whitespace matches any other sequence of whitespace. - FIRST means these parts are the first of a macro definition; - so ignore leading whitespace entirely. - LAST means these parts are the last of a macro definition; - so ignore trailing whitespace entirely. */ - -static int -comp_def_part (first, beg1, len1, beg2, len2, last) - int first; - U_CHAR *beg1, *beg2; - int len1, len2; - int last; -{ - register U_CHAR *end1 = beg1 + len1; - register U_CHAR *end2 = beg2 + len2; - if (first) { - while (beg1 != end1 && is_space[*beg1]) beg1++; - while (beg2 != end2 && is_space[*beg2]) beg2++; - } - if (last) { - while (beg1 != end1 && is_space[end1[-1]]) end1--; - while (beg2 != end2 && is_space[end2[-1]]) end2--; - } - while (beg1 != end1 && beg2 != end2) { - if (is_space[*beg1] && is_space[*beg2]) { - while (beg1 != end1 && is_space[*beg1]) beg1++; - while (beg2 != end2 && is_space[*beg2]) beg2++; - } else if (*beg1 == *beg2) { - beg1++; beg2++; - } else break; - } - return (beg1 != end1) || (beg2 != end2); -} - -/* Process a #define command. -KEYWORD is the keyword-table entry for #define, -or NULL for a "predefined" macro. */ - -static int -do_define (pfile, keyword) - cpp_reader *pfile; - struct directive *keyword; -{ - int hashcode; - MACRODEF mdef; - HASHNODE *hp; - int save_put_out_comments; - long here; - U_CHAR *macro, *buf, *end; - - here = CPP_WRITTEN (pfile); - - save_put_out_comments = CPP_OPTIONS (pfile)->put_out_comments; - CPP_OPTIONS (pfile)->put_out_comments = CPP_TRADITIONAL (pfile); - copy_rest_of_line (pfile); - CPP_OPTIONS (pfile)->put_out_comments = save_put_out_comments; - - /* Copy out the line so we can pop the token buffer. */ - buf = pfile->token_buffer + here; - end = CPP_PWRITTEN (pfile); - macro = alloca (end - buf + 1); - bcopy (buf, macro, end - buf + 1); - end = macro + (end - buf); - - CPP_SET_WRITTEN (pfile, here); - -#if 0 - /* If this is a precompiler run (with -pcp) pass thru #define commands. */ - if (pcp_outfile && keyword) - pass_thru_directive (macro, end, pfile, keyword); -#endif - - mdef = create_definition (macro, end, pfile, keyword == NULL); - if (mdef.defn == 0) - goto nope; - - hashcode = hashf (mdef.symnam, mdef.symlen, HASHSIZE); - - if ((hp = cpp_lookup (pfile, mdef.symnam, mdef.symlen, hashcode)) != NULL) + if ((hp = cpp_lookup (pfile, mdef.symnam, mdef.symlen)) != NULL) { int ok = 0; - /* Redefining a precompiled key is ok. */ - if (hp->type == T_PCSTRING) - ok = 1; + /* Redefining a poisoned identifier is even worse than `not ok'. */ + if (hp->type == T_POISON) + ok = -1; /* Redefining a macro is ok if the definitions are the same. */ else if (hp->type == T_MACRO) ok = ! compare_defs (pfile, mdef.defn, hp->value.defn); /* Redefining a constant is ok with -D. */ else if (hp->type == T_CONST || hp->type == T_STDC) ok = ! CPP_OPTIONS (pfile)->done_initializing; - /* Print the warning if it's not ok. */ - if (!ok) + /* Print the warning or error if it's not ok. */ + if (ok <= 0) + { + if (hp->type == T_POISON) + cpp_error (pfile, "redefining poisoned `%.*s'", + mdef.symlen, mdef.symnam); + else + cpp_pedwarn (pfile, "`%.*s' redefined", mdef.symlen, mdef.symnam); + if (hp->type == T_MACRO && CPP_OPTIONS (pfile)->done_initializing) + cpp_pedwarn_with_file_and_line (pfile, hp->value.defn->file, + hp->value.defn->line, -1, + "this is the location of the previous definition"); + } + if (hp->type != T_POISON) { - /* If we are passing through #define and #undef directives, do - that for this re-definition now. */ - if (CPP_OPTIONS (pfile)->debug_output && keyword) - pass_thru_directive (macro, end, pfile, keyword); - - cpp_pedwarn (pfile, "`%.*s' redefined", mdef.symlen, mdef.symnam); - if (hp->type == T_MACRO) - cpp_pedwarn_with_file_and_line (pfile, hp->value.defn->file, hp->value.defn->line, - "this is the location of the previous definition"); + /* Replace the old definition. */ + hp->type = new_type; + free_definition (hp->value.defn); + hp->value.defn = mdef.defn; } - /* Replace the old definition. */ - hp->type = T_MACRO; - hp->value.defn = mdef.defn; } else + cpp_install (pfile, mdef.symnam, mdef.symlen, new_type, (char *)mdef.defn); + + if (keyword != NULL && keyword->type == T_DEFINE) { - /* If we are passing through #define and #undef directives, do - that for this new definition now. */ - if (CPP_OPTIONS (pfile)->debug_output && keyword) - pass_thru_directive (macro, end, pfile, keyword); - install (mdef.symnam, mdef.symlen, T_MACRO, - (char *) mdef.defn, hashcode); + if (CPP_OPTIONS (pfile)->debug_output + || CPP_OPTIONS (pfile)->dump_macros == dump_definitions) + dump_definition (pfile, mdef); + else if (CPP_OPTIONS (pfile)->dump_macros == dump_names) + pass_thru_directive (mdef.symnam, mdef.symlen, pfile, keyword); } return 0; - -nope: - - return 1; } -/* This structure represents one parsed argument in a macro call. - `raw' points to the argument text as written (`raw_length' is its length). - `expanded' points to the argument's macro-expansion - (its length is `expand_length'). - `stringified_length' is the length the argument would have - if stringified. - `use_count' is the number of times this macro arg is substituted - into the macro. If the actual use count exceeds 10, - the value stored is 10. */ - -/* raw and expanded are relative to ARG_BASE */ -#define ARG_BASE ((pfile)->token_buffer) - -struct argdata { - /* Strings relative to pfile->token_buffer */ - long raw, expanded, stringified; - int raw_length, expand_length; - int stringified_length; - char newlines; - char use_count; -}; /* Allocate a new cpp_buffer for PFILE, and push it on the input buffer stack. If BUFFER != NULL, then use the LENGTH characters in BUFFER @@ -1479,23 +752,26 @@ cpp_push_buffer (pfile, buffer, length) U_CHAR *buffer; long length; { - register cpp_buffer *buf = CPP_BUFFER (pfile); - if (buf == pfile->buffer_stack) + cpp_buffer *buf = CPP_BUFFER (pfile); + cpp_buffer *new; + if (++pfile->buffer_stack_depth == CPP_STACK_MAX) { - cpp_fatal (pfile, "%s: macro or `#include' recursion too deep", - buf->fname); + cpp_fatal (pfile, "macro or `#include' recursion too deep"); return NULL; } - buf--; - bzero ((char *) buf, sizeof (cpp_buffer)); - CPP_BUFFER (pfile) = buf; - buf->if_stack = pfile->if_stack; - buf->cleanup = null_cleanup; - buf->underflow = null_underflow; - buf->buf = buf->cur = buffer; - buf->alimit = buf->rlimit = buffer + length; - - return buf; + + new = (cpp_buffer *) xcalloc (1, sizeof (cpp_buffer)); + + new->if_stack = pfile->if_stack; + new->cleanup = null_cleanup; + new->underflow = null_underflow; + new->buf = new->cur = buffer; + new->alimit = new->rlimit = buffer + length; + new->prev = buf; + new->mark = -1; + + CPP_BUFFER (pfile) = new; + return new; } cpp_buffer * @@ -1503,8 +779,13 @@ cpp_pop_buffer (pfile) cpp_reader *pfile; { cpp_buffer *buf = CPP_BUFFER (pfile); + if (ACTIVE_MARK_P()) + cpp_ice (pfile, "mark active in cpp_pop_buffer"); (*buf->cleanup) (buf, pfile); - return ++CPP_BUFFER (pfile); + CPP_BUFFER (pfile) = CPP_PREV_BUFFER (buf); + free (buf); + pfile->buffer_stack_depth--; + return CPP_BUFFER (pfile); } /* Scan until CPP_BUFFER (PFILE) is exhausted into PFILE->token_buffer. @@ -1515,15 +796,42 @@ cpp_scan_buffer (pfile) cpp_reader *pfile; { cpp_buffer *buffer = CPP_BUFFER (pfile); - for (;;) + enum cpp_token token; + if (CPP_OPTIONS (pfile)->no_output) { - enum cpp_token token = cpp_get_token (pfile); - if (token == CPP_EOF) /* Should not happen ... */ - break; - if (token == CPP_POP && CPP_BUFFER (pfile) == buffer) + long old_written = CPP_WRITTEN (pfile); + /* In no-output mode, we can ignore everything but directives. */ + for (;;) { - cpp_pop_buffer (pfile); - break; + if (! pfile->only_seen_white) + skip_rest_of_line (pfile); + token = cpp_get_token (pfile); + if (token == CPP_EOF) /* Should not happen ... */ + break; + if (token == CPP_POP && CPP_BUFFER (pfile) == buffer) + { + if (CPP_PREV_BUFFER (CPP_BUFFER (pfile)) + != CPP_NULL_BUFFER (pfile)) + cpp_pop_buffer (pfile); + break; + } + } + CPP_SET_WRITTEN (pfile, old_written); + } + else + { + for (;;) + { + token = cpp_get_token (pfile); + if (token == CPP_EOF) /* Should not happen ... */ + break; + if (token == CPP_POP && CPP_BUFFER (pfile) == buffer) + { + if (CPP_PREV_BUFFER (CPP_BUFFER (pfile)) + != CPP_NULL_BUFFER (pfile)) + cpp_pop_buffer (pfile); + break; + } } } } @@ -1537,23 +845,21 @@ cpp_scan_buffer (pfile) * (because it follows CPP_WRITTEN). This is used by do_include. */ -static void +void cpp_expand_to_buffer (pfile, buf, length) cpp_reader *pfile; - U_CHAR *buf; + const U_CHAR *buf; int length; { register cpp_buffer *ip; -#if 0 - cpp_buffer obuf; -#endif U_CHAR *buf1; -#if 0 - int odepth = indepth; -#endif + int save_no_output; if (length < 0) - abort (); + { + cpp_ice (pfile, "length < 0 in cpp_expand_to_buffer"); + return; + } /* Set up the input on the input stack. */ @@ -1565,70 +871,32 @@ cpp_expand_to_buffer (pfile, buf, length) if (ip == NULL) return; ip->has_escapes = 1; -#if 0 - ip->lineno = obuf.lineno = 1; -#endif /* Scan the input, create the output. */ + save_no_output = CPP_OPTIONS (pfile)->no_output; + CPP_OPTIONS (pfile)->no_output = 0; cpp_scan_buffer (pfile); + CPP_OPTIONS (pfile)->no_output = save_no_output; CPP_NUL_TERMINATE (pfile); } - -static void -adjust_position (buf, limit, linep, colp) - U_CHAR *buf; - U_CHAR *limit; - long *linep; - long *colp; -{ - while (buf < limit) - { - U_CHAR ch = *buf++; - if (ch == '\n') - (*linep)++, (*colp) = 1; - else - (*colp)++; - } -} - -/* Move line_base forward, updating lineno and colno. */ - -static void -update_position (pbuf) - register cpp_buffer *pbuf; -{ - unsigned char *old_pos = pbuf->buf + pbuf->line_base; - unsigned char *new_pos = pbuf->cur; - register struct parse_marker *mark; - for (mark = pbuf->marks; mark != NULL; mark = mark->next) - { - if (pbuf->buf + mark->position < new_pos) - new_pos = pbuf->buf + mark->position; - } - pbuf->line_base += new_pos - old_pos; - adjust_position (old_pos, new_pos, &pbuf->lineno, &pbuf->colno); -} - void cpp_buf_line_and_col (pbuf, linep, colp) register cpp_buffer *pbuf; long *linep, *colp; { - long dummy; - if (colp == NULL) - colp = &dummy; if (pbuf) { *linep = pbuf->lineno; - *colp = pbuf->colno; - adjust_position (pbuf->buf + pbuf->line_base, pbuf->cur, linep, colp); + if (colp) + *colp = pbuf->cur - pbuf->line_base; } else { *linep = 0; - *colp = 0; + if (colp) + *colp = 0; } } @@ -1646,1151 +914,295 @@ cpp_file_buffer (pfile) return NULL; } -static long -count_newlines (buf, limit) - register U_CHAR *buf; - register U_CHAR *limit; -{ - register long count = 0; - while (buf < limit) - { - U_CHAR ch = *buf++; - if (ch == '\n') - count++; - } - return count; -} - /* * write out a #line command, for instance, after an #include file. - * If CONDITIONAL is nonzero, we can omit the #line if it would - * appear to be a no-op, and we can output a few newlines instead - * if we want to increase the line number by a small amount. * FILE_CHANGE says whether we are entering a file, leaving, or neither. */ -static void -output_line_command (pfile, conditional, file_change) +void +output_line_command (pfile, file_change) cpp_reader *pfile; - int conditional; enum file_change_code file_change; { - long line, col; + long line; cpp_buffer *ip = CPP_BUFFER (pfile); if (ip->fname == NULL) return; - update_position (ip); - if (CPP_OPTIONS (pfile)->no_line_commands || CPP_OPTIONS (pfile)->no_output) return; - line = CPP_BUFFER (pfile)->lineno; - col = CPP_BUFFER (pfile)->colno; - adjust_position (CPP_LINE_BASE (ip), ip->cur, &line, &col); - - if (CPP_OPTIONS (pfile)->no_line_commands) - return; + cpp_buf_line_and_col (CPP_BUFFER (pfile), &line, NULL); - if (conditional) { - if (line == pfile->lineno) - return; + /* If the current file has not changed, we omit the #line if it would + appear to be a no-op, and we output a few newlines instead + if we want to increase the line number by a small amount. + We cannot do this if pfile->lineno is zero, because that means we + haven't output any line commands yet. (The very first line command + output is a `same_file' command.) */ + if (file_change == same_file && pfile->lineno != 0) + { + if (line == pfile->lineno) + return; - /* If the inherited line number is a little too small, - output some newlines instead of a #line command. */ - if (line > pfile->lineno && line < pfile->lineno + 8) { - CPP_RESERVE (pfile, 20); - while (line > pfile->lineno) { - CPP_PUTC_Q (pfile, '\n'); - pfile->lineno++; - } - return; + /* If the inherited line number is a little too small, + output some newlines instead of a #line command. */ + if (line > pfile->lineno && line < pfile->lineno + 8) + { + CPP_RESERVE (pfile, 20); + while (line > pfile->lineno) + { + CPP_PUTC_Q (pfile, '\n'); + pfile->lineno++; + } + return; + } } - } - -#if 0 - /* Don't output a line number of 0 if we can help it. */ - if (ip->lineno == 0 && ip->bufp - ip->buf < ip->length - && *ip->bufp == '\n') { - ip->lineno++; - ip->bufp++; - } -#endif CPP_RESERVE (pfile, 4 * strlen (ip->nominal_fname) + 50); - { -#ifdef OUTPUT_LINE_COMMANDS - static char sharp_line[] = "#line "; -#else - static char sharp_line[] = "# "; -#endif - CPP_PUTS_Q (pfile, sharp_line, sizeof(sharp_line)-1); - } + CPP_PUTS_Q (pfile, "# ", 2); sprintf ((char *) CPP_PWRITTEN (pfile), "%ld ", line); CPP_ADJUST_WRITTEN (pfile, strlen (CPP_PWRITTEN (pfile))); quote_string (pfile, ip->nominal_fname); - if (file_change != same_file) { - CPP_PUTC_Q (pfile, ' '); - CPP_PUTC_Q (pfile, file_change == enter_file ? '1' : '2'); - } + if (file_change != same_file) + { + CPP_PUTC_Q (pfile, ' '); + CPP_PUTC_Q (pfile, file_change == enter_file ? '1' : '2'); + } /* Tell cc1 if following text comes from a system header file. */ - if (ip->system_header_p) { - CPP_PUTC_Q (pfile, ' '); - CPP_PUTC_Q (pfile, '3'); - } + if (ip->system_header_p) + { + CPP_PUTC_Q (pfile, ' '); + CPP_PUTC_Q (pfile, '3'); + } #ifndef NO_IMPLICIT_EXTERN_C /* Tell cc1plus if following text should be treated as C. */ - if (ip->system_header_p == 2 && CPP_OPTIONS (pfile)->cplusplus) { - CPP_PUTC_Q (pfile, ' '); - CPP_PUTC_Q (pfile, '4'); - } + if (ip->system_header_p == 2 && CPP_OPTIONS (pfile)->cplusplus) + { + CPP_PUTC_Q (pfile, ' '); + CPP_PUTC_Q (pfile, '4'); + } #endif CPP_PUTC_Q (pfile, '\n'); pfile->lineno = line; } - -/* - * Parse a macro argument and append the info on PFILE's token_buffer. - * REST_ARGS means to absorb the rest of the args. - * Return nonzero to indicate a syntax error. - */ -static enum cpp_token -macarg (pfile, rest_args) + +/* Like cpp_get_token, except that it does not read past end-of-line. + Also, horizontal space is skipped, and macros are popped. */ + +enum cpp_token +get_directive_token (pfile) cpp_reader *pfile; - int rest_args; { - int paren = 0; + long old_written = CPP_WRITTEN (pfile); enum cpp_token token; - char save_put_out_comments = CPP_OPTIONS (pfile)->put_out_comments; - CPP_OPTIONS (pfile)->put_out_comments = 0; - /* Try to parse as much of the argument as exists at this - input stack level. */ - pfile->no_macro_expand++; for (;;) { + cpp_skip_hspace (pfile); + if (PEEKC () == '\n') + return CPP_VSPACE; + token = cpp_get_token (pfile); - switch (token) + /* token could be hspace at the beginning of a macro. */ + if (token == CPP_HSPACE || token == CPP_COMMENT) { - case CPP_EOF: - goto done; - case CPP_POP: - /* If we've hit end of file, it's an error (reported by caller). - Ditto if it's the end of cpp_expand_to_buffer text. - If we've hit end of macro, just continue. */ - if (! CPP_IS_MACRO_BUFFER (CPP_BUFFER (pfile))) - goto done; - break; - case CPP_LPAREN: - paren++; - break; - case CPP_RPAREN: - if (--paren < 0) - goto found; - break; - case CPP_COMMA: - /* if we've returned to lowest level and - we aren't absorbing all args */ - if (paren == 0 && rest_args == 0) - goto found; - break; - found: - /* Remove ',' or ')' from argument buffer. */ - CPP_ADJUST_WRITTEN (pfile, -1); - goto done; - default: ; + CPP_SET_WRITTEN (pfile, old_written); + continue; } - } - done: - CPP_OPTIONS (pfile)->put_out_comments = save_put_out_comments; - pfile->no_macro_expand--; + /* token cannot be vspace, it would have been caught above. */ + if (token == CPP_VSPACE) + { + cpp_ice (pfile, "VSPACE in get_directive_token"); + return token; + } - return token; -} - -/* Turn newlines to spaces in the string of length LENGTH at START, - except inside of string constants. - The string is copied into itself with its beginning staying fixed. */ + /* token cannot be POP unless the buffer is a macro buffer. */ + if (token != CPP_POP) + return token; -static int -change_newlines (start, length) - U_CHAR *start; - int length; -{ - register U_CHAR *ibp; - register U_CHAR *obp; - register U_CHAR *limit; - register int c; - - ibp = start; - limit = start + length; - obp = start; - - while (ibp < limit) { - *obp++ = c = *ibp++; - switch (c) { - - case '\'': - case '\"': - /* Notice and skip strings, so that we don't delete newlines in them. */ - { - int quotec = c; - while (ibp < limit) { - *obp++ = c = *ibp++; - if (c == quotec) - break; - if (c == '\n' && quotec == '\'') - break; + if (! CPP_IS_MACRO_BUFFER (CPP_BUFFER (pfile))) + { + cpp_ice (pfile, "POP of file buffer in get_directive_token"); + return token; } - } - break; - } - } - return obp - start; + /* We must pop the buffer by hand, or else cpp_get_token might + hand us white space or newline on the next invocation. */ + cpp_pop_buffer (pfile); + } } - -static struct tm * -timestamp (pfile) - cpp_reader *pfile; -{ - if (!pfile->timebuf) { - time_t t = time ((time_t *) 0); - pfile->timebuf = localtime (&t); - } - return pfile->timebuf; -} - -static char *monthnames[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", - "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", - }; +/* Handle #include and #import. + This function expects to see "fname" or on the input. -/* - * expand things like __FILE__. Place the expansion into the output - * buffer *without* rescanning. - */ + The input is normally in part of the output_buffer following + CPP_WRITTEN, and will get overwritten by output_line_command. + I.e. in input file specification has been popped by handle_directive. + This is safe. */ -static void -special_symbol (hp, pfile) - HASHNODE *hp; +static int +do_include (pfile, keyword) cpp_reader *pfile; + const struct directive *keyword; { - const char *buf; - int len; - - switch (hp->type) - { - case T_FILE: - case T_BASE_FILE: - { - cpp_buffer *ip = CPP_BUFFER (pfile); - if (hp->type == T_BASE_FILE) - { - while (CPP_PREV_BUFFER (ip) != CPP_NULL_BUFFER (pfile)) - ip = CPP_PREV_BUFFER (ip); - } - else - { - ip = CPP_BUFFER (pfile); - while (! ip->nominal_fname && ip != CPP_NULL_BUFFER (pfile)) - ip = CPP_PREV_BUFFER (ip); - } - - buf = ip->nominal_fname; - - if (!buf) - buf = ""; - CPP_RESERVE (pfile, 3 + 4 * strlen (buf)); - quote_string (pfile, buf); - return; - } - - case T_INCLUDE_LEVEL: - { - int true_indepth = 0; - cpp_buffer *ip = CPP_BUFFER (pfile); - for (; ip != CPP_NULL_BUFFER (pfile); ip = CPP_PREV_BUFFER (ip)) - if (ip->fname != NULL) - true_indepth++; - - CPP_RESERVE (pfile, 10); - sprintf (CPP_PWRITTEN (pfile), "%d", true_indepth); - CPP_ADJUST_WRITTEN (pfile, strlen (CPP_PWRITTEN (pfile))); - return; - } - - case T_VERSION: - len = strlen (version_string); - CPP_RESERVE (pfile, 3 + len); - CPP_PUTC_Q (pfile, '"'); - CPP_PUTS_Q (pfile, version_string, len); - CPP_PUTC_Q (pfile, '"'); - CPP_NUL_TERMINATE_Q (pfile); - return; - - case T_CONST: - buf = hp->value.cpval; - if (!buf) - return; - - len = strlen (buf); - CPP_RESERVE (pfile, len + 1); - CPP_PUTS_Q (pfile, buf, len); - CPP_NUL_TERMINATE_Q (pfile); - return; - - case T_STDC: - CPP_RESERVE (pfile, 2); -#ifdef STDC_0_IN_SYSTEM_HEADERS - ip = CPP_BUFFER (pfile); - while (! ip->nominal_fname && ip != CPP_NULL_BUFFER (pfile)) - ip = CPP_PREV_BUFFER (ip); - if (ip->system_header_p - && ! cpp_lookup (pfile, (U_CHAR *) "__STRICT_ANSI__", 15, -1)) - CPP_PUTC_Q (pfile, '0'); - else -#endif - CPP_PUTC_Q (pfile, '1'); - CPP_NUL_TERMINATE_Q (pfile); - return; - - case T_SPECLINE: - { - long line; - cpp_buf_line_and_col (CPP_BUFFER (pfile), &line, NULL); + int importing = (keyword->type == T_IMPORT); + int skip_dirs = (keyword->type == T_INCLUDE_NEXT); + int angle_brackets = 0; /* 0 for "...", 1 for <...> */ + int before; /* included before? */ + long flen; + unsigned char *ftok; + cpp_buffer *fp; - CPP_RESERVE (pfile, 10); - sprintf (CPP_PWRITTEN (pfile), "%ld", line); - CPP_ADJUST_WRITTEN (pfile, strlen (CPP_PWRITTEN (pfile))); - return; - } + enum cpp_token token; - case T_DATE: - case T_TIME: - { - struct tm *timebuf; - - CPP_RESERVE (pfile, 20); - timebuf = timestamp (pfile); - if (hp->type == T_DATE) - sprintf (CPP_PWRITTEN (pfile), "\"%s %2d %4d\"", - monthnames[timebuf->tm_mon], - timebuf->tm_mday, timebuf->tm_year + 1900); - else - sprintf (CPP_PWRITTEN (pfile), "\"%02d:%02d:%02d\"", - timebuf->tm_hour, timebuf->tm_min, timebuf->tm_sec); + /* Chain of dirs to search */ + struct include_hash *ihash; + struct file_name_list *search_start; + + long old_written = CPP_WRITTEN (pfile); - CPP_ADJUST_WRITTEN (pfile, strlen (CPP_PWRITTEN (pfile))); - return; - } + int fd; - default: - cpp_fatal (pfile, "cpplib internal error: invalid special hash type"); - return; + if (CPP_PEDANTIC (pfile) && !CPP_BUFFER (pfile)->system_header_p) + { + if (importing) + cpp_pedwarn (pfile, "ANSI C does not allow `#import'"); + if (skip_dirs) + cpp_pedwarn (pfile, "ANSI C does not allow `#include_next'"); } - /* This point should be unreachable. */ - abort(); -} - -/* Write out a #define command for the special named MACRO_NAME - to PFILE's token_buffer. */ - -static void -dump_special_to_buffer (pfile, macro_name) - cpp_reader *pfile; - char *macro_name; -{ - static char define_directive[] = "#define "; - int macro_name_length = strlen (macro_name); - output_line_command (pfile, 0, same_file); - CPP_RESERVE (pfile, sizeof(define_directive) + macro_name_length); - CPP_PUTS_Q (pfile, define_directive, sizeof(define_directive)-1); - CPP_PUTS_Q (pfile, macro_name, macro_name_length); - CPP_PUTC_Q (pfile, ' '); - cpp_expand_to_buffer (pfile, macro_name, macro_name_length); - CPP_PUTC (pfile, '\n'); -} + if (importing && CPP_OPTIONS (pfile)->warn_import + && !CPP_OPTIONS (pfile)->inhibit_warnings + && !CPP_BUFFER (pfile)->system_header_p && !pfile->import_warning) + { + pfile->import_warning = 1; + cpp_warning (pfile, + "#import is obsolete, use an #ifndef wrapper in the header file"); + } -/* Initialize the built-in macros. */ + pfile->parsing_include_directive++; + token = get_directive_token (pfile); + pfile->parsing_include_directive--; -static void -initialize_builtins (pfile) - cpp_reader *pfile; -{ -#define NAME(str) (U_CHAR *)str, sizeof str - 1 - install (NAME("__TIME__"), T_TIME, 0, -1); - install (NAME("__DATE__"), T_DATE, 0, -1); - install (NAME("__FILE__"), T_FILE, 0, -1); - install (NAME("__BASE_FILE__"), T_BASE_FILE, 0, -1); - install (NAME("__LINE__"), T_SPECLINE, 0, -1); - install (NAME("__INCLUDE_LEVEL__"), T_INCLUDE_LEVEL, 0, -1); - install (NAME("__VERSION__"), T_VERSION, 0, -1); -#ifndef NO_BUILTIN_SIZE_TYPE - install (NAME("__SIZE_TYPE__"), T_CONST, SIZE_TYPE, -1); -#endif -#ifndef NO_BUILTIN_PTRDIFF_TYPE - install (NAME("__PTRDIFF_TYPE__ "), T_CONST, PTRDIFF_TYPE, -1); -#endif - install (NAME("__WCHAR_TYPE__"), T_CONST, WCHAR_TYPE, -1); - install (NAME("__USER_LABEL_PREFIX__"), T_CONST, user_label_prefix, -1); - install (NAME("__REGISTER_PREFIX__"), T_CONST, REGISTER_PREFIX, -1); - if (!CPP_TRADITIONAL (pfile)) + if (token == CPP_STRING) { - install (NAME("__STDC__"), T_STDC, 0, -1); -#if 0 - if (CPP_OPTIONS (pfile)->c9x) - install (NAME("__STDC_VERSION__"),T_CONST, "199909L", -1); - else -#endif - install (NAME("__STDC_VERSION__"),T_CONST, "199409L", -1); + if (pfile->token_buffer[old_written] == '<') + angle_brackets = 1; } -#undef NAME - - if (CPP_OPTIONS (pfile)->debug_output) +#ifdef VMS + else if (token == CPP_NAME) { - dump_special_to_buffer (pfile, "__BASE_FILE__"); - dump_special_to_buffer (pfile, "__VERSION__"); -#ifndef NO_BUILTIN_SIZE_TYPE - dump_special_to_buffer (pfile, "__SIZE_TYPE__"); -#endif -#ifndef NO_BUILTIN_PTRDIFF_TYPE - dump_special_to_buffer (pfile, "__PTRDIFF_TYPE__"); + /* Support '#include xyz' like VAX-C. It is taken as + '#include ' and generates a warning. */ + cpp_warning (pfile, + "`#include filename' is obsolete, use `#include '"); + angle_brackets = 1; + + /* Append the missing `.h' to the name. */ + CPP_PUTS (pfile, ".h", 2); + } #endif - dump_special_to_buffer (pfile, "__WCHAR_TYPE__"); - dump_special_to_buffer (pfile, "__DATE__"); - dump_special_to_buffer (pfile, "__TIME__"); - if (!CPP_TRADITIONAL (pfile)) - dump_special_to_buffer (pfile, "__STDC__"); + else + { + cpp_error (pfile, + "`#%s' expects \"FILENAME\" or ", keyword->name); + CPP_SET_WRITTEN (pfile, old_written); + skip_rest_of_line (pfile); + return 0; } -} - -/* Return 1 iff a token ending in C1 followed directly by a token C2 - could cause mis-tokenization. */ -static int -unsafe_chars (c1, c2) - int c1, c2; -{ - switch (c1) + flen = CPP_WRITTEN (pfile) - old_written; + ftok = (unsigned char *) alloca (flen + 1); + memcpy (ftok, pfile->token_buffer + old_written, flen); + ftok[flen] = '\0'; + + if (get_directive_token (pfile) != CPP_VSPACE) { - case '+': case '-': - if (c2 == c1 || c2 == '=') - return 1; - goto letter; - case '.': - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': - case 'e': case 'E': case 'p': case 'P': - if (c2 == '-' || c2 == '+') - return 1; /* could extend a pre-processing number */ - goto letter; - case 'L': - if (c2 == '\'' || c2 == '\"') - return 1; /* Could turn into L"xxx" or L'xxx'. */ - goto letter; - letter: - case '_': - case 'a': case 'b': case 'c': case 'd': case 'f': - case 'g': case 'h': case 'i': case 'j': case 'k': case 'l': - case 'm': case 'n': case 'o': case 'q': case 'r': - case 's': case 't': case 'u': case 'v': case 'w': case 'x': - case 'y': case 'z': - case 'A': case 'B': case 'C': case 'D': case 'F': - case 'G': case 'H': case 'I': case 'J': case 'K': - case 'M': case 'N': case 'O': case 'Q': case 'R': - case 'S': case 'T': case 'U': case 'V': case 'W': case 'X': - case 'Y': case 'Z': - /* We're in the middle of either a name or a pre-processing number. */ - return (is_idchar[c2] || c2 == '.'); - case '<': case '>': case '!': case '%': case '#': case ':': - case '^': case '&': case '|': case '*': case '/': case '=': - return (c2 == c1 || c2 == '='); + cpp_error (pfile, "junk at end of `#include'"); + skip_rest_of_line (pfile); } - return 0; -} -/* Expand a macro call. - HP points to the symbol that is the macro being called. - Put the result of expansion onto the input stack - so that subsequent input by our caller will use it. + CPP_SET_WRITTEN (pfile, old_written); - If macro wants arguments, caller has already verified that - an argument list follows; arguments come from the input stack. */ + if (flen == 0) + { + cpp_error (pfile, "empty file name in `#%s'", keyword->name); + return 0; + } -static void -macroexpand (pfile, hp) - cpp_reader *pfile; - HASHNODE *hp; -{ - int nargs; - DEFINITION *defn; - register U_CHAR *xbuf; - long start_line, start_column; - int xbuf_len; - struct argdata *args; - long old_written = CPP_WRITTEN (pfile); -#if 0 - int start_line = instack[indepth].lineno; + if (CPP_OPTIONS (pfile)->dump_includes) + pass_thru_directive (ftok, + flen +#ifdef VMS + - ((token == CPP_NAME) ? 2 : 0) #endif - int rest_args, rest_zero; - register int i; + , pfile, keyword); -#if 0 - CHECK_DEPTH (return;); +#ifdef VMS + if (token == CPP_STRING) #endif + { + ftok++; + flen -= 2; + ftok[flen] = '\0'; + } -#if 0 - /* This macro is being used inside a #if, which means it must be */ - /* recorded as a precondition. */ - if (pcp_inside_if && pcp_outfile && defn->predefined) - dump_single_macro (hp, pcp_outfile); -#endif + search_start = 0; - cpp_buf_line_and_col (cpp_file_buffer (pfile), &start_line, &start_column); + for (fp = CPP_BUFFER (pfile); + fp != CPP_NULL_BUFFER (pfile); + fp = CPP_PREV_BUFFER (fp)) + if (fp->fname != NULL) + break; - /* Check for and handle special symbols. */ - if (hp->type != T_MACRO) + if (fp == CPP_NULL_BUFFER (pfile)) { - special_symbol (hp, pfile); - xbuf_len = CPP_WRITTEN (pfile) - old_written; - xbuf = (U_CHAR *) xmalloc (xbuf_len + 1); - CPP_SET_WRITTEN (pfile, old_written); - bcopy (CPP_PWRITTEN (pfile), xbuf, xbuf_len + 1); - push_macro_expansion (pfile, xbuf, xbuf_len, hp); - return; + cpp_ice (pfile, "fp == NULL_BUFFER in do_include"); + return 0; } - - defn = hp->value.defn; - nargs = defn->nargs; - pfile->output_escapes++; - - if (nargs >= 0) + + /* For #include_next, skip in the search path past the dir in which the + containing file was found. Treat files specified using an absolute path + as if there are no more directories to search. Treat the primary source + file like any other included source, but generate a warning. */ + if (skip_dirs && CPP_PREV_BUFFER(fp) != CPP_NULL_BUFFER (pfile)) { - enum cpp_token token; - - args = (struct argdata *) alloca ((nargs + 1) * sizeof (struct argdata)); - - for (i = 0; i < nargs; i++) - { - args[i].raw = args[i].expanded = 0; - args[i].raw_length = 0; - args[i].expand_length = args[i].stringified_length = -1; - args[i].use_count = 0; - } - - /* Parse all the macro args that are supplied. I counts them. - The first NARGS args are stored in ARGS. - The rest are discarded. If rest_args is set then we assume - macarg absorbed the rest of the args. */ - i = 0; - rest_args = 0; - rest_args = 0; - FORWARD(1); /* Discard the open-parenthesis before the first arg. */ - do - { - if (rest_args) - continue; - if (i < nargs || (nargs == 0 && i == 0)) - { - /* if we are working on last arg which absorbs rest of args... */ - if (i == nargs - 1 && defn->rest_args) - rest_args = 1; - args[i].raw = CPP_WRITTEN (pfile); - token = macarg (pfile, rest_args); - args[i].raw_length = CPP_WRITTEN (pfile) - args[i].raw; - args[i].newlines = 0; /* FIXME */ - } - else - token = macarg (pfile, 0); - if (token == CPP_EOF || token == CPP_POP) + if (fp->ihash->foundhere != ABSOLUTE_PATH) + search_start = fp->ihash->foundhere->next; + } + else + { + if (skip_dirs) + cpp_warning (pfile, "#include_next in primary source file"); + + if (angle_brackets) + search_start = CPP_OPTIONS (pfile)->bracket_include; + else + { + if (!CPP_OPTIONS (pfile)->ignore_srcdir) { - cpp_error_with_line (pfile, start_line, start_column, - "unterminated macro call"); - return; + if (fp) + search_start = fp->actual_dir; } - i++; - } while (token == CPP_COMMA); - - /* If we got one arg but it was just whitespace, call that 0 args. */ - if (i == 1) - { - register U_CHAR *bp = ARG_BASE + args[0].raw; - register U_CHAR *lim = bp + args[0].raw_length; - /* cpp.texi says for foo ( ) we provide one argument. - However, if foo wants just 0 arguments, treat this as 0. */ - if (nargs == 0) - while (bp != lim && is_space[*bp]) bp++; - if (bp == lim) - i = 0; - } - - /* Don't output an error message if we have already output one for - a parse error above. */ - rest_zero = 0; - if (nargs == 0 && i > 0) - { - cpp_error (pfile, "arguments given to macro `%s'", hp->name); - } - else if (i < nargs) - { - /* traditional C allows foo() if foo wants one argument. */ - if (nargs == 1 && i == 0 && CPP_TRADITIONAL (pfile)) - ; - /* the rest args token is allowed to absorb 0 tokens */ - else if (i == nargs - 1 && defn->rest_args) - rest_zero = 1; - else if (i == 0) - cpp_error (pfile, "macro `%s' used without args", hp->name); - else if (i == 1) - cpp_error (pfile, "macro `%s' used with just one arg", hp->name); else - cpp_error (pfile, "macro `%s' used with only %d args", - hp->name, i); - } - else if (i > nargs) - { - cpp_error (pfile, - "macro `%s' used with too many (%d) args", hp->name, i); + search_start = CPP_OPTIONS (pfile)->quote_include; } } - /* If macro wants zero args, we parsed the arglist for checking only. - Read directly from the macro definition. */ - if (nargs <= 0) + if (!search_start) { - xbuf = defn->expansion; - xbuf_len = defn->length; + cpp_error (pfile, "No include path in which to find %s", ftok); + return 0; } - else - { - register U_CHAR *exp = defn->expansion; - register int offset; /* offset in expansion, - copied a piece at a time */ - register int totlen; /* total amount of exp buffer filled so far */ - - register struct reflist *ap, *last_ap; - - /* Macro really takes args. Compute the expansion of this call. */ - - /* Compute length in characters of the macro's expansion. - Also count number of times each arg is used. */ - xbuf_len = defn->length; - for (ap = defn->pattern; ap != NULL; ap = ap->next) - { - if (ap->stringify) - { - register struct argdata *arg = &args[ap->argno]; - /* Stringify if it hasn't already been */ - if (arg->stringified_length < 0) - { - int arglen = arg->raw_length; - int escaped = 0; - int in_string = 0; - int c; - /* Initially need_space is -1. Otherwise, 1 means the - previous character was a space, but we suppressed it; - 0 means the previous character was a non-space. */ - int need_space = -1; - i = 0; - arg->stringified = CPP_WRITTEN (pfile); - if (!CPP_TRADITIONAL (pfile)) - CPP_PUTC (pfile, '\"'); /* insert beginning quote */ - for (; i < arglen; i++) - { - c = (ARG_BASE + arg->raw)[i]; - if (! in_string) - { - /* Internal sequences of whitespace are replaced by - one space except within an string or char token.*/ - if (is_space[c]) - { - if (CPP_WRITTEN (pfile) > (unsigned)arg->stringified - && (CPP_PWRITTEN (pfile))[-1] == '@') - { - /* "@ " escape markers are removed */ - CPP_ADJUST_WRITTEN (pfile, -1); - continue; - } - if (need_space == 0) - need_space = 1; - continue; - } - else if (need_space > 0) - CPP_PUTC (pfile, ' '); - need_space = 0; - } - - if (escaped) - escaped = 0; - else - { - if (c == '\\') - escaped = 1; - if (in_string) - { - if (c == in_string) - in_string = 0; - } - else if (c == '\"' || c == '\'') - in_string = c; - } - - /* Escape these chars */ - if (c == '\"' || (in_string && c == '\\')) - CPP_PUTC (pfile, '\\'); - if (ISPRINT (c)) - CPP_PUTC (pfile, c); - else - { - CPP_RESERVE (pfile, 4); - sprintf ((char *)CPP_PWRITTEN (pfile), "\\%03o", - (unsigned int) c); - CPP_ADJUST_WRITTEN (pfile, 4); - } - } - if (!CPP_TRADITIONAL (pfile)) - CPP_PUTC (pfile, '\"'); /* insert ending quote */ - arg->stringified_length - = CPP_WRITTEN (pfile) - arg->stringified; - } - xbuf_len += args[ap->argno].stringified_length; - } - else if (ap->raw_before || ap->raw_after || CPP_TRADITIONAL (pfile)) - /* Add 4 for two newline-space markers to prevent - token concatenation. */ - xbuf_len += args[ap->argno].raw_length + 4; - else - { - /* We have an ordinary (expanded) occurrence of the arg. - So compute its expansion, if we have not already. */ - if (args[ap->argno].expand_length < 0) - { - args[ap->argno].expanded = CPP_WRITTEN (pfile); - cpp_expand_to_buffer (pfile, - ARG_BASE + args[ap->argno].raw, - args[ap->argno].raw_length); - - args[ap->argno].expand_length - = CPP_WRITTEN (pfile) - args[ap->argno].expanded; - } - - /* Add 4 for two newline-space markers to prevent - token concatenation. */ - xbuf_len += args[ap->argno].expand_length + 4; - } - if (args[ap->argno].use_count < 10) - args[ap->argno].use_count++; - } - - xbuf = (U_CHAR *) xmalloc (xbuf_len + 1); - - /* Generate in XBUF the complete expansion - with arguments substituted in. - TOTLEN is the total size generated so far. - OFFSET is the index in the definition - of where we are copying from. */ - offset = totlen = 0; - for (last_ap = NULL, ap = defn->pattern; ap != NULL; - last_ap = ap, ap = ap->next) - { - register struct argdata *arg = &args[ap->argno]; - int count_before = totlen; - - /* Add chars to XBUF. */ - for (i = 0; i < ap->nchars; i++, offset++) - xbuf[totlen++] = exp[offset]; - - /* If followed by an empty rest arg with concatenation, - delete the last run of nonwhite chars. */ - if (rest_zero && totlen > count_before - && ((ap->rest_args && ap->raw_before) - || (last_ap != NULL && last_ap->rest_args - && last_ap->raw_after))) - { - /* Delete final whitespace. */ - while (totlen > count_before && is_space[xbuf[totlen - 1]]) - totlen--; - - /* Delete the nonwhites before them. */ - while (totlen > count_before && ! is_space[xbuf[totlen - 1]]) - totlen--; - } - - if (ap->stringify != 0) - { - bcopy (ARG_BASE + arg->stringified, - xbuf + totlen, arg->stringified_length); - totlen += arg->stringified_length; - } - else if (ap->raw_before || ap->raw_after || CPP_TRADITIONAL (pfile)) - { - U_CHAR *p1 = ARG_BASE + arg->raw; - U_CHAR *l1 = p1 + arg->raw_length; - if (ap->raw_before) - { - while (p1 != l1 && is_space[*p1]) p1++; - while (p1 != l1 && is_idchar[*p1]) - xbuf[totlen++] = *p1++; - } - if (ap->raw_after) - { - /* Arg is concatenated after: delete trailing whitespace, - whitespace markers, and no-reexpansion markers. */ - while (p1 != l1) - { - if (is_space[l1[-1]]) l1--; - else if (l1[-1] == '@') - { - U_CHAR *p2 = l1 - 1; - /* If whitespace is preceded by an odd number - of `@' signs, the last `@' was a whitespace - marker; drop it too. */ - while (p2 != p1 && p2[0] == '@') p2--; - if ((l1 - p2) & 1) - l1--; - break; - } - else if (l1[-1] == '-') - { - U_CHAR *p2 = l1 - 1; - /* If a `-' is preceded by an odd number of - `@' signs then it and the last `@' are - a no-reexpansion marker. */ - while (p2 != p1 && p2[0] == '@') p2--; - if ((l1 - p2) & 1) - l1 -= 2; - else - break; - } - else break; - } - } - - /* Delete any no-reexpansion marker that precedes - an identifier at the beginning of the argument. */ - if (p1[0] == '@' && p1[1] == '-') - p1 += 2; - - bcopy (p1, xbuf + totlen, l1 - p1); - totlen += l1 - p1; - } - else - { - U_CHAR *expanded = ARG_BASE + arg->expanded; - if (!ap->raw_before && totlen > 0 && arg->expand_length - && !CPP_TRADITIONAL(pfile) - && unsafe_chars (xbuf[totlen-1], expanded[0])) - { - xbuf[totlen++] = '@'; - xbuf[totlen++] = ' '; - } - - bcopy (expanded, xbuf + totlen, arg->expand_length); - totlen += arg->expand_length; - - if (!ap->raw_after && totlen > 0 && offset < defn->length - && !CPP_TRADITIONAL(pfile) - && unsafe_chars (xbuf[totlen-1], exp[offset])) - { - xbuf[totlen++] = '@'; - xbuf[totlen++] = ' '; - } - - /* If a macro argument with newlines is used multiple times, - then only expand the newlines once. This avoids creating - output lines which don't correspond to any input line, - which confuses gdb and gcov. */ - if (arg->use_count > 1 && arg->newlines > 0) - { - /* Don't bother doing change_newlines for subsequent - uses of arg. */ - arg->use_count = 1; - arg->expand_length - = change_newlines (expanded, arg->expand_length); - } - } - - if (totlen > xbuf_len) - abort (); - } - - /* if there is anything left of the definition - after handling the arg list, copy that in too. */ - - for (i = offset; i < defn->length; i++) - { - /* if we've reached the end of the macro */ - if (exp[i] == ')') - rest_zero = 0; - if (! (rest_zero && last_ap != NULL && last_ap->rest_args - && last_ap->raw_after)) - xbuf[totlen++] = exp[i]; - } - - xbuf[totlen] = 0; - xbuf_len = totlen; - - } - - pfile->output_escapes--; - - /* Now put the expansion on the input stack - so our caller will commence reading from it. */ - push_macro_expansion (pfile, xbuf, xbuf_len, hp); - CPP_BUFFER (pfile)->has_escapes = 1; - - /* Pop the space we've used in the token_buffer for argument expansion. */ - CPP_SET_WRITTEN (pfile, old_written); - - /* Recursive macro use sometimes works traditionally. - #define foo(x,y) bar (x (y,0), y) - foo (foo, baz) */ - - if (!CPP_TRADITIONAL (pfile)) - hp->type = T_DISABLED; -} - -static void -push_macro_expansion (pfile, xbuf, xbuf_len, hp) - cpp_reader *pfile; - register U_CHAR *xbuf; - int xbuf_len; - HASHNODE *hp; -{ - register cpp_buffer *mbuf = cpp_push_buffer (pfile, xbuf, xbuf_len); - if (mbuf == NULL) - return; - mbuf->cleanup = macro_cleanup; - mbuf->data = hp; - - /* The first chars of the expansion should be a "@ " added by - collect_expansion. This is to prevent accidental token-pasting - between the text preceding the macro invocation, and the macro - expansion text. - - We would like to avoid adding unneeded spaces (for the sake of - tools that use cpp, such as imake). In some common cases we can - tell that it is safe to omit the space. - - The character before the macro invocation cannot have been an - idchar (or else it would have been pasted with the idchars of - the macro name). Therefore, if the first non-space character - of the expansion is an idchar, we do not need the extra space - to prevent token pasting. - - Also, we don't need the extra space if the first char is '(', - or some other (less common) characters. */ - - if (xbuf[0] == '@' && xbuf[1] == ' ' - && (is_idchar[xbuf[2]] || xbuf[2] == '(' || xbuf[2] == '\'' - || xbuf[2] == '\"')) - mbuf->cur += 2; - - /* Likewise, avoid the extra space at the end of the macro expansion - if this is safe. (We can do a better job here since we can know - what the next char will be.) */ - if (xbuf_len >= 3 - && mbuf->rlimit[-2] == '@' - && mbuf->rlimit[-1] == ' ') - { - int c1 = mbuf->rlimit[-3]; - int c2 = CPP_BUF_PEEK (CPP_PREV_BUFFER (CPP_BUFFER (pfile))); - if (c2 == EOF || ! unsafe_chars (c1, c2)) - mbuf->rlimit -= 2; - } -} - -/* Like cpp_get_token, except that it does not read past end-of-line. - Also, horizontal space is skipped, and macros are popped. */ - -static enum cpp_token -get_directive_token (pfile) - cpp_reader *pfile; -{ - for (;;) - { - long old_written = CPP_WRITTEN (pfile); - enum cpp_token token; - cpp_skip_hspace (pfile); - if (PEEKC () == '\n') - return CPP_VSPACE; - token = cpp_get_token (pfile); - switch (token) - { - case CPP_POP: - if (! CPP_IS_MACRO_BUFFER (CPP_BUFFER (pfile))) - return token; - /* ... else fall though ... */ - case CPP_HSPACE: case CPP_COMMENT: - CPP_SET_WRITTEN (pfile, old_written); - break; - default: - return token; - } - } -} - -/* Handle #include and #import. - This function expects to see "fname" or on the input. - - The input is normally in part of the output_buffer following - CPP_WRITTEN, and will get overwritten by output_line_command. - I.e. in input file specification has been popped by handle_directive. - This is safe. */ - -static int -do_include (pfile, keyword) - cpp_reader *pfile; - struct directive *keyword; -{ - int importing = (keyword->type == T_IMPORT); - int skip_dirs = (keyword->type == T_INCLUDE_NEXT); - int angle_brackets = 0; /* 0 for "...", 1 for <...> */ - int before; /* included before? */ - long flen; - char *fbeg, *fend; - cpp_buffer *fp; - - enum cpp_token token; - - /* Chain of dirs to search */ - struct include_hash *ihash; - struct file_name_list *search_start; - - long old_written = CPP_WRITTEN (pfile); - - int fd; - - if (CPP_PEDANTIC (pfile) && !CPP_BUFFER (pfile)->system_header_p) - { - if (importing) - cpp_pedwarn (pfile, "ANSI C does not allow `#import'"); - if (skip_dirs) - cpp_pedwarn (pfile, "ANSI C does not allow `#include_next'"); - } - - if (importing && CPP_OPTIONS (pfile)->warn_import - && !CPP_OPTIONS (pfile)->inhibit_warnings - && !CPP_BUFFER (pfile)->system_header_p && !pfile->import_warning) - { - pfile->import_warning = 1; - cpp_warning (pfile, "`#import' is obsolete, use an #ifndef wrapper in the header file"); - } - - pfile->parsing_include_directive++; - token = get_directive_token (pfile); - pfile->parsing_include_directive--; - - if (token == CPP_STRING) - { - fbeg = pfile->token_buffer + old_written + 1; - fend = CPP_PWRITTEN (pfile) - 1; - *fend = '\0'; - if (fbeg[-1] == '<') - angle_brackets = 1; - } -#ifdef VMS - else if (token == CPP_NAME) - { - /* Support '#include xyz' like VAX-C to allow for easy use of - * all the decwindow include files. It defaults to '#include - * ' and generates a warning. */ - cpp_warning (pfile, - "VAX-C-style include specification found, use '#include ' !"); - angle_brackets = 1; - - /* Append the missing `.h' to the name. */ - CPP_PUTS (pfile, ".h", 3) - CPP_NUL_TERMINATE_Q (pfile); - - fbeg = pfile->token_buffer + old_written; - fend = CPP_PWRITTEN (pfile); - } -#endif - else - { - cpp_error (pfile, - "`#%s' expects \"FILENAME\" or ", keyword->name); - CPP_SET_WRITTEN (pfile, old_written); - skip_rest_of_line (pfile); - return 0; - } - - token = get_directive_token (pfile); - if (token != CPP_VSPACE) - { - cpp_error (pfile, "junk at end of `#include'"); - skip_rest_of_line (pfile); - } - - CPP_SET_WRITTEN (pfile, old_written); - - flen = fend - fbeg; - - if (flen == 0) - { - cpp_error (pfile, "empty file name in `#%s'", keyword->name); - return 0; - } - - search_start = 0; - - for (fp = CPP_BUFFER (pfile); - fp != CPP_NULL_BUFFER (pfile); - fp = CPP_PREV_BUFFER (fp)) - if (fp->fname != NULL) - break; - - if (fp == CPP_NULL_BUFFER (pfile)) - { - cpp_fatal (pfile, "cpp internal error: fp == NULL_BUFFER in do_include"); - return 1; - } - - /* For #include_next, skip in the search path past the dir in which the - containing file was found. Treat files specified using an absolute path - as if there are no more directories to search. Treat the primary source - file like any other included source, but generate a warning. */ - if (skip_dirs && CPP_PREV_BUFFER(fp) != CPP_NULL_BUFFER (pfile)) - { - if (fp->ihash->foundhere != ABSOLUTE_PATH) - search_start = fp->ihash->foundhere->next; - } - else - { - if (skip_dirs) - cpp_warning (pfile, "#include_next in primary source file"); - - if (angle_brackets) - search_start = CPP_OPTIONS (pfile)->bracket_include; - else - { - if (!CPP_OPTIONS (pfile)->ignore_srcdir) - { - if (fp) - search_start = fp->actual_dir; - } - else - search_start = CPP_OPTIONS (pfile)->quote_include; - } - } - - if (!search_start) - { - cpp_error (pfile, "No include path in which to find %s", fbeg); - return 0; - } - - fd = find_include_file (pfile, fbeg, search_start, &ihash, &before); + fd = find_include_file (pfile, ftok, search_start, &ihash, &before); if (fd == -2) return 0; @@ -2802,7 +1214,7 @@ do_include (pfile, keyword) (pfile->system_include_depth > 0))) { if (!angle_brackets) - deps_output (pfile, fbeg, ' '); + deps_output (pfile, ftok, ' '); else { char *p; @@ -2815,13 +1227,13 @@ do_include (pfile, keyword) ptr = CPP_OPTIONS (pfile)->quote_include; p = (char *) alloca (strlen (ptr->name) - + strlen (fbeg) + 2); + + strlen (ftok) + 2); if (*ptr->name != '\0') { strcpy (p, ptr->name); strcat (p, "/"); } - strcat (p, fbeg); + strcat (p, ftok); deps_output (pfile, p, ' '); } } @@ -2834,9 +1246,9 @@ do_include (pfile, keyword) else if (CPP_PRINT_DEPS (pfile) && (CPP_PRINT_DEPS (pfile) <= (angle_brackets || (pfile->system_include_depth > 0)))) - cpp_warning (pfile, "No include path in which to find %s", fbeg); + cpp_warning (pfile, "No include path in which to find %s", ftok); else - cpp_error_from_errno (pfile, fbeg); + cpp_error_from_errno (pfile, ftok); return 0; } @@ -2871,13 +1283,41 @@ do_include (pfile, keyword) if (finclude (pfile, fd, ihash)) { - output_line_command (pfile, 0, enter_file); + output_line_command (pfile, enter_file); pfile->only_seen_white = 2; } return 0; } +/* Subroutine of do_line. Read next token from PFILE without adding it to + the output buffer. If it is a number between 1 and 4, store it in *NUM + and return 1; otherwise, return 0 and complain if we aren't at the end + of the directive. */ + +static int +read_line_number (pfile, num) + cpp_reader *pfile; + int *num; +{ + long save_written = CPP_WRITTEN (pfile); + U_CHAR *p = pfile->token_buffer + save_written; + enum cpp_token token = get_directive_token (pfile); + CPP_SET_WRITTEN (pfile, save_written); + + if (token == CPP_NUMBER && *p >= '1' && *p <= '4' && p[1] == '\0') + { + *num = p[0] - '0'; + return 1; + } + else + { + if (token != CPP_VSPACE && token != CPP_EOF && token != CPP_POP) + cpp_error (pfile, "invalid format `#line' command"); + return 0; + } +} + /* Interpret #line command. Note that the filename string (if any) is treated as if it were an include filename. That means no escape handling. */ @@ -2885,7 +1325,7 @@ do_include (pfile, keyword) static int do_line (pfile, keyword) cpp_reader *pfile; - struct directive *keyword ATTRIBUTE_UNUSED; + const struct directive *keyword ATTRIBUTE_UNUSED; { cpp_buffer *ip = CPP_BUFFER (pfile); int new_lineno; @@ -2919,41 +1359,32 @@ do_line (pfile, keyword) { U_CHAR *fname = pfile->token_buffer + old_written + 1; U_CHAR *end_name = CPP_PWRITTEN (pfile) - 1; - long num_start = CPP_WRITTEN (pfile); + int action_number = 0; - token = get_directive_token (pfile); - if (token != CPP_VSPACE && token != CPP_EOF && token != CPP_POP) + if (read_line_number (pfile, &action_number)) { - U_CHAR *p = pfile->token_buffer + num_start; if (CPP_PEDANTIC (pfile)) cpp_pedwarn (pfile, "garbage at end of `#line' command"); - if (token != CPP_NUMBER || *p < '0' || *p > '4' || p[1] != '\0') + if (action_number == 1) { - cpp_error (pfile, "invalid format `#line' command"); - goto bad_line_directive; + file_change = enter_file; + read_line_number (pfile, &action_number); } - if (*p == '1') - file_change = enter_file; - else if (*p == '2') - file_change = leave_file; - else if (*p == '3') - ip->system_header_p = 1; - else /* if (*p == '4') */ - ip->system_header_p = 2; - - CPP_SET_WRITTEN (pfile, num_start); - token = get_directive_token (pfile); - p = pfile->token_buffer + num_start; - if (token == CPP_NUMBER && p[1] == '\0' && (*p == '3' || *p== '4')) + else if (action_number == 2) + { + file_change = leave_file; + read_line_number (pfile, &action_number); + } + if (action_number == 3) { - ip->system_header_p = *p == '3' ? 1 : 2; - token = get_directive_token (pfile); + ip->system_header_p = 1; + read_line_number (pfile, &action_number); } - if (token != CPP_VSPACE) + if (action_number == 4) { - cpp_error (pfile, "invalid format `#line' command"); - goto bad_line_directive; + ip->system_header_p = 2; + read_line_number (pfile, &action_number); } } @@ -2961,7 +1392,7 @@ do_line (pfile, keyword) if (strcmp (fname, ip->nominal_fname)) { - char *newname, *oldname; + const char *newname, *oldname; if (!strcmp (fname, ip->fname)) newname = ip->fname; else if (ip->last_nominal_fname @@ -2975,8 +1406,9 @@ do_line (pfile, keyword) if (ip->last_nominal_fname && ip->last_nominal_fname != oldname - && ip->last_nominal_fname != newname) - free (ip->last_nominal_fname); + && ip->last_nominal_fname != newname + && ip->last_nominal_fname != ip->fname) + free ((void *) ip->last_nominal_fname); if (newname == ip->fname) ip->last_nominal_fname = NULL; @@ -2995,7 +1427,7 @@ do_line (pfile, keyword) we must store a line number now that is one less. */ ip->lineno = new_lineno - 1; CPP_SET_WRITTEN (pfile, old_written); - output_line_command (pfile, 0, file_change); + output_line_command (pfile, file_change); return 0; bad_line_directive: @@ -3010,7 +1442,7 @@ do_line (pfile, keyword) static int do_undef (pfile, keyword) cpp_reader *pfile; - struct directive *keyword; + const struct directive *keyword; { int sym_length; HASHNODE *hp; @@ -3021,7 +1453,7 @@ do_undef (pfile, keyword) cpp_skip_hspace (pfile); c = GETC(); - if (! is_idstart[c]) + if (! is_idstart(c)) { cpp_error (pfile, "token after #undef is not an identifier"); skip_rest_of_line (pfile); @@ -3033,7 +1465,7 @@ do_undef (pfile, keyword) limit = CPP_PWRITTEN(pfile); /* Copy out the token so we can pop the token buffer. */ - name = alloca (limit - buf + 1); + name = (U_CHAR *) alloca (limit - buf + 1); bcopy(buf, name, limit - buf); name[limit - buf] = '\0'; @@ -3046,42 +1478,46 @@ do_undef (pfile, keyword) CPP_SET_WRITTEN (pfile, here); -#if 0 - /* If this is a precompiler run (with -pcp) pass thru #undef commands. */ - if (pcp_outfile && keyword) - pass_thru_directive (buf, limit, pfile, keyword); -#endif - - sym_length = check_macro_name (pfile, buf, 0); + sym_length = check_macro_name (pfile, buf); - while ((hp = cpp_lookup (pfile, name, sym_length, -1)) != NULL) + while ((hp = cpp_lookup (pfile, name, sym_length)) != NULL) { /* If we are generating additional info for debugging (with -g) we need to pass through all effective #undef commands. */ if (CPP_OPTIONS (pfile)->debug_output && keyword) - pass_thru_directive (name, name+sym_length, pfile, keyword); - if (hp->type != T_MACRO) - cpp_warning (pfile, "undefining `%s'", hp->name); - delete_macro (hp); + pass_thru_directive (name, sym_length, pfile, keyword); + if (hp->type == T_POISON) + cpp_error (pfile, "cannot undefine poisoned `%s'", hp->name); + else + { + if (hp->type != T_MACRO) + cpp_warning (pfile, "undefining `%s'", hp->name); + delete_macro (hp); + } } return 0; } /* Wrap do_undef for -U processing. */ -static void +void cpp_undef (pfile, macro) cpp_reader *pfile; U_CHAR *macro; { - if (cpp_push_buffer (pfile, macro, strlen(macro))) + /* Copy the string so we can append a newline. */ + size_t len = strlen (macro); + U_CHAR *buf = alloca (len + 2); + memcpy (buf, macro, len); + buf[len] = '\n'; + buf[len + 1] = '\0'; + if (cpp_push_buffer (pfile, buf, len + 1)) { - do_undef (pfile, NULL); - cpp_pop_buffer (pfile); + do_undef (pfile, NULL); + cpp_pop_buffer (pfile); } } - /* * Report an error detected by the program we are processing. * Use the text of the line in the error message. @@ -3091,7 +1527,7 @@ cpp_undef (pfile, macro) static int do_error (pfile, keyword) cpp_reader *pfile; - struct directive *keyword ATTRIBUTE_UNUSED; + const struct directive *keyword ATTRIBUTE_UNUSED; { long here = CPP_WRITTEN (pfile); U_CHAR *text; @@ -3112,7 +1548,7 @@ do_error (pfile, keyword) static int do_warning (pfile, keyword) cpp_reader *pfile; - struct directive *keyword ATTRIBUTE_UNUSED; + const struct directive *keyword ATTRIBUTE_UNUSED; { U_CHAR *text; long here = CPP_WRITTEN(pfile); @@ -3130,18 +1566,23 @@ do_warning (pfile, keyword) return 0; } -/* Report program identification. */ +/* Report program identification. + This is not precisely what cccp does with #ident, however I believe + it matches `closely enough' (behavior is identical as long as there + are no macros on the #ident line, which is pathological in my opinion). */ static int do_ident (pfile, keyword) cpp_reader *pfile; - struct directive *keyword ATTRIBUTE_UNUSED; + const struct directive *keyword ATTRIBUTE_UNUSED; { /* Allow #ident in system headers, since that's not user's fault. */ if (CPP_PEDANTIC (pfile) && !CPP_BUFFER (pfile)->system_header_p) cpp_pedwarn (pfile, "ANSI C does not allow `#ident'"); - skip_rest_of_line (pfile); /* Correct? Appears to match cccp. */ + CPP_PUTS (pfile, "#ident ", 7); + cpp_skip_hspace (pfile); + copy_rest_of_line (pfile); return 0; } @@ -3152,14 +1593,17 @@ do_ident (pfile, keyword) static int do_pragma (pfile, keyword) cpp_reader *pfile; - struct directive *keyword ATTRIBUTE_UNUSED; + const struct directive *keyword ATTRIBUTE_UNUSED; { - long here = CPP_WRITTEN (pfile); + long here; U_CHAR *buf; + + CPP_PUTS (pfile, "#pragma ", 8); + cpp_skip_hspace (pfile); + here = CPP_WRITTEN (pfile); copy_rest_of_line (pfile); buf = pfile->token_buffer + here; - SKIP_WHITE_SPACE (buf); if (!strncmp (buf, "once", 4)) { @@ -3183,8 +1627,7 @@ do_pragma (pfile, keyword) else ip->ihash->control_macro = ""; /* never repeat */ } - - if (!strncmp (buf, "implementation", 14)) + else if (!strncmp (buf, "implementation", 14)) { /* Be quiet about `#pragma implementation' for a file only if it hasn't been included yet. */ @@ -3197,7 +1640,7 @@ do_pragma (pfile, keyword) fname = p + 1; p = (U_CHAR *) index (fname, '\"'); - fcopy = alloca (p - fname + 1); + fcopy = (U_CHAR *) alloca (p - fname + 1); bcopy (fname, fcopy, p - fname); fcopy[p-fname] = '\0'; @@ -3207,6 +1650,65 @@ do_pragma (pfile, keyword) "`#pragma implementation' for `%s' appears after file is included", fcopy); } + else if (!strncmp (buf, "poison", 6)) + { + /* Poison these symbols so that all subsequent usage produces an + error message. */ + U_CHAR *p = buf + 6; + size_t plen; + U_CHAR *syms; + int writeit; + + SKIP_WHITE_SPACE (p); + plen = strlen(p) + 1; + + syms = (U_CHAR *) alloca (plen); + memcpy (syms, p, plen); + + /* As a rule, don't include #pragma poison commands in output, + unless the user asks for them. */ + writeit = (CPP_OPTIONS (pfile)->debug_output + || CPP_OPTIONS (pfile)->dump_macros == dump_definitions + || CPP_OPTIONS (pfile)->dump_macros == dump_names); + + if (writeit) + CPP_SET_WRITTEN (pfile, here); + else + CPP_SET_WRITTEN (pfile, here-8); + + if (writeit) + { + CPP_RESERVE (pfile, plen + 7); + CPP_PUTS_Q (pfile, "poison", 7); + } + + while (*syms != '\0') + { + U_CHAR *end = syms; + + while (is_idchar(*end)) + end++; + + if (!is_hspace(*end) && *end != '\0') + { + cpp_error (pfile, "invalid #pragma poison directive"); + return 1; + } + + if (cpp_push_buffer (pfile, syms, end - syms) != NULL) + { + do_define (pfile, keyword); + cpp_pop_buffer (pfile); + } + if (writeit) + { + CPP_PUTC_Q (pfile, ' '); + CPP_PUTS_Q (pfile, syms, end - syms); + } + syms = end; + SKIP_WHITE_SPACE (syms); + } + } return 0; } @@ -3217,7 +1719,7 @@ do_pragma (pfile, keyword) static int do_sccs (pfile, keyword) cpp_reader *pfile; - struct directive *keyword ATTRIBUTE_UNUSED; + const struct directive *keyword ATTRIBUTE_UNUSED; { if (CPP_PEDANTIC (pfile)) cpp_pedwarn (pfile, "ANSI C does not allow `#sccs'"); @@ -3226,6 +1728,81 @@ do_sccs (pfile, keyword) } #endif + +/* We've found an `#if' directive. If the only thing before it in + this file is white space, and if it is of the form + `#if ! defined SYMBOL', then SYMBOL is a possible controlling macro + for inclusion of this file. (See redundant_include_p in cppfiles.c + for an explanation of controlling macros.) If so, return a + malloc'd copy of SYMBOL. Otherwise, return NULL. */ + +static U_CHAR * +detect_if_not_defined (pfile) + cpp_reader *pfile; +{ + U_CHAR *control_macro = 0; + + if (pfile->only_seen_white == 2) + { + char *ident; + enum cpp_token token; + int base_offset; + int token_offset; + int need_rparen = 0; + + /* Save state required for restore. */ + pfile->no_macro_expand++; + parse_set_mark (pfile); + base_offset = CPP_WRITTEN (pfile); + + /* Look for `!', */ + if (get_directive_token (pfile) != CPP_OTHER + || CPP_WRITTEN (pfile) != (size_t) base_offset + 1 + || CPP_PWRITTEN (pfile)[-1] != '!') + goto restore; + + /* ...then `defined', */ + token_offset = CPP_WRITTEN (pfile); + token = get_directive_token (pfile); + if (token != CPP_NAME) + goto restore; + ident = pfile->token_buffer + token_offset; + CPP_NUL_TERMINATE (pfile); + if (strcmp (ident, "defined")) + goto restore; + + /* ...then an optional '(' and the name, */ + token_offset = CPP_WRITTEN (pfile); + token = get_directive_token (pfile); + if (token == CPP_LPAREN) + { + token_offset = CPP_WRITTEN (pfile); + token = get_directive_token (pfile); + if (token != CPP_NAME) + goto restore; + need_rparen = 1; + } + else if (token != CPP_NAME) + goto restore; + + ident = pfile->token_buffer + token_offset; + CPP_NUL_TERMINATE (pfile); + + /* ...then the ')', if necessary, */ + if ((!need_rparen || get_directive_token (pfile) == CPP_RPAREN) + /* ...and make sure there's nothing else on the line. */ + && get_directive_token (pfile) == CPP_VSPACE) + control_macro = xstrdup (ident); + + restore: + CPP_SET_WRITTEN (pfile, base_offset); + pfile->no_macro_expand--; + parse_goto_mark (pfile); + } + + return control_macro; +} + /* * handle #if command by * 1) inserting special `defined' keyword into the hash table @@ -3242,10 +1819,11 @@ do_sccs (pfile, keyword) static int do_if (pfile, keyword) cpp_reader *pfile; - struct directive *keyword ATTRIBUTE_UNUSED; + const struct directive *keyword ATTRIBUTE_UNUSED; { - HOST_WIDE_INT value = eval_if_expression (pfile); - conditional_skip (pfile, value == 0, T_IF, NULL_PTR); + U_CHAR *control_macro = detect_if_not_defined (pfile); + HOST_WIDEST_INT value = eval_if_expression (pfile); + conditional_skip (pfile, value == 0, T_IF, control_macro); return 0; } @@ -3257,37 +1835,37 @@ do_if (pfile, keyword) static int do_elif (pfile, keyword) cpp_reader *pfile; - struct directive *keyword ATTRIBUTE_UNUSED; + const struct directive *keyword ATTRIBUTE_UNUSED; { - if (pfile->if_stack == CPP_BUFFER (pfile)->if_stack) { - cpp_error (pfile, "`#elif' not within a conditional"); - return 0; - } else { - if (pfile->if_stack->type != T_IF && pfile->if_stack->type != T_ELIF) { - cpp_error (pfile, "`#elif' after `#else'"); -#if 0 - fprintf (stderr, " (matches line %d", pfile->if_stack->lineno); -#endif - if (pfile->if_stack->fname != NULL && CPP_BUFFER (pfile)->fname != NULL - && strcmp (pfile->if_stack->fname, - CPP_BUFFER (pfile)->nominal_fname) != 0) - fprintf (stderr, ", file %s", pfile->if_stack->fname); - fprintf (stderr, ")\n"); + if (pfile->if_stack == CPP_BUFFER (pfile)->if_stack) + { + cpp_error (pfile, "`#elif' not within a conditional"); + return 0; + } + else + { + if (pfile->if_stack->type != T_IF && pfile->if_stack->type != T_ELIF) + { + cpp_error (pfile, "`#elif' after `#else'"); + cpp_error_with_line (pfile, pfile->if_stack->lineno, -1, + "the conditional began here"); + } + pfile->if_stack->type = T_ELIF; } - pfile->if_stack->type = T_ELIF; - } if (pfile->if_stack->if_succeeded) skip_if_group (pfile); - else { - HOST_WIDE_INT value = eval_if_expression (pfile); - if (value == 0) - skip_if_group (pfile); - else { - ++pfile->if_stack->if_succeeded; /* continue processing input */ - output_line_command (pfile, 1, same_file); + else + { + HOST_WIDEST_INT value = eval_if_expression (pfile); + if (value == 0) + skip_if_group (pfile); + else + { + ++pfile->if_stack->if_succeeded; /* continue processing input */ + output_line_command (pfile, same_file); + } } - } return 0; } @@ -3296,17 +1874,20 @@ do_elif (pfile, keyword) * then parse the result as a C expression and return the value as an int. */ -static HOST_WIDE_INT +static HOST_WIDEST_INT eval_if_expression (pfile) cpp_reader *pfile; { - HOST_WIDE_INT value; + HOST_WIDEST_INT value; long old_written = CPP_WRITTEN (pfile); - pfile->pcp_inside_if = 1; + /* Work around bug in cpp_get_token where it may mistake an + assertion for a directive. */ + pfile->only_seen_white = 0; + value = cpp_parse_expr (pfile); - pfile->pcp_inside_if = 0; + skip_rest_of_line (pfile); CPP_SET_WRITTEN (pfile, old_written); /* Pop */ return value; @@ -3321,7 +1902,7 @@ eval_if_expression (pfile) static int do_xifdef (pfile, keyword) cpp_reader *pfile; - struct directive *keyword; + const struct directive *keyword; { int skip; cpp_buffer *ip = CPP_BUFFER (pfile); @@ -3352,13 +1933,18 @@ do_xifdef (pfile, keyword) } else if (token == CPP_NAME) { - HASHNODE *hp = cpp_lookup (pfile, ident, ident_length, -1); + HASHNODE *hp = cpp_lookup (pfile, ident, ident_length); skip = (hp == NULL) ^ (keyword->type == T_IFNDEF); if (start_of_file && !skip) { control_macro = (U_CHAR *) xmalloc (ident_length + 1); bcopy (ident, control_macro, ident_length + 1); } + if (hp != NULL && hp->type == T_POISON) + { + cpp_error (pfile, "attempt to use poisoned `%s'", hp->name); + skip = !skip; + } } else { @@ -3376,20 +1962,6 @@ do_xifdef (pfile, keyword) } skip_rest_of_line (pfile); -#if 0 - if (pcp_outfile) { - /* Output a precondition for this macro. */ - if (hp && hp->value.defn->predefined) - fprintf (pcp_outfile, "#define %s\n", hp->name); - else { - U_CHAR *cp = buf; - fprintf (pcp_outfile, "#undef "); - while (is_idchar[*cp]) /* Ick! */ - fputc (*cp++, pcp_outfile); - putc ('\n', pcp_outfile); - } -#endif - conditional_skip (pfile, skip, T_IF, control_macro); return 0; } @@ -3410,9 +1982,7 @@ conditional_skip (pfile, skip, type, control_macro) temp = (IF_STACK_FRAME *) xcalloc (1, sizeof (IF_STACK_FRAME)); temp->fname = CPP_BUFFER (pfile)->nominal_fname; -#if 0 temp->lineno = CPP_BUFFER (pfile)->lineno; -#endif temp->next = pfile->if_stack; temp->control_macro = control_macro; pfile->if_stack = temp; @@ -3424,7 +1994,7 @@ conditional_skip (pfile, skip, type, control_macro) return; } else { ++pfile->if_stack->if_succeeded; - output_line_command (pfile, 1, same_file); + output_line_command (pfile, same_file); } } @@ -3439,7 +2009,7 @@ consider_directive_while_skipping (pfile, stack) IF_STACK_FRAME *stack; { long ident_len, ident; - struct directive *kt; + const struct directive *kt; IF_STACK_FRAME *temp; cpp_skip_hspace (pfile); @@ -3466,13 +2036,10 @@ consider_directive_while_skipping (pfile, stack) return 0; case T_ELSE: - if (CPP_PEDANTIC (pfile) && pfile->if_stack != stack) + if (pfile->if_stack != stack) validate_else (pfile, "#else"); /* fall through */ case T_ELIF: - if (pfile->if_stack->type == T_ELSE) - cpp_error (pfile, "`%s' after `#else'", kt->name); - if (pfile->if_stack == stack) return 1; else @@ -3482,7 +2049,7 @@ consider_directive_while_skipping (pfile, stack) } case T_ENDIF: - if (CPP_PEDANTIC (pfile) && pfile->if_stack != stack) + if (pfile->if_stack != stack) validate_else (pfile, "#endif"); if (pfile->if_stack == stack) @@ -3519,7 +2086,7 @@ skip_if_group (pfile) { CPP_PUTS (pfile, "#failed\n", 8); pfile->lineno++; - output_line_command (pfile, 1, same_file); + output_line_command (pfile, same_file); } old_written = CPP_WRITTEN (pfile); @@ -3535,6 +2102,7 @@ skip_if_group (pfile) { if (CPP_OPTIONS (pfile)->output_conditionals) CPP_PUTC (pfile, c); + CPP_BUMP_LINE (pfile); continue; } else if (c == '#') @@ -3564,7 +2132,11 @@ skip_if_group (pfile) { /* \n */ if (CPP_OPTIONS (pfile)->output_conditionals) - CPP_PUTC (pfile, c); + { + CPP_PUTC (pfile, c); + pfile->lineno++; + } + CPP_BUMP_LINE (pfile); } } @@ -3589,38 +2161,38 @@ skip_if_group (pfile) static int do_else (pfile, keyword) cpp_reader *pfile; - struct directive *keyword ATTRIBUTE_UNUSED; + const struct directive *keyword ATTRIBUTE_UNUSED; { - cpp_buffer *ip = CPP_BUFFER (pfile); - - if (CPP_PEDANTIC (pfile)) - validate_else (pfile, "#else"); + validate_else (pfile, "#else"); skip_rest_of_line (pfile); - if (pfile->if_stack == CPP_BUFFER (pfile)->if_stack) { - cpp_error (pfile, "`#else' not within a conditional"); - return 0; - } else { - /* #ifndef can't have its special treatment for containing the whole file - if it has a #else clause. */ - pfile->if_stack->control_macro = 0; - - if (pfile->if_stack->type != T_IF && pfile->if_stack->type != T_ELIF) { - cpp_error (pfile, "`#else' after `#else'"); - fprintf (stderr, " (matches line %d", pfile->if_stack->lineno); - if (strcmp (pfile->if_stack->fname, ip->nominal_fname) != 0) - fprintf (stderr, ", file %s", pfile->if_stack->fname); - fprintf (stderr, ")\n"); + if (pfile->if_stack == CPP_BUFFER (pfile)->if_stack) + { + cpp_error (pfile, "`#else' not within a conditional"); + return 0; + } + else + { + /* #ifndef can't have its special treatment for containing the whole file + if it has a #else clause. */ + pfile->if_stack->control_macro = 0; + + if (pfile->if_stack->type != T_IF && pfile->if_stack->type != T_ELIF) + { + cpp_error (pfile, "`#else' after `#else'"); + cpp_error_with_line (pfile, pfile->if_stack->lineno, -1, + "the conditional began here"); + } + pfile->if_stack->type = T_ELSE; } - pfile->if_stack->type = T_ELSE; - } if (pfile->if_stack->if_succeeded) skip_if_group (pfile); - else { - ++pfile->if_stack->if_succeeded; /* continue processing input */ - output_line_command (pfile, 1, same_file); - } + else + { + ++pfile->if_stack->if_succeeded; /* continue processing input */ + output_line_command (pfile, same_file); + } return 0; } @@ -3631,14 +2203,13 @@ do_else (pfile, keyword) static int do_endif (pfile, keyword) cpp_reader *pfile; - struct directive *keyword ATTRIBUTE_UNUSED; + const struct directive *keyword ATTRIBUTE_UNUSED; { - if (CPP_PEDANTIC (pfile)) - validate_else (pfile, "#endif"); + validate_else (pfile, "#endif"); skip_rest_of_line (pfile); if (pfile->if_stack == CPP_BUFFER (pfile)->if_stack) - cpp_error (pfile, "unbalanced `#endif'"); + cpp_error (pfile, "`#endif' not within a conditional"); else { IF_STACK_FRAME *temp = pfile->if_stack; @@ -3647,10 +2218,9 @@ do_endif (pfile, keyword) { /* This #endif matched a #ifndef at the start of the file. See if it is at the end of the file. */ - struct parse_marker start_mark; int c; - parse_set_mark (&start_mark, pfile); + parse_set_mark (pfile); for (;;) { @@ -3659,8 +2229,7 @@ do_endif (pfile, keyword) if (c != '\n') break; } - parse_goto_mark (&start_mark, pfile); - parse_clear_mark (&start_mark); + parse_goto_mark (pfile); if (c == EOF) { @@ -3672,62 +2241,98 @@ do_endif (pfile, keyword) for (ip = CPP_BUFFER (pfile); ; ip = CPP_PREV_BUFFER (ip)) if (ip->fname != NULL) break; - ip->ihash->control_macro = temp->control_macro; + ip->ihash->control_macro = (char *) temp->control_macro; } } free (temp); - output_line_command (pfile, 1, same_file); + output_line_command (pfile, same_file); } return 0; } -/* When an #else or #endif is found while skipping failed conditional, - if -pedantic was specified, this is called to warn about text after - the command name. P points to the first char after the command name. */ +/* Issue -pedantic warning for text which is not a comment following + an #else or #endif. Do not warn in system headers, as this is harmless + and very common on old systems. */ static void validate_else (pfile, directive) cpp_reader *pfile; - char *directive; + const char *directive; { - int c; + if (! CPP_PEDANTIC (pfile) || CPP_BUFFER (pfile)->system_header_p) + return; + cpp_skip_hspace (pfile); - c = PEEKC (); - if (c != EOF && c != '\n') + if (PEEKC () != '\n') cpp_pedwarn (pfile, "text following `%s' violates ANSI standard", directive); } +/* Convert T_IF, etc. to a string. Used in error messages. */ +static const char * +if_directive_name (pfile, ifs) + cpp_reader *pfile; + struct if_stack *ifs; +{ + switch (ifs->type) + { + case T_IF: return "#if"; + case T_IFDEF: return "#ifdef"; + case T_IFNDEF: return "#ifndef"; + case T_ELIF: return "#elif"; + case T_ELSE: return "#else"; + default: + cpp_ice (pfile, "impossible if_stack->type value %d", ifs->type); + return "unknown"; + } +} + /* Get the next token, and add it to the text in pfile->token_buffer. Return the kind of token we got. */ - + enum cpp_token cpp_get_token (pfile) cpp_reader *pfile; { register int c, c2, c3; - long old_written; - long start_line, start_column; enum cpp_token token; struct cpp_options *opts = CPP_OPTIONS (pfile); - CPP_BUFFER (pfile)->prev = CPP_BUFFER (pfile)->cur; + get_next: c = GETC(); if (c == EOF) { - handle_eof: - if (CPP_BUFFER (pfile)->seen_eof) + if (CPP_BUFFER (pfile)->manual_pop) + /* If we've been reading from redirected input, the + frontend will pop the buffer. */ + return CPP_EOF; + else if (CPP_BUFFER (pfile)->seen_eof) { - if (cpp_pop_buffer (pfile) != CPP_NULL_BUFFER (pfile)) - goto get_next; - else + if (CPP_PREV_BUFFER (CPP_BUFFER (pfile)) == CPP_NULL_BUFFER (pfile)) return CPP_EOF; + + cpp_pop_buffer (pfile); + goto get_next; } else { - cpp_buffer *next_buf - = CPP_PREV_BUFFER (CPP_BUFFER (pfile)); - CPP_BUFFER (pfile)->seen_eof = 1; + cpp_buffer *next_buf = CPP_PREV_BUFFER (CPP_BUFFER (pfile)); + struct if_stack *ifs, *nifs; + + /* Unwind the conditional stack and generate error messages. */ + for (ifs = pfile->if_stack; + ifs != CPP_BUFFER (pfile)->if_stack; + ifs = nifs) + { + cpp_error_with_line (pfile, ifs->lineno, -1, + "unterminated `%s' conditional", + if_directive_name (pfile, ifs)); + + nifs = ifs->next; + free (ifs); + } + pfile->if_stack = ifs; + if (CPP_BUFFER (pfile)->nominal_fname && next_buf != CPP_NULL_BUFFER (pfile)) { @@ -3737,9 +2342,11 @@ cpp_get_token (pfile) cpp_buffer *cur_buffer = CPP_BUFFER (pfile); CPP_BUFFER (pfile) = next_buf; pfile->input_stack_listing_current = 0; - output_line_command (pfile, 0, leave_file); + output_line_command (pfile, leave_file); CPP_BUFFER (pfile) = cur_buffer; } + + CPP_BUFFER (pfile)->seen_eof = 1; return CPP_POP; } } @@ -3747,210 +2354,46 @@ cpp_get_token (pfile) { switch (c) { - long newlines; - struct parse_marker start_mark; case '/': if (PEEKC () == '=') goto op2; - if (opts->put_out_comments) - parse_set_mark (&start_mark, pfile); - newlines = 0; - cpp_buf_line_and_col (cpp_file_buffer (pfile), - &start_line, &start_column); - c = skip_comment (pfile, &newlines); - if (opts->put_out_comments && (c == '/' || c == EOF)) - parse_clear_mark (&start_mark); - if (c == '/') + + comment: + if (opts->discard_comments) + c = skip_comment (pfile, c); + else + c = copy_comment (pfile, c); + if (c != ' ') goto randomchar; - if (c == EOF) - { - cpp_error_with_line (pfile, start_line, start_column, - "unterminated comment"); - goto handle_eof; - } - c = '/'; /* Initial letter of comment. */ - return_comment: + /* Comments are equivalent to spaces. For -traditional, a comment is equivalent to nothing. */ - if (opts->put_out_comments) - { - cpp_buffer *pbuf = CPP_BUFFER (pfile); - U_CHAR *start = pbuf->buf + start_mark.position; - int len = pbuf->cur - start; - CPP_RESERVE(pfile, 1 + len); - CPP_PUTC_Q (pfile, c); - CPP_PUTS_Q (pfile, start, len); - pfile->lineno += newlines; - parse_clear_mark (&start_mark); - return CPP_COMMENT; - } - else if (CPP_TRADITIONAL (pfile)) - { - return CPP_COMMENT; - } + if (opts->traditional || !opts->discard_comments) + return CPP_COMMENT; else { -#if 0 - /* This may not work if cpp_get_token is called recursively, - since many places look for horizontal space. */ - if (newlines) - { - /* Copy the newlines into the output buffer, in order to - avoid the pain of a #line every time a multiline comment - is seen. */ - CPP_RESERVE(pfile, newlines); - while (--newlines >= 0) - { - CPP_PUTC_Q (pfile, '\n'); - pfile->lineno++; - } - return CPP_VSPACE; - } -#endif - CPP_RESERVE(pfile, 1); - CPP_PUTC_Q (pfile, ' '); + CPP_PUTC (pfile, c); return CPP_HSPACE; } -#if 0 - if (opts->for_lint) { - U_CHAR *argbp; - int cmdlen, arglen; - char *lintcmd = get_lintcmd (ibp, limit, &argbp, &arglen, &cmdlen); - - if (lintcmd != NULL) { - /* I believe it is always safe to emit this newline: */ - obp[-1] = '\n'; - bcopy ("#pragma lint ", (char *) obp, 13); - obp += 13; - bcopy (lintcmd, (char *) obp, cmdlen); - obp += cmdlen; - - if (arglen != 0) { - *(obp++) = ' '; - bcopy (argbp, (char *) obp, arglen); - obp += arglen; - } - - /* OK, now bring us back to the state we were in before we entered - this branch. We need #line because the newline for the pragma - could mess things up. */ - output_line_command (pfile, 0, same_file); - *(obp++) = ' '; /* just in case, if comments are copied thru */ - *(obp++) = '/'; - } - } -#endif case '#': -#if 0 - /* If this is expanding a macro definition, don't recognize - preprocessor directives. */ - if (ip->macro != 0) - goto randomchar; - /* If this is expand_into_temp_buffer, recognize them - only after an actual newline at this level, - not at the beginning of the input level. */ - if (ip->fname == 0 && beg_of_line == ip->buf) - goto randomchar; - if (ident_length) - goto specialchar; -#endif - if (!pfile->only_seen_white) goto randomchar; + /* -traditional directives are recognized only with the # in + column 1. + XXX Layering violation. */ + if (CPP_TRADITIONAL (pfile) + && CPP_BUFFER (pfile)->cur - CPP_BUFFER (pfile)->line_base != 1) + goto randomchar; if (handle_directive (pfile)) return CPP_DIRECTIVE; pfile->only_seen_white = 0; - return CPP_OTHER; + goto randomchar; case '\"': case '\'': string: - /* A single quoted string is treated like a double -- some - programs (e.g., troff) are perverse this way */ - cpp_buf_line_and_col (cpp_file_buffer (pfile), - &start_line, &start_column); - old_written = CPP_WRITTEN (pfile); - CPP_PUTC (pfile, c); - while (1) - { - int cc = GETC(); - if (cc == EOF) - { - if (CPP_IS_MACRO_BUFFER (CPP_BUFFER (pfile))) - { - /* try harder: this string crosses a macro expansion - boundary. This can happen naturally if -traditional. - Otherwise, only -D can make a macro with an unmatched - quote. */ - cpp_pop_buffer (pfile); - continue; - } - if (!CPP_TRADITIONAL (pfile)) - { - cpp_error_with_line (pfile, start_line, start_column, - "unterminated string or character constant"); - if (pfile->multiline_string_line != start_line - && pfile->multiline_string_line != 0) - cpp_error_with_line (pfile, - pfile->multiline_string_line, -1, - "possible real start of unterminated constant"); - pfile->multiline_string_line = 0; - } - break; - } - CPP_PUTC (pfile, cc); - switch (cc) - { - case '\n': - /* Traditionally, end of line ends a string constant with - no error. So exit the loop and record the new line. */ - if (CPP_TRADITIONAL (pfile)) - goto while2end; - if (c == '\'') - { - cpp_error_with_line (pfile, start_line, start_column, - "unterminated character constant"); - goto while2end; - } - if (CPP_PEDANTIC (pfile) - && pfile->multiline_string_line == 0) - { - cpp_pedwarn_with_line (pfile, start_line, start_column, - "string constant runs past end of line"); - } - if (pfile->multiline_string_line == 0) - pfile->multiline_string_line = start_line; - break; - - case '\\': - cc = GETC(); - if (cc == '\n') - { - /* Backslash newline is replaced by nothing at all. */ - CPP_ADJUST_WRITTEN (pfile, -1); - pfile->lineno++; - } - else - { - /* ANSI stupidly requires that in \\ the second \ - is *not* prevented from combining with a newline. */ - NEWLINE_FIX1(cc); - if (cc != EOF) - CPP_PUTC (pfile, cc); - } - break; - - case '\"': - case '\'': - if (cc == c) - goto while2end; - break; - } - } - while2end: - pfile->lineno += count_newlines (pfile->token_buffer + old_written, - CPP_PWRITTEN (pfile)); + parse_string (pfile, c); pfile->only_seen_white = 0; return c == '\'' ? CPP_CHAR : CPP_STRING; @@ -3967,7 +2410,6 @@ cpp_get_token (pfile) case '&': case '+': case '|': - NEWLINE_FIX; c2 = PEEKC (); if (c2 == c || c2 == '=') goto op2; @@ -3978,37 +2420,32 @@ cpp_get_token (pfile) case '%': case '=': case '^': - NEWLINE_FIX; if (PEEKC () == '=') goto op2; goto randomchar; case '-': - NEWLINE_FIX; c2 = PEEKC (); if (c2 == '-' && opts->chill) + goto comment; /* Chill style comment */ + if (c2 == '-' || c2 == '=') + goto op2; + if (c2 == '>') { - /* Chill style comment */ - if (opts->put_out_comments) - parse_set_mark (&start_mark, pfile); - FORWARD(1); /* Skip second '-'. */ - for (;;) + if (opts->cplusplus && PEEKN (1) == '*') { - c = GETC (); - if (c == EOF) - break; - if (c == '\n') - { - /* Don't consider final '\n' to be part of comment. */ - FORWARD(-1); - break; - } + /* In C++, there's a ->* operator. */ + token = CPP_OTHER; + pfile->only_seen_white = 0; + CPP_RESERVE (pfile, 4); + CPP_PUTC_Q (pfile, c); + CPP_PUTC_Q (pfile, GETC ()); + CPP_PUTC_Q (pfile, GETC ()); + CPP_NUL_TERMINATE_Q (pfile); + return token; } - c = '-'; - goto return_comment; + goto op2; } - if (c2 == '-' || c2 == '=' || c2 == '>') - goto op2; goto randomchar; case '<': @@ -4020,29 +2457,45 @@ cpp_get_token (pfile) if (c == '>') break; c = GETC (); - NEWLINE_FIX1 (c); if (c == '\n' || c == EOF) { cpp_error (pfile, "missing '>' in `#include '"); break; } + else if (c == '\r') + { + if (!CPP_BUFFER (pfile)->has_escapes) + { + /* Backslash newline is replaced by nothing. */ + CPP_ADJUST_WRITTEN (pfile, -1); + CPP_BUMP_LINE (pfile); + } + else + { + /* We might conceivably get \r- or \r in + here. Just delete 'em. */ + int d = GETC(); + if (d != '-' && d != ' ') + cpp_ice (pfile, "unrecognized escape \\r%c", d); + CPP_ADJUST_WRITTEN (pfile, -1); + } + } } return CPP_STRING; } /* else fall through */ case '>': - NEWLINE_FIX; c2 = PEEKC (); if (c2 == '=') goto op2; - if (c2 != c) + /* GNU C++ supports MIN and MAX operators ?. */ + if (c2 != c && (!opts->cplusplus || c2 != '?')) goto randomchar; FORWARD(1); CPP_RESERVE (pfile, 4); CPP_PUTC (pfile, c); CPP_PUTC (pfile, c2); - NEWLINE_FIX; c3 = PEEKC (); if (c3 == '=') CPP_PUTC_Q (pfile, GETC ()); @@ -4050,35 +2503,7 @@ cpp_get_token (pfile) pfile->only_seen_white = 0; return CPP_OTHER; - case '@': - if (CPP_BUFFER (pfile)->has_escapes) - { - c = GETC (); - if (c == '-') - { - if (pfile->output_escapes) - CPP_PUTS (pfile, "@-", 2); - parse_name (pfile, GETC ()); - return CPP_NAME; - } - else if (is_space [c]) - { - CPP_RESERVE (pfile, 2); - if (pfile->output_escapes) - CPP_PUTC_Q (pfile, '@'); - CPP_PUTC_Q (pfile, c); - return CPP_HSPACE; - } - } - if (pfile->output_escapes) - { - CPP_PUTS (pfile, "@@", 2); - return CPP_OTHER; - } - goto randomchar; - case '.': - NEWLINE_FIX; c2 = PEEKC (); if (ISDIGIT(c2)) { @@ -4087,7 +2512,11 @@ cpp_get_token (pfile) c = GETC (); goto number; } - /* FIXME - misses the case "..\\\n." */ + + /* In C++ there's a .* operator. */ + if (opts->cplusplus && c2 == '*') + goto op2; + if (c2 == '.' && PEEKN(1) == '.') { CPP_RESERVE(pfile, 4); @@ -4104,7 +2533,6 @@ cpp_get_token (pfile) op2: token = CPP_OTHER; pfile->only_seen_white = 0; - op2any: CPP_RESERVE(pfile, 3); CPP_PUTC_Q (pfile, c); CPP_PUTC_Q (pfile, GETC ()); @@ -4112,7 +2540,6 @@ cpp_get_token (pfile) return token; case 'L': - NEWLINE_FIX; c2 = PEEKC (); if ((c2 == '\'' || c2 == '\"') && !CPP_TRADITIONAL (pfile)) { @@ -4130,11 +2557,10 @@ cpp_get_token (pfile) { CPP_RESERVE (pfile, 2); CPP_PUTC_Q (pfile, c); - NEWLINE_FIX; c = PEEKC (); if (c == EOF) break; - if (!is_idchar[c] && c != '.' + if (!is_idchar(c) && c != '.' && ((c2 != 'e' && c2 != 'E' && ((c2 != 'p' && c2 != 'P') || CPP_C89 (pfile))) || (c != '+' && c != '-'))) @@ -4159,15 +2585,8 @@ cpp_get_token (pfile) c = GETC(); if (c == EOF) goto chill_number_eof; - if (!is_idchar[c]) - { - if (c == '\\' && PEEKC() == '\n') - { - FORWARD(2); - continue; - } - break; - } + if (!is_idchar(c)) + break; CPP_PUTC (pfile, c); } if (c == '\'') @@ -4208,72 +2627,71 @@ cpp_get_token (pfile) return CPP_NAME; ident = pfile->token_buffer + before_name_written; ident_len = CPP_PWRITTEN (pfile) - ident; - hp = cpp_lookup (pfile, ident, ident_len, -1); + hp = cpp_lookup (pfile, ident, ident_len); if (!hp) return CPP_NAME; if (hp->type == T_DISABLED) { if (pfile->output_escapes) - { /* Return "@-IDENT", followed by '\0'. */ + { /* Return "\r-IDENT", followed by '\0'. */ int i; CPP_RESERVE (pfile, 3); ident = pfile->token_buffer + before_name_written; CPP_ADJUST_WRITTEN (pfile, 2); for (i = ident_len; i >= 0; i--) ident[i+2] = ident[i]; - ident[0] = '@'; + ident[0] = '\r'; ident[1] = '-'; } return CPP_NAME; } - /* If macro wants an arglist, verify that a '(' follows. - first skip all whitespace, copying it to the output - after the macro name. Then, if there is no '(', - decide this is not a macro call and leave things that way. */ + /* If macro wants an arglist, verify that a '(' follows. */ if (hp->type == T_MACRO && hp->value.defn->nargs >= 0) { - struct parse_marker macro_mark; - int is_macro_call, macbuf_whitespace = 0; + int macbuf_whitespace = 0; - parse_set_mark (¯o_mark, pfile); + while (CPP_IS_MACRO_BUFFER (CPP_BUFFER (pfile))) + { + U_CHAR *point = CPP_BUFFER (pfile)->cur; + for (;;) + { + cpp_skip_hspace (pfile); + c = PEEKC (); + if (c == '\n') + FORWARD(1); + else + break; + } + if (point != CPP_BUFFER (pfile)->cur) + macbuf_whitespace = 1; + if (c == '(') + goto is_macro_call; + else if (c != EOF) + goto not_macro_call; + cpp_pop_buffer (pfile); + } + + parse_set_mark (pfile); for (;;) { cpp_skip_hspace (pfile); c = PEEKC (); - is_macro_call = c == '('; - if (c != EOF) - { - if (c != '\n') - break; - FORWARD (1); - } - else - { - if (CPP_IS_MACRO_BUFFER (CPP_BUFFER (pfile))) - { - if (macro_mark.position != - (CPP_BUFFER (pfile)->cur - - CPP_BUFFER (pfile)->buf)) - macbuf_whitespace = 1; - - parse_clear_mark (¯o_mark); - cpp_pop_buffer (pfile); - parse_set_mark (¯o_mark, pfile); - } - else - break; - } + if (c == '\n') + FORWARD(1); + else + break; } - if (!is_macro_call) - { - parse_goto_mark (¯o_mark, pfile); - if (macbuf_whitespace) - CPP_PUTC (pfile, ' '); - } - parse_clear_mark (¯o_mark); - if (!is_macro_call) - return CPP_NAME; + parse_goto_mark (pfile); + + if (c == '(') + goto is_macro_call; + + not_macro_call: + if (macbuf_whitespace) + CPP_PUTC (pfile, ' '); + return CPP_NAME; } + is_macro_call: /* This is now known to be a macro call. Expand the macro, reading arguments as needed, and push the expansion on the input stack. */ @@ -4282,30 +2700,60 @@ cpp_get_token (pfile) } goto get_next; - case ' ': case '\t': case '\v': case '\r': + case ' ': case '\t': case '\v': for (;;) { CPP_PUTC (pfile, c); c = PEEKC (); - if (c == EOF || !is_hor_space[c]) + if (c == EOF || !is_hspace(c)) break; FORWARD(1); } return CPP_HSPACE; - case '\\': - c2 = PEEKC (); - if (c2 != '\n') - goto randomchar; - token = CPP_HSPACE; - goto op2any; + case '\r': + if (CPP_BUFFER (pfile)->has_escapes) + { + c = GETC (); + if (c == '-') + { + if (pfile->output_escapes) + CPP_PUTS (pfile, "\r-", 2); + parse_name (pfile, GETC ()); + return CPP_NAME; + } + else if (c == ' ') + { + CPP_RESERVE (pfile, 2); + if (pfile->output_escapes) + CPP_PUTC_Q (pfile, '\r'); + CPP_PUTC_Q (pfile, c); + return CPP_HSPACE; + } + else + { + cpp_ice (pfile, "unrecognized escape \\r%c", c); + goto get_next; + } + } + else + { + /* Backslash newline is ignored. */ + CPP_BUMP_LINE (pfile); + goto get_next; + } case '\n': CPP_PUTC (pfile, c); if (pfile->only_seen_white == 0) pfile->only_seen_white = 1; - pfile->lineno++; - output_line_command (pfile, 1, same_file); + CPP_BUMP_LINE (pfile); + if (! CPP_OPTIONS (pfile)->no_line_commands) + { + pfile->lineno++; + if (CPP_BUFFER (pfile)->lineno != pfile->lineno) + output_line_command (pfile, same_file); + } return CPP_VSPACE; case '(': token = CPP_LPAREN; goto char1; @@ -4345,1280 +2793,128 @@ cpp_get_non_space_token (pfile) /* Parse an identifier starting with C. */ -static int +static void parse_name (pfile, c) - cpp_reader *pfile; int c; + cpp_reader *pfile; + int c; { for (;;) { - if (! is_idchar[c]) - { - if (c == '\\' && PEEKC() == '\n') - { - FORWARD(2); - continue; - } - FORWARD (-1); - break; - } - - if (c == '$' && CPP_PEDANTIC (pfile)) - cpp_pedwarn (pfile, "`$' in identifier"); - - CPP_RESERVE(pfile, 2); /* One more for final NUL. */ - CPP_PUTC_Q (pfile, c); - c = GETC(); - if (c == EOF) - break; - } - CPP_NUL_TERMINATE_Q (pfile); - return 1; -} - -/* This is called after options have been processed. - * Check options for consistency, and setup for processing input - * from the file named FNAME. (Use standard input if FNAME==NULL.) - * Return 1 on success, 0 on failure. - */ - -int -cpp_start_read (pfile, fname) - cpp_reader *pfile; - char *fname; -{ - struct cpp_options *opts = CPP_OPTIONS (pfile); - struct cpp_pending *pend; - char *p; - int f; - cpp_buffer *fp; - struct include_hash *ih_fake; - - /* The code looks at the defaults through this pointer, rather than - through the constant structure above. This pointer gets changed - if an environment variable specifies other defaults. */ - struct default_include *include_defaults = include_defaults_array; - - /* Now that we know dollars_in_ident, we can initialize the syntax - tables. */ - initialize_char_syntax (opts->dollars_in_ident); - - /* Add dirs from CPATH after dirs from -I. */ - /* There seems to be confusion about what CPATH should do, - so for the moment it is not documented. */ - /* Some people say that CPATH should replace the standard include - dirs, but that seems pointless: it comes before them, so it - overrides them anyway. */ - GET_ENV_PATH_LIST (p, "CPATH"); - if (p != 0 && ! opts->no_standard_includes) - path_include (pfile, p); - - /* Do partial setup of input buffer for the sake of generating - early #line directives (when -g is in effect). */ - fp = cpp_push_buffer (pfile, NULL, 0); - if (!fp) - return 0; - if (opts->in_fname == NULL || *opts->in_fname == 0) - { - opts->in_fname = fname; - if (opts->in_fname == NULL) - opts->in_fname = ""; - } - fp->nominal_fname = fp->fname = opts->in_fname; - fp->lineno = 0; - - /* Install __LINE__, etc. Must follow initialize_char_syntax - and option processing. */ - initialize_builtins (pfile); - - /* Do standard #defines and assertions - that identify system and machine type. */ - - if (!opts->inhibit_predefs) { - char *p = (char *) alloca (strlen (predefs) + 1); - strcpy (p, predefs); - while (*p) { - char *q; - while (*p == ' ' || *p == '\t') - p++; - /* Handle -D options. */ - if (p[0] == '-' && p[1] == 'D') { - q = &p[2]; - while (*p && *p != ' ' && *p != '\t') - p++; - if (*p != 0) - *p++= 0; - if (opts->debug_output) - output_line_command (pfile, 0, same_file); - cpp_define (pfile, q); - while (*p == ' ' || *p == '\t') - p++; - } else if (p[0] == '-' && p[1] == 'A') { - /* Handle -A options (assertions). */ - char *assertion; - char *past_name; - char *value; - char *past_value; - char *termination; - int save_char; - - assertion = &p[2]; - past_name = assertion; - /* Locate end of name. */ - while (*past_name && *past_name != ' ' - && *past_name != '\t' && *past_name != '(') - past_name++; - /* Locate `(' at start of value. */ - value = past_name; - while (*value && (*value == ' ' || *value == '\t')) - value++; - if (*value++ != '(') - abort (); - while (*value && (*value == ' ' || *value == '\t')) - value++; - past_value = value; - /* Locate end of value. */ - while (*past_value && *past_value != ' ' - && *past_value != '\t' && *past_value != ')') - past_value++; - termination = past_value; - while (*termination && (*termination == ' ' || *termination == '\t')) - termination++; - if (*termination++ != ')') - abort (); - if (*termination && *termination != ' ' && *termination != '\t') - abort (); - /* Temporarily null-terminate the value. */ - save_char = *termination; - *termination = '\0'; - /* Install the assertion. */ - cpp_assert (pfile, assertion); - *termination = (char) save_char; - p = termination; - while (*p == ' ' || *p == '\t') - p++; - } else { - abort (); - } - } - } - - /* Now handle the command line options. */ - - /* Do -U's, -D's and -A's in the order they were seen. */ - /* First reverse the list. */ - opts->pending = nreverse_pending (opts->pending); - - for (pend = opts->pending; pend; pend = pend->next) - { - if (pend->cmd != NULL && pend->cmd[0] == '-') - { - switch (pend->cmd[1]) - { - case 'U': - if (opts->debug_output) - output_line_command (pfile, 0, same_file); - cpp_undef (pfile, pend->arg); - break; - case 'D': - if (opts->debug_output) - output_line_command (pfile, 0, same_file); - cpp_define (pfile, pend->arg); - break; - case 'A': - cpp_assert (pfile, pend->arg); - break; - } - } - } - - opts->done_initializing = 1; - - { /* Read the appropriate environment variable and if it exists - replace include_defaults with the listed path. */ - char *epath = 0; - switch ((opts->objc << 1) + opts->cplusplus) + if (! is_idchar(c)) { - case 0: - GET_ENV_PATH_LIST (epath, "C_INCLUDE_PATH"); - break; - case 1: - GET_ENV_PATH_LIST (epath, "CPLUS_INCLUDE_PATH"); - break; - case 2: - GET_ENV_PATH_LIST (epath, "OBJC_INCLUDE_PATH"); - break; - case 3: - GET_ENV_PATH_LIST (epath, "OBJCPLUS_INCLUDE_PATH"); - break; - } - /* If the environment var for this language is set, - add to the default list of include directories. */ - if (epath) { - char *nstore = (char *) alloca (strlen (epath) + 2); - int num_dirs; - char *startp, *endp; - - for (num_dirs = 1, startp = epath; *startp; startp++) - if (*startp == PATH_SEPARATOR) - num_dirs++; - include_defaults - = (struct default_include *) xmalloc ((num_dirs - * sizeof (struct default_include)) - + sizeof (include_defaults_array)); - startp = endp = epath; - num_dirs = 0; - while (1) { - /* Handle cases like c:/usr/lib:d:/gcc/lib */ - if ((*endp == PATH_SEPARATOR) - || *endp == 0) { - strncpy (nstore, startp, endp-startp); - if (endp == startp) - strcpy (nstore, "."); - else - nstore[endp-startp] = '\0'; - - include_defaults[num_dirs].fname = xstrdup (nstore); - include_defaults[num_dirs].component = 0; - include_defaults[num_dirs].cplusplus = opts->cplusplus; - include_defaults[num_dirs].cxx_aware = 1; - num_dirs++; - if (*endp == '\0') - break; - endp = startp = endp + 1; - } else - endp++; - } - /* Put the usual defaults back in at the end. */ - bcopy ((char *) include_defaults_array, - (char *) &include_defaults[num_dirs], - sizeof (include_defaults_array)); - } - } - - /* Unless -fnostdinc, - tack on the standard include file dirs to the specified list */ - if (!opts->no_standard_includes) { - struct default_include *p = include_defaults; - char *specd_prefix = opts->include_prefix; - char *default_prefix = xstrdup (GCC_INCLUDE_DIR); - int default_len = 0; - /* Remove the `include' from /usr/local/lib/gcc.../include. */ - if (!strcmp (default_prefix + strlen (default_prefix) - 8, "/include")) { - default_len = strlen (default_prefix) - 7; - default_prefix[default_len] = 0; - } - /* Search "translated" versions of GNU directories. - These have /usr/local/lib/gcc... replaced by specd_prefix. */ - if (specd_prefix != 0 && default_len != 0) - for (p = include_defaults; p->fname; p++) { - /* Some standard dirs are only for C++. */ - if (!p->cplusplus - || (opts->cplusplus && !opts->no_standard_cplusplus_includes)) { - /* Does this dir start with the prefix? */ - if (!strncmp (p->fname, default_prefix, default_len)) { - /* Yes; change prefix and add to search list. */ - int this_len = strlen (specd_prefix) - + strlen (p->fname) - default_len; - char *str = (char *) xmalloc (this_len + 1); - strcpy (str, specd_prefix); - strcat (str, p->fname + default_len); - - append_include_chain (pfile, &opts->system_include, - str, !p->cxx_aware); - } - } - } - /* Search ordinary names for GNU include directories. */ - for (p = include_defaults; p->fname; p++) { - /* Some standard dirs are only for C++. */ - if (!p->cplusplus - || (opts->cplusplus && !opts->no_standard_cplusplus_includes)) { - const char *str = update_path (p->fname, p->component); - append_include_chain (pfile, &opts->system_include, - str, !p->cxx_aware); - } - } - } - - merge_include_chains (opts); - - /* With -v, print the list of dirs to search. */ - if (opts->verbose) { - struct file_name_list *p; - cpp_notice ("#include \"...\" search starts here:\n"); - for (p = opts->quote_include; p; p = p->next) { - if (p == opts->bracket_include) - cpp_notice ("#include <...> search starts here:\n"); - fprintf (stderr, " %s\n", p->name); - } - cpp_notice ("End of search list.\n"); - } - - /* Copy the entire contents of the main input file into - the stacked input buffer previously allocated for it. */ - if (fname == NULL || *fname == 0) { - fname = ""; - f = 0; - } else if ((f = open (fname, O_RDONLY|O_NONBLOCK|O_NOCTTY, 0666)) < 0) - cpp_pfatal_with_name (pfile, fname); - - /* -MG doesn't select the form of output and must be specified with one of - -M or -MM. -MG doesn't make sense with -MD or -MMD since they don't - inhibit compilation. */ - if (opts->print_deps_missing_files - && (opts->print_deps == 0 || !opts->no_output)) - { - cpp_fatal (pfile, "-MG must be specified with one of -M or -MM"); - return 0; - } - - /* Either of two environment variables can specify output of deps. - Its value is either "OUTPUT_FILE" or "OUTPUT_FILE DEPS_TARGET", - where OUTPUT_FILE is the file to write deps info to - and DEPS_TARGET is the target to mention in the deps. */ - - if (opts->print_deps == 0 - && (getenv ("SUNPRO_DEPENDENCIES") != 0 - || getenv ("DEPENDENCIES_OUTPUT") != 0)) { - char *spec = getenv ("DEPENDENCIES_OUTPUT"); - char *s; - char *output_file; - - if (spec == 0) - { - spec = getenv ("SUNPRO_DEPENDENCIES"); - opts->print_deps = 2; - } - else - opts->print_deps = 1; - - s = spec; - /* Find the space before the DEPS_TARGET, if there is one. */ - /* This should use index. (mrs) */ - while (*s != 0 && *s != ' ') s++; - if (*s != 0) - { - opts->deps_target = s + 1; - output_file = (char *) xmalloc (s - spec + 1); - bcopy (spec, output_file, s - spec); - output_file[s - spec] = 0; - } - else - { - opts->deps_target = 0; - output_file = spec; - } - - opts->deps_file = output_file; - opts->print_deps_append = 1; - } - - /* For -M, print the expected object file name - as the target of this Make-rule. */ - if (opts->print_deps) - { - pfile->deps_allocated_size = 200; - pfile->deps_buffer = (char *) xmalloc (pfile->deps_allocated_size); - pfile->deps_buffer[0] = 0; - pfile->deps_size = 0; - pfile->deps_column = 0; - - if (opts->deps_target) - deps_output (pfile, opts->deps_target, ':'); - else if (*opts->in_fname == 0) - deps_output (pfile, "-", ':'); - else - { - char *p, *q, *r; - int len, x; - static char *known_suffixes[] = { ".c", ".C", ".s", ".S", ".m", - ".cc", ".cxx", ".cpp", ".cp", - ".c++", 0 - }; - - /* Discard all directory prefixes from filename. */ - if ((q = rindex (opts->in_fname, '/')) != NULL -#ifdef DIR_SEPARATOR - && (q = rindex (opts->in_fname, DIR_SEPARATOR)) != NULL -#endif - ) - ++q; - else - q = opts->in_fname; - - /* Copy remainder to mungable area. */ - p = (char *) alloca (strlen(q) + 8); - strcpy (p, q); - - /* Output P, but remove known suffixes. */ - len = strlen (p); - q = p + len; - /* Point to the filename suffix. */ - r = rindex (p, '.'); - /* Compare against the known suffixes. */ - x = 0; - while (known_suffixes[x] != 0) - { - if (strncmp (known_suffixes[x], r, q - r) == 0) - { - /* Make q point to the bit we're going to overwrite - with an object suffix. */ - q = r; - break; - } - x++; - } - - /* Supply our own suffix. */ -#ifndef VMS - strcpy (q, ".o"); -#else - strcpy (q, ".obj"); -#endif - - deps_output (pfile, p, ':'); - deps_output (pfile, opts->in_fname, ' '); - } - } - - /* Must call finclude() on the main input before processing - -include switches; otherwise the -included text winds up - after the main input. */ - ih_fake = (struct include_hash *) xmalloc (sizeof (struct include_hash)); - ih_fake->next = 0; - ih_fake->next_this_file = 0; - ih_fake->foundhere = ABSOLUTE_PATH; /* well sort of ... */ - ih_fake->name = fname; - ih_fake->control_macro = 0; - ih_fake->buf = (char *)-1; - ih_fake->limit = 0; - if (!finclude (pfile, f, ih_fake)) - return 0; - output_line_command (pfile, 0, same_file); - pfile->only_seen_white = 2; - - /* The -imacros files can be scanned now, but the -include files - have to be pushed onto the include stack and processed later, - in the main loop calling cpp_get_token. That means the -include - files have to be processed in reverse order of the pending list, - which means the pending list has to be reversed again, which - means the -imacros files have to be done separately and first. */ - - pfile->no_record_file++; - opts->no_output++; - for (pend = opts->pending; pend; pend = pend->next) - { - if (pend->cmd != NULL) - { - if (strcmp (pend->cmd, "-imacros") == 0) - { - int fd = open (pend->arg, O_RDONLY|O_NONBLOCK|O_NOCTTY, 0666); - if (fd < 0) - { - cpp_perror_with_name (pfile, pend->arg); - return 0; - } - if (!cpp_push_buffer (pfile, NULL, 0)) - return 0; - - ih_fake = (struct include_hash *) - xmalloc (sizeof (struct include_hash)); - ih_fake->next = 0; - ih_fake->next_this_file = 0; - ih_fake->foundhere = ABSOLUTE_PATH; /* well sort of ... */ - ih_fake->name = pend->arg; - ih_fake->control_macro = 0; - ih_fake->buf = (char *)-1; - ih_fake->limit = 0; - if (!finclude (pfile, fd, ih_fake)) - cpp_scan_buffer (pfile); - free (ih_fake); - } - } - } - opts->no_output--; - opts->pending = nreverse_pending (opts->pending); - for (pend = opts->pending; pend; pend = pend->next) - { - if (pend->cmd != NULL) - { - if (strcmp (pend->cmd, "-include") == 0) - { - int fd = open (pend->arg, O_RDONLY|O_NONBLOCK|O_NOCTTY, 0666); - if (fd < 0) - { - cpp_perror_with_name (pfile, pend->arg); - return 0; - } - if (!cpp_push_buffer (pfile, NULL, 0)) - return 0; - - ih_fake = (struct include_hash *) - xmalloc (sizeof (struct include_hash)); - ih_fake->next = 0; - ih_fake->next_this_file = 0; - ih_fake->foundhere = ABSOLUTE_PATH; /* well sort of ... */ - ih_fake->name = pend->arg; - ih_fake->control_macro = 0; - ih_fake->buf = (char *)-1; - ih_fake->limit = 0; - if (finclude (pfile, fd, ih_fake)) - output_line_command (pfile, 0, enter_file); - } - } - } - pfile->no_record_file--; - - /* Free the pending list. */ - for (pend = opts->pending; pend; ) - { - struct cpp_pending *next = pend->next; - free (pend); - pend = next; - } - opts->pending = NULL; - - return 1; -} - -void -cpp_reader_init (pfile) - cpp_reader *pfile; -{ - bzero ((char *) pfile, sizeof (cpp_reader)); - pfile->get_token = cpp_get_token; - - pfile->token_buffer_size = 200; - pfile->token_buffer = (U_CHAR *) xmalloc (pfile->token_buffer_size); - CPP_SET_WRITTEN (pfile, 0); - - pfile->timebuf = NULL; - pfile->only_seen_white = 1; - pfile->buffer = CPP_NULL_BUFFER(pfile); - pfile->actual_dirs = NULL; -} - -static struct cpp_pending * -nreverse_pending (list) - struct cpp_pending *list; - -{ - register struct cpp_pending *prev = 0, *next, *pend; - for (pend = list; pend; pend = next) - { - next = pend->next; - pend->next = prev; - prev = pend; - } - return prev; -} - -static void -push_pending (pfile, cmd, arg) - cpp_reader *pfile; - char *cmd; - char *arg; -{ - struct cpp_pending *pend - = (struct cpp_pending *) xmalloc (sizeof (struct cpp_pending)); - pend->cmd = cmd; - pend->arg = arg; - pend->next = CPP_OPTIONS (pfile)->pending; - CPP_OPTIONS (pfile)->pending = pend; -} - - -static void -print_help () -{ - printf ("Usage: %s [switches] input output\n", progname); - printf ("Switches:\n"); - printf (" -include Include the contents of before other files\n"); - printf (" -imacros Accept definition of marcos in \n"); - printf (" -iprefix Specify as a prefix for next two options\n"); - printf (" -iwithprefix Add to the end of the system include paths\n"); - printf (" -iwithprefixbefore Add to the end of the main include paths\n"); - printf (" -isystem Add to the start of the system include paths\n"); - printf (" -idirafter Add to the end of the system include paths\n"); - printf (" -I Add to the end of the main include paths\n"); - printf (" -nostdinc Do not search the system include directories\n"); - printf (" -nostdinc++ Do not search the system include directories for C++\n"); - printf (" -o Put output into \n"); - printf (" -pedantic Issue all warnings demanded by strict ANSI C\n"); - printf (" -traditional Follow K&R pre-processor behaviour\n"); - printf (" -trigraphs Support ANSI C trigraphs\n"); - printf (" -lang-c Assume that the input sources are in C\n"); - printf (" -lang-c89 Assume that the input sources are in C89\n"); - printf (" -lang-c++ Assume that the input sources are in C++\n"); - printf (" -lang-objc Assume that the input sources are in ObjectiveC\n"); - printf (" -lang-objc++ Assume that the input sources are in ObjectiveC++\n"); - printf (" -lang-asm Assume that the input sources are in assembler\n"); - printf (" -lang-chill Assume that the input sources are in Chill\n"); - printf (" -std= Specify the conformance standard; one of:\n"); - printf (" gnu89, gnu9x, c89, c9x, iso9899:1990,\n"); - printf (" iso9899:199409, iso9899:199x\n"); - - printf (" -+ Allow parsing of C++ style features\n"); - printf (" -w Inhibit warning messages\n"); - printf (" -Wtrigraphs Warn if trigraphs are encountered\n"); - printf (" -Wno-trigraphs Do not warn about trigraphs\n"); - printf (" -Wcomment{s} Warn if one comment starts inside another\n"); - printf (" -Wno-comment{s} Do not warn about comments\n"); - printf (" -Wtraditional Warn if a macro argument is/would be turned into\n"); - printf (" a string if -traditional is specified\n"); - printf (" -Wno-traditional Do not warn about stringification\n"); - printf (" -Wundef Warn if an undefined macro is used by #if\n"); - printf (" -Wno-undef Do not warn about testing undefined macros\n"); - printf (" -Wimport Warn about the use of the #import directive\n"); - printf (" -Wno-import Do not warn about the use of #import\n"); - printf (" -Werror Treat all warnings as errors\n"); - printf (" -Wno-error Do not treat warnings as errors\n"); - printf (" -Wall Enable all preprocessor warnings\n"); - printf (" -M Generate make dependencies\n"); - printf (" -MM As -M, but ignore system header files\n"); - printf (" -MD As -M, but put output in a .d file\n"); - printf (" -MMD As -MD, but ignore system header files\n"); - printf (" -MG Treat missing header file as generated files\n"); - printf (" -g Include #define and #undef directives in the output\n"); - printf (" -D Define a with string '1' as its value\n"); - printf (" -D= Define a with as its value\n"); - printf (" -A () Assert the to \n"); - printf (" -U Undefine \n"); - printf (" -u or -undef Do not predefine any macros\n"); - printf (" -v Display the version number\n"); - printf (" -H Print the name of header files as they are used\n"); - printf (" -C Do not discard comments\n"); - printf (" -dM Display a list of macro definitions active at end\n"); - printf (" -dD Preserve macro definitions in output\n"); - printf (" -dN As -dD except that only the names are preserved\n"); - printf (" -dI Include #include directives in the output\n"); - printf (" -ifoutput Describe skipped code blocks in output \n"); - printf (" -P Do not generate #line directives\n"); - printf (" -$ Do not include '$' in identifiers\n"); - printf (" -remap Remap file names when including files.\n"); - printf (" -h or --help Display this information\n"); -} - - -/* Handle one command-line option in (argc, argv). - Can be called multiple times, to handle multiple sets of options. - Returns number of strings consumed. */ -int -cpp_handle_option (pfile, argc, argv) - cpp_reader *pfile; - int argc; - char **argv; -{ - struct cpp_options *opts = CPP_OPTIONS (pfile); - int i = 0; - - if (user_label_prefix == NULL) - user_label_prefix = USER_LABEL_PREFIX; - - if (argv[i][0] != '-') { - if (opts->out_fname != NULL) - { - print_help (); - cpp_fatal (pfile, "Too many arguments"); - } - else if (opts->in_fname != NULL) - opts->out_fname = argv[i]; - else - opts->in_fname = argv[i]; - } else { - switch (argv[i][1]) { - - missing_filename: - cpp_fatal (pfile, "Filename missing after `%s' option", argv[i]); - return argc; - missing_dirname: - cpp_fatal (pfile, "Directory name missing after `%s' option", argv[i]); - return argc; - - case 'f': - if (!strcmp (argv[i], "-fleading-underscore")) - user_label_prefix = "_"; - else if (!strcmp (argv[i], "-fno-leading-underscore")) - user_label_prefix = ""; - break; - - case 'I': /* Add directory to path for includes. */ - if (!strcmp (argv[i] + 2, "-")) - { - if (! opts->ignore_srcdir) - { - opts->ignore_srcdir = 1; - /* Don't use any preceding -I directories for #include <...>. */ - opts->quote_include = opts->bracket_include; - opts->bracket_include = 0; - } - } - else - { - char *fname; - if (argv[i][2] != 0) - fname = argv[i] + 2; - else if (i + 1 == argc) - goto missing_dirname; - else - fname = argv[++i]; - append_include_chain (pfile, &opts->bracket_include, fname, 0); - } - break; - - case 'i': - /* Add directory to beginning of system include path, as a system - include directory. */ - if (!strcmp (argv[i], "-isystem")) - { - if (i + 1 == argc) - goto missing_filename; - append_include_chain (pfile, &opts->system_include, argv[++i], 1); - } - /* Add directory to end of path for includes, - with the default prefix at the front of its name. */ - else if (!strcmp (argv[i], "-iwithprefix")) - { - char *fname; - if (i + 1 == argc) - goto missing_dirname; - ++i; - - if (opts->include_prefix != 0) - { - fname = xmalloc (strlen (opts->include_prefix) - + strlen (argv[i]) + 1); - strcpy (fname, opts->include_prefix); - strcat (fname, argv[i]); - } - else - { - fname = xmalloc (strlen (GCC_INCLUDE_DIR) - + strlen (argv[i]) + 1); - strcpy (fname, GCC_INCLUDE_DIR); - /* Remove the `include' from /usr/local/lib/gcc.../include. */ - if (!strcmp (fname + strlen (fname) - 8, "/include")) - fname[strlen (fname) - 7] = 0; - strcat (fname, argv[i]); - } - - append_include_chain (pfile, &opts->system_include, fname, 0); - } - /* Add directory to main path for includes, - with the default prefix at the front of its name. */ - else if (!strcmp (argv[i], "-iwithprefix")) - { - char *fname; - if (i + 1 == argc) - goto missing_dirname; - ++i; - - if (opts->include_prefix != 0) - { - fname = xmalloc (strlen (opts->include_prefix) - + strlen (argv[i]) + 1); - strcpy (fname, opts->include_prefix); - strcat (fname, argv[i]); - } - else - { - fname = xmalloc (strlen (GCC_INCLUDE_DIR) - + strlen (argv[i]) + 1); - strcpy (fname, GCC_INCLUDE_DIR); - /* Remove the `include' from /usr/local/lib/gcc.../include. */ - if (!strcmp (fname + strlen (fname) - 8, "/include")) - fname[strlen (fname) - 7] = 0; - strcat (fname, argv[i]); - } - - append_include_chain (pfile, &opts->bracket_include, fname, 0); - } - /* Add directory to end of path for includes. */ - else if (!strcmp (argv[i], "-idirafter")) - { - if (i + 1 == argc) - goto missing_dirname; - append_include_chain (pfile, &opts->after_include, argv[++i], 0); - } - else if (!strcmp (argv[i], "-include") || !strcmp (argv[i], "-imacros")) - { - if (i + 1 == argc) - goto missing_filename; - else - push_pending (pfile, argv[i], argv[i+1]), i++; - } - else if (!strcmp (argv[i], "-iprefix")) - { - if (i + 1 == argc) - goto missing_filename; - else - opts->include_prefix = argv[++i]; - } - else if (!strcmp (argv[i], "-ifoutput")) - opts->output_conditionals = 1; - - break; - - case 'o': - if (opts->out_fname != NULL) - { - cpp_fatal (pfile, "Output filename specified twice"); - return argc; - } - if (i + 1 == argc) - goto missing_filename; - opts->out_fname = argv[++i]; - if (!strcmp (opts->out_fname, "-")) - opts->out_fname = ""; - break; - - case 'p': - if (!strcmp (argv[i], "-pedantic")) - CPP_PEDANTIC (pfile) = 1; - else if (!strcmp (argv[i], "-pedantic-errors")) { - CPP_PEDANTIC (pfile) = 1; - opts->pedantic_errors = 1; - } -#if 0 - else if (!strcmp (argv[i], "-pcp")) { - char *pcp_fname = argv[++i]; - pcp_outfile = ((pcp_fname[0] != '-' || pcp_fname[1] != '\0') - ? fopen (pcp_fname, "w") - : fdopen (dup (fileno (stdout)), "w")); - if (pcp_outfile == 0) - cpp_pfatal_with_name (pfile, pcp_fname); - no_precomp = 1; - } -#endif - break; - - case 't': - if (!strcmp (argv[i], "-traditional")) { - opts->traditional = 1; - opts->cplusplus_comments = 0; - } else if (!strcmp (argv[i], "-trigraphs")) { - if (!opts->chill) - opts->trigraphs = 1; - } - break; - - case 'l': - if (! strcmp (argv[i], "-lang-c")) - opts->cplusplus = 0, opts->cplusplus_comments = 1, opts->c89 = 0, - opts->c9x = 1, opts->objc = 0; - if (! strcmp (argv[i], "-lang-c89")) - opts->cplusplus = 0, opts->cplusplus_comments = 0, opts->c89 = 1, - opts->c9x = 0, opts->objc = 0; - if (! strcmp (argv[i], "-lang-c++")) - opts->cplusplus = 1, opts->cplusplus_comments = 1, opts->c89 = 0, - opts->c9x = 0, opts->objc = 0; - if (! strcmp (argv[i], "-lang-objc")) - opts->cplusplus = 0, opts->cplusplus_comments = 1, opts->c89 = 0, - opts->c9x = 0, opts->objc = 1; - if (! strcmp (argv[i], "-lang-objc++")) - opts->cplusplus = 1, opts->cplusplus_comments = 1, opts->c89 = 0, - opts->c9x = 0, opts->objc = 1; - if (! strcmp (argv[i], "-lang-asm")) - opts->lang_asm = 1; - if (! strcmp (argv[i], "-lint")) - opts->for_lint = 1; - if (! strcmp (argv[i], "-lang-chill")) - opts->objc = 0, opts->cplusplus = 0, opts->chill = 1, - opts->traditional = 1, opts->trigraphs = 0; - break; - - case '+': - opts->cplusplus = 1, opts->cplusplus_comments = 1; - break; - - case 's': - if (!strcmp (argv[i], "-std=iso9899:1990") - || !strcmp (argv[i], "-std=iso9899:199409") - || !strcmp (argv[i], "-std=c89") - || !strcmp (argv[i], "-std=gnu89")) - opts->cplusplus = 0, opts->cplusplus_comments = 0, - opts->c89 = 1, opts->c9x = 0, opts->objc = 0; - else if (!strcmp (argv[i], "-std=iso9899:199x") - || !strcmp (argv[i], "-std=c9x") - || !strcmp (argv[i], "-std=gnu9x")) - opts->cplusplus = 0, opts->cplusplus_comments = 1, opts->c89 = 0, - opts->c9x = 1, opts->objc = 0; - break; - - case 'w': - opts->inhibit_warnings = 1; - break; - - case 'W': - if (!strcmp (argv[i], "-Wtrigraphs")) - opts->warn_trigraphs = 1; - else if (!strcmp (argv[i], "-Wno-trigraphs")) - opts->warn_trigraphs = 0; - else if (!strcmp (argv[i], "-Wcomment")) - opts->warn_comments = 1; - else if (!strcmp (argv[i], "-Wno-comment")) - opts->warn_comments = 0; - else if (!strcmp (argv[i], "-Wcomments")) - opts->warn_comments = 1; - else if (!strcmp (argv[i], "-Wno-comments")) - opts->warn_comments = 0; - else if (!strcmp (argv[i], "-Wtraditional")) - opts->warn_stringify = 1; - else if (!strcmp (argv[i], "-Wno-traditional")) - opts->warn_stringify = 0; - else if (!strcmp (argv[i], "-Wundef")) - opts->warn_undef = 1; - else if (!strcmp (argv[i], "-Wno-undef")) - opts->warn_undef = 0; - else if (!strcmp (argv[i], "-Wimport")) - opts->warn_import = 1; - else if (!strcmp (argv[i], "-Wno-import")) - opts->warn_import = 0; - else if (!strcmp (argv[i], "-Werror")) - opts->warnings_are_errors = 1; - else if (!strcmp (argv[i], "-Wno-error")) - opts->warnings_are_errors = 0; - else if (!strcmp (argv[i], "-Wall")) - { - opts->warn_trigraphs = 1; - opts->warn_comments = 1; - } - break; - - case 'M': - /* The style of the choices here is a bit mixed. - The chosen scheme is a hybrid of keeping all options in one string - and specifying each option in a separate argument: - -M|-MM|-MD file|-MMD file [-MG]. An alternative is: - -M|-MM|-MD file|-MMD file|-MG|-MMG; or more concisely: - -M[M][G][D file]. This is awkward to handle in specs, and is not - as extensible. */ - /* ??? -MG must be specified in addition to one of -M or -MM. - This can be relaxed in the future without breaking anything. - The converse isn't true. */ - - /* -MG isn't valid with -MD or -MMD. This is checked for later. */ - if (!strcmp (argv[i], "-MG")) - { - opts->print_deps_missing_files = 1; - break; - } - if (!strcmp (argv[i], "-M")) - opts->print_deps = 2; - else if (!strcmp (argv[i], "-MM")) - opts->print_deps = 1; - else if (!strcmp (argv[i], "-MD")) - opts->print_deps = 2; - else if (!strcmp (argv[i], "-MMD")) - opts->print_deps = 1; - /* For -MD and -MMD options, write deps on file named by next arg. */ - if (!strcmp (argv[i], "-MD") || !strcmp (argv[i], "-MMD")) - { - if (i+1 == argc) - goto missing_filename; - opts->deps_file = argv[++i]; - } - else - { - /* For -M and -MM, write deps on standard output - and suppress the usual output. */ - opts->no_output = 1; - } - break; - - case 'd': - { - char *p = argv[i] + 2; - char c; - while ((c = *p++) != 0) { - /* Arg to -d specifies what parts of macros to dump */ - switch (c) { - case 'M': - opts->dump_macros = dump_only; - opts->no_output = 1; - break; - case 'N': - opts->dump_macros = dump_names; - break; - case 'D': - opts->dump_macros = dump_definitions; - break; - case 'I': - opts->dump_includes = 1; - break; - } - } - } - break; - - case 'g': - if (argv[i][2] == '3') - opts->debug_output = 1; - break; - - case '-': - if (strcmp (argv[i], "--help") != 0) - return i; - print_help (); - break; - - case 'v': - cpp_notice ("GNU CPP version %s", version_string); -#ifdef TARGET_VERSION - TARGET_VERSION; -#endif - fprintf (stderr, "\n"); - opts->verbose = 1; - break; - - case 'H': - opts->print_include_names = 1; - break; - - case 'D': - if (argv[i][2] != 0) - push_pending (pfile, "-D", argv[i] + 2); - else if (i + 1 == argc) - { - cpp_fatal (pfile, "Macro name missing after -D option"); - return argc; - } - else - i++, push_pending (pfile, "-D", argv[i]); - break; - - case 'A': - { - char *p; - - if (argv[i][2] != 0) - p = argv[i] + 2; - else if (i + 1 == argc) - { - cpp_fatal (pfile, "Assertion missing after -A option"); - return argc; - } - else - p = argv[++i]; - - if (!strcmp (p, "-")) { - struct cpp_pending **ptr; - /* -A- eliminates all predefined macros and assertions. - Let's include also any that were specified earlier - on the command line. That way we can get rid of any - that were passed automatically in from GCC. */ - opts->inhibit_predefs = 1; - for (ptr = &opts->pending; *ptr != NULL; ) - { - struct cpp_pending *pend = *ptr; - if (pend->cmd && pend->cmd[0] == '-' - && (pend->cmd[1] == 'D' || pend->cmd[1] == 'A')) - { - *ptr = pend->next; - free (pend); - } - else - ptr = &pend->next; - } - } else { - push_pending (pfile, "-A", p); - } - } - break; - - case 'U': /* JF #undef something */ - if (argv[i][2] != 0) - push_pending (pfile, "-U", argv[i] + 2); - else if (i + 1 == argc) - { - cpp_fatal (pfile, "Macro name missing after -U option"); - return argc; - } - else - push_pending (pfile, "-U", argv[i+1]), i++; - break; - - case 'C': - opts->put_out_comments = 1; - break; - - case 'E': /* -E comes from cc -E; ignore it. */ - break; - - case 'P': - opts->no_line_commands = 1; - break; - - case '$': /* Don't include $ in identifiers. */ - opts->dollars_in_ident = 0; - break; - - case 'n': - if (!strcmp (argv[i], "-nostdinc")) - /* -nostdinc causes no default include directories. - You must specify all include-file directories with -I. */ - opts->no_standard_includes = 1; - else if (!strcmp (argv[i], "-nostdinc++")) - /* -nostdinc++ causes no default C++-specific include directories. */ - opts->no_standard_cplusplus_includes = 1; -#if 0 - else if (!strcmp (argv[i], "-noprecomp")) - no_precomp = 1; -#endif - break; - - case 'r': - if (!strcmp (argv[i], "-remap")) - opts->remap = 1; - break; - - case 'u': - /* Sun compiler passes undocumented switch "-undef". - Let's assume it means to inhibit the predefined symbols. */ - opts->inhibit_predefs = 1; - break; - - case '\0': /* JF handle '-' as file name meaning stdin or stdout */ - if (opts->in_fname == NULL) { - opts->in_fname = ""; - break; - } else if (opts->out_fname == NULL) { - opts->out_fname = ""; - break; - } /* else fall through into error */ - - default: - return i; - } - } - - return i + 1; -} + FORWARD (-1); + break; + } -/* Handle command-line options in (argc, argv). - Can be called multiple times, to handle multiple sets of options. - Returns if an unrecognized option is seen. - Returns number of strings consumed. */ + if (c == '$' && CPP_PEDANTIC (pfile)) + cpp_pedwarn (pfile, "`$' in identifier"); -int -cpp_handle_options (pfile, argc, argv) - cpp_reader *pfile; - int argc; - char **argv; -{ - int i; - int strings_processed; - for (i = 0; i < argc; i += strings_processed) - { - strings_processed = cpp_handle_option (pfile, argc - i, argv + i); - if (strings_processed == 0) + CPP_RESERVE(pfile, 2); /* One more for final NUL. */ + CPP_PUTC_Q (pfile, c); + c = GETC(); + if (c == EOF) break; - } - return i; + } + CPP_NUL_TERMINATE_Q (pfile); + return; } - -void -cpp_finish (pfile) + +/* Parse a string starting with C. A single quoted string is treated + like a double -- some programs (e.g., troff) are perverse this way. + (However, a single quoted string is not allowed to extend over + multiple lines.) */ +static void +parse_string (pfile, c) cpp_reader *pfile; + int c; { - struct cpp_options *opts = CPP_OPTIONS (pfile); + long start_line, start_column; - if (opts->print_deps) - { - /* Stream on which to print the dependency information. */ - FILE *deps_stream; + cpp_buf_line_and_col (cpp_file_buffer (pfile), &start_line, &start_column); - /* Don't actually write the deps file if compilation has failed. */ - if (pfile->errors == 0) + CPP_PUTC (pfile, c); + while (1) + { + int cc = GETC(); + if (cc == EOF) { - char *deps_mode = opts->print_deps_append ? "a" : "w"; - if (opts->deps_file == 0) - deps_stream = stdout; - else if ((deps_stream = fopen (opts->deps_file, deps_mode)) == 0) - cpp_pfatal_with_name (pfile, opts->deps_file); - fputs (pfile->deps_buffer, deps_stream); - putc ('\n', deps_stream); - if (opts->deps_file) + if (CPP_IS_MACRO_BUFFER (CPP_BUFFER (pfile))) { - if (ferror (deps_stream) || fclose (deps_stream) != 0) - cpp_fatal (pfile, "I/O error on output"); + /* try harder: this string crosses a macro expansion + boundary. This can happen naturally if -traditional. + Otherwise, only -D can make a macro with an unmatched + quote. */ + cpp_pop_buffer (pfile); + continue; } - } - } - -#if 0 - /* Debugging: dump statistics on the include hash table. */ - { - struct include_hash *x; - int i, j; - - for(i = 0; i < ALL_INCLUDE_HASHSIZE; i++) - { - x = pfile->all_include_files[i]; - j = 0; - while(x) - { - j++; - x = x->next; - } - fprintf(stderr, "%d/%d ", i, j); - } - fputc('\n', stderr); - } -#endif - -} -/* Free resources used by PFILE. - This is the cpp_reader 'finalizer' or 'destructor' (in C++ terminology). */ - -void -cpp_cleanup (pfile) - cpp_reader *pfile; -{ - int i; - while ( CPP_BUFFER (pfile) != CPP_NULL_BUFFER (pfile)) - cpp_pop_buffer (pfile); + cpp_error_with_line (pfile, start_line, start_column, + "unterminated string or character constant"); + if (pfile->multiline_string_line != start_line + && pfile->multiline_string_line != 0) + cpp_error_with_line (pfile, + pfile->multiline_string_line, -1, + "possible real start of unterminated constant"); + pfile->multiline_string_line = 0; + break; + } + CPP_PUTC (pfile, cc); + switch (cc) + { + case '\n': + CPP_BUMP_LINE (pfile); + pfile->lineno++; - if (pfile->token_buffer) - { - free (pfile->token_buffer); - pfile->token_buffer = NULL; - } + /* In Fortran and assembly language, silently terminate + strings of either variety at end of line. This is a + kludge around not knowing where comments are in these + languages. */ + if (CPP_OPTIONS (pfile)->lang_fortran + || CPP_OPTIONS (pfile)->lang_asm) + return; + /* Character constants may not extend over multiple lines. + In Standard C, neither may strings. We accept multiline + strings as an extension. */ + if (c == '\'') + { + cpp_error_with_line (pfile, start_line, start_column, + "unterminated character constant"); + return; + } + if (CPP_PEDANTIC (pfile) && pfile->multiline_string_line == 0) + cpp_pedwarn_with_line (pfile, start_line, start_column, + "string constant runs past end of line"); + if (pfile->multiline_string_line == 0) + pfile->multiline_string_line = start_line; + break; - if (pfile->deps_buffer) - { - free (pfile->deps_buffer); - pfile->deps_buffer = NULL; - pfile->deps_allocated_size = 0; - } + case '\r': + CPP_ADJUST_WRITTEN (pfile, -1); + if (CPP_BUFFER (pfile)->has_escapes) + { + cpp_ice (pfile, "\\r escape inside string constant"); + FORWARD(1); + } + else + /* Backslash newline is replaced by nothing at all. */ + CPP_BUMP_LINE (pfile); + break; - while (pfile->if_stack) - { - IF_STACK_FRAME *temp = pfile->if_stack; - pfile->if_stack = temp->next; - free (temp); - } + case '\\': + cc = GETC(); + if (cc != EOF) + CPP_PUTC (pfile, cc); + break; - for (i = ALL_INCLUDE_HASHSIZE; --i >= 0; ) - { - struct include_hash *imp = pfile->all_include_files[i]; - while (imp) - { - struct include_hash *next = imp->next; -#if 0 - /* This gets freed elsewhere - I think. */ - free (imp->name); -#endif - free (imp); - imp = next; + case '\"': + case '\'': + if (cc == c) + return; + break; } - pfile->all_include_files[i] = 0; } - - cpp_hash_cleanup (pfile); } - + /* Read an assertion into the token buffer, converting to canonical form: `#predicate(a n swe r)' The next non-whitespace character to read should be the first letter of the predicate. @@ -5632,7 +2928,7 @@ parse_assertion (pfile) int c, dropwhite; cpp_skip_hspace (pfile); c = PEEKC(); - if (! is_idstart[c]) + if (! is_idstart(c)) { cpp_error (pfile, "assertion predicate is not an identifier"); return 0; @@ -5644,7 +2940,7 @@ parse_assertion (pfile) c = PEEKC(); if (c != '(') { - if (is_hor_space[c]) + if (is_hspace(c) || c == '\r') cpp_skip_hspace (pfile); c = PEEKC(); } @@ -5656,7 +2952,7 @@ parse_assertion (pfile) dropwhite = 1; while ((c = GETC()) != ')') { - if (is_hor_space[c]) + if (is_space(c)) { if (! dropwhite) { @@ -5664,17 +2960,18 @@ parse_assertion (pfile) dropwhite = 1; } } - else if (c == '\\' && PEEKC() == '\n') - FORWARD(1); else if (c == '\n' || c == EOF) { if (c == '\n') FORWARD(-1); cpp_error (pfile, "un-terminated assertion answer"); return 0; } + else if (c == '\r') + /* \r cannot be a macro escape here. */ + CPP_BUMP_LINE (pfile); else { - CPP_PUTC(pfile, c); + CPP_PUTC (pfile, c); dropwhite = 0; } } @@ -5687,16 +2984,16 @@ parse_assertion (pfile) return 0; } else - CPP_PUTC(pfile, ')'); + CPP_PUTC (pfile, ')'); - CPP_NUL_TERMINATE(pfile); + CPP_NUL_TERMINATE (pfile); return 2; } static int do_assert (pfile, keyword) cpp_reader *pfile; - struct directive *keyword ATTRIBUTE_UNUSED; + const struct directive *keyword ATTRIBUTE_UNUSED; { char *sym; int ret, c; @@ -5708,7 +3005,7 @@ do_assert (pfile, keyword) cpp_pedwarn (pfile, "ANSI C does not allow `#assert'"); cpp_skip_hspace (pfile); - sym = CPP_PWRITTEN (pfile); /* remember where it starts */ + sym = (char *) CPP_PWRITTEN (pfile); /* remember where it starts */ ret = parse_assertion (pfile); if (ret == 0) goto error; @@ -5728,41 +3025,40 @@ do_assert (pfile, keyword) thislen = strlen (sym); baselen = index (sym, '(') - sym; - this = cpp_lookup (pfile, sym, thislen, -1); + this = cpp_lookup (pfile, sym, thislen); if (this) { cpp_warning (pfile, "`%s' re-asserted", sym); goto error; } - base = cpp_lookup (pfile, sym, baselen, -1); + base = cpp_lookup (pfile, sym, baselen); if (! base) - base = install (sym, baselen, T_ASSERT, 0, -1); + base = cpp_install (pfile, sym, baselen, T_ASSERT, 0); else if (base->type != T_ASSERT) { /* Token clash - but with what?! */ - cpp_fatal (pfile, - "cpp internal error: base->type != T_ASSERT in do_assert"); + cpp_ice (pfile, "base->type != T_ASSERT in do_assert"); goto error; } - this = install (sym, thislen, T_ASSERT, - (char *)base->value.aschain, -1); + this = cpp_install (pfile, sym, thislen, T_ASSERT, + (char *)base->value.aschain); base->value.aschain = this; - pfile->limit = sym; /* Pop */ + pfile->limit = (unsigned char *) sym; /* Pop */ return 0; error: - pfile->limit = sym; /* Pop */ skip_rest_of_line (pfile); - return 1; + pfile->limit = (unsigned char *) sym; /* Pop */ + return 0; } static int do_unassert (pfile, keyword) cpp_reader *pfile; - struct directive *keyword ATTRIBUTE_UNUSED; + const struct directive *keyword ATTRIBUTE_UNUSED; { int c, ret; char *sym; @@ -5775,7 +3071,7 @@ do_unassert (pfile, keyword) cpp_skip_hspace (pfile); - sym = CPP_PWRITTEN (pfile); /* remember where it starts */ + sym = (char *) CPP_PWRITTEN (pfile); /* remember where it starts */ ret = parse_assertion (pfile); if (ret == 0) goto error; @@ -5788,7 +3084,7 @@ do_unassert (pfile, keyword) thislen = strlen (sym); if (ret == 1) { - base = cpp_lookup (pfile, sym, thislen, -1); + base = cpp_lookup (pfile, sym, thislen); if (! base) goto error; /* It isn't an error to #undef what isn't #defined, so it isn't an error to #unassert what isn't @@ -5804,9 +3100,9 @@ do_unassert (pfile, keyword) else { baselen = index (sym, '(') - sym; - base = cpp_lookup (pfile, sym, baselen, -1); + base = cpp_lookup (pfile, sym, baselen); if (! base) goto error; - this = cpp_lookup (pfile, sym, thislen, -1); + this = cpp_lookup (pfile, sym, thislen); if (! this) goto error; next = base; @@ -5820,21 +3116,34 @@ do_unassert (pfile, keyword) delete_macro (base); /* Last answer for this predicate deleted. */ } - pfile->limit = sym; /* Pop */ + pfile->limit = (unsigned char *) sym; /* Pop */ return 0; error: - pfile->limit = sym; /* Pop */ skip_rest_of_line (pfile); - return 1; + pfile->limit = (unsigned char *) sym; /* Pop */ + return 0; } +/* Process STR as if it appeared as the body of an #unassert. */ +void +cpp_unassert (pfile, str) + cpp_reader *pfile; + unsigned char *str; +{ + if (cpp_push_buffer (pfile, str, strlen (str)) != NULL) + { + do_assert (pfile, NULL); + cpp_pop_buffer (pfile); + } +} + int cpp_read_check_assertion (pfile) cpp_reader *pfile; { - char *name = CPP_PWRITTEN (pfile); + U_CHAR *name; int result; - HASHNODE *hp; + long written = CPP_WRITTEN (pfile); FORWARD (1); /* Skip '#' */ cpp_skip_hspace (pfile); @@ -5842,410 +3151,44 @@ cpp_read_check_assertion (pfile) result = 0; else { - hp = cpp_lookup (pfile, name, (char *)CPP_PWRITTEN (pfile) - name, -1); - result = (hp != 0); + name = pfile->token_buffer + written; + result = cpp_defined (pfile, name, CPP_PWRITTEN (pfile) - name); } - pfile->limit = name; + CPP_SET_WRITTEN (pfile, written); return result; } -/* Initialize PMARK to remember the current position of PFILE. */ - -void -parse_set_mark (pmark, pfile) - struct parse_marker *pmark; - cpp_reader *pfile; -{ - cpp_buffer *pbuf = CPP_BUFFER (pfile); - pmark->next = pbuf->marks; - pbuf->marks = pmark; - pmark->buf = pbuf; - pmark->position = pbuf->cur - pbuf->buf; -} - -/* Cleanup PMARK - we no longer need it. */ - -void -parse_clear_mark (pmark) - struct parse_marker *pmark; -{ - struct parse_marker **pp = &pmark->buf->marks; - for (; ; pp = &(*pp)->next) { - if (*pp == NULL) abort (); - if (*pp == pmark) break; - } - *pp = pmark->next; -} - -/* Backup the current position of PFILE to that saved in PMARK. */ - -void -parse_goto_mark (pmark, pfile) - struct parse_marker *pmark; - cpp_reader *pfile; -{ - cpp_buffer *pbuf = CPP_BUFFER (pfile); - if (pbuf != pmark->buf) - cpp_fatal (pfile, "internal error %s", "parse_goto_mark"); - pbuf->cur = pbuf->buf + pmark->position; -} - -/* Reset PMARK to point to the current position of PFILE. (Same - as parse_clear_mark (PMARK), parse_set_mark (PMARK, PFILE) but faster. */ - -void -parse_move_mark (pmark, pfile) - struct parse_marker *pmark; - cpp_reader *pfile; -{ - cpp_buffer *pbuf = CPP_BUFFER (pfile); - if (pbuf != pmark->buf) - cpp_fatal (pfile, "internal error %s", "parse_move_mark"); - pmark->position = pbuf->cur - pbuf->buf; -} - - -void -cpp_print_file_and_line (pfile) - cpp_reader *pfile; -{ - cpp_buffer *ip = cpp_file_buffer (pfile); - - if (ip != NULL) - { - long line, col; - cpp_buf_line_and_col (ip, &line, &col); - cpp_file_line_for_message (pfile, ip->nominal_fname, - line, pfile->show_column ? col : -1); - } -} - -static void -v_cpp_error (pfile, msgid, ap) - cpp_reader *pfile; - const char *msgid; - va_list ap; -{ - cpp_print_containing_files (pfile); - cpp_print_file_and_line (pfile); - v_cpp_message (pfile, 1, msgid, ap); -} - -void -cpp_error VPROTO ((cpp_reader * pfile, const char *msgid, ...)) -{ -#ifndef ANSI_PROTOTYPES - cpp_reader *pfile; - const char *msgid; -#endif - va_list ap; - - VA_START(ap, msgid); - -#ifndef ANSI_PROTOTYPES - pfile = va_arg (ap, cpp_reader *); - msgid = va_arg (ap, const char *); -#endif - - v_cpp_error (pfile, msgid, ap); - va_end(ap); -} - -/* Print error message but don't count it. */ - -static void -v_cpp_warning (pfile, msgid, ap) - cpp_reader *pfile; - const char *msgid; - va_list ap; -{ - if (CPP_OPTIONS (pfile)->inhibit_warnings) - return; - - if (CPP_OPTIONS (pfile)->warnings_are_errors) - pfile->errors++; - - cpp_print_containing_files (pfile); - cpp_print_file_and_line (pfile); - v_cpp_message (pfile, 0, msgid, ap); -} - -void -cpp_warning VPROTO ((cpp_reader * pfile, const char *msgid, ...)) -{ -#ifndef ANSI_PROTOTYPES - cpp_reader *pfile; - const char *msgid; -#endif - va_list ap; - - VA_START (ap, msgid); - -#ifndef ANSI_PROTOTYPES - pfile = va_arg (ap, cpp_reader *); - msgid = va_arg (ap, const char *); -#endif - - v_cpp_warning (pfile, msgid, ap); - va_end(ap); -} - -/* Print an error message and maybe count it. */ - -void -cpp_pedwarn VPROTO ((cpp_reader * pfile, const char *msgid, ...)) -{ -#ifndef ANSI_PROTOTYPES - cpp_reader *pfile; - const char *msgid; -#endif - va_list ap; - - VA_START (ap, msgid); - -#ifndef ANSI_PROTOTYPES - pfile = va_arg (ap, cpp_reader *); - msgid = va_arg (ap, const char *); -#endif +/* Remember the current position of PFILE so it may be returned to + after looking ahead a bit. - if (CPP_OPTIONS (pfile)->pedantic_errors) - v_cpp_error (pfile, msgid, ap); - else - v_cpp_warning (pfile, msgid, ap); - va_end(ap); -} + Note that when you set a mark, you _must_ return to that mark. You + may not forget about it and continue parsing. You may not pop a + buffer with an active mark. You may not call CPP_BUMP_LINE while a + mark is active. */ static void -v_cpp_error_with_line (pfile, line, column, msgid, ap) - cpp_reader * pfile; - int line; - int column; - const char * msgid; - va_list ap; +parse_set_mark (pfile) + cpp_reader *pfile; { - cpp_buffer *ip = cpp_file_buffer (pfile); - - cpp_print_containing_files (pfile); - - if (ip != NULL) - cpp_file_line_for_message (pfile, ip->nominal_fname, line, column); + cpp_buffer *ip = CPP_BUFFER (pfile); + if (ACTIVE_MARK_P()) + cpp_ice (pfile, "mark active in parse_set_mark"); - v_cpp_message (pfile, 1, msgid, ap); + ip->mark = ip->cur - ip->buf; } -void -cpp_error_with_line VPROTO ((cpp_reader * pfile, int line, int column, - const char *msgid, ...)) -{ -#ifndef ANSI_PROTOTYPES - cpp_reader *pfile; - int line; - int column; - const char *msgid; -#endif - va_list ap; - - VA_START (ap, msgid); - -#ifndef ANSI_PROTOTYPES - pfile = va_arg (ap, cpp_reader *); - line = va_arg (ap, int); - column = va_arg (ap, int); - msgid = va_arg (ap, const char *); -#endif - - v_cpp_error_with_line(pfile, line, column, msgid, ap); - va_end(ap); -} +/* Backup the current position of PFILE to that saved in its mark, + and clear the mark. */ static void -v_cpp_warning_with_line (pfile, line, column, msgid, ap) - cpp_reader * pfile; - int line; - int column; - const char *msgid; - va_list ap; -{ - cpp_buffer *ip; - - if (CPP_OPTIONS (pfile)->inhibit_warnings) - return; - - if (CPP_OPTIONS (pfile)->warnings_are_errors) - pfile->errors++; - - cpp_print_containing_files (pfile); - - ip = cpp_file_buffer (pfile); - - if (ip != NULL) - cpp_file_line_for_message (pfile, ip->nominal_fname, line, column); - - v_cpp_message (pfile, 0, msgid, ap); -} - -void -cpp_warning_with_line VPROTO ((cpp_reader * pfile, int line, int column, - const char *msgid, ...)) -{ -#ifndef ANSI_PROTOTYPES - cpp_reader *pfile; - int line; - int column; - const char *msgid; -#endif - va_list ap; - - VA_START (ap, msgid); - -#ifndef ANSI_PROTOTYPES - pfile = va_arg (ap, cpp_reader *); - line = va_arg (ap, int); - column = va_arg (ap, int); - msgid = va_arg (ap, const char *); -#endif - - v_cpp_warning_with_line (pfile, line, column, msgid, ap); - va_end(ap); -} - -void -cpp_pedwarn_with_line VPROTO ((cpp_reader * pfile, int line, int column, - const char *msgid, ...)) -{ -#ifndef ANSI_PROTOTYPES - cpp_reader *pfile; - int line; - int column; - const char *msgid; -#endif - va_list ap; - - VA_START (ap, msgid); - -#ifndef ANSI_PROTOTYPES - pfile = va_arg (ap, cpp_reader *); - line = va_arg (ap, int); - column = va_arg (ap, int); - msgid = va_arg (ap, const char *); -#endif - - if (CPP_OPTIONS (pfile)->pedantic_errors) - v_cpp_error_with_line (pfile, column, line, msgid, ap); - else - v_cpp_warning_with_line (pfile, line, column, msgid, ap); - va_end(ap); -} - -/* Report a warning (or an error if pedantic_errors) - giving specified file name and line number, not current. */ - -void -cpp_pedwarn_with_file_and_line VPROTO ((cpp_reader *pfile, char *file, int line, - const char *msgid, ...)) -{ -#ifndef ANSI_PROTOTYPES - cpp_reader *pfile; - char *file; - int line; - const char *msgid; -#endif - va_list ap; - - VA_START (ap, msgid); - -#ifndef ANSI_PROTOTYPES - pfile = va_arg (ap, cpp_reader *); - file = va_arg (ap, char *); - line = va_arg (ap, int); - msgid = va_arg (ap, const char *); -#endif - - if (!CPP_OPTIONS (pfile)->pedantic_errors - && CPP_OPTIONS (pfile)->inhibit_warnings) - return; - if (file != NULL) - cpp_file_line_for_message (pfile, file, line, -1); - v_cpp_message (pfile, CPP_OPTIONS (pfile)->pedantic_errors, msgid, ap); - va_end(ap); -} - -/* my_strerror - return the descriptive text associated with an - `errno' code. */ - -static char * -my_strerror (errnum) - int errnum; -{ - char *result; - -#ifndef VMS -#ifndef HAVE_STRERROR - result = (char *) ((errnum < sys_nerr) ? sys_errlist[errnum] : 0); -#else - result = strerror (errnum); -#endif -#else /* VMS */ - /* VAXCRTL's strerror() takes an optional second argument, which only - matters when the first argument is EVMSERR. However, it's simplest - just to pass it unconditionally. `vaxc$errno' is declared in - , and maintained by the library in parallel with `errno'. - We assume that caller's `errnum' either matches the last setting of - `errno' by the library or else does not have the value `EVMSERR'. */ - - result = strerror (errnum, vaxc$errno); -#endif - - if (!result) - result = "errno = ?"; - - return result; -} - -/* Error including a message from `errno'. */ - -void -cpp_error_from_errno (pfile, name) - cpp_reader *pfile; - const char *name; -{ - cpp_message_from_errno (pfile, 1, name); -} - -void -cpp_message_from_errno (pfile, is_error, name) +parse_goto_mark (pfile) cpp_reader *pfile; - int is_error; - const char *name; { - int e = errno; - cpp_buffer *ip = cpp_file_buffer (pfile); - - cpp_print_containing_files (pfile); - - if (ip != NULL) - cpp_file_line_for_message (pfile, ip->nominal_fname, ip->lineno, -1); - - cpp_message (pfile, is_error, "%s: %s", name, my_strerror (e)); -} + cpp_buffer *ip = CPP_BUFFER (pfile); + if (!ACTIVE_MARK_P()) + cpp_ice (pfile, "mark not active in parse_goto_mark"); -void -cpp_perror_with_name (pfile, name) - cpp_reader *pfile; - const char *name; -{ - cpp_message (pfile, 1, "%s: %s: %s", progname, name, my_strerror (errno)); + ip->cur = ip->buf + ip->mark; + ip->mark = -1; } - -/* TODO: - * No pre-compiled header file support. - * - * Possibly different enum token codes for each C/C++ token. - * - * Find and cleanup remaining uses of static variables, - * - * Support -dM flag (dump_all_macros). - * - * Support for_lint flag. - */