TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Improve static_assert test

Browse source 
Previously, SConstruct tested whether static_assert worked with trivial
constant expressions.  Extend the test to more complicated expressions
like the ones used in the program.

Replace the typedef based approach with an inline enum to avoid warnings
about unused local typedefs.

Allow use with compilers that lack working static_assert or that cannot
accept complicated expressions.  Add a non-checking definition that uses
the input parameter.  This prevents warnings when types or constants are
used only for the static_assert.
This commit is contained in:
Kp 2015-07-09 03:12:45 +00:00
parent 4a742e3fc4
commit 658102a868
2 changed files with 59 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
SConstruct
View file

@ -695,9 +695,9 @@ auto f()->int;
'''
if not self.Cxx11Compile(context, text=f, msg='for C++11 function declarator syntax'):
raise SCons.Errors.StopError("C++ compiler does not support C++11 function declarator syntax.")
def _check_static_assert_method(self,context,msg,f,testflags={},_Compile=Compile,**kwargs):
return _Compile(self, context, text=f % 'true', msg=msg % 'true', testflags=testflags, **kwargs) and \
_Compile(self, context, text=f % 'false', msg=msg % 'false', expect_failure=True, successflags=testflags, **kwargs)
def _check_static_assert_method(self,context,msg,f,testflags={},_Compile=Compile,_tdict={'expr' : 'true&&true'},_fdict={'expr' : 'false||false'},**kwargs):
return _Compile(self, context, text=f % _tdict, main='f(A());', msg=msg % 'true', testflags=testflags, **kwargs) and \
_Compile(self, context, text=f % _fdict, main='f(A());', msg=msg % 'false', expect_failure=True, successflags=testflags, **kwargs)
@_implicit_test
def check_boost_static_assert(self,context,f):
"""
@ -720,11 +720,57 @@ help:assume compiler supports C++ intrinsic static_assert
def _check_static_assert(self,context):
f = '''
#include "compiler-static_assert.h"
static_assert(%s, "");
static_assert(%(expr)s, "global");
struct A
{
static const bool value = %(expr)s;
static_assert(%(expr)s, "class literal");
static_assert(A::value, "class static");
A()
{
static_assert(%(expr)s, "constructor literal");
static_assert(value, "constructor static");
}
};
template <typename>
struct B
{
static const bool value = %(expr)s;
static_assert(%(expr)s, "template class literal");
static_assert(value, "template class static");
B(A a)
{
static_assert(%(expr)s, "constructor literal");
static_assert(value, "constructor self static");
static_assert(A::value, "constructor static");
static_assert(a.value, "constructor member");
}
template <typename R>
B(B<R> &&b)
{
static_assert(%(expr)s, "template constructor literal");
static_assert(value, "template constructor self static");
static_assert(B<R>::value, "template constructor static");
static_assert(b.value, "template constructor member");
}
};
template <typename T>
static void f(B<T> b)
{
static_assert(%(expr)s, "template function literal");
static_assert(B<T>::value, "template function static");
static_assert(b.value, "template function member");
}
void f(A a);
void f(A a)
{
static_assert(%(expr)s, "function literal");
static_assert(A::value, "function static");
static_assert(a.value, "function member");
f(B<long>(B<int>(a)));
}
'''
how = self.check_cxx11_static_assert(context,f) or self.check_boost_static_assert(context,f) or self.check_c_typedef_static_assert(context,f)
if not how:
raise SCons.Errors.StopError("C++ compiler does not support static_assert or Boost.StaticAssert or typedef-based static assertion.")
@_implicit_test
def check_boost_type_traits(self,context,f):
"""

10
common/include/compiler-static_assert.h
View file

@ -12,10 +12,14 @@
#elif defined(DXX_HAVE_BOOST_STATIC_ASSERT)
#include <boost/static_assert.hpp>
#define static_assert(C,M) BOOST_STATIC_ASSERT_MSG((C),M)
#elif defined(DXX_HAVE_C_TYPEDEF_STATIC_ASSERT)
#define static_assert(C,M) typedef int static_assertion_check[(C) ? 1 : -1];
#else
#error "No static_assert implementation found."
#define DXX_C_STATIC_ASSERT_PASTE2(A,B,C) A##_##B##_##C
#define DXX_C_STATIC_ASSERT_PASTE(A,B,C) DXX_C_STATIC_ASSERT_PASTE2(A,B,C)
#ifdef DXX_HAVE_C_TYPEDEF_STATIC_ASSERT
#define static_assert(C,M) enum { DXX_C_STATIC_ASSERT_PASTE(static_assertion_check, __LINE__, __COUNTER__) = sizeof(char[(C) ? 1 : -1]) }
#else
#define static_assert(C,M) enum { DXX_C_STATIC_ASSERT_PASTE(static_assertion_disabled, __LINE__, __COUNTER__) = sizeof((C)) }
#endif
#endif
#define DEFINE_ASSERT_HELPER_CLASS(N,OP,STR) \