* 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@66019 138bc75d-0d04-0410-961f-82ee72b054a4
Showing
- gcc/ChangeLog 20 additions, 0 deletionsgcc/ChangeLog
- gcc/Makefile.in 3 additions, 3 deletionsgcc/Makefile.in
- gcc/c-lex.c 27 additions, 56 deletionsgcc/c-lex.c
- gcc/cp/ChangeLog 7 additions, 0 deletionsgcc/cp/ChangeLog
- gcc/cp/Make-lang.in 1 addition, 1 deletiongcc/cp/Make-lang.in
- gcc/cp/lex.c 0 additions, 5 deletionsgcc/cp/lex.c
- gcc/cp/parser.c 0 additions, 4 deletionsgcc/cp/parser.c
- gcc/cpplex.c 71 additions, 114 deletionsgcc/cpplex.c
- gcc/cpplib.c 11 additions, 9 deletionsgcc/cpplib.c
- gcc/cpplib.h 9 additions, 9 deletionsgcc/cpplib.h
- gcc/cppmacro.c 13 additions, 12 deletionsgcc/cppmacro.c
- gcc/testsuite/ChangeLog 8 additions, 0 deletionsgcc/testsuite/ChangeLog
- gcc/testsuite/gcc.dg/cpp/include2.c 1 addition, 2 deletionsgcc/testsuite/gcc.dg/cpp/include2.c
- gcc/testsuite/gcc.dg/cpp/multiline-2.c 14 additions, 0 deletionsgcc/testsuite/gcc.dg/cpp/multiline-2.c
- gcc/testsuite/gcc.dg/cpp/multiline.c 2 additions, 8 deletionsgcc/testsuite/gcc.dg/cpp/multiline.c
- gcc/testsuite/gcc.dg/cpp/strify2.c 1 addition, 1 deletiongcc/testsuite/gcc.dg/cpp/strify2.c
- gcc/testsuite/gcc.dg/cpp/trad/literals-2.c 1 addition, 1 deletiongcc/testsuite/gcc.dg/cpp/trad/literals-2.c
Loading
Please register or sign in to comment