roland/xo-tokenizer2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xo-indentlog: bugfix: parse altered gcc output starting gcc13.2

Browse source
This commit is contained in:
Roland Conybeare 2025-06-12 07:41:44 -05:00
commit 302288f2ce
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
xo-indentlog/include/xo/indentlog/print/function.hpp
View file

@ -97,6 +97,7 @@ namespace xo {
std::size_t r = find_toplevel_sep(s4, false /*!last_flag*/);
std::string_view s5 = s4.substr(r); /*no namespace qualifier (unless function)*/
//std::cerr << "print_streamlined: __GNUC__=" << __GNUC__ << ", __GNUC_MINOR__=" << __GNUC_MINOR__ << std::endl;
//std::cerr << "print_streamlined: s=[" << s << "]" << std::endl;
//std::cerr << "print_streamlined: s2=[" << s2 << "] (excluded [with ..] suffix)" << std::endl;
//std::cerr << "print_streamlined: s3=[" << s3 << "] (excluded const suffix)" << std::endl;
@ -147,8 +148,8 @@ namespace xo {
/* clang footnote like [CharT = char] instead of [with CharT = char] */
std::size_t p = s.find(" [");
#else
# if (__GNUC__ > 13) || ((__GNUC__ == 13) && (__GNUC_MINOR__ >= 3))
/* gcc footnote like [CharT = char] instead of [with CharT = char] starting w/ gcc 13.3 (approximately ?)*/
# if (__GNUC__ > 13) || ((__GNUC__ == 13) && (__GNUC_MINOR__ >= 2))
/* gcc footnote like [CharT = char] instead of [with CharT = char] starting w/ gcc 13.2 (approximately ?)*/
std::size_t p = s.find(" [");
# else
std::size_t p = s.find(" [with ");

2
xo-indentlog/utest/function.test.cpp
View file

@ -19,7 +19,7 @@ namespace ut {
color_spec_type spec_;
/* function signature (as per __PRETTY_FUNCTION__) */
std::string_view pretty_;
/* output text */
/* output text: expected output from function_name(.style .spec .pretty) */
std::string_view output_;
}; /*function_tcase*/