From d700097ea6018c44e82bacc32e2618de28b6351f Mon Sep 17 00:00:00 2001 From: philip82148 <92205270+philip82148@users.noreply.github.com> Date: Tue, 24 Sep 2024 01:18:40 +0900 Subject: [PATCH 01/25] add&use classname_style --- cpp-dump/hpp/export_var/export_exception.hpp | 3 +- cpp-dump/hpp/export_var/export_object.hpp | 3 +- .../hpp/export_var/export_object_generic.hpp | 4 +- cpp-dump/hpp/options.hpp | 13 +++ cpp-dump/hpp/type_check.hpp | 45 ---------- cpp-dump/hpp/type_name.hpp | 88 +++++++++++++++++++ 6 files changed, 107 insertions(+), 49 deletions(-) create mode 100644 cpp-dump/hpp/type_name.hpp diff --git a/cpp-dump/hpp/export_var/export_exception.hpp b/cpp-dump/hpp/export_var/export_exception.hpp index f91bceaf..a32ec7a1 100644 --- a/cpp-dump/hpp/export_var/export_exception.hpp +++ b/cpp-dump/hpp/export_var/export_exception.hpp @@ -13,6 +13,7 @@ #include "../escape_sequence.hpp" #include "../export_command/export_command.hpp" #include "../type_check.hpp" +#include "../type_name.hpp" #include "./export_object_common.hpp" namespace cpp_dump { @@ -28,7 +29,7 @@ inline auto export_exception( bool fail_on_newline, const export_command &command ) -> std::enable_if_t, std::string> { - std::string class_name = es::class_name(get_typename()); + std::string class_name = es::class_name(styled_typename()); _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; diff --git a/cpp-dump/hpp/export_var/export_object.hpp b/cpp-dump/hpp/export_var/export_object.hpp index ef3badb0..a9764982 100644 --- a/cpp-dump/hpp/export_var/export_object.hpp +++ b/cpp-dump/hpp/export_var/export_object.hpp @@ -13,6 +13,7 @@ #include "../expand_va_macro.hpp" #include "../export_command/export_command.hpp" #include "../type_check.hpp" +#include "../type_name.hpp" #include "./export_object_common.hpp" #define _p_CPP_DUMP_EXPAND_FOR_EXPORT_OBJECT(member) append_output(#member, value.member) @@ -38,7 +39,7 @@ bool fail_on_newline, \ const export_command &command \ ) { \ - std::string class_name = es::class_name(#TYPE); \ + std::string class_name = es::class_name(styled_typename_str(#TYPE)); \ \ _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; \ \ diff --git a/cpp-dump/hpp/export_var/export_object_generic.hpp b/cpp-dump/hpp/export_var/export_object_generic.hpp index 9570602e..d0d06ffe 100644 --- a/cpp-dump/hpp/export_var/export_object_generic.hpp +++ b/cpp-dump/hpp/export_var/export_object_generic.hpp @@ -12,7 +12,7 @@ #include "../escape_sequence.hpp" #include "../expand_va_macro.hpp" #include "../export_command/export_command.hpp" -#include "../type_check.hpp" +#include "../type_name.hpp" #include "./export_object_common.hpp" #define _p_CPP_DUMP_EXPAND_FOR_EXPORT_OBJECT_GENERIC(member) value.member @@ -37,7 +37,7 @@ bool fail_on_newline, \ const export_command &command \ ) -> decltype(_p_CPP_DUMP_EXPAND_VA(_p_CPP_DUMP_EXPAND_FOR_EXPORT_OBJECT_GENERIC, __VA_ARGS__), std::string()) { \ - std::string class_name = es::class_name(get_typename()); \ + std::string class_name = es::class_name(styled_typename()); \ \ _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; \ \ diff --git a/cpp-dump/hpp/options.hpp b/cpp-dump/hpp/options.hpp index 9027d80e..e7eb7a29 100644 --- a/cpp-dump/hpp/options.hpp +++ b/cpp-dump/hpp/options.hpp @@ -56,6 +56,13 @@ namespace types { */ enum class cont_indent_style_t { minimal, when_nested, when_non_tuples_nested, always }; +/** + * Type of cpp_dump::options::classname_style. + * cpp_dump::export_var() supports this type. + * This is an experimental feature. + */ +enum class typename_style_t { no_temp_args, fullname, maximum20 }; + /** * Type of cpp_dump::options::es_style. * cpp_dump::export_var() supports this type. @@ -124,6 +131,12 @@ inline bool print_expr = true; */ inline types::log_label_func_t log_label_func = log_label::default_func; +/** + * Style of class name. + * This is an experimental feature. + */ +inline types::typename_style_t typename_style = types::typename_style_t::no_temp_args; + /** * Style of the escape sequences (output coloring). */ diff --git a/cpp-dump/hpp/type_check.hpp b/cpp-dump/hpp/type_check.hpp index 13ff610b..1ce8b8fb 100644 --- a/cpp-dump/hpp/type_check.hpp +++ b/cpp-dump/hpp/type_check.hpp @@ -277,51 +277,6 @@ inline constexpr bool is_exportable = template inline constexpr bool is_iterable_like = is_container || is_map || is_set || is_tuple; -// The return type must be a built-in type, otherwise we don't know how it will be stringified. -template -const char* _get_typename() { -#if defined(__GNUC__) && !defined(__clang__) - return __PRETTY_FUNCTION__; -#elif defined(__clang__) - return __PRETTY_FUNCTION__; -#elif defined(_MSC_VER) - return __FUNCSIG__; -#else - return ""; -#endif -} - -// Currently, used only by export_exception() and CPP_DUMP_DEFINE_EXPORT_OBJECT_GENERIC() -template -std::string get_typename() { -#if defined(__GNUC__) && !defined(__clang__) - constexpr std::size_t prefix_length = - std::string_view("const char* cpp_dump::_detail::_get_typename() [with T = ").size(); - constexpr std::size_t suffix_length = std::string_view("]").size(); -#elif defined(__clang__) - constexpr std::size_t prefix_length = - std::string_view("const char *cpp_dump::_detail::_get_typename() [T = ").size(); - constexpr std::size_t suffix_length = std::string_view("]").size(); -#elif defined(_MSC_VER) - constexpr std::size_t prefix_length = - std::string_view("const char *__cdecl cpp_dump::_detail::_get_typename<").size(); - constexpr std::size_t suffix_length = std::string_view(">(void)").size(); -#else - constexpr std::size_t prefix_length = 0; - constexpr std::size_t suffix_length = 0; -#endif - - std::string_view func_name = _get_typename(); - std::string type_name(func_name, prefix_length, func_name.size() - prefix_length - suffix_length); - -#if defined(_MSC_VER) - type_name = replace_string(type_name, "struct ", ""); - type_name = replace_string(type_name, "class ", ""); -#endif - - return type_name; -} - } // namespace _detail } // namespace cpp_dump diff --git a/cpp-dump/hpp/type_name.hpp b/cpp-dump/hpp/type_name.hpp new file mode 100644 index 00000000..b63568fe --- /dev/null +++ b/cpp-dump/hpp/type_name.hpp @@ -0,0 +1,88 @@ +/* + * Copyright (c) 2023 Ryota Sasaki. + * + * This source code is licensed under the MIT license found in the LICENSE file in the root + * directory of this source tree. + */ + +#pragma once + +#include +#include + +#include "./options.hpp" +#include "./type_check.hpp" + +namespace cpp_dump { + +namespace _detail { + +// The return type must be a built-in type, otherwise we don't know how it will be stringified. +template +const char* _get_typename_aux() { +#if defined(__GNUC__) && !defined(__clang__) + return __PRETTY_FUNCTION__; +#elif defined(__clang__) + return __PRETTY_FUNCTION__; +#elif defined(_MSC_VER) + return __FUNCSIG__; +#else + return ""; +#endif +} + +template +std::string _get_typename() { +#if defined(__GNUC__) && !defined(__clang__) + constexpr std::size_t prefix_length = + std::string_view("const char* cpp_dump::_detail::_get_typename_aux() [with T = ").size(); + constexpr std::size_t suffix_length = std::string_view("]").size(); +#elif defined(__clang__) + constexpr std::size_t prefix_length = + std::string_view("const char *cpp_dump::_detail::_get_typename_aux() [T = ").size(); + constexpr std::size_t suffix_length = std::string_view("]").size(); +#elif defined(_MSC_VER) + constexpr std::size_t prefix_length = + std::string_view("const char *__cdecl cpp_dump::_detail::_get_typename_aux<").size(); + constexpr std::size_t suffix_length = std::string_view(">(void)").size(); +#else + constexpr std::size_t prefix_length = 0; + constexpr std::size_t suffix_length = 0; +#endif + + std::string_view func_name = _get_typename_aux<_remove_cvref>(); + std::string type_name(func_name, prefix_length, func_name.size() - prefix_length - suffix_length); + +#if defined(_MSC_VER) + type_name = replace_string(type_name, "struct ", ""); + type_name = replace_string(type_name, "class ", ""); +#endif + + return type_name; +} + +inline std::string_view styled_typename_str(std::string_view type_name) { + switch (options::typename_style) { + case types::typename_style_t::no_temp_args: { + auto lt_pos = type_name.find('<'); + return type_name.substr(0, lt_pos); + } + case types::typename_style_t::maximum20: { + return type_name.substr(0, 20); + } + default: { + return type_name; + } + } +} + +// Currently, used only by export_exception() and CPP_DUMP_DEFINE_EXPORT_OBJECT_GENERIC() +template +inline std::string_view styled_typename() { + static std::string type_name = _get_typename(); + return styled_typename_str(type_name); +} + +} // namespace _detail + +} // namespace cpp_dump From 91cd194857dce6c95a3f773e4db4d52cf635492e Mon Sep 17 00:00:00 2001 From: philip82148 <92205270+philip82148@users.noreply.github.com> Date: Tue, 24 Sep 2024 01:23:35 +0900 Subject: [PATCH 02/25] update test txts --- test/txt/color_variable_clang_by_syntax.txt | 2 +- test/txt/color_variable_clang_original.txt | 2 +- test/txt/color_variable_gnu_by_syntax.txt | 2 +- test/txt/color_variable_gnu_original.txt | 2 +- test/txt/color_variable_msvc_by_syntax.txt | 2 +- test/txt/color_variable_msvc_original.txt | 2 +- test/txt/dump_variable_clang.txt | 2 +- test/txt/dump_variable_gnu.txt | 2 +- test/txt/dump_variable_msvc.txt | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/txt/color_variable_clang_by_syntax.txt b/test/txt/color_variable_clang_by_syntax.txt index 6eb45669..dcfc6ff7 100644 --- a/test/txt/color_variable_clang_by_syntax.txt +++ b/test/txt/color_variable_clang_by_syntax.txt @@ -1,4 +1,4 @@ [dump] original_error1 => original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_class<ns::template_class<int>>{ member_var= 5, member_func()= "This is a member_func." } +[dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/color_variable_clang_original.txt b/test/txt/color_variable_clang_original.txt index c185b3de..b2b87305 100644 --- a/test/txt/color_variable_clang_original.txt +++ b/test/txt/color_variable_clang_original.txt @@ -1,4 +1,4 @@ [dump] original_error1 => original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_class>{ member_var= 5, member_func()= "This is a member_func." } +[dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/color_variable_gnu_by_syntax.txt b/test/txt/color_variable_gnu_by_syntax.txt index e0821ed4..dafcba41 100644 --- a/test/txt/color_variable_gnu_by_syntax.txt +++ b/test/txt/color_variable_gnu_by_syntax.txt @@ -1,4 +1,4 @@ [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_class<ns::template_class<int> >{ member_var= 5, member_func()= "This is a member_func." } +[dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => main(int, char**)::original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/color_variable_gnu_original.txt b/test/txt/color_variable_gnu_original.txt index 7a3f9acd..9701fde0 100644 --- a/test/txt/color_variable_gnu_original.txt +++ b/test/txt/color_variable_gnu_original.txt @@ -1,4 +1,4 @@ [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } +[dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => main(int, char**)::original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/color_variable_msvc_by_syntax.txt b/test/txt/color_variable_msvc_by_syntax.txt index edb15ac8..cedd9c29 100644 --- a/test/txt/color_variable_msvc_by_syntax.txt +++ b/test/txt/color_variable_msvc_by_syntax.txt @@ -1,4 +1,4 @@ [dump] original_error1 => main::original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_class<ns::template_class<int> >{ member_var= 5, member_func()= "This is a member_func." } +[dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => main::original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/color_variable_msvc_original.txt b/test/txt/color_variable_msvc_original.txt index d0e6c8a1..497990ac 100644 --- a/test/txt/color_variable_msvc_original.txt +++ b/test/txt/color_variable_msvc_original.txt @@ -1,4 +1,4 @@ [dump] original_error1 => main::original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } +[dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => main::original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/dump_variable_clang.txt b/test/txt/dump_variable_clang.txt index 3ba927f1..1defaece 100644 --- a/test/txt/dump_variable_clang.txt +++ b/test/txt/dump_variable_clang.txt @@ -1,4 +1,4 @@ [dump] original_error1 => original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_class>{ member_var= 5, member_func()= "This is a member_func." } +[dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/dump_variable_gnu.txt b/test/txt/dump_variable_gnu.txt index 1bc2916f..72b1fd9e 100644 --- a/test/txt/dump_variable_gnu.txt +++ b/test/txt/dump_variable_gnu.txt @@ -1,4 +1,4 @@ [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } +[dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => main(int, char**)::original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/dump_variable_msvc.txt b/test/txt/dump_variable_msvc.txt index 63fbdfd3..caa097b9 100644 --- a/test/txt/dump_variable_msvc.txt +++ b/test/txt/dump_variable_msvc.txt @@ -1,4 +1,4 @@ [dump] original_error1 => main::original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } +[dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => main::original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type From f67a8ec6388ad7850975d83944fec9b4c5f7317a Mon Sep 17 00:00:00 2001 From: philip82148 <92205270+philip82148@users.noreply.github.com> Date: Tue, 24 Sep 2024 01:46:54 +0900 Subject: [PATCH 03/25] add support for exporting typename_style_t --- cpp-dump/hpp/export_var/export_enum.hpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cpp-dump/hpp/export_var/export_enum.hpp b/cpp-dump/hpp/export_var/export_enum.hpp index 023bb30a..80d44812 100644 --- a/cpp-dump/hpp/export_var/export_enum.hpp +++ b/cpp-dump/hpp/export_var/export_enum.hpp @@ -70,3 +70,9 @@ CPP_DUMP_DEFINE_EXPORT_ENUM( cpp_dump::types::cont_indent_style_t::when_non_tuples_nested, cpp_dump::types::cont_indent_style_t::always ); +CPP_DUMP_DEFINE_EXPORT_ENUM( + cpp_dump::types::typename_style_t, + cpp_dump::types::typename_style_t::no_temp_args, + cpp_dump::types::typename_style_t::fullname, + cpp_dump::types::typename_style_t::maximum20 +); From 3c65ed242d0f9f9b33838ffe9c3df50a56634c87 Mon Sep 17 00:00:00 2001 From: philip82148 <92205270+philip82148@users.noreply.github.com> Date: Tue, 24 Sep 2024 01:53:36 +0900 Subject: [PATCH 04/25] enhance test --- test/dump_non_variable_test.cpp | 6 ++++++ test/dump_variable_test.cpp | 15 +++++++++++---- test/txt/color_variable_clang_by_syntax.txt | 11 +++++++++++ test/txt/color_variable_clang_original.txt | 11 +++++++++++ test/txt/color_variable_gnu_by_syntax.txt | 11 +++++++++++ test/txt/color_variable_gnu_original.txt | 11 +++++++++++ test/txt/dump_non_variable.txt | 4 ++++ test/txt/dump_variable_clang.txt | 11 +++++++++++ test/txt/dump_variable_gnu.txt | 11 +++++++++++ 9 files changed, 87 insertions(+), 4 deletions(-) diff --git a/test/dump_non_variable_test.cpp b/test/dump_non_variable_test.cpp index 08bb7f31..9dea8c31 100644 --- a/test/dump_non_variable_test.cpp +++ b/test/dump_non_variable_test.cpp @@ -417,6 +417,12 @@ int main(int argc, char *argv[]) { cp::types::cont_indent_style_t::always, cp::options::cont_indent_style ); + cpp_dump( + cp::types::typename_style_t::no_temp_args, + cp::types::typename_style_t::fullname, + cp::types::typename_style_t::maximum20, + cp::options::typename_style + ); // index, front, back, middle, both_ends array array50; diff --git a/test/dump_variable_test.cpp b/test/dump_variable_test.cpp index a60c8a35..699cdf76 100644 --- a/test/dump_variable_test.cpp +++ b/test/dump_variable_test.cpp @@ -78,10 +78,17 @@ int main(int argc, char *argv[]) { std::string member_func() { return "This is a member_func."; } }; - cpp_dump(original_error1); - cpp_dump(ns::template_class>()); - cpp_dump(original_class()); - cpp_dump(unsupported_original_class()); + for (auto style : + {cpp_dump::types::typename_style_t::no_temp_args, + cpp_dump::types::typename_style_t::maximum20, + cpp_dump::types::typename_style_t::fullname}) { + CPP_DUMP_SET_OPTION(typename_style, style); + cpp_dump(cpp_dump::options::typename_style); + cpp_dump(original_error1); + cpp_dump(ns::template_class>()); + cpp_dump(original_class()); + cpp_dump(unsupported_original_class()); + } } else { // pointer const void *void_ptr = (void *)0x7ffd06586204; diff --git a/test/txt/color_variable_clang_by_syntax.txt b/test/txt/color_variable_clang_by_syntax.txt index dcfc6ff7..514c62fb 100644 --- a/test/txt/color_variable_clang_by_syntax.txt +++ b/test/txt/color_variable_clang_by_syntax.txt @@ -1,4 +1,15 @@ +[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::no_temp_args [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type +[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::maximum20 +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_class<n{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] unsupported_original_class() => Unsupported Type +[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::fullname +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_class<ns::template_class<int>>{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/color_variable_clang_original.txt b/test/txt/color_variable_clang_original.txt index b2b87305..fb3eda01 100644 --- a/test/txt/color_variable_clang_original.txt +++ b/test/txt/color_variable_clang_original.txt @@ -1,4 +1,15 @@ +[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::no_temp_args [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type +[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::maximum20 +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_class original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] unsupported_original_class() => Unsupported Type +[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::fullname +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_class>{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/color_variable_gnu_by_syntax.txt b/test/txt/color_variable_gnu_by_syntax.txt index dafcba41..368dc73d 100644 --- a/test/txt/color_variable_gnu_by_syntax.txt +++ b/test/txt/color_variable_gnu_by_syntax.txt @@ -1,4 +1,15 @@ +[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::no_temp_args [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => main(int, char**)::original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type +[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::maximum20 +[dump] original_error1 => main(int, char**)::o{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_class<n{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_class() => main(int, char**)::o{ member_var= 5, member_func()= "This is a member_func." } +[dump] unsupported_original_class() => Unsupported Type +[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::fullname +[dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_class<ns::template_class<int> >{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_class() => main(int, char**)::original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/color_variable_gnu_original.txt b/test/txt/color_variable_gnu_original.txt index 9701fde0..c0cec76e 100644 --- a/test/txt/color_variable_gnu_original.txt +++ b/test/txt/color_variable_gnu_original.txt @@ -1,4 +1,15 @@ +[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::no_temp_args [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => main(int, char**)::original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type +[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::maximum20 +[dump] original_error1 => main(int, char**)::o{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_class main(int, char**)::o{ member_var= 5, member_func()= "This is a member_func." } +[dump] unsupported_original_class() => Unsupported Type +[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::fullname +[dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_class() => main(int, char**)::original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/dump_non_variable.txt b/test/txt/dump_non_variable.txt index 800879e0..c2e09aee 100644 --- a/test/txt/dump_non_variable.txt +++ b/test/txt/dump_non_variable.txt @@ -420,6 +420,10 @@ here.`, cp::types::cont_indent_style_t::when_non_tuples_nested => cpp_dump::types::cont_indent_style_t::when_non_tuples_nested, cp::types::cont_indent_style_t::always => cpp_dump::types::cont_indent_style_t::always, cp::options::cont_indent_style => cpp_dump::types::cont_indent_style_t::when_nested +[dump] cp::types::typename_style_t::no_temp_args => cpp_dump::types::typename_style_t::no_temp_args, + cp::types::typename_style_t::fullname => cpp_dump::types::typename_style_t::fullname, + cp::types::typename_style_t::maximum20 => cpp_dump::types::typename_style_t::maximum20, + cp::options::typename_style => cpp_dump::types::typename_style_t::no_temp_args [dump] array50 => [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ... ], map50 => { 0: 1, 1: 2, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, ... }, diff --git a/test/txt/dump_variable_clang.txt b/test/txt/dump_variable_clang.txt index 1defaece..c4d62ae3 100644 --- a/test/txt/dump_variable_clang.txt +++ b/test/txt/dump_variable_clang.txt @@ -1,4 +1,15 @@ +[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::no_temp_args [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type +[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::maximum20 +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_class original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] unsupported_original_class() => Unsupported Type +[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::fullname +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_class>{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/dump_variable_gnu.txt b/test/txt/dump_variable_gnu.txt index 72b1fd9e..e970a4c7 100644 --- a/test/txt/dump_variable_gnu.txt +++ b/test/txt/dump_variable_gnu.txt @@ -1,4 +1,15 @@ +[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::no_temp_args [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => main(int, char**)::original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type +[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::maximum20 +[dump] original_error1 => main(int, char**)::o{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_class main(int, char**)::o{ member_var= 5, member_func()= "This is a member_func." } +[dump] unsupported_original_class() => Unsupported Type +[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::fullname +[dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_class() => main(int, char**)::original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] unsupported_original_class() => Unsupported Type From db643dc277b8da9432e5f44e97dd123386050f4a Mon Sep 17 00:00:00 2001 From: philip82148 <92205270+philip82148@users.noreply.github.com> Date: Tue, 24 Sep 2024 02:07:03 +0900 Subject: [PATCH 05/25] improve styled_typename_str() --- cpp-dump/hpp/export_var/export_exception.hpp | 2 +- cpp-dump/hpp/export_var/export_object.hpp | 2 +- .../hpp/export_var/export_object_generic.hpp | 2 +- cpp-dump/hpp/type_name.hpp | 24 ++++++++++++++----- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/cpp-dump/hpp/export_var/export_exception.hpp b/cpp-dump/hpp/export_var/export_exception.hpp index a32ec7a1..6b1396fc 100644 --- a/cpp-dump/hpp/export_var/export_exception.hpp +++ b/cpp-dump/hpp/export_var/export_exception.hpp @@ -29,7 +29,7 @@ inline auto export_exception( bool fail_on_newline, const export_command &command ) -> std::enable_if_t, std::string> { - std::string class_name = es::class_name(styled_typename()); + std::string class_name = styled_typename(); _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; diff --git a/cpp-dump/hpp/export_var/export_object.hpp b/cpp-dump/hpp/export_var/export_object.hpp index a9764982..0df1b61b 100644 --- a/cpp-dump/hpp/export_var/export_object.hpp +++ b/cpp-dump/hpp/export_var/export_object.hpp @@ -39,7 +39,7 @@ bool fail_on_newline, \ const export_command &command \ ) { \ - std::string class_name = es::class_name(styled_typename_str(#TYPE)); \ + std::string class_name = styled_typename_str(#TYPE); \ \ _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; \ \ diff --git a/cpp-dump/hpp/export_var/export_object_generic.hpp b/cpp-dump/hpp/export_var/export_object_generic.hpp index d0d06ffe..80883f31 100644 --- a/cpp-dump/hpp/export_var/export_object_generic.hpp +++ b/cpp-dump/hpp/export_var/export_object_generic.hpp @@ -37,7 +37,7 @@ bool fail_on_newline, \ const export_command &command \ ) -> decltype(_p_CPP_DUMP_EXPAND_VA(_p_CPP_DUMP_EXPAND_FOR_EXPORT_OBJECT_GENERIC, __VA_ARGS__), std::string()) { \ - std::string class_name = es::class_name(styled_typename()); \ + std::string class_name = styled_typename(); \ \ _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; \ \ diff --git a/cpp-dump/hpp/type_name.hpp b/cpp-dump/hpp/type_name.hpp index b63568fe..53799b27 100644 --- a/cpp-dump/hpp/type_name.hpp +++ b/cpp-dump/hpp/type_name.hpp @@ -10,6 +10,7 @@ #include #include +#include "./escape_sequence.hpp" #include "./options.hpp" #include "./type_check.hpp" @@ -61,24 +62,35 @@ std::string _get_typename() { return type_name; } -inline std::string_view styled_typename_str(std::string_view type_name) { +inline std::string styled_typename_str(std::string_view type_name) { switch (options::typename_style) { case types::typename_style_t::no_temp_args: { - auto lt_pos = type_name.find('<'); - return type_name.substr(0, lt_pos); + std::string typename_no_arg; + int lt_count = 0; + for (auto c : type_name) { + if (c == '<') { + ++lt_count; + } else if (c == '>') { + --lt_count; + } else if (lt_count == 0) { + typename_no_arg.push_back(c); + } + } + return es::class_name(typename_no_arg); } case types::typename_style_t::maximum20: { - return type_name.substr(0, 20); + if (type_name.size() <= 20) return es::class_name(type_name); + return es::class_name(type_name.substr(0, 17)) + es::op("..."); } default: { - return type_name; + return es::class_name(type_name); } } } // Currently, used only by export_exception() and CPP_DUMP_DEFINE_EXPORT_OBJECT_GENERIC() template -inline std::string_view styled_typename() { +inline std::string styled_typename() { static std::string type_name = _get_typename(); return styled_typename_str(type_name); } From a0273219b6f1e40629175f842a9d916a0ce36855 Mon Sep 17 00:00:00 2001 From: philip82148 <92205270+philip82148@users.noreply.github.com> Date: Tue, 24 Sep 2024 02:18:56 +0900 Subject: [PATCH 06/25] update test txts --- test/txt/color_variable_clang_by_syntax.txt | 2 +- test/txt/color_variable_clang_original.txt | 2 +- test/txt/color_variable_gnu_by_syntax.txt | 6 +++--- test/txt/color_variable_gnu_original.txt | 6 +++--- test/txt/color_variable_msvc_by_syntax.txt | 11 +++++++++++ test/txt/color_variable_msvc_original.txt | 11 +++++++++++ test/txt/dump_variable_clang.txt | 2 +- test/txt/dump_variable_gnu.txt | 6 +++--- test/txt/dump_variable_msvc.txt | 11 +++++++++++ 9 files changed, 45 insertions(+), 12 deletions(-) diff --git a/test/txt/color_variable_clang_by_syntax.txt b/test/txt/color_variable_clang_by_syntax.txt index 514c62fb..b52a64ca 100644 --- a/test/txt/color_variable_clang_by_syntax.txt +++ b/test/txt/color_variable_clang_by_syntax.txt @@ -5,7 +5,7 @@ [dump] unsupported_original_class() => Unsupported Type [dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::maximum20 [dump] original_error1 => original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_class<n{ member_var= 5, member_func()= "This is a member_func." } +[dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type [dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::fullname diff --git a/test/txt/color_variable_clang_original.txt b/test/txt/color_variable_clang_original.txt index fb3eda01..e5e4e7cc 100644 --- a/test/txt/color_variable_clang_original.txt +++ b/test/txt/color_variable_clang_original.txt @@ -5,7 +5,7 @@ [dump] unsupported_original_class() => Unsupported Type [dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::maximum20 [dump] original_error1 => original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type [dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::fullname diff --git a/test/txt/color_variable_gnu_by_syntax.txt b/test/txt/color_variable_gnu_by_syntax.txt index 368dc73d..81d74134 100644 --- a/test/txt/color_variable_gnu_by_syntax.txt +++ b/test/txt/color_variable_gnu_by_syntax.txt @@ -4,9 +4,9 @@ [dump] original_class() => main(int, char**)::original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type [dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::maximum20 -[dump] original_error1 => main(int, char**)::o{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_class<n{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => main(int, char**)::o{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type [dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::fullname [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } diff --git a/test/txt/color_variable_gnu_original.txt b/test/txt/color_variable_gnu_original.txt index c0cec76e..ed976aa8 100644 --- a/test/txt/color_variable_gnu_original.txt +++ b/test/txt/color_variable_gnu_original.txt @@ -4,9 +4,9 @@ [dump] original_class() => main(int, char**)::original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type [dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::maximum20 -[dump] original_error1 => main(int, char**)::o{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_class main(int, char**)::o{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type [dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::fullname [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } diff --git a/test/txt/color_variable_msvc_by_syntax.txt b/test/txt/color_variable_msvc_by_syntax.txt index cedd9c29..c9ba0c6d 100644 --- a/test/txt/color_variable_msvc_by_syntax.txt +++ b/test/txt/color_variable_msvc_by_syntax.txt @@ -1,4 +1,15 @@ +[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::no_temp_args [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => main::original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type +[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::maximum20 +[dump] original_error1 => main...{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_class() => main...{ member_var= 5, member_func()= "This is a member_func." } +[dump] unsupported_original_class() => Unsupported Type +[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::fullname +[dump] original_error1 => main::original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_class<ns::template_class<int> >{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_class() => main::original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/color_variable_msvc_original.txt b/test/txt/color_variable_msvc_original.txt index 497990ac..6578bbc7 100644 --- a/test/txt/color_variable_msvc_original.txt +++ b/test/txt/color_variable_msvc_original.txt @@ -1,4 +1,15 @@ +[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::no_temp_args [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => main::original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type +[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::maximum20 +[dump] original_error1 => main...{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_class() => main...{ member_var= 5, member_func()= "This is a member_func." } +[dump] unsupported_original_class() => Unsupported Type +[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::fullname +[dump] original_error1 => main::original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_class() => main::original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/dump_variable_clang.txt b/test/txt/dump_variable_clang.txt index c4d62ae3..a4a33bc6 100644 --- a/test/txt/dump_variable_clang.txt +++ b/test/txt/dump_variable_clang.txt @@ -5,7 +5,7 @@ [dump] unsupported_original_class() => Unsupported Type [dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::maximum20 [dump] original_error1 => original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type [dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::fullname diff --git a/test/txt/dump_variable_gnu.txt b/test/txt/dump_variable_gnu.txt index e970a4c7..8e67088c 100644 --- a/test/txt/dump_variable_gnu.txt +++ b/test/txt/dump_variable_gnu.txt @@ -4,9 +4,9 @@ [dump] original_class() => main(int, char**)::original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type [dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::maximum20 -[dump] original_error1 => main(int, char**)::o{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_class main(int, char**)::o{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type [dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::fullname [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } diff --git a/test/txt/dump_variable_msvc.txt b/test/txt/dump_variable_msvc.txt index caa097b9..889aabdd 100644 --- a/test/txt/dump_variable_msvc.txt +++ b/test/txt/dump_variable_msvc.txt @@ -1,4 +1,15 @@ +[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::no_temp_args [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => main::original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type +[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::maximum20 +[dump] original_error1 => main...{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_class() => main...{ member_var= 5, member_func()= "This is a member_func." } +[dump] unsupported_original_class() => Unsupported Type +[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::fullname +[dump] original_error1 => main::original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_class() => main::original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] unsupported_original_class() => Unsupported Type From 27c685d54b9b4a2e77c5fa0fd9fc04d6052a1cc7 Mon Sep 17 00:00:00 2001 From: philip82148 <92205270+philip82148@users.noreply.github.com> Date: Tue, 24 Sep 2024 02:28:50 +0900 Subject: [PATCH 07/25] rename typename_style -> classname_style --- .../hpp/{type_name.hpp => class_name.hpp} | 36 ++++++++++--------- cpp-dump/hpp/export_var/export_enum.hpp | 8 ++--- cpp-dump/hpp/export_var/export_exception.hpp | 4 +-- cpp-dump/hpp/export_var/export_object.hpp | 4 +-- .../hpp/export_var/export_object_generic.hpp | 4 +-- cpp-dump/hpp/options.hpp | 4 +-- test/dump_non_variable_test.cpp | 8 ++--- test/dump_variable_test.cpp | 10 +++--- 8 files changed, 40 insertions(+), 38 deletions(-) rename cpp-dump/hpp/{type_name.hpp => class_name.hpp} (68%) diff --git a/cpp-dump/hpp/type_name.hpp b/cpp-dump/hpp/class_name.hpp similarity index 68% rename from cpp-dump/hpp/type_name.hpp rename to cpp-dump/hpp/class_name.hpp index 53799b27..6dd579a3 100644 --- a/cpp-dump/hpp/type_name.hpp +++ b/cpp-dump/hpp/class_name.hpp @@ -20,7 +20,7 @@ namespace _detail { // The return type must be a built-in type, otherwise we don't know how it will be stringified. template -const char* _get_typename_aux() { +const char* _get_classname_aux() { #if defined(__GNUC__) && !defined(__clang__) return __PRETTY_FUNCTION__; #elif defined(__clang__) @@ -33,38 +33,40 @@ const char* _get_typename_aux() { } template -std::string _get_typename() { +std::string _get_classname() { #if defined(__GNUC__) && !defined(__clang__) constexpr std::size_t prefix_length = - std::string_view("const char* cpp_dump::_detail::_get_typename_aux() [with T = ").size(); + std::string_view("const char* cpp_dump::_detail::_get_classname_aux() [with T = ").size(); constexpr std::size_t suffix_length = std::string_view("]").size(); #elif defined(__clang__) constexpr std::size_t prefix_length = - std::string_view("const char *cpp_dump::_detail::_get_typename_aux() [T = ").size(); + std::string_view("const char *cpp_dump::_detail::_get_classname_aux() [T = ").size(); constexpr std::size_t suffix_length = std::string_view("]").size(); #elif defined(_MSC_VER) constexpr std::size_t prefix_length = - std::string_view("const char *__cdecl cpp_dump::_detail::_get_typename_aux<").size(); + std::string_view("const char *__cdecl cpp_dump::_detail::_get_classname_aux<").size(); constexpr std::size_t suffix_length = std::string_view(">(void)").size(); #else constexpr std::size_t prefix_length = 0; constexpr std::size_t suffix_length = 0; #endif - std::string_view func_name = _get_typename_aux<_remove_cvref>(); - std::string type_name(func_name, prefix_length, func_name.size() - prefix_length - suffix_length); + std::string_view func_name = _get_classname_aux<_remove_cvref>(); + std::string class_name( + func_name, prefix_length, func_name.size() - prefix_length - suffix_length + ); #if defined(_MSC_VER) - type_name = replace_string(type_name, "struct ", ""); - type_name = replace_string(type_name, "class ", ""); + class_name = replace_string(class_name, "struct ", ""); + class_name = replace_string(class_name, "class ", ""); #endif - return type_name; + return class_name; } -inline std::string styled_typename_str(std::string_view type_name) { - switch (options::typename_style) { - case types::typename_style_t::no_temp_args: { +inline std::string styled_classname_str(std::string_view type_name) { + switch (options::classname_style) { + case types::classname_style_t::no_temp_args: { std::string typename_no_arg; int lt_count = 0; for (auto c : type_name) { @@ -78,7 +80,7 @@ inline std::string styled_typename_str(std::string_view type_name) { } return es::class_name(typename_no_arg); } - case types::typename_style_t::maximum20: { + case types::classname_style_t::maximum20: { if (type_name.size() <= 20) return es::class_name(type_name); return es::class_name(type_name.substr(0, 17)) + es::op("..."); } @@ -90,9 +92,9 @@ inline std::string styled_typename_str(std::string_view type_name) { // Currently, used only by export_exception() and CPP_DUMP_DEFINE_EXPORT_OBJECT_GENERIC() template -inline std::string styled_typename() { - static std::string type_name = _get_typename(); - return styled_typename_str(type_name); +inline std::string styled_classname() { + static std::string class_name = _get_classname(); + return styled_classname_str(class_name); } } // namespace _detail diff --git a/cpp-dump/hpp/export_var/export_enum.hpp b/cpp-dump/hpp/export_var/export_enum.hpp index 80d44812..cf02d70d 100644 --- a/cpp-dump/hpp/export_var/export_enum.hpp +++ b/cpp-dump/hpp/export_var/export_enum.hpp @@ -71,8 +71,8 @@ CPP_DUMP_DEFINE_EXPORT_ENUM( cpp_dump::types::cont_indent_style_t::always ); CPP_DUMP_DEFINE_EXPORT_ENUM( - cpp_dump::types::typename_style_t, - cpp_dump::types::typename_style_t::no_temp_args, - cpp_dump::types::typename_style_t::fullname, - cpp_dump::types::typename_style_t::maximum20 + cpp_dump::types::classname_style_t, + cpp_dump::types::classname_style_t::no_temp_args, + cpp_dump::types::classname_style_t::fullname, + cpp_dump::types::classname_style_t::maximum20 ); diff --git a/cpp-dump/hpp/export_var/export_exception.hpp b/cpp-dump/hpp/export_var/export_exception.hpp index 6b1396fc..b1f98567 100644 --- a/cpp-dump/hpp/export_var/export_exception.hpp +++ b/cpp-dump/hpp/export_var/export_exception.hpp @@ -10,10 +10,10 @@ #include #include +#include "../class_name.hpp" #include "../escape_sequence.hpp" #include "../export_command/export_command.hpp" #include "../type_check.hpp" -#include "../type_name.hpp" #include "./export_object_common.hpp" namespace cpp_dump { @@ -29,7 +29,7 @@ inline auto export_exception( bool fail_on_newline, const export_command &command ) -> std::enable_if_t, std::string> { - std::string class_name = styled_typename(); + std::string class_name = styled_classname(); _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; diff --git a/cpp-dump/hpp/export_var/export_object.hpp b/cpp-dump/hpp/export_var/export_object.hpp index 0df1b61b..82108b16 100644 --- a/cpp-dump/hpp/export_var/export_object.hpp +++ b/cpp-dump/hpp/export_var/export_object.hpp @@ -9,11 +9,11 @@ #include +#include "../class_name.hpp" #include "../escape_sequence.hpp" #include "../expand_va_macro.hpp" #include "../export_command/export_command.hpp" #include "../type_check.hpp" -#include "../type_name.hpp" #include "./export_object_common.hpp" #define _p_CPP_DUMP_EXPAND_FOR_EXPORT_OBJECT(member) append_output(#member, value.member) @@ -39,7 +39,7 @@ bool fail_on_newline, \ const export_command &command \ ) { \ - std::string class_name = styled_typename_str(#TYPE); \ + std::string class_name = styled_classname_str(#TYPE); \ \ _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; \ \ diff --git a/cpp-dump/hpp/export_var/export_object_generic.hpp b/cpp-dump/hpp/export_var/export_object_generic.hpp index 80883f31..12b571d5 100644 --- a/cpp-dump/hpp/export_var/export_object_generic.hpp +++ b/cpp-dump/hpp/export_var/export_object_generic.hpp @@ -9,10 +9,10 @@ #include +#include "../class_name.hpp" #include "../escape_sequence.hpp" #include "../expand_va_macro.hpp" #include "../export_command/export_command.hpp" -#include "../type_name.hpp" #include "./export_object_common.hpp" #define _p_CPP_DUMP_EXPAND_FOR_EXPORT_OBJECT_GENERIC(member) value.member @@ -37,7 +37,7 @@ bool fail_on_newline, \ const export_command &command \ ) -> decltype(_p_CPP_DUMP_EXPAND_VA(_p_CPP_DUMP_EXPAND_FOR_EXPORT_OBJECT_GENERIC, __VA_ARGS__), std::string()) { \ - std::string class_name = styled_typename(); \ + std::string class_name = styled_classname(); \ \ _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; \ \ diff --git a/cpp-dump/hpp/options.hpp b/cpp-dump/hpp/options.hpp index e7eb7a29..218046d3 100644 --- a/cpp-dump/hpp/options.hpp +++ b/cpp-dump/hpp/options.hpp @@ -61,7 +61,7 @@ enum class cont_indent_style_t { minimal, when_nested, when_non_tuples_nested, a * cpp_dump::export_var() supports this type. * This is an experimental feature. */ -enum class typename_style_t { no_temp_args, fullname, maximum20 }; +enum class classname_style_t { no_temp_args, fullname, maximum20 }; /** * Type of cpp_dump::options::es_style. @@ -135,7 +135,7 @@ inline types::log_label_func_t log_label_func = log_label::default_func; * Style of class name. * This is an experimental feature. */ -inline types::typename_style_t typename_style = types::typename_style_t::no_temp_args; +inline types::classname_style_t classname_style = types::classname_style_t::no_temp_args; /** * Style of the escape sequences (output coloring). diff --git a/test/dump_non_variable_test.cpp b/test/dump_non_variable_test.cpp index 9dea8c31..c58ba2dc 100644 --- a/test/dump_non_variable_test.cpp +++ b/test/dump_non_variable_test.cpp @@ -418,10 +418,10 @@ int main(int argc, char *argv[]) { cp::options::cont_indent_style ); cpp_dump( - cp::types::typename_style_t::no_temp_args, - cp::types::typename_style_t::fullname, - cp::types::typename_style_t::maximum20, - cp::options::typename_style + cp::types::classname_style_t::no_temp_args, + cp::types::classname_style_t::fullname, + cp::types::classname_style_t::maximum20, + cp::options::classname_style ); // index, front, back, middle, both_ends diff --git a/test/dump_variable_test.cpp b/test/dump_variable_test.cpp index 699cdf76..20349f86 100644 --- a/test/dump_variable_test.cpp +++ b/test/dump_variable_test.cpp @@ -79,11 +79,11 @@ int main(int argc, char *argv[]) { }; for (auto style : - {cpp_dump::types::typename_style_t::no_temp_args, - cpp_dump::types::typename_style_t::maximum20, - cpp_dump::types::typename_style_t::fullname}) { - CPP_DUMP_SET_OPTION(typename_style, style); - cpp_dump(cpp_dump::options::typename_style); + {cpp_dump::types::classname_style_t::no_temp_args, + cpp_dump::types::classname_style_t::maximum20, + cpp_dump::types::classname_style_t::fullname}) { + CPP_DUMP_SET_OPTION(classname_style, style); + cpp_dump(cpp_dump::options::classname_style); cpp_dump(original_error1); cpp_dump(ns::template_class>()); cpp_dump(original_class()); From 2cfe3d68a29c12cebf29c6d798d114cc841327db Mon Sep 17 00:00:00 2001 From: philip82148 <92205270+philip82148@users.noreply.github.com> Date: Tue, 24 Sep 2024 02:30:40 +0900 Subject: [PATCH 08/25] update test txts --- test/txt/color_variable_clang_by_syntax.txt | 6 +++--- test/txt/color_variable_clang_original.txt | 6 +++--- test/txt/color_variable_gnu_by_syntax.txt | 6 +++--- test/txt/color_variable_gnu_original.txt | 6 +++--- test/txt/color_variable_msvc_by_syntax.txt | 10 +++++----- test/txt/color_variable_msvc_original.txt | 10 +++++----- test/txt/dump_non_variable.txt | 8 ++++---- test/txt/dump_variable_clang.txt | 6 +++--- test/txt/dump_variable_gnu.txt | 6 +++--- test/txt/dump_variable_msvc.txt | 10 +++++----- 10 files changed, 37 insertions(+), 37 deletions(-) diff --git a/test/txt/color_variable_clang_by_syntax.txt b/test/txt/color_variable_clang_by_syntax.txt index b52a64ca..2d697f52 100644 --- a/test/txt/color_variable_clang_by_syntax.txt +++ b/test/txt/color_variable_clang_by_syntax.txt @@ -1,14 +1,14 @@ -[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::no_temp_args +[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::no_temp_args [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::maximum20 +[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::maximum20 [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::fullname +[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::fullname [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class<ns::template_class<int>>{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/color_variable_clang_original.txt b/test/txt/color_variable_clang_original.txt index e5e4e7cc..4dc35b01 100644 --- a/test/txt/color_variable_clang_original.txt +++ b/test/txt/color_variable_clang_original.txt @@ -1,14 +1,14 @@ -[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::no_temp_args +[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::no_temp_args [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::maximum20 +[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::maximum20 [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::fullname +[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::fullname [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class>{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/color_variable_gnu_by_syntax.txt b/test/txt/color_variable_gnu_by_syntax.txt index 81d74134..6a60b9a5 100644 --- a/test/txt/color_variable_gnu_by_syntax.txt +++ b/test/txt/color_variable_gnu_by_syntax.txt @@ -1,14 +1,14 @@ -[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::no_temp_args +[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::no_temp_args [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => main(int, char**)::original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::maximum20 +[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::maximum20 [dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::fullname +[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::fullname [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class<ns::template_class<int> >{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => main(int, char**)::original_class{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/color_variable_gnu_original.txt b/test/txt/color_variable_gnu_original.txt index ed976aa8..94c8b878 100644 --- a/test/txt/color_variable_gnu_original.txt +++ b/test/txt/color_variable_gnu_original.txt @@ -1,14 +1,14 @@ -[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::no_temp_args +[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::no_temp_args [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => main(int, char**)::original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::maximum20 +[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::maximum20 [dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::fullname +[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::fullname [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => main(int, char**)::original_class{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/color_variable_msvc_by_syntax.txt b/test/txt/color_variable_msvc_by_syntax.txt index c9ba0c6d..4f747c87 100644 --- a/test/txt/color_variable_msvc_by_syntax.txt +++ b/test/txt/color_variable_msvc_by_syntax.txt @@ -1,14 +1,14 @@ -[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::no_temp_args +[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::no_temp_args [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => main::original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::maximum20 -[dump] original_error1 => main...{ what()= "This is an original error." } +[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::maximum20 +[dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => main...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_class() => main::original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::fullname +[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::fullname [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class<ns::template_class<int> >{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => main::original_class{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/color_variable_msvc_original.txt b/test/txt/color_variable_msvc_original.txt index 6578bbc7..7880ec1f 100644 --- a/test/txt/color_variable_msvc_original.txt +++ b/test/txt/color_variable_msvc_original.txt @@ -1,14 +1,14 @@ -[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::no_temp_args +[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::no_temp_args [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => main::original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::maximum20 -[dump] original_error1 => main...{ what()= "This is an original error." } +[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::maximum20 +[dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => main...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_class() => main::original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::fullname +[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::fullname [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => main::original_class{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/dump_non_variable.txt b/test/txt/dump_non_variable.txt index c2e09aee..5b9fb7ee 100644 --- a/test/txt/dump_non_variable.txt +++ b/test/txt/dump_non_variable.txt @@ -420,10 +420,10 @@ here.`, cp::types::cont_indent_style_t::when_non_tuples_nested => cpp_dump::types::cont_indent_style_t::when_non_tuples_nested, cp::types::cont_indent_style_t::always => cpp_dump::types::cont_indent_style_t::always, cp::options::cont_indent_style => cpp_dump::types::cont_indent_style_t::when_nested -[dump] cp::types::typename_style_t::no_temp_args => cpp_dump::types::typename_style_t::no_temp_args, - cp::types::typename_style_t::fullname => cpp_dump::types::typename_style_t::fullname, - cp::types::typename_style_t::maximum20 => cpp_dump::types::typename_style_t::maximum20, - cp::options::typename_style => cpp_dump::types::typename_style_t::no_temp_args +[dump] cp::types::classname_style_t::no_temp_args => cpp_dump::types::classname_style_t::no_temp_args, + cp::types::classname_style_t::fullname => cpp_dump::types::classname_style_t::fullname, + cp::types::classname_style_t::maximum20 => cpp_dump::types::classname_style_t::maximum20, + cp::options::classname_style => cpp_dump::types::classname_style_t::no_temp_args [dump] array50 => [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ... ], map50 => { 0: 1, 1: 2, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, ... }, diff --git a/test/txt/dump_variable_clang.txt b/test/txt/dump_variable_clang.txt index a4a33bc6..8163db25 100644 --- a/test/txt/dump_variable_clang.txt +++ b/test/txt/dump_variable_clang.txt @@ -1,14 +1,14 @@ -[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::no_temp_args +[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::no_temp_args [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::maximum20 +[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::maximum20 [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::fullname +[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::fullname [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class>{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/dump_variable_gnu.txt b/test/txt/dump_variable_gnu.txt index 8e67088c..9beac722 100644 --- a/test/txt/dump_variable_gnu.txt +++ b/test/txt/dump_variable_gnu.txt @@ -1,14 +1,14 @@ -[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::no_temp_args +[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::no_temp_args [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => main(int, char**)::original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::maximum20 +[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::maximum20 [dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::fullname +[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::fullname [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => main(int, char**)::original_class{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/dump_variable_msvc.txt b/test/txt/dump_variable_msvc.txt index 889aabdd..9f479325 100644 --- a/test/txt/dump_variable_msvc.txt +++ b/test/txt/dump_variable_msvc.txt @@ -1,14 +1,14 @@ -[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::no_temp_args +[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::no_temp_args [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => main::original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::maximum20 -[dump] original_error1 => main...{ what()= "This is an original error." } +[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::maximum20 +[dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => main...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_class() => main::original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::typename_style => cpp_dump::types::typename_style_t::fullname +[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::fullname [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } [dump] original_class() => main::original_class{ member_var= 5, member_func()= "This is a member_func." } From 73abb10438a4a6ec93a4a1a4589504251a743f89 Mon Sep 17 00:00:00 2001 From: philip82148 <92205270+philip82148@users.noreply.github.com> Date: Wed, 25 Sep 2024 11:08:49 +0900 Subject: [PATCH 09/25] make classname_style unsigned int flag --- cpp-dump/hpp/class_name.hpp | 56 +++++++++++++++++-------- cpp-dump/hpp/export_var/export_enum.hpp | 6 --- cpp-dump/hpp/options.hpp | 22 ++++++---- test/dump_non_variable_test.cpp | 6 --- test/dump_variable_test.cpp | 9 ++-- 5 files changed, 56 insertions(+), 43 deletions(-) diff --git a/cpp-dump/hpp/class_name.hpp b/cpp-dump/hpp/class_name.hpp index 6dd579a3..92e9c273 100644 --- a/cpp-dump/hpp/class_name.hpp +++ b/cpp-dump/hpp/class_name.hpp @@ -7,6 +7,7 @@ #pragma once +#include #include #include @@ -65,29 +66,48 @@ std::string _get_classname() { } inline std::string styled_classname_str(std::string_view type_name) { - switch (options::classname_style) { - case types::classname_style_t::no_temp_args: { - std::string typename_no_arg; - int lt_count = 0; - for (auto c : type_name) { - if (c == '<') { - ++lt_count; - } else if (c == '>') { - --lt_count; - } else if (lt_count == 0) { - typename_no_arg.push_back(c); + std::string styled(type_name); + + if (options::classname_style & flags::classname_style::no_namespace) { + std::string no_ns; + no_ns.swap(styled); + std::reverse(no_ns.begin(), no_ns.end()); + int gt_count = 0; + for (std::size_t i = 0; i < no_ns.size(); ++i) { + if (no_ns[i] == '>') { + ++gt_count; + } else if (no_ns[i] == '<') { + --gt_count; + } else if (gt_count == 0) { + if (no_ns[i] == ':') { + no_ns.erase(i); + break; } } - return es::class_name(typename_no_arg); - } - case types::classname_style_t::maximum20: { - if (type_name.size() <= 20) return es::class_name(type_name); - return es::class_name(type_name.substr(0, 17)) + es::op("..."); } - default: { - return es::class_name(type_name); + std::reverse(no_ns.begin(), no_ns.end()); + styled.swap(no_ns); + } + + if (options::classname_style & flags::classname_style::no_temp_args) { + std::string no_args; + int lt_count = 0; + for (auto c : styled) { + if (c == '<') { + ++lt_count; + } else if (c == '>') { + --lt_count; + } else if (lt_count == 0) { + no_args.push_back(c); + } } + styled.swap(no_args); } + + if (options::classname_style & flags::classname_style::max_width_20 && styled.size() > 20) + return es::class_name(styled.substr(0, 17)) + es::op("..."); + + return es::class_name(styled); } // Currently, used only by export_exception() and CPP_DUMP_DEFINE_EXPORT_OBJECT_GENERIC() diff --git a/cpp-dump/hpp/export_var/export_enum.hpp b/cpp-dump/hpp/export_var/export_enum.hpp index cf02d70d..023bb30a 100644 --- a/cpp-dump/hpp/export_var/export_enum.hpp +++ b/cpp-dump/hpp/export_var/export_enum.hpp @@ -70,9 +70,3 @@ CPP_DUMP_DEFINE_EXPORT_ENUM( cpp_dump::types::cont_indent_style_t::when_non_tuples_nested, cpp_dump::types::cont_indent_style_t::always ); -CPP_DUMP_DEFINE_EXPORT_ENUM( - cpp_dump::types::classname_style_t, - cpp_dump::types::classname_style_t::no_temp_args, - cpp_dump::types::classname_style_t::fullname, - cpp_dump::types::classname_style_t::maximum20 -); diff --git a/cpp-dump/hpp/options.hpp b/cpp-dump/hpp/options.hpp index 218046d3..b79fa6ae 100644 --- a/cpp-dump/hpp/options.hpp +++ b/cpp-dump/hpp/options.hpp @@ -56,13 +56,6 @@ namespace types { */ enum class cont_indent_style_t { minimal, when_nested, when_non_tuples_nested, always }; -/** - * Type of cpp_dump::options::classname_style. - * cpp_dump::export_var() supports this type. - * This is an experimental feature. - */ -enum class classname_style_t { no_temp_args, fullname, maximum20 }; - /** * Type of cpp_dump::options::es_style. * cpp_dump::export_var() supports this type. @@ -92,6 +85,19 @@ struct es_value_t { } // namespace types +namespace flags { + +namespace classname_style { + +inline constexpr unsigned int fullname = 0; +inline constexpr unsigned int no_temp_args = 1u << 0; +inline constexpr unsigned int no_namespace = 1u << 1; +inline constexpr unsigned int max_width_20 = 1u << 2; + +}; // namespace classname_style + +} // namespace flags + namespace options { /** @@ -135,7 +141,7 @@ inline types::log_label_func_t log_label_func = log_label::default_func; * Style of class name. * This is an experimental feature. */ -inline types::classname_style_t classname_style = types::classname_style_t::no_temp_args; +inline unsigned int classname_style = flags::classname_style::no_temp_args; /** * Style of the escape sequences (output coloring). diff --git a/test/dump_non_variable_test.cpp b/test/dump_non_variable_test.cpp index c58ba2dc..08bb7f31 100644 --- a/test/dump_non_variable_test.cpp +++ b/test/dump_non_variable_test.cpp @@ -417,12 +417,6 @@ int main(int argc, char *argv[]) { cp::types::cont_indent_style_t::always, cp::options::cont_indent_style ); - cpp_dump( - cp::types::classname_style_t::no_temp_args, - cp::types::classname_style_t::fullname, - cp::types::classname_style_t::maximum20, - cp::options::classname_style - ); // index, front, back, middle, both_ends array array50; diff --git a/test/dump_variable_test.cpp b/test/dump_variable_test.cpp index 20349f86..2c5c1de8 100644 --- a/test/dump_variable_test.cpp +++ b/test/dump_variable_test.cpp @@ -78,12 +78,11 @@ int main(int argc, char *argv[]) { std::string member_func() { return "This is a member_func."; } }; - for (auto style : - {cpp_dump::types::classname_style_t::no_temp_args, - cpp_dump::types::classname_style_t::maximum20, - cpp_dump::types::classname_style_t::fullname}) { + rep(style, 1 << 3) { CPP_DUMP_SET_OPTION(classname_style, style); - cpp_dump(cpp_dump::options::classname_style); + cpp_dump(bool(cp::options::classname_style & cp::flags::classname_style::no_namespace)); + cpp_dump(bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args)); + cpp_dump(bool(cp::options::classname_style & cp::flags::classname_style::max_width_20)); cpp_dump(original_error1); cpp_dump(ns::template_class>()); cpp_dump(original_class()); From 5e81b7f61556e6de154812074b872224e4b60008 Mon Sep 17 00:00:00 2001 From: philip82148 <92205270+philip82148@users.noreply.github.com> Date: Wed, 25 Sep 2024 21:32:06 +0900 Subject: [PATCH 10/25] fix test --- cpp-dump/hpp/class_name.hpp | 3 ++- cpp-dump/hpp/export_var/export_enum_generic.hpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cpp-dump/hpp/class_name.hpp b/cpp-dump/hpp/class_name.hpp index 92e9c273..54e28883 100644 --- a/cpp-dump/hpp/class_name.hpp +++ b/cpp-dump/hpp/class_name.hpp @@ -52,7 +52,7 @@ std::string _get_classname() { constexpr std::size_t suffix_length = 0; #endif - std::string_view func_name = _get_classname_aux<_remove_cvref>(); + std::string_view func_name = _get_classname_aux>(); std::string class_name( func_name, prefix_length, func_name.size() - prefix_length - suffix_length ); @@ -60,6 +60,7 @@ std::string _get_classname() { #if defined(_MSC_VER) class_name = replace_string(class_name, "struct ", ""); class_name = replace_string(class_name, "class ", ""); + class_name = replace_string(class_name, "enum ", ""); #endif return class_name; diff --git a/cpp-dump/hpp/export_var/export_enum_generic.hpp b/cpp-dump/hpp/export_var/export_enum_generic.hpp index e577ec91..4638f724 100644 --- a/cpp-dump/hpp/export_var/export_enum_generic.hpp +++ b/cpp-dump/hpp/export_var/export_enum_generic.hpp @@ -10,10 +10,10 @@ #include #include +#include "../class_name.hpp" #include "../escape_sequence.hpp" #include "../expand_va_macro.hpp" #include "../export_command/export_command.hpp" -#include "../type_check.hpp" #define _p_CPP_DUMP_EXPAND_FOR_EXPORT_ENUM_GENERIC(member) T::member #define _p_CPP_DUMP_EXPAND_FOR_EXPORT_ENUM_GENERIC2(member) \ @@ -36,7 +36,7 @@ decltype(_p_CPP_DUMP_EXPAND_VA(_p_CPP_DUMP_EXPAND_FOR_EXPORT_ENUM_GENERIC, __VA_ARGS__), std::string())> { \ static const std::unordered_map enum_to_string{ \ _p_CPP_DUMP_EXPAND_VA(_p_CPP_DUMP_EXPAND_FOR_EXPORT_ENUM_GENERIC2, __VA_ARGS__)}; \ - return es::class_name(get_typename()) + es::op("::") \ + return styled_classname() + es::op("::") \ + (enum_to_string.count(value) ? es::member(enum_to_string.at(value)) \ : es::unsupported("?")); \ } \ From 91743aa83ec96acc3af2effbd540bb2d4a089a9b Mon Sep 17 00:00:00 2001 From: philip82148 <92205270+philip82148@users.noreply.github.com> Date: Wed, 25 Sep 2024 22:47:41 +0900 Subject: [PATCH 11/25] add support for removing namespace in temp args --- cpp-dump/hpp/class_name.hpp | 49 ++++++----- test/dump_variable_test.cpp | 29 +++---- test/txt/color_variable_clang_by_syntax.txt | 81 +++++++++++++++--- test/txt/color_variable_clang_original.txt | 81 +++++++++++++++--- test/txt/color_variable_gnu_by_syntax.txt | 91 +++++++++++++++++---- test/txt/color_variable_gnu_original.txt | 91 +++++++++++++++++---- test/txt/dump_non_variable.txt | 4 - test/txt/dump_variable_clang.txt | 81 +++++++++++++++--- test/txt/dump_variable_gnu.txt | 91 +++++++++++++++++---- 9 files changed, 480 insertions(+), 118 deletions(-) diff --git a/cpp-dump/hpp/class_name.hpp b/cpp-dump/hpp/class_name.hpp index 54e28883..f0e5bb1b 100644 --- a/cpp-dump/hpp/class_name.hpp +++ b/cpp-dump/hpp/class_name.hpp @@ -7,7 +7,7 @@ #pragma once -#include +#include #include #include @@ -69,27 +69,6 @@ std::string _get_classname() { inline std::string styled_classname_str(std::string_view type_name) { std::string styled(type_name); - if (options::classname_style & flags::classname_style::no_namespace) { - std::string no_ns; - no_ns.swap(styled); - std::reverse(no_ns.begin(), no_ns.end()); - int gt_count = 0; - for (std::size_t i = 0; i < no_ns.size(); ++i) { - if (no_ns[i] == '>') { - ++gt_count; - } else if (no_ns[i] == '<') { - --gt_count; - } else if (gt_count == 0) { - if (no_ns[i] == ':') { - no_ns.erase(i); - break; - } - } - } - std::reverse(no_ns.begin(), no_ns.end()); - styled.swap(no_ns); - } - if (options::classname_style & flags::classname_style::no_temp_args) { std::string no_args; int lt_count = 0; @@ -105,6 +84,32 @@ inline std::string styled_classname_str(std::string_view type_name) { styled.swap(no_args); } + if (options::classname_style & flags::classname_style::no_namespace) { + std::string no_ns; + auto remove_namespace = [&](std::size_t begin) { + std::string_view partial(no_ns.c_str() + begin, no_ns.size() - begin); + auto colon_pos = partial.rfind(':'); + std::string class_name(partial.substr(colon_pos == std::string::npos ? 0 : colon_pos + 1)); + no_ns.erase(begin).append(class_name); + }; + + std::stack lt_pos_stack; + for (auto c : styled) { + if (c == '<') { + lt_pos_stack.push(no_ns.size()); + } else if (c == '>') { + if (lt_pos_stack.empty()) continue; + auto lt_pos = lt_pos_stack.top(); + lt_pos_stack.pop(); + remove_namespace(lt_pos + 1); + } + no_ns.push_back(c); + } + remove_namespace(0); + + styled.swap(no_ns); + } + if (options::classname_style & flags::classname_style::max_width_20 && styled.size() > 20) return es::class_name(styled.substr(0, 17)) + es::op("..."); diff --git a/test/dump_variable_test.cpp b/test/dump_variable_test.cpp index 3fbdfac4..ae1c64b4 100644 --- a/test/dump_variable_test.cpp +++ b/test/dump_variable_test.cpp @@ -69,21 +69,16 @@ int main(int argc, char *argv[]) { using logic_error::logic_error; } original_error1("This is an original error."); - struct original_class { + struct long_name_original_class { int member_var = 5; std::string member_func() const { return "This is a member_func."; } }; enum original_enum { member1, member2, member3 }; - enum class original_scoped_enum { member1, member2, member3 }; - - struct unsupported_original_class { - int member_var = 5; - std::string member_func() { return "This is a member_func."; } - }; + enum class long_name_original_scoped_enum { member1, member2, member3 }; cpp_dump::_detail::export_enum_generic( - original_scoped_enum::member1, + long_name_original_scoped_enum::member1, "", 0, 0, @@ -93,20 +88,26 @@ int main(int argc, char *argv[]) { rep(style, 1 << 3) { CPP_DUMP_SET_OPTION(classname_style, style); - cpp_dump(bool(cp::options::classname_style & cp::flags::classname_style::no_namespace)); cpp_dump(bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args)); + cpp_dump(bool(cp::options::classname_style & cp::flags::classname_style::no_namespace)); cpp_dump(bool(cp::options::classname_style & cp::flags::classname_style::max_width_20)); cpp_dump(original_error1); cpp_dump(ns::template_class>()); - cpp_dump(original_class()); + cpp_dump(long_name_original_class()); cpp_dump(original_enum::member1, original_enum::member2, original_enum::member3); cpp_dump( - original_scoped_enum::member1, - original_scoped_enum::member2, - original_scoped_enum::member3 + long_name_original_scoped_enum::member1, + long_name_original_scoped_enum::member2, + long_name_original_scoped_enum::member3 ); - cpp_dump(unsupported_original_class()); } + + struct unsupported_original_class { + int member_var = 5; + std::string member_func() { return "This is a member_func."; } + }; + + cpp_dump(unsupported_original_class()); } else { // pointer const void *void_ptr = (void *)0x7ffd06586204; diff --git a/test/txt/color_variable_clang_by_syntax.txt b/test/txt/color_variable_clang_by_syntax.txt index b12931d2..77d3fbf4 100644 --- a/test/txt/color_variable_clang_by_syntax.txt +++ b/test/txt/color_variable_clang_by_syntax.txt @@ -1,18 +1,77 @@ -[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::no_temp_args +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_class<ns::template_class<int>>{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1,  + long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  + long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::maximum20 +[dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1,  + long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  + long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class<template_class<int>>{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1,  + long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  + long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1,  + long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  + long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::fullname +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_class<ns::template_class<int>>{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class<te...{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? -[dump] original_scoped_enum::member1 => original_scoped_enum::member1, original_scoped_enum::member2 => original_scoped_enum::member2,  - original_scoped_enum::member3 => original_scoped_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? [dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/color_variable_clang_original.txt b/test/txt/color_variable_clang_original.txt index 217a59af..4693b778 100644 --- a/test/txt/color_variable_clang_original.txt +++ b/test/txt/color_variable_clang_original.txt @@ -1,18 +1,77 @@ -[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::no_temp_args +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_class>{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1,  + long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  + long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::maximum20 +[dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1,  + long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  + long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class>{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1,  + long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  + long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1,  + long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  + long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::fullname +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_class>{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? -[dump] original_scoped_enum::member1 => original_scoped_enum::member1, original_scoped_enum::member2 => original_scoped_enum::member2,  - original_scoped_enum::member3 => original_scoped_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? [dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/color_variable_gnu_by_syntax.txt b/test/txt/color_variable_gnu_by_syntax.txt index b9ecd420..4c9604e6 100644 --- a/test/txt/color_variable_gnu_by_syntax.txt +++ b/test/txt/color_variable_gnu_by_syntax.txt @@ -1,20 +1,81 @@ -[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::no_temp_args -[dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => main(int, char**)::original_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::maximum20 -[dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } -[dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::fullname +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class<ns::template_class<int> >{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => main(int, char**)::original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => main(int, char**)::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => main(int, char**)::original_enum::member1, original_enum::member2 => main(int, char**)::original_enum::member2,  + original_enum::member3 => main(int, char**)::original_enum::? +[dump] long_name_original_scoped_enum::member1 => main(int, char**)::long_name_original_scoped_enum::member1,  + long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2,  + long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => main(int, char**)::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => main(int, char**)::original_enum::member1, original_enum::member2 => main(int, char**)::original_enum::member2,  original_enum::member3 => main(int, char**)::original_enum::? -[dump] original_scoped_enum::member1 => main(int, char**)::original_scoped_enum::member1,  - original_scoped_enum::member2 => main(int, char**)::original_scoped_enum::member2,  - original_scoped_enum::member3 => main(int, char**)::original_scoped_enum::? +[dump] long_name_original_scoped_enum::member1 => main(int, char**)::long_name_original_scoped_enum::member1,  + long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2,  + long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class<template_class<int> >{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1,  + long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  + long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1,  + long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  + long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => main(int, char**)...::member1, original_enum::member2 => main(int, char**)...::member2,  + original_enum::member3 => main(int, char**)...::? +[dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2,  + long_name_original_scoped_enum::member3 => main(int, char**)...::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => main(int, char**)...::member1, original_enum::member2 => main(int, char**)...::member2,  + original_enum::member3 => main(int, char**)...::? +[dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2,  + long_name_original_scoped_enum::member3 => main(int, char**)...::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class<te...{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? [dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/color_variable_gnu_original.txt b/test/txt/color_variable_gnu_original.txt index f36cdd91..54a89429 100644 --- a/test/txt/color_variable_gnu_original.txt +++ b/test/txt/color_variable_gnu_original.txt @@ -1,20 +1,81 @@ -[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::no_temp_args -[dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => main(int, char**)::original_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::maximum20 -[dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } -[dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::fullname +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => main(int, char**)::original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => main(int, char**)::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => main(int, char**)::original_enum::member1, original_enum::member2 => main(int, char**)::original_enum::member2,  + original_enum::member3 => main(int, char**)::original_enum::? +[dump] long_name_original_scoped_enum::member1 => main(int, char**)::long_name_original_scoped_enum::member1,  + long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2,  + long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => main(int, char**)::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => main(int, char**)::original_enum::member1, original_enum::member2 => main(int, char**)::original_enum::member2,  original_enum::member3 => main(int, char**)::original_enum::? -[dump] original_scoped_enum::member1 => main(int, char**)::original_scoped_enum::member1,  - original_scoped_enum::member2 => main(int, char**)::original_scoped_enum::member2,  - original_scoped_enum::member3 => main(int, char**)::original_scoped_enum::? +[dump] long_name_original_scoped_enum::member1 => main(int, char**)::long_name_original_scoped_enum::member1,  + long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2,  + long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class >{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1,  + long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  + long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1,  + long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  + long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => main(int, char**)...::member1, original_enum::member2 => main(int, char**)...::member2,  + original_enum::member3 => main(int, char**)...::? +[dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2,  + long_name_original_scoped_enum::member3 => main(int, char**)...::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => main(int, char**)...::member1, original_enum::member2 => main(int, char**)...::member2,  + original_enum::member3 => main(int, char**)...::? +[dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2,  + long_name_original_scoped_enum::member3 => main(int, char**)...::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? [dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/dump_non_variable.txt b/test/txt/dump_non_variable.txt index 5b9fb7ee..800879e0 100644 --- a/test/txt/dump_non_variable.txt +++ b/test/txt/dump_non_variable.txt @@ -420,10 +420,6 @@ here.`, cp::types::cont_indent_style_t::when_non_tuples_nested => cpp_dump::types::cont_indent_style_t::when_non_tuples_nested, cp::types::cont_indent_style_t::always => cpp_dump::types::cont_indent_style_t::always, cp::options::cont_indent_style => cpp_dump::types::cont_indent_style_t::when_nested -[dump] cp::types::classname_style_t::no_temp_args => cpp_dump::types::classname_style_t::no_temp_args, - cp::types::classname_style_t::fullname => cpp_dump::types::classname_style_t::fullname, - cp::types::classname_style_t::maximum20 => cpp_dump::types::classname_style_t::maximum20, - cp::options::classname_style => cpp_dump::types::classname_style_t::no_temp_args [dump] array50 => [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ... ], map50 => { 0: 1, 1: 2, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, ... }, diff --git a/test/txt/dump_variable_clang.txt b/test/txt/dump_variable_clang.txt index 3ad9c1a3..4ce81e5a 100644 --- a/test/txt/dump_variable_clang.txt +++ b/test/txt/dump_variable_clang.txt @@ -1,18 +1,77 @@ -[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::no_temp_args +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_class>{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1, + long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, + long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::maximum20 +[dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1, + long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, + long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class>{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1, + long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, + long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1, + long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, + long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::fullname +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, + long_name_original_scoped_enum::member3 => long_name_origina...::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_class>{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, + long_name_original_scoped_enum::member3 => long_name_origina...::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, + long_name_original_scoped_enum::member3 => long_name_origina...::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? -[dump] original_scoped_enum::member1 => original_scoped_enum::member1, original_scoped_enum::member2 => original_scoped_enum::member2, - original_scoped_enum::member3 => original_scoped_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, + long_name_original_scoped_enum::member3 => long_name_origina...::? [dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/dump_variable_gnu.txt b/test/txt/dump_variable_gnu.txt index eaac1434..cebc77d7 100644 --- a/test/txt/dump_variable_gnu.txt +++ b/test/txt/dump_variable_gnu.txt @@ -1,20 +1,81 @@ -[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::no_temp_args -[dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => main(int, char**)::original_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::maximum20 -[dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } -[dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::fullname +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => main(int, char**)::original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => main(int, char**)::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => main(int, char**)::original_enum::member1, original_enum::member2 => main(int, char**)::original_enum::member2, + original_enum::member3 => main(int, char**)::original_enum::? +[dump] long_name_original_scoped_enum::member1 => main(int, char**)::long_name_original_scoped_enum::member1, + long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2, + long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => main(int, char**)::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => main(int, char**)::original_enum::member1, original_enum::member2 => main(int, char**)::original_enum::member2, original_enum::member3 => main(int, char**)::original_enum::? -[dump] original_scoped_enum::member1 => main(int, char**)::original_scoped_enum::member1, - original_scoped_enum::member2 => main(int, char**)::original_scoped_enum::member2, - original_scoped_enum::member3 => main(int, char**)::original_scoped_enum::? +[dump] long_name_original_scoped_enum::member1 => main(int, char**)::long_name_original_scoped_enum::member1, + long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2, + long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class >{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1, + long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, + long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1, + long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, + long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => main(int, char**)...::member1, original_enum::member2 => main(int, char**)...::member2, + original_enum::member3 => main(int, char**)...::? +[dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2, + long_name_original_scoped_enum::member3 => main(int, char**)...::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => main(int, char**)...::member1, original_enum::member2 => main(int, char**)...::member2, + original_enum::member3 => main(int, char**)...::? +[dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2, + long_name_original_scoped_enum::member3 => main(int, char**)...::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, + long_name_original_scoped_enum::member3 => long_name_origina...::? +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, + long_name_original_scoped_enum::member3 => long_name_origina...::? [dump] unsupported_original_class() => Unsupported Type From f26ae070418ed346728af9bb1c02afaa41540ec3 Mon Sep 17 00:00:00 2001 From: philip82148 <92205270+philip82148@users.noreply.github.com> Date: Wed, 25 Sep 2024 22:58:19 +0900 Subject: [PATCH 12/25] fix test --- test/dump_variable_test.cpp | 1 + test/txt/color_variable_clang_by_syntax.txt | 8 ++ test/txt/color_variable_clang_original.txt | 8 ++ test/txt/color_variable_gnu_by_syntax.txt | 8 ++ test/txt/color_variable_gnu_original.txt | 8 ++ test/txt/color_variable_msvc_by_syntax.txt | 92 ++++++++++++++++++--- test/txt/color_variable_msvc_original.txt | 92 ++++++++++++++++++--- test/txt/dump_variable_clang.txt | 8 ++ test/txt/dump_variable_gnu.txt | 8 ++ test/txt/dump_variable_msvc.txt | 92 ++++++++++++++++++--- 10 files changed, 292 insertions(+), 33 deletions(-) diff --git a/test/dump_variable_test.cpp b/test/dump_variable_test.cpp index ae1c64b4..13685577 100644 --- a/test/dump_variable_test.cpp +++ b/test/dump_variable_test.cpp @@ -100,6 +100,7 @@ int main(int argc, char *argv[]) { long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 ); + clog << endl; } struct unsupported_original_class { diff --git a/test/txt/color_variable_clang_by_syntax.txt b/test/txt/color_variable_clang_by_syntax.txt index 77d3fbf4..4c430f94 100644 --- a/test/txt/color_variable_clang_by_syntax.txt +++ b/test/txt/color_variable_clang_by_syntax.txt @@ -8,6 +8,7 @@ [dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1,  long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false @@ -18,6 +19,7 @@ [dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1,  long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false @@ -28,6 +30,7 @@ [dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1,  long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false @@ -38,6 +41,7 @@ [dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1,  long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true @@ -47,6 +51,7 @@ [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true @@ -56,6 +61,7 @@ [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true @@ -65,6 +71,7 @@ [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true @@ -74,4 +81,5 @@ [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? + [dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/color_variable_clang_original.txt b/test/txt/color_variable_clang_original.txt index 4693b778..89c7d58a 100644 --- a/test/txt/color_variable_clang_original.txt +++ b/test/txt/color_variable_clang_original.txt @@ -8,6 +8,7 @@ [dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1,  long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false @@ -18,6 +19,7 @@ [dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1,  long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false @@ -28,6 +30,7 @@ [dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1,  long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false @@ -38,6 +41,7 @@ [dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1,  long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true @@ -47,6 +51,7 @@ [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true @@ -56,6 +61,7 @@ [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true @@ -65,6 +71,7 @@ [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true @@ -74,4 +81,5 @@ [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? + [dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/color_variable_gnu_by_syntax.txt b/test/txt/color_variable_gnu_by_syntax.txt index 4c9604e6..e7e80248 100644 --- a/test/txt/color_variable_gnu_by_syntax.txt +++ b/test/txt/color_variable_gnu_by_syntax.txt @@ -9,6 +9,7 @@ [dump] long_name_original_scoped_enum::member1 => main(int, char**)::long_name_original_scoped_enum::member1,  long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false @@ -20,6 +21,7 @@ [dump] long_name_original_scoped_enum::member1 => main(int, char**)::long_name_original_scoped_enum::member1,  long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false @@ -30,6 +32,7 @@ [dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1,  long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false @@ -40,6 +43,7 @@ [dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1,  long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true @@ -50,6 +54,7 @@ original_enum::member3 => main(int, char**)...::? [dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2,  long_name_original_scoped_enum::member3 => main(int, char**)...::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true @@ -60,6 +65,7 @@ original_enum::member3 => main(int, char**)...::? [dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2,  long_name_original_scoped_enum::member3 => main(int, char**)...::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true @@ -69,6 +75,7 @@ [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true @@ -78,4 +85,5 @@ [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? + [dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/color_variable_gnu_original.txt b/test/txt/color_variable_gnu_original.txt index 54a89429..f25b15a8 100644 --- a/test/txt/color_variable_gnu_original.txt +++ b/test/txt/color_variable_gnu_original.txt @@ -9,6 +9,7 @@ [dump] long_name_original_scoped_enum::member1 => main(int, char**)::long_name_original_scoped_enum::member1,  long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false @@ -20,6 +21,7 @@ [dump] long_name_original_scoped_enum::member1 => main(int, char**)::long_name_original_scoped_enum::member1,  long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false @@ -30,6 +32,7 @@ [dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1,  long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false @@ -40,6 +43,7 @@ [dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1,  long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true @@ -50,6 +54,7 @@ original_enum::member3 => main(int, char**)...::? [dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2,  long_name_original_scoped_enum::member3 => main(int, char**)...::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true @@ -60,6 +65,7 @@ original_enum::member3 => main(int, char**)...::? [dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2,  long_name_original_scoped_enum::member3 => main(int, char**)...::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true @@ -69,6 +75,7 @@ [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true @@ -78,4 +85,5 @@ [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? + [dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/color_variable_msvc_by_syntax.txt b/test/txt/color_variable_msvc_by_syntax.txt index d65c019d..66570c44 100644 --- a/test/txt/color_variable_msvc_by_syntax.txt +++ b/test/txt/color_variable_msvc_by_syntax.txt @@ -1,19 +1,89 @@ -[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::no_temp_args +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] original_error1 => main::original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_class<ns::template_class<int> >{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => main::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => main::original_enum::member1, original_enum::member2 => main::original_enum::member2,  + original_enum::member3 => main::original_enum::? +[dump] long_name_original_scoped_enum::member1 => main::long_name_original_scoped_enum::member1,  + long_name_original_scoped_enum::member2 => main::long_name_original_scoped_enum::member2,  + long_name_original_scoped_enum::member3 => main::long_name_original_scoped_enum::? + +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => main::original_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::maximum20 +[dump] long_name_original_class() => main::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => main::original_enum::member1, original_enum::member2 => main::original_enum::member2,  + original_enum::member3 => main::original_enum::? +[dump] long_name_original_scoped_enum::member1 => main::long_name_original_scoped_enum::member1,  + long_name_original_scoped_enum::member2 => main::long_name_original_scoped_enum::member2,  + long_name_original_scoped_enum::member3 => main::long_name_original_scoped_enum::? + +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class<template_class<int> >{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1,  + long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  + long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? + +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1,  + long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  + long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? + +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => main::original_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::fullname +[dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => main::original_enum::member1, original_enum::member2 => main::original_enum::member2,  + original_enum::member3 => main::original_enum::? +[dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2,  + long_name_original_scoped_enum::member3 => main::long_name_o...::? + +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true [dump] original_error1 => main::original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_class<ns::template_class<int> >{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => main::original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => main::original_enum::member1, original_enum::member2 => main::original_enum::member2,  original_enum::member3 => main::original_enum::? -[dump] original_scoped_enum::member1 => main::original_scoped_enum::member1, original_scoped_enum::member2 => main::original_scoped_enum::member2,  - original_scoped_enum::member3 => main::original_scoped_enum::? +[dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2,  + long_name_original_scoped_enum::member3 => main::long_name_o...::? + +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class<te...{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? + +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? + [dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/color_variable_msvc_original.txt b/test/txt/color_variable_msvc_original.txt index 47c367b3..21bcc717 100644 --- a/test/txt/color_variable_msvc_original.txt +++ b/test/txt/color_variable_msvc_original.txt @@ -1,19 +1,89 @@ -[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::no_temp_args +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] original_error1 => main::original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => main::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => main::original_enum::member1, original_enum::member2 => main::original_enum::member2,  + original_enum::member3 => main::original_enum::? +[dump] long_name_original_scoped_enum::member1 => main::long_name_original_scoped_enum::member1,  + long_name_original_scoped_enum::member2 => main::long_name_original_scoped_enum::member2,  + long_name_original_scoped_enum::member3 => main::long_name_original_scoped_enum::? + +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => main::original_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::maximum20 +[dump] long_name_original_class() => main::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => main::original_enum::member1, original_enum::member2 => main::original_enum::member2,  + original_enum::member3 => main::original_enum::? +[dump] long_name_original_scoped_enum::member1 => main::long_name_original_scoped_enum::member1,  + long_name_original_scoped_enum::member2 => main::long_name_original_scoped_enum::member2,  + long_name_original_scoped_enum::member3 => main::long_name_original_scoped_enum::? + +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class >{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1,  + long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  + long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? + +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1,  + long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  + long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? + +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => main::original_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::fullname +[dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => main::original_enum::member1, original_enum::member2 => main::original_enum::member2,  + original_enum::member3 => main::original_enum::? +[dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2,  + long_name_original_scoped_enum::member3 => main::long_name_o...::? + +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true [dump] original_error1 => main::original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => main::original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => main::original_enum::member1, original_enum::member2 => main::original_enum::member2,  original_enum::member3 => main::original_enum::? -[dump] original_scoped_enum::member1 => main::original_scoped_enum::member1, original_scoped_enum::member2 => main::original_scoped_enum::member2,  - original_scoped_enum::member3 => main::original_scoped_enum::? +[dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2,  + long_name_original_scoped_enum::member3 => main::long_name_o...::? + +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? + +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? + [dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/dump_variable_clang.txt b/test/txt/dump_variable_clang.txt index 4ce81e5a..5e350a87 100644 --- a/test/txt/dump_variable_clang.txt +++ b/test/txt/dump_variable_clang.txt @@ -8,6 +8,7 @@ [dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1, long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false @@ -18,6 +19,7 @@ [dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1, long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false @@ -28,6 +30,7 @@ [dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1, long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false @@ -38,6 +41,7 @@ [dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1, long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true @@ -47,6 +51,7 @@ [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, long_name_original_scoped_enum::member3 => long_name_origina...::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true @@ -56,6 +61,7 @@ [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, long_name_original_scoped_enum::member3 => long_name_origina...::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true @@ -65,6 +71,7 @@ [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, long_name_original_scoped_enum::member3 => long_name_origina...::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true @@ -74,4 +81,5 @@ [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, long_name_original_scoped_enum::member3 => long_name_origina...::? + [dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/dump_variable_gnu.txt b/test/txt/dump_variable_gnu.txt index cebc77d7..02b27e63 100644 --- a/test/txt/dump_variable_gnu.txt +++ b/test/txt/dump_variable_gnu.txt @@ -9,6 +9,7 @@ [dump] long_name_original_scoped_enum::member1 => main(int, char**)::long_name_original_scoped_enum::member1, long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false @@ -20,6 +21,7 @@ [dump] long_name_original_scoped_enum::member1 => main(int, char**)::long_name_original_scoped_enum::member1, long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false @@ -30,6 +32,7 @@ [dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1, long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false @@ -40,6 +43,7 @@ [dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1, long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true @@ -50,6 +54,7 @@ original_enum::member3 => main(int, char**)...::? [dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2, long_name_original_scoped_enum::member3 => main(int, char**)...::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true @@ -60,6 +65,7 @@ original_enum::member3 => main(int, char**)...::? [dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2, long_name_original_scoped_enum::member3 => main(int, char**)...::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true @@ -69,6 +75,7 @@ [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, long_name_original_scoped_enum::member3 => long_name_origina...::? + [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true [dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true @@ -78,4 +85,5 @@ [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, long_name_original_scoped_enum::member3 => long_name_origina...::? + [dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/dump_variable_msvc.txt b/test/txt/dump_variable_msvc.txt index 9750d4a2..6ea80401 100644 --- a/test/txt/dump_variable_msvc.txt +++ b/test/txt/dump_variable_msvc.txt @@ -1,19 +1,89 @@ -[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::no_temp_args +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] original_error1 => main::original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => main::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => main::original_enum::member1, original_enum::member2 => main::original_enum::member2, + original_enum::member3 => main::original_enum::? +[dump] long_name_original_scoped_enum::member1 => main::long_name_original_scoped_enum::member1, + long_name_original_scoped_enum::member2 => main::long_name_original_scoped_enum::member2, + long_name_original_scoped_enum::member3 => main::long_name_original_scoped_enum::? + +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => main::original_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::maximum20 +[dump] long_name_original_class() => main::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => main::original_enum::member1, original_enum::member2 => main::original_enum::member2, + original_enum::member3 => main::original_enum::? +[dump] long_name_original_scoped_enum::member1 => main::long_name_original_scoped_enum::member1, + long_name_original_scoped_enum::member2 => main::long_name_original_scoped_enum::member2, + long_name_original_scoped_enum::member3 => main::long_name_original_scoped_enum::? + +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class >{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1, + long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, + long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? + +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_original_scoped_enum::member1, + long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, + long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? + +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => main::original_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] unsupported_original_class() => Unsupported Type -[dump] cpp_dump::options::classname_style => cpp_dump::types::classname_style_t::fullname +[dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => main::original_enum::member1, original_enum::member2 => main::original_enum::member2, + original_enum::member3 => main::original_enum::? +[dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2, + long_name_original_scoped_enum::member3 => main::long_name_o...::? + +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true [dump] original_error1 => main::original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_class() => main::original_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => main::original_enum::member1, original_enum::member2 => main::original_enum::member2, original_enum::member3 => main::original_enum::? -[dump] original_scoped_enum::member1 => main::original_scoped_enum::member1, original_scoped_enum::member2 => main::original_scoped_enum::member2, - original_scoped_enum::member3 => main::original_scoped_enum::? +[dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2, + long_name_original_scoped_enum::member3 => main::long_name_o...::? + +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, + long_name_original_scoped_enum::member3 => long_name_origina...::? + +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true +[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] original_error1 => original_error{ what()= "This is an original error." } +[dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, + long_name_original_scoped_enum::member3 => long_name_origina...::? + [dump] unsupported_original_class() => Unsupported Type From 1c34ac4a071431bded3d5cd9b7b1e826283666fd Mon Sep 17 00:00:00 2001 From: philip82148 <92205270+philip82148@users.noreply.github.com> Date: Wed, 25 Sep 2024 23:01:45 +0900 Subject: [PATCH 13/25] update comment --- cpp-dump/hpp/class_name.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cpp-dump/hpp/class_name.hpp b/cpp-dump/hpp/class_name.hpp index f0e5bb1b..d07bf9a0 100644 --- a/cpp-dump/hpp/class_name.hpp +++ b/cpp-dump/hpp/class_name.hpp @@ -116,7 +116,8 @@ inline std::string styled_classname_str(std::string_view type_name) { return es::class_name(styled); } -// Currently, used only by export_exception() and CPP_DUMP_DEFINE_EXPORT_OBJECT_GENERIC() +// Currently, used only by export_exception(), CPP_DUMP_DEFINE_EXPORT_OBJECT_GENERIC(), and +// CPP_DUMP_DEFINE_EXPORT_ENUM_GENERIC() template inline std::string styled_classname() { static std::string class_name = _get_classname(); From c1e2e4d5b3bc4bb3329d52553c0b3b52648ccede Mon Sep 17 00:00:00 2001 From: philip82148 <92205270+philip82148@users.noreply.github.com> Date: Thu, 26 Sep 2024 01:14:31 +0900 Subject: [PATCH 14/25] improve code for removing namespaces --- cpp-dump/hpp/class_name.hpp | 42 ++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/cpp-dump/hpp/class_name.hpp b/cpp-dump/hpp/class_name.hpp index d07bf9a0..712805e4 100644 --- a/cpp-dump/hpp/class_name.hpp +++ b/cpp-dump/hpp/class_name.hpp @@ -7,7 +7,7 @@ #pragma once -#include +#include #include #include @@ -86,26 +86,30 @@ inline std::string styled_classname_str(std::string_view type_name) { if (options::classname_style & flags::classname_style::no_namespace) { std::string no_ns; - auto remove_namespace = [&](std::size_t begin) { - std::string_view partial(no_ns.c_str() + begin, no_ns.size() - begin); - auto colon_pos = partial.rfind(':'); - std::string class_name(partial.substr(colon_pos == std::string::npos ? 0 : colon_pos + 1)); - no_ns.erase(begin).append(class_name); - }; - - std::stack lt_pos_stack; - for (auto c : styled) { - if (c == '<') { - lt_pos_stack.push(no_ns.size()); - } else if (c == '>') { - if (lt_pos_stack.empty()) continue; - auto lt_pos = lt_pos_stack.top(); - lt_pos_stack.pop(); - remove_namespace(lt_pos + 1); + + std::reverse(styled.begin(), styled.end()); + for (std::size_t i = 0; i < styled.size(); ++i) { + if (styled[i] != ':') { + // append class name + no_ns.push_back(styled[i]); + continue; + } + + // skip namespace + int gt_count = 0; + for (++i; i < styled.size(); ++i) { + if (styled[i] == '>') { + ++gt_count; + } else if (styled[i] == '<') { + --gt_count; + if (gt_count < 0) { + no_ns.push_back(styled[i]); + break; + } + } } - no_ns.push_back(c); } - remove_namespace(0); + std::reverse(no_ns.begin(), no_ns.end()); styled.swap(no_ns); } From aab8dc36d8279f95c9dec72f6ec1f8e3f5276042 Mon Sep 17 00:00:00 2001 From: philip82148 <92205270+philip82148@users.noreply.github.com> Date: Thu, 26 Sep 2024 01:44:52 +0900 Subject: [PATCH 15/25] improve code to remove namespace --- cpp-dump/hpp/class_name.hpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cpp-dump/hpp/class_name.hpp b/cpp-dump/hpp/class_name.hpp index 712805e4..62d5b760 100644 --- a/cpp-dump/hpp/class_name.hpp +++ b/cpp-dump/hpp/class_name.hpp @@ -87,8 +87,7 @@ inline std::string styled_classname_str(std::string_view type_name) { if (options::classname_style & flags::classname_style::no_namespace) { std::string no_ns; - std::reverse(styled.begin(), styled.end()); - for (std::size_t i = 0; i < styled.size(); ++i) { + for (int i = static_cast(styled.size() - 1); i >= 0; --i) { if (styled[i] != ':') { // append class name no_ns.push_back(styled[i]); @@ -97,7 +96,7 @@ inline std::string styled_classname_str(std::string_view type_name) { // skip namespace int gt_count = 0; - for (++i; i < styled.size(); ++i) { + for (--i; i >= 0; --i) { if (styled[i] == '>') { ++gt_count; } else if (styled[i] == '<') { From 18a08f30d2f86c243e5e4977887c0e6a858d2391 Mon Sep 17 00:00:00 2001 From: philip82148 <92205270+philip82148@users.noreply.github.com> Date: Fri, 27 Sep 2024 10:46:44 +0900 Subject: [PATCH 16/25] use styled_classname_str for FIFO/LIFO and etc. --- .../hpp/export_var/export_other/export_es_value_t.hpp | 3 ++- cpp-dump/hpp/export_var/export_other/export_optional.hpp | 5 +++-- .../hpp/export_var/export_other/export_other_object.hpp | 4 ++-- cpp-dump/hpp/export_var/export_other/export_type_info.hpp | 8 ++++++-- cpp-dump/hpp/export_var/export_xixo.hpp | 7 ++++--- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/cpp-dump/hpp/export_var/export_other/export_es_value_t.hpp b/cpp-dump/hpp/export_var/export_other/export_es_value_t.hpp index 9d97d926..af2b0da0 100644 --- a/cpp-dump/hpp/export_var/export_other/export_es_value_t.hpp +++ b/cpp-dump/hpp/export_var/export_other/export_es_value_t.hpp @@ -11,6 +11,7 @@ #include #include +#include "../../class_name.hpp" #include "../../escape_sequence.hpp" #include "../../export_command/export_command.hpp" #include "../../options.hpp" @@ -117,7 +118,7 @@ inline std::string export_es_value_t( bool fail_on_newline, const export_command &command ) { - std::string class_name = es::class_name("cpp_dump::types::es_value_t"); + std::string class_name = styled_classname_str("cpp_dump::types::es_value_t"); _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1_1; diff --git a/cpp-dump/hpp/export_var/export_other/export_optional.hpp b/cpp-dump/hpp/export_var/export_other/export_optional.hpp index f689559d..2d472635 100644 --- a/cpp-dump/hpp/export_var/export_other/export_optional.hpp +++ b/cpp-dump/hpp/export_var/export_other/export_optional.hpp @@ -12,6 +12,7 @@ #include #include +#include "../../class_name.hpp" #include "../../escape_sequence.hpp" #include "../../export_command/export_command.hpp" #include "../../type_check.hpp" @@ -23,7 +24,7 @@ namespace _detail { inline std::string export_optional(const std::nullopt_t &, const std::string &, std::size_t, std::size_t, bool, const export_command &) { - return es::class_name("std::nullopt"); + return styled_classname_str("std::nullopt"); } namespace es { @@ -43,7 +44,7 @@ inline auto export_optional( bool fail_on_newline, const export_command &command ) -> std::enable_if_t, std::string> { - if (!optional) return es::class_name("std::nullopt"); + if (!optional) return styled_classname_str("std::nullopt"); return es::_optional_question("?") + export_var( diff --git a/cpp-dump/hpp/export_var/export_other/export_other_object.hpp b/cpp-dump/hpp/export_var/export_other/export_other_object.hpp index 5bc6e6b1..22376943 100644 --- a/cpp-dump/hpp/export_var/export_other/export_other_object.hpp +++ b/cpp-dump/hpp/export_var/export_other/export_other_object.hpp @@ -17,7 +17,7 @@ #endif -#include "../../escape_sequence.hpp" +#include "../../class_name.hpp" #include "../../expand_va_macro.hpp" #include "../../export_command/export_command.hpp" #include "../../type_check.hpp" @@ -42,7 +42,7 @@ bool fail_on_newline, \ const export_command &command \ ) { \ - std::string class_name = es::class_name(#TYPE); \ + std::string class_name = styled_classname_str(#TYPE); \ \ _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; \ \ diff --git a/cpp-dump/hpp/export_var/export_other/export_type_info.hpp b/cpp-dump/hpp/export_var/export_other/export_type_info.hpp index 0d008094..4e637214 100644 --- a/cpp-dump/hpp/export_var/export_other/export_type_info.hpp +++ b/cpp-dump/hpp/export_var/export_other/export_type_info.hpp @@ -15,7 +15,10 @@ #include #endif +#include "../../class_name.hpp" +#include "../../escape_sequence.hpp" #include "../../export_command/export_command.hpp" +#include "../../type_check.hpp" #include "../export_object_common.hpp" namespace cpp_dump { @@ -31,8 +34,9 @@ inline auto export_type_info( bool fail_on_newline, const export_command &command ) -> std::enable_if_t, std::string> { - std::string class_name = - es::class_name(std::is_same_v ? "std::type_info" : "std::type_index"); + std::string class_name = styled_classname_str( + std::is_same_v ? "std::type_info" : "std::type_index" + ); #if defined(__GNUC__) int status = 0; diff --git a/cpp-dump/hpp/export_var/export_xixo.hpp b/cpp-dump/hpp/export_var/export_xixo.hpp index 06ec3809..23da1749 100644 --- a/cpp-dump/hpp/export_var/export_xixo.hpp +++ b/cpp-dump/hpp/export_var/export_xixo.hpp @@ -11,6 +11,7 @@ #include #include +#include "../class_name.hpp" #include "../escape_sequence.hpp" #include "../export_command/export_command.hpp" #include "./export_object_common.hpp" @@ -28,7 +29,7 @@ inline std::string export_xixo( bool fail_on_newline, const export_command &command ) { - std::string class_name = es::class_name("std::queue"); + std::string class_name = styled_classname_str("std::queue"); _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; @@ -50,7 +51,7 @@ inline std::string export_xixo( bool fail_on_newline, const export_command &command ) { - std::string class_name = es::class_name("std::priority_queue"); + std::string class_name = styled_classname_str("std::priority_queue"); _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; @@ -69,7 +70,7 @@ inline std::string export_xixo( bool fail_on_newline, const export_command &command ) { - std::string class_name = es::class_name("std::stack"); + std::string class_name = styled_classname_str("std::stack"); _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; From e32acf1a0c978f95b8c4479cafccb8f3d80f03b2 Mon Sep 17 00:00:00 2001 From: philip82148 <92205270+philip82148@users.noreply.github.com> Date: Fri, 27 Sep 2024 10:58:31 +0900 Subject: [PATCH 17/25] tweak --- cpp-dump/hpp/class_name.hpp | 98 ++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/cpp-dump/hpp/class_name.hpp b/cpp-dump/hpp/class_name.hpp index 62d5b760..a08e299c 100644 --- a/cpp-dump/hpp/class_name.hpp +++ b/cpp-dump/hpp/class_name.hpp @@ -19,55 +19,8 @@ namespace cpp_dump { namespace _detail { -// The return type must be a built-in type, otherwise we don't know how it will be stringified. -template -const char* _get_classname_aux() { -#if defined(__GNUC__) && !defined(__clang__) - return __PRETTY_FUNCTION__; -#elif defined(__clang__) - return __PRETTY_FUNCTION__; -#elif defined(_MSC_VER) - return __FUNCSIG__; -#else - return ""; -#endif -} - -template -std::string _get_classname() { -#if defined(__GNUC__) && !defined(__clang__) - constexpr std::size_t prefix_length = - std::string_view("const char* cpp_dump::_detail::_get_classname_aux() [with T = ").size(); - constexpr std::size_t suffix_length = std::string_view("]").size(); -#elif defined(__clang__) - constexpr std::size_t prefix_length = - std::string_view("const char *cpp_dump::_detail::_get_classname_aux() [T = ").size(); - constexpr std::size_t suffix_length = std::string_view("]").size(); -#elif defined(_MSC_VER) - constexpr std::size_t prefix_length = - std::string_view("const char *__cdecl cpp_dump::_detail::_get_classname_aux<").size(); - constexpr std::size_t suffix_length = std::string_view(">(void)").size(); -#else - constexpr std::size_t prefix_length = 0; - constexpr std::size_t suffix_length = 0; -#endif - - std::string_view func_name = _get_classname_aux>(); - std::string class_name( - func_name, prefix_length, func_name.size() - prefix_length - suffix_length - ); - -#if defined(_MSC_VER) - class_name = replace_string(class_name, "struct ", ""); - class_name = replace_string(class_name, "class ", ""); - class_name = replace_string(class_name, "enum ", ""); -#endif - - return class_name; -} - -inline std::string styled_classname_str(std::string_view type_name) { - std::string styled(type_name); +inline std::string styled_classname_str(std::string_view class_name) { + std::string styled(class_name); if (options::classname_style & flags::classname_style::no_temp_args) { std::string no_args; @@ -119,6 +72,53 @@ inline std::string styled_classname_str(std::string_view type_name) { return es::class_name(styled); } +// The return type must be a built-in type, otherwise we don't know how it will be stringified. +template +const char* _get_classname_aux() { +#if defined(__GNUC__) && !defined(__clang__) + return __PRETTY_FUNCTION__; +#elif defined(__clang__) + return __PRETTY_FUNCTION__; +#elif defined(_MSC_VER) + return __FUNCSIG__; +#else + return ""; +#endif +} + +template +std::string _get_classname() { +#if defined(__GNUC__) && !defined(__clang__) + constexpr std::size_t prefix_length = + std::string_view("const char* cpp_dump::_detail::_get_classname_aux() [with T = ").size(); + constexpr std::size_t suffix_length = std::string_view("]").size(); +#elif defined(__clang__) + constexpr std::size_t prefix_length = + std::string_view("const char *cpp_dump::_detail::_get_classname_aux() [T = ").size(); + constexpr std::size_t suffix_length = std::string_view("]").size(); +#elif defined(_MSC_VER) + constexpr std::size_t prefix_length = + std::string_view("const char *__cdecl cpp_dump::_detail::_get_classname_aux<").size(); + constexpr std::size_t suffix_length = std::string_view(">(void)").size(); +#else + constexpr std::size_t prefix_length = 0; + constexpr std::size_t suffix_length = 0; +#endif + + std::string_view func_name = _get_classname_aux>(); + std::string class_name( + func_name, prefix_length, func_name.size() - prefix_length - suffix_length + ); + +#if defined(_MSC_VER) + class_name = replace_string(class_name, "struct ", ""); + class_name = replace_string(class_name, "class ", ""); + class_name = replace_string(class_name, "enum ", ""); +#endif + + return class_name; +} + // Currently, used only by export_exception(), CPP_DUMP_DEFINE_EXPORT_OBJECT_GENERIC(), and // CPP_DUMP_DEFINE_EXPORT_ENUM_GENERIC() template From d50f02dd1224df22c2abe16a9278337e7f4a05ee Mon Sep 17 00:00:00 2001 From: philip82148 <92205270+philip82148@users.noreply.github.com> Date: Fri, 27 Sep 2024 11:03:30 +0900 Subject: [PATCH 18/25] classname -> class_name --- cpp-dump/hpp/class_name.hpp | 26 +++++----- .../hpp/export_var/export_enum_generic.hpp | 2 +- cpp-dump/hpp/export_var/export_exception.hpp | 2 +- cpp-dump/hpp/export_var/export_object.hpp | 2 +- .../hpp/export_var/export_object_generic.hpp | 2 +- .../export_other/export_es_value_t.hpp | 2 +- .../export_other/export_optional.hpp | 4 +- .../export_other/export_other_object.hpp | 2 +- .../export_other/export_type_info.hpp | 2 +- cpp-dump/hpp/export_var/export_xixo.hpp | 6 +-- cpp-dump/hpp/options.hpp | 6 +-- test/dump_variable_test.cpp | 8 ++-- test/readme_test.cmake | 4 +- test/txt/color_variable_clang_by_syntax.txt | 48 +++++++++---------- test/txt/color_variable_clang_original.txt | 48 +++++++++---------- test/txt/color_variable_gnu_by_syntax.txt | 48 +++++++++---------- test/txt/color_variable_gnu_original.txt | 48 +++++++++---------- test/txt/color_variable_msvc_by_syntax.txt | 48 +++++++++---------- test/txt/color_variable_msvc_original.txt | 48 +++++++++---------- test/txt/dump_variable_clang.txt | 48 +++++++++---------- test/txt/dump_variable_gnu.txt | 48 +++++++++---------- test/txt/dump_variable_msvc.txt | 48 +++++++++---------- 22 files changed, 250 insertions(+), 250 deletions(-) diff --git a/cpp-dump/hpp/class_name.hpp b/cpp-dump/hpp/class_name.hpp index a08e299c..afbafb07 100644 --- a/cpp-dump/hpp/class_name.hpp +++ b/cpp-dump/hpp/class_name.hpp @@ -19,10 +19,10 @@ namespace cpp_dump { namespace _detail { -inline std::string styled_classname_str(std::string_view class_name) { +inline std::string styled_class_name_str(std::string_view class_name) { std::string styled(class_name); - if (options::classname_style & flags::classname_style::no_temp_args) { + if (options::class_name_style & flags::class_name_style::no_temp_args) { std::string no_args; int lt_count = 0; for (auto c : styled) { @@ -37,7 +37,7 @@ inline std::string styled_classname_str(std::string_view class_name) { styled.swap(no_args); } - if (options::classname_style & flags::classname_style::no_namespace) { + if (options::class_name_style & flags::class_name_style::no_namespace) { std::string no_ns; for (int i = static_cast(styled.size() - 1); i >= 0; --i) { @@ -66,7 +66,7 @@ inline std::string styled_classname_str(std::string_view class_name) { styled.swap(no_ns); } - if (options::classname_style & flags::classname_style::max_width_20 && styled.size() > 20) + if (options::class_name_style & flags::class_name_style::max_width_20 && styled.size() > 20) return es::class_name(styled.substr(0, 17)) + es::op("..."); return es::class_name(styled); @@ -74,7 +74,7 @@ inline std::string styled_classname_str(std::string_view class_name) { // The return type must be a built-in type, otherwise we don't know how it will be stringified. template -const char* _get_classname_aux() { +const char* _get_class_name_aux() { #if defined(__GNUC__) && !defined(__clang__) return __PRETTY_FUNCTION__; #elif defined(__clang__) @@ -87,25 +87,25 @@ const char* _get_classname_aux() { } template -std::string _get_classname() { +std::string _get_class_name() { #if defined(__GNUC__) && !defined(__clang__) constexpr std::size_t prefix_length = - std::string_view("const char* cpp_dump::_detail::_get_classname_aux() [with T = ").size(); + std::string_view("const char* cpp_dump::_detail::_get_class_name_aux() [with T = ").size(); constexpr std::size_t suffix_length = std::string_view("]").size(); #elif defined(__clang__) constexpr std::size_t prefix_length = - std::string_view("const char *cpp_dump::_detail::_get_classname_aux() [T = ").size(); + std::string_view("const char *cpp_dump::_detail::_get_class_name_aux() [T = ").size(); constexpr std::size_t suffix_length = std::string_view("]").size(); #elif defined(_MSC_VER) constexpr std::size_t prefix_length = - std::string_view("const char *__cdecl cpp_dump::_detail::_get_classname_aux<").size(); + std::string_view("const char *__cdecl cpp_dump::_detail::_get_class_name_aux<").size(); constexpr std::size_t suffix_length = std::string_view(">(void)").size(); #else constexpr std::size_t prefix_length = 0; constexpr std::size_t suffix_length = 0; #endif - std::string_view func_name = _get_classname_aux>(); + std::string_view func_name = _get_class_name_aux>(); std::string class_name( func_name, prefix_length, func_name.size() - prefix_length - suffix_length ); @@ -122,9 +122,9 @@ std::string _get_classname() { // Currently, used only by export_exception(), CPP_DUMP_DEFINE_EXPORT_OBJECT_GENERIC(), and // CPP_DUMP_DEFINE_EXPORT_ENUM_GENERIC() template -inline std::string styled_classname() { - static std::string class_name = _get_classname(); - return styled_classname_str(class_name); +inline std::string styled_class_name() { + static std::string class_name = _get_class_name(); + return styled_class_name_str(class_name); } } // namespace _detail diff --git a/cpp-dump/hpp/export_var/export_enum_generic.hpp b/cpp-dump/hpp/export_var/export_enum_generic.hpp index 4638f724..75e77b4c 100644 --- a/cpp-dump/hpp/export_var/export_enum_generic.hpp +++ b/cpp-dump/hpp/export_var/export_enum_generic.hpp @@ -36,7 +36,7 @@ decltype(_p_CPP_DUMP_EXPAND_VA(_p_CPP_DUMP_EXPAND_FOR_EXPORT_ENUM_GENERIC, __VA_ARGS__), std::string())> { \ static const std::unordered_map enum_to_string{ \ _p_CPP_DUMP_EXPAND_VA(_p_CPP_DUMP_EXPAND_FOR_EXPORT_ENUM_GENERIC2, __VA_ARGS__)}; \ - return styled_classname() + es::op("::") \ + return styled_class_name() + es::op("::") \ + (enum_to_string.count(value) ? es::member(enum_to_string.at(value)) \ : es::unsupported("?")); \ } \ diff --git a/cpp-dump/hpp/export_var/export_exception.hpp b/cpp-dump/hpp/export_var/export_exception.hpp index b1f98567..f3bcb647 100644 --- a/cpp-dump/hpp/export_var/export_exception.hpp +++ b/cpp-dump/hpp/export_var/export_exception.hpp @@ -29,7 +29,7 @@ inline auto export_exception( bool fail_on_newline, const export_command &command ) -> std::enable_if_t, std::string> { - std::string class_name = styled_classname(); + std::string class_name = styled_class_name(); _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; diff --git a/cpp-dump/hpp/export_var/export_object.hpp b/cpp-dump/hpp/export_var/export_object.hpp index 82108b16..e59c78ca 100644 --- a/cpp-dump/hpp/export_var/export_object.hpp +++ b/cpp-dump/hpp/export_var/export_object.hpp @@ -39,7 +39,7 @@ bool fail_on_newline, \ const export_command &command \ ) { \ - std::string class_name = styled_classname_str(#TYPE); \ + std::string class_name = styled_class_name_str(#TYPE); \ \ _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; \ \ diff --git a/cpp-dump/hpp/export_var/export_object_generic.hpp b/cpp-dump/hpp/export_var/export_object_generic.hpp index 12b571d5..6c53114c 100644 --- a/cpp-dump/hpp/export_var/export_object_generic.hpp +++ b/cpp-dump/hpp/export_var/export_object_generic.hpp @@ -37,7 +37,7 @@ bool fail_on_newline, \ const export_command &command \ ) -> decltype(_p_CPP_DUMP_EXPAND_VA(_p_CPP_DUMP_EXPAND_FOR_EXPORT_OBJECT_GENERIC, __VA_ARGS__), std::string()) { \ - std::string class_name = styled_classname(); \ + std::string class_name = styled_class_name(); \ \ _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; \ \ diff --git a/cpp-dump/hpp/export_var/export_other/export_es_value_t.hpp b/cpp-dump/hpp/export_var/export_other/export_es_value_t.hpp index af2b0da0..babd102f 100644 --- a/cpp-dump/hpp/export_var/export_other/export_es_value_t.hpp +++ b/cpp-dump/hpp/export_var/export_other/export_es_value_t.hpp @@ -118,7 +118,7 @@ inline std::string export_es_value_t( bool fail_on_newline, const export_command &command ) { - std::string class_name = styled_classname_str("cpp_dump::types::es_value_t"); + std::string class_name = styled_class_name_str("cpp_dump::types::es_value_t"); _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1_1; diff --git a/cpp-dump/hpp/export_var/export_other/export_optional.hpp b/cpp-dump/hpp/export_var/export_other/export_optional.hpp index 2d472635..4e7df64e 100644 --- a/cpp-dump/hpp/export_var/export_other/export_optional.hpp +++ b/cpp-dump/hpp/export_var/export_other/export_optional.hpp @@ -24,7 +24,7 @@ namespace _detail { inline std::string export_optional(const std::nullopt_t &, const std::string &, std::size_t, std::size_t, bool, const export_command &) { - return styled_classname_str("std::nullopt"); + return styled_class_name_str("std::nullopt"); } namespace es { @@ -44,7 +44,7 @@ inline auto export_optional( bool fail_on_newline, const export_command &command ) -> std::enable_if_t, std::string> { - if (!optional) return styled_classname_str("std::nullopt"); + if (!optional) return styled_class_name_str("std::nullopt"); return es::_optional_question("?") + export_var( diff --git a/cpp-dump/hpp/export_var/export_other/export_other_object.hpp b/cpp-dump/hpp/export_var/export_other/export_other_object.hpp index 22376943..1d54588c 100644 --- a/cpp-dump/hpp/export_var/export_other/export_other_object.hpp +++ b/cpp-dump/hpp/export_var/export_other/export_other_object.hpp @@ -42,7 +42,7 @@ bool fail_on_newline, \ const export_command &command \ ) { \ - std::string class_name = styled_classname_str(#TYPE); \ + std::string class_name = styled_class_name_str(#TYPE); \ \ _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; \ \ diff --git a/cpp-dump/hpp/export_var/export_other/export_type_info.hpp b/cpp-dump/hpp/export_var/export_other/export_type_info.hpp index 4e637214..3b47a97c 100644 --- a/cpp-dump/hpp/export_var/export_other/export_type_info.hpp +++ b/cpp-dump/hpp/export_var/export_other/export_type_info.hpp @@ -34,7 +34,7 @@ inline auto export_type_info( bool fail_on_newline, const export_command &command ) -> std::enable_if_t, std::string> { - std::string class_name = styled_classname_str( + std::string class_name = styled_class_name_str( std::is_same_v ? "std::type_info" : "std::type_index" ); diff --git a/cpp-dump/hpp/export_var/export_xixo.hpp b/cpp-dump/hpp/export_var/export_xixo.hpp index 23da1749..4afe26bc 100644 --- a/cpp-dump/hpp/export_var/export_xixo.hpp +++ b/cpp-dump/hpp/export_var/export_xixo.hpp @@ -29,7 +29,7 @@ inline std::string export_xixo( bool fail_on_newline, const export_command &command ) { - std::string class_name = styled_classname_str("std::queue"); + std::string class_name = styled_class_name_str("std::queue"); _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; @@ -51,7 +51,7 @@ inline std::string export_xixo( bool fail_on_newline, const export_command &command ) { - std::string class_name = styled_classname_str("std::priority_queue"); + std::string class_name = styled_class_name_str("std::priority_queue"); _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; @@ -70,7 +70,7 @@ inline std::string export_xixo( bool fail_on_newline, const export_command &command ) { - std::string class_name = styled_classname_str("std::stack"); + std::string class_name = styled_class_name_str("std::stack"); _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; diff --git a/cpp-dump/hpp/options.hpp b/cpp-dump/hpp/options.hpp index b79fa6ae..76c39eb2 100644 --- a/cpp-dump/hpp/options.hpp +++ b/cpp-dump/hpp/options.hpp @@ -87,14 +87,14 @@ struct es_value_t { namespace flags { -namespace classname_style { +namespace class_name_style { inline constexpr unsigned int fullname = 0; inline constexpr unsigned int no_temp_args = 1u << 0; inline constexpr unsigned int no_namespace = 1u << 1; inline constexpr unsigned int max_width_20 = 1u << 2; -}; // namespace classname_style +}; // namespace class_name_style } // namespace flags @@ -141,7 +141,7 @@ inline types::log_label_func_t log_label_func = log_label::default_func; * Style of class name. * This is an experimental feature. */ -inline unsigned int classname_style = flags::classname_style::no_temp_args; +inline unsigned int class_name_style = flags::class_name_style::no_temp_args; /** * Style of the escape sequences (output coloring). diff --git a/test/dump_variable_test.cpp b/test/dump_variable_test.cpp index 13685577..6fd8ba31 100644 --- a/test/dump_variable_test.cpp +++ b/test/dump_variable_test.cpp @@ -87,10 +87,10 @@ int main(int argc, char *argv[]) { ); rep(style, 1 << 3) { - CPP_DUMP_SET_OPTION(classname_style, style); - cpp_dump(bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args)); - cpp_dump(bool(cp::options::classname_style & cp::flags::classname_style::no_namespace)); - cpp_dump(bool(cp::options::classname_style & cp::flags::classname_style::max_width_20)); + CPP_DUMP_SET_OPTION(class_name_style, style); + cpp_dump(bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args)); + cpp_dump(bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace)); + cpp_dump(bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20)); cpp_dump(original_error1); cpp_dump(ns::template_class>()); cpp_dump(long_name_original_class()); diff --git a/test/readme_test.cmake b/test/readme_test.cmake index 740359d1..78d68984 100644 --- a/test/readme_test.cmake +++ b/test/readme_test.cmake @@ -28,7 +28,7 @@ execute_process( ) set(raw_address_file supports-various-types;customizable-colors;no-es;formatting-with-manipulators;test-code) -set(auto_classname_file user-defined-class-generic;user-defined-enum-generic) +set(auto_class_name_file user-defined-class-generic;user-defined-enum-generic) if("${basename}" IN_LIST raw_address_file) # Do not remove escape sequences but remove raw addresses. @@ -37,7 +37,7 @@ if("${basename}" IN_LIST raw_address_file) else() string(REGEX REPLACE "${esc0x1b}\\[32m(0x[0-9a-f]+|00[0-9A-F]+)${esc0x1b}\\[0m" "${esc0x1b}[32m0x7fffffffffff${esc0x1b}[0m" error_contents "${error_contents}") endif() -elseif("${basename}" IN_LIST auto_classname_file) +elseif("${basename}" IN_LIST auto_class_name_file) string(REGEX REPLACE "main[^:]*::" "" error_contents "${error_contents}") endif() diff --git a/test/txt/color_variable_clang_by_syntax.txt b/test/txt/color_variable_clang_by_syntax.txt index 4c430f94..eacca3bb 100644 --- a/test/txt/color_variable_clang_by_syntax.txt +++ b/test/txt/color_variable_clang_by_syntax.txt @@ -1,6 +1,6 @@ -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class<ns::template_class<int>>{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -9,9 +9,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -20,9 +20,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class<template_class<int>>{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -31,9 +31,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -42,9 +42,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -52,9 +52,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -62,9 +62,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class<te...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -72,9 +72,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/color_variable_clang_original.txt b/test/txt/color_variable_clang_original.txt index 89c7d58a..5e87cdb3 100644 --- a/test/txt/color_variable_clang_original.txt +++ b/test/txt/color_variable_clang_original.txt @@ -1,6 +1,6 @@ -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class>{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -9,9 +9,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -20,9 +20,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class>{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -31,9 +31,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -42,9 +42,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -52,9 +52,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -62,9 +62,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -72,9 +72,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/color_variable_gnu_by_syntax.txt b/test/txt/color_variable_gnu_by_syntax.txt index e7e80248..fc92d91b 100644 --- a/test/txt/color_variable_gnu_by_syntax.txt +++ b/test/txt/color_variable_gnu_by_syntax.txt @@ -1,6 +1,6 @@ -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class<ns::template_class<int> >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -10,9 +10,9 @@ long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -22,9 +22,9 @@ long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class<template_class<int> >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -33,9 +33,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -44,9 +44,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } @@ -55,9 +55,9 @@ [dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2,  long_name_original_scoped_enum::member3 => main(int, char**)...::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } @@ -66,9 +66,9 @@ [dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2,  long_name_original_scoped_enum::member3 => main(int, char**)...::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class<te...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -76,9 +76,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/color_variable_gnu_original.txt b/test/txt/color_variable_gnu_original.txt index f25b15a8..306d5186 100644 --- a/test/txt/color_variable_gnu_original.txt +++ b/test/txt/color_variable_gnu_original.txt @@ -1,6 +1,6 @@ -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -10,9 +10,9 @@ long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -22,9 +22,9 @@ long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -33,9 +33,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -44,9 +44,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } @@ -55,9 +55,9 @@ [dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2,  long_name_original_scoped_enum::member3 => main(int, char**)...::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } @@ -66,9 +66,9 @@ [dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2,  long_name_original_scoped_enum::member3 => main(int, char**)...::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -76,9 +76,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/color_variable_msvc_by_syntax.txt b/test/txt/color_variable_msvc_by_syntax.txt index 66570c44..9a762fda 100644 --- a/test/txt/color_variable_msvc_by_syntax.txt +++ b/test/txt/color_variable_msvc_by_syntax.txt @@ -1,6 +1,6 @@ -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class<ns::template_class<int> >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -10,9 +10,9 @@ long_name_original_scoped_enum::member2 => main::long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => main::long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -22,9 +22,9 @@ long_name_original_scoped_enum::member2 => main::long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => main::long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class<template_class<int> >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -33,9 +33,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -44,9 +44,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } @@ -55,9 +55,9 @@ [dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2,  long_name_original_scoped_enum::member3 => main::long_name_o...::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } @@ -66,9 +66,9 @@ [dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2,  long_name_original_scoped_enum::member3 => main::long_name_o...::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class<te...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -76,9 +76,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/color_variable_msvc_original.txt b/test/txt/color_variable_msvc_original.txt index 21bcc717..614209f5 100644 --- a/test/txt/color_variable_msvc_original.txt +++ b/test/txt/color_variable_msvc_original.txt @@ -1,6 +1,6 @@ -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -10,9 +10,9 @@ long_name_original_scoped_enum::member2 => main::long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => main::long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -22,9 +22,9 @@ long_name_original_scoped_enum::member2 => main::long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => main::long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -33,9 +33,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -44,9 +44,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } @@ -55,9 +55,9 @@ [dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2,  long_name_original_scoped_enum::member3 => main::long_name_o...::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } @@ -66,9 +66,9 @@ [dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2,  long_name_original_scoped_enum::member3 => main::long_name_o...::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -76,9 +76,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/dump_variable_clang.txt b/test/txt/dump_variable_clang.txt index 5e350a87..fa10d56e 100644 --- a/test/txt/dump_variable_clang.txt +++ b/test/txt/dump_variable_clang.txt @@ -1,6 +1,6 @@ -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class>{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -9,9 +9,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -20,9 +20,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class>{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -31,9 +31,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -42,9 +42,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -52,9 +52,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -62,9 +62,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -72,9 +72,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/dump_variable_gnu.txt b/test/txt/dump_variable_gnu.txt index 02b27e63..95815290 100644 --- a/test/txt/dump_variable_gnu.txt +++ b/test/txt/dump_variable_gnu.txt @@ -1,6 +1,6 @@ -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -10,9 +10,9 @@ long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -22,9 +22,9 @@ long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -33,9 +33,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -44,9 +44,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } @@ -55,9 +55,9 @@ [dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2, long_name_original_scoped_enum::member3 => main(int, char**)...::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } @@ -66,9 +66,9 @@ [dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2, long_name_original_scoped_enum::member3 => main(int, char**)...::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -76,9 +76,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/dump_variable_msvc.txt b/test/txt/dump_variable_msvc.txt index 6ea80401..8766e8d9 100644 --- a/test/txt/dump_variable_msvc.txt +++ b/test/txt/dump_variable_msvc.txt @@ -1,6 +1,6 @@ -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -10,9 +10,9 @@ long_name_original_scoped_enum::member2 => main::long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => main::long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -22,9 +22,9 @@ long_name_original_scoped_enum::member2 => main::long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => main::long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -33,9 +33,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -44,9 +44,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } @@ -55,9 +55,9 @@ [dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2, long_name_original_scoped_enum::member3 => main::long_name_o...::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } @@ -66,9 +66,9 @@ [dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2, long_name_original_scoped_enum::member3 => main::long_name_o...::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => false -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -76,9 +76,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_temp_args) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::no_namespace) => true -[dump] bool(cp::options::classname_style & cp::flags::classname_style::max_width_20) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true +[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } From d113611866291510c271bff11e697c7c3c80acbe Mon Sep 17 00:00:00 2001 From: philip82148 <92205270+philip82148@users.noreply.github.com> Date: Fri, 27 Sep 2024 11:12:27 +0900 Subject: [PATCH 19/25] rename styled_class_name_str -> style_class_name, styled_class_name -> style_class_name_auto --- cpp-dump/hpp/class_name.hpp | 6 +++--- cpp-dump/hpp/export_var/export_enum_generic.hpp | 2 +- cpp-dump/hpp/export_var/export_exception.hpp | 2 +- cpp-dump/hpp/export_var/export_object.hpp | 2 +- cpp-dump/hpp/export_var/export_object_generic.hpp | 2 +- cpp-dump/hpp/export_var/export_other/export_es_value_t.hpp | 2 +- cpp-dump/hpp/export_var/export_other/export_optional.hpp | 4 ++-- .../hpp/export_var/export_other/export_other_object.hpp | 2 +- cpp-dump/hpp/export_var/export_other/export_type_info.hpp | 5 ++--- cpp-dump/hpp/export_var/export_xixo.hpp | 6 +++--- 10 files changed, 16 insertions(+), 17 deletions(-) diff --git a/cpp-dump/hpp/class_name.hpp b/cpp-dump/hpp/class_name.hpp index afbafb07..a1f6c4f3 100644 --- a/cpp-dump/hpp/class_name.hpp +++ b/cpp-dump/hpp/class_name.hpp @@ -19,7 +19,7 @@ namespace cpp_dump { namespace _detail { -inline std::string styled_class_name_str(std::string_view class_name) { +inline std::string style_class_name(std::string_view class_name) { std::string styled(class_name); if (options::class_name_style & flags::class_name_style::no_temp_args) { @@ -122,9 +122,9 @@ std::string _get_class_name() { // Currently, used only by export_exception(), CPP_DUMP_DEFINE_EXPORT_OBJECT_GENERIC(), and // CPP_DUMP_DEFINE_EXPORT_ENUM_GENERIC() template -inline std::string styled_class_name() { +inline std::string style_class_name_auto() { static std::string class_name = _get_class_name(); - return styled_class_name_str(class_name); + return style_class_name(class_name); } } // namespace _detail diff --git a/cpp-dump/hpp/export_var/export_enum_generic.hpp b/cpp-dump/hpp/export_var/export_enum_generic.hpp index 75e77b4c..27c774c5 100644 --- a/cpp-dump/hpp/export_var/export_enum_generic.hpp +++ b/cpp-dump/hpp/export_var/export_enum_generic.hpp @@ -36,7 +36,7 @@ decltype(_p_CPP_DUMP_EXPAND_VA(_p_CPP_DUMP_EXPAND_FOR_EXPORT_ENUM_GENERIC, __VA_ARGS__), std::string())> { \ static const std::unordered_map enum_to_string{ \ _p_CPP_DUMP_EXPAND_VA(_p_CPP_DUMP_EXPAND_FOR_EXPORT_ENUM_GENERIC2, __VA_ARGS__)}; \ - return styled_class_name() + es::op("::") \ + return style_class_name_auto() + es::op("::") \ + (enum_to_string.count(value) ? es::member(enum_to_string.at(value)) \ : es::unsupported("?")); \ } \ diff --git a/cpp-dump/hpp/export_var/export_exception.hpp b/cpp-dump/hpp/export_var/export_exception.hpp index f3bcb647..33bfd9c1 100644 --- a/cpp-dump/hpp/export_var/export_exception.hpp +++ b/cpp-dump/hpp/export_var/export_exception.hpp @@ -29,7 +29,7 @@ inline auto export_exception( bool fail_on_newline, const export_command &command ) -> std::enable_if_t, std::string> { - std::string class_name = styled_class_name(); + std::string class_name = style_class_name_auto(); _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; diff --git a/cpp-dump/hpp/export_var/export_object.hpp b/cpp-dump/hpp/export_var/export_object.hpp index e59c78ca..9c024147 100644 --- a/cpp-dump/hpp/export_var/export_object.hpp +++ b/cpp-dump/hpp/export_var/export_object.hpp @@ -39,7 +39,7 @@ bool fail_on_newline, \ const export_command &command \ ) { \ - std::string class_name = styled_class_name_str(#TYPE); \ + std::string class_name = style_class_name(#TYPE); \ \ _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; \ \ diff --git a/cpp-dump/hpp/export_var/export_object_generic.hpp b/cpp-dump/hpp/export_var/export_object_generic.hpp index 6c53114c..8eea31c5 100644 --- a/cpp-dump/hpp/export_var/export_object_generic.hpp +++ b/cpp-dump/hpp/export_var/export_object_generic.hpp @@ -37,7 +37,7 @@ bool fail_on_newline, \ const export_command &command \ ) -> decltype(_p_CPP_DUMP_EXPAND_VA(_p_CPP_DUMP_EXPAND_FOR_EXPORT_OBJECT_GENERIC, __VA_ARGS__), std::string()) { \ - std::string class_name = styled_class_name(); \ + std::string class_name = style_class_name_auto(); \ \ _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; \ \ diff --git a/cpp-dump/hpp/export_var/export_other/export_es_value_t.hpp b/cpp-dump/hpp/export_var/export_other/export_es_value_t.hpp index babd102f..e9843866 100644 --- a/cpp-dump/hpp/export_var/export_other/export_es_value_t.hpp +++ b/cpp-dump/hpp/export_var/export_other/export_es_value_t.hpp @@ -118,7 +118,7 @@ inline std::string export_es_value_t( bool fail_on_newline, const export_command &command ) { - std::string class_name = styled_class_name_str("cpp_dump::types::es_value_t"); + std::string class_name = style_class_name("cpp_dump::types::es_value_t"); _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1_1; diff --git a/cpp-dump/hpp/export_var/export_other/export_optional.hpp b/cpp-dump/hpp/export_var/export_other/export_optional.hpp index 4e7df64e..289884de 100644 --- a/cpp-dump/hpp/export_var/export_other/export_optional.hpp +++ b/cpp-dump/hpp/export_var/export_other/export_optional.hpp @@ -24,7 +24,7 @@ namespace _detail { inline std::string export_optional(const std::nullopt_t &, const std::string &, std::size_t, std::size_t, bool, const export_command &) { - return styled_class_name_str("std::nullopt"); + return style_class_name("std::nullopt"); } namespace es { @@ -44,7 +44,7 @@ inline auto export_optional( bool fail_on_newline, const export_command &command ) -> std::enable_if_t, std::string> { - if (!optional) return styled_class_name_str("std::nullopt"); + if (!optional) return style_class_name("std::nullopt"); return es::_optional_question("?") + export_var( diff --git a/cpp-dump/hpp/export_var/export_other/export_other_object.hpp b/cpp-dump/hpp/export_var/export_other/export_other_object.hpp index 1d54588c..9bc7b31e 100644 --- a/cpp-dump/hpp/export_var/export_other/export_other_object.hpp +++ b/cpp-dump/hpp/export_var/export_other/export_other_object.hpp @@ -42,7 +42,7 @@ bool fail_on_newline, \ const export_command &command \ ) { \ - std::string class_name = styled_class_name_str(#TYPE); \ + std::string class_name = style_class_name(#TYPE); \ \ _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; \ \ diff --git a/cpp-dump/hpp/export_var/export_other/export_type_info.hpp b/cpp-dump/hpp/export_var/export_other/export_type_info.hpp index 3b47a97c..c29643b9 100644 --- a/cpp-dump/hpp/export_var/export_other/export_type_info.hpp +++ b/cpp-dump/hpp/export_var/export_other/export_type_info.hpp @@ -34,9 +34,8 @@ inline auto export_type_info( bool fail_on_newline, const export_command &command ) -> std::enable_if_t, std::string> { - std::string class_name = styled_class_name_str( - std::is_same_v ? "std::type_info" : "std::type_index" - ); + std::string class_name = + style_class_name(std::is_same_v ? "std::type_info" : "std::type_index"); #if defined(__GNUC__) int status = 0; diff --git a/cpp-dump/hpp/export_var/export_xixo.hpp b/cpp-dump/hpp/export_var/export_xixo.hpp index 4afe26bc..0c6d209c 100644 --- a/cpp-dump/hpp/export_var/export_xixo.hpp +++ b/cpp-dump/hpp/export_var/export_xixo.hpp @@ -29,7 +29,7 @@ inline std::string export_xixo( bool fail_on_newline, const export_command &command ) { - std::string class_name = styled_class_name_str("std::queue"); + std::string class_name = style_class_name("std::queue"); _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; @@ -51,7 +51,7 @@ inline std::string export_xixo( bool fail_on_newline, const export_command &command ) { - std::string class_name = styled_class_name_str("std::priority_queue"); + std::string class_name = style_class_name("std::priority_queue"); _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; @@ -70,7 +70,7 @@ inline std::string export_xixo( bool fail_on_newline, const export_command &command ) { - std::string class_name = styled_class_name_str("std::stack"); + std::string class_name = style_class_name("std::stack"); _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; From 195d127f92775dff997d2a6cc37742707a35c3b8 Mon Sep 17 00:00:00 2001 From: philip82148 <92205270+philip82148@users.noreply.github.com> Date: Mon, 10 Feb 2025 23:33:28 +0900 Subject: [PATCH 20/25] refactoring --- cpp-dump/hpp/class_name.hpp | 41 ++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/cpp-dump/hpp/class_name.hpp b/cpp-dump/hpp/class_name.hpp index a1f6c4f3..a6588261 100644 --- a/cpp-dump/hpp/class_name.hpp +++ b/cpp-dump/hpp/class_name.hpp @@ -20,56 +20,51 @@ namespace cpp_dump { namespace _detail { inline std::string style_class_name(std::string_view class_name) { - std::string styled(class_name); - + std::string raw_output(class_name); if (options::class_name_style & flags::class_name_style::no_temp_args) { - std::string no_args; + std::string raw_output_wo_arg; int lt_count = 0; - for (auto c : styled) { + for (auto c : raw_output) { if (c == '<') { ++lt_count; } else if (c == '>') { --lt_count; } else if (lt_count == 0) { - no_args.push_back(c); + raw_output_wo_arg.push_back(c); } } - styled.swap(no_args); + raw_output.swap(raw_output_wo_arg); } - if (options::class_name_style & flags::class_name_style::no_namespace) { - std::string no_ns; - - for (int i = static_cast(styled.size() - 1); i >= 0; --i) { - if (styled[i] != ':') { + std::string raw_output_wo_namespace; + for (int i = static_cast(raw_output.size() - 1); i >= 0; --i) { + if (raw_output[i] != ':') { // append class name - no_ns.push_back(styled[i]); + raw_output_wo_namespace.push_back(raw_output[i]); continue; } // skip namespace int gt_count = 0; for (--i; i >= 0; --i) { - if (styled[i] == '>') { + if (raw_output[i] == '>') { ++gt_count; - } else if (styled[i] == '<') { + } else if (raw_output[i] == '<') { --gt_count; if (gt_count < 0) { - no_ns.push_back(styled[i]); + raw_output_wo_namespace.push_back(raw_output[i]); break; } } } } - std::reverse(no_ns.begin(), no_ns.end()); - - styled.swap(no_ns); + std::reverse(raw_output_wo_namespace.begin(), raw_output_wo_namespace.end()); + raw_output.swap(raw_output_wo_namespace); } - - if (options::class_name_style & flags::class_name_style::max_width_20 && styled.size() > 20) - return es::class_name(styled.substr(0, 17)) + es::op("..."); - - return es::class_name(styled); + if (options::class_name_style & flags::class_name_style::max_width_20 && raw_output.size() > 20) { + return es::class_name(raw_output.substr(0, 17)) + es::op("..."); + } + return es::class_name(raw_output); } // The return type must be a built-in type, otherwise we don't know how it will be stringified. From 041023800906033af7f97ec864b409bda609f409 Mon Sep 17 00:00:00 2001 From: philip82148 <92205270+philip82148@users.noreply.github.com> Date: Tue, 11 Feb 2025 00:04:08 +0900 Subject: [PATCH 21/25] style_class_name -> format_class_name --- cpp-dump/hpp/class_name.hpp | 6 +++--- cpp-dump/hpp/export_var/export_enum_generic.hpp | 2 +- cpp-dump/hpp/export_var/export_exception.hpp | 2 +- cpp-dump/hpp/export_var/export_object.hpp | 2 +- cpp-dump/hpp/export_var/export_object_generic.hpp | 2 +- cpp-dump/hpp/export_var/export_other/export_es_value_t.hpp | 2 +- cpp-dump/hpp/export_var/export_other/export_optional.hpp | 4 ++-- .../hpp/export_var/export_other/export_other_object.hpp | 2 +- cpp-dump/hpp/export_var/export_other/export_type_info.hpp | 2 +- cpp-dump/hpp/export_var/export_xixo.hpp | 6 +++--- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cpp-dump/hpp/class_name.hpp b/cpp-dump/hpp/class_name.hpp index a6588261..25f856b2 100644 --- a/cpp-dump/hpp/class_name.hpp +++ b/cpp-dump/hpp/class_name.hpp @@ -19,7 +19,7 @@ namespace cpp_dump { namespace _detail { -inline std::string style_class_name(std::string_view class_name) { +inline std::string format_class_name(std::string_view class_name) { std::string raw_output(class_name); if (options::class_name_style & flags::class_name_style::no_temp_args) { std::string raw_output_wo_arg; @@ -117,9 +117,9 @@ std::string _get_class_name() { // Currently, used only by export_exception(), CPP_DUMP_DEFINE_EXPORT_OBJECT_GENERIC(), and // CPP_DUMP_DEFINE_EXPORT_ENUM_GENERIC() template -inline std::string style_class_name_auto() { +inline std::string format_class_name_auto() { static std::string class_name = _get_class_name(); - return style_class_name(class_name); + return format_class_name(class_name); } } // namespace _detail diff --git a/cpp-dump/hpp/export_var/export_enum_generic.hpp b/cpp-dump/hpp/export_var/export_enum_generic.hpp index 7a9fde95..ad6aa332 100644 --- a/cpp-dump/hpp/export_var/export_enum_generic.hpp +++ b/cpp-dump/hpp/export_var/export_enum_generic.hpp @@ -37,7 +37,7 @@ decltype(_p_CPP_DUMP_EXPAND_VA(_p_CPP_DUMP_EXPAND_FOR_EXPORT_ENUM_GENERIC, __VA_ARGS__), std::string())> { \ static const std::map enum_to_string{ \ _p_CPP_DUMP_EXPAND_VA(_p_CPP_DUMP_EXPAND_FOR_EXPORT_ENUM_GENERIC2, __VA_ARGS__)}; \ - return style_class_name_auto() + es::op("::") \ + return format_class_name_auto() + es::op("::") \ + (enum_to_string.count(value) ? es::member(enum_to_string.at(value)) \ : es::unsupported("?")); \ } \ diff --git a/cpp-dump/hpp/export_var/export_exception.hpp b/cpp-dump/hpp/export_var/export_exception.hpp index 33bfd9c1..ba548dba 100644 --- a/cpp-dump/hpp/export_var/export_exception.hpp +++ b/cpp-dump/hpp/export_var/export_exception.hpp @@ -29,7 +29,7 @@ inline auto export_exception( bool fail_on_newline, const export_command &command ) -> std::enable_if_t, std::string> { - std::string class_name = style_class_name_auto(); + std::string class_name = format_class_name_auto(); _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; diff --git a/cpp-dump/hpp/export_var/export_object.hpp b/cpp-dump/hpp/export_var/export_object.hpp index 9c024147..1257cb19 100644 --- a/cpp-dump/hpp/export_var/export_object.hpp +++ b/cpp-dump/hpp/export_var/export_object.hpp @@ -39,7 +39,7 @@ bool fail_on_newline, \ const export_command &command \ ) { \ - std::string class_name = style_class_name(#TYPE); \ + std::string class_name = format_class_name(#TYPE); \ \ _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; \ \ diff --git a/cpp-dump/hpp/export_var/export_object_generic.hpp b/cpp-dump/hpp/export_var/export_object_generic.hpp index 8eea31c5..f87310b5 100644 --- a/cpp-dump/hpp/export_var/export_object_generic.hpp +++ b/cpp-dump/hpp/export_var/export_object_generic.hpp @@ -37,7 +37,7 @@ bool fail_on_newline, \ const export_command &command \ ) -> decltype(_p_CPP_DUMP_EXPAND_VA(_p_CPP_DUMP_EXPAND_FOR_EXPORT_OBJECT_GENERIC, __VA_ARGS__), std::string()) { \ - std::string class_name = style_class_name_auto(); \ + std::string class_name = format_class_name_auto(); \ \ _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; \ \ diff --git a/cpp-dump/hpp/export_var/export_other/export_es_value_t.hpp b/cpp-dump/hpp/export_var/export_other/export_es_value_t.hpp index 824056f6..bf89177c 100644 --- a/cpp-dump/hpp/export_var/export_other/export_es_value_t.hpp +++ b/cpp-dump/hpp/export_var/export_other/export_es_value_t.hpp @@ -119,7 +119,7 @@ inline std::string export_es_value_t( bool fail_on_newline, const export_command &command ) { - std::string class_name = style_class_name("cpp_dump::types::es_value_t"); + std::string class_name = format_class_name("cpp_dump::types::es_value_t"); _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1_1; diff --git a/cpp-dump/hpp/export_var/export_other/export_optional.hpp b/cpp-dump/hpp/export_var/export_other/export_optional.hpp index 663174ce..5e623d6e 100644 --- a/cpp-dump/hpp/export_var/export_other/export_optional.hpp +++ b/cpp-dump/hpp/export_var/export_other/export_optional.hpp @@ -24,7 +24,7 @@ namespace _detail { inline std::string export_optional(const std::nullopt_t &, const std::string &, std::size_t, std::size_t, bool, const export_command &) { - return style_class_name("std::nullopt"); + return format_class_name("std::nullopt"); } namespace es { @@ -45,7 +45,7 @@ inline auto export_optional( const export_command &command ) -> std::enable_if_t, std::string> { if (optional == std::nullopt) { - return style_class_name("std::nullopt"); + return format_class_name("std::nullopt"); } return es::_optional_question("?") + export_var( diff --git a/cpp-dump/hpp/export_var/export_other/export_other_object.hpp b/cpp-dump/hpp/export_var/export_other/export_other_object.hpp index 9bc7b31e..61f1bc89 100644 --- a/cpp-dump/hpp/export_var/export_other/export_other_object.hpp +++ b/cpp-dump/hpp/export_var/export_other/export_other_object.hpp @@ -42,7 +42,7 @@ bool fail_on_newline, \ const export_command &command \ ) { \ - std::string class_name = style_class_name(#TYPE); \ + std::string class_name = format_class_name(#TYPE); \ \ _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; \ \ diff --git a/cpp-dump/hpp/export_var/export_other/export_type_info.hpp b/cpp-dump/hpp/export_var/export_other/export_type_info.hpp index d55ab767..55b066d0 100644 --- a/cpp-dump/hpp/export_var/export_other/export_type_info.hpp +++ b/cpp-dump/hpp/export_var/export_other/export_type_info.hpp @@ -35,7 +35,7 @@ inline auto export_type_info( const export_command &command ) -> std::enable_if_t, std::string> { std::string class_name = - style_class_name(std::is_same_v ? "std::type_info" : "std::type_index"); + format_class_name(std::is_same_v ? "std::type_info" : "std::type_index"); #if defined(__GNUC__) int status = 0; diff --git a/cpp-dump/hpp/export_var/export_xixo.hpp b/cpp-dump/hpp/export_var/export_xixo.hpp index b3af8786..2ba34b5d 100644 --- a/cpp-dump/hpp/export_var/export_xixo.hpp +++ b/cpp-dump/hpp/export_var/export_xixo.hpp @@ -29,7 +29,7 @@ inline std::string export_xixo( bool fail_on_newline, const export_command &command ) { - std::string class_name = style_class_name("std::queue"); + std::string class_name = format_class_name("std::queue"); _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; @@ -53,7 +53,7 @@ inline std::string export_xixo( bool fail_on_newline, const export_command &command ) { - std::string class_name = style_class_name("std::priority_queue"); + std::string class_name = format_class_name("std::priority_queue"); _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; @@ -74,7 +74,7 @@ inline std::string export_xixo( bool fail_on_newline, const export_command &command ) { - std::string class_name = style_class_name("std::stack"); + std::string class_name = format_class_name("std::stack"); _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; From df5ca329b42b12ff0de93bf6e42be19e653cea50 Mon Sep 17 00:00:00 2001 From: philip82148 <92205270+philip82148@users.noreply.github.com> Date: Tue, 11 Feb 2025 00:06:53 +0900 Subject: [PATCH 22/25] class_name_style -> class_name_format --- cpp-dump/hpp/class_name.hpp | 7 +-- cpp-dump/hpp/options.hpp | 6 +-- test/dump_variable_test.cpp | 8 ++-- test/txt/color_variable_clang_by_syntax.txt | 48 ++++++++++----------- test/txt/color_variable_clang_original.txt | 48 ++++++++++----------- test/txt/color_variable_gnu_by_syntax.txt | 48 ++++++++++----------- test/txt/color_variable_gnu_original.txt | 48 ++++++++++----------- test/txt/color_variable_msvc_by_syntax.txt | 48 ++++++++++----------- test/txt/color_variable_msvc_original.txt | 48 ++++++++++----------- test/txt/dump_variable_clang.txt | 48 ++++++++++----------- test/txt/dump_variable_gnu.txt | 48 ++++++++++----------- test/txt/dump_variable_msvc.txt | 48 ++++++++++----------- 12 files changed, 227 insertions(+), 226 deletions(-) diff --git a/cpp-dump/hpp/class_name.hpp b/cpp-dump/hpp/class_name.hpp index 25f856b2..25317a17 100644 --- a/cpp-dump/hpp/class_name.hpp +++ b/cpp-dump/hpp/class_name.hpp @@ -21,7 +21,7 @@ namespace _detail { inline std::string format_class_name(std::string_view class_name) { std::string raw_output(class_name); - if (options::class_name_style & flags::class_name_style::no_temp_args) { + if (options::class_name_format & flags::class_name_format::no_temp_args) { std::string raw_output_wo_arg; int lt_count = 0; for (auto c : raw_output) { @@ -35,7 +35,7 @@ inline std::string format_class_name(std::string_view class_name) { } raw_output.swap(raw_output_wo_arg); } - if (options::class_name_style & flags::class_name_style::no_namespace) { + if (options::class_name_format & flags::class_name_format::no_namespace) { std::string raw_output_wo_namespace; for (int i = static_cast(raw_output.size() - 1); i >= 0; --i) { if (raw_output[i] != ':') { @@ -61,7 +61,8 @@ inline std::string format_class_name(std::string_view class_name) { std::reverse(raw_output_wo_namespace.begin(), raw_output_wo_namespace.end()); raw_output.swap(raw_output_wo_namespace); } - if (options::class_name_style & flags::class_name_style::max_width_20 && raw_output.size() > 20) { + if (options::class_name_format & flags::class_name_format::max_width_20 + && raw_output.size() > 20) { return es::class_name(raw_output.substr(0, 17)) + es::op("..."); } return es::class_name(raw_output); diff --git a/cpp-dump/hpp/options.hpp b/cpp-dump/hpp/options.hpp index 76c39eb2..d92c235b 100644 --- a/cpp-dump/hpp/options.hpp +++ b/cpp-dump/hpp/options.hpp @@ -87,14 +87,14 @@ struct es_value_t { namespace flags { -namespace class_name_style { +namespace class_name_format { inline constexpr unsigned int fullname = 0; inline constexpr unsigned int no_temp_args = 1u << 0; inline constexpr unsigned int no_namespace = 1u << 1; inline constexpr unsigned int max_width_20 = 1u << 2; -}; // namespace class_name_style +}; // namespace class_name_format } // namespace flags @@ -141,7 +141,7 @@ inline types::log_label_func_t log_label_func = log_label::default_func; * Style of class name. * This is an experimental feature. */ -inline unsigned int class_name_style = flags::class_name_style::no_temp_args; +inline unsigned int class_name_format = flags::class_name_format::no_temp_args; /** * Style of the escape sequences (output coloring). diff --git a/test/dump_variable_test.cpp b/test/dump_variable_test.cpp index 6fd8ba31..3271448e 100644 --- a/test/dump_variable_test.cpp +++ b/test/dump_variable_test.cpp @@ -87,10 +87,10 @@ int main(int argc, char *argv[]) { ); rep(style, 1 << 3) { - CPP_DUMP_SET_OPTION(class_name_style, style); - cpp_dump(bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args)); - cpp_dump(bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace)); - cpp_dump(bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20)); + CPP_DUMP_SET_OPTION(class_name_format, style); + cpp_dump(bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args)); + cpp_dump(bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace)); + cpp_dump(bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20)); cpp_dump(original_error1); cpp_dump(ns::template_class>()); cpp_dump(long_name_original_class()); diff --git a/test/txt/color_variable_clang_by_syntax.txt b/test/txt/color_variable_clang_by_syntax.txt index eacca3bb..6cf85359 100644 --- a/test/txt/color_variable_clang_by_syntax.txt +++ b/test/txt/color_variable_clang_by_syntax.txt @@ -1,6 +1,6 @@ -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class<ns::template_class<int>>{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -9,9 +9,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -20,9 +20,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class<template_class<int>>{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -31,9 +31,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -42,9 +42,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -52,9 +52,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -62,9 +62,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class<te...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -72,9 +72,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/color_variable_clang_original.txt b/test/txt/color_variable_clang_original.txt index 5e87cdb3..0aaa85e4 100644 --- a/test/txt/color_variable_clang_original.txt +++ b/test/txt/color_variable_clang_original.txt @@ -1,6 +1,6 @@ -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class>{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -9,9 +9,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -20,9 +20,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class>{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -31,9 +31,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -42,9 +42,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -52,9 +52,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -62,9 +62,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -72,9 +72,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/color_variable_gnu_by_syntax.txt b/test/txt/color_variable_gnu_by_syntax.txt index fc92d91b..94afae6e 100644 --- a/test/txt/color_variable_gnu_by_syntax.txt +++ b/test/txt/color_variable_gnu_by_syntax.txt @@ -1,6 +1,6 @@ -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class<ns::template_class<int> >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -10,9 +10,9 @@ long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -22,9 +22,9 @@ long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class<template_class<int> >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -33,9 +33,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -44,9 +44,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } @@ -55,9 +55,9 @@ [dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2,  long_name_original_scoped_enum::member3 => main(int, char**)...::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } @@ -66,9 +66,9 @@ [dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2,  long_name_original_scoped_enum::member3 => main(int, char**)...::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class<te...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -76,9 +76,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/color_variable_gnu_original.txt b/test/txt/color_variable_gnu_original.txt index 306d5186..c9378f4f 100644 --- a/test/txt/color_variable_gnu_original.txt +++ b/test/txt/color_variable_gnu_original.txt @@ -1,6 +1,6 @@ -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -10,9 +10,9 @@ long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -22,9 +22,9 @@ long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -33,9 +33,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -44,9 +44,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } @@ -55,9 +55,9 @@ [dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2,  long_name_original_scoped_enum::member3 => main(int, char**)...::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } @@ -66,9 +66,9 @@ [dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2,  long_name_original_scoped_enum::member3 => main(int, char**)...::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -76,9 +76,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/color_variable_msvc_by_syntax.txt b/test/txt/color_variable_msvc_by_syntax.txt index 9a762fda..d09e02c5 100644 --- a/test/txt/color_variable_msvc_by_syntax.txt +++ b/test/txt/color_variable_msvc_by_syntax.txt @@ -1,6 +1,6 @@ -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class<ns::template_class<int> >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -10,9 +10,9 @@ long_name_original_scoped_enum::member2 => main::long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => main::long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -22,9 +22,9 @@ long_name_original_scoped_enum::member2 => main::long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => main::long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class<template_class<int> >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -33,9 +33,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -44,9 +44,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } @@ -55,9 +55,9 @@ [dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2,  long_name_original_scoped_enum::member3 => main::long_name_o...::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } @@ -66,9 +66,9 @@ [dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2,  long_name_original_scoped_enum::member3 => main::long_name_o...::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class<te...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -76,9 +76,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/color_variable_msvc_original.txt b/test/txt/color_variable_msvc_original.txt index 614209f5..3305c218 100644 --- a/test/txt/color_variable_msvc_original.txt +++ b/test/txt/color_variable_msvc_original.txt @@ -1,6 +1,6 @@ -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -10,9 +10,9 @@ long_name_original_scoped_enum::member2 => main::long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => main::long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -22,9 +22,9 @@ long_name_original_scoped_enum::member2 => main::long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => main::long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -33,9 +33,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -44,9 +44,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } @@ -55,9 +55,9 @@ [dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2,  long_name_original_scoped_enum::member3 => main::long_name_o...::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } @@ -66,9 +66,9 @@ [dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2,  long_name_original_scoped_enum::member3 => main::long_name_o...::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -76,9 +76,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/dump_variable_clang.txt b/test/txt/dump_variable_clang.txt index fa10d56e..5f848b51 100644 --- a/test/txt/dump_variable_clang.txt +++ b/test/txt/dump_variable_clang.txt @@ -1,6 +1,6 @@ -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class>{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -9,9 +9,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -20,9 +20,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class>{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -31,9 +31,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -42,9 +42,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -52,9 +52,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -62,9 +62,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -72,9 +72,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/dump_variable_gnu.txt b/test/txt/dump_variable_gnu.txt index 95815290..e4534d94 100644 --- a/test/txt/dump_variable_gnu.txt +++ b/test/txt/dump_variable_gnu.txt @@ -1,6 +1,6 @@ -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -10,9 +10,9 @@ long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -22,9 +22,9 @@ long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -33,9 +33,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -44,9 +44,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } @@ -55,9 +55,9 @@ [dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2, long_name_original_scoped_enum::member3 => main(int, char**)...::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } @@ -66,9 +66,9 @@ [dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2, long_name_original_scoped_enum::member3 => main(int, char**)...::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -76,9 +76,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/dump_variable_msvc.txt b/test/txt/dump_variable_msvc.txt index 8766e8d9..11986c7d 100644 --- a/test/txt/dump_variable_msvc.txt +++ b/test/txt/dump_variable_msvc.txt @@ -1,6 +1,6 @@ -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -10,9 +10,9 @@ long_name_original_scoped_enum::member2 => main::long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => main::long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -22,9 +22,9 @@ long_name_original_scoped_enum::member2 => main::long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => main::long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -33,9 +33,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -44,9 +44,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } @@ -55,9 +55,9 @@ [dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2, long_name_original_scoped_enum::member3 => main::long_name_o...::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } @@ -66,9 +66,9 @@ [dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2, long_name_original_scoped_enum::member3 => main::long_name_o...::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => false -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -76,9 +76,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_temp_args) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::no_namespace) => true -[dump] bool(cp::options::class_name_style & cp::flags::class_name_style::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } From 4622f6844362f5b3bfdf9854a9f8e284cfe84e44 Mon Sep 17 00:00:00 2001 From: philip82148 <92205270+philip82148@users.noreply.github.com> Date: Tue, 11 Feb 2025 00:18:23 +0900 Subject: [PATCH 23/25] flags::class_name_format -> types::class_name_format_f --- cpp-dump/hpp/class_name.hpp | 6 +-- cpp-dump/hpp/options.hpp | 27 ++++++------ test/dump_variable_test.cpp | 6 +-- test/txt/color_variable_clang_by_syntax.txt | 48 ++++++++++----------- test/txt/color_variable_clang_original.txt | 48 ++++++++++----------- test/txt/color_variable_gnu_by_syntax.txt | 48 ++++++++++----------- test/txt/color_variable_gnu_original.txt | 48 ++++++++++----------- test/txt/color_variable_msvc_by_syntax.txt | 48 ++++++++++----------- test/txt/color_variable_msvc_original.txt | 48 ++++++++++----------- test/txt/dump_variable_clang.txt | 48 ++++++++++----------- test/txt/dump_variable_gnu.txt | 48 ++++++++++----------- test/txt/dump_variable_msvc.txt | 48 ++++++++++----------- 12 files changed, 234 insertions(+), 237 deletions(-) diff --git a/cpp-dump/hpp/class_name.hpp b/cpp-dump/hpp/class_name.hpp index 25317a17..c49eb374 100644 --- a/cpp-dump/hpp/class_name.hpp +++ b/cpp-dump/hpp/class_name.hpp @@ -21,7 +21,7 @@ namespace _detail { inline std::string format_class_name(std::string_view class_name) { std::string raw_output(class_name); - if (options::class_name_format & flags::class_name_format::no_temp_args) { + if (options::class_name_format & types::class_name_format_f::no_temp_args) { std::string raw_output_wo_arg; int lt_count = 0; for (auto c : raw_output) { @@ -35,7 +35,7 @@ inline std::string format_class_name(std::string_view class_name) { } raw_output.swap(raw_output_wo_arg); } - if (options::class_name_format & flags::class_name_format::no_namespace) { + if (options::class_name_format & types::class_name_format_f::no_namespace) { std::string raw_output_wo_namespace; for (int i = static_cast(raw_output.size() - 1); i >= 0; --i) { if (raw_output[i] != ':') { @@ -61,7 +61,7 @@ inline std::string format_class_name(std::string_view class_name) { std::reverse(raw_output_wo_namespace.begin(), raw_output_wo_namespace.end()); raw_output.swap(raw_output_wo_namespace); } - if (options::class_name_format & flags::class_name_format::max_width_20 + if (options::class_name_format & types::class_name_format_f::max_width_20 && raw_output.size() > 20) { return es::class_name(raw_output.substr(0, 17)) + es::op("..."); } diff --git a/cpp-dump/hpp/options.hpp b/cpp-dump/hpp/options.hpp index d92c235b..46223a45 100644 --- a/cpp-dump/hpp/options.hpp +++ b/cpp-dump/hpp/options.hpp @@ -83,20 +83,17 @@ struct es_value_t { std::string number_op{}; // default }; -} // namespace types - -namespace flags { - -namespace class_name_format { - -inline constexpr unsigned int fullname = 0; -inline constexpr unsigned int no_temp_args = 1u << 0; -inline constexpr unsigned int no_namespace = 1u << 1; -inline constexpr unsigned int max_width_20 = 1u << 2; - -}; // namespace class_name_format +/** + * Type that holds the flags for class_name_format. + */ +struct class_name_format_f { + static constexpr unsigned int unset = 0; + static constexpr unsigned int no_temp_args = 1u << 0; + static constexpr unsigned int no_namespace = 1u << 1; + static constexpr unsigned int max_width_20 = 1u << 2; +}; -} // namespace flags +} // namespace types namespace options { @@ -138,10 +135,10 @@ inline bool print_expr = true; inline types::log_label_func_t log_label_func = log_label::default_func; /** - * Style of class name. + * Format of the class name when printing objects. * This is an experimental feature. */ -inline unsigned int class_name_format = flags::class_name_format::no_temp_args; +inline unsigned int class_name_format = types::class_name_format_f::no_temp_args; /** * Style of the escape sequences (output coloring). diff --git a/test/dump_variable_test.cpp b/test/dump_variable_test.cpp index 3271448e..4f761367 100644 --- a/test/dump_variable_test.cpp +++ b/test/dump_variable_test.cpp @@ -88,9 +88,9 @@ int main(int argc, char *argv[]) { rep(style, 1 << 3) { CPP_DUMP_SET_OPTION(class_name_format, style); - cpp_dump(bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args)); - cpp_dump(bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace)); - cpp_dump(bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20)); + cpp_dump(bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args)); + cpp_dump(bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace)); + cpp_dump(bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20)); cpp_dump(original_error1); cpp_dump(ns::template_class>()); cpp_dump(long_name_original_class()); diff --git a/test/txt/color_variable_clang_by_syntax.txt b/test/txt/color_variable_clang_by_syntax.txt index 6cf85359..011c179c 100644 --- a/test/txt/color_variable_clang_by_syntax.txt +++ b/test/txt/color_variable_clang_by_syntax.txt @@ -1,6 +1,6 @@ -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class<ns::template_class<int>>{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -9,9 +9,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -20,9 +20,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class<template_class<int>>{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -31,9 +31,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -42,9 +42,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -52,9 +52,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -62,9 +62,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class<te...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -72,9 +72,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/color_variable_clang_original.txt b/test/txt/color_variable_clang_original.txt index 0aaa85e4..396a6624 100644 --- a/test/txt/color_variable_clang_original.txt +++ b/test/txt/color_variable_clang_original.txt @@ -1,6 +1,6 @@ -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class>{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -9,9 +9,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -20,9 +20,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class>{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -31,9 +31,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -42,9 +42,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -52,9 +52,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -62,9 +62,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -72,9 +72,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/color_variable_gnu_by_syntax.txt b/test/txt/color_variable_gnu_by_syntax.txt index 94afae6e..e79cee2c 100644 --- a/test/txt/color_variable_gnu_by_syntax.txt +++ b/test/txt/color_variable_gnu_by_syntax.txt @@ -1,6 +1,6 @@ -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class<ns::template_class<int> >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -10,9 +10,9 @@ long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -22,9 +22,9 @@ long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class<template_class<int> >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -33,9 +33,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -44,9 +44,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } @@ -55,9 +55,9 @@ [dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2,  long_name_original_scoped_enum::member3 => main(int, char**)...::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } @@ -66,9 +66,9 @@ [dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2,  long_name_original_scoped_enum::member3 => main(int, char**)...::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class<te...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -76,9 +76,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/color_variable_gnu_original.txt b/test/txt/color_variable_gnu_original.txt index c9378f4f..cd9b2295 100644 --- a/test/txt/color_variable_gnu_original.txt +++ b/test/txt/color_variable_gnu_original.txt @@ -1,6 +1,6 @@ -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -10,9 +10,9 @@ long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -22,9 +22,9 @@ long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -33,9 +33,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -44,9 +44,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } @@ -55,9 +55,9 @@ [dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2,  long_name_original_scoped_enum::member3 => main(int, char**)...::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } @@ -66,9 +66,9 @@ [dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2,  long_name_original_scoped_enum::member3 => main(int, char**)...::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -76,9 +76,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/color_variable_msvc_by_syntax.txt b/test/txt/color_variable_msvc_by_syntax.txt index d09e02c5..8ae6335b 100644 --- a/test/txt/color_variable_msvc_by_syntax.txt +++ b/test/txt/color_variable_msvc_by_syntax.txt @@ -1,6 +1,6 @@ -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class<ns::template_class<int> >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -10,9 +10,9 @@ long_name_original_scoped_enum::member2 => main::long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => main::long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -22,9 +22,9 @@ long_name_original_scoped_enum::member2 => main::long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => main::long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class<template_class<int> >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -33,9 +33,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -44,9 +44,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } @@ -55,9 +55,9 @@ [dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2,  long_name_original_scoped_enum::member3 => main::long_name_o...::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } @@ -66,9 +66,9 @@ [dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2,  long_name_original_scoped_enum::member3 => main::long_name_o...::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class<te...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -76,9 +76,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/color_variable_msvc_original.txt b/test/txt/color_variable_msvc_original.txt index 3305c218..1edba065 100644 --- a/test/txt/color_variable_msvc_original.txt +++ b/test/txt/color_variable_msvc_original.txt @@ -1,6 +1,6 @@ -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -10,9 +10,9 @@ long_name_original_scoped_enum::member2 => main::long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => main::long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -22,9 +22,9 @@ long_name_original_scoped_enum::member2 => main::long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => main::long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -33,9 +33,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -44,9 +44,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2,  long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } @@ -55,9 +55,9 @@ [dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2,  long_name_original_scoped_enum::member3 => main::long_name_o...::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } @@ -66,9 +66,9 @@ [dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2,  long_name_original_scoped_enum::member3 => main::long_name_o...::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -76,9 +76,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/dump_variable_clang.txt b/test/txt/dump_variable_clang.txt index 5f848b51..a4c16fab 100644 --- a/test/txt/dump_variable_clang.txt +++ b/test/txt/dump_variable_clang.txt @@ -1,6 +1,6 @@ -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class>{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -9,9 +9,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -20,9 +20,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class>{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -31,9 +31,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -42,9 +42,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -52,9 +52,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -62,9 +62,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -72,9 +72,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/dump_variable_gnu.txt b/test/txt/dump_variable_gnu.txt index e4534d94..b36bd9c3 100644 --- a/test/txt/dump_variable_gnu.txt +++ b/test/txt/dump_variable_gnu.txt @@ -1,6 +1,6 @@ -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -10,9 +10,9 @@ long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => main(int, char**)::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -22,9 +22,9 @@ long_name_original_scoped_enum::member2 => main(int, char**)::long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => main(int, char**)::long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -33,9 +33,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -44,9 +44,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } @@ -55,9 +55,9 @@ [dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2, long_name_original_scoped_enum::member3 => main(int, char**)...::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } @@ -66,9 +66,9 @@ [dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2, long_name_original_scoped_enum::member3 => main(int, char**)...::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -76,9 +76,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } diff --git a/test/txt/dump_variable_msvc.txt b/test/txt/dump_variable_msvc.txt index 11986c7d..c8b799e9 100644 --- a/test/txt/dump_variable_msvc.txt +++ b/test/txt/dump_variable_msvc.txt @@ -1,6 +1,6 @@ -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -10,9 +10,9 @@ long_name_original_scoped_enum::member2 => main::long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => main::long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -22,9 +22,9 @@ long_name_original_scoped_enum::member2 => main::long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => main::long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class >{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -33,9 +33,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => false [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_original_class{ member_var= 5, member_func()= "This is a member_func." } @@ -44,9 +44,9 @@ long_name_original_scoped_enum::member2 => long_name_original_scoped_enum::member2, long_name_original_scoped_enum::member3 => long_name_original_scoped_enum::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } @@ -55,9 +55,9 @@ [dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2, long_name_original_scoped_enum::member3 => main::long_name_o...::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } @@ -66,9 +66,9 @@ [dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2, long_name_original_scoped_enum::member3 => main::long_name_o...::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => false -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } @@ -76,9 +76,9 @@ [dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2, long_name_original_scoped_enum::member3 => long_name_origina...::? -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_temp_args) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::no_namespace) => true -[dump] bool(cp::options::class_name_format & cp::flags::class_name_format::max_width_20) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true +[dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } [dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } From 5174e46a50477139e658270c2d9e5ed45337cdfd Mon Sep 17 00:00:00 2001 From: philip82148 <92205270+philip82148@users.noreply.github.com> Date: Tue, 11 Feb 2025 00:30:08 +0900 Subject: [PATCH 24/25] change ellipsis color in class name --- cpp-dump/hpp/class_name.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp-dump/hpp/class_name.hpp b/cpp-dump/hpp/class_name.hpp index c49eb374..bd71d66a 100644 --- a/cpp-dump/hpp/class_name.hpp +++ b/cpp-dump/hpp/class_name.hpp @@ -63,7 +63,7 @@ inline std::string format_class_name(std::string_view class_name) { } if (options::class_name_format & types::class_name_format_f::max_width_20 && raw_output.size() > 20) { - return es::class_name(raw_output.substr(0, 17)) + es::op("..."); + return es::class_name(raw_output.substr(0, 17) + "..."); } return es::class_name(raw_output); } From 0a7a370517e54cd5471b1c7c2894b316615cac0a Mon Sep 17 00:00:00 2001 From: philip82148 <92205270+philip82148@users.noreply.github.com> Date: Tue, 11 Feb 2025 00:37:49 +0900 Subject: [PATCH 25/25] update test --- test/txt/color_variable_clang_by_syntax.txt | 28 +++++++-------- test/txt/color_variable_clang_original.txt | 28 +++++++-------- test/txt/color_variable_gnu_by_syntax.txt | 40 ++++++++++----------- test/txt/color_variable_gnu_original.txt | 40 ++++++++++----------- test/txt/color_variable_msvc_by_syntax.txt | 28 +++++++-------- test/txt/color_variable_msvc_original.txt | 28 +++++++-------- 6 files changed, 96 insertions(+), 96 deletions(-) diff --git a/test/txt/color_variable_clang_by_syntax.txt b/test/txt/color_variable_clang_by_syntax.txt index 011c179c..8de3e9d3 100644 --- a/test/txt/color_variable_clang_by_syntax.txt +++ b/test/txt/color_variable_clang_by_syntax.txt @@ -46,40 +46,40 @@ [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } -[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? -[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  - long_name_original_scoped_enum::member3 => long_name_origina...::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? -[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  - long_name_original_scoped_enum::member3 => long_name_origina...::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => template_class<te...{ member_var= 5, member_func()= "This is a member_func." } -[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] ns::template_class>() => template_class<te...{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? -[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  - long_name_original_scoped_enum::member3 => long_name_origina...::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? -[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  - long_name_original_scoped_enum::member3 => long_name_origina...::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? [dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/color_variable_clang_original.txt b/test/txt/color_variable_clang_original.txt index 396a6624..480512fd 100644 --- a/test/txt/color_variable_clang_original.txt +++ b/test/txt/color_variable_clang_original.txt @@ -46,40 +46,40 @@ [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } -[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? -[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  - long_name_original_scoped_enum::member3 => long_name_origina...::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? -[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  - long_name_original_scoped_enum::member3 => long_name_origina...::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? -[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  - long_name_original_scoped_enum::member3 => long_name_origina...::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? -[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  - long_name_original_scoped_enum::member3 => long_name_origina...::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? [dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/color_variable_gnu_by_syntax.txt b/test/txt/color_variable_gnu_by_syntax.txt index e79cee2c..83fbd88c 100644 --- a/test/txt/color_variable_gnu_by_syntax.txt +++ b/test/txt/color_variable_gnu_by_syntax.txt @@ -47,43 +47,43 @@ [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true -[dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } -[dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_enum::member1 => main(int, char**)...::member1, original_enum::member2 => main(int, char**)...::member2,  - original_enum::member3 => main(int, char**)...::? -[dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2,  - long_name_original_scoped_enum::member3 => main(int, char**)...::? +[dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => main(int, char**)...::member1, original_enum::member2 => main(int, char**)...::member2,  + original_enum::member3 => main(int, char**)...::? +[dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2,  + long_name_original_scoped_enum::member3 => main(int, char**)...::? [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true -[dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } +[dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_enum::member1 => main(int, char**)...::member1, original_enum::member2 => main(int, char**)...::member2,  - original_enum::member3 => main(int, char**)...::? -[dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2,  - long_name_original_scoped_enum::member3 => main(int, char**)...::? +[dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => main(int, char**)...::member1, original_enum::member2 => main(int, char**)...::member2,  + original_enum::member3 => main(int, char**)...::? +[dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2,  + long_name_original_scoped_enum::member3 => main(int, char**)...::? [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => template_class<te...{ member_var= 5, member_func()= "This is a member_func." } -[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] ns::template_class>() => template_class<te...{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? -[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  - long_name_original_scoped_enum::member3 => long_name_origina...::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? -[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  - long_name_original_scoped_enum::member3 => long_name_origina...::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? [dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/color_variable_gnu_original.txt b/test/txt/color_variable_gnu_original.txt index cd9b2295..6c550144 100644 --- a/test/txt/color_variable_gnu_original.txt +++ b/test/txt/color_variable_gnu_original.txt @@ -47,43 +47,43 @@ [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true -[dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } -[dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_enum::member1 => main(int, char**)...::member1, original_enum::member2 => main(int, char**)...::member2,  - original_enum::member3 => main(int, char**)...::? -[dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2,  - long_name_original_scoped_enum::member3 => main(int, char**)...::? +[dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } +[dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => main(int, char**)...::member1, original_enum::member2 => main(int, char**)...::member2,  + original_enum::member3 => main(int, char**)...::? +[dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2,  + long_name_original_scoped_enum::member3 => main(int, char**)...::? [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true -[dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } +[dump] original_error1 => main(int, char**)...{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } -[dump] original_enum::member1 => main(int, char**)...::member1, original_enum::member2 => main(int, char**)...::member2,  - original_enum::member3 => main(int, char**)...::? -[dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2,  - long_name_original_scoped_enum::member3 => main(int, char**)...::? +[dump] long_name_original_class() => main(int, char**)...{ member_var= 5, member_func()= "This is a member_func." } +[dump] original_enum::member1 => main(int, char**)...::member1, original_enum::member2 => main(int, char**)...::member2,  + original_enum::member3 => main(int, char**)...::? +[dump] long_name_original_scoped_enum::member1 => main(int, char**)...::member1, long_name_original_scoped_enum::member2 => main(int, char**)...::member2,  + long_name_original_scoped_enum::member3 => main(int, char**)...::? [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? -[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  - long_name_original_scoped_enum::member3 => long_name_origina...::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? -[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  - long_name_original_scoped_enum::member3 => long_name_origina...::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? [dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/color_variable_msvc_by_syntax.txt b/test/txt/color_variable_msvc_by_syntax.txt index 8ae6335b..9ae78d59 100644 --- a/test/txt/color_variable_msvc_by_syntax.txt +++ b/test/txt/color_variable_msvc_by_syntax.txt @@ -48,42 +48,42 @@ [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => main::original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } -[dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } +[dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => main::original_enum::member1, original_enum::member2 => main::original_enum::member2,  original_enum::member3 => main::original_enum::? -[dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2,  - long_name_original_scoped_enum::member3 => main::long_name_o...::? +[dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2,  + long_name_original_scoped_enum::member3 => main::long_name_o...::? [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => main::original_enum::member1, original_enum::member2 => main::original_enum::member2,  original_enum::member3 => main::original_enum::? -[dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2,  - long_name_original_scoped_enum::member3 => main::long_name_o...::? +[dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2,  + long_name_original_scoped_enum::member3 => main::long_name_o...::? [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => template_class<te...{ member_var= 5, member_func()= "This is a member_func." } -[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] ns::template_class>() => template_class<te...{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? -[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  - long_name_original_scoped_enum::member3 => long_name_origina...::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? -[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  - long_name_original_scoped_enum::member3 => long_name_origina...::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? [dump] unsupported_original_class() => Unsupported Type diff --git a/test/txt/color_variable_msvc_original.txt b/test/txt/color_variable_msvc_original.txt index 1edba065..e045f249 100644 --- a/test/txt/color_variable_msvc_original.txt +++ b/test/txt/color_variable_msvc_original.txt @@ -48,42 +48,42 @@ [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => main::original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } -[dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } +[dump] ns::template_class>() => ns::template_clas...{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => main::original_enum::member1, original_enum::member2 => main::original_enum::member2,  original_enum::member3 => main::original_enum::? -[dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2,  - long_name_original_scoped_enum::member3 => main::long_name_o...::? +[dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2,  + long_name_original_scoped_enum::member3 => main::long_name_o...::? [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => false [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => main::original_error{ what()= "This is an original error." } [dump] ns::template_class>() => ns::template_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => main::long_name_o...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => main::original_enum::member1, original_enum::member2 => main::original_enum::member2,  original_enum::member3 => main::original_enum::? -[dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2,  - long_name_original_scoped_enum::member3 => main::long_name_o...::? +[dump] long_name_original_scoped_enum::member1 => main::long_name_o...::member1, long_name_original_scoped_enum::member2 => main::long_name_o...::member2,  + long_name_original_scoped_enum::member3 => main::long_name_o...::? [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => false [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } -[dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] ns::template_class>() => template_class long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? -[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  - long_name_original_scoped_enum::member3 => long_name_origina...::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_temp_args) => true [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::no_namespace) => true [dump] bool(cp::options::class_name_format & cp::types::class_name_format_f::max_width_20) => true [dump] original_error1 => original_error{ what()= "This is an original error." } [dump] ns::template_class>() => template_class{ member_var= 5, member_func()= "This is a member_func." } -[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } +[dump] long_name_original_class() => long_name_origina...{ member_var= 5, member_func()= "This is a member_func." } [dump] original_enum::member1 => original_enum::member1, original_enum::member2 => original_enum::member2, original_enum::member3 => original_enum::? -[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  - long_name_original_scoped_enum::member3 => long_name_origina...::? +[dump] long_name_original_scoped_enum::member1 => long_name_origina...::member1, long_name_original_scoped_enum::member2 => long_name_origina...::member2,  + long_name_original_scoped_enum::member3 => long_name_origina...::? [dump] unsupported_original_class() => Unsupported Type