diff options
| author | Neil Booth <neil@daikokuya.co.uk> | 2003-04-23 22:44:06 +0000 |
|---|---|---|
| committer | Neil Booth <neil@gcc.gnu.org> | 2003-04-23 22:44:06 +0000 |
| commit | 6338b35872d465cf27fdbbc43b5a146363c8f246 (patch) | |
| tree | e4f819e101d1dc188ae9d2012e0cb8ab2239160d /gcc/testsuite/gcc.dg/cpp/multiline.c | |
| parent | 06f5e63748eeb66140858914bbffb149406789a9 (diff) | |
| download | gcc-6338b35872d465cf27fdbbc43b5a146363c8f246.zip gcc-6338b35872d465cf27fdbbc43b5a146363c8f246.tar.gz gcc-6338b35872d465cf27fdbbc43b5a146363c8f246.tar.bz2 | |
Makefile.in (c-lex.o, [...]): Update.
* Makefile.in (c-lex.o, LIBCPP_OBJS, cpplex.o): Update.
* c-lex.c (MULTIBYTE_CHARS): Remove conditionals.
(lex_string): Take cpp_string with full spelling.
(cb_ident): Update.
(c_lex): Update diagnostics.
* cpplex.c (SPELL_NUMBER, SPELL_STRING): Combine into SPELL_LITERAL.
(create_literal): New.
(lex_string): Unterminated literals have type CPP_OTHER.
(_cpp_lex_direct): Update calls to lex_string. Use create_literal
for CPP_OTHER.
(cpp_token_len, cpp_spell_token, cpp_output_token): Simplify.
(_cpp_equiv_tokens, cpp_interpret_charconst): Update.
* cpplib.c (parse_include, do_line, do_linemarker,
destringize_and_run): Update for token storing full spelling.
* cpplib.h: Update token spelling types.
* cppmacro.c (stringify_arg, check_trad_stringification):
Update for token storing full spelling.
cp:
* Make-lang.in (lex.o): Remove mbchar.h.
* lex.c (MULTIBYTE_CHARS): Lose.
* parser.c (cp_lexer_get_preprocessor_token): CPP_OTHER handled
in c-lex.c.
testsuite:
* gcc.dg/cpp/include2.c: Update.
* gcc.dg/cpp/multiline-2.c: New.
* gcc.dg/cpp/multiline.c: Update.
* gcc.dg/cpp/strify2.c: Update.
* gcc.dg/cpp/trad/literals-2.c: Update.
From-SVN: r66019
Diffstat (limited to 'gcc/testsuite/gcc.dg/cpp/multiline.c')
| -rw-r--r-- | gcc/testsuite/gcc.dg/cpp/multiline.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/gcc/testsuite/gcc.dg/cpp/multiline.c b/gcc/testsuite/gcc.dg/cpp/multiline.c index e76ba04..103f9f6 100644 --- a/gcc/testsuite/gcc.dg/cpp/multiline.c +++ b/gcc/testsuite/gcc.dg/cpp/multiline.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 Free Software Foundation, Inc. */ +/* Copyright (C) 2000, 2003 Free Software Foundation, Inc. */ /* { dg-do preprocess } */ /* { dg-options "-C" } */ /* Test that multi-line tokens are recognized by cpp0 as being @@ -22,11 +22,5 @@ L"line 1 { dg-final { if \{ [grep multiline.i "^$"] == "" \} \{ } } { dg-final { return \} } } { dg-final { fail "multiline.c: multi-line tokens" } } */ -/* { dg-error "missing term" "multiline strings" { target *-*-* } 11 } */ -/* { dg-error "missing term" "multiline strings" { target *-*-* } 14 } */ -/* { dg-error "missing term" "multiline strings" { target *-*-* } 15 } */ -/* { dg-error "missing term" "multiline strings" { target *-*-* } 18 } */ -/* { dg-bogus "warning" "warning in place of error" { target *-*-* } 11 } */ -/* { dg-bogus "warning" "warning in place of error" { target *-*-* } 14 } */ +/* { dg-bogus "missing term" "multiline strings" { target *-*-* } 11 } */ /* { dg-bogus "warning" "warning in place of error" { target *-*-* } 15 } */ -/* { dg-bogus "warning" "warning in place of error" { target *-*-* } 18 } */ |