* cpplex.c (parse_string2): Update comment.
(cpp_lex_line): No special assertion treatment for '('.
* cpplib.c (DIRECTIVE_TABLE): Remove SYNTAX_ASSERT.
* cpplib.h (SYNTAX_ASSERT): Remove.
From-SVN: r33915
+2000-05-16 Neil Booth <NeilB@earthling.net>
+
+ * cpplex.c (parse_string2): Update comment.
+ (cpp_lex_line): No special assertion treatment for '('.
+ * cpplib.c (DIRECTIVE_TABLE): Remove SYNTAX_ASSERT.
+ * cpplib.h (SYNTAX_ASSERT): Remove.
+
Mon May 15 21:45:36 MET DST 2000 Jan Hubicka <jh@suse.cz>
* jump.c (condjump_p): Mark as depreached.
escaped newlines.
Can be used for character constants (terminator = '\''), string
- constants ('"'), angled headers ('>') and assertions (')'). */
+ constants ('"') and angled headers ('>'). Multi-line strings are
+ allowed, except for within directives. */
static void
parse_string2 (pfile, list, name, terminator)
cur_token++;
break;
- case '(':
- /* Is this the beginning of an assertion string? */
- if (list->dir_flags & SYNTAX_ASSERT)
- {
- c = ')'; /* Terminator. */
- cur_token->type = CPP_ASSERTION;
- goto do_parse_string;
- }
- PUSH_TOKEN (CPP_OPEN_PAREN);
- break;
-
case '?':
if (cur + 1 < buffer->rlimit && *cur == '?'
&& trigraph_map[cur[1]] && trigraph_ok (pfile, cur + 1))
case '!': PUSH_TOKEN (CPP_NOT); break;
case ',': PUSH_TOKEN (CPP_COMMA); break;
case ';': PUSH_TOKEN (CPP_SEMICOLON); break;
+ case '(': PUSH_TOKEN (CPP_OPEN_PAREN); break;
case ')': PUSH_TOKEN (CPP_CLOSE_PAREN); break;
case '$':
D(include_next, T_INCLUDE_NEXT, EXTENSION | SYNTAX_INCLUDE) /* 19 GNU */ \
D(ident, T_IDENT, EXTENSION) /* 11 SVR4 */ \
D(import, T_IMPORT, EXTENSION | SYNTAX_INCLUDE) /* 0 ObjC */ \
-D(assert, T_ASSERT, EXTENSION | SYNTAX_ASSERT) /* 0 SVR4 */ \
-D(unassert, T_UNASSERT, EXTENSION | SYNTAX_ASSERT) /* 0 SVR4 */ \
+D(assert, T_ASSERT, EXTENSION) /* 0 SVR4 */ \
+D(unassert, T_UNASSERT, EXTENSION) /* 0 SVR4 */ \
SCCS_ENTRY
/* Use the table to generate a series of prototypes, an enum for the
/* Directive flags. */
#define SYNTAX_INCLUDE (1 << 8)
-#define SYNTAX_ASSERT (1 << 9)
typedef int (*directive_handler) PARAMS ((cpp_reader *));