Based on CCCP program by Paul Rubin, June 1986
Adapted to ANSI C, Richard Stallman, Jan 1987
Broken out to separate file, Zack Weinberg, Mar 2000
+ Single-pass line tokenization by Neil Booth, April 2000
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
along with this program; if not, write to the Free Software
Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+/*
+
+Cleanups to do:-
+
+o Distinguish integers, floats, and 'other' pp-numbers.
+o Store ints and char constants as binary values.
+o New command-line assertion syntax.
+o Comment all functions, and describe macro expansion algorithm.
+o Move as much out of header files as possible.
+o Remove single quote pairs `', and some '', from diagnostics.
+o Correct pastability test for CPP_NAME and CPP_NUMBER.
+
+*/
+
#include "config.h"
#include "system.h"
#include "intl.h"
#include "cpplib.h"
#include "cpphash.h"
-
-#define PEEKBUF(BUFFER, N) \
- ((BUFFER)->rlimit - (BUFFER)->cur > (N) ? (BUFFER)->cur[N] : EOF)
-#define GETBUF(BUFFER) \
- ((BUFFER)->cur < (BUFFER)->rlimit ? *(BUFFER)->cur++ : EOF)
-#define FORWARDBUF(BUFFER, N) ((BUFFER)->cur += (N))
-
-#define PEEKN(N) PEEKBUF (CPP_BUFFER (pfile), N)
-#define FORWARD(N) FORWARDBUF (CPP_BUFFER (pfile), (N))
-#define GETC() GETBUF (CPP_BUFFER (pfile))
-#define PEEKC() PEEKBUF (CPP_BUFFER (pfile), 0)
-
-static void skip_block_comment PARAMS ((cpp_reader *));
-static void skip_line_comment PARAMS ((cpp_reader *));
-static int maybe_macroexpand PARAMS ((cpp_reader *, long));
-static int skip_comment PARAMS ((cpp_reader *, int));
-static int copy_comment PARAMS ((cpp_reader *, int));
-static void skip_string PARAMS ((cpp_reader *, int));
-static void parse_string PARAMS ((cpp_reader *, int));
-static U_CHAR *find_position PARAMS ((U_CHAR *, U_CHAR *, unsigned long *));
-static int null_cleanup PARAMS ((cpp_buffer *, cpp_reader *));
-static void null_warning PARAMS ((cpp_reader *, unsigned int));
-
-/* Re-allocates PFILE->token_buffer so it will hold at least N more chars. */
-
-void
-_cpp_grow_token_buffer (pfile, n)
- cpp_reader *pfile;
- long n;
+#include "symcat.h"
+
+const unsigned char *_cpp_digraph_spellings [] = {U"%:", U"%:%:", U"<:",
+ U":>", U"<%", U"%>"};
+static const cpp_token placemarker_token = {0, 0, CPP_PLACEMARKER,
+ 0 UNION_INIT_ZERO};
+static const cpp_token eof_token = {0, 0, CPP_EOF, 0 UNION_INIT_ZERO};
+
+/* Flags for cpp_context. */
+#define CONTEXT_PASTEL (1 << 0) /* An argument context on LHS of ##. */
+#define CONTEXT_PASTER (1 << 1) /* An argument context on RHS of ##. */
+#define CONTEXT_RAW (1 << 2) /* If argument tokens already expanded. */
+#define CONTEXT_ARG (1 << 3) /* If an argument context. */
+#define CONTEXT_VARARGS (1 << 4) /* If a varargs argument context. */
+
+typedef struct cpp_context cpp_context;
+struct cpp_context
{
- long old_written = CPP_WRITTEN (pfile);
- pfile->token_buffer_size = n + 2 * pfile->token_buffer_size;
- pfile->token_buffer = (U_CHAR *)
- xrealloc(pfile->token_buffer, pfile->token_buffer_size);
- CPP_SET_WRITTEN (pfile, old_written);
-}
-
-static int
-null_cleanup (pbuf, pfile)
- cpp_buffer *pbuf ATTRIBUTE_UNUSED;
- cpp_reader *pfile ATTRIBUTE_UNUSED;
+ union
+ {
+ const cpp_toklist *list; /* Used for macro contexts only. */
+ const cpp_token **arg; /* Used for arg contexts only. */
+ } u;
+
+ /* Pushed token to be returned by next call to get_raw_token. */
+ const cpp_token *pushed_token;
+
+ struct macro_args *args; /* The arguments for a function-like
+ macro. NULL otherwise. */
+ unsigned short posn; /* Current posn, index into u. */
+ unsigned short count; /* No. of tokens in u. */
+ unsigned short level;
+ unsigned char flags;
+};
+
+typedef struct macro_args macro_args;
+struct macro_args
{
- return 0;
-}
-
-/* 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
- as the new input buffer.
- Return the new buffer, or NULL on failure. */
-
-cpp_buffer *
-cpp_push_buffer (pfile, buffer, length)
- cpp_reader *pfile;
- const U_CHAR *buffer;
- long length;
+ unsigned int *ends;
+ const cpp_token **tokens;
+ unsigned int capacity;
+ unsigned int used;
+ unsigned short level;
+};
+
+static const cpp_token *get_raw_token PARAMS ((cpp_reader *));
+static const cpp_token *parse_arg PARAMS ((cpp_reader *, int, unsigned int,
+ macro_args *, unsigned int *));
+static int parse_args PARAMS ((cpp_reader *, cpp_hashnode *, macro_args *));
+static void save_token PARAMS ((macro_args *, const cpp_token *));
+static int pop_context PARAMS ((cpp_reader *));
+static int push_macro_context PARAMS ((cpp_reader *, const cpp_token *));
+static void push_arg_context PARAMS ((cpp_reader *, const cpp_token *));
+static void free_macro_args PARAMS ((macro_args *));
+
+static cppchar_t handle_newline PARAMS ((cpp_buffer *, cppchar_t));
+static cppchar_t skip_escaped_newlines PARAMS ((cpp_buffer *, cppchar_t));
+static cppchar_t get_effective_char PARAMS ((cpp_buffer *));
+
+static int skip_block_comment PARAMS ((cpp_reader *));
+static int skip_line_comment PARAMS ((cpp_reader *));
+static void adjust_column PARAMS ((cpp_reader *));
+static void skip_whitespace PARAMS ((cpp_reader *, cppchar_t));
+static cpp_hashnode *parse_identifier PARAMS ((cpp_reader *, cppchar_t));
+static void parse_number PARAMS ((cpp_reader *, cpp_string *, cppchar_t));
+static void parse_string PARAMS ((cpp_reader *, cpp_token *, cppchar_t));
+static void unterminated PARAMS ((cpp_reader *, unsigned int, int));
+static int trigraph_ok PARAMS ((cpp_reader *, cppchar_t));
+static void save_comment PARAMS ((cpp_reader *, cpp_token *, const U_CHAR *));
+static void lex_percent PARAMS ((cpp_buffer *, cpp_token *));
+static void lex_dot PARAMS ((cpp_reader *, cpp_token *));
+static void lex_line PARAMS ((cpp_reader *, cpp_toklist *));
+static void lex_token PARAMS ((cpp_reader *, cpp_token *));
+static int lex_next PARAMS ((cpp_reader *, int));
+
+static int is_macro_disabled PARAMS ((cpp_reader *, const cpp_toklist *,
+ const cpp_token *));
+
+static cpp_token *stringify_arg PARAMS ((cpp_reader *, const cpp_token *));
+static void expand_context_stack PARAMS ((cpp_reader *));
+static unsigned char * spell_token PARAMS ((cpp_reader *, const cpp_token *,
+ unsigned char *));
+typedef unsigned int (* speller) PARAMS ((unsigned char *, cpp_toklist *,
+ cpp_token *));
+static cpp_token *make_string_token PARAMS ((cpp_token *, const U_CHAR *,
+ unsigned int));
+static cpp_token *alloc_number_token PARAMS ((cpp_reader *, int number));
+static const cpp_token *special_symbol PARAMS ((cpp_reader *, cpp_hashnode *,
+ const cpp_token *));
+static cpp_token *duplicate_token PARAMS ((cpp_reader *, const cpp_token *));
+static const cpp_token *maybe_paste_with_next PARAMS ((cpp_reader *,
+ const cpp_token *));
+static unsigned int prevent_macro_expansion PARAMS ((cpp_reader *));
+static void restore_macro_expansion PARAMS ((cpp_reader *, unsigned int));
+static cpp_token *get_temp_token PARAMS ((cpp_reader *));
+static void release_temp_tokens PARAMS ((cpp_reader *));
+static U_CHAR * quote_string PARAMS ((U_CHAR *, const U_CHAR *, unsigned int));
+
+#define VALID_SIGN(c, prevc) \
+ (((c) == '+' || (c) == '-') && \
+ ((prevc) == 'e' || (prevc) == 'E' \
+ || (((prevc) == 'p' || (prevc) == 'P') && !CPP_OPTION (pfile, c89))))
+
+/* An upper bound on the number of bytes needed to spell a token,
+ including preceding whitespace. */
+static inline size_t TOKEN_LEN PARAMS ((const cpp_token *));
+static inline size_t
+TOKEN_LEN (token)
+ const cpp_token *token;
{
- cpp_buffer *buf = CPP_BUFFER (pfile);
- cpp_buffer *new;
- if (++pfile->buffer_stack_depth == CPP_STACK_MAX)
+ size_t len;
+
+ switch (TOKEN_SPELL (token))
{
- cpp_fatal (pfile, "macro or `#include' recursion too deep");
- return NULL;
+ default: len = 0; break;
+ case SPELL_STRING: len = token->val.str.len; break;
+ case SPELL_IDENT: len = token->val.node->length; break;
}
+ return len + 5;
+}
- new = (cpp_buffer *) xcalloc (1, sizeof (cpp_buffer));
+#define IS_ARG_CONTEXT(c) ((c)->flags & CONTEXT_ARG)
+#define CURRENT_CONTEXT(pfile) ((pfile)->contexts + (pfile)->cur_context)
- new->if_stack = pfile->if_stack;
- new->cleanup = null_cleanup;
- new->buf = new->cur = buffer;
- new->rlimit = buffer + length;
- new->prev = buf;
- new->mark = NULL;
- new->line_base = NULL;
+#define ASSIGN_FLAGS_AND_POS(d, s) \
+ do {(d)->flags = (s)->flags & (PREV_WHITE | BOL | PASTE_LEFT); \
+ if ((d)->flags & BOL) {(d)->col = (s)->col; (d)->line = (s)->line;} \
+ } while (0)
- CPP_BUFFER (pfile) = new;
- return new;
-}
+/* f is flags, just consisting of PREV_WHITE | BOL. */
+#define MODIFY_FLAGS_AND_POS(d, s, f) \
+ do {(d)->flags &= ~(PREV_WHITE | BOL); (d)->flags |= (f); \
+ if ((f) & BOL) {(d)->col = (s)->col; (d)->line = (s)->line;} \
+ } while (0)
-cpp_buffer *
-cpp_pop_buffer (pfile)
- cpp_reader *pfile;
-{
- cpp_buffer *buf = CPP_BUFFER (pfile);
- if (ACTIVE_MARK_P (pfile))
- cpp_ice (pfile, "mark active in cpp_pop_buffer");
- (*buf->cleanup) (buf, pfile);
- CPP_BUFFER (pfile) = CPP_PREV_BUFFER (buf);
- free (buf);
- pfile->buffer_stack_depth--;
- return CPP_BUFFER (pfile);
-}
+#define OP(e, s) { SPELL_OPERATOR, U s },
+#define TK(e, s) { s, U STRINGX (e) },
-/* Scan until CPP_BUFFER (PFILE) is exhausted into PFILE->token_buffer.
- Pop the buffer when done. */
+const struct token_spelling
+_cpp_token_spellings [N_TTYPES] = {TTYPE_TABLE };
-void
-cpp_scan_buffer (pfile)
+#undef OP
+#undef TK
+
+/* Helper routine used by parse_include, which can't see spell_token.
+ Reinterpret the current line as an h-char-sequence (< ... >); we are
+ looking at the first token after the <. */
+const cpp_token *
+_cpp_glue_header_name (pfile)
cpp_reader *pfile;
{
- cpp_buffer *buffer = CPP_BUFFER (pfile);
- enum cpp_token token;
- if (CPP_OPTION (pfile, no_output))
- {
- long old_written = CPP_WRITTEN (pfile);
- /* In no-output mode, we can ignore everything but directives. */
- for (;;)
- {
- if (! pfile->only_seen_white)
- _cpp_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)) != NULL)
- cpp_pop_buffer (pfile);
- break;
- }
- }
- CPP_SET_WRITTEN (pfile, old_written);
- }
- else
+ const cpp_token *t;
+ cpp_token *hdr;
+ U_CHAR *buf, *p;
+ size_t len, avail;
+
+ avail = 40;
+ len = 0;
+ buf = xmalloc (avail);
+
+ for (;;)
{
- for (;;)
+ t = _cpp_get_token (pfile);
+ if (t->type == CPP_GREATER || t->type == CPP_EOF)
+ break;
+
+ if (len + TOKEN_LEN (t) > avail)
{
- 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)) != NULL)
- cpp_pop_buffer (pfile);
- break;
- }
+ avail = len + TOKEN_LEN (t) + 40;
+ buf = xrealloc (buf, avail);
}
+
+ if (t->flags & PREV_WHITE)
+ buf[len++] = ' ';
+
+ p = spell_token (pfile, t, buf + len);
+ len = (size_t) (p - buf); /* p known >= buf */
}
+
+ if (t->type == CPP_EOF)
+ cpp_error (pfile, "missing terminating > character");
+
+ buf = xrealloc (buf, len);
+
+ hdr = get_temp_token (pfile);
+ hdr->type = CPP_HEADER_NAME;
+ hdr->flags = 0;
+ hdr->val.str.text = buf;
+ hdr->val.str.len = len;
+ return hdr;
}
-/*
- * Rescan a string (which may have escape marks) into pfile's buffer.
- * Place the result in pfile->token_buffer.
- *
- * The input is copied before it is scanned, so it is safe to pass
- * it something from the token_buffer that will get overwritten
- * (because it follows CPP_WRITTEN). This is used by do_include.
- */
+/* Token-buffer helper functions. */
+/* Expand a token list's string space. It is *vital* that
+ list->tokens_used is correct, to get pointer fix-up right. */
void
-cpp_expand_to_buffer (pfile, buf, length)
- cpp_reader *pfile;
- const U_CHAR *buf;
- int length;
+_cpp_expand_name_space (list, len)
+ cpp_toklist *list;
+ unsigned int len;
{
- register cpp_buffer *ip;
- U_CHAR *buf1;
- int save_no_output;
+ const U_CHAR *old_namebuf;
- if (length < 0)
- {
- cpp_ice (pfile, "length < 0 in cpp_expand_to_buffer");
- return;
- }
+ old_namebuf = list->namebuf;
+ list->name_cap += len;
+ list->namebuf = (unsigned char *) xrealloc (list->namebuf, list->name_cap);
- /* Set up the input on the input stack. */
+ /* Fix up token text pointers. */
+ if (list->namebuf != old_namebuf)
+ {
+ unsigned int i;
- buf1 = (U_CHAR *) alloca (length + 1);
- memcpy (buf1, buf, length);
- buf1[length] = 0;
+ for (i = 0; i < list->tokens_used; i++)
+ if (TOKEN_SPELL (&list->tokens[i]) == SPELL_STRING)
+ list->tokens[i].val.str.text += (list->namebuf - old_namebuf);
+ }
+}
- ip = cpp_push_buffer (pfile, buf1, length);
- if (ip == NULL)
- return;
- ip->has_escapes = 1;
+/* If there is not enough room for LEN more characters, expand the
+ list by just enough to have room for LEN characters. */
+void
+_cpp_reserve_name_space (list, len)
+ cpp_toklist *list;
+ unsigned int len;
+{
+ unsigned int room = list->name_cap - list->name_used;
- /* Scan the input, create the output. */
- save_no_output = CPP_OPTION (pfile, no_output);
- CPP_OPTION (pfile, no_output) = 0;
- CPP_OPTION (pfile, no_line_commands)++;
- cpp_scan_buffer (pfile);
- CPP_OPTION (pfile, no_line_commands)--;
- CPP_OPTION (pfile, no_output) = save_no_output;
+ if (room < len)
+ _cpp_expand_name_space (list, len - room);
+}
- CPP_NUL_TERMINATE (pfile);
+/* Expand the number of tokens in a list. */
+void
+_cpp_expand_token_space (list, count)
+ cpp_toklist *list;
+ unsigned int count;
+{
+ list->tokens_cap += count;
+ list->tokens = (cpp_token *)
+ xrealloc (list->tokens, list->tokens_cap * sizeof (cpp_token));
}
+/* Initialize a token list. If EMPTY is false, some token and name
+ space is provided. */
void
-cpp_buf_line_and_col (pbuf, linep, colp)
- register cpp_buffer *pbuf;
- long *linep, *colp;
+_cpp_init_toklist (list, empty)
+ cpp_toklist *list;
+ int empty;
{
- if (pbuf)
+ if (empty)
{
- *linep = pbuf->lineno;
- if (colp)
- *colp = pbuf->cur - pbuf->line_base;
+ list->tokens_cap = 0;
+ list->tokens = 0;
+ list->name_cap = 0;
+ list->namebuf = 0;
}
else
{
- *linep = 0;
- if (colp)
- *colp = 0;
+ /* Initialize token space. */
+ list->tokens_cap = 256; /* 4K's worth. */
+ list->tokens = (cpp_token *)
+ xmalloc ((list->tokens_cap + 1) * sizeof (cpp_token));
+
+ /* Initialize name space. */
+ list->name_cap = 1024;
+ list->namebuf = (unsigned char *) xmalloc (list->name_cap);
}
+
+ _cpp_clear_toklist (list);
+}
+
+/* Clear a token list. */
+void
+_cpp_clear_toklist (list)
+ cpp_toklist *list;
+{
+ list->tokens_used = 0;
+ list->name_used = 0;
+ list->directive = 0;
+ list->paramc = 0;
+ list->params_len = 0;
+ list->flags = 0;
}
-/* Return the topmost cpp_buffer that corresponds to a file (not a macro). */
+/* Free a token list. Does not free the list itself, which may be
+ embedded in a larger structure. */
+void
+_cpp_free_toklist (list)
+ const cpp_toklist *list;
+{
+ free (list->tokens);
+ free (list->namebuf);
+}
-cpp_buffer *
-cpp_file_buffer (pfile)
- cpp_reader *pfile;
+/* Compare two tokens. */
+int
+_cpp_equiv_tokens (a, b)
+ const cpp_token *a, *b;
{
- cpp_buffer *ip;
+ if (a->type == b->type && a->flags == b->flags)
+ switch (TOKEN_SPELL (a))
+ {
+ default: /* Keep compiler happy. */
+ case SPELL_OPERATOR:
+ return 1;
+ case SPELL_CHAR:
+ case SPELL_NONE:
+ return a->val.aux == b->val.aux; /* arg_no or character. */
+ case SPELL_IDENT:
+ return a->val.node == b->val.node;
+ case SPELL_STRING:
+ return (a->val.str.len == b->val.str.len
+ && !memcmp (a->val.str.text, b->val.str.text,
+ a->val.str.len));
+ }
- for (ip = CPP_BUFFER (pfile); ip; ip = CPP_PREV_BUFFER (ip))
- if (ip->ihash != NULL)
- return ip;
- return NULL;
+ return 0;
}
-/* 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;
+/* Compare two token lists. */
+int
+_cpp_equiv_toklists (a, b)
+ const cpp_toklist *a, *b;
+{
+ unsigned int i;
+
+ if (a->tokens_used != b->tokens_used
+ || a->flags != b->flags
+ || a->paramc != b->paramc)
+ return 0;
+
+ for (i = 0; i < a->tokens_used; i++)
+ if (! _cpp_equiv_tokens (&a->tokens[i], &b->tokens[i]))
+ return 0;
+ return 1;
+}
+
+/* Utility routine:
+
+ Compares, the token TOKEN to the NUL-terminated string STRING.
+ TOKEN must be a CPP_NAME. Returns 1 for equal, 0 for unequal. */
+
+int
+cpp_ideq (token, string)
+ const cpp_token *token;
+ const char *string;
+{
+ if (token->type != CPP_NAME)
+ return 0;
+
+ return !ustrcmp (token->val.node->name, (const U_CHAR *)string);
+}
+
+/* Call when meeting a newline. Returns the character after the newline
+ (or carriage-return newline combination), or EOF. */
+static cppchar_t
+handle_newline (buffer, newline_char)
+ cpp_buffer *buffer;
+ cppchar_t newline_char;
{
- long line, col;
- const U_CHAR *limit, *cur;
+ cppchar_t next = EOF;
- FORWARD(1);
- cpp_buf_line_and_col (CPP_BUFFER (pfile), &line, &col);
- limit = CPP_BUFFER (pfile)->rlimit;
- cur = CPP_BUFFER (pfile)->cur;
+ buffer->col_adjust = 0;
+ buffer->lineno++;
+ buffer->line_base = buffer->cur;
- while (cur < limit)
+ /* Handle CR-LF and LF-CR combinations, get the next character. */
+ if (buffer->cur < buffer->rlimit)
{
- char c = *cur++;
- if (c == '\n' || c == '\r')
+ next = *buffer->cur++;
+ if (next + newline_char == '\r' + '\n')
{
- /* \r cannot be a macro escape marker here. */
- if (!ACTIVE_MARK_P (pfile))
- CPP_BUMP_LINE_CUR (pfile, cur);
- }
- else if (c == '*')
- {
- /* Check for teminator. */
- if (cur < limit && *cur == '/')
- goto out;
-
- /* Warn about comment starter embedded in comment. */
- if (cur[-2] == '/' && CPP_OPTION (pfile, warn_comments))
- cpp_warning_with_line (pfile, CPP_BUFFER (pfile)->lineno,
- cur - CPP_BUFFER (pfile)->line_base,
- "'/*' within comment");
+ buffer->line_base = buffer->cur;
+ if (buffer->cur < buffer->rlimit)
+ next = *buffer->cur++;
+ else
+ next = EOF;
}
}
- cpp_error_with_line (pfile, line, col, "unterminated comment");
- cur--;
- out:
- CPP_BUFFER (pfile)->cur = cur + 1;
+ buffer->read_ahead = next;
+ return next;
}
-/* 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)
+/* Subroutine of skip_escaped_newlines; called when a trigraph is
+ encountered. It warns if necessary, and returns true if the
+ trigraph should be honoured. FROM_CHAR is the third character of a
+ trigraph, and presumed to be the previous character for position
+ reporting. */
+static int
+trigraph_ok (pfile, from_char)
cpp_reader *pfile;
+ cppchar_t from_char;
{
- FORWARD(1);
- for (;;)
+ int accept = CPP_OPTION (pfile, trigraphs);
+
+ /* Don't warn about trigraphs in comments. */
+ if (CPP_OPTION (pfile, warn_trigraphs) && !pfile->state.lexing_comment)
+ {
+ cpp_buffer *buffer = pfile->buffer;
+ if (accept)
+ cpp_warning_with_line (pfile, buffer->lineno, CPP_BUF_COL (buffer) - 2,
+ "trigraph ??%c converted to %c",
+ (int) from_char,
+ (int) _cpp_trigraph_map[from_char]);
+ else
+ cpp_warning_with_line (pfile, buffer->lineno, CPP_BUF_COL (buffer) - 2,
+ "trigraph ??%c ignored", (int) from_char);
+ }
+
+ return accept;
+}
+
+/* Assumes local variables buffer and result. */
+#define ACCEPT_CHAR(t) \
+ do { result->type = t; buffer->read_ahead = EOF; } while (0)
+
+/* When we move to multibyte character sets, add to these something
+ that saves and restores the state of the multibyte conversion
+ library. This probably involves saving and restoring a "cookie".
+ In the case of glibc it is an 8-byte structure, so is not a high
+ overhead operation. In any case, it's out of the fast path. */
+#define SAVE_STATE() do { saved_cur = buffer->cur; } while (0)
+#define RESTORE_STATE() do { buffer->cur = saved_cur; } while (0)
+
+/* Skips any escaped newlines introduced by NEXT, which is either a
+ '?' or a '\\'. Returns the next character, which will also have
+ been placed in buffer->read_ahead. */
+static cppchar_t
+skip_escaped_newlines (buffer, next)
+ cpp_buffer *buffer;
+ cppchar_t next;
+{
+ cppchar_t next1;
+ const unsigned char *saved_cur;
+ int space;
+
+ do
{
- int c = GETC ();
+ if (buffer->cur == buffer->rlimit)
+ break;
+
+ SAVE_STATE ();
+ if (next == '?')
+ {
+ next1 = *buffer->cur++;
+ if (next1 != '?' || buffer->cur == buffer->rlimit)
+ {
+ RESTORE_STATE ();
+ break;
+ }
+
+ next1 = *buffer->cur++;
+ if (!_cpp_trigraph_map[next1] || !trigraph_ok (buffer->pfile, next1))
+ {
+ RESTORE_STATE ();
+ break;
+ }
+
+ /* We have a full trigraph here. */
+ next = _cpp_trigraph_map[next1];
+ if (next != '\\' || buffer->cur == buffer->rlimit)
+ break;
+ SAVE_STATE ();
+ }
- /* We don't have to worry about EOF in here. */
- if (c == '\n')
+ /* We have a backslash, and room for at least one more character. */
+ space = 0;
+ do
{
- /* Don't consider final '\n' to be part of comment. */
- FORWARD(-1);
- return;
+ next1 = *buffer->cur++;
+ if (!is_nvspace (next1))
+ break;
+ space = 1;
}
- else if (c == '\r')
+ while (buffer->cur < buffer->rlimit);
+
+ if (!is_vspace (next1))
{
- /* \r cannot be a macro escape marker here. */
- if (!ACTIVE_MARK_P (pfile))
- CPP_BUMP_LINE (pfile);
- if (CPP_OPTION (pfile, warn_comments))
- cpp_warning (pfile, "backslash-newline within line comment");
+ RESTORE_STATE ();
+ break;
}
+
+ if (space)
+ cpp_warning (buffer->pfile,
+ "backslash and newline separated by space");
+
+ next = handle_newline (buffer, next1);
+ if (next == EOF)
+ cpp_pedwarn (buffer->pfile, "backslash-newline at end of file");
}
+ while (next == '\\' || next == '?');
+
+ buffer->read_ahead = next;
+ return next;
}
-/* 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 '-'). */
+/* Obtain the next character, after trigraph conversion and skipping
+ an arbitrary string of escaped newlines. The common case of no
+ trigraphs or escaped newlines falls through quickly. */
+static cppchar_t
+get_effective_char (buffer)
+ cpp_buffer *buffer;
+{
+ cppchar_t next = EOF;
+
+ if (buffer->cur < buffer->rlimit)
+ {
+ next = *buffer->cur++;
+
+ /* '?' can introduce trigraphs (and therefore backslash); '\\'
+ can introduce escaped newlines, which we want to skip, or
+ UCNs, which, depending upon lexer state, we will handle in
+ the future. */
+ if (next == '?' || next == '\\')
+ next = skip_escaped_newlines (buffer, next);
+ }
+
+ buffer->read_ahead = next;
+ return next;
+}
+/* Skip a C-style block comment. We find the end of the comment by
+ seeing if an asterisk is before every '/' we encounter. Returns
+ non-zero if comment terminated by EOF, zero otherwise. */
static int
-skip_comment (pfile, m)
+skip_block_comment (pfile)
cpp_reader *pfile;
- int m;
{
- if (m == '/' && PEEKC() == '*')
- {
- skip_block_comment (pfile);
- return ' ';
- }
- else if (m == '/' && PEEKC() == '/')
+ cpp_buffer *buffer = pfile->buffer;
+ cppchar_t c = EOF, prevc = EOF;
+
+ pfile->state.lexing_comment = 1;
+ while (buffer->cur != buffer->rlimit)
{
- if (CPP_BUFFER (pfile)->system_header_p)
- {
- /* 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 (CPP_OPTION (pfile, cplusplus_comments))
+ prevc = c, c = *buffer->cur++;
+
+ next_char:
+ /* FIXME: For speed, create a new character class of characters
+ of no interest inside block comments. */
+ if (c == '?' || c == '\\')
+ c = skip_escaped_newlines (buffer, c);
+
+ /* People like decorating comments with '*', so check for '/'
+ instead for efficiency. */
+ if (c == '/')
{
- if (CPP_OPTION (pfile, c89)
- && CPP_PEDANTIC (pfile)
- && ! CPP_BUFFER (pfile)->warned_cplusplus_comments)
+ if (prevc == '*')
+ break;
+
+ /* Warn about potential nested comments, but not if the '/'
+ comes immediately before the true comment delimeter.
+ Don't bother to get it right across escaped newlines. */
+ if (CPP_OPTION (pfile, warn_comments)
+ && buffer->cur != buffer->rlimit)
{
- 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;
+ prevc = c, c = *buffer->cur++;
+ if (c == '*' && buffer->cur != buffer->rlimit)
+ {
+ prevc = c, c = *buffer->cur++;
+ if (c != '/')
+ cpp_warning_with_line (pfile, CPP_BUF_LINE (buffer),
+ CPP_BUF_COL (buffer),
+ "\"/*\" within comment");
+ }
+ goto next_char;
}
- skip_line_comment (pfile);
- return ' ';
}
- else
- return m;
- }
- else if (m == '-' && PEEKC() == '-'
- && CPP_OPTION (pfile, chill))
- {
- skip_line_comment (pfile);
- return ' ';
+ else if (is_vspace (c))
+ {
+ prevc = c, c = handle_newline (buffer, c);
+ goto next_char;
+ }
+ else if (c == '\t')
+ adjust_column (pfile);
}
- else
- return m;
+
+ pfile->state.lexing_comment = 0;
+ buffer->read_ahead = EOF;
+ return c != '/' || prevc != '*';
}
-/* Identical to skip_comment except that it copies the comment into the
- token_buffer. This is used if !discard_comments. */
+/* Skip a C++ line comment. Handles escaped newlines. Returns
+ non-zero if a multiline comment. The following new line, if any,
+ is left in buffer->read_ahead. */
static int
-copy_comment (pfile, m)
+skip_line_comment (pfile)
cpp_reader *pfile;
- int m;
{
- const U_CHAR *start = CPP_BUFFER (pfile)->cur; /* XXX Layering violation */
- const U_CHAR *limit;
+ cpp_buffer *buffer = pfile->buffer;
+ unsigned int orig_lineno = buffer->lineno;
+ cppchar_t c;
- if (skip_comment (pfile, m) == m)
- return m;
+ pfile->state.lexing_comment = 1;
+ do
+ {
+ c = EOF;
+ if (buffer->cur == buffer->rlimit)
+ break;
- limit = CPP_BUFFER (pfile)->cur;
- CPP_RESERVE (pfile, limit - start + 2);
- CPP_PUTC_Q (pfile, m);
- for (; start <= limit; start++)
- if (*start != '\r')
- CPP_PUTC_Q (pfile, *start);
+ c = *buffer->cur++;
+ if (c == '?' || c == '\\')
+ c = skip_escaped_newlines (buffer, c);
+ }
+ while (!is_vspace (c));
- return ' ';
+ pfile->state.lexing_comment = 0;
+ buffer->read_ahead = c; /* Leave any newline for caller. */
+ return orig_lineno != buffer->lineno;
}
+/* pfile->buffer->cur is one beyond the \t character. Update
+ col_adjust so we track the column correctly. */
static void
-null_warning (pfile, count)
+adjust_column (pfile)
cpp_reader *pfile;
- unsigned int count;
{
- if (count == 1)
- cpp_warning (pfile, "embedded null character ignored");
- else
- cpp_warning (pfile, "embedded null characters ignored");
-}
+ cpp_buffer *buffer = pfile->buffer;
+ unsigned int col = CPP_BUF_COL (buffer) - 1; /* Zero-based column. */
-/* Skip whitespace \-newline and comments. Does not macro-expand. */
+ /* Round it up to multiple of the tabstop, but subtract 1 since the
+ tab itself occupies a character position. */
+ buffer->col_adjust += (CPP_OPTION (pfile, tabstop)
+ - col % CPP_OPTION (pfile, tabstop)) - 1;
+}
-void
-_cpp_skip_hspace (pfile)
+/* Skips whitespace, saving the next non-whitespace character.
+ Adjusts pfile->col_adjust to account for tabs. Without this,
+ tokens might be assigned an incorrect column. */
+static void
+skip_whitespace (pfile, c)
cpp_reader *pfile;
+ cppchar_t c;
{
- unsigned int null_count = 0;
- int c;
+ cpp_buffer *buffer = pfile->buffer;
+ unsigned int warned = 0;
- while (1)
+ do
{
- c = GETC();
- if (c == EOF)
- goto out;
- 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");
- else if (c == '\0')
- null_count++;
- }
- else if (c == '\r')
- {
- /* \r is a backslash-newline marker if !has_escapes, and
- a deletable-whitespace or no-reexpansion marker otherwise. */
- if (CPP_BUFFER (pfile)->has_escapes)
+ /* Horizontal space always OK. */
+ if (c == ' ')
+ ;
+ else if (c == '\t')
+ adjust_column (pfile);
+ /* Just \f \v or \0 left. */
+ else if (c == '\0')
+ {
+ if (!warned)
{
- if (PEEKC() == ' ')
- FORWARD(1);
- else
- break;
+ cpp_warning (pfile, "null character(s) ignored");
+ warned = 1;
}
- else
- CPP_BUMP_LINE (pfile);
- }
- else if (c == '/' || c == '-')
- {
- c = skip_comment (pfile, c);
- if (c != ' ')
- break;
}
- else
+ else if (IN_DIRECTIVE (pfile) && CPP_PEDANTIC (pfile))
+ cpp_pedwarn_with_line (pfile, CPP_BUF_LINE (buffer),
+ CPP_BUF_COL (buffer),
+ "%s in preprocessing directive",
+ c == '\f' ? "form feed" : "vertical tab");
+
+ c = EOF;
+ if (buffer->cur == buffer->rlimit)
break;
+ c = *buffer->cur++;
}
- FORWARD(-1);
- out:
- if (null_count)
- null_warning (pfile, null_count);
+ /* We only want non-vertical space, i.e. ' ' \t \f \v \0. */
+ while (is_nvspace (c));
+
+ /* Remember the next character. */
+ buffer->read_ahead = c;
}
-/* Read and discard the rest of the current line. */
+/* Parse an identifier, skipping embedded backslash-newlines.
+ Calculate the hash value of the token while parsing, for improved
+ performance. The hashing algorithm *must* match cpp_lookup(). */
-void
-_cpp_skip_rest_of_line (pfile)
+static cpp_hashnode *
+parse_identifier (pfile, c)
cpp_reader *pfile;
+ cppchar_t c;
{
- for (;;)
+ cpp_buffer *buffer = pfile->buffer;
+ unsigned int r = 0, saw_dollar = 0;
+ unsigned int orig_used = pfile->token_list.name_used;
+
+ do
{
- int c = GETC();
- switch (c)
+ do
{
- case '\n':
- FORWARD(-1);
- case EOF:
- return;
-
- case '\r':
- if (! CPP_BUFFER (pfile)->has_escapes)
- CPP_BUMP_LINE (pfile);
- break;
-
- case '\'':
- case '\"':
- skip_string (pfile, c);
- break;
+ if (pfile->token_list.name_used == pfile->token_list.name_cap)
+ _cpp_expand_name_space (&pfile->token_list,
+ pfile->token_list.name_used + 256);
+ pfile->token_list.namebuf[pfile->token_list.name_used++] = c;
+ r = HASHSTEP (r, c);
- case '/':
- case '-':
- skip_comment (pfile, c);
- break;
+ if (c == '$')
+ saw_dollar++;
- case '\f':
- case '\v':
- if (CPP_PEDANTIC (pfile))
- cpp_pedwarn (pfile, "%s in preprocessing directive",
- c == '\f' ? "formfeed" : "vertical tab");
- break;
+ c = EOF;
+ if (buffer->cur == buffer->rlimit)
+ break;
+ c = *buffer->cur++;
}
+ while (is_idchar (c));
+
+ /* Potential escaped newline? */
+ if (c != '?' && c != '\\')
+ break;
+ c = skip_escaped_newlines (buffer, c);
}
+ while (is_idchar (c));
+
+ /* $ is not a identifier character in the standard, but is commonly
+ accepted as an extension. Don't warn about it in skipped
+ conditional blocks. */
+ if (saw_dollar && CPP_PEDANTIC (pfile) && ! pfile->skipping)
+ cpp_pedwarn (pfile, "'$' character(s) in identifier");
+
+ /* Remember the next character. */
+ buffer->read_ahead = c;
+ return _cpp_lookup_with_hash (pfile, &pfile->token_list.namebuf[orig_used],
+ pfile->token_list.name_used - orig_used, r);
}
-/* Parse an identifier starting with C. */
-
-void
-_cpp_parse_name (pfile, c)
+/* Parse a number, skipping embedded backslash-newlines. */
+static void
+parse_number (pfile, number, c)
cpp_reader *pfile;
- int c;
+ cpp_string *number;
+ cppchar_t c;
{
- for (;;)
- {
- if (! is_idchar(c))
- {
- FORWARD (-1);
- break;
- }
+ cppchar_t prevc;
+ cpp_buffer *buffer = pfile->buffer;
+ unsigned int orig_used = pfile->token_list.name_used;
+
+ /* Reserve space for a leading period. */
+ if (pfile->state.seen_dot)
+ pfile->token_list.name_used++;
+
+ do
+ {
+ do
+ {
+ if (pfile->token_list.name_used >= pfile->token_list.name_cap)
+ _cpp_expand_name_space (&pfile->token_list,
+ pfile->token_list.name_used + 256);
+ pfile->token_list.namebuf[pfile->token_list.name_used++] = c;
+
+ prevc = c;
+ c = EOF;
+ if (buffer->cur == buffer->rlimit)
+ break;
- if (c == '$' && CPP_PEDANTIC (pfile))
- cpp_pedwarn (pfile, "`$' in identifier");
+ c = *buffer->cur++;
+ }
+ while (is_numchar (c) || c == '.' || VALID_SIGN (c, prevc));
- CPP_RESERVE(pfile, 2); /* One more for final NUL. */
- CPP_PUTC_Q (pfile, c);
- c = GETC();
- if (c == EOF)
+ /* Potential escaped newline? */
+ if (c != '?' && c != '\\')
break;
- }
- CPP_NUL_TERMINATE_Q (pfile);
- return;
+ c = skip_escaped_newlines (buffer, c);
+ }
+ while (is_numchar (c) || c == '.' || VALID_SIGN (c, prevc));
+
+ /* Put any leading period in place, now we have the room. */
+ if (pfile->state.seen_dot)
+ pfile->token_list.namebuf[orig_used] = '.';
+
+ /* Remember the next character. */
+ buffer->read_ahead = c;
+
+ number->text = &pfile->token_list.namebuf[orig_used];
+ number->len = pfile->token_list.name_used - orig_used;
}
-/* Parse and skip over 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.) */
+/* Subroutine of parse_string. Emits error for unterminated strings. */
static void
-skip_string (pfile, c)
+unterminated (pfile, line, term)
cpp_reader *pfile;
- int c;
+ unsigned int line;
+ int term;
{
- long start_line, start_column;
- unsigned int null_count = 0;
+ cpp_error (pfile, "missing terminating %c character", term);
- cpp_buf_line_and_col (cpp_file_buffer (pfile), &start_line, &start_column);
- while (1)
+ if (term == '\"' && pfile->mls_line && pfile->mls_line != line)
{
- int cc = GETC();
- switch (cc)
- {
- case EOF:
- 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;
- goto out;
+ cpp_error_with_line (pfile, pfile->mls_line, pfile->mls_column,
+ "possible start of unterminated string literal");
+ pfile->mls_line = 0;
+ }
+}
+
+/* Parses a string, character constant, or angle-bracketed header file
+ name. Handles embedded trigraphs and escaped newlines.
+
+ Multi-line strings are allowed, but they are deprecated within
+ directives. */
+static void
+parse_string (pfile, token, terminator)
+ cpp_reader *pfile;
+ cpp_token *token;
+ cppchar_t terminator;
+{
+ cpp_buffer *buffer = pfile->buffer;
+ unsigned int orig_used = pfile->token_list.name_used;
+ cppchar_t c;
+ unsigned int nulls = 0;
- case '\0':
- null_count++;
+ for (;;)
+ {
+ if (buffer->cur == buffer->rlimit)
+ {
+ c = EOF;
+ unterminated (pfile, token->line, terminator);
break;
-
- case '\n':
- CPP_BUMP_LINE (pfile);
- /* 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_OPTION (pfile, lang_fortran)
- || CPP_OPTION (pfile, lang_asm))
+ }
+ c = *buffer->cur++;
+
+ have_char:
+ /* Handle trigraphs, escaped newlines etc. */
+ if (c == '?' || c == '\\')
+ c = skip_escaped_newlines (buffer, c);
+
+ if (c == terminator)
+ {
+ unsigned int u = pfile->token_list.name_used;
+
+ /* An odd number of consecutive backslashes represents an
+ escaped terminator. */
+ while (u > orig_used && pfile->token_list.namebuf[u - 1] == '\\')
+ u--;
+
+ if ((pfile->token_list.name_used - u) % 2 == 0)
{
- FORWARD(-1);
- goto out;
+ c = EOF;
+ break;
}
- /* Character constants may not extend over multiple lines.
- In Standard C, neither may strings. We accept multiline
- strings as an extension. */
- if (c == '\'')
+ }
+ else if (is_vspace (c))
+ {
+ /* In assembly language, silently terminate string and
+ character literals at end of line. This is a kludge
+ around not knowing where comments are. */
+ if (CPP_OPTION (pfile, lang_asm) && terminator != '>')
+ break;
+
+ /* Character constants and header names may not extend over
+ multiple lines. In Standard C, neither may strings.
+ Unfortunately, we accept multiline strings as an
+ extension. (Deprecatedly even in directives - otherwise,
+ glibc's longlong.h breaks.) */
+ if (terminator != '"')
{
- cpp_error_with_line (pfile, start_line, start_column,
- "unterminated character constant");
- FORWARD(-1);
- goto out;
+ unterminated (pfile, token->line, terminator);
+ break;
}
- 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 '\r':
- if (CPP_BUFFER (pfile)->has_escapes)
+ if (pfile->mls_line == 0)
{
- cpp_ice (pfile, "\\r escape inside string constant");
- FORWARD(1);
+ pfile->mls_line = token->line;
+ pfile->mls_column = token->col;
+ if (CPP_PEDANTIC (pfile))
+ cpp_pedwarn (pfile, "multi-line string constant");
}
- else
- /* Backslash newline is replaced by nothing at all. */
- CPP_BUMP_LINE (pfile);
- break;
-
- case '\\':
- FORWARD(1);
- break;
-
- case '\"':
- case '\'':
- if (cc == c)
- goto out;
- break;
+
+ handle_newline (buffer, c); /* Stores to read_ahead. */
+ c = '\n';
+ }
+ else if (c == '\0')
+ {
+ if (nulls++ == 0)
+ cpp_warning (pfile, "null character(s) preserved in literal");
}
+
+ if (pfile->token_list.name_used == pfile->token_list.name_cap)
+ _cpp_expand_name_space (&pfile->token_list,
+ pfile->token_list.name_used + 256);
+
+ pfile->token_list.namebuf[pfile->token_list.name_used++] = c;
+ /* If we had a new line, the next character is in read_ahead. */
+ if (c != '\n')
+ continue;
+ c = buffer->read_ahead;
+ if (c != EOF)
+ goto have_char;
}
- out:
- if (null_count == 1)
- cpp_warning (pfile, "null character in string or character constant");
- else if (null_count > 1)
- cpp_warning (pfile, "null characters in string or character constant");
-}
+ buffer->read_ahead = c;
-/* Parse a string and copy it to the output. */
+ token->val.str.text = &pfile->token_list.namebuf[orig_used];
+ token->val.str.len = pfile->token_list.name_used - orig_used;
+}
+/* For output routine simplicity, the stored comment includes the
+ comment start and any terminator. */
static void
-parse_string (pfile, c)
+save_comment (pfile, token, from)
cpp_reader *pfile;
- int c;
+ cpp_token *token;
+ const unsigned char *from;
{
- const U_CHAR *start = CPP_BUFFER (pfile)->cur; /* XXX Layering violation */
- const U_CHAR *limit;
-
- skip_string (pfile, c);
-
- limit = CPP_BUFFER (pfile)->cur;
- CPP_RESERVE (pfile, limit - start + 2);
- CPP_PUTC_Q (pfile, c);
- for (; start < limit; start++)
- if (*start != '\r')
- CPP_PUTC_Q (pfile, *start);
+ unsigned char *buffer;
+ unsigned int len;
+ cpp_toklist *list = &pfile->token_list;
+
+ len = pfile->buffer->cur - from + 1; /* + 1 for the initial '/'. */
+ _cpp_reserve_name_space (list, len);
+ buffer = list->namebuf + list->name_used;
+ list->name_used += len;
+
+ token->type = CPP_COMMENT;
+ token->val.str.len = len;
+ token->val.str.text = buffer;
+
+ buffer[0] = '/';
+ memcpy (buffer + 1, from, len - 1);
}
-/* 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.
- Returns 0 for syntax error, 1 for bare predicate, 2 for predicate
- with answer (see callers for why). In case of 0, an error has been
- printed. */
-int
-_cpp_parse_assertion (pfile)
- cpp_reader *pfile;
+/* Subroutine of lex_token to handle '%'. A little tricky, since we
+ want to avoid stepping back when lexing %:%X. */
+static void
+lex_percent (buffer, result)
+ cpp_buffer *buffer;
+ cpp_token *result;
{
- int c, dropwhite;
- _cpp_skip_hspace (pfile);
- c = PEEKC();
- if (c == '\n')
- {
- cpp_error (pfile, "assertion without predicate");
- return 0;
- }
- else if (! is_idstart(c))
- {
- cpp_error (pfile, "assertion predicate is not an identifier");
- return 0;
- }
- CPP_PUTC(pfile, '#');
- FORWARD(1);
- _cpp_parse_name (pfile, c);
+ cppchar_t c;
- c = PEEKC();
- if (c != '(')
+ result->type = CPP_MOD;
+ /* Parsing %:%X could leave an extra character. */
+ if (buffer->extra_char == EOF)
+ c = get_effective_char (buffer);
+ else
{
- if (is_hspace(c) || c == '\r')
- _cpp_skip_hspace (pfile);
- c = PEEKC();
+ c = buffer->read_ahead = buffer->extra_char;
+ buffer->extra_char = EOF;
}
- if (c != '(')
- return 1;
- CPP_PUTC(pfile, '(');
- FORWARD(1);
- dropwhite = 1;
- while ((c = GETC()) != ')')
+ if (c == '=')
+ ACCEPT_CHAR (CPP_MOD_EQ);
+ else if (CPP_OPTION (buffer->pfile, digraphs))
{
- if (is_space(c))
+ if (c == ':')
{
- if (! dropwhite)
+ result->flags |= DIGRAPH;
+ ACCEPT_CHAR (CPP_HASH);
+ if (get_effective_char (buffer) == '%')
{
- CPP_PUTC(pfile, ' ');
- dropwhite = 1;
+ buffer->extra_char = get_effective_char (buffer);
+ if (buffer->extra_char == ':')
+ {
+ buffer->extra_char = EOF;
+ ACCEPT_CHAR (CPP_PASTE);
+ }
+ else
+ /* We'll catch the extra_char when we're called back. */
+ buffer->read_ahead = '%';
}
}
- 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
+ else if (c == '>')
{
- CPP_PUTC (pfile, c);
- dropwhite = 0;
+ result->flags |= DIGRAPH;
+ ACCEPT_CHAR (CPP_CLOSE_BRACE);
}
}
+}
+
+/* Subroutine of lex_token to handle '.'. This is tricky, since we
+ want to avoid stepping back when lexing '...' or '.123'. In the
+ latter case we should also set a flag for parse_number. */
+static void
+lex_dot (pfile, result)
+ cpp_reader *pfile;
+ cpp_token *result;
+{
+ cpp_buffer *buffer = pfile->buffer;
+ cppchar_t c;
- if (pfile->limit[-1] == ' ')
- pfile->limit[-1] = ')';
- else if (pfile->limit[-1] == '(')
+ /* Parsing ..X could leave an extra character. */
+ if (buffer->extra_char == EOF)
+ c = get_effective_char (buffer);
+ else
{
- cpp_error (pfile, "empty token sequence in assertion");
- return 0;
+ c = buffer->read_ahead = buffer->extra_char;
+ buffer->extra_char = EOF;
}
- else
- CPP_PUTC (pfile, ')');
- return 2;
+ /* All known character sets have 0...9 contiguous. */
+ if (c >= '0' && c <= '9')
+ {
+ result->type = CPP_NUMBER;
+ buffer->pfile->state.seen_dot = 1;
+ parse_number (pfile, &result->val.str, c);
+ buffer->pfile->state.seen_dot = 0;
+ }
+ else
+ {
+ result->type = CPP_DOT;
+ if (c == '.')
+ {
+ buffer->extra_char = get_effective_char (buffer);
+ if (buffer->extra_char == '.')
+ {
+ buffer->extra_char = EOF;
+ ACCEPT_CHAR (CPP_ELLIPSIS);
+ }
+ else
+ /* We'll catch the extra_char when we're called back. */
+ buffer->read_ahead = '.';
+ }
+ else if (c == '*' && CPP_OPTION (pfile, cplusplus))
+ ACCEPT_CHAR (CPP_DOT_STAR);
+ }
}
-/* 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_lex_token (pfile)
+static void
+lex_token (pfile, result)
cpp_reader *pfile;
+ cpp_token *result;
{
- register int c, c2, c3;
- enum cpp_token token;
+ cppchar_t c;
+ cpp_buffer *buffer = pfile->buffer;
+ const unsigned char *comment_start;
+
+ result->flags = 0;
+ next_char:
+ result->line = CPP_BUF_LINE (buffer);
+ next_char2:
+ result->col = CPP_BUF_COLUMN (buffer, buffer->cur);
+
+ c = buffer->read_ahead;
+ if (c == EOF && buffer->cur < buffer->rlimit)
+ {
+ c = *buffer->cur++;
+ result->col++;
+ }
- get_next:
- c = GETC();
+ do_switch:
+ buffer->read_ahead = EOF;
switch (c)
{
case EOF:
- return CPP_EOF;
+ /* Non-empty files should end in a newline. Testing
+ skip_newlines ensures we only emit the warning once. */
+ if (buffer->cur != buffer->line_base && buffer->cur != buffer->buf
+ && pfile->state.skip_newlines)
+ cpp_pedwarn_with_line (pfile, buffer->lineno, CPP_BUF_COL (buffer),
+ "no newline at end of file");
+ result->type = CPP_EOF;
+ break;
+
+ case ' ': case '\t': case '\f': case '\v': case '\0':
+ skip_whitespace (pfile, c);
+ result->flags |= PREV_WHITE;
+ goto next_char2;
+
+ case '\n': case '\r':
+ result->type = CPP_EOF;
+ handle_newline (buffer, c);
+ /* Handling here will change significantly when moving to
+ token-at-a-time. */
+ if (pfile->state.skip_newlines)
+ {
+ result->flags &= ~PREV_WHITE; /* Clear any whitespace flag. */
+ goto next_char;
+ }
+ break;
+
+ case '?':
+ case '\\':
+ /* These could start an escaped newline, or '?' a trigraph. Let
+ skip_escaped_newlines do all the work. */
+ {
+ unsigned int lineno = buffer->lineno;
+
+ c = skip_escaped_newlines (buffer, c);
+ if (lineno != buffer->lineno)
+ /* We had at least one escaped newline of some sort, and the
+ next character is in buffer->read_ahead. Update the
+ token's line and column. */
+ goto next_char;
+
+ /* We are either the original '?' or '\\', or a trigraph. */
+ result->type = CPP_QUERY;
+ buffer->read_ahead = EOF;
+ if (c == '\\')
+ result->type = CPP_BACKSLASH;
+ else if (c != '?')
+ goto do_switch;
+ }
+ break;
+
+ case '0': case '1': case '2': case '3': case '4':
+ case '5': case '6': case '7': case '8': case '9':
+ result->type = CPP_NUMBER;
+ parse_number (pfile, &result->val.str, c);
+ break;
+
+ case '$':
+ if (!CPP_OPTION (pfile, dollars_in_ident))
+ goto random_char;
+ /* Fall through... */
+
+ case '_':
+ case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
+ case 'g': case 'h': case 'i': case 'j': case 'k': case 'l':
+ case 'm': case 'n': case 'o': case 'p': 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 'E': case 'F':
+ case 'G': case 'H': case 'I': case 'J': case 'K': case 'L':
+ case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R':
+ case 'S': case 'T': case 'U': case 'V': case 'W': case 'X':
+ case 'Y': case 'Z':
+ result->type = CPP_NAME;
+ result->val.node = parse_identifier (pfile, c);
+
+ /* 'L' may introduce wide characters or strings. */
+ if (result->val.node == pfile->spec_nodes->n_L)
+ {
+ c = buffer->read_ahead; /* For make_string. */
+ if (c == '\'' || c == '"')
+ {
+ ACCEPT_CHAR (c == '"' ? CPP_WSTRING: CPP_WCHAR);
+ goto make_string;
+ }
+ }
+ /* Convert named operators to their proper types. */
+ else if (result->val.node->type == T_OPERATOR)
+ {
+ result->flags |= NAMED_OP;
+ result->type = result->val.node->value.code;
+ }
+ break;
+
+ case '\'':
+ case '"':
+ result->type = c == '"' ? CPP_STRING: CPP_CHAR;
+ make_string:
+ parse_string (pfile, result, c);
+ break;
case '/':
- if (PEEKC () == '=')
- goto op2;
+ /* A potential block or line comment. */
+ comment_start = buffer->cur;
+ result->type = CPP_DIV;
+ c = get_effective_char (buffer);
+ if (c == '=')
+ ACCEPT_CHAR (CPP_DIV_EQ);
+ if (c != '/' && c != '*')
+ break;
- comment:
- if (CPP_OPTION (pfile, discard_comments))
- c = skip_comment (pfile, c);
- else
- c = copy_comment (pfile, c);
- if (c != ' ')
- goto randomchar;
-
- /* Comments are equivalent to spaces.
- For -traditional, a comment is equivalent to nothing. */
- if (!CPP_OPTION (pfile, discard_comments))
- return CPP_COMMENT;
- else if (CPP_TRADITIONAL (pfile)
- && ! is_space (PEEKC ()))
- {
- if (pfile->parsing_define_directive)
- return CPP_COMMENT;
- else
- goto get_next;
+ if (c == '*')
+ {
+ if (skip_block_comment (pfile))
+ cpp_error_with_line (pfile, result->line, result->col,
+ "unterminated comment");
}
else
{
- CPP_PUTC (pfile, c);
- return CPP_HSPACE;
+ if (!CPP_OPTION (pfile, cplusplus_comments)
+ && !CPP_IN_SYSTEM_HEADER (pfile))
+ break;
+
+ /* We silently allow C++ comments in system headers,
+ irrespective of conformance mode, because lots of
+ broken systems do that and trying to clean it up in
+ fixincludes is a nightmare. */
+ if (CPP_OPTION (pfile, c89) && CPP_PEDANTIC (pfile)
+ && ! buffer->warned_cplusplus_comments)
+ {
+ cpp_pedwarn (pfile,
+ "C++ style comments are not allowed in ISO C89");
+ cpp_pedwarn (pfile,
+ "(this will be reported only once per input file)");
+ buffer->warned_cplusplus_comments = 1;
+ }
+
+ /* Skip_line_comment updates buffer->read_ahead. */
+ if (skip_line_comment (pfile))
+ cpp_warning_with_line (pfile, result->line, result->col,
+ "multi-line comment");
}
- case '#':
- if (pfile->parsing_if_directive)
+ /* Skipping the comment has updated buffer->read_ahead. */
+ if (!pfile->state.save_comments)
{
- if (_cpp_parse_assertion (pfile))
- return CPP_ASSERTION;
- goto randomchar;
+ result->flags |= PREV_WHITE;
+ goto next_char;
}
- if (pfile->parsing_define_directive && ! CPP_TRADITIONAL (pfile))
+ /* Save the comment as a token in its own right. */
+ save_comment (pfile, result, comment_start);
+ break;
+
+ case '<':
+ if (pfile->state.angled_headers)
{
- CPP_RESERVE (pfile, 3);
- CPP_PUTC_Q (pfile, '#');
- CPP_NUL_TERMINATE_Q (pfile);
- if (PEEKC () != '#')
- return CPP_STRINGIZE;
-
- FORWARD (1);
- CPP_PUTC_Q (pfile, '#');
- CPP_NUL_TERMINATE_Q (pfile);
- return CPP_TOKPASTE;
+ result->type = CPP_HEADER_NAME;
+ c = '>'; /* terminator. */
+ goto make_string;
}
- if (!pfile->only_seen_white)
- goto randomchar;
- return CPP_DIRECTIVE;
+ result->type = CPP_LESS;
+ c = get_effective_char (buffer);
+ if (c == '=')
+ ACCEPT_CHAR (CPP_LESS_EQ);
+ else if (c == '<')
+ {
+ ACCEPT_CHAR (CPP_LSHIFT);
+ if (get_effective_char (buffer) == '=')
+ ACCEPT_CHAR (CPP_LSHIFT_EQ);
+ }
+ else if (c == '?' && CPP_OPTION (pfile, cplusplus))
+ {
+ ACCEPT_CHAR (CPP_MIN);
+ if (get_effective_char (buffer) == '=')
+ ACCEPT_CHAR (CPP_MIN_EQ);
+ }
+ else if (c == ':' && CPP_OPTION (pfile, digraphs))
+ {
+ ACCEPT_CHAR (CPP_OPEN_SQUARE);
+ result->flags |= DIGRAPH;
+ }
+ else if (c == '%' && CPP_OPTION (pfile, digraphs))
+ {
+ ACCEPT_CHAR (CPP_OPEN_BRACE);
+ result->flags |= DIGRAPH;
+ }
+ break;
- case '\"':
- case '\'':
- parse_string (pfile, c);
- return c == '\'' ? CPP_CHAR : CPP_STRING;
+ case '>':
+ result->type = CPP_GREATER;
+ c = get_effective_char (buffer);
+ if (c == '=')
+ ACCEPT_CHAR (CPP_GREATER_EQ);
+ else if (c == '>')
+ {
+ ACCEPT_CHAR (CPP_RSHIFT);
+ if (get_effective_char (buffer) == '=')
+ ACCEPT_CHAR (CPP_RSHIFT_EQ);
+ }
+ else if (c == '?' && CPP_OPTION (pfile, cplusplus))
+ {
+ ACCEPT_CHAR (CPP_MAX);
+ if (get_effective_char (buffer) == '=')
+ ACCEPT_CHAR (CPP_MAX_EQ);
+ }
+ break;
- case '$':
- if (!CPP_OPTION (pfile, dollars_in_ident))
- goto randomchar;
- goto letter;
+ case '%':
+ lex_percent (buffer, result);
+ break;
- case ':':
- if (CPP_OPTION (pfile, cplusplus) && PEEKC () == ':')
- goto op2;
- goto randomchar;
+ case '.':
+ lex_dot (pfile, result);
+ break;
- case '&':
case '+':
- case '|':
- c2 = PEEKC ();
- if (c2 == c || c2 == '=')
- goto op2;
- goto randomchar;
+ result->type = CPP_PLUS;
+ c = get_effective_char (buffer);
+ if (c == '=')
+ ACCEPT_CHAR (CPP_PLUS_EQ);
+ else if (c == '+')
+ ACCEPT_CHAR (CPP_PLUS_PLUS);
+ break;
+
+ case '-':
+ result->type = CPP_MINUS;
+ c = get_effective_char (buffer);
+ if (c == '>')
+ {
+ ACCEPT_CHAR (CPP_DEREF);
+ if (CPP_OPTION (pfile, cplusplus)
+ && get_effective_char (buffer) == '*')
+ ACCEPT_CHAR (CPP_DEREF_STAR);
+ }
+ else if (c == '=')
+ ACCEPT_CHAR (CPP_MINUS_EQ);
+ else if (c == '-')
+ ACCEPT_CHAR (CPP_MINUS_MINUS);
+ break;
case '*':
- case '!':
- case '%':
+ result->type = CPP_MULT;
+ if (get_effective_char (buffer) == '=')
+ ACCEPT_CHAR (CPP_MULT_EQ);
+ break;
+
case '=':
+ result->type = CPP_EQ;
+ if (get_effective_char (buffer) == '=')
+ ACCEPT_CHAR (CPP_EQ_EQ);
+ break;
+
+ case '!':
+ result->type = CPP_NOT;
+ if (get_effective_char (buffer) == '=')
+ ACCEPT_CHAR (CPP_NOT_EQ);
+ break;
+
+ case '&':
+ result->type = CPP_AND;
+ c = get_effective_char (buffer);
+ if (c == '=')
+ ACCEPT_CHAR (CPP_AND_EQ);
+ else if (c == '&')
+ ACCEPT_CHAR (CPP_AND_AND);
+ break;
+
+ case '#':
+ result->type = CPP_HASH;
+ if (get_effective_char (buffer) == '#')
+ ACCEPT_CHAR (CPP_PASTE);
+ break;
+
+ case '|':
+ result->type = CPP_OR;
+ c = get_effective_char (buffer);
+ if (c == '=')
+ ACCEPT_CHAR (CPP_OR_EQ);
+ else if (c == '|')
+ ACCEPT_CHAR (CPP_OR_OR);
+ break;
+
case '^':
- if (PEEKC () == '=')
- goto op2;
- goto randomchar;
+ result->type = CPP_XOR;
+ if (get_effective_char (buffer) == '=')
+ ACCEPT_CHAR (CPP_XOR_EQ);
+ break;
- case '-':
- c2 = PEEKC ();
- if (c2 == '-')
+ case ':':
+ result->type = CPP_COLON;
+ c = get_effective_char (buffer);
+ if (c == ':' && CPP_OPTION (pfile, cplusplus))
+ ACCEPT_CHAR (CPP_SCOPE);
+ else if (c == '>' && CPP_OPTION (pfile, digraphs))
{
- if (CPP_OPTION (pfile, chill))
- goto comment; /* Chill style comment */
- else
- goto op2;
+ result->flags |= DIGRAPH;
+ ACCEPT_CHAR (CPP_CLOSE_SQUARE);
}
- else if (c2 == '=')
- goto op2;
- else if (c2 == '>')
+ break;
+
+ case '~': result->type = CPP_COMPL; break;
+ case ',': result->type = CPP_COMMA; break;
+ case '(': result->type = CPP_OPEN_PAREN; break;
+ case ')': result->type = CPP_CLOSE_PAREN; break;
+ case '[': result->type = CPP_OPEN_SQUARE; break;
+ case ']': result->type = CPP_CLOSE_SQUARE; break;
+ case '{': result->type = CPP_OPEN_BRACE; break;
+ case '}': result->type = CPP_CLOSE_BRACE; break;
+ case ';': result->type = CPP_SEMICOLON; break;
+
+ case '@':
+ if (CPP_OPTION (pfile, objc))
{
- if (CPP_OPTION (pfile, cplusplus) && PEEKN (1) == '*')
+ /* In Objective C, '@' may begin keywords or strings, like
+ @keyword or @"string". It would be nice to call
+ get_effective_char here and test the result. However, we
+ would then need to pass 2 characters to parse_identifier,
+ making it ugly and slowing down its main loop. Instead,
+ we assume we have an identifier, and recover if not. */
+ result->type = CPP_NAME;
+ result->val.node = parse_identifier (pfile, c);
+ if (result->val.node->length != 1)
+ break;
+
+ /* OK, so it wasn't an identifier. Maybe a string? */
+ if (buffer->read_ahead == '"')
{
- /* In C++, there's a ->* operator. */
- token = CPP_OTHER;
- 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 = '"';
+ ACCEPT_CHAR (CPP_OSTRING);
+ goto make_string;
}
- goto op2;
}
- goto randomchar;
+ goto random_char;
- case '<':
- if (pfile->parsing_include_directive)
+ random_char:
+ default:
+ result->type = CPP_OTHER;
+ result->val.aux = c;
+ break;
+ }
+}
+
+/*
+ * The tokenizer's main loop. Returns a token list, representing a
+ * logical line in the input file. On EOF after some tokens have
+ * been processed, we return immediately. Then in next call, or if
+ * EOF occurred at the beginning of a logical line, a single CPP_EOF
+ * token is placed in the list.
+ */
+
+static void
+lex_line (pfile, list)
+ cpp_reader *pfile;
+ cpp_toklist *list;
+{
+ unsigned int first_token;
+ cpp_token *cur_token, *first;
+ cpp_buffer *buffer = pfile->buffer;
+
+ pfile->state.in_lex_line = 1;
+ if (pfile->buffer->cur == pfile->buffer->buf)
+ list->flags |= BEG_OF_FILE;
+
+ retry:
+ pfile->state.in_directive = 0;
+ pfile->state.angled_headers = 0;
+ pfile->state.skip_newlines = 1;
+ pfile->state.save_comments = ! CPP_OPTION (pfile, discard_comments);
+ first_token = list->tokens_used;
+ list->file = buffer->nominal_fname;
+
+ do
+ {
+ if (list->tokens_used >= list->tokens_cap)
+ _cpp_expand_token_space (list, 256);
+
+ cur_token = list->tokens + list->tokens_used;
+ lex_token (pfile, cur_token);
+
+ if (pfile->state.skip_newlines)
{
- for (;;)
+ pfile->state.skip_newlines = 0;
+ list->line = buffer->lineno;
+ if (cur_token->type == CPP_HASH)
{
- CPP_PUTC (pfile, c);
- if (c == '>')
- break;
- c = GETC ();
- if (c == '\n' || c == EOF)
- {
- cpp_error (pfile,
- "missing '>' in `#include <FILENAME>'");
- 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<space> in
- here. Just delete 'em. */
- int d = GETC();
- if (d != '-' && d != ' ')
- cpp_ice (pfile, "unrecognized escape \\r%c", d);
- CPP_ADJUST_WRITTEN (pfile, -1);
- }
- }
+ pfile->state.in_directive = 1;
+ pfile->state.save_comments = 0;
+ pfile->state.indented = cur_token->flags & PREV_WHITE;
}
- return CPP_STRING;
+ /* 6.10.3.10: Within the sequence of preprocessing tokens
+ making up the invocation of a function-like macro, new
+ line is considered a normal white-space character. */
+ else if (first_token != 0)
+ cur_token->flags |= PREV_WHITE;
}
- /* else fall through */
- case '>':
- c2 = PEEKC ();
- if (c2 == '=')
- goto op2;
- /* GNU C++ supports MIN and MAX operators <? and >?. */
- if (c2 != c && (!CPP_OPTION (pfile, cplusplus) || c2 != '?'))
- goto randomchar;
- FORWARD(1);
- CPP_RESERVE (pfile, 4);
- CPP_PUTC (pfile, c);
- CPP_PUTC (pfile, c2);
- c3 = PEEKC ();
- if (c3 == '=')
- CPP_PUTC_Q (pfile, GETC ());
- CPP_NUL_TERMINATE_Q (pfile);
- return CPP_OTHER;
-
- case '.':
- c2 = PEEKC ();
- if (ISDIGIT(c2))
+ else if (IN_DIRECTIVE (pfile) && list->tokens_used == first_token + 1)
{
- CPP_RESERVE(pfile, 2);
- CPP_PUTC_Q (pfile, '.');
- c = GETC ();
- goto number;
+ if (cur_token->type == CPP_NUMBER)
+ list->directive = _cpp_check_linemarker (pfile, cur_token);
+ else
+ list->directive = _cpp_check_directive (pfile, cur_token);
}
- /* In C++ there's a .* operator. */
- if (CPP_OPTION (pfile, cplusplus) && c2 == '*')
- goto op2;
-
- if (c2 == '.' && PEEKN(1) == '.')
+ /* _cpp_get_line assumes list->tokens_used refers to the current
+ token being lexed. So do this after _cpp_check_directive to
+ get the warnings therein correct. */
+ list->tokens_used++;
+ }
+ while (cur_token->type != CPP_EOF);
+
+ /* All tokens are allocated, so the memory location is fixed. */
+ first = &list->tokens[first_token];
+ first->flags |= BOL;
+ pfile->first_directive_token = first;
+
+ /* Don't complain about the null directive, nor directives in
+ assembly source: we don't know where the comments are, and # may
+ introduce assembler pseudo-ops. Don't complain about invalid
+ directives in skipped conditional groups (6.10 p4). */
+ if (IN_DIRECTIVE (pfile) && !KNOWN_DIRECTIVE (list) && !pfile->skipping
+ && !CPP_OPTION (pfile, lang_asm))
+ {
+ if (cur_token > first + 1)
{
- CPP_RESERVE(pfile, 4);
- CPP_PUTC_Q (pfile, '.');
- CPP_PUTC_Q (pfile, '.');
- CPP_PUTC_Q (pfile, '.');
- FORWARD (2);
- CPP_NUL_TERMINATE_Q (pfile);
- return CPP_3DOTS;
+ if (first[1].type == CPP_NAME)
+ cpp_error_with_line (pfile, first->line, first->col,
+ "invalid preprocessing directive #%s",
+ first[1].val.node->name);
+ else
+ cpp_error_with_line (pfile, first->line, first->col,
+ "invalid preprocessing directive");
}
- goto randomchar;
- op2:
- token = CPP_OTHER;
- CPP_RESERVE(pfile, 3);
- CPP_PUTC_Q (pfile, c);
- CPP_PUTC_Q (pfile, GETC ());
- CPP_NUL_TERMINATE_Q (pfile);
- return token;
+ /* Discard this line to prevent further errors from cc1. */
+ _cpp_clear_toklist (list);
+ goto retry;
+ }
- case 'L':
- c2 = PEEKC ();
- if ((c2 == '\'' || c2 == '\"') && !CPP_TRADITIONAL (pfile))
- {
- CPP_PUTC (pfile, c);
- c = GETC ();
- parse_string (pfile, c);
- return c == '\'' ? CPP_WCHAR : CPP_WSTRING;
- }
- goto letter;
+ /* Drop the EOF unless really at EOF or in a directive. */
+ if (cur_token != first && !KNOWN_DIRECTIVE (list)
+ && pfile->done_initializing)
+ list->tokens_used--;
- case '0': case '1': case '2': case '3': case '4':
- case '5': case '6': case '7': case '8': case '9':
- number:
- c2 = '.';
- for (;;)
+ pfile->state.in_lex_line = 0;
+}
+
+/* Write the spelling of a token TOKEN to BUFFER. The buffer must
+ already contain the enough space to hold the token's spelling.
+ Returns a pointer to the character after the last character
+ written. */
+
+static unsigned char *
+spell_token (pfile, token, buffer)
+ cpp_reader *pfile; /* Would be nice to be rid of this... */
+ const cpp_token *token;
+ unsigned char *buffer;
+{
+ switch (TOKEN_SPELL (token))
+ {
+ case SPELL_OPERATOR:
{
- CPP_RESERVE (pfile, 2);
- CPP_PUTC_Q (pfile, c);
- c = PEEKC ();
- if (c == EOF)
- break;
- if (!is_numchar(c) && c != '.'
- && ((c2 != 'e' && c2 != 'E'
- && ((c2 != 'p' && c2 != 'P')
- || CPP_OPTION (pfile, c89)))
- || (c != '+' && c != '-')))
- break;
- FORWARD(1);
- c2= c;
+ const unsigned char *spelling;
+ unsigned char c;
+
+ if (token->flags & DIGRAPH)
+ spelling = _cpp_digraph_spellings[token->type - CPP_FIRST_DIGRAPH];
+ else if (token->flags & NAMED_OP)
+ goto spell_ident;
+ else
+ spelling = TOKEN_NAME (token);
+
+ while ((c = *spelling++) != '\0')
+ *buffer++ = c;
}
- CPP_NUL_TERMINATE_Q (pfile);
- return CPP_NUMBER;
- case 'b': case 'c': case 'd': case 'h': case 'o':
- case 'B': case 'C': case 'D': case 'H': case 'O':
- if (CPP_OPTION (pfile, chill) && PEEKC () == '\'')
- {
- CPP_RESERVE (pfile, 2);
- CPP_PUTC_Q (pfile, c);
- CPP_PUTC_Q (pfile, '\'');
- FORWARD(1);
- for (;;)
- {
- c = GETC();
- if (c == EOF)
- goto chill_number_eof;
- if (!is_numchar(c))
- break;
- CPP_PUTC (pfile, c);
- }
- if (c == '\'')
- {
- CPP_RESERVE (pfile, 2);
- CPP_PUTC_Q (pfile, c);
- CPP_NUL_TERMINATE_Q (pfile);
- return CPP_STRING;
- }
- else
- {
- FORWARD(-1);
- chill_number_eof:
- CPP_NUL_TERMINATE (pfile);
- return CPP_NUMBER;
- }
- }
- else
- goto letter;
- case '_':
- case 'a': case 'e': case 'f': case 'g': case 'i': case 'j':
- case 'k': case 'l': case 'm': case 'n': case 'p': case 'q':
- case 'r': case 's': case 't': case 'u': case 'v': case 'w':
- case 'x': case 'y': case 'z':
- case 'A': case 'E': case 'F': case 'G': case 'I': case 'J':
- case 'K': case 'M': case 'N': case 'P': case 'Q': case 'R':
- case 'S': case 'T': case 'U': case 'V': case 'W': case 'X':
- case 'Y': case 'Z':
- letter:
- _cpp_parse_name (pfile, c);
- return CPP_MACRO;
+ break;
- case ' ': case '\t': case '\v': case '\f': case '\0':
- {
- int null_count = 0;
+ case SPELL_IDENT:
+ spell_ident:
+ memcpy (buffer, token->val.node->name, token->val.node->length);
+ buffer += token->val.node->length;
+ break;
- for (;;)
+ case SPELL_STRING:
+ {
+ int left, right, tag;
+ switch (token->type)
{
- if (c == '\0')
- null_count++;
- else
- CPP_PUTC (pfile, c);
- c = PEEKC ();
- if (c == EOF || !is_hspace(c))
- break;
- FORWARD(1);
+ case CPP_STRING: left = '"'; right = '"'; tag = '\0'; break;
+ case CPP_WSTRING: left = '"'; right = '"'; tag = 'L'; break;
+ case CPP_OSTRING: left = '"'; right = '"'; tag = '@'; break;
+ case CPP_CHAR: left = '\''; right = '\''; tag = '\0'; break;
+ case CPP_WCHAR: left = '\''; right = '\''; tag = 'L'; break;
+ case CPP_HEADER_NAME: left = '<'; right = '>'; tag = '\0'; break;
+ default: left = '\0'; right = '\0'; tag = '\0'; break;
}
- if (null_count)
- null_warning (pfile, null_count);
- return CPP_HSPACE;
+ if (tag) *buffer++ = tag;
+ if (left) *buffer++ = left;
+ memcpy (buffer, token->val.str.text, token->val.str.len);
+ buffer += token->val.str.len;
+ if (right) *buffer++ = right;
}
+ break;
- case '\r':
- if (CPP_BUFFER (pfile)->has_escapes)
- {
- c = GETC ();
- if (c == '-')
- {
- if (pfile->output_escapes)
- CPP_PUTS (pfile, "\r-", 2);
- _cpp_parse_name (pfile, GETC ());
- return CPP_NAME;
- }
- else if (c == ' ')
- {
- /* "\r " means a space, but only if necessary to prevent
- accidental token concatenation. */
- 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 SPELL_CHAR:
+ *buffer++ = token->val.aux;
+ break;
- case '\n':
- CPP_PUTC (pfile, c);
- return CPP_VSPACE;
+ case SPELL_NONE:
+ cpp_ice (pfile, "Unspellable token %s", TOKEN_NAME (token));
+ break;
+ }
- case '(': token = CPP_LPAREN; goto char1;
- case ')': token = CPP_RPAREN; goto char1;
- case '{': token = CPP_LBRACE; goto char1;
- case '}': token = CPP_RBRACE; goto char1;
- case ',': token = CPP_COMMA; goto char1;
- case ';': token = CPP_SEMICOLON; goto char1;
+ return buffer;
+}
- randomchar:
- default:
- token = CPP_OTHER;
- char1:
- CPP_PUTC (pfile, c);
- return token;
- }
+/* Macro expansion algorithm.
+
+Macro expansion is implemented by a single-pass algorithm; there are
+no rescan passes involved. cpp_get_token expands just enough to be
+able to return a token to the caller, a consequence is that when it
+returns the preprocessor can be in a state of mid-expansion. The
+algorithm does not work by fully expanding a macro invocation into
+some kind of token list, and then returning them one by one.
+
+Our expansion state is recorded in a context stack. We start out with
+a single context on the stack, let's call it base context. This
+consists of the token list returned by lex_line that forms the next
+logical line in the source file.
+
+The current level in the context stack is stored in the cur_context
+member of the cpp_reader structure. The context it references keeps,
+amongst other things, a count of how many tokens form that context and
+our position within those tokens.
+
+Fundamentally, calling cpp_get_token will return the next token from
+the current context. If we're at the end of the current context, that
+context is popped from the stack first, unless it is the base context,
+in which case the next logical line is lexed from the source file.
+
+However, before returning the token, if it is a CPP_NAME token
+_cpp_get_token checks to see if it is a macro and if it is enabled.
+Each time it encounters a macro name, it calls push_macro_context.
+This function checks that the macro should be expanded (with
+is_macro_enabled), and if so pushes a new macro context on the stack
+which becomes the current context. It then loops back to read the
+first token of the macro context.
+
+A macro context basically consists of the token list representing the
+macro's replacement list, which was saved in the hash table by
+save_macro_expansion when its #define statement was parsed. If the
+macro is function-like, it also contains the tokens that form the
+arguments to the macro. I say more about macro arguments below, but
+for now just saying that each argument is a set of pointers to tokens
+is enough.
+
+When taking tokens from a macro context, we may get a CPP_MACRO_ARG
+token. This represents an argument passed to the macro, with the
+argument number stored in the token's AUX field. The argument should
+be substituted, this is achieved by pushing an "argument context". An
+argument context is just refers to the tokens forming the argument,
+which are obtained directly from the macro context. The STRINGIFY
+flag on a CPP_MACRO_ARG token indicates that the argument should be
+stringified.
+
+Here's a few simple rules the context stack obeys:-
+
+ 1) The lex_line token list is always context zero.
+
+ 2) Context 1, if it exists, must be a macro context.
+
+ 3) An argument context can only appear above a macro context.
+
+ 4) A macro context can appear above the base context, another macro
+ context, or an argument context.
+
+ 5) These imply that the minimal level of an argument context is 2.
+
+The only tricky thing left is ensuring that macros are enabled and
+disabled correctly. The algorithm controls macro expansion by the
+level of the context a token is taken from in the context stack. If a
+token is taken from a level equal to no_expand_level (a member of
+struct cpp_reader), no expansion is performed.
+
+When popping a context off the stack, if no_expand_level equals the
+level of the popped context, it is reduced by one to match the new
+context level, so that expansion is still disabled. It does not
+increase if a context is pushed, though. It starts out life as
+UINT_MAX, which has the effect that initially macro expansion is
+enabled. I explain how this mechanism works below.
+
+The standard requires:-
+
+ 1) Arguments to be fully expanded before substitution.
+
+ 2) Stringified arguments to not be expanded, nor the tokens
+ immediately surrounding a ## operator.
+
+ 3) Continual rescanning until there are no more macros left to
+ replace.
+
+ 4) Once a macro has been expanded in stage 1) or 3), it cannot be
+ expanded again during later rescans. This prevents infinite
+ recursion.
+
+The first thing to observe is that stage 3) is mostly redundant.
+Since a macro is disabled once it has been expanded, how can a rescan
+find an unexpanded macro name? There are only two cases where this is
+possible:-
+
+ a) If the macro name results from a token paste operation.
+
+ b) If the macro in question is a function-like macro that hasn't
+ already been expanded because previously there was not the required
+ '(' token immediately following it. This is only possible when an
+ argument is substituted, and after substitution the last token of
+ the argument can bind with a parenthesis appearing in the tokens
+ following the substitution. Note that if the '(' appears within the
+ argument, the ')' must too, as expanding macro arguments cannot
+ "suck in" tokens outside the argument.
+
+So we tackle this as follows. When parsing the macro invocation for
+arguments, we record the tokens forming each argument as a list of
+pointers to those tokens. We do not expand any tokens that are "raw",
+i.e. directly from the macro invocation, but other tokens that come
+from (nested) argument substitution are fully expanded.
+
+This is achieved by setting the no_expand_level to that of the macro
+invocation. A CPP_MACRO_ARG token never appears in the list of tokens
+forming an argument, because parse_args (indirectly) calls
+get_raw_token which automatically pushes argument contexts and traces
+into them. Since these contexts are at a higher level than the
+no_expand_level, they get fully macro expanded.
+
+"Raw" and non-raw tokens are separated in arguments by null pointers,
+with the policy that the initial state of an argument is raw. If the
+first token is not raw, it should be preceded by a null pointer. When
+tracing through the tokens of an argument context, each time
+get_raw_token encounters a null pointer, it toggles the flag
+CONTEXT_RAW.
+
+This flag, when set, indicates to is_macro_disabled that we are
+reading raw tokens which should be macro-expanded. Similarly, if
+clear, is_macro_disabled suppresses re-expansion.
+
+It's probably time for an example.
+
+#define hash #
+#define str(x) #x
+#define xstr(y) str(y hash)
+str(hash) // "hash"
+xstr(hash) // "# hash"
+
+In the invocation of str, parse_args turns off macro expansion and so
+parses the argument as <hash>. This is the only token (pointer)
+passed as the argument to str. Since <hash> is raw there is no need
+for an initial null pointer. stringify_arg is called from
+get_raw_token when tracing through the expansion of str, since the
+argument has the STRINGIFY flag set. stringify_arg turns off
+macro_expansion by setting the no_expand_level to that of the argument
+context. Thus it gets the token <hash> and stringifies it to "hash"
+correctly.
+
+Similary xstr is passed <hash>. However, when parse_args is parsing
+the invocation of str() in xstr's expansion, get_raw_token encounters
+a CPP_MACRO_ARG token for y. Transparently to parse_args, it pushes
+an argument context, and enters the tokens of the argument,
+i.e. <hash>. This is at a higher context level than parse_args
+disabled, and so is_macro_disabled permits expansion of it and a macro
+context is pushed on top of the argument context. This contains the
+<#> token, and the end result is that <hash> is macro expanded.
+However, after popping off the argument context, the <hash> of xstr's
+expansion does not get macro expanded because we're back at the
+no_expand_level. The end result is that the argument passed to str is
+<NULL> <#> <NULL> <hash>. Note the nulls - policy is we start off
+raw, <#> is not raw, but then <hash> is.
+
+*/
+
+
+/* Free the storage allocated for macro arguments. */
+static void
+free_macro_args (args)
+ macro_args *args;
+{
+ if (args->tokens)
+ free ((PTR) args->tokens);
+ free (args->ends);
+ free (args);
}
-/* Check for and expand a macro, which is from WRITTEN to CPP_WRITTEN (pfile).
- Caller is expected to have checked no_macro_expand. */
+/* Determines if a macro has been already used (and is therefore
+ disabled). */
static int
-maybe_macroexpand (pfile, written)
+is_macro_disabled (pfile, expansion, token)
cpp_reader *pfile;
- long written;
+ const cpp_toklist *expansion;
+ const cpp_token *token;
{
- U_CHAR *macro = pfile->token_buffer + written;
- size_t len = CPP_WRITTEN (pfile) - written;
- HASHNODE *hp = _cpp_lookup (pfile, macro, len);
-
- if (!hp)
- return 0;
- if (hp->type == T_DISABLED)
+ cpp_context *context = CURRENT_CONTEXT (pfile);
+
+ /* Arguments on either side of ## are inserted in place without
+ macro expansion (6.10.3.3.2). Conceptually, any macro expansion
+ occurs during a later rescan pass. The effect is that we expand
+ iff we would as part of the macro's expansion list, so we should
+ drop to the macro's context. */
+ if (IS_ARG_CONTEXT (context))
{
- if (pfile->output_escapes)
- {
- /* Insert a no-reexpand marker before IDENT. */
- CPP_RESERVE (pfile, 2);
- CPP_ADJUST_WRITTEN (pfile, 2);
- macro = pfile->token_buffer + written;
-
- memmove (macro + 2, macro, len);
- macro[0] = '\r';
- macro[1] = '-';
- }
- return 0;
+ if (token->flags & PASTED)
+ context--;
+ else if (!(context->flags & CONTEXT_RAW))
+ return 1;
+ else if (context->flags & (CONTEXT_PASTEL | CONTEXT_PASTER))
+ context--;
}
- if (hp->type == T_EMPTY)
+
+ /* Have we already used this macro? */
+ while (context->level > 0)
{
- /* Special case optimization: macro expands to nothing. */
- CPP_SET_WRITTEN (pfile, written);
- CPP_PUTC_Q (pfile, ' ');
- return 1;
+ if (!IS_ARG_CONTEXT (context) && context->u.list == expansion)
+ return 1;
+ /* Raw argument tokens are judged based on the token list they
+ came from. */
+ if (context->flags & CONTEXT_RAW)
+ context = pfile->contexts + context->level;
+ else
+ context--;
}
- /* If macro wants an arglist, verify that a '(' follows. */
- if (hp->type == T_MACRO && hp->value.defn->nargs >= 0)
+ /* Function-like macros may be disabled if the '(' is not in the
+ current context. We check this without disrupting the context
+ stack. */
+ if (expansion->paramc >= 0)
{
- int macbuf_whitespace = 0;
- int c;
+ const cpp_token *next;
+ unsigned int prev_nme;
- while (CPP_IS_MACRO_BUFFER (CPP_BUFFER (pfile)))
+ context = CURRENT_CONTEXT (pfile);
+ /* Drop down any contexts we're at the end of: the '(' may
+ appear in lower macro expansions, or in the rest of the file. */
+ while (context->posn == context->count && context > pfile->contexts)
{
- const 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);
- }
-
- CPP_SET_MARK (pfile);
- for (;;)
- {
- _cpp_skip_hspace (pfile);
- c = PEEKC ();
- if (c == '\n')
- FORWARD(1);
- else
- break;
+ context--;
+ /* If we matched, we are disabled, as we appear in the
+ expansion of each macro we meet. */
+ if (!IS_ARG_CONTEXT (context) && context->u.list == expansion)
+ return 1;
}
- CPP_GOTO_MARK (pfile);
- if (c != '(')
+ prev_nme = pfile->no_expand_level;
+ pfile->no_expand_level = context - pfile->contexts;
+ next = _cpp_get_token (pfile);
+ restore_macro_expansion (pfile, prev_nme);
+
+ if (next->type != CPP_OPEN_PAREN)
{
- not_macro_call:
- if (macbuf_whitespace)
- CPP_PUTC (pfile, ' ');
- return 0;
+ _cpp_push_token (pfile, next);
+ if (CPP_WTRADITIONAL (pfile))
+ cpp_warning (pfile,
+ "function macro %s must be used with arguments in traditional C",
+ token->val.node->name);
+ return 1;
}
}
- 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. */
- _cpp_macroexpand (pfile, hp);
- CPP_SET_WRITTEN (pfile, written);
- return 1;
+ return 0;
}
-enum cpp_token
-cpp_get_token (pfile)
- cpp_reader *pfile;
+/* Add a token to the set of tokens forming the arguments to the macro
+ being parsed in parse_args. */
+static void
+save_token (args, token)
+ macro_args *args;
+ const cpp_token *token;
{
- enum cpp_token token;
- long written = CPP_WRITTEN (pfile);
-
- get_next:
- token = _cpp_lex_token (pfile);
+ if (args->used == args->capacity)
+ {
+ args->capacity += args->capacity + 100;
+ args->tokens = (const cpp_token **)
+ xrealloc ((PTR) args->tokens,
+ args->capacity * sizeof (const cpp_token *));
+ }
+ args->tokens[args->used++] = token;
+}
- switch (token)
+/* Take and save raw tokens until we finish one argument. Empty
+ arguments are saved as a single CPP_PLACEMARKER token. */
+static const cpp_token *
+parse_arg (pfile, var_args, paren_context, args, pcount)
+ cpp_reader *pfile;
+ int var_args;
+ unsigned int paren_context;
+ macro_args *args;
+ unsigned int *pcount;
+{
+ const cpp_token *token;
+ unsigned int paren = 0, count = 0;
+ int raw, was_raw = 1;
+
+ for (count = 0;; count++)
{
- default:
- pfile->potential_control_macro = 0;
- pfile->only_seen_white = 0;
- return token;
+ token = _cpp_get_token (pfile);
- case CPP_VSPACE:
- if (pfile->only_seen_white == 0)
- pfile->only_seen_white = 1;
- CPP_BUMP_LINE (pfile);
- if (! CPP_OPTION (pfile, no_line_commands))
+ switch (token->type)
{
- pfile->lineno++;
- if (CPP_BUFFER (pfile)->lineno != pfile->lineno)
- _cpp_output_line_command (pfile, same_file);
- }
- return token;
-
- case CPP_HSPACE:
- case CPP_COMMENT:
- return token;
+ default:
+ break;
- case CPP_DIRECTIVE:
- pfile->potential_control_macro = 0;
- if (_cpp_handle_directive (pfile))
- return CPP_DIRECTIVE;
- pfile->only_seen_white = 0;
- CPP_PUTC (pfile, '#');
- return CPP_OTHER;
+ case CPP_OPEN_PAREN:
+ paren++;
+ break;
- case CPP_MACRO:
- pfile->potential_control_macro = 0;
- pfile->only_seen_white = 0;
- if (! pfile->no_macro_expand
- && maybe_macroexpand (pfile, written))
- goto get_next;
- return CPP_NAME;
+ case CPP_CLOSE_PAREN:
+ if (paren-- != 0)
+ break;
+ goto out;
- case CPP_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_PREV_BUFFER (CPP_BUFFER (pfile)) == NULL)
- return CPP_EOF;
+ case CPP_COMMA:
+ /* Commas are not terminators within parantheses or var_args. */
+ if (paren || var_args)
+ break;
+ goto out;
- cpp_pop_buffer (pfile);
- goto get_next;
+ case CPP_EOF: /* Error reported by caller. */
+ goto out;
}
- else
+
+ raw = pfile->cur_context <= paren_context;
+ if (raw != was_raw)
{
- _cpp_handle_eof (pfile);
- return CPP_POP;
+ was_raw = raw;
+ save_token (args, 0);
+ count++;
}
+ save_token (args, token);
}
-}
-
-/* Like cpp_get_token, but skip spaces and comments. */
-enum cpp_token
-cpp_get_non_space_token (pfile)
- cpp_reader *pfile;
-{
- int old_written = CPP_WRITTEN (pfile);
- for (;;)
+ out:
+ if (count == 0)
{
- enum cpp_token token = cpp_get_token (pfile);
- if (token != CPP_COMMENT && token != CPP_HSPACE && token != CPP_VSPACE)
- return token;
- CPP_SET_WRITTEN (pfile, old_written);
+ /* Duplicate the placemarker. Then we can set its flags and
+ position and safely be using more than one. */
+ save_token (args, duplicate_token (pfile, &placemarker_token));
+ count++;
}
+
+ *pcount = count;
+ return token;
}
-/* Like cpp_get_token, except that it does not execute directives,
- does not consume vertical space, and automatically pops off macro
- buffers.
+/* This macro returns true if the argument starting at offset O of arglist
+ A is empty - that is, it's either a single PLACEMARKER token, or a null
+ pointer followed by a PLACEMARKER. */
- XXX This function will exist only till collect_expansion doesn't
- need to see whitespace anymore, then it'll be merged with
- _cpp_get_directive_token (below). */
-enum cpp_token
-_cpp_get_define_token (pfile)
+#define empty_argument(A, O) \
+ ((A)->tokens[O] ? (A)->tokens[O]->type == CPP_PLACEMARKER \
+ : (A)->tokens[(O)+1]->type == CPP_PLACEMARKER)
+
+/* Parse the arguments making up a macro invocation. Nested arguments
+ are automatically macro expanded, but immediate macros are not
+ expanded; this enables e.g. operator # to work correctly. Returns
+ non-zero on error. */
+static int
+parse_args (pfile, hp, args)
cpp_reader *pfile;
+ cpp_hashnode *hp;
+ macro_args *args;
{
- long old_written;
- enum cpp_token token;
-
- get_next:
- old_written = CPP_WRITTEN (pfile);
- token = _cpp_lex_token (pfile);
- switch (token)
+ const cpp_token *token;
+ const cpp_toklist *macro;
+ unsigned int total = 0;
+ unsigned int paren_context = pfile->cur_context;
+ int argc = 0;
+
+ macro = hp->value.expansion;
+ do
{
- default:
- return token;
-
- case CPP_VSPACE:
- /* Put it back and return VSPACE. */
- FORWARD(-1);
- CPP_ADJUST_WRITTEN (pfile, -1);
- return CPP_VSPACE;
+ unsigned int count;
- case CPP_HSPACE:
- if (CPP_PEDANTIC (pfile))
+ token = parse_arg (pfile, (argc + 1 == macro->paramc
+ && (macro->flags & VAR_ARGS)),
+ paren_context, args, &count);
+ if (argc < macro->paramc)
{
- U_CHAR *p, *limit;
- p = pfile->token_buffer + old_written;
- limit = CPP_PWRITTEN (pfile);
- while (p < limit)
+ total += count;
+ args->ends[argc] = total;
+ }
+ argc++;
+ }
+ while (token->type != CPP_CLOSE_PAREN && token->type != CPP_EOF);
+
+ if (token->type == CPP_EOF)
+ {
+ cpp_error(pfile, "unterminated argument list for macro \"%s\"", hp->name);
+ return 1;
+ }
+ else if (argc < macro->paramc)
+ {
+ /* A rest argument is allowed to not appear in the invocation at all.
+ e.g. #define debug(format, args...) ...
+ debug("string");
+ This is exactly the same as if the rest argument had received no
+ tokens - debug("string",); This extension is deprecated. */
+
+ if (argc + 1 == macro->paramc && (macro->flags & VAR_ARGS))
+ {
+ /* Duplicate the placemarker. Then we can set its flags and
+ position and safely be using more than one. */
+ save_token (args, duplicate_token (pfile, &placemarker_token));
+ args->ends[argc] = total + 1;
+
+ if (CPP_OPTION (pfile, c99) && CPP_PEDANTIC (pfile))
+ cpp_pedwarn (pfile, "ISO C99 requires rest arguments to be used");
+
+ return 0;
+ }
+ else
+ {
+ cpp_error (pfile, "%u arguments is not enough for macro \"%s\"",
+ argc, hp->name);
+ return 1;
+ }
+ }
+ /* An empty argument to an empty function-like macro is fine. */
+ else if (argc > macro->paramc
+ && !(macro->paramc == 0 && argc == 1 && empty_argument (args, 0)))
+ {
+ cpp_error (pfile, "%u arguments is too many for macro \"%s\"",
+ argc, hp->name);
+ return 1;
+ }
+
+ return 0;
+}
+
+/* Adds backslashes before all backslashes and double quotes appearing
+ in strings. Non-printable characters are converted to octal. */
+static U_CHAR *
+quote_string (dest, src, len)
+ U_CHAR *dest;
+ const U_CHAR *src;
+ unsigned int len;
+{
+ while (len--)
+ {
+ U_CHAR c = *src++;
+
+ if (c == '\\' || c == '"')
+ {
+ *dest++ = '\\';
+ *dest++ = c;
+ }
+ else
+ {
+ if (ISPRINT (c))
+ *dest++ = c;
+ else
{
- if (*p == '\v' || *p == '\f')
- cpp_pedwarn (pfile, "%s in preprocessing directive",
- *p == '\f' ? "formfeed" : "vertical tab");
- p++;
+ sprintf ((char *) dest, "\\%03o", c);
+ dest += 4;
}
}
- return CPP_HSPACE;
+ }
- case CPP_DIRECTIVE:
- /* Don't execute the directive, but don't smash it to OTHER either. */
- CPP_PUTC (pfile, '#');
- return CPP_DIRECTIVE;
+ return dest;
+}
- case CPP_MACRO:
- if (! pfile->no_macro_expand
- && maybe_macroexpand (pfile, old_written))
- goto get_next;
- return CPP_NAME;
+/* Allocates a buffer to hold a token's TEXT, and converts TOKEN to a
+ CPP_STRING token containing TEXT in quoted form. */
+static cpp_token *
+make_string_token (token, text, len)
+ cpp_token *token;
+ const U_CHAR *text;
+ unsigned int len;
+{
+ U_CHAR *buf;
+
+ buf = (U_CHAR *) xmalloc (len * 4);
+ token->type = CPP_STRING;
+ token->flags = 0;
+ token->val.str.text = buf;
+ token->val.str.len = quote_string (buf, text, len) - buf;
+ return token;
+}
- case CPP_EOF:
- if (CPP_IS_MACRO_BUFFER (CPP_BUFFER (pfile)))
+/* Allocates and converts a temporary token to a CPP_NUMBER token,
+ evaluating to NUMBER. */
+static cpp_token *
+alloc_number_token (pfile, number)
+ cpp_reader *pfile;
+ int number;
+{
+ cpp_token *result;
+ char *buf;
+
+ result = get_temp_token (pfile);
+ buf = xmalloc (20);
+ sprintf (buf, "%d", number);
+
+ result->type = CPP_NUMBER;
+ result->flags = 0;
+ result->val.str.text = (U_CHAR *) buf;
+ result->val.str.len = strlen (buf);
+ return result;
+}
+
+/* Returns a temporary token from the temporary token store of PFILE. */
+static cpp_token *
+get_temp_token (pfile)
+ cpp_reader *pfile;
+{
+ if (pfile->temp_used == pfile->temp_alloced)
+ {
+ if (pfile->temp_used == pfile->temp_cap)
{
- cpp_pop_buffer (pfile);
- goto get_next;
+ pfile->temp_cap += pfile->temp_cap + 20;
+ pfile->temp_tokens = (cpp_token **) xrealloc
+ (pfile->temp_tokens, pfile->temp_cap * sizeof (cpp_token *));
}
- else
- /* This can happen for files that don't end with a newline,
- and for cpp_define and friends. Pretend they do, so
- callers don't have to deal. A warning will be issued by
- someone else, if necessary. */
- return CPP_VSPACE;
+ pfile->temp_tokens[pfile->temp_alloced++] = (cpp_token *) xmalloc
+ (sizeof (cpp_token));
}
+
+ return pfile->temp_tokens[pfile->temp_used++];
}
-/* Just like _cpp_get_define_token except that it discards horizontal
- whitespace. */
+/* Release (not free) for re-use the temporary tokens of PFILE. */
+static void
+release_temp_tokens (pfile)
+ cpp_reader *pfile;
+{
+ while (pfile->temp_used)
+ {
+ cpp_token *token = pfile->temp_tokens[--pfile->temp_used];
+
+ if (TOKEN_SPELL (token) == SPELL_STRING)
+ {
+ free ((char *) token->val.str.text);
+ token->val.str.text = 0;
+ }
+ }
+}
-enum cpp_token
-_cpp_get_directive_token (pfile)
+/* Free all of PFILE's dynamically-allocated temporary tokens. */
+void
+_cpp_free_temp_tokens (pfile)
cpp_reader *pfile;
{
- int old_written = CPP_WRITTEN (pfile);
- for (;;)
+ if (pfile->temp_tokens)
{
- enum cpp_token token = _cpp_get_define_token (pfile);
- if (token != CPP_COMMENT && token != CPP_HSPACE)
- return token;
- CPP_SET_WRITTEN (pfile, old_written);
+ /* It is possible, though unlikely (looking for '(' of a funlike
+ macro into EOF), that we haven't released the tokens yet. */
+ release_temp_tokens (pfile);
+ while (pfile->temp_alloced)
+ free (pfile->temp_tokens[--pfile->temp_alloced]);
+ free (pfile->temp_tokens);
+ }
+
+ if (pfile->date)
+ {
+ free ((char *) pfile->date->val.str.text);
+ free (pfile->date);
+ free ((char *) pfile->time->val.str.text);
+ free (pfile->time);
}
}
-/* Determine the current line and column. Used only by read_and_prescan. */
-static U_CHAR *
-find_position (start, limit, linep)
- U_CHAR *start;
- U_CHAR *limit;
- unsigned long *linep;
-{
- unsigned long line = *linep;
- U_CHAR *lbase = start;
- while (start < limit)
+/* Copy TOKEN into a temporary token from PFILE's store. */
+static cpp_token *
+duplicate_token (pfile, token)
+ cpp_reader *pfile;
+ const cpp_token *token;
+{
+ cpp_token *result = get_temp_token (pfile);
+
+ *result = *token;
+ if (TOKEN_SPELL (token) == SPELL_STRING)
+ {
+ U_CHAR *buff = (U_CHAR *) xmalloc (token->val.str.len);
+ memcpy (buff, token->val.str.text, token->val.str.len);
+ result->val.str.text = buff;
+ }
+ return result;
+}
+
+/* Determine whether two tokens can be pasted together, and if so,
+ what the resulting token is. Returns CPP_EOF if the tokens cannot
+ be pasted, or the appropriate type for the merged token if they
+ can. */
+enum cpp_ttype
+_cpp_can_paste (pfile, token1, token2, digraph)
+ cpp_reader * pfile;
+ const cpp_token *token1, *token2;
+ int* digraph;
+{
+ enum cpp_ttype a = token1->type, b = token2->type;
+ int cxx = CPP_OPTION (pfile, cplusplus);
+
+ /* Treat named operators as if they were ordinary NAMEs. */
+ if (token1->flags & NAMED_OP)
+ a = CPP_NAME;
+ if (token2->flags & NAMED_OP)
+ b = CPP_NAME;
+
+ if (a <= CPP_LAST_EQ && b == CPP_EQ)
+ return a + (CPP_EQ_EQ - CPP_EQ);
+
+ switch (a)
{
- U_CHAR ch = *start++;
- if (ch == '\n' || ch == '\r')
+ case CPP_GREATER:
+ if (b == a) return CPP_RSHIFT;
+ if (b == CPP_QUERY && cxx) return CPP_MAX;
+ if (b == CPP_GREATER_EQ) return CPP_RSHIFT_EQ;
+ break;
+ case CPP_LESS:
+ if (b == a) return CPP_LSHIFT;
+ if (b == CPP_QUERY && cxx) return CPP_MIN;
+ if (b == CPP_LESS_EQ) return CPP_LSHIFT_EQ;
+ if (CPP_OPTION (pfile, digraphs))
+ {
+ if (b == CPP_COLON)
+ {*digraph = 1; return CPP_OPEN_SQUARE;} /* <: digraph */
+ if (b == CPP_MOD)
+ {*digraph = 1; return CPP_OPEN_BRACE;} /* <% digraph */
+ }
+ break;
+
+ case CPP_PLUS: if (b == a) return CPP_PLUS_PLUS; break;
+ case CPP_AND: if (b == a) return CPP_AND_AND; break;
+ case CPP_OR: if (b == a) return CPP_OR_OR; break;
+
+ case CPP_MINUS:
+ if (b == a) return CPP_MINUS_MINUS;
+ if (b == CPP_GREATER) return CPP_DEREF;
+ break;
+ case CPP_COLON:
+ if (b == a && cxx) return CPP_SCOPE;
+ if (b == CPP_GREATER && CPP_OPTION (pfile, digraphs))
+ {*digraph = 1; return CPP_CLOSE_SQUARE;} /* :> digraph */
+ break;
+
+ case CPP_MOD:
+ if (CPP_OPTION (pfile, digraphs))
+ {
+ if (b == CPP_GREATER)
+ {*digraph = 1; return CPP_CLOSE_BRACE;} /* %> digraph */
+ if (b == CPP_COLON)
+ {*digraph = 1; return CPP_HASH;} /* %: digraph */
+ }
+ break;
+ case CPP_DEREF:
+ if (b == CPP_MULT && cxx) return CPP_DEREF_STAR;
+ break;
+ case CPP_DOT:
+ if (b == CPP_MULT && cxx) return CPP_DOT_STAR;
+ if (b == CPP_NUMBER) return CPP_NUMBER;
+ break;
+
+ case CPP_HASH:
+ if (b == a && (token1->flags & DIGRAPH) == (token2->flags & DIGRAPH))
+ /* %:%: digraph */
+ {*digraph = (token1->flags & DIGRAPH); return CPP_PASTE;}
+ break;
+
+ case CPP_NAME:
+ if (b == CPP_NAME) return CPP_NAME;
+ if (b == CPP_NUMBER
+ && is_numstart(token2->val.str.text[0])) return CPP_NAME;
+ if (b == CPP_CHAR
+ && token1->val.node == pfile->spec_nodes->n_L) return CPP_WCHAR;
+ if (b == CPP_STRING
+ && token1->val.node == pfile->spec_nodes->n_L) return CPP_WSTRING;
+ break;
+
+ case CPP_NUMBER:
+ if (b == CPP_NUMBER) return CPP_NUMBER;
+ if (b == CPP_NAME) return CPP_NUMBER;
+ if (b == CPP_DOT) return CPP_NUMBER;
+ /* Numbers cannot have length zero, so this is safe. */
+ if ((b == CPP_PLUS || b == CPP_MINUS)
+ && VALID_SIGN ('+', token1->val.str.text[token1->val.str.len - 1]))
+ return CPP_NUMBER;
+ break;
+
+ case CPP_OTHER:
+ if (CPP_OPTION (pfile, objc) && token1->val.aux == '@')
{
- line++;
- lbase = start;
+ if (b == CPP_NAME) return CPP_NAME;
+ if (b == CPP_STRING) return CPP_OSTRING;
}
+
+ default:
+ break;
}
- *linep = line;
- return lbase;
+
+ return CPP_EOF;
}
-/* The following table is used by _cpp_read_and_prescan. If we have
- designated initializers, it can be constant data; otherwise, it is
- set up at runtime by _cpp_init_input_buffer. */
+/* Check if TOKEN is to be ##-pasted with the token after it. */
+static const cpp_token *
+maybe_paste_with_next (pfile, token)
+ cpp_reader *pfile;
+ const cpp_token *token;
+{
+ cpp_token *pasted;
+ const cpp_token *second;
+ cpp_context *context = CURRENT_CONTEXT (pfile);
-#ifndef UCHAR_MAX
-#define UCHAR_MAX 255 /* assume 8-bit bytes */
-#endif
+ /* Is this token on the LHS of ## ? */
-#if (GCC_VERSION >= 2007) || (__STDC_VERSION__ >= 199901L)
-#define init_chartab() /* nothing */
-#define CHARTAB static const unsigned char chartab[UCHAR_MAX + 1] = {
-#define END };
-#define s(p, v) [p] = v,
-#else
-#define CHARTAB static unsigned char chartab[UCHAR_MAX + 1] = { 0 }; \
- static void init_chartab PARAMS ((void)) { \
- unsigned char *x = chartab;
-#define END }
-#define s(p, v) x[p] = v;
-#endif
+ while ((token->flags & PASTE_LEFT)
+ || ((context->flags & CONTEXT_PASTEL)
+ && context->posn == context->count))
+ {
+ /* Suppress macro expansion for next token, but don't conflict
+ with the other method of suppression. If it is an argument,
+ macro expansion within the argument will still occur. */
+ pfile->paste_level = pfile->cur_context;
+ second = _cpp_get_token (pfile);
+ pfile->paste_level = 0;
+ context = CURRENT_CONTEXT (pfile);
+
+ /* Ignore placemarker argument tokens (cannot be from an empty
+ macro since macros are not expanded). */
+ if (token->type == CPP_PLACEMARKER)
+ pasted = duplicate_token (pfile, second);
+ else if (second->type == CPP_PLACEMARKER)
+ {
+ /* GCC has special extended semantics for , ## b where b is
+ a varargs parameter: the comma disappears if b was given
+ no actual arguments (not merely if b is an empty
+ argument). */
+ if (token->type == CPP_COMMA && (context->flags & CONTEXT_VARARGS))
+ pasted = duplicate_token (pfile, second);
+ else
+ pasted = duplicate_token (pfile, token);
+ }
+ else
+ {
+ int digraph = 0;
+ enum cpp_ttype type = _cpp_can_paste (pfile, token, second, &digraph);
-/* Table of characters that can't be handled in the inner loop.
- Also contains the mapping between trigraph third characters and their
- replacements. */
-#define SPECCASE_CR 1
-#define SPECCASE_BACKSLASH 2
-#define SPECCASE_QUESTION 3
-
-CHARTAB
- s('\r', SPECCASE_CR)
- s('\\', SPECCASE_BACKSLASH)
- s('?', SPECCASE_QUESTION)
-
- s('=', '#') s(')', ']') s('!', '|')
- s('(', '[') s('\'', '^') s('>', '}')
- s('/', '\\') s('<', '{') s('-', '~')
-END
-
-#undef CHARTAB
-#undef END
-#undef s
-
-#define NORMAL(c) ((chartab[c]) == 0 || (chartab[c]) > SPECCASE_QUESTION)
-#define NONTRI(c) ((c) <= SPECCASE_QUESTION)
-
-/* Read the entire contents of file DESC into buffer BUF. LEN is how
- much memory to allocate initially; more will be allocated if
- necessary. Convert end-of-line markers (\n, \r, \r\n, \n\r) to
- canonical form (\n). If enabled, convert and/or warn about
- trigraphs. Convert backslash-newline to a one-character escape
- (\r) and remove it from "embarrassing" places (i.e. the middle of a
- token). If there is no newline at the end of the file, add one and
- warn. Returns -1 on failure, or the actual length of the data to
- be scanned.
-
- This function does a lot of work, and can be a serious performance
- bottleneck. It has been tuned heavily; make sure you understand it
- before hacking. The common case - no trigraphs, Unix style line
- breaks, backslash-newline set off by whitespace, newline at EOF -
- has been optimized at the expense of the others. The performance
- penalty for DOS style line breaks (\r\n) is about 15%.
-
- Warnings lose particularly heavily since we have to determine the
- line number, which involves scanning from the beginning of the file
- or from the last warning. The penalty for the absence of a newline
- at the end of reload1.c is about 60%. (reload1.c is 329k.)
+ if (type == CPP_EOF)
+ {
+ if (CPP_OPTION (pfile, warn_paste))
+ {
+ /* Do not complain about , ## <whatever> if
+ <whatever> came from a variable argument, because
+ the author probably intended the ## to trigger
+ the special extended semantics (see above). */
+ if (token->type == CPP_COMMA
+ && (context->flags & CONTEXT_VARARGS))
+ /* no warning */;
+ else
+ cpp_warning (pfile,
+ "pasting would not give a valid preprocessing token");
+ }
+ _cpp_push_token (pfile, second);
+ /* A short term hack to safely clear the PASTE_LEFT flag. */
+ pasted = duplicate_token (pfile, token);
+ pasted->flags &= ~PASTE_LEFT;
+ return pasted;
+ }
- If your file has more than one kind of end-of-line marker, you
- will get messed-up line numbering.
-
- So that the cases of the switch statement do not have to concern
- themselves with the complications of reading beyond the end of the
- buffer, the buffer is guaranteed to have at least 3 characters in
- it (or however many are left in the file, if less) on entry to the
- switch. This is enough to handle trigraphs and the "\\\n\r" and
- "\\\r\n" cases.
-
- The end of the buffer is marked by a '\\', which, being a special
- character, guarantees we will exit the fast-scan loops and perform
- a refill. */
-
-long
-_cpp_read_and_prescan (pfile, fp, desc, len)
+ if (type == CPP_NAME || type == CPP_NUMBER)
+ {
+ /* Join spellings. */
+ U_CHAR *buf, *end;
+
+ pasted = get_temp_token (pfile);
+ buf = (U_CHAR *) alloca (TOKEN_LEN (token) + TOKEN_LEN (second));
+ end = spell_token (pfile, token, buf);
+ end = spell_token (pfile, second, end);
+ *end = '\0';
+
+ if (type == CPP_NAME)
+ pasted->val.node = cpp_lookup (pfile, buf, end - buf);
+ else
+ {
+ pasted->val.str.text = uxstrdup (buf);
+ pasted->val.str.len = end - buf;
+ }
+ }
+ else if (type == CPP_WCHAR || type == CPP_WSTRING
+ || type == CPP_OSTRING)
+ pasted = duplicate_token (pfile, second);
+ else
+ {
+ pasted = get_temp_token (pfile);
+ pasted->val.integer = 0;
+ }
+
+ pasted->type = type;
+ pasted->flags = digraph ? DIGRAPH : 0;
+
+ if (type == CPP_NAME && pasted->val.node->type == T_OPERATOR)
+ {
+ pasted->type = pasted->val.node->value.code;
+ pasted->flags |= NAMED_OP;
+ }
+ }
+
+ /* The pasted token gets the whitespace flags and position of the
+ first token, the PASTE_LEFT flag of the second token, plus the
+ PASTED flag to indicate it is the result of a paste. However, we
+ want to preserve the DIGRAPH flag. */
+ pasted->flags &= ~(PREV_WHITE | BOL | PASTE_LEFT);
+ pasted->flags |= ((token->flags & (PREV_WHITE | BOL))
+ | (second->flags & PASTE_LEFT) | PASTED);
+ pasted->col = token->col;
+ pasted->line = token->line;
+
+ /* See if there is another token to be pasted onto the one we just
+ constructed. */
+ token = pasted;
+ /* and loop */
+ }
+ return token;
+}
+
+/* Convert a token sequence to a single string token according to the
+ rules of the ISO C #-operator. */
+#define INIT_SIZE 200
+static cpp_token *
+stringify_arg (pfile, token)
cpp_reader *pfile;
- cpp_buffer *fp;
- int desc;
- size_t len;
-{
- U_CHAR *buf = (U_CHAR *) xmalloc (len);
- U_CHAR *ip, *op, *line_base;
- U_CHAR *ibase;
- unsigned long line;
- unsigned int deferred_newlines;
- size_t offset;
- int count = 0;
-
- offset = 0;
- deferred_newlines = 0;
- op = buf;
- line_base = buf;
- line = 1;
- ibase = pfile->input_buffer + 3;
- ip = ibase;
- ip[-1] = '\0'; /* Guarantee no match with \n for SPECCASE_CR */
+ const cpp_token *token;
+{
+ cpp_token *result;
+ unsigned char *main_buf;
+ unsigned int prev_value, backslash_count = 0;
+ unsigned int buf_used = 0, whitespace = 0, buf_cap = INIT_SIZE;
- for (;;)
+ push_arg_context (pfile, token);
+ prev_value = prevent_macro_expansion (pfile);
+ main_buf = (unsigned char *) xmalloc (buf_cap);
+
+ result = get_temp_token (pfile);
+ ASSIGN_FLAGS_AND_POS (result, token);
+
+ for (; (token = _cpp_get_token (pfile))->type != CPP_EOF; )
{
- U_CHAR *near_buff_end;
+ int escape;
+ unsigned char *buf;
+ unsigned int len = TOKEN_LEN (token);
+
+ if (token->type == CPP_PLACEMARKER)
+ continue;
- /* Copy previous char plus unprocessed (at most 2) chars
- to beginning of buffer, refill it with another
- read(), and continue processing */
- memcpy(ip - count - 1, ip - 1, 3);
- ip -= count;
+ escape = (token->type == CPP_STRING || token->type == CPP_WSTRING
+ || token->type == CPP_CHAR || token->type == CPP_WCHAR);
+ if (escape)
+ len *= 4 + 1;
+
+ if (buf_used + len > buf_cap)
+ {
+ buf_cap = buf_used + len + INIT_SIZE;
+ main_buf = xrealloc (main_buf, buf_cap);
+ }
- count = read (desc, ibase, pfile->input_buffer_len);
- if (count < 0)
- goto error;
+ if (whitespace && (token->flags & PREV_WHITE))
+ main_buf[buf_used++] = ' ';
+
+ if (escape)
+ buf = (unsigned char *) xmalloc (len);
+ else
+ buf = main_buf + buf_used;
- ibase[count] = '\\'; /* Marks end of buffer */
- if (count)
+ len = spell_token (pfile, token, buf) - buf;
+ if (escape)
{
- near_buff_end = pfile->input_buffer + count;
- offset += count;
- if (offset > len)
- {
- size_t delta_op;
- size_t delta_line_base;
- len *= 2;
- if (offset > len)
- /* len overflowed.
- This could happen if the file is larger than half the
- maximum address space of the machine. */
- goto too_big;
-
- delta_op = op - buf;
- delta_line_base = line_base - buf;
- buf = (U_CHAR *) xrealloc (buf, len);
- op = buf + delta_op;
- line_base = buf + delta_line_base;
- }
+ buf_used = quote_string (&main_buf[buf_used], buf, len) - main_buf;
+ free (buf);
+ }
+ else
+ buf_used += len;
+
+ whitespace = 1;
+ if (token->type == CPP_BACKSLASH)
+ backslash_count++;
+ else
+ backslash_count = 0;
+ }
+
+ /* Ignore the final \ of invalid string literals. */
+ if (backslash_count & 1)
+ {
+ cpp_warning (pfile, "invalid string literal, ignoring final '\\'");
+ buf_used--;
+ }
+
+ result->type = CPP_STRING;
+ result->val.str.text = main_buf;
+ result->val.str.len = buf_used;
+ restore_macro_expansion (pfile, prev_value);
+ return result;
+}
+
+/* Allocate more room on the context stack of PFILE. */
+static void
+expand_context_stack (pfile)
+ cpp_reader *pfile;
+{
+ pfile->context_cap += pfile->context_cap + 20;
+ pfile->contexts = (cpp_context *)
+ xrealloc (pfile->contexts, pfile->context_cap * sizeof (cpp_context));
+}
+
+/* Push the context of macro NODE onto the context stack. TOKEN is
+ the CPP_NAME token invoking the macro. */
+static int
+push_macro_context (pfile, token)
+ cpp_reader *pfile;
+ const cpp_token *token;
+{
+ unsigned char orig_flags;
+ macro_args *args;
+ cpp_context *context;
+ cpp_hashnode *node = token->val.node;
+
+ /* Token's flags may change when parsing args containing a nested
+ invocation of this macro. */
+ orig_flags = token->flags & (PREV_WHITE | BOL);
+ args = 0;
+ if (node->value.expansion->paramc >= 0)
+ {
+ unsigned int error, prev_nme;
+
+ /* Allocate room for the argument contexts, and parse them. */
+ args = (macro_args *) xmalloc (sizeof (macro_args));
+ args->ends = (unsigned int *)
+ xmalloc (node->value.expansion->paramc * sizeof (unsigned int));
+ args->tokens = 0;
+ args->capacity = 0;
+ args->used = 0;
+
+ prev_nme = prevent_macro_expansion (pfile);
+ pfile->args = args;
+ error = parse_args (pfile, node, args);
+ pfile->args = 0;
+ restore_macro_expansion (pfile, prev_nme);
+ if (error)
+ {
+ free_macro_args (args);
+ return 1;
}
+ /* Set the level after the call to parse_args. */
+ args->level = pfile->cur_context;
+ }
+
+ /* Now push its context. */
+ pfile->cur_context++;
+ if (pfile->cur_context == pfile->context_cap)
+ expand_context_stack (pfile);
+
+ context = CURRENT_CONTEXT (pfile);
+ context->u.list = node->value.expansion;
+ context->args = args;
+ context->posn = 0;
+ context->count = context->u.list->tokens_used;
+ context->level = pfile->cur_context;
+ context->flags = 0;
+ context->pushed_token = 0;
+
+ /* Set the flags of the first token. We know there must
+ be one, empty macros are a single placemarker token. */
+ MODIFY_FLAGS_AND_POS (&context->u.list->tokens[0], token, orig_flags);
+
+ return 0;
+}
+
+/* Push an argument to the current macro onto the context stack.
+ TOKEN is the MACRO_ARG token representing the argument expansion. */
+static void
+push_arg_context (pfile, token)
+ cpp_reader *pfile;
+ const cpp_token *token;
+{
+ cpp_context *context;
+ macro_args *args;
+
+ pfile->cur_context++;
+ if (pfile->cur_context == pfile->context_cap)
+ expand_context_stack (pfile);
+
+ context = CURRENT_CONTEXT (pfile);
+ args = context[-1].args;
+
+ context->count = token->val.aux ? args->ends[token->val.aux - 1]: 0;
+ context->u.arg = args->tokens + context->count;
+ context->count = args->ends[token->val.aux] - context->count;
+ context->args = 0;
+ context->posn = 0;
+ context->level = args->level;
+ context->flags = CONTEXT_ARG | CONTEXT_RAW;
+ if ((context[-1].u.list->flags & VAR_ARGS)
+ && token->val.aux + 1 == (unsigned) context[-1].u.list->paramc)
+ context->flags |= CONTEXT_VARARGS;
+ context->pushed_token = 0;
+
+ /* Set the flags of the first token. There is one. */
+ {
+ const cpp_token *first = context->u.arg[0];
+ if (!first)
+ first = context->u.arg[1];
+
+ MODIFY_FLAGS_AND_POS ((cpp_token *) first, token,
+ token->flags & (PREV_WHITE | BOL));
+ }
+
+ if (token->flags & PASTE_LEFT)
+ context->flags |= CONTEXT_PASTEL;
+ if (pfile->paste_level)
+ context->flags |= CONTEXT_PASTER;
+}
+
+/* "Unget" a token. It is effectively inserted in the token queue and
+ will be returned by the next call to get_raw_token. */
+void
+_cpp_push_token (pfile, token)
+ cpp_reader *pfile;
+ const cpp_token *token;
+{
+ cpp_context *context = CURRENT_CONTEXT (pfile);
+
+ if (context->posn > 0)
+ {
+ const cpp_token *prev;
+ if (IS_ARG_CONTEXT (context))
+ prev = context->u.arg[context->posn - 1];
else
+ prev = &context->u.list->tokens[context->posn - 1];
+
+ if (prev == token)
{
- if (ip == ibase)
- break;
- /* Allow normal processing of the (at most 2) remaining
- characters. The end-of-buffer marker is still present
- and prevents false matches within the switch. */
- near_buff_end = ibase - 1;
+ context->posn--;
+ return;
}
+ }
+
+ if (context->pushed_token)
+ cpp_ice (pfile, "two tokens pushed in a row");
+ if (token->type != CPP_EOF)
+ context->pushed_token = token;
+ /* Don't push back a directive's CPP_EOF, step back instead. */
+ else if (pfile->cur_context == 0)
+ pfile->contexts[0].posn--;
+}
+
+/* Handle a preprocessing directive. TOKEN is the CPP_HASH token
+ introducing the directive. */
+void
+_cpp_process_directive (pfile, token)
+ cpp_reader *pfile;
+ const cpp_token *token;
+{
+ const struct directive *d = pfile->token_list.directive;
+ int prev_nme = 0;
+
+ /* Skip over the directive name. */
+ if (token[1].type == CPP_NAME)
+ _cpp_get_raw_token (pfile);
+ else if (token[1].type != CPP_NUMBER)
+ cpp_ice (pfile, "directive begins with %s?!", TOKEN_NAME (token));
+
+ if (! (d->flags & EXPAND))
+ prev_nme = prevent_macro_expansion (pfile);
+ (void) (*d->handler) (pfile);
+ if (! (d->flags & EXPAND))
+ restore_macro_expansion (pfile, prev_nme);
+ _cpp_skip_rest_of_line (pfile);
+}
- for (;;)
+/* The external interface to return the next token. All macro
+ expansion and directive processing is handled internally, the
+ caller only ever sees the output after preprocessing. */
+const cpp_token *
+cpp_get_token (pfile)
+ cpp_reader *pfile;
+{
+ const cpp_token *token;
+ /* Loop till we hit a non-directive, non-placemarker token. */
+ for (;;)
+ {
+ token = _cpp_get_token (pfile);
+
+ if (token->type == CPP_PLACEMARKER)
+ continue;
+
+ if (token->type == CPP_HASH && token->flags & BOL
+ && pfile->token_list.directive)
{
- unsigned int span;
+ _cpp_process_directive (pfile, token);
+ continue;
+ }
- /* Deal with \-newline, potentially in the middle of a token. */
- if (deferred_newlines)
+ return token;
+ }
+}
+
+/* The internal interface to return the next token. There are two
+ differences between the internal and external interfaces: the
+ internal interface may return a PLACEMARKER token, and it does not
+ process directives. */
+const cpp_token *
+_cpp_get_token (pfile)
+ cpp_reader *pfile;
+{
+ const cpp_token *token, *old_token;
+ cpp_hashnode *node;
+
+ /* Loop until we hit a non-macro token. */
+ for (;;)
+ {
+ token = get_raw_token (pfile);
+
+ /* Short circuit EOF. */
+ if (token->type == CPP_EOF)
+ return token;
+
+ /* If we are skipping... */
+ if (pfile->skipping)
+ {
+ /* we still have to process directives, */
+ if (pfile->token_list.directive)
+ return token;
+
+ /* but everything else is ignored. */
+ _cpp_skip_rest_of_line (pfile);
+ continue;
+ }
+
+ /* If there's a potential control macro and we get here, then that
+ #ifndef didn't cover the entire file and its argument shouldn't
+ be taken as a control macro. */
+ pfile->potential_control_macro = 0;
+
+ /* If we are rescanning preprocessed input, no macro expansion or
+ token pasting may occur. */
+ if (CPP_OPTION (pfile, preprocessed))
+ return token;
+
+ old_token = token;
+
+ /* See if there's a token to paste with this one. */
+ if (!pfile->paste_level)
+ token = maybe_paste_with_next (pfile, token);
+
+ /* If it isn't a macro, return it now. */
+ if (token->type != CPP_NAME || token->val.node->type == T_VOID)
+ return token;
+
+ /* Is macro expansion disabled in general, or are we in the
+ middle of a token paste, or was this token just pasted?
+ (Note we don't check token->flags & PASTED, because that
+ counts tokens that were pasted at some point in the past,
+ we're only interested in tokens that were pasted by this call
+ to maybe_paste_with_next.) */
+ if (pfile->no_expand_level == pfile->cur_context
+ || pfile->paste_level
+ || (token != old_token
+ && pfile->no_expand_level + 1 == pfile->cur_context))
+ return token;
+
+ node = token->val.node;
+ if (node->type != T_MACRO)
+ return special_symbol (pfile, node, token);
+
+ if (is_macro_disabled (pfile, node->value.expansion, token))
+ return token;
+
+ if (push_macro_context (pfile, token))
+ return token;
+ /* else loop */
+ }
+}
+
+/* Returns the next raw token, i.e. without performing macro
+ expansion. Argument contexts are automatically entered. */
+static const cpp_token *
+get_raw_token (pfile)
+ cpp_reader *pfile;
+{
+ const cpp_token *result;
+ cpp_context *context;
+
+ for (;;)
+ {
+ context = CURRENT_CONTEXT (pfile);
+ if (context->pushed_token)
+ {
+ result = context->pushed_token;
+ context->pushed_token = 0;
+ return result; /* Cannot be a CPP_MACRO_ARG */
+ }
+ else if (context->posn == context->count)
+ {
+ if (pop_context (pfile))
+ return &eof_token;
+ continue;
+ }
+ else if (IS_ARG_CONTEXT (context))
+ {
+ result = context->u.arg[context->posn++];
+ if (result == 0)
{
- if (op != buf && ! is_space (op[-1]) && op[-1] != '\r')
- {
- /* Previous was not white space. Skip to white
- space, if we can, before outputting the \r's */
- span = 0;
- while (ip[span] != ' '
- && ip[span] != '\t'
- && ip[span] != '\n'
- && NORMAL(ip[span]))
- span++;
- memcpy (op, ip, span);
- op += span;
- ip += span;
- if (! NORMAL(ip[0]))
- goto do_speccase;
- }
- while (deferred_newlines)
- deferred_newlines--, *op++ = '\r';
+ context->flags ^= CONTEXT_RAW;
+ result = context->u.arg[context->posn++];
}
+ return result; /* Cannot be a CPP_MACRO_ARG */
+ }
- /* Copy as much as we can without special treatment. */
- span = 0;
- while (NORMAL (ip[span])) span++;
- memcpy (op, ip, span);
- op += span;
- ip += span;
+ result = &context->u.list->tokens[context->posn++];
- do_speccase:
- if (ip > near_buff_end) /* Do we have enough chars? */
- break;
- switch (chartab[*ip++])
- {
- case SPECCASE_CR: /* \r */
- if (ip[-2] != '\n')
- {
- if (*ip == '\n')
- ip++;
- *op++ = '\n';
- }
- break;
+ if (result->type != CPP_MACRO_ARG)
+ return result;
- case SPECCASE_BACKSLASH: /* \ */
- if (*ip == '\n')
- {
- deferred_newlines++;
- ip++;
- if (*ip == '\r') ip++;
- }
- else if (*ip == '\r')
- {
- deferred_newlines++;
- ip++;
- if (*ip == '\n') ip++;
- }
- else
- *op++ = '\\';
- break;
+ if (result->flags & STRINGIFY_ARG)
+ return stringify_arg (pfile, result);
- case SPECCASE_QUESTION: /* ? */
- {
- unsigned int d, t;
-
- *op++ = '?'; /* Normal non-trigraph case */
- if (ip[0] != '?')
- break;
-
- d = ip[1];
- t = chartab[d];
- if (NONTRI (t))
- break;
-
- if (CPP_OPTION (pfile, warn_trigraphs))
- {
- unsigned long col;
- line_base = find_position (line_base, op, &line);
- col = op - line_base + 1;
- if (CPP_OPTION (pfile, trigraphs))
- cpp_warning_with_line (pfile, line, col,
- "trigraph ??%c converted to %c", d, t);
- else
- cpp_warning_with_line (pfile, line, col,
- "trigraph ??%c ignored", d);
- }
-
- ip += 2;
- if (CPP_OPTION (pfile, trigraphs))
- {
- op[-1] = t; /* Overwrite '?' */
- if (t == '\\')
- {
- op--;
- *--ip = '\\';
- goto do_speccase; /* May need buffer refill */
- }
- }
- else
- {
- *op++ = '?';
- *op++ = d;
- }
- }
- break;
+ push_arg_context (pfile, result);
+ }
+}
+
+/* Internal interface to get the token without macro expanding. */
+const cpp_token *
+_cpp_get_raw_token (pfile)
+ cpp_reader *pfile;
+{
+ int prev_nme = prevent_macro_expansion (pfile);
+ const cpp_token *result = _cpp_get_token (pfile);
+ restore_macro_expansion (pfile, prev_nme);
+ return result;
+}
+
+/* A thin wrapper to lex_line. CLEAR is non-zero if the current token
+ list should be overwritten, or zero if we need to append
+ (typically, if we are within the arguments to a macro, or looking
+ for the '(' to start a function-like macro invocation). */
+static int
+lex_next (pfile, clear)
+ cpp_reader *pfile;
+ int clear;
+{
+ cpp_toklist *list = &pfile->token_list;
+ const cpp_token *old_list = list->tokens;
+ unsigned int old_used = list->tokens_used;
+
+ if (clear)
+ {
+ /* Release all temporary tokens. */
+ _cpp_clear_toklist (list);
+ pfile->contexts[0].posn = 0;
+ if (pfile->temp_used)
+ release_temp_tokens (pfile);
+ }
+ lex_line (pfile, list);
+ pfile->contexts[0].count = list->tokens_used;
+
+ if (!clear && pfile->args)
+ {
+ /* Fix up argument token pointers. */
+ if (old_list != list->tokens)
+ {
+ unsigned int i;
+
+ for (i = 0; i < pfile->args->used; i++)
+ {
+ const cpp_token *token = pfile->args->tokens[i];
+ if (token >= old_list && token < old_list + old_used)
+ pfile->args->tokens[i] = (const cpp_token *)
+ ((char *) token + ((char *) list->tokens - (char *) old_list));
}
}
+
+ /* 6.10.3 paragraph 11: If there are sequences of preprocessing
+ tokens within the list of arguments that would otherwise act as
+ preprocessing directives, the behavior is undefined.
+
+ This implementation will report a hard error and treat the
+ 'sequence of preprocessing tokens' as part of the macro argument,
+ not a directive.
+
+ Note if pfile->args == 0, we're OK since we're only inside a
+ macro argument after a '('. */
+ if (list->directive)
+ {
+ cpp_error_with_line (pfile, list->tokens[old_used].line,
+ list->tokens[old_used].col,
+ "#%s may not be used inside a macro argument",
+ list->directive->name);
+ return 1;
+ }
}
- if (offset == 0)
- return 0;
+ return 0;
+}
+
+/* Pops a context off the context stack. If we're at the bottom, lexes
+ the next logical line. Returns EOF if we're at the end of the
+ argument list to the # operator, or we should not "overflow"
+ into the rest of the file (e.g. 6.10.3.1.1). */
+static int
+pop_context (pfile)
+ cpp_reader *pfile;
+{
+ cpp_context *context;
+
+ if (pfile->cur_context == 0)
+ {
+ /* If we are currently processing a directive, do not advance. 6.10
+ paragraph 2: A new-line character ends the directive even if it
+ occurs within what would otherwise be an invocation of a
+ function-like macro. */
+ if (pfile->token_list.directive)
+ return 1;
+
+ return lex_next (pfile, pfile->no_expand_level == UINT_MAX);
+ }
+
+ /* Argument contexts, when parsing args or handling # operator
+ return CPP_EOF at the end. */
+ context = CURRENT_CONTEXT (pfile);
+ if (IS_ARG_CONTEXT (context) && pfile->cur_context == pfile->no_expand_level)
+ return 1;
+
+ /* Free resources when leaving macro contexts. */
+ if (context->args)
+ free_macro_args (context->args);
- if (op[-1] != '\n')
+ if (pfile->cur_context == pfile->no_expand_level)
+ pfile->no_expand_level--;
+ pfile->cur_context--;
+
+ return 0;
+}
+
+/* Turn off macro expansion at the current context level. */
+static unsigned int
+prevent_macro_expansion (pfile)
+ cpp_reader *pfile;
+{
+ unsigned int prev_value = pfile->no_expand_level;
+ pfile->no_expand_level = pfile->cur_context;
+ return prev_value;
+}
+
+/* Restore macro expansion to its previous state. */
+static void
+restore_macro_expansion (pfile, prev_value)
+ cpp_reader *pfile;
+ unsigned int prev_value;
+{
+ pfile->no_expand_level = prev_value;
+}
+
+/* Used by cpperror.c to obtain the correct line and column to report
+ in a diagnostic. */
+unsigned int
+_cpp_get_line (pfile, pcol)
+ cpp_reader *pfile;
+ unsigned int *pcol;
+{
+ unsigned int index;
+ const cpp_token *cur_token;
+
+ if (pfile->state.in_lex_line)
+ index = pfile->token_list.tokens_used;
+ else
{
- unsigned long col;
- line_base = find_position (line_base, op, &line);
- col = op - line_base + 1;
- cpp_warning_with_line (pfile, line, col, "no newline at end of file\n");
- if (offset + 1 > len)
- {
- len += 1;
- if (offset + 1 > len)
- goto too_big;
- buf = (U_CHAR *) xrealloc (buf, len);
- op = buf + offset;
- }
- *op++ = '\n';
+ index = pfile->contexts[0].posn;
+
+ if (index == 0)
+ {
+ if (pcol)
+ *pcol = 0;
+ return 0;
+ }
+ index--;
}
- fp->buf = ((len - offset < 20) ? buf : (U_CHAR *)xrealloc (buf, op - buf));
- return op - buf;
+ cur_token = &pfile->token_list.tokens[index];
+ if (pcol)
+ *pcol = cur_token->col;
+ return cur_token->line;
+}
+
+#define DSC(str) (const U_CHAR *)str, sizeof str - 1
+static const char * const monthnames[] =
+{
+ "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+ "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
+};
+
+/* Handle builtin macros like __FILE__. */
+static const cpp_token *
+special_symbol (pfile, node, token)
+ cpp_reader *pfile;
+ cpp_hashnode *node;
+ const cpp_token *token;
+{
+ cpp_token *result;
+ cpp_buffer *ip;
+
+ switch (node->type)
+ {
+ case T_FILE:
+ case T_BASE_FILE:
+ {
+ const char *file;
+
+ ip = CPP_BUFFER (pfile);
+ if (ip == 0)
+ file = "";
+ else
+ {
+ if (node->type == T_BASE_FILE)
+ while (CPP_PREV_BUFFER (ip) != NULL)
+ ip = CPP_PREV_BUFFER (ip);
+
+ file = ip->nominal_fname;
+ }
+ result = make_string_token (get_temp_token (pfile), (U_CHAR *) file,
+ strlen (file));
+ }
+ break;
+
+ case T_INCLUDE_LEVEL:
+ /* pfile->include_depth counts the primary source as level 1,
+ but historically __INCLUDE_DEPTH__ has called the primary
+ source level 0. */
+ result = alloc_number_token (pfile, pfile->include_depth - 1);
+ break;
+
+ case T_SPECLINE:
+ /* If __LINE__ is embedded in a macro, it must expand to the
+ line of the macro's invocation, not its definition.
+ Otherwise things like assert() will not work properly. */
+ result = alloc_number_token (pfile, _cpp_get_line (pfile, NULL));
+ break;
+
+ case T_STDC:
+ {
+ int stdc = 1;
+
+#ifdef STDC_0_IN_SYSTEM_HEADERS
+ if (CPP_IN_SYSTEM_HEADER (pfile)
+ && pfile->spec_nodes->n__STRICT_ANSI__->type == T_VOID)
+ stdc = 0;
+#endif
+ result = alloc_number_token (pfile, stdc);
+ }
+ break;
+
+ case T_DATE:
+ case T_TIME:
+ if (pfile->date == 0)
+ {
+ /* Allocate __DATE__ and __TIME__ from permanent storage,
+ and save them in pfile so we don't have to do this again.
+ We don't generate these strings at init time because
+ time() and localtime() are very slow on some systems. */
+ time_t tt = time (NULL);
+ struct tm *tb = localtime (&tt);
+
+ pfile->date = make_string_token
+ ((cpp_token *) xmalloc (sizeof (cpp_token)), DSC("Oct 11 1347"));
+ pfile->time = make_string_token
+ ((cpp_token *) xmalloc (sizeof (cpp_token)), DSC("12:34:56"));
+
+ sprintf ((char *) pfile->date->val.str.text, "%s %2d %4d",
+ monthnames[tb->tm_mon], tb->tm_mday, tb->tm_year + 1900);
+ sprintf ((char *) pfile->time->val.str.text, "%02d:%02d:%02d",
+ tb->tm_hour, tb->tm_min, tb->tm_sec);
+ }
+ result = node->type == T_DATE ? pfile->date: pfile->time;
+ break;
+
+ case T_POISON:
+ cpp_error (pfile, "attempt to use poisoned \"%s\"", node->name);
+ return token;
- too_big:
- cpp_error (pfile, "file is too large (>%lu bytes)\n", (unsigned long)offset);
- free (buf);
- return -1;
+ default:
+ cpp_ice (pfile, "invalid special hash type");
+ return token;
+ }
- error:
- cpp_error_from_errno (pfile, fp->ihash->name);
- free (buf);
- return -1;
+ ASSIGN_FLAGS_AND_POS (result, token);
+ return result;
}
+#undef DSC
-/* Allocate pfile->input_buffer, and initialize chartab[]
+/* Allocate pfile->input_buffer, and initialize _cpp_trigraph_map[]
if it hasn't happened already. */
-
+
void
_cpp_init_input_buffer (pfile)
cpp_reader *pfile;
{
- U_CHAR *tmp;
+ cpp_context *base;
+
+ _cpp_init_toklist (&pfile->token_list, 0);
+ pfile->no_expand_level = UINT_MAX;
+ pfile->context_cap = 20;
+ pfile->cur_context = 0;
+
+ pfile->contexts = (cpp_context *)
+ xmalloc (pfile->context_cap * sizeof (cpp_context));
+
+ /* Clear the base context. */
+ base = &pfile->contexts[0];
+ base->u.list = &pfile->token_list;
+ base->posn = 0;
+ base->count = 0;
+ base->args = 0;
+ base->level = 0;
+ base->flags = 0;
+ base->pushed_token = 0;
+}
+
+/* Moves to the end of the directive line, popping contexts as
+ necessary. */
+void
+_cpp_skip_rest_of_line (pfile)
+ cpp_reader *pfile;
+{
+ /* Discard all stacked contexts. */
+ int i;
+ for (i = pfile->cur_context; i > 0; i--)
+ if (pfile->contexts[i].args)
+ free_macro_args (pfile->contexts[i].args);
+
+ if (pfile->no_expand_level <= pfile->cur_context)
+ pfile->no_expand_level = 0;
+ pfile->cur_context = 0;
+
+ /* Clear the base context, and clear the directive pointer so that
+ get_raw_token will advance to the next line. */
+ pfile->contexts[0].count = 0;
+ pfile->contexts[0].posn = 0;
+ pfile->token_list.directive = 0;
+}
- init_chartab ();
+/* Directive handler wrapper used by the command line option
+ processor. */
+void
+_cpp_run_directive (pfile, dir, buf, count, name)
+ cpp_reader *pfile;
+ const struct directive *dir;
+ const char *buf;
+ size_t count;
+ const char *name;
+{
+ if (cpp_push_buffer (pfile, (const U_CHAR *)buf, count) != NULL)
+ {
+ unsigned int prev_lvl = 0;
- /* Determine the appropriate size for the input buffer. Normal C
- source files are smaller than eight K. */
- /* 8Kbytes of buffer proper, 1 to detect running off the end without
- address arithmetic all the time, and 3 for pushback during buffer
- refill, in case there's a potential trigraph or end-of-line
- digraph at the end of a block. */
+ if (name)
+ CPP_BUFFER (pfile)->nominal_fname = name;
+ else
+ CPP_BUFFER (pfile)->nominal_fname = _("<command line>");
+ CPP_BUFFER (pfile)->lineno = (unsigned int)-1;
+
+ /* Scan the line now, else prevent_macro_expansion won't work. */
+ lex_next (pfile, 1);
+ if (! (dir->flags & EXPAND))
+ prev_lvl = prevent_macro_expansion (pfile);
+
+ (void) (*dir->handler) (pfile);
- tmp = (U_CHAR *) xmalloc (8192 + 1 + 3);
- pfile->input_buffer = tmp;
- pfile->input_buffer_len = 8192;
+ if (! (dir->flags & EXPAND))
+ restore_macro_expansion (pfile, prev_lvl);
+
+ _cpp_skip_rest_of_line (pfile);
+ cpp_pop_buffer (pfile);
+ }
}
OSDN Git Service
