Template over noexcept.

Author: ColinH

include/tao/json/binding/element.hpp

@@ -76,8 +76,8 @@ namespace tao::json::binding
          }
       };
 
-      template< typename C, typename T, T ( *P )( const C& ) >
-      struct element< T ( * )( const C& ), P >
+      template< bool N, typename C, typename T, T ( *P )( const C& ) noexcept( N ) >
+      struct element< T ( * )( const C& ) noexcept( N ), P >
       {
          using class_t = C;
          using value_t = T;
@@ -99,8 +99,8 @@ namespace tao::json::binding
       template< typename CT, CT CP, typename T, T P >
       struct element2;
 
-      template< typename A, typename CR, CR ( *CP )( const A& ) noexcept, typename R, R ( *P )( A& ) noexcept >
-      struct element2< CR ( * )( const A& ) noexcept, CP, R ( * )( A& ) noexcept, P >
+      template< bool CN, bool N, typename A, typename CR, CR ( *CP )( const A& ) noexcept( CN ), typename R, R ( *P )( A& ) noexcept( N ) >
+      struct element2< CR ( * )( const A& ) noexcept( CN ), CP, R ( * )( A& ) noexcept( N ), P >
       {
          using class_t = A;
          using value_t = std::decay_t< R >;
@@ -137,8 +137,8 @@ namespace tao::json::binding
          }
       };
 
-      template< typename A, typename CR, CR ( *CP )( const A& ) noexcept, typename R, void ( *P )( A&, R&& ) noexcept >
-      struct element2< CR ( * )( const A& ) noexcept, CP, void ( * )( A&, R&& ) noexcept, P >
+      template< bool CN, bool N, typename A, typename CR, CR ( *CP )( const A& ) noexcept( CN ), typename R, void ( *P )( A&, R&& ) noexcept( N ) >
+      struct element2< CR ( * )( const A& ) noexcept( CN ), CP, void ( * )( A&, R&& ) noexcept( N ), P >
       {
          using class_t = A;
          using value_t = std::decay_t< R >;

src/test/json/binding_function.cpp

@@ -9,23 +9,63 @@ namespace tao::json
 {
    struct type_f
    {
-      int private_a;
-      int private_b;
+      int private_a1 = 11;
+      int private_a2 = 12;
+
+      int private_b1 = 21;
+      int private_b2 = 22;
+      int private_b3 = 23;
+      int private_b4 = 24;
    };
 
-   [[nodiscard]] int get_a( const type_f& f ) noexcept
+   [[nodiscard]] int get_a1( const type_f& f )
+   {
+      return f.private_a1 + 100;
+   }
+
+   [[nodiscard]] int get_a2( const type_f& f ) noexcept
+   {
+      return f.private_a2 + 100;
+   }
+
+   [[nodiscard]] int get_b1( const type_f& f )
+   {
+      return f.private_b1 + 200;
+   }
+
+   [[nodiscard]] int& set_b1( type_f& f )
+   {
+      return f.private_b1;
+   }
+
+   [[nodiscard]] int get_b2( const type_f& f ) noexcept
+   {
+      return f.private_b2 + 200;
+   }
+
+   [[nodiscard]] int& set_b2( type_f& f )
+   {
+      return f.private_b2;
+   }
+
+   [[nodiscard]] int get_b3( const type_f& f )
+   {
+      return f.private_b3 + 200;
+   }
+
+   [[nodiscard]] int& set_b3( type_f& f ) noexcept
    {
-      return f.private_a + 10;
+      return f.private_b3;
    }
 
-   [[nodiscard]] int& set_a( type_f& f ) noexcept
+   [[nodiscard]] int get_b4( const type_f& f ) noexcept
    {
-      return f.private_a;
+      return f.private_b4 + 200;
    }
 
-   [[nodiscard]] int get_b( const type_f& f )
+   [[nodiscard]] int& set_b4( type_f& f ) noexcept
    {
-      return f.private_b + 20;
+      return f.private_b4;
    }
 
    // void set_b( type_f& f, int& b ) noexcept
@@ -35,19 +75,29 @@ namespace tao::json
 
    template<>
    struct traits< type_f >
-      : binding::object< binding::member2< binding::member_kind::required, TAO_JSON_STRING_T( "a" ), &get_a, &set_a >,
-                         binding::member< binding::member_kind::required, TAO_JSON_STRING_T( "b" ), &get_b > >
+      : binding::object< binding::member< binding::member_kind::required, TAO_JSON_STRING_T( "a1" ), &get_a1 >,
+                         binding::member< binding::member_kind::required, TAO_JSON_STRING_T( "a2" ), &get_a2 >,
+                         binding::member2< binding::member_kind::required, TAO_JSON_STRING_T( "b1" ), &get_b1, &set_b1 >,
+                         binding::member2< binding::member_kind::required, TAO_JSON_STRING_T( "b2" ), &get_b2, &set_b2 >,
+                         binding::member2< binding::member_kind::required, TAO_JSON_STRING_T( "b3" ), &get_b3, &set_b3 >,
+                         binding::member2< binding::member_kind::required, TAO_JSON_STRING_T( "b4" ), &get_b4, &set_b4 > >
    {
       TAO_JSON_DEFAULT_KEY( "f" );
    };
 
    void unit_test()
    {
-      const type_f f{ 41, 42 };
+      const type_f f;
       const value v = produce::to_value( f );
-      TEST_ASSERT( v.get_object().size() == 2 );
-      TEST_ASSERT( v.get_object().at( "a" ).as< int >() == 51 );
-      TEST_ASSERT( v.get_object().at( "b" ).as< int >() == 62 );
+      TEST_ASSERT( v.get_object().size() == 6 );
+
+      TEST_ASSERT( v.get_object().at( "a1" ).as< int >() == 111 );
+      TEST_ASSERT( v.get_object().at( "a2" ).as< int >() == 112 );
+
+      TEST_ASSERT( v.get_object().at( "b1" ).as< int >() == 221 );
+      TEST_ASSERT( v.get_object().at( "b2" ).as< int >() == 222 );
+      TEST_ASSERT( v.get_object().at( "b3" ).as< int >() == 223 );
+      TEST_ASSERT( v.get_object().at( "b4" ).as< int >() == 224 );
    }
 
 }  // namespace tao::json