feedc0de/boost_assert
1
0
Fork 0
forked from boostorg/assert
Code Pull Requests Activity

Enable BOOST_CURRENT_LOCATION at top level and in default arguments

Browse Source
This commit is contained in:
Peter Dimov
2022-02-03 21:19:43 +02:00
parent 23e699b9a4
commit 844d8c2245
5 changed files with 151 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/Jamfile.v2
+1
View File
@@ -40,3 +40,4 @@ run current_function_test2.cpp ;
run source_location_test.cpp ;
run source_location_test2.cpp ;
run source_location_test3.cpp ;
run source_location_test4.cpp ;
test/source_location_test.cpp
+17 -6
View File
@@ -17,17 +17,28 @@ int main()
}
{
boost::source_location loc = BOOST_CURRENT_LOCATION;
boost::source_location loc( __FILE__, __LINE__, "main" );
BOOST_TEST_CSTR_EQ( loc.file_name(), __FILE__ );
BOOST_TEST_EQ( loc.line(), 20 );
#if !( defined(__cpp_lib_source_location) && __cpp_lib_source_location >= 201907L )
BOOST_TEST_CSTR_EQ( loc.function_name(), BOOST_CURRENT_FUNCTION );
BOOST_TEST_CSTR_EQ( loc.function_name(), "main" );
BOOST_TEST_EQ( loc.column(), 0 );
}
#endif
{
boost::source_location loc( "file", 1, "main", 2 );
BOOST_TEST_CSTR_EQ( loc.file_name(), "file" );
BOOST_TEST_EQ( loc.line(), 1 );
BOOST_TEST_CSTR_EQ( loc.function_name(), "main" );
BOOST_TEST_EQ( loc.column(), 2 );
}
{
boost::source_location loc = BOOST_CURRENT_LOCATION;
BOOST_TEST_CSTR_EQ( loc.file_name(), __FILE__ );
BOOST_TEST_EQ( loc.line(), 38 );
}
#if defined(__cpp_lib_source_location) && __cpp_lib_source_location >= 201907L
test/source_location_test3.cpp
+48 -26
View File
@@ -23,34 +23,66 @@ int main()
}
{
boost::source_location loc( __FILE__, __LINE__, BOOST_CURRENT_FUNCTION );
BOOST_TEST_EQ( loc.to_string(), std::string( __FILE__ ) + ":26 in function '" + BOOST_CURRENT_FUNCTION + "'" );
boost::source_location loc( "file", 5, "" );
BOOST_TEST_EQ( loc.to_string(), std::string( "file:5" ) );
}
{
boost::source_location loc( __FILE__, __LINE__, BOOST_CURRENT_FUNCTION );
boost::source_location loc( "file", 5, "" );
std::ostringstream os;
os << loc;
BOOST_TEST_EQ( os.str(), std::string( __FILE__ ) + ":31 in function '" + BOOST_CURRENT_FUNCTION + "'" );
BOOST_TEST_EQ( os.str(), std::string( "file:5" ) );
}
{
boost::source_location loc( "file", 7, "main" );
BOOST_TEST_EQ( loc.to_string(), std::string( "file:7 in function 'main'" ) );
}
{
boost::source_location loc( "file", 7, "main" );
std::ostringstream os;
os << loc;
BOOST_TEST_EQ( os.str(), std::string( "file:7 in function 'main'" ) );
}
{
boost::source_location loc( "file", 11, "main", 13 );
BOOST_TEST_EQ( loc.to_string(), std::string( "file:11:13 in function 'main'" ) );
}
{
boost::source_location loc( "file", 11, "main", 13 );
std::ostringstream os;
os << loc;
BOOST_TEST_EQ( os.str(), std::string( "file:11:13 in function 'main'" ) );
}
{
boost::source_location loc( "file", 17, "", 19 );
BOOST_TEST_EQ( loc.to_string(), std::string( "file:17:19" ) );
}
{
boost::source_location loc( "file", 17, "", 19 );
std::ostringstream os;
os << loc;
BOOST_TEST_EQ( os.str(), std::string( "file:17:19" ) );
}
{
boost::source_location loc = BOOST_CURRENT_LOCATION;
std::string prefix = std::string( __FILE__ ) + ":40";
#if !( defined(__cpp_lib_source_location) && __cpp_lib_source_location >= 201907L )
BOOST_TEST_EQ( loc.to_string(), prefix + " in function '" + BOOST_CURRENT_FUNCTION + "'" );
#else
// column and function vary when coming from std::source_location::current()
std::string prefix = std::string( __FILE__ ) + ":82";
BOOST_TEST_EQ( loc.to_string().substr( 0, prefix.size() ), prefix );
#endif
}
{
@@ -59,18 +91,8 @@ int main()
std::ostringstream os;
os << loc;
std::string prefix = std::string( __FILE__ ) + ":57";
#if !( defined(__cpp_lib_source_location) && __cpp_lib_source_location >= 201907L )
BOOST_TEST_EQ( os.str(), prefix + " in function '" + BOOST_CURRENT_FUNCTION + "'" );
#else
// column and function vary when coming from std::source_location::current()
std::string prefix = std::string( __FILE__ ) + ":89";
BOOST_TEST_EQ( os.str().substr( 0, prefix.size() ), prefix );
#endif
}
return boost::report_errors();
test/source_location_test4.cpp
+42
View File
@@ -0,0 +1,42 @@
// Copyright 2022 Peter Dimov
// Distributed under the Boost Software License, Version 1.0.
// http://www.boost.org/LICENSE_1_0.txt
#include <boost/assert/source_location.hpp>
#include <boost/core/lightweight_test.hpp>
boost::source_location s_loc = BOOST_CURRENT_LOCATION;
boost::source_location f( boost::source_location const& loc = BOOST_CURRENT_LOCATION )
{
return loc;
}
int main()
{
{
BOOST_TEST_CSTR_EQ( s_loc.file_name(), __FILE__ );
BOOST_TEST_EQ( s_loc.line(), 8 );
BOOST_TEST_CSTR_EQ( s_loc.function_name(), "" );
}
{
boost::source_location loc = f();
#if defined(__cpp_lib_source_location) && __cpp_lib_source_location >= 201907L && !BOOST_WORKAROUND(BOOST_MSVC, < 1931)
BOOST_TEST_CSTR_EQ( loc.file_name(), std::source_location::current().file_name() );
BOOST_TEST_CSTR_EQ( loc.function_name(), std::source_location::current().function_name() );
BOOST_TEST_EQ( loc.line(), 24 );
#else
BOOST_TEST_CSTR_EQ( loc.file_name(), __FILE__ );
BOOST_TEST_EQ( loc.line(), 10 );
BOOST_TEST_CSTR_EQ( loc.function_name(), "" );
#endif
}
return boost::report_errors();
}