boost/log
2
0
Fork 0
mirror of https://github.com/boostorg/log.git synced 2026-02-10 23:42:22 +00:00
Code Issues Projects Releases Wiki Activity

Added support for bare filename and function name extraction in the

Browse Source 
named scope formatter. Function name does not work yet if function types
are present in the scope (function) signature.
This commit is contained in:
Andrey Semashev
2014-02-23 21:04:22 +04:00
parent f734363ee3
commit 15ed06e606
2 changed files with 372 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/named_scope_format_parser.cpp
View File

@@ -13,6 +13,8 @@
* at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
*/
#include <cstddef>
#include <cstring>
#include <string>
#include <vector>
#include <limits>
@@ -76,7 +78,39 @@ public:
}
};
struct file_name
template< bool OmitScopeV >
struct function_name
{
typedef void result_type;
result_type operator() (stream_type& strm, value_type const& value) const
{
const char* const begin = value.scope_name.c_str();
const char* const paren = std::strchr(begin, '(');
if (paren)
{
const char* p = paren;
for (; p != begin; --p)
{
const char c = *(p - 1);
if (OmitScopeV && c == ':')
break;
if (c == ' ')
break;
}
if (p != begin && p != paren)
{
strm.write(p, paren - p);
return;
}
}
strm << value.scope_name;
}
};
struct full_file_name
{
typedef void result_type;
@@ -86,6 +120,27 @@ public:
}
};
struct file_name
{
typedef void result_type;
result_type operator() (stream_type& strm, value_type const& value) const
{
std::size_t n = value.file_name.size(), i = n;
for (; i > 0; --i)
{
const char c = value.file_name[i - 1];
#if defined(BOOST_WINDOWS)
if (c == '\\')
break;
#endif
if (c == '/')
break;
}
strm.write(value.file_name.c_str() + i, n - i);
}
};
struct line_number
{
typedef void result_type;
@@ -182,7 +237,25 @@ do_parse_named_scope_format(const CharT* begin, const CharT* end)
fmt.add_formatter(typename formatter_type::scope_name());
break;
case 'c':
if (!literal.empty())
fmt.add_formatter(typename formatter_type::literal(literal));
fmt.add_formatter(typename formatter_type::BOOST_NESTED_TEMPLATE function_name< false >());
break;
case 'C':
if (!literal.empty())
fmt.add_formatter(typename formatter_type::literal(literal));
fmt.add_formatter(typename formatter_type::BOOST_NESTED_TEMPLATE function_name< true >());
break;
case 'f':
if (!literal.empty())
fmt.add_formatter(typename formatter_type::literal(literal));
fmt.add_formatter(typename formatter_type::full_file_name());
break;
case 'F':
if (!literal.empty())
fmt.add_formatter(typename formatter_type::literal(literal));
fmt.add_formatter(typename formatter_type::file_name());