diff options
Diffstat (limited to 'libcpp/include')
| -rw-r--r-- | libcpp/include/cpp-id-data.h | 2 | ||||
| -rw-r--r-- | libcpp/include/cpplib.h | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/libcpp/include/cpp-id-data.h b/libcpp/include/cpp-id-data.h index 2445186..db37c2b 100644 --- a/libcpp/include/cpp-id-data.h +++ b/libcpp/include/cpp-id-data.h @@ -22,7 +22,7 @@ Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ typedef unsigned char uchar; #endif -#define U (const unsigned char *) /* Intended use: U"string" */ +#define UC (const unsigned char *) /* Intended use: UC"string" */ /* Chained list of answers to an assertion. */ struct answer GTY(()) diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h index 84de0e0..483c543 100644 --- a/libcpp/include/cpplib.h +++ b/libcpp/include/cpplib.h @@ -123,10 +123,14 @@ struct _cpp_file; \ TK(CHAR, LITERAL) /* 'char' */ \ TK(WCHAR, LITERAL) /* L'char' */ \ + TK(CHAR16, LITERAL) /* u'char' */ \ + TK(CHAR32, LITERAL) /* U'char' */ \ TK(OTHER, LITERAL) /* stray punctuation */ \ \ TK(STRING, LITERAL) /* "string" */ \ TK(WSTRING, LITERAL) /* L"string" */ \ + TK(STRING16, LITERAL) /* u"string" */ \ + TK(STRING32, LITERAL) /* U"string" */ \ TK(OBJC_STRING, LITERAL) /* @"string" - Objective-C */ \ TK(HEADER_NAME, LITERAL) /* <stdio.h> in #include */ \ \ @@ -291,6 +295,9 @@ struct cpp_options /* Nonzero means to allow hexadecimal floats and LL suffixes. */ unsigned char extended_numbers; + /* Nonzero means process u/U prefix literals (UTF-16/32). */ + unsigned char uliterals; + /* Nonzero means print names of header files (-H). */ unsigned char print_include_names; @@ -712,10 +719,10 @@ extern cppchar_t cpp_interpret_charconst (cpp_reader *, const cpp_token *, /* Evaluate a vector of CPP_STRING or CPP_WSTRING tokens. */ extern bool cpp_interpret_string (cpp_reader *, const cpp_string *, size_t, - cpp_string *, bool); + cpp_string *, enum cpp_ttype); extern bool cpp_interpret_string_notranslate (cpp_reader *, const cpp_string *, size_t, - cpp_string *, bool); + cpp_string *, enum cpp_ttype); /* Convert a host character constant to the execution character set. */ extern cppchar_t cpp_host_to_exec_charset (cpp_reader *, cppchar_t); |