Implement C++11 user-defined literals.
libcpp/ * expr.c: (cpp_interpret_float_suffix, cpp_interpret_int_suffix, cpp_userdef_string_remove_type, cpp_userdef_string_add_type, cpp_userdef_char_remove_type, cpp_userdef_char_add_type, cpp_userdef_string_p, cpp_userdef_char_p, cpp_get_userdef_suffix): New. (cpp_classify_number): Classify unrecognized tokens as user-defined literals. * include/cpplib.h: Add new tokens for user-defined literals. * init.c: Add new preprocessor flag (cxx11). * lex.c: (lex_string, lex_raw_string): Handle user-defined literals including concatenation and promotion with suffixes. c-family/ * c-common.c (build_userdef_literal): New. * c-common.def: New tree code. * c-common.h (tree_userdef_literal): New tree struct and accessors. * c-lex.c (interpret_float): Add suffix parm. (c_lex_with_flags): Build literal tokens. cp/ * cp-objcp-common.c: (cp_tree_size) Return size of USERDEF_LITERAL tree. * cp-tree.h: (UDLIT_OP_*, UDLIT_OPER_P): Literal operator name tools. New tree code for user-defined literals. * cxx-pretty-print.h: (pp_cxx_userdef_literal) New. * cxx-pretty-print.c: (pp_cxx_userdef_literal) New. (pp_cxx_primary_expression, pp_cxx_expression): Use it. * decl.c: (cp_tree_node_structure): Return new tree code. (duplicate_decls): Check for raw vs. template operator conflicts. (grokfndecl, grokdeclarator): New checks for literal operators. * error.c: (dump_expr): Warn about user-defined literals in C++98 mode. (dump_function_name): Pretty printing. * mangle.c: (write_literal_operator_name): New. (write_unqualified_id, write_unqualified_name): Use it. * parser.c: (cp_parser_operator): Handle operator"". (cp_parser_userdef_char_literal, cp_parser_userdef_numeric_literal, cp_parser_userdef_string_literal): New. (cp_parser_primary_expression): Handle new user-defined literal tokens with new functions. * semantics.c: (potential_constant_expression_1): Add user-defined literals. * typeck.c (check_raw_literal_operator, check_literal_operator_args): New. From-SVN: r180536
This commit is contained in:
parent
7f808cadda
commit
3ce4f9e4d2
57 changed files with 1714 additions and 51 deletions
|
@ -131,6 +131,16 @@ struct _cpp_file;
|
|||
TK(OBJC_STRING, LITERAL) /* @"string" - Objective-C */ \
|
||||
TK(HEADER_NAME, LITERAL) /* <stdio.h> in #include */ \
|
||||
\
|
||||
TK(CHAR_USERDEF, LITERAL) /* 'char'_suffix - C++-0x */ \
|
||||
TK(WCHAR_USERDEF, LITERAL) /* L'char'_suffix - C++-0x */ \
|
||||
TK(CHAR16_USERDEF, LITERAL) /* u'char'_suffix - C++-0x */ \
|
||||
TK(CHAR32_USERDEF, LITERAL) /* U'char'_suffix - C++-0x */ \
|
||||
TK(STRING_USERDEF, LITERAL) /* "string"_suffix - C++-0x */ \
|
||||
TK(WSTRING_USERDEF, LITERAL) /* L"string"_suffix - C++-0x */ \
|
||||
TK(STRING16_USERDEF, LITERAL) /* u"string"_suffix - C++-0x */ \
|
||||
TK(STRING32_USERDEF, LITERAL) /* U"string"_suffix - C++-0x */ \
|
||||
TK(UTF8STRING_USERDEF,LITERAL) /* u8"string"_suffix - C++-0x */ \
|
||||
\
|
||||
TK(COMMENT, LITERAL) /* Only if output comments. */ \
|
||||
/* SPELL_LITERAL happens to DTRT. */ \
|
||||
TK(MACRO_ARG, NONE) /* Macro argument. */ \
|
||||
|
@ -414,6 +424,9 @@ struct cpp_options
|
|||
/* True for traditional preprocessing. */
|
||||
unsigned char traditional;
|
||||
|
||||
/* Nonzero for C++ 2011 Standard user-defnied literals. */
|
||||
unsigned char user_literals;
|
||||
|
||||
/* Holds the name of the target (execution) character set. */
|
||||
const char *narrow_charset;
|
||||
|
||||
|
@ -829,13 +842,22 @@ struct cpp_num
|
|||
#define CPP_N_FRACT 0x100000 /* Fract types. */
|
||||
#define CPP_N_ACCUM 0x200000 /* Accum types. */
|
||||
|
||||
#define CPP_N_USERDEF 0x1000000 /* C++0x user-defined literal. */
|
||||
|
||||
/* Classify a CPP_NUMBER token. The return value is a combination of
|
||||
the flags from the above sets. */
|
||||
extern unsigned cpp_classify_number (cpp_reader *, const cpp_token *);
|
||||
extern unsigned cpp_classify_number (cpp_reader *, const cpp_token *,
|
||||
const char **);
|
||||
|
||||
/* Return the classification flags for a float suffix. */
|
||||
extern unsigned int cpp_interpret_float_suffix (const char *, size_t);
|
||||
|
||||
/* Return the classification flags for an int suffix. */
|
||||
extern unsigned int cpp_interpret_int_suffix (const char *, size_t);
|
||||
|
||||
/* Evaluate a token classified as category CPP_N_INTEGER. */
|
||||
extern cpp_num cpp_interpret_integer (cpp_reader *, const cpp_token *,
|
||||
unsigned int type);
|
||||
unsigned int);
|
||||
|
||||
/* Sign extend a number, with PRECISION significant bits and all
|
||||
others assumed clear, to fill out a cpp_num structure. */
|
||||
|
@ -1005,4 +1027,20 @@ extern int cpp_read_state (cpp_reader *, const char *, FILE *,
|
|||
extern void cpp_force_token_locations (cpp_reader *, source_location *);
|
||||
extern void cpp_stop_forcing_token_locations (cpp_reader *);
|
||||
|
||||
/* In expr.c */
|
||||
extern enum cpp_ttype cpp_userdef_string_remove_type
|
||||
(enum cpp_ttype type);
|
||||
extern enum cpp_ttype cpp_userdef_string_add_type
|
||||
(enum cpp_ttype type);
|
||||
extern enum cpp_ttype cpp_userdef_char_remove_type
|
||||
(enum cpp_ttype type);
|
||||
extern enum cpp_ttype cpp_userdef_char_add_type
|
||||
(enum cpp_ttype type);
|
||||
extern bool cpp_userdef_string_p
|
||||
(enum cpp_ttype type);
|
||||
extern bool cpp_userdef_char_p
|
||||
(enum cpp_ttype type);
|
||||
extern const char * cpp_get_userdef_suffix
|
||||
(const cpp_token *);
|
||||
|
||||
#endif /* ! LIBCPP_CPPLIB_H */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue