diff --git a/cpp-dump/hpp/class_name.hpp b/cpp-dump/hpp/class_name.hpp new file mode 100644 index 0000000..bd71d66 --- /dev/null +++ b/cpp-dump/hpp/class_name.hpp @@ -0,0 +1,128 @@ +/* + * 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 + +#include "./escape_sequence.hpp" +#include "./options.hpp" +#include "./type_check.hpp" + +namespace cpp_dump { + +namespace _detail { + +inline std::string format_class_name(std::string_view class_name) { + std::string raw_output(class_name); + 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) { + if (c == '<') { + ++lt_count; + } else if (c == '>') { + --lt_count; + } else if (lt_count == 0) { + raw_output_wo_arg.push_back(c); + } + } + raw_output.swap(raw_output_wo_arg); + } + 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] != ':') { + // append class name + raw_output_wo_namespace.push_back(raw_output[i]); + continue; + } + + // skip namespace + int gt_count = 0; + for (--i; i >= 0; --i) { + if (raw_output[i] == '>') { + ++gt_count; + } else if (raw_output[i] == '<') { + --gt_count; + if (gt_count < 0) { + raw_output_wo_namespace.push_back(raw_output[i]); + break; + } + } + } + } + std::reverse(raw_output_wo_namespace.begin(), raw_output_wo_namespace.end()); + raw_output.swap(raw_output_wo_namespace); + } + 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) + "..."); + } + 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. +template +const char* _get_class_name_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_class_name() { +#if defined(__GNUC__) && !defined(__clang__) + constexpr std::size_t prefix_length = + 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_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_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_class_name_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 +inline std::string format_class_name_auto() { + static std::string class_name = _get_class_name(); + return format_class_name(class_name); +} + +} // namespace _detail + +} // namespace cpp_dump diff --git a/cpp-dump/hpp/export_var/export_enum_generic.hpp b/cpp-dump/hpp/export_var/export_enum_generic.hpp index e54ede7..ad6aa33 100644 --- a/cpp-dump/hpp/export_var/export_enum_generic.hpp +++ b/cpp-dump/hpp/export_var/export_enum_generic.hpp @@ -11,10 +11,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) \ @@ -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 es::class_name(get_typename()) + 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 f91bcea..ba548db 100644 --- a/cpp-dump/hpp/export_var/export_exception.hpp +++ b/cpp-dump/hpp/export_var/export_exception.hpp @@ -10,6 +10,7 @@ #include #include +#include "../class_name.hpp" #include "../escape_sequence.hpp" #include "../export_command/export_command.hpp" #include "../type_check.hpp" @@ -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 = 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 ef3badb..1257cb1 100644 --- a/cpp-dump/hpp/export_var/export_object.hpp +++ b/cpp-dump/hpp/export_var/export_object.hpp @@ -9,6 +9,7 @@ #include +#include "../class_name.hpp" #include "../escape_sequence.hpp" #include "../expand_va_macro.hpp" #include "../export_command/export_command.hpp" @@ -38,7 +39,7 @@ bool fail_on_newline, \ const export_command &command \ ) { \ - std::string class_name = es::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 9570602..f87310b 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_check.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 = 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 43f267e..bf89177 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" @@ -118,7 +119,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 = 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 5558b4e..5e623d6 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 format_class_name("std::nullopt"); } namespace es { @@ -44,7 +45,7 @@ inline auto export_optional( const export_command &command ) -> std::enable_if_t, std::string> { if (optional == std::nullopt) { - return es::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 5bc6e6b..61f1bc8 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 = 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 a1bd0c9..55b066d 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 { @@ -32,7 +35,7 @@ inline auto export_type_info( 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"); + 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 2dc457e..2ba34b5 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 = format_class_name("std::queue"); _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; @@ -52,7 +53,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 = format_class_name("std::priority_queue"); _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; @@ -73,7 +74,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 = format_class_name("std::stack"); _p_CPP_DUMP_DEFINE_EXPORT_OBJECT_COMMON1; diff --git a/cpp-dump/hpp/options.hpp b/cpp-dump/hpp/options.hpp index 9027d80..46223a4 100644 --- a/cpp-dump/hpp/options.hpp +++ b/cpp-dump/hpp/options.hpp @@ -83,6 +83,16 @@ struct es_value_t { std::string number_op{}; // default }; +/** + * 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 types namespace options { @@ -124,6 +134,12 @@ inline bool print_expr = true; */ inline types::log_label_func_t log_label_func = log_label::default_func; +/** + * Format of the class name when printing objects. + * This is an experimental feature. + */ +inline unsigned int class_name_format = types::class_name_format_f::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 c144bb4..1384995 100644 --- a/cpp-dump/hpp/type_check.hpp +++ b/cpp-dump/hpp/type_check.hpp @@ -343,52 +343,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 ", ""); - type_name = replace_string(type_name, "enum ", ""); -#endif - - return type_name; -} - } // namespace _detail } // namespace cpp_dump diff --git a/test/dump_variable_test.cpp b/test/dump_variable_test.cpp index bba0374..4f76136 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, @@ -91,13 +86,28 @@ int main(int argc, char *argv[]) { cpp_dump::_detail::export_command::default_command ); - cpp_dump(original_error1); - cpp_dump(ns::template_class>()); - cpp_dump(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 - ); + rep(style, 1 << 3) { + CPP_DUMP_SET_OPTION(class_name_format, style); + 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()); + cpp_dump(original_enum::member1, original_enum::member2, original_enum::member3); + cpp_dump( + long_name_original_scoped_enum::member1, + long_name_original_scoped_enum::member2, + long_name_original_scoped_enum::member3 + ); + clog << endl; + } + + 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 diff --git a/test/readme_test.cmake b/test/readme_test.cmake index 740359d..78d6898 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 fd17a58..8de3e9d 100644 --- a/test/txt/color_variable_clang_by_syntax.txt +++ b/test/txt/color_variable_clang_by_syntax.txt @@ -1,7 +1,85 @@ +[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] original_class() => original_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] 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_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::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." } +[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::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." } +[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::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." } +[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::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." } +[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::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] 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::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] 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::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] 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 6eec721..480512f 100644 --- a/test/txt/color_variable_clang_original.txt +++ b/test/txt/color_variable_clang_original.txt @@ -1,7 +1,85 @@ +[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] original_class() => original_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] 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_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::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." } +[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::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." } +[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::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." } +[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::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." } +[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::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] 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::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] 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::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] 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 17531c1..83fbd88 100644 --- a/test/txt/color_variable_gnu_by_syntax.txt +++ b/test/txt/color_variable_gnu_by_syntax.txt @@ -1,9 +1,89 @@ +[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] 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] 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::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." } +[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::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." } +[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::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." } +[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::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] 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." } +[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] 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::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] 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 d8a066a..6c55014 100644 --- a/test/txt/color_variable_gnu_original.txt +++ b/test/txt/color_variable_gnu_original.txt @@ -1,9 +1,89 @@ +[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] 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] 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::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." } +[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::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." } +[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::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." } +[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::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] 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." } +[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] 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::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] 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 051f032..9ae78d5 100644 --- a/test/txt/color_variable_msvc_by_syntax.txt +++ b/test/txt/color_variable_msvc_by_syntax.txt @@ -1,8 +1,89 @@ +[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] original_class() => main::original_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] 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_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::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." } +[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::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." } +[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::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." } +[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::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." } +[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::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] 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::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] 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::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] 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 955f9ea..e045f24 100644 --- a/test/txt/color_variable_msvc_original.txt +++ b/test/txt/color_variable_msvc_original.txt @@ -1,8 +1,89 @@ +[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] original_class() => main::original_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] 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_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::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." } +[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::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." } +[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::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." } +[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::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." } +[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::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] 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::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] 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::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] 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 425531c..a4c16fa 100644 --- a/test/txt/dump_variable_clang.txt +++ b/test/txt/dump_variable_clang.txt @@ -1,7 +1,85 @@ +[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] original_class() => original_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] 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_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::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." } +[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::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." } +[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::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." } +[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::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." } +[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::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] 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::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] 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::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] 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 bebfe26..b36bd9c 100644 --- a/test/txt/dump_variable_gnu.txt +++ b/test/txt/dump_variable_gnu.txt @@ -1,9 +1,89 @@ +[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] 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] 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::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." } +[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::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." } +[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::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." } +[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::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] 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." } +[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] 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::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] 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 0398372..c8b799e 100644 --- a/test/txt/dump_variable_msvc.txt +++ b/test/txt/dump_variable_msvc.txt @@ -1,8 +1,89 @@ +[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] original_class() => main::original_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] 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_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::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." } +[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::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." } +[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::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." } +[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::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." } +[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::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] 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::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] 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::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] 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