Implement SD-6: SG10 Feature Test Recommendations
2014-10-01 Edward Smith-Rowland <3dw4rd@verizon.net> Implement SD-6: SG10 Feature Test Recommendations * internal.h (lexer_state, spec_nodes): Add in__has_include__. * directives.c: Support __has_include__ builtin. * expr.c (parse_has_include): New function to parse __has_include__ builtin; (eval_token()): Use it. * files.c (_cpp_has_header()): New funtion to look for header; (open_file_failed()): Not an error to not find a header file for __has_include__. * identifiers.c (_cpp_init_hashtable()): Add entry for __has_include__. * pch.c (cpp_read_state): Lookup __has_include__. * traditional.c (enum ls, _cpp_scan_out_logical_line()): Walk through __has_include__ statements. 2014-10-01 Edward Smith-Rowland <3dw4rd@verizon.net> Implement SD-6: SG10 Feature Test Recommendations * c-cppbuiltin.c (c_cpp_builtins()): Define language feature macros and the __has_header macro. 2014-10-01 Edward Smith-Rowland <3dw4rd@verizon.net> Implement SD-6: SG10 Feature Test Recommendations * include/bits/basic_string.h: Add __cpp_lib feature test macro. * include/bits/stl_algobase.h: Ditto. * include/bits/stl_function.h: Ditto. * include/bits/unique_ptr.h: Ditto. * include/std/chrono: Ditto. * include/std/complex: Ditto. * include/std/iomanip: Ditto. * include/std/shared_mutex: Ditto. * include/std/tuple: Ditto. * include/std/type_traits: Ditto. * include/std/utility: Ditto. * testsuite/experimental/feat-cxx14.cc: New. * testsuite/experimental/feat-lib-fund.cc: New. * testsuite/20_util/declval/requirements/1_neg.cc: Adjust. * testsuite/20_util/duration/literals/range.cc: Adjust. * testsuite/20_util/duration/requirements/typedefs_neg1.cc: Adjust. * testsuite/20_util/duration/requirements/typedefs_neg2.cc: Adjust. * testsuite/20_util/duration/requirements/typedefs_neg3.cc: Adjust. * testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Adjust. * testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Adjust. * testsuite/23_containers/array/tuple_interface/get_neg.cc: Adjust. * testsuite/23_containers/array/tuple_interface/tuple_element_neg.cc: Adjust. 2014-10-01 Edward Smith-Rowland <3dw4rd@verizon.net> Implement SD-6: SG10 Feature Test Recommendations * g++.dg/cpp1y/feat-cxx11-neg.C: New. * g++.dg/cpp1y/feat-cxx11.C: New. * g++.dg/cpp1y/feat-cxx14.C: New. * g++.dg/cpp1y/feat-cxx98.C: New. * g++.dg/cpp1y/feat-cxx98-neg.C: New. * g++.dg/cpp1y/phoobhar.h: New. * g++.dg/cpp1y/testinc/phoobhar.h: New. From-SVN: r215752
This commit is contained in:
parent
5fbb36f4a4
commit
a15f7cb8b8
41 changed files with 820 additions and 16 deletions
|
@ -64,6 +64,8 @@ static unsigned int interpret_float_suffix (cpp_reader *, const uchar *, size_t)
|
|||
static unsigned int interpret_int_suffix (cpp_reader *, const uchar *, size_t);
|
||||
static void check_promotion (cpp_reader *, const struct op *);
|
||||
|
||||
static cpp_num parse_has_include (cpp_reader *, enum include_type);
|
||||
|
||||
/* Token type abuse to create unary plus and minus operators. */
|
||||
#define CPP_UPLUS ((enum cpp_ttype) (CPP_LAST_CPP_OP + 1))
|
||||
#define CPP_UMINUS ((enum cpp_ttype) (CPP_LAST_CPP_OP + 2))
|
||||
|
@ -1048,6 +1050,10 @@ eval_token (cpp_reader *pfile, const cpp_token *token,
|
|||
case CPP_NAME:
|
||||
if (token->val.node.node == pfile->spec_nodes.n_defined)
|
||||
return parse_defined (pfile);
|
||||
else if (token->val.node.node == pfile->spec_nodes.n__has_include__)
|
||||
return parse_has_include (pfile, IT_INCLUDE);
|
||||
else if (token->val.node.node == pfile->spec_nodes.n__has_include_next__)
|
||||
return parse_has_include (pfile, IT_INCLUDE_NEXT);
|
||||
else if (CPP_OPTION (pfile, cplusplus)
|
||||
&& (token->val.node.node == pfile->spec_nodes.n_true
|
||||
|| token->val.node.node == pfile->spec_nodes.n_false))
|
||||
|
@ -2072,3 +2078,72 @@ num_div_op (cpp_reader *pfile, cpp_num lhs, cpp_num rhs, enum cpp_ttype op,
|
|||
|
||||
return lhs;
|
||||
}
|
||||
|
||||
/* Handle meeting "__has_include__" in a preprocessor expression. */
|
||||
static cpp_num
|
||||
parse_has_include (cpp_reader *pfile, enum include_type type)
|
||||
{
|
||||
cpp_num result;
|
||||
bool paren = false;
|
||||
cpp_hashnode *node = 0;
|
||||
const cpp_token *token;
|
||||
bool bracket = false;
|
||||
char *fname = 0;
|
||||
|
||||
result.unsignedp = false;
|
||||
result.high = 0;
|
||||
result.overflow = false;
|
||||
result.low = 0;
|
||||
|
||||
pfile->state.in__has_include__++;
|
||||
|
||||
token = cpp_get_token (pfile);
|
||||
if (token->type == CPP_OPEN_PAREN)
|
||||
{
|
||||
paren = true;
|
||||
token = cpp_get_token (pfile);
|
||||
}
|
||||
|
||||
if (token->type == CPP_STRING || token->type == CPP_HEADER_NAME)
|
||||
{
|
||||
if (token->type == CPP_HEADER_NAME)
|
||||
bracket = true;
|
||||
fname = XNEWVEC (char, token->val.str.len - 1);
|
||||
memcpy (fname, token->val.str.text + 1, token->val.str.len - 2);
|
||||
fname[token->val.str.len - 2] = '\0';
|
||||
node = token->val.node.node;
|
||||
}
|
||||
else if (token->type == CPP_LESS)
|
||||
{
|
||||
bracket = true;
|
||||
fname = _cpp_bracket_include (pfile);
|
||||
}
|
||||
else
|
||||
cpp_error (pfile, CPP_DL_ERROR,
|
||||
"operator \"__has_include__\" requires a header string");
|
||||
|
||||
if (fname)
|
||||
{
|
||||
int angle_brackets = (bracket ? 1 : 0);
|
||||
|
||||
if (_cpp_has_header (pfile, fname, angle_brackets, type))
|
||||
result.low = 1;
|
||||
else
|
||||
result.low = 0;
|
||||
|
||||
XDELETEVEC (fname);
|
||||
}
|
||||
|
||||
if (paren && cpp_get_token (pfile)->type != CPP_CLOSE_PAREN)
|
||||
cpp_error (pfile, CPP_DL_ERROR,
|
||||
"missing ')' after \"__has_include__\"");
|
||||
|
||||
/* A possible controlling macro of the form #if !__has_include__ ().
|
||||
_cpp_parse_expr checks there was no other junk on the line. */
|
||||
if (node)
|
||||
pfile->mi_ind_cmacro = node;
|
||||
|
||||
pfile->state.in__has_include__--;
|
||||
|
||||
return result;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue