more macro work

Author: jll63

docs.in/reference/method_container.cpp

@@ -42,7 +42,7 @@ the same namespace as the container itself.
 #include <yorel/yomm2.hpp>
 #include <yorel/yomm2/compiler.hpp>
 
-method_container(kicks);
+template<typename> struct kicks;
 
 class Animal {
     std::string name;
@@ -53,7 +53,7 @@ class Animal {
     virtual ~Animal() {
     }
 
-    friend_method(kicks);
+    template<typename> friend struct kicks;
 };
 
 class Dog : public Animal {
@@ -72,8 +72,8 @@ define_method_inline(kicks, kick, (Dog * dog), std::string) {
     return dog->name + " barks";
 }
 
-define_method(kicks, kick, (Bulldog * dog), std::string) {
-    return method_definition(kicks, kick, (Dog*))(dog) + " and bites";
+define_method_in(kicks, kick, (Bulldog * dog), std::string) {
+    return kicks<std::string (Dog*)>::fn(dog) + " and bites";
 }
 
 BOOST_AUTO_TEST_CASE(ref_example) {

include/yorel/yomm2/macros.hpp

@@ -99,7 +99,11 @@
     boost::mp11::mp_first<boost::mp11::mp_list<__VA_ARGS__>>                   \
         NS::_yOMM2_spec::yOMM2_body ARGS
 
-#define YOMM2_DECLARE_METHOD_CONTAINER_4_NS(NS, CONTAINER, NAME, ARGS, ...)    \
+#define YOMM2_DEFINE_INLINE(CONTAINER, NAME, ARGS, ...)                        \
+    yOMM2_DEFINE_IN_CONTAINER(                                                 \
+        YOMM2_GENSYM, inline, CONTAINER, NAME, ARGS, __VA_ARGS__)
+
+#define yOMM2_DEFINE_IN_CONTAINER(NS, INLINE, CONTAINER, NAME, ARGS, ...)      \
     template<typename>                                                         \
     struct CONTAINER;                                                          \
     namespace {                                                                \
@@ -113,24 +117,17 @@
         static NS::_yOMM2_method::next_type next;                              \
         static boost::mp11::mp_first<boost::mp11::mp_list<__VA_ARGS__>> fn     \
             ARGS;                                                              \
-    }
-
-#define YOMM2_DEFINE_INLINE(CONTAINER, NAME, ARGS, ...)                        \
-    yOMM2_DEFINE_IN_CONTAINER(                                                 \
-        YOMM2_GENSYM, inline, CONTAINER, NAME, ARGS, __VA_ARGS__)
-
-#define yOMM2_DEFINE_IN_CONTAINER(NS, INLINE, CONTAINER, NAME, ARGS, ...)      \
-    YOMM2_DECLARE_METHOD_CONTAINER_4_NS(                                       \
-        NS, CONTAINER, NAME, ARGS, __VA_ARGS__);                               \
+    };                                                                         \
     INLINE NS::_yOMM2_method::next_type CONTAINER<                             \
         boost::mp11::mp_first<boost::mp11::mp_list<__VA_ARGS__>>(ARGS)>::next; \
     namespace {                                                                \
     namespace NS {                                                             \
     INLINE _yOMM2_method::override_fn<CONTAINER<                               \
         boost::mp11::mp_first<boost::mp11::mp_list<__VA_ARGS__>> ARGS>::fn>    \
         YOMM2_GENSYM(                                                          \
-            &CONTAINER<boost::mp11::mp_first<boost::mp11::mp_list<__VA_ARGS__>> \
-                          ARGS>::next);                                        \
+            &CONTAINER<                                                        \
+                boost::mp11::mp_first<boost::mp11::mp_list<__VA_ARGS__>>       \
+                    ARGS>::next);                                              \
     }                                                                          \
     }                                                                          \
     INLINE boost::mp11::mp_first<boost::mp11::mp_list<__VA_ARGS__>>            \