@@ -3714,6 +3714,9 @@ diagnose_trait_expr (tree expr, tree args)
case CPTK_IS_AGGREGATE:
inform (loc, " %qT is not an aggregate", t1);
break;
+ case CPTK_IS_ARITHMETIC:
+ inform (loc, " %qT is not an arithmetic type", t1);
+ break;
case CPTK_IS_ARRAY:
inform (loc, " %qT is not an array", t1);
break;
@@ -59,6 +59,7 @@ DEFTRAIT_EXPR (HAS_UNIQUE_OBJ_REPRESENTATIONS, "__has_unique_object_representati
DEFTRAIT_EXPR (HAS_VIRTUAL_DESTRUCTOR, "__has_virtual_destructor", 1)
DEFTRAIT_EXPR (IS_ABSTRACT, "__is_abstract", 1)
DEFTRAIT_EXPR (IS_AGGREGATE, "__is_aggregate", 1)
+DEFTRAIT_EXPR (IS_ARITHMETIC, "__is_arithmetic", 1)
DEFTRAIT_EXPR (IS_ARRAY, "__is_array", 1)
DEFTRAIT_EXPR (IS_ASSIGNABLE, "__is_assignable", 2)
DEFTRAIT_EXPR (IS_BASE_OF, "__is_base_of", 2)
@@ -40,6 +40,7 @@ struct cp_trait {
"__has_virtual_destructor", CPTK_HAS_VIRTUAL_DESTRUCTOR, false, false, false
"__is_abstract", CPTK_IS_ABSTRACT, false, false, false
"__is_aggregate", CPTK_IS_AGGREGATE, false, false, false
+"__is_arithmetic", CPTK_IS_ARITHMETIC, false, false, false
"__is_array", CPTK_IS_ARRAY, false, false, false
"__is_assignable", CPTK_IS_ASSIGNABLE, true, false, false
"__is_base_of", CPTK_IS_BASE_OF, true, false, false
@@ -56,7 +56,7 @@ struct cp_trait {
bool variadic;
bool type;
};
-/* maximum key range = 92, duplicates = 0 */
+/* maximum key range = 97, duplicates = 0 */
class cp_trait_lookup
{
@@ -71,32 +71,32 @@ cp_trait_lookup::hash (const char *str, size_t len)
{
static const unsigned char asso_values[] =
{
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 20, 99, 40, 45, 40,
- 5, 0, 55, 10, 99, 0, 99, 99, 10, 25,
- 30, 0, 10, 99, 10, 15, 5, 0, 20, 99,
- 99, 10, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99
+ 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+ 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+ 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+ 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+ 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+ 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+ 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+ 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+ 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+ 104, 104, 104, 104, 104, 20, 104, 45, 50, 40,
+ 5, 0, 55, 0, 104, 0, 104, 104, 10, 15,
+ 35, 0, 10, 104, 10, 15, 5, 0, 20, 104,
+ 104, 20, 104, 104, 104, 104, 104, 104, 104, 104,
+ 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+ 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+ 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+ 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+ 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+ 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+ 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+ 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+ 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+ 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+ 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+ 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+ 104, 104, 104, 104, 104, 104
};
unsigned int hval = len;
@@ -118,130 +118,132 @@ cp_trait_lookup::find (const char *str, size_t len)
{
enum
{
- TOTAL_KEYWORDS = 58,
+ TOTAL_KEYWORDS = 59,
MIN_WORD_LENGTH = 7,
MAX_WORD_LENGTH = 37,
MIN_HASH_VALUE = 7,
- MAX_HASH_VALUE = 98
+ MAX_HASH_VALUE = 103
};
static const struct cp_trait wordlist[] =
{
-#line 87 "../../gcc/cp/cp-trait.gperf"
+#line 88 "../../gcc/cp/cp-trait.gperf"
{"__bases", CPTK_BASES, false, false, true},
-#line 52 "../../gcc/cp/cp-trait.gperf"
+#line 53 "../../gcc/cp/cp-trait.gperf"
{"__is_enum", CPTK_IS_ENUM, false, false, false},
-#line 76 "../../gcc/cp/cp-trait.gperf"
+#line 77 "../../gcc/cp/cp-trait.gperf"
{"__is_union", CPTK_IS_UNION, false, false, false},
-#line 80 "../../gcc/cp/cp-trait.gperf"
- {"__remove_cv", CPTK_REMOVE_CV, false, false, true},
#line 81 "../../gcc/cp/cp-trait.gperf"
- {"__remove_cvref", CPTK_REMOVE_CVREF, false, false, true},
+ {"__remove_cv", CPTK_REMOVE_CV, false, false, true},
#line 82 "../../gcc/cp/cp-trait.gperf"
+ {"__remove_cvref", CPTK_REMOVE_CVREF, false, false, true},
+#line 83 "../../gcc/cp/cp-trait.gperf"
{"__remove_pointer", CPTK_REMOVE_POINTER, false, false, true},
-#line 71 "../../gcc/cp/cp-trait.gperf"
+#line 72 "../../gcc/cp/cp-trait.gperf"
{"__is_trivial", CPTK_IS_TRIVIAL, false, false, false},
-#line 83 "../../gcc/cp/cp-trait.gperf"
+#line 84 "../../gcc/cp/cp-trait.gperf"
{"__remove_reference", CPTK_REMOVE_REFERENCE, false, false, true},
-#line 88 "../../gcc/cp/cp-trait.gperf"
+#line 89 "../../gcc/cp/cp-trait.gperf"
{"__direct_bases", CPTK_DIRECT_BASES, false, false, true},
-#line 51 "../../gcc/cp/cp-trait.gperf"
+#line 52 "../../gcc/cp/cp-trait.gperf"
{"__is_empty", CPTK_IS_EMPTY, false, false, false},
-#line 65 "../../gcc/cp/cp-trait.gperf"
+#line 66 "../../gcc/cp/cp-trait.gperf"
{"__is_pointer", CPTK_IS_POINTER, false, false, false},
-#line 64 "../../gcc/cp/cp-trait.gperf"
+#line 65 "../../gcc/cp/cp-trait.gperf"
{"__is_pod", CPTK_IS_POD, false, false, false},
-#line 86 "../../gcc/cp/cp-trait.gperf"
+#line 87 "../../gcc/cp/cp-trait.gperf"
{"__is_deducible ", CPTK_IS_DEDUCIBLE, true, false, false},
-#line 85 "../../gcc/cp/cp-trait.gperf"
+#line 86 "../../gcc/cp/cp-trait.gperf"
{"__underlying_type", CPTK_UNDERLYING_TYPE, false, false, true},
-#line 74 "../../gcc/cp/cp-trait.gperf"
+#line 75 "../../gcc/cp/cp-trait.gperf"
{"__is_trivially_copyable", CPTK_IS_TRIVIALLY_COPYABLE, false, false, false},
-#line 84 "../../gcc/cp/cp-trait.gperf"
+#line 85 "../../gcc/cp/cp-trait.gperf"
{"__type_pack_element", CPTK_TYPE_PACK_ELEMENT, false, true, true},
-#line 72 "../../gcc/cp/cp-trait.gperf"
+#line 73 "../../gcc/cp/cp-trait.gperf"
{"__is_trivially_assignable", CPTK_IS_TRIVIALLY_ASSIGNABLE, true, false, false},
-#line 69 "../../gcc/cp/cp-trait.gperf"
+#line 70 "../../gcc/cp/cp-trait.gperf"
{"__is_scoped_enum", CPTK_IS_SCOPED_ENUM, false, false, false},
-#line 56 "../../gcc/cp/cp-trait.gperf"
+#line 57 "../../gcc/cp/cp-trait.gperf"
{"__is_literal_type", CPTK_IS_LITERAL_TYPE, false, false, false},
-#line 73 "../../gcc/cp/cp-trait.gperf"
+#line 74 "../../gcc/cp/cp-trait.gperf"
{"__is_trivially_constructible", CPTK_IS_TRIVIALLY_CONSTRUCTIBLE, false, true, false},
-#line 79 "../../gcc/cp/cp-trait.gperf"
+#line 80 "../../gcc/cp/cp-trait.gperf"
{"__reference_converts_from_temporary", CPTK_REF_CONVERTS_FROM_TEMPORARY, true, false, false},
-#line 66 "../../gcc/cp/cp-trait.gperf"
+#line 67 "../../gcc/cp/cp-trait.gperf"
{"__is_polymorphic", CPTK_IS_POLYMORPHIC, false, false, false},
-#line 78 "../../gcc/cp/cp-trait.gperf"
+#line 79 "../../gcc/cp/cp-trait.gperf"
{"__reference_constructs_from_temporary", CPTK_REF_CONSTRUCTS_FROM_TEMPORARY, true, false, false},
#line 34 "../../gcc/cp/cp-trait.gperf"
{"__has_nothrow_copy", CPTK_HAS_NOTHROW_COPY, false, false, false},
+#line 69 "../../gcc/cp/cp-trait.gperf"
+ {"__is_same", CPTK_IS_SAME, true, false, false},
#line 32 "../../gcc/cp/cp-trait.gperf"
{"__has_nothrow_assign", CPTK_HAS_NOTHROW_ASSIGN, false, false, false},
-#line 55 "../../gcc/cp/cp-trait.gperf"
- {"__is_layout_compatible", CPTK_IS_LAYOUT_COMPATIBLE, true, false, false},
-#line 77 "../../gcc/cp/cp-trait.gperf"
+#line 31 "../../gcc/cp/cp-trait.gperf"
+ {"__is_same_as", CPTK_IS_SAME, true, false, false},
+#line 78 "../../gcc/cp/cp-trait.gperf"
{"__is_volatile", CPTK_IS_VOLATILE, false, false, false},
#line 40 "../../gcc/cp/cp-trait.gperf"
{"__has_virtual_destructor", CPTK_HAS_VIRTUAL_DESTRUCTOR, false, false, false},
#line 33 "../../gcc/cp/cp-trait.gperf"
{"__has_nothrow_constructor", CPTK_HAS_NOTHROW_CONSTRUCTOR, false, false, false},
-#line 63 "../../gcc/cp/cp-trait.gperf"
+#line 64 "../../gcc/cp/cp-trait.gperf"
{"__is_pointer_interconvertible_base_of", CPTK_IS_POINTER_INTERCONVERTIBLE_BASE_OF, true, false, false},
#line 37 "../../gcc/cp/cp-trait.gperf"
{"__has_trivial_copy", CPTK_HAS_TRIVIAL_COPY, false, false, false},
-#line 68 "../../gcc/cp/cp-trait.gperf"
- {"__is_same", CPTK_IS_SAME, true, false, false},
+#line 60 "../../gcc/cp/cp-trait.gperf"
+ {"__is_member_pointer", CPTK_IS_MEMBER_POINTER, false, false, false},
#line 35 "../../gcc/cp/cp-trait.gperf"
{"__has_trivial_assign", CPTK_HAS_TRIVIAL_ASSIGN, false, false, false},
-#line 31 "../../gcc/cp/cp-trait.gperf"
- {"__is_same_as", CPTK_IS_SAME, true, false, false},
+#line 56 "../../gcc/cp/cp-trait.gperf"
+ {"__is_layout_compatible", CPTK_IS_LAYOUT_COMPATIBLE, true, false, false},
#line 38 "../../gcc/cp/cp-trait.gperf"
{"__has_trivial_destructor", CPTK_HAS_TRIVIAL_DESTRUCTOR, false, false, false},
#line 36 "../../gcc/cp/cp-trait.gperf"
{"__has_trivial_constructor", CPTK_HAS_TRIVIAL_CONSTRUCTOR, false, false, false},
-#line 60 "../../gcc/cp/cp-trait.gperf"
+#line 59 "../../gcc/cp/cp-trait.gperf"
+ {"__is_member_object_pointer", CPTK_IS_MEMBER_OBJECT_POINTER, false, false, false},
+#line 58 "../../gcc/cp/cp-trait.gperf"
+ {"__is_member_function_pointer", CPTK_IS_MEMBER_FUNCTION_POINTER, false, false, false},
+#line 42 "../../gcc/cp/cp-trait.gperf"
+ {"__is_aggregate", CPTK_IS_AGGREGATE, false, false, false},
+#line 43 "../../gcc/cp/cp-trait.gperf"
+ {"__is_arithmetic", CPTK_IS_ARITHMETIC, false, false, false},
+#line 61 "../../gcc/cp/cp-trait.gperf"
{"__is_nothrow_assignable", CPTK_IS_NOTHROW_ASSIGNABLE, true, false, false},
-#line 62 "../../gcc/cp/cp-trait.gperf"
+#line 63 "../../gcc/cp/cp-trait.gperf"
{"__is_nothrow_convertible", CPTK_IS_NOTHROW_CONVERTIBLE, true, false, false},
-#line 43 "../../gcc/cp/cp-trait.gperf"
+#line 44 "../../gcc/cp/cp-trait.gperf"
{"__is_array", CPTK_IS_ARRAY, false, false, false},
-#line 61 "../../gcc/cp/cp-trait.gperf"
+#line 62 "../../gcc/cp/cp-trait.gperf"
{"__is_nothrow_constructible", CPTK_IS_NOTHROW_CONSTRUCTIBLE, false, true, false},
-#line 46 "../../gcc/cp/cp-trait.gperf"
+#line 47 "../../gcc/cp/cp-trait.gperf"
{"__is_bounded_array", CPTK_IS_BOUNDED_ARRAY, false, false, false},
-#line 42 "../../gcc/cp/cp-trait.gperf"
- {"__is_aggregate", CPTK_IS_AGGREGATE, false, false, false},
-#line 75 "../../gcc/cp/cp-trait.gperf"
+#line 76 "../../gcc/cp/cp-trait.gperf"
{"__is_unbounded_array", CPTK_IS_UNBOUNDED_ARRAY, false, false, false},
#line 41 "../../gcc/cp/cp-trait.gperf"
{"__is_abstract", CPTK_IS_ABSTRACT, false, false, false},
-#line 59 "../../gcc/cp/cp-trait.gperf"
- {"__is_member_pointer", CPTK_IS_MEMBER_POINTER, false, false, false},
-#line 44 "../../gcc/cp/cp-trait.gperf"
- {"__is_assignable", CPTK_IS_ASSIGNABLE, true, false, false},
#line 45 "../../gcc/cp/cp-trait.gperf"
+ {"__is_assignable", CPTK_IS_ASSIGNABLE, true, false, false},
+#line 46 "../../gcc/cp/cp-trait.gperf"
{"__is_base_of", CPTK_IS_BASE_OF, true, false, false},
-#line 70 "../../gcc/cp/cp-trait.gperf"
- {"__is_standard_layout", CPTK_IS_STD_LAYOUT, false, false, false},
-#line 58 "../../gcc/cp/cp-trait.gperf"
- {"__is_member_object_pointer", CPTK_IS_MEMBER_OBJECT_POINTER, false, false, false},
-#line 57 "../../gcc/cp/cp-trait.gperf"
- {"__is_member_function_pointer", CPTK_IS_MEMBER_FUNCTION_POINTER, false, false, false},
-#line 67 "../../gcc/cp/cp-trait.gperf"
+#line 68 "../../gcc/cp/cp-trait.gperf"
{"__is_reference", CPTK_IS_REFERENCE, false, false, false},
-#line 48 "../../gcc/cp/cp-trait.gperf"
+#line 71 "../../gcc/cp/cp-trait.gperf"
+ {"__is_standard_layout", CPTK_IS_STD_LAYOUT, false, false, false},
+#line 49 "../../gcc/cp/cp-trait.gperf"
{"__is_const", CPTK_IS_CONST, false, false, false},
#line 39 "../../gcc/cp/cp-trait.gperf"
{"__has_unique_object_representations", CPTK_HAS_UNIQUE_OBJ_REPRESENTATIONS, false, false, false},
-#line 50 "../../gcc/cp/cp-trait.gperf"
+#line 51 "../../gcc/cp/cp-trait.gperf"
{"__is_convertible", CPTK_IS_CONVERTIBLE, true, false, false},
-#line 49 "../../gcc/cp/cp-trait.gperf"
+#line 50 "../../gcc/cp/cp-trait.gperf"
{"__is_constructible", CPTK_IS_CONSTRUCTIBLE, false, true, false},
-#line 47 "../../gcc/cp/cp-trait.gperf"
+#line 48 "../../gcc/cp/cp-trait.gperf"
{"__is_class", CPTK_IS_CLASS, false, false, false},
-#line 53 "../../gcc/cp/cp-trait.gperf"
- {"__is_final", CPTK_IS_FINAL, false, false, false},
#line 54 "../../gcc/cp/cp-trait.gperf"
+ {"__is_final", CPTK_IS_FINAL, false, false, false},
+#line 55 "../../gcc/cp/cp-trait.gperf"
{"__is_function", CPTK_IS_FUNCTION, false, false, false}
};
@@ -249,12 +251,12 @@ cp_trait_lookup::find (const char *str, size_t len)
{
-1, -1, -1, -1, -1, -1, -1, 0, -1, 1, 2, 3, -1, -1,
4, -1, 5, 6, 7, 8, 9, -1, 10, 11, -1, 12, -1, 13,
- 14, 15, 16, 17, 18, 19, -1, 20, 21, 22, 23, -1, 24, -1,
- 25, 26, 27, 28, -1, 29, 30, 31, 32, -1, 33, -1, 34, 35,
- -1, -1, 36, 37, 38, 39, -1, 40, 41, 42, -1, -1, 43, 44,
- 45, -1, 46, -1, -1, 47, 48, -1, 49, 50, 51, -1, -1, -1,
- -1, 52, 53, -1, 54, -1, 55, -1, -1, -1, -1, 56, -1, -1,
- 57
+ 14, 15, 16, 17, 18, 19, -1, 20, 21, 22, 23, 24, 25, -1,
+ 26, 27, 28, 29, -1, 30, 31, 32, 33, -1, 34, -1, 35, 36,
+ 37, -1, 38, 39, 40, -1, -1, 41, 42, 43, 44, -1, 45, -1,
+ 46, -1, -1, 47, -1, 48, -1, 49, -1, 50, 51, -1, -1, -1,
+ -1, 52, -1, -1, -1, -1, 53, 54, -1, 55, -1, 56, -1, -1,
+ -1, -1, 57, -1, -1, 58
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -12143,6 +12143,9 @@ trait_expr_value (cp_trait_kind kind, tree type1, tree type2)
case CPTK_IS_AGGREGATE:
return CP_AGGREGATE_TYPE_P (type1);
+ case CPTK_IS_ARITHMETIC:
+ return ARITHMETIC_TYPE_P (type1);
+
case CPTK_IS_ARRAY:
return type_code1 == ARRAY_TYPE;
@@ -12406,6 +12409,7 @@ finish_trait_expr (location_t loc, cp_trait_kind kind, tree type1, tree type2)
return error_mark_node;
break;
+ case CPTK_IS_ARITHMETIC:
case CPTK_IS_ARRAY:
case CPTK_IS_BOUNDED_ARRAY:
case CPTK_IS_CLASS:
@@ -56,6 +56,9 @@
#if !__has_builtin (__is_aggregate)
# error "__has_builtin (__is_aggregate) failed"
#endif
+#if !__has_builtin (__is_arithmetic)
+# error "__has_builtin (__is_arithmetic) failed"
+#endif
#if !__has_builtin (__is_array)
# error "__has_builtin (__is_array) failed"
#endif
new file mode 100644
@@ -0,0 +1,33 @@
+// { dg-do compile { target c++11 } }
+
+#include <testsuite_tr1.h>
+
+using namespace __gnu_test;
+
+#define SA(X) static_assert((X),#X)
+#define SA_TEST_CATEGORY(TRAIT, TYPE, EXPECT) \
+ SA(TRAIT(TYPE) == EXPECT); \
+ SA(TRAIT(const TYPE) == EXPECT); \
+ SA(TRAIT(volatile TYPE) == EXPECT); \
+ SA(TRAIT(const volatile TYPE) == EXPECT)
+
+SA_TEST_CATEGORY(__is_arithmetic, void, false);
+
+SA_TEST_CATEGORY(__is_arithmetic, char, true);
+SA_TEST_CATEGORY(__is_arithmetic, signed char, true);
+SA_TEST_CATEGORY(__is_arithmetic, unsigned char, true);
+SA_TEST_CATEGORY(__is_arithmetic, wchar_t, true);
+SA_TEST_CATEGORY(__is_arithmetic, short, true);
+SA_TEST_CATEGORY(__is_arithmetic, unsigned short, true);
+SA_TEST_CATEGORY(__is_arithmetic, int, true);
+SA_TEST_CATEGORY(__is_arithmetic, unsigned int, true);
+SA_TEST_CATEGORY(__is_arithmetic, long, true);
+SA_TEST_CATEGORY(__is_arithmetic, unsigned long, true);
+SA_TEST_CATEGORY(__is_arithmetic, long long, true);
+SA_TEST_CATEGORY(__is_arithmetic, unsigned long long, true);
+SA_TEST_CATEGORY(__is_arithmetic, float, true);
+SA_TEST_CATEGORY(__is_arithmetic, double, true);
+SA_TEST_CATEGORY(__is_arithmetic, long double, true);
+
+// Sanity check.
+SA_TEST_CATEGORY(__is_arithmetic, ClassType, false);
@@ -217,16 +217,16 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef __true_type __type;
};
template<typename _Tp>
- struct __is_arithmetic
+ struct __is_arith
: public __traitor<__is_integer<_Tp>, __is_floating<_Tp> >
{ };
template<typename _Tp>
struct __is_fundamental
- : public __traitor<__is_void<_Tp>, __is_arithmetic<_Tp> >
+ : public __traitor<__is_void<_Tp>, __is_arith<_Tp> >
{ };
template<typename _Tp>
struct __is_scalar
- : public __traitor<__is_arithmetic<_Tp>, __is_ptr<_Tp> >
+ : public __traitor<__is_arith<_Tp>, __is_ptr<_Tp> >
{ };
template<typename _Tp>
struct __is_char
@@ -25,9 +25,9 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
enum {
__value = 0 };
};
- template<typename _Tp> struct __is_arithmetic : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> > {
+ template<typename _Tp> struct __is_arith : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> > {
};
- template<typename _Tp> struct __is_scalar : public __traitor<__is_arithmetic<_Tp>, __is_ptr<_Tp> > {
+ template<typename _Tp> struct __is_scalar : public __traitor<__is_arith<_Tp>, __is_ptr<_Tp> > {
};
}
namespace __gnu_cxx __attribute__ ((__visibility__ ("default"))) {
@@ -389,7 +389,7 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
// An arithmetic type is an integer type or a floating point type
//
template<typename _Tp>
- struct __is_arithmetic
+ struct __is_arith
: public __traitor<__is_integer<_Tp>, __is_floating<_Tp> >
{ };
@@ -398,7 +398,7 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
//
template<typename _Tp>
struct __is_scalar
- : public __traitor<__is_arithmetic<_Tp>, __is_ptr<_Tp> >
+ : public __traitor<__is_arith<_Tp>, __is_ptr<_Tp> >
{ };
//
@@ -1259,8 +1259,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
template<typename _Tp, typename _Up>
constexpr typename
- __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
- && __is_arithmetic<_Up>::__value), bool>::__type
+ __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
+ && __is_arith<_Up>::__value), bool>::__type
isgreater(_Tp __x, _Up __y)
{
typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
@@ -1285,8 +1285,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
template<typename _Tp, typename _Up>
constexpr typename
- __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
- && __is_arithmetic<_Up>::__value), bool>::__type
+ __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
+ && __is_arith<_Up>::__value), bool>::__type
isgreaterequal(_Tp __x, _Up __y)
{
typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
@@ -1311,8 +1311,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
template<typename _Tp, typename _Up>
constexpr typename
- __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
- && __is_arithmetic<_Up>::__value), bool>::__type
+ __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
+ && __is_arith<_Up>::__value), bool>::__type
isless(_Tp __x, _Up __y)
{
typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
@@ -1337,8 +1337,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
template<typename _Tp, typename _Up>
constexpr typename
- __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
- && __is_arithmetic<_Up>::__value), bool>::__type
+ __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
+ && __is_arith<_Up>::__value), bool>::__type
islessequal(_Tp __x, _Up __y)
{
typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
@@ -1363,8 +1363,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
template<typename _Tp, typename _Up>
constexpr typename
- __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
- && __is_arithmetic<_Up>::__value), bool>::__type
+ __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
+ && __is_arith<_Up>::__value), bool>::__type
islessgreater(_Tp __x, _Up __y)
{
typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
@@ -1389,8 +1389,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
template<typename _Tp, typename _Up>
constexpr typename
- __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
- && __is_arithmetic<_Up>::__value), bool>::__type
+ __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
+ && __is_arith<_Up>::__value), bool>::__type
isunordered(_Tp __x, _Up __y)
{
typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
@@ -1401,7 +1401,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#else
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
fpclassify(_Tp __f)
{
@@ -1411,7 +1411,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isfinite(_Tp __f)
{
@@ -1420,7 +1420,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isinf(_Tp __f)
{
@@ -1429,7 +1429,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isnan(_Tp __f)
{
@@ -1438,7 +1438,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isnormal(_Tp __f)
{
@@ -1447,7 +1447,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
signbit(_Tp __f)
{
@@ -1456,7 +1456,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isgreater(_Tp __f1, _Tp __f2)
{
@@ -1465,7 +1465,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isgreaterequal(_Tp __f1, _Tp __f2)
{
@@ -1474,7 +1474,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isless(_Tp __f1, _Tp __f2)
{
@@ -1483,7 +1483,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
islessequal(_Tp __f1, _Tp __f2)
{
@@ -1492,7 +1492,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
islessgreater(_Tp __f1, _Tp __f2)
{
@@ -1501,7 +1501,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isunordered(_Tp __f1, _Tp __f2)
{
@@ -467,7 +467,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#undef isunordered
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
fpclassify(_Tp __f)
{
@@ -477,7 +477,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isfinite(_Tp __f)
{
@@ -486,7 +486,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isinf(_Tp __f)
{
@@ -495,7 +495,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isnan(_Tp __f)
{
@@ -504,7 +504,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isnormal(_Tp __f)
{
@@ -513,7 +513,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
signbit(_Tp __f)
{
@@ -522,7 +522,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isgreater(_Tp __f1, _Tp __f2)
{
@@ -531,7 +531,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isgreaterequal(_Tp __f1, _Tp __f2)
{
@@ -540,7 +540,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isless(_Tp __f1, _Tp __f2)
{
@@ -549,7 +549,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
islessequal(_Tp __f1, _Tp __f2)
{
@@ -558,7 +558,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
islessgreater(_Tp __f1, _Tp __f2)
{
@@ -567,7 +567,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isunordered(_Tp __f1, _Tp __f2)
{
@@ -307,7 +307,7 @@ namespace tr1
/// Function template definitions [8.16.3].
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
fpclassify(_Tp __f)
{
@@ -317,7 +317,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isfinite(_Tp __f)
{
@@ -326,7 +326,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isinf(_Tp __f)
{
@@ -335,7 +335,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isnan(_Tp __f)
{
@@ -344,7 +344,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isnormal(_Tp __f)
{
@@ -353,7 +353,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
signbit(_Tp __f)
{
@@ -362,7 +362,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isgreater(_Tp __f1, _Tp __f2)
{
@@ -371,7 +371,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isgreaterequal(_Tp __f1, _Tp __f2)
{
@@ -380,7 +380,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isless(_Tp __f1, _Tp __f2)
{
@@ -389,7 +389,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
islessequal(_Tp __f1, _Tp __f2)
{
@@ -398,7 +398,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
islessgreater(_Tp __f1, _Tp __f2)
{
@@ -407,7 +407,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isunordered(_Tp __f1, _Tp __f2)
{
This patch implements built-in trait for std::is_arithmetic. gcc/cp/ChangeLog: * cp-trait.def: Define __is_arithmetic. * cp-trait.gperf: Reflect cp-trait.def change. * cp-trait.h: Likewise. * constraint.cc (diagnose_trait_expr): Handle CPTK_IS_ARITHMETIC. * semantics.cc (trait_expr_value): Likewise. (finish_trait_expr): Likewise. gcc/testsuite/ChangeLog: * g++.dg/ext/has-builtin-1.C: Test existence of __is_arithmetic. * g++.dg/ext/is_arithmetic.C: New test. * g++.dg/tm/pr46567.C (__is_arithmetic): Rename to ... (__is_arith): ... this. * g++.dg/torture/pr57107.C: Likewise. libstdc++-v3/ChangeLog: * include/bits/cpp_type_traits.h (__is_arithmetic): Rename to ... (__is_arith): ... this. * include/c_global/cmath: Use __is_arith instead. * include/c_std/cmath: Likewise. * include/tr1/cmath: Likewise. Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org> --- gcc/cp/constraint.cc | 3 + gcc/cp/cp-trait.def | 1 + gcc/cp/cp-trait.gperf | 1 + gcc/cp/cp-trait.h | 184 ++++++++++---------- gcc/cp/semantics.cc | 4 + gcc/testsuite/g++.dg/ext/has-builtin-1.C | 3 + gcc/testsuite/g++.dg/ext/is_arithmetic.C | 33 ++++ gcc/testsuite/g++.dg/tm/pr46567.C | 6 +- gcc/testsuite/g++.dg/torture/pr57107.C | 4 +- libstdc++-v3/include/bits/cpp_type_traits.h | 4 +- libstdc++-v3/include/c_global/cmath | 48 ++--- libstdc++-v3/include/c_std/cmath | 24 +-- libstdc++-v3/include/tr1/cmath | 24 +-- 13 files changed, 193 insertions(+), 146 deletions(-) create mode 100644 gcc/testsuite/g++.dg/ext/is_arithmetic.C