Adapt to new namespace for demangle()

d-frey · d-frey · commit 9689f107dacf · 2020-12-22T20:15:11.000+01:00
diff --git a/include/tao/json/binding/factory.hpp b/include/tao/json/binding/factory.hpp
@@ -135,15 +135,15 @@ namespace tao::json::binding
 
          const auto& a = v.get_object();
          if( a.size() != 1 ) {
-            throw std::runtime_error( json::internal::format( "polymorphic factory requires object of size one for base class ", demangle< Base >(), json::message_extension( v ) ) );
+            throw std::runtime_error( json::internal::format( "polymorphic factory requires object of size one for base class ", pegtl::demangle< Base >(), json::message_extension( v ) ) );
          }
          const auto b = a.begin();
          const auto i = m.find( b->first );
          if( i == m.end() ) {
             std::ostringstream oss;
             json::internal::format_to( oss, "unknown factory type \"", json::internal::escape( b->first ), "\" -- known are" );
             internal::list_all_types( oss, m );
-            json::internal::format_to( oss, " for base class ", demangle< Base >(), json::message_extension( v ) );
+            json::internal::format_to( oss, " for base class ", pegtl::demangle< Base >(), json::message_extension( v ) );
             throw std::runtime_error( oss.str() );
          }
          r = i->second.function( b->second, with... );
@@ -170,9 +170,9 @@ namespace tao::json::binding
          const auto i = m.find( &typeid( *p ) );
          if( i == m.end() ) {
             std::ostringstream oss;
-            json::internal::format_to( oss, "unknown factory type ", demangle< decltype( *p ) >(), " -- known are" );
+            json::internal::format_to( oss, "unknown factory type ", pegtl::demangle< decltype( *p ) >(), " -- known are" );
             internal::list_all_types( oss, m );
-            json::internal::format_to( oss, " for base class ", demangle< Base >() );
+            json::internal::format_to( oss, " for base class ", pegtl::demangle< Base >() );
             throw std::runtime_error( oss.str() );
          }
          i->second.function( v, p );
@@ -205,7 +205,7 @@ namespace tao::json::binding
             std::ostringstream oss;
             json::internal::format_to( oss, "unknown factory type \"", json::internal::escape( k ), "\" -- known are" );
             internal::list_all_types( oss, m );
-            json::internal::format_to( oss, " for base class ", demangle< Base >() );
+            json::internal::format_to( oss, " for base class ", pegtl::demangle< Base >() );
             throw std::runtime_error( oss.str() );
          }
          r = i->second.function( parser );
@@ -233,9 +233,9 @@ namespace tao::json::binding
          const auto i = m.find( &typeid( *p ) );
          if( i == m.end() ) {
             std::ostringstream oss;
-            json::internal::format_to( oss, "unknown factory type ", demangle< decltype( *p ) >(), " -- known are" );
+            json::internal::format_to( oss, "unknown factory type ", pegtl::demangle< decltype( *p ) >(), " -- known are" );
             internal::list_all_types( oss, m );
-            json::internal::format_to( oss, " for base class ", demangle< Base >() );
+            json::internal::format_to( oss, " for base class ", pegtl::demangle< Base >() );
             throw std::runtime_error( oss.str() );
          }
          consumer.begin_object( 1 );
diff --git a/include/tao/json/binding/internal/array.hpp b/include/tao/json/binding/internal/array.hpp
@@ -29,7 +29,7 @@ namespace tao::json::binding::internal
       {
          const auto& a = v.get_array();
          if( a.size() != sizeof...( As ) ) {
-            throw std::runtime_error( json::internal::format( "array size mismatch for type ", demangle< C >(), " -- expected ", sizeof...( As ), " received ", a.size(), json::message_extension( v ) ) );
+            throw std::runtime_error( json::internal::format( "array size mismatch for type ", pegtl::demangle< C >(), " -- expected ", sizeof...( As ), " received ", a.size(), json::message_extension( v ) ) );
          }
          return a;
       }
diff --git a/include/tao/json/binding/internal/object.hpp b/include/tao/json/binding/internal/object.hpp
@@ -119,7 +119,7 @@ namespace tao::json::binding::internal
                std::ostringstream oss;
                json::internal::format_to( oss, "unknown object key \"", json::internal::escape( k ), "\" -- known are" );
                list_all_keys( oss, m );
-               json::internal::format_to( oss, " for type ", demangle< C >(), json::message_extension( v ) );
+               json::internal::format_to( oss, " for type ", pegtl::demangle< C >(), json::message_extension( v ) );
                throw std::runtime_error( oss.str() );
             }
             i->second.function( p.second, x );
@@ -130,7 +130,7 @@ namespace tao::json::binding::internal
             std::ostringstream oss;
             json::internal::format_to( oss, "missing required key(s)" );
             list_missing_keys( oss, b, m );
-            json::internal::format_to( oss, " for type ", demangle< C >(), json::message_extension( v ) );
+            json::internal::format_to( oss, " for type ", pegtl::demangle< C >(), json::message_extension( v ) );
             throw std::runtime_error( oss.str() );
          }
       }
@@ -176,11 +176,11 @@ namespace tao::json::binding::internal
                std::ostringstream oss;
                json::internal::format_to( oss, "unknown object key \"", json::internal::escape( k ), "\" -- known are" );
                list_all_keys( oss, m );
-               json::internal::format_to( oss, " for type ", demangle< C >() );
+               json::internal::format_to( oss, " for type ", pegtl::demangle< C >() );
                parser.throw_parse_error( oss.str() );
             }
             if( b.test( i->second.index ) ) {
-               parser.throw_parse_error( json::internal::format( "duplicate object key \"", json::internal::escape( k ), "\" for type ", demangle< C >() ) );
+               parser.throw_parse_error( json::internal::format( "duplicate object key \"", json::internal::escape( k ), "\" for type ", pegtl::demangle< C >() ) );
             }
             i->second.function( parser, x );
             b.set( i->second.index );
@@ -190,7 +190,7 @@ namespace tao::json::binding::internal
             std::ostringstream oss;
             json::internal::format_to( oss, "missing required key(s)" );
             list_missing_keys( oss, b, m );
-            json::internal::format_to( oss, " for type ", demangle< C >() );
+            json::internal::format_to( oss, " for type ", pegtl::demangle< C >() );
             parser.throw_parse_error( oss.str() );
          }
       }
diff --git a/include/tao/json/binding/versions.hpp b/include/tao/json/binding/versions.hpp
@@ -35,7 +35,7 @@ namespace tao::json::binding
                std::rethrow_exception( e );  // TODO: Did I miss a way to avoid the throw?
             }
             catch( ... ) {
-               std::throw_with_nested( std::runtime_error( json::internal::format( "all versions failed for type ", demangle< C >(), " -- see nested for first error" ) ) );
+               std::throw_with_nested( std::runtime_error( json::internal::format( "all versions failed for type ", pegtl::demangle< C >(), " -- see nested for first error" ) ) );
             }
          }
       }
diff --git a/include/tao/json/contrib/variant_traits.hpp b/include/tao/json/contrib/variant_traits.hpp
@@ -21,7 +21,7 @@ namespace tao::json
 
       static std::string_view demangle() noexcept
       {
-         return tao::demangle< value_t >();
+         return pegtl::demangle< value_t >();
       }
 
       template< template< typename... > class Traits, typename Consumer >

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ namespace tao::json::binding::internal`
`29`	`29`	`{`
`30`	`30`	`const auto& a = v.get_array();`
`31`	`31`	`if( a.size() != sizeof...( As ) ) {`
`32`		`- throw std::runtime_error( json::internal::format( "array size mismatch for type ", demangle< C >(), " -- expected ", sizeof...( As ), " received ", a.size(), json::message_extension( v ) ) );`
	`32`	`+ throw std::runtime_error( json::internal::format( "array size mismatch for type ", pegtl::demangle< C >(), " -- expected ", sizeof...( As ), " received ", a.size(), json::message_extension( v ) ) );`
`33`	`33`	`}`
`34`	`34`	`return a;`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ namespace tao::json::binding::internal`
`119`	`119`	`std::ostringstream oss;`
`120`	`120`	`json::internal::format_to( oss, "unknown object key \"", json::internal::escape( k ), "\" -- known are" );`
`121`	`121`	`list_all_keys( oss, m );`
`122`		`- json::internal::format_to( oss, " for type ", demangle< C >(), json::message_extension( v ) );`
	`122`	`+ json::internal::format_to( oss, " for type ", pegtl::demangle< C >(), json::message_extension( v ) );`
`123`	`123`	`throw std::runtime_error( oss.str() );`
`124`	`124`	`}`
`125`	`125`	`i->second.function( p.second, x );`
`@@ -130,7 +130,7 @@ namespace tao::json::binding::internal`
`130`	`130`	`std::ostringstream oss;`
`131`	`131`	`json::internal::format_to( oss, "missing required key(s)" );`
`132`	`132`	`list_missing_keys( oss, b, m );`
`133`		`- json::internal::format_to( oss, " for type ", demangle< C >(), json::message_extension( v ) );`
	`133`	`+ json::internal::format_to( oss, " for type ", pegtl::demangle< C >(), json::message_extension( v ) );`
`134`	`134`	`throw std::runtime_error( oss.str() );`
`135`	`135`	`}`
`136`	`136`	`}`
`@@ -176,11 +176,11 @@ namespace tao::json::binding::internal`
`176`	`176`	`std::ostringstream oss;`
`177`	`177`	`json::internal::format_to( oss, "unknown object key \"", json::internal::escape( k ), "\" -- known are" );`
`178`	`178`	`list_all_keys( oss, m );`
`179`		`- json::internal::format_to( oss, " for type ", demangle< C >() );`
	`179`	`+ json::internal::format_to( oss, " for type ", pegtl::demangle< C >() );`
`180`	`180`	`parser.throw_parse_error( oss.str() );`
`181`	`181`	`}`
`182`	`182`	`if( b.test( i->second.index ) ) {`
`183`		`- parser.throw_parse_error( json::internal::format( "duplicate object key \"", json::internal::escape( k ), "\" for type ", demangle< C >() ) );`
	`183`	`+ parser.throw_parse_error( json::internal::format( "duplicate object key \"", json::internal::escape( k ), "\" for type ", pegtl::demangle< C >() ) );`
`184`	`184`	`}`
`185`	`185`	`i->second.function( parser, x );`
`186`	`186`	`b.set( i->second.index );`
`@@ -190,7 +190,7 @@ namespace tao::json::binding::internal`
`190`	`190`	`std::ostringstream oss;`
`191`	`191`	`json::internal::format_to( oss, "missing required key(s)" );`
`192`	`192`	`list_missing_keys( oss, b, m );`
`193`		`- json::internal::format_to( oss, " for type ", demangle< C >() );`
	`193`	`+ json::internal::format_to( oss, " for type ", pegtl::demangle< C >() );`
`194`	`194`	`parser.throw_parse_error( oss.str() );`
`195`	`195`	`}`
`196`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ namespace tao::json::binding`
`35`	`35`	`std::rethrow_exception( e ); // TODO: Did I miss a way to avoid the throw?`
`36`	`36`	`}`
`37`	`37`	`catch( ... ) {`
`38`		`- std::throw_with_nested( std::runtime_error( json::internal::format( "all versions failed for type ", demangle< C >(), " -- see nested for first error" ) ) );`
	`38`	`+ std::throw_with_nested( std::runtime_error( json::internal::format( "all versions failed for type ", pegtl::demangle< C >(), " -- see nested for first error" ) ) );`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ namespace tao::json`
`21`	`21`
`22`	`22`	`static std::string_view demangle() noexcept`
`23`	`23`	`{`
`24`		`- return tao::demangle< value_t >();`
	`24`	`+ return pegtl::demangle< value_t >();`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`template< template< typename... > class Traits, typename Consumer >`