#include <bits/c++config.h>
#include <bits/cpp_type_traits.h>
-#include <typeinfo>
+
+#if __cpp_rtti
+# include <typeinfo>
+# define _GLIBCXX_TYPEID(_Type) &typeid(_Type)
+#else
+namespace std
+{
+ class type_info;
+}
+# define _GLIBCXX_TYPEID(_Type) 0
+#endif
namespace __gnu_debug
{
enum _Iterator_state
{
__unknown_state,
- __singular, // singular, may still be attached to a sequence
- __begin, // dereferenceable, and at the beginning
- __middle, // dereferenceable, not at the beginning
- __end, // past-the-end, may be at beginning if sequence empty
- __before_begin, // before begin
+ __singular, // singular, may still be attached to a sequence
+ __begin, // dereferenceable, and at the beginning
+ __middle, // dereferenceable, not at the beginning
+ __end, // past-the-end, may be at beginning if sequence empty
+ __before_begin, // before begin
__last_state
};
// When _M_kind == __iterator
struct
{
- const char* _M_name;
- const void* _M_address;
- const type_info* _M_type;
- _Constness _M_constness;
- _Iterator_state _M_state;
- const void* _M_sequence;
- const type_info* _M_seq_type;
+ const char* _M_name;
+ const void* _M_address;
+ const type_info* _M_type;
+ _Constness _M_constness;
+ _Iterator_state _M_state;
+ const void* _M_sequence;
+ const type_info* _M_seq_type;
} _M_iterator;
// When _M_kind == __sequence
struct
{
- const char* _M_name;
- const void* _M_address;
- const type_info* _M_type;
+ const char* _M_name;
+ const void* _M_address;
+ const type_info* _M_type;
} _M_sequence;
// When _M_kind == __integer
struct
{
- const char* _M_name;
- long _M_value;
+ const char* _M_name;
+ long _M_value;
} _M_integer;
// When _M_kind == __string
struct
{
- const char* _M_name;
- const char* _M_value;
+ const char* _M_name;
+ const char* _M_value;
} _M_string;
} _M_variant;
_Parameter() : _M_kind(__unused_param), _M_variant() { }
- _Parameter(long __value, const char* __name)
+ _Parameter(long __value, const char* __name)
: _M_kind(__integer), _M_variant()
{
_M_variant._M_integer._M_name = __name;
_M_variant._M_integer._M_value = __value;
}
- _Parameter(const char* __value, const char* __name)
+ _Parameter(const char* __value, const char* __name)
: _M_kind(__string), _M_variant()
{
_M_variant._M_string._M_name = __name;
}
template<typename _Iterator, typename _Sequence>
- _Parameter(const _Safe_iterator<_Iterator, _Sequence>& __it,
+ _Parameter(const _Safe_iterator<_Iterator, _Sequence>& __it,
const char* __name, _Is_iterator)
: _M_kind(__iterator), _M_variant()
- {
+ {
_M_variant._M_iterator._M_name = __name;
_M_variant._M_iterator._M_address = &__it;
-#if __cpp_rtti
- _M_variant._M_iterator._M_type = &typeid(__it);
-#else
- _M_variant._M_iterator._M_type = 0;
-#endif
+ _M_variant._M_iterator._M_type = _GLIBCXX_TYPEID(__it);
_M_variant._M_iterator._M_constness =
std::__are_same<_Safe_iterator<_Iterator, _Sequence>,
- typename _Sequence::iterator>::
+ typename _Sequence::iterator>::
__value ? __mutable_iterator : __const_iterator;
_M_variant._M_iterator._M_sequence = __it._M_get_sequence();
-#if __cpp_rtti
- _M_variant._M_iterator._M_seq_type = &typeid(_Sequence);
-#else
- _M_variant._M_iterator._M_seq_type = 0;
-#endif
+ _M_variant._M_iterator._M_seq_type = _GLIBCXX_TYPEID(_Sequence);
if (__it._M_singular())
_M_variant._M_iterator._M_state = __singular;
{
_M_variant._M_iterator._M_name = __name;
_M_variant._M_iterator._M_address = &__it;
-#if __cpp_rtti
- _M_variant._M_iterator._M_type = &typeid(__it);
-#else
- _M_variant._M_iterator._M_type = 0;
-#endif
+ _M_variant._M_iterator._M_type = _GLIBCXX_TYPEID(__it);
_M_variant._M_iterator._M_constness =
std::__are_same<_Safe_local_iterator<_Iterator, _Sequence>,
- typename _Sequence::local_iterator>::
+ typename _Sequence::local_iterator>::
__value ? __mutable_iterator : __const_iterator;
_M_variant._M_iterator._M_sequence = __it._M_get_sequence();
-#if __cpp_rtti
- _M_variant._M_iterator._M_seq_type = &typeid(_Sequence);
-#else
- _M_variant._M_iterator._M_seq_type = 0;
-#endif
+ _M_variant._M_iterator._M_seq_type = _GLIBCXX_TYPEID(_Sequence);
if (__it._M_singular())
_M_variant._M_iterator._M_state = __singular;
}
template<typename _Type>
- _Parameter(const _Type*& __it, const char* __name, _Is_iterator)
- : _M_kind(__iterator), _M_variant()
- {
+ _Parameter(const _Type*& __it, const char* __name, _Is_iterator)
+ : _M_kind(__iterator), _M_variant()
+ {
_M_variant._M_iterator._M_name = __name;
_M_variant._M_iterator._M_address = &__it;
-#if __cpp_rtti
- _M_variant._M_iterator._M_type = &typeid(__it);
-#else
- _M_variant._M_iterator._M_type = 0;
-#endif
+ _M_variant._M_iterator._M_type = _GLIBCXX_TYPEID(__it);
_M_variant._M_iterator._M_constness = __mutable_iterator;
_M_variant._M_iterator._M_state = __it? __unknown_state : __singular;
_M_variant._M_iterator._M_sequence = 0;
}
template<typename _Type>
- _Parameter(_Type*& __it, const char* __name, _Is_iterator)
- : _M_kind(__iterator), _M_variant()
- {
+ _Parameter(_Type*& __it, const char* __name, _Is_iterator)
+ : _M_kind(__iterator), _M_variant()
+ {
_M_variant._M_iterator._M_name = __name;
_M_variant._M_iterator._M_address = &__it;
-#if __cpp_rtti
- _M_variant._M_iterator._M_type = &typeid(__it);
-#else
- _M_variant._M_iterator._M_type = 0;
-#endif
+ _M_variant._M_iterator._M_type = _GLIBCXX_TYPEID(__it);
_M_variant._M_iterator._M_constness = __const_iterator;
_M_variant._M_iterator._M_state = __it? __unknown_state : __singular;
_M_variant._M_iterator._M_sequence = 0;
}
template<typename _Iterator>
- _Parameter(const _Iterator& __it, const char* __name, _Is_iterator)
- : _M_kind(__iterator), _M_variant()
- {
+ _Parameter(const _Iterator& __it, const char* __name, _Is_iterator)
+ : _M_kind(__iterator), _M_variant()
+ {
_M_variant._M_iterator._M_name = __name;
_M_variant._M_iterator._M_address = &__it;
-#if __cpp_rtti
- _M_variant._M_iterator._M_type = &typeid(__it);
-#else
- _M_variant._M_iterator._M_type = 0;
-#endif
+ _M_variant._M_iterator._M_type = _GLIBCXX_TYPEID(__it);
_M_variant._M_iterator._M_constness = __unknown_constness;
_M_variant._M_iterator._M_state =
__gnu_debug::__check_singular(__it)? __singular : __unknown_state;
}
template<typename _Sequence>
- _Parameter(const _Safe_sequence<_Sequence>& __seq,
+ _Parameter(const _Safe_sequence<_Sequence>& __seq,
const char* __name, _Is_sequence)
- : _M_kind(__sequence), _M_variant()
- {
+ : _M_kind(__sequence), _M_variant()
+ {
_M_variant._M_sequence._M_name = __name;
_M_variant._M_sequence._M_address =
static_cast<const _Sequence*>(&__seq);
-#if __cpp_rtti
- _M_variant._M_sequence._M_type = &typeid(_Sequence);
-#else
- _M_variant._M_sequence._M_type = 0;
-#endif
+ _M_variant._M_sequence._M_type = _GLIBCXX_TYPEID(_Sequence);
}
template<typename _Sequence>
- _Parameter(const _Sequence& __seq, const char* __name, _Is_sequence)
- : _M_kind(__sequence), _M_variant()
- {
+ _Parameter(const _Sequence& __seq, const char* __name, _Is_sequence)
+ : _M_kind(__sequence), _M_variant()
+ {
_M_variant._M_sequence._M_name = __name;
_M_variant._M_sequence._M_address = &__seq;
-#if __cpp_rtti
- _M_variant._M_sequence._M_type = &typeid(_Sequence);
-#else
- _M_variant._M_sequence._M_type = 0;
-#endif
+ _M_variant._M_sequence._M_type = _GLIBCXX_TYPEID(_Sequence);
}
void
void
_M_print_string(const char* __string) const;
+ void
+ _M_print_type(const type_info* __info,
+ const char* __unknown_name) const;
+
void
_M_get_max_length() const throw ();
enum { __max_parameters = 9 };
- const char* _M_file;
- std::size_t _M_line;
- mutable _Parameter _M_parameters[__max_parameters];
- mutable std::size_t _M_num_parameters;
- mutable const char* _M_text;
- mutable std::size_t _M_max_length;
+ const char* _M_file;
+ std::size_t _M_line;
+ mutable _Parameter _M_parameters[__max_parameters];
+ mutable std::size_t _M_num_parameters;
+ mutable const char* _M_text;
+ mutable std::size_t _M_max_length;
enum { _M_indent = 4 } ;
- mutable std::size_t _M_column;
- mutable bool _M_first_line;
- mutable bool _M_wordwrap;
+ mutable std::size_t _M_column;
+ mutable bool _M_first_line;
+ mutable bool _M_wordwrap;
public:
static _Error_formatter
};
} // namespace __gnu_debug
+#undef _GLIBCXX_TYPEID
+
#endif
#include <cstdlib>
#include <functional>
+#include <cxxabi.h> // for __cxa_demangle
+
using namespace std;
namespace
namespace __gnu_debug
{
- const char* _S_debug_messages[] =
+ const char* _S_debug_messages[] =
{
// General Checks
"function requires a valid iterator range [%1.name;, %2.name;)",
" container only holds %3; buckets",
"load factor shall be positive",
"allocators must be equal",
- "attempt to insert with an iterator range [%1.name;, %2.name;) from this container"
+ "attempt to insert with an iterator range [%1.name;, %2.name;) from this"
+ " container"
};
void
__gnu_cxx::__scoped_lock sentry(_M_get_mutex());
detach_all(_M_iterators);
_M_iterators = 0;
-
+
detach_all(_M_const_iterators);
_M_const_iterators = 0;
}
_M_attach(_Safe_sequence_base* __seq, bool __constant)
{
_M_detach();
-
+
// Attach to the new sequence (if there is one)
if (__seq)
{
_M_sequence->_M_attach(this, __constant);
}
}
-
+
void
_Safe_iterator_base::
_M_attach_single(_Safe_sequence_base* __seq, bool __constant) throw ()
{
_M_detach_single();
-
+
// Attach to the new sequence (if there is one)
if (__seq)
{
_Safe_iterator_base::
_M_singular() const throw ()
{ return !_M_sequence || _M_version != _M_sequence->_M_version; }
-
+
bool
_Safe_iterator_base::
_M_can_compare(const _Safe_iterator_base& __x) const throw ()
{
- return (!_M_singular()
+ return (!_M_singular()
&& !__x._M_singular() && _M_sequence == __x._M_sequence);
}
_M_attach(_Safe_sequence_base* __cont, bool __constant)
{
_M_detach();
-
+
// Attach to the new container (if there is one)
if (__cont)
{
_M_get_container()->_M_attach_local(this, __constant);
}
}
-
+
void
_Safe_local_iterator_base::
_M_attach_single(_Safe_sequence_base* __cont, bool __constant) throw ()
{
_M_detach_single();
-
+
// Attach to the new container (if there is one)
if (__cont)
{
__gnu_cxx::__scoped_lock sentry(_M_get_mutex());
detach_all(_M_iterators);
_M_iterators = 0;
-
+
detach_all(_M_const_iterators);
_M_const_iterators = 0;
assert(this->_M_kind != _Parameter::__unused_param);
const int __bufsize = 64;
char __buf[__bufsize];
-
- if (_M_kind == __iterator)
- {
- if (strcmp(__name, "name") == 0)
- {
- assert(_M_variant._M_iterator._M_name);
- __formatter->_M_print_word(_M_variant._M_iterator._M_name);
- }
- else if (strcmp(__name, "address") == 0)
- {
- __formatter->_M_format_word(__buf, __bufsize, "%p",
- _M_variant._M_iterator._M_address);
- __formatter->_M_print_word(__buf);
- }
- else if (strcmp(__name, "type") == 0)
- {
- if (!_M_variant._M_iterator._M_type)
- __formatter->_M_print_word("<unknown type>");
- else
- // TBD: demangle!
- __formatter->_M_print_word(_M_variant._M_iterator.
- _M_type->name());
- }
- else if (strcmp(__name, "constness") == 0)
- {
- static const char* __constness_names[__last_constness] =
- {
- "<unknown>",
- "constant",
- "mutable"
- };
- __formatter->_M_print_word(__constness_names[_M_variant.
- _M_iterator.
- _M_constness]);
- }
- else if (strcmp(__name, "state") == 0)
- {
- static const char* __state_names[__last_state] =
- {
- "<unknown>",
- "singular",
- "dereferenceable (start-of-sequence)",
- "dereferenceable",
- "past-the-end",
- "before-begin"
- };
- __formatter->_M_print_word(__state_names[_M_variant.
- _M_iterator._M_state]);
- }
- else if (strcmp(__name, "sequence") == 0)
- {
- assert(_M_variant._M_iterator._M_sequence);
- __formatter->_M_format_word(__buf, __bufsize, "%p",
- _M_variant._M_iterator._M_sequence);
- __formatter->_M_print_word(__buf);
- }
- else if (strcmp(__name, "seq_type") == 0)
- {
- if (!_M_variant._M_iterator._M_seq_type)
- __formatter->_M_print_word("<unknown seq_type>");
- else
- // TBD: demangle!
- __formatter->_M_print_word(_M_variant._M_iterator.
- _M_seq_type->name());
- }
- else
- assert(false);
- }
- else if (_M_kind == __sequence)
- {
- if (strcmp(__name, "name") == 0)
- {
- assert(_M_variant._M_sequence._M_name);
- __formatter->_M_print_word(_M_variant._M_sequence._M_name);
- }
- else if (strcmp(__name, "address") == 0)
- {
- assert(_M_variant._M_sequence._M_address);
- __formatter->_M_format_word(__buf, __bufsize, "%p",
- _M_variant._M_sequence._M_address);
- __formatter->_M_print_word(__buf);
- }
- else if (strcmp(__name, "type") == 0)
- {
- if (!_M_variant._M_sequence._M_type)
- __formatter->_M_print_word("<unknown type>");
- else
- // TBD: demangle!
- __formatter->_M_print_word(_M_variant._M_sequence.
- _M_type->name());
- }
- else
- assert(false);
- }
- else if (_M_kind == __integer)
- {
- if (strcmp(__name, "name") == 0)
- {
- assert(_M_variant._M_integer._M_name);
- __formatter->_M_print_word(_M_variant._M_integer._M_name);
- }
- else
+
+ switch (_M_kind)
+ {
+ case __iterator:
+ if (strcmp(__name, "name") == 0)
+ {
+ assert(_M_variant._M_iterator._M_name);
+ __formatter->_M_print_word(_M_variant._M_iterator._M_name);
+ }
+ else if (strcmp(__name, "address") == 0)
+ {
+ __formatter->_M_format_word(__buf, __bufsize, "%p",
+ _M_variant._M_iterator._M_address);
+ __formatter->_M_print_word(__buf);
+ }
+ else if (strcmp(__name, "type") == 0)
+ __formatter->_M_print_type(_M_variant._M_iterator._M_type,
+ "<unknown type>");
+ else if (strcmp(__name, "constness") == 0)
+ {
+ static const char* __constness_names[__last_constness] =
+ {
+ "<unknown>",
+ "constant",
+ "mutable"
+ };
+ __formatter->_M_print_word(__constness_names[_M_variant.
+ _M_iterator.
+ _M_constness]);
+ }
+ else if (strcmp(__name, "state") == 0)
+ {
+ static const char* __state_names[__last_state] =
+ {
+ "<unknown>",
+ "singular",
+ "dereferenceable (start-of-sequence)",
+ "dereferenceable",
+ "past-the-end",
+ "before-begin"
+ };
+ __formatter->_M_print_word(__state_names[_M_variant.
+ _M_iterator._M_state]);
+ }
+ else if (strcmp(__name, "sequence") == 0)
+ {
+ assert(_M_variant._M_iterator._M_sequence);
+ __formatter->_M_format_word(__buf, __bufsize, "%p",
+ _M_variant._M_iterator._M_sequence);
+ __formatter->_M_print_word(__buf);
+ }
+ else if (strcmp(__name, "seq_type") == 0)
+ __formatter->_M_print_type(_M_variant._M_iterator._M_seq_type,
+ "<unknown seq_type>");
+ else
assert(false);
- }
- else if (_M_kind == __string)
- {
- if (strcmp(__name, "name") == 0)
- {
- assert(_M_variant._M_string._M_name);
- __formatter->_M_print_word(_M_variant._M_string._M_name);
- }
- else
- assert(false);
- }
- else
- {
+ break;
+ case __sequence:
+ if (strcmp(__name, "name") == 0)
+ {
+ assert(_M_variant._M_sequence._M_name);
+ __formatter->_M_print_word(_M_variant._M_sequence._M_name);
+ }
+ else if (strcmp(__name, "address") == 0)
+ {
+ assert(_M_variant._M_sequence._M_address);
+ __formatter->_M_format_word(__buf, __bufsize, "%p",
+ _M_variant._M_sequence._M_address);
+ __formatter->_M_print_word(__buf);
+ }
+ else if (strcmp(__name, "type") == 0)
+ __formatter->_M_print_type(_M_variant._M_sequence._M_type,
+ "<unknown type>");
+ else
assert(false);
- }
+ break;
+ case __integer:
+ if (strcmp(__name, "name") == 0)
+ {
+ assert(_M_variant._M_integer._M_name);
+ __formatter->_M_print_word(_M_variant._M_integer._M_name);
+ }
+ else
+ assert(false);
+ break;
+ case __string:
+ if (strcmp(__name, "name") == 0)
+ {
+ assert(_M_variant._M_string._M_name);
+ __formatter->_M_print_word(_M_variant._M_string._M_name);
+ }
+ else
+ assert(false);
+ break;
+ default:
+ assert(false);
+ break;
+ }
}
-
+
void
_Error_formatter::_Parameter::
_M_print_description(const _Error_formatter* __formatter) const
{
const int __bufsize = 128;
char __buf[__bufsize];
-
- if (_M_kind == __iterator)
+
+ switch (_M_kind)
{
+ case __iterator:
__formatter->_M_print_word("iterator ");
if (_M_variant._M_iterator._M_name)
{
- __formatter->_M_format_word(__buf, __bufsize, "\"%s\" ",
+ __formatter->_M_format_word(__buf, __bufsize, "\"%s\" ",
_M_variant._M_iterator._M_name);
__formatter->_M_print_word(__buf);
}
-
- __formatter->_M_format_word(__buf, __bufsize, "@ 0x%p {\n",
+
+ __formatter->_M_format_word(__buf, __bufsize, "@ 0x%p {\n",
_M_variant._M_iterator._M_address);
__formatter->_M_print_word(__buf);
if (_M_variant._M_iterator._M_type)
{
__formatter->_M_print_word("type = ");
_M_print_field(__formatter, "type");
-
+
if (_M_variant._M_iterator._M_constness != __unknown_constness)
{
__formatter->_M_print_word(" (");
}
__formatter->_M_print_word(";\n");
}
-
+
if (_M_variant._M_iterator._M_state != __unknown_state)
{
__formatter->_M_print_word(" state = ");
_M_print_field(__formatter, "state");
__formatter->_M_print_word(";\n");
}
-
+
if (_M_variant._M_iterator._M_sequence)
{
__formatter->_M_print_word(" references sequence ");
_M_print_field(__formatter, "seq_type");
__formatter->_M_print_word("' ");
}
-
- __formatter->_M_format_word(__buf, __bufsize, "@ 0x%p\n",
+
+ __formatter->_M_format_word(__buf, __bufsize, "@ 0x%p\n",
_M_variant._M_iterator._M_sequence);
__formatter->_M_print_word(__buf);
}
__formatter->_M_print_word("}\n");
- }
- else if (_M_kind == __sequence)
- {
+ break;
+ case __sequence:
__formatter->_M_print_word("sequence ");
if (_M_variant._M_sequence._M_name)
{
- __formatter->_M_format_word(__buf, __bufsize, "\"%s\" ",
+ __formatter->_M_format_word(__buf, __bufsize, "\"%s\" ",
_M_variant._M_sequence._M_name);
__formatter->_M_print_word(__buf);
}
-
- __formatter->_M_format_word(__buf, __bufsize, "@ 0x%p {\n",
+
+ __formatter->_M_format_word(__buf, __bufsize, "@ 0x%p {\n",
_M_variant._M_sequence._M_address);
__formatter->_M_print_word(__buf);
-
+
if (_M_variant._M_sequence._M_type)
{
__formatter->_M_print_word(" type = ");
_M_print_field(__formatter, "type");
__formatter->_M_print_word(";\n");
- }
+ }
__formatter->_M_print_word("}\n");
+ break;
+ default:
+ break;
}
}
const _Error_formatter&
_Error_formatter::_M_message(_Debug_msg_id __id) const throw ()
{ return this->_M_message(_S_debug_messages[__id]); }
-
+
void
_Error_formatter::_M_error() const
{
const int __bufsize = 128;
char __buf[__bufsize];
-
+
// Emit file & line number information
_M_column = 1;
_M_wordwrap = false;
_M_print_word(__buf);
_M_column += strlen(__buf);
}
-
+
if (_M_line > 0)
{
_M_format_word(__buf, __bufsize, "%u:", _M_line);
_M_print_word(__buf);
_M_column += strlen(__buf);
}
-
+
if (_M_max_length)
_M_wordwrap = true;
_M_print_word("error: ");
-
+
// Print the error message
assert(_M_text);
_M_print_string(_M_text);
_M_print_word(".\n");
-
+
// Emit descriptions of the objects involved in the operation
_M_wordwrap = false;
bool __has_noninteger_parameters = false;
for (unsigned int __i = 0; __i < _M_num_parameters; ++__i)
{
- if (_M_parameters[__i]._M_kind == _Parameter::__iterator
- || _M_parameters[__i]._M_kind == _Parameter::__sequence)
+ switch (_M_parameters[__i]._M_kind)
{
+ case _Parameter::__iterator:
+ case _Parameter::__sequence:
if (!__has_noninteger_parameters)
{
_M_first_line = true;
__has_noninteger_parameters = true;
}
_M_parameters[__i]._M_print_description(this);
+ break;
+ default:
+ break;
}
}
-
+
abort();
}
template<typename _Tp>
void
- _Error_formatter::_M_format_word(char* __buf,
- int __n __attribute__ ((__unused__)),
+ _Error_formatter::_M_format_word(char* __buf,
+ int __n __attribute__ ((__unused__)),
const char* __fmt, _Tp __s) const throw ()
{
#ifdef _GLIBCXX_USE_C99
#endif
}
-
- void
+ void
_Error_formatter::_M_print_word(const char* __word) const
{
- if (!_M_wordwrap)
+ if (!_M_wordwrap)
{
fprintf(stderr, "%s", __word);
return;
}
-
+
size_t __length = strlen(__word);
if (__length == 0)
return;
-
+
size_t __visual_length
= __word[__length - 1] == '\n' ? __length - 1 : __length;
if (__visual_length == 0
|| (_M_column + __visual_length < _M_max_length)
- || (__visual_length >= _M_max_length && _M_column == 1))
+ || (__visual_length >= _M_max_length && _M_column == 1))
{
// If this isn't the first line, indent
if (_M_column == 1 && !_M_first_line)
fprintf(stderr, "%s", __spacing);
_M_column += _M_indent;
}
-
+
fprintf(stderr, "%s", __word);
-
- if (__word[__length - 1] == '\n')
+
+ if (__word[__length - 1] == '\n')
{
_M_first_line = false;
_M_column = 1;
_M_print_word(__word);
}
}
-
+
void
_Error_formatter::
_M_print_string(const char* __string) const
++__finish;
if (isspace(*__finish))
++__finish;
-
+
const ptrdiff_t __len = __finish - __start;
assert(__len < __bufsize);
memcpy(__buf, __start, __len);
__buf[__len] = '\0';
_M_print_word(__buf);
__start = __finish;
-
+
// Skip extra whitespace
- while (*__start == ' ')
+ while (*__start == ' ')
++__start;
-
+
continue;
- }
-
+ }
+
++__start;
assert(*__start);
if (*__start == '%')
++__start;
continue;
}
-
+
// Get the parameter number
assert(*__start >= '1' && *__start <= '9');
size_t __param = *__start - '0';
--__param;
assert(__param < _M_num_parameters);
-
+
// '.' separates the parameter number from the field
// name, if there is one.
++__start;
__buf[0] = '\0';
if (_M_parameters[__param]._M_kind == _Parameter::__integer)
{
- _M_format_word(__buf, __bufsize, "%ld",
+ _M_format_word(__buf, __bufsize, "%ld",
_M_parameters[__param]._M_variant._M_integer._M_value);
_M_print_word(__buf);
}
_M_print_string(_M_parameters[__param]._M_variant._M_string._M_value);
continue;
}
-
+
// Extract the field name we want
enum { __max_field_len = 16 };
char __field[__max_field_len];
}
++__start;
__field[__field_idx] = 0;
-
- _M_parameters[__param]._M_print_field(this, __field);
+
+ _M_parameters[__param]._M_print_field(this, __field);
+ }
+ }
+
+ void
+ _Error_formatter::_M_print_type(const type_info* __info,
+ const char* __unknown_name) const
+ {
+ if (!__info)
+ _M_print_word(__unknown_name);
+ else
+ {
+ int __status;
+ char* __demangled_name =
+ __cxxabiv1::__cxa_demangle(__info->name(), NULL, NULL, &__status);
+ _M_print_word(__status == 0 ? __demangled_name : __info->name());
+ free(__demangled_name);
}
}
// Instantiations.
template
void
- _Error_formatter::_M_format_word(char*, int, const char*,
+ _Error_formatter::_M_format_word(char*, int, const char*,
const void*) const;
template
template
void
- _Error_formatter::_M_format_word(char*, int, const char*,
+ _Error_formatter::_M_format_word(char*, int, const char*,
std::size_t) const;
template
void
- _Error_formatter::_M_format_word(char*, int, const char*,
+ _Error_formatter::_M_format_word(char*, int, const char*,
const char*) const;
} // namespace __gnu_debug
projects / gcc.git / commitdiff