Author: jfb Date: Tue Mar 22 16:12:48 2016 New Revision: 264098 URL: http://llvm.org/viewvc/llvm-project?rev=264098&view=rev Log: Update cxx-features test to C++1z
Forked from the following patch: http://reviews.llvm.org/D17950 Modified: cfe/trunk/test/Lexer/cxx-features.cpp Modified: cfe/trunk/test/Lexer/cxx-features.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Lexer/cxx-features.cpp?rev=264098&r1=264097&r2=264098&view=diff ============================================================================== --- cfe/trunk/test/Lexer/cxx-features.cpp (original) +++ cfe/trunk/test/Lexer/cxx-features.cpp Tue Mar 22 16:12:48 2016 @@ -1,133 +1,137 @@ // RUN: %clang_cc1 -std=c++98 -verify %s // RUN: %clang_cc1 -std=c++11 -verify %s // RUN: %clang_cc1 -std=c++1y -fsized-deallocation -verify %s -// RUN: %clang_cc1 -std=c++1y -fsized-deallocation -fconcepts-ts -DCONCEPTS_TS=1 -verify %s +// RUN: %clang_cc1 -std=c++14 -fsized-deallocation -verify %s +// RUN: %clang_cc1 -std=c++1z -fsized-deallocation -verify %s +// RUN: %clang_cc1 -std=c++1z -fsized-deallocation -fconcepts-ts -DCONCEPTS_TS=1 -verify %s // RUN: %clang_cc1 -fcoroutines -DCOROUTINES -verify %s // expected-no-diagnostics // FIXME using `defined` in a macro has undefined behavior. #if __cplusplus < 201103L -#define check(macro, cxx98, cxx11, cxx1y) cxx98 == 0 ? defined(__cpp_##macro) : __cpp_##macro != cxx98 -#elif __cplusplus < 201304L -#define check(macro, cxx98, cxx11, cxx1y) cxx11 == 0 ? defined(__cpp_##macro) : __cpp_##macro != cxx11 +#define check(macro, cxx98, cxx11, cxx14, cxx1z) cxx98 == 0 ? defined(__cpp_##macro) : __cpp_##macro != cxx98 +#elif __cplusplus < 201402L +#define check(macro, cxx98, cxx11, cxx14, cxx1z) cxx11 == 0 ? defined(__cpp_##macro) : __cpp_##macro != cxx11 +#elif __cplusplus < 201406L +#define check(macro, cxx98, cxx11, cxx14, cxx1z) cxx14 == 0 ? defined(__cpp_##macro) : __cpp_##macro != cxx14 #else -#define check(macro, cxx98, cxx11, cxx1y) cxx1y == 0 ? defined(__cpp_##macro) : __cpp_##macro != cxx1y +#define check(macro, cxx98, cxx11, cxx14, cxx1z) cxx1z == 0 ? defined(__cpp_##macro) : __cpp_##macro != cxx1z #endif -#if check(binary_literals, 0, 0, 201304) +#if check(binary_literals, 0, 0, 201304, 201304) #error "wrong value for __cpp_binary_literals" #endif -#if check(digit_separators, 0, 0, 201309) +#if check(digit_separators, 0, 0, 201309, 201309) #error "wrong value for __cpp_digit_separators" #endif -#if check(init_captures, 0, 0, 201304) +#if check(init_captures, 0, 0, 201304, 201304) #error "wrong value for __cpp_init_captures" #endif -#if check(generic_lambdas, 0, 0, 201304) +#if check(generic_lambdas, 0, 0, 201304, 201304) #error "wrong value for __cpp_generic_lambdas" #endif -#if check(sized_deallocation, 0, 0, 201309) +#if check(sized_deallocation, 0, 0, 201309, 201309) #error "wrong value for __cpp_sized_deallocation" #endif -#if check(constexpr, 0, 200704, 201304) +#if check(constexpr, 0, 200704, 201304, 201304) #error "wrong value for __cpp_constexpr" #endif -#if check(decltype_auto, 0, 0, 201304) +#if check(decltype_auto, 0, 0, 201304, 201304) #error "wrong value for __cpp_decltype_auto" #endif -#if check(return_type_deduction, 0, 0, 201304) +#if check(return_type_deduction, 0, 0, 201304, 201304) #error "wrong value for __cpp_return_type_deduction" #endif -#if check(runtime_arrays, 0, 0, 0) +#if check(runtime_arrays, 0, 0, 0, 0) #error "wrong value for __cpp_runtime_arrays" #endif -#if check(aggregate_nsdmi, 0, 0, 201304) +#if check(aggregate_nsdmi, 0, 0, 201304, 201304) #error "wrong value for __cpp_aggregate_nsdmi" #endif -#if check(variable_templates, 0, 0, 201304) +#if check(variable_templates, 0, 0, 201304, 201304) #error "wrong value for __cpp_variable_templates" #endif -#if check(unicode_characters, 0, 200704, 200704) +#if check(unicode_characters, 0, 200704, 200704, 200704) #error "wrong value for __cpp_unicode_characters" #endif -#if check(raw_strings, 0, 200710, 200710) +#if check(raw_strings, 0, 200710, 200710, 200710) #error "wrong value for __cpp_raw_strings" #endif -#if check(unicode_literals, 0, 200710, 200710) +#if check(unicode_literals, 0, 200710, 200710, 200710) #error "wrong value for __cpp_unicode_literals" #endif -#if check(user_defined_literals, 0, 200809, 200809) +#if check(user_defined_literals, 0, 200809, 200809, 200809) #error "wrong value for __cpp_user_defined_literals" #endif -#if check(lambdas, 0, 200907, 200907) +#if check(lambdas, 0, 200907, 200907, 200907) #error "wrong value for __cpp_lambdas" #endif -#if check(range_based_for, 0, 200907, 200907) +#if check(range_based_for, 0, 200907, 200907, 200907) #error "wrong value for __cpp_range_based_for" #endif -#if check(static_assert, 0, 200410, 200410) +#if check(static_assert, 0, 200410, 200410, 200410) #error "wrong value for __cpp_static_assert" #endif -#if check(decltype, 0, 200707, 200707) +#if check(decltype, 0, 200707, 200707, 200707) #error "wrong value for __cpp_decltype" #endif -#if check(attributes, 0, 200809, 200809) +#if check(attributes, 0, 200809, 200809, 200809) #error "wrong value for __cpp_attributes" #endif -#if check(rvalue_references, 0, 200610, 200610) +#if check(rvalue_references, 0, 200610, 200610, 200610) #error "wrong value for __cpp_rvalue_references" #endif -#if check(variadic_templates, 0, 200704, 200704) +#if check(variadic_templates, 0, 200704, 200704, 200704) #error "wrong value for __cpp_variadic_templates" #endif -#if check(initializer_lists, 0, 200806, 200806) +#if check(initializer_lists, 0, 200806, 200806, 200806) #error "wrong value for __cpp_initializer_lists" #endif -#if check(delegating_constructors, 0, 200604, 200604) +#if check(delegating_constructors, 0, 200604, 200604, 200604) #error "wrong value for __cpp_delegating_constructors" #endif -#if check(nsdmi, 0, 200809, 200809) +#if check(nsdmi, 0, 200809, 200809, 200809) #error "wrong value for __cpp_nsdmi" #endif -#if check(inheriting_constructors, 0, 200802, 200802) +#if check(inheriting_constructors, 0, 200802, 200802, 200802) #error "wrong value for __cpp_inheriting_constructors" #endif -#if check(ref_qualifiers, 0, 200710, 200710) +#if check(ref_qualifiers, 0, 200710, 200710, 200710) #error "wrong value for __cpp_ref_qualifiers" #endif -#if check(alias_templates, 0, 200704, 200704) +#if check(alias_templates, 0, 200704, 200704, 200704) #error "wrong value for __cpp_alias_templates" #endif -#if check(experimental_concepts, 0, 0, CONCEPTS_TS) +#if check(experimental_concepts, 0, 0, CONCEPTS_TS, CONCEPTS_TS) #error "wrong value for __cpp_experimental_concepts" #endif _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
