fix tests

Author: oktonion

tests/compile_time_reflection.cpp

@@ -16,25 +16,19 @@ namespace resources
 
 
 template<>
-struct cppmeta::reflect<resources::type_for_ct_reflection, cppmeta::reflection::compile_time>
-{   
-    typedef resources::type_for_ct_reflection type_for_ct_reflection;
-
-    template<class meta>
-    class info
-    {
-        name = "type_for_ct_reflection",
-        members =
-                member("type_for_ct_reflection()", &class_<type_for_ct_reflection>::default_constructor),
-                member("type_for_ct_reflection(int, float)", &class_<type_for_ct_reflection>::constructor<int, float>),
-                member("constructor2", &class_<type_for_ct_reflection>::constructor<int, int>),
-                member("~type_for_ct_reflection", &class_<type_for_ct_reflection>::destructor),
-                member("data1", &type_for_ct_reflection::data1),
-                member("func1", &type_for_ct_reflection::func1),
-                member("templ_func1(int)", &type_for_ct_reflection::templ_func1<int>)
-            ;
-    }
-};
+cppmeta::reflexpr<resources::type_for_ct_reflection>::meta_type
+cppmeta::reflexpr<resources::type_for_ct_reflection>::meta =
+(   
+    name = "type_for_ct_reflection",
+    members =
+            cppmeta::member("type_for_ct_reflection()", &class_<resources::type_for_ct_reflection>::default_constructor),
+            cppmeta::member("type_for_ct_reflection(int, float)", &class_<resources::type_for_ct_reflection>::constructor<int, float>),
+            cppmeta::member("constructor2", &class_<resources::type_for_ct_reflection>::constructor<int, int>),
+            cppmeta::member("~type_for_ct_reflection", &class_<resources::type_for_ct_reflection>::destructor),
+            cppmeta::member("data1", &resources::type_for_ct_reflection::data1),
+            cppmeta::member("func1", &resources::type_for_ct_reflection::func1),
+            cppmeta::member("templ_func1(int)", &resources::type_for_ct_reflection::templ_func1<int>)
+);
 
 TEST_SUITE("compile-time reflection")
 {
@@ -44,21 +38,22 @@ TEST_CASE("reflect some types"){
     using namespace cppmeta;
 
 
-    reflect<int>::
+    reflexpr<int>::meta =
+    (
         objects += 
               object("some_data_rt", &some_data_rt)
             , object("some_data_rt_ref", some_data_rt)
             , object("some_data_rt_const", some_data_rt_const)
         ,values +=
             constant("max_int", 2048)
-        ;
+    );
 
     SUBCASE("resolving object by value")
     {
         int some_data_rt_resolved =
-            resolve<int>::object("some_data_rt").value;
+            reflexpr<int>::object("some_data_rt").value;
         const int& some_data_rt_const_resolved =
-            resolve<int>::object("some_data_rt_const").value;
+            reflexpr<int>::object("some_data_rt_const").value;
 
         CHECK(some_data_rt_resolved == some_data_rt);
         CHECK(some_data_rt_const_resolved == some_data_rt_const);
@@ -67,9 +62,9 @@ TEST_CASE("reflect some types"){
     SUBCASE("resolving object by const value")
     {
         const int& some_data_rt_resolved =
-            resolve<const int>::object("some_data_rt").value;
+            reflexpr<const int>::object("some_data_rt").value;
         const int& some_data_rt_const_resolved =
-            resolve<const int>::object("some_data_rt_const").value;
+            reflexpr<const int>::object("some_data_rt_const").value;
 
         CHECK(some_data_rt_resolved == some_data_rt);
         CHECK(some_data_rt_const_resolved == some_data_rt_const);
@@ -78,7 +73,7 @@ TEST_CASE("reflect some types"){
     SUBCASE("resolving object by reference")
     {
         int& some_data_rt_resolved =
-            resolve<int&>::object("some_data_rt").value;
+            reflexpr<int&>::object("some_data_rt").value;
         CHECK(some_data_rt_resolved == some_data_rt);
 
         REQUIRE(some_data_rt_resolved != 42);
@@ -87,7 +82,7 @@ TEST_CASE("reflect some types"){
         CHECK(some_data_rt == 42);
 
         const int& some_data_rt_const_resolved =
-            resolve<const int&>::object("some_data_rt_const").value;
+            reflexpr<const int&>::object("some_data_rt_const").value;
 
         CHECK(some_data_rt_const_resolved == some_data_rt_const);
     }
@@ -100,7 +95,7 @@ TEST_CASE("reflect some class"){
     SUBCASE("resolving class data")
     {
         int type_for_ct_reflection::*  data1_tmp =
-            resolve<type_for_ct_reflection>::member<int>("data1").value;
+            reflexpr<type_for_ct_reflection>::member<int>("data1").value;
 
         type_for_ct_reflection obj;
         obj.data1 = true;

tests/runtime_reflection.cpp

@@ -36,8 +36,7 @@ TEST_CASE("reflect some types"){
             , object("some_data_rt_const", some_data_rt_const)
         ,values +=
             constant("max_int", 2048)
-        ;
-     );
+    );
 
     SUBCASE("resolving object by value")
     {
@@ -95,8 +94,8 @@ TEST_CASE("reflect some class"){
     SUBCASE("resolving class data")
     {
         int type_for_rt_reflection::*  data1_tmp =
-            resolve<type_for_rt_reflection>::member<int>("data1").value;
-    );
+            reflexpr<type_for_rt_reflection>::member<int>("data1").value;
+    };
 
     SUBCASE("resolving class data1")
     {