Call macro

amethyst · Jun 18, 2017 · 1173116 · 1173116
1 parent 20915c0
commit 1173116
Show file tree

Hide file tree

Showing 4 changed files with 85 additions and 83 deletions.
diff --git a/specs/examples/serialize.rs b/specs/examples/serialize.rs
@@ -95,10 +95,10 @@ fn main() {
     }
 
     struct RemovalSystem;
-    impl<'a, C> System<'a, C> for RemovalSystem {
+    impl<'a> System<'a> for RemovalSystem {
         type SystemData = RemovalData<'a>;
 
-        fn work(&mut self, mut data: RemovalData, _: C) {
+        fn run(&mut self, mut data: RemovalData) {
             // Remove all components
             for (entity, _) in (&*data.entities, &data.comp_serial.check()).join() {
                 data.comp_serial.remove(entity);
@@ -169,7 +169,8 @@ fn main() {
             .add(RemovalSystem, "removal", &[])
             .build();
 
-        dispatcher.dispatch(&mut world.res, ());
+        dispatcher.dispatch(&mut world.res);
+        world.maintain();
     }
 
     {
@@ -180,7 +181,7 @@ fn main() {
 
     {
         let entity_list: Vec<_> = {
-            let entities = world.read_resource::<specs::Entities>();
+            let entities = world.read_resource::<specs::EntitiesRes>();
             entities.join().collect()
         };
 

diff --git a/specs/src/group.rs b/specs/src/group.rs
@@ -72,3 +72,79 @@ impl Split for () {
     fn next() -> bool { false }
 }
 
+#[macro_export]
+macro_rules! call {
+    // Top level calls
+    ( component: $group:ty => 
+        fn $method:ident
+        [ $( $before:ty ),* ] in [ $( $after:ty ),* ]
+        ( $( $args:expr ),* )
+    ) => {
+        call!(
+            @Iter $group: Locals =>
+            fn $method
+            [ $( $before ),* ] in [ $( $after ),* ]
+            ( $( $args ),* )
+        );
+    };
+    ( subgroup: $group:ty => 
+        fn $method:ident
+        [ $( $before:ty ),* ] in [ $( $after:ty ),* ]
+        ( $( $args:expr ),* )
+    ) => {
+        call!(
+            @Iter $group: Subgroups =>
+            fn $method
+            [ $( $before ),* ] in [ $( $after ),* ]
+            ( $( $args ),* )
+        );
+    };
+
+    // Helper methods
+
+    // Break macro recursion.
+    (@Iter [ $( $group:tt )* ] [ ] =>
+        fn $method:ident
+        [ $( $before:ty ),* ] in [ $( $after:ty ),* ]
+        ( $( $args:expr ),* )
+    ) => { };
+
+    // Iterate over components through associated type recursion.
+    (@Iter [ $( $group:tt )* ] [ A $( $token:tt )* ] =>
+        fn $method:ident
+        [ $( $before:ty ),* ] in [ $( $after:ty ),* ]
+        ( $( $args:expr ),* )
+    ) => {
+        $method::<$( $before, )* <$( $group )* as Split>::This $( , $after )*>( $( $args ),* );
+
+        if <$( $group )* as Split>::next() {
+            call!(
+                @Iter [ <$( $group )* as Split>::Next ] [ $( $token )* ] =>
+                fn $method
+                [ $( $before ),* ] in [ $( $after ),* ]
+                ( $( $args ),* )
+            );
+        }
+    };
+
+    // Entrance to iteration.
+    (@Iter $group:ty: $at:ident =>
+        fn $method:ident
+        [ $( $before:ty ),* ] in [ $( $after:ty ),* ]
+        ( $( $args:expr ),* )
+    ) => {
+        call!(
+            @Iter [ <$group as DeconstructedGroup>::$at ] [
+                // Requires tokens for recursion breaking.
+                // Each row has 32 tokens, totalling to 128 currently.
+                A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A
+                A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A
+                A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A
+                A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A
+            ] =>
+            fn $method
+            [ $( $before ),* ] in [ $( $after ),* ]
+            ( $( $args ),* )
+        );
+    };
+}
diff --git a/specs/src/lib.rs b/specs/src/lib.rs
@@ -214,6 +214,7 @@ pub type Entities<'a> = Fetch<'a, EntitiesRes>;
 /// An index is basically the id of an `Entity`.
 pub type Index = u32;
 
+#[macro_export]
 mod group;
 mod join;
 mod storage;

diff --git a/specs_derive/examples/derive.rs b/specs_derive/examples/derive.rs
@@ -1,6 +1,7 @@
 
 #![recursion_limit="256"]
 
+#[macro_use]
 extern crate specs;
 #[macro_use]
 extern crate specs_derive;
@@ -13,81 +14,6 @@ extern crate serde_derive;
 #[cfg(feature="serialize")]
 extern crate serde_json;
 
-/*
-macro_rules! call {
-    // Top level calls
-    ( local: $group:ty => 
-        fn $method:ident
-        [ $( $before:ty ),* ] in [ $( $after:ty ),* ]
-        ( $( $args:expr ),* )
-    ) => {
-        call!(
-            @Iter $group: Locals =>
-            fn $method
-            [ $( $before ),* ] in [ $( $after ),* ]
-            ( $( $args ),* )
-        );
-    };
-    ( subgroups: $group:ty => 
-        fn $method:ident
-        [ $( $before:ty ),* ] in [ $( $after:ty ),* ]
-        ( $( $args:expr ),* )
-    ) => {
-        call!(
-            @Iter $group: Subgroups =>
-            fn $method
-            [ $( $before ),* ] in [ $( $after ),* ]
-            ( $( $args ),* )
-        );
-    };
-
-    // Helper methods
-    (@Iter [ $( $group:tt )* ] [ A $( $token:tt )* ] =>
-        fn $method:ident
-        [ $( $before:ty ),* ] in [ $( $after:ty ),* ]
-        ( $( $args:expr ),* )
-    ) => {
-        $method::<$( $before, )* <$( $group )* as Split>::This $( , $after )*>( $( $args ),* );
-
-        if <$( $group )* as Split>::next() {
-            call!(
-                @Iter [ <$( $group )* as Split>::Next ] [ $( $token )* ] =>
-                fn $method
-                [ $( $before ),* ] in [ $( $after ),* ]
-                ( $( $args ),* )
-            );
-        }
-    };
-
-    // Break macro recursion
-    (@Iter [ $( $group:tt )* ] [ ] =>
-        fn $method:ident
-        [ $( $before:ty ),* ] in [ $( $after:ty ),* ]
-        ( $( $args:expr ),* )
-    ) => { };
-
-    (@Iter $group:ty: $at:ident =>
-        fn $method:ident
-        [ $( $before:ty ),* ] in [ $( $after:ty ),* ]
-        ( $( $args:expr ),* )
-    ) => {
-        call!(
-            @Iter [ <$group as DeconstructedGroup>::$at ] [
-                // Requires tokens for recursion breaking.
-                // Each row has 32 tokens, totalling to 128 currently.
-                A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A
-                A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A
-                A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A
-                A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A
-            ] =>
-            fn $method
-            [ $( $before ),* ] in [ $( $after ),* ]
-            ( $( $args ),* )
-        );
-    };
-}
-*/
-
 #[cfg(feature="serialize")]
 fn main() {
     use specs::{Component, ComponentGroup, DeconstructedGroup, DispatcherBuilder, Entities, EntitiesRes, Join, SerializeGroup, System, ReadStorage, Split, VecStorage, WriteStorage, World, WorldDeserializer, WorldSerializer};
@@ -253,15 +179,13 @@ fn main() {
         3
     }
 
-    /*
     let s = "Something";
-    call!(local: SomeGroup =>
+    call!(component: SomeGroup =>
         fn call_method [ ] in [ ] (s)
     );
-    call!(local: SomeGroup =>
+    call!(component: SomeGroup =>
         fn call_other [ ] in [ ] (s)
     );
-    */
 }
 
 #[cfg(not(feature="serialize"))]