Define handlers with std::array

Author: frmdstryr

atom/src/defaultvaluebehavior.cpp

@@ -187,8 +187,7 @@ typedef PyObject*
 ( *handler )( Member* member, CAtom* atom );
 
 
-static handler
-handlers[] = {
+static const std::array<handler, DefaultValue::Mode::Last> handlers = {
     no_op_handler,
     static_handler,
     list_handler,
@@ -205,8 +204,6 @@ handlers[] = {
     member_method_object_handler
 };
 
-static_assert( sizeof(handlers) / sizeof(handler) == DefaultValue::Mode::Last, "Handler missing" );
-
 }  // namespace
 
 

atom/src/delattrbehavior.cpp

@@ -180,8 +180,7 @@ typedef int
 ( *handler )( Member* member, CAtom* atom );
 
 
-static handler
-handlers[] = {
+static const std::array<handler, DelAttr::Mode::Last> handlers = {
     no_op_handler,
     slot_handler,
     constant_handler,
@@ -192,9 +191,6 @@ handlers[] = {
     property_handler
 };
 
-static_assert( sizeof(handlers) / sizeof(handler) == DelAttr::Mode::Last, "Handler missing" );
-
-
 }  // namespace
 
 

atom/src/getattrbehavior.cpp

@@ -243,8 +243,7 @@ typedef PyObject*
 ( *handler )( Member* member, CAtom* atom );
 
 
-static handler
-handlers[] = {
+static const std::array<handler, GetAttr::Mode::Last> handlers = {
     no_op_handler,
     slot_handler,
     event_handler,
@@ -259,8 +258,6 @@ handlers[] = {
     member_method_object_handler
 };
 
-static_assert( sizeof(handlers) / sizeof(handler) == GetAttr::Mode::Last, "Handler missing" );
-
 }  // namespace
 
 

atom/src/getstatebehavior.cpp

@@ -117,8 +117,7 @@ typedef PyObject*
 ( *handler )( Member* member, CAtom* atom );
 
 
-static handler
-handlers[] = {
+static const std::array<handler, GetState::Mode::Last> handlers = {
     include_handler,  // We want the include handler to be the default one
     exclude_handler,
     include_non_default_handler,
@@ -127,8 +126,6 @@ handlers[] = {
     member_method_object_handler
 };
 
-static_assert( sizeof(handlers) / sizeof(handler) == GetState::Mode::Last, "Handler missing" );
-
 }  // namespace
 
 

atom/src/member.h

@@ -7,6 +7,7 @@
 |----------------------------------------------------------------------------*/
 #pragma once
 
+#include <array>
 #include <vector>
 #include <cppy/cppy.h>
 #include "inttypes.h"

atom/src/postgetattrbehavior.cpp

@@ -87,17 +87,14 @@ typedef PyObject*
 ( *handler )( Member* member, CAtom* atom, PyObject* value );
 
 
-static handler
-handlers[] = {
+static const std::array<handler, PostGetAttr::Mode::Last> handlers = {
     no_op_handler,
     delegate_handler,
     object_method_value_handler,
     object_method_name_value_handler,
     member_method_object_value_handler
 };
 
-static_assert( sizeof(handlers) / sizeof(handler) == PostGetAttr::Mode::Last, "Handler missing" );
-
 }  // namespace
 
 

atom/src/postsetattrbehavior.cpp

@@ -100,17 +100,14 @@ typedef int
 ( *handler )( Member* member, CAtom* atom, PyObject* oldvalue, PyObject* newvalue );
 
 
-static handler
-handlers[] = {
+static const std::array<handler, PostSetAttr::Mode::Last> handlers = {
     no_op_handler,
     delegate_handler,
     object_method_old_new_handler,
     object_method_name_old_new_handler,
     member_method_object_old_new_handler
 };
 
-static_assert( sizeof(handlers) / sizeof(handler) == PostSetAttr::Mode::Last, "Handler missing" );
-
 }  // namespace
 
 

atom/src/postvalidatebehavior.cpp

@@ -91,17 +91,14 @@ typedef PyObject*
 ( *handler )( Member* member, CAtom* atom, PyObject* oldvalue, PyObject* newvalue );
 
 
-static handler
-handlers[] = {
+static const std::array<handler, PostValidate::Mode::Last> handlers = {
     no_op_handler,
     delegate_handler,
     object_method_old_new_handler,
     object_method_name_old_new_handler,
     member_method_object_old_new_handler
 };
 
-static_assert( sizeof(handlers) / sizeof(handler) == PostValidate::Mode::Last, "Handler missing" );
-
 }  // namespace
 
 

atom/src/setattrbehavior.cpp

@@ -363,8 +363,7 @@ typedef int
 ( *handler )( Member* member, CAtom* atom, PyObject* value );
 
 
-static handler
-handlers[] = {
+static const std::array<handler, SetAttr::Mode::Last> handlers = {
     no_op_handler,
     slot_handler,
     constant_handler,
@@ -380,8 +379,6 @@ handlers[] = {
     member_method_object_value_handler
 };
 
-static_assert( sizeof(handlers) / sizeof(handler) == SetAttr::Mode::Last, "Handler missing" );
-
 } // namespace
 
 

atom/src/validatebehavior.cpp

@@ -964,8 +964,7 @@ typedef PyObject*
 ( *handler )( Member* member, CAtom* atom, PyObject* oldvalue, PyObject* newvalue );
 
 
-static handler
-handlers[] = {
+static const std::array<handler, Validate::Mode::Last> handlers = {
     no_op_handler,
     bool_handler,
     long_handler,
@@ -1000,8 +999,6 @@ handlers[] = {
     member_method_object_old_new_handler
 };
 
-static_assert( sizeof(handlers) / sizeof(handler) == Validate::Mode::Last, "Handler missing" );
-
 }  // namespace