Jelajahi Sumber

process: dead -> finished

Michele Caini 5 tahun lalu
induk
melakukan
5c56cbd672

+ 3 - 3
docs/md/process.md

@@ -28,9 +28,9 @@ A typical process must inherit from the `process` class template that stays true
 to the CRTP idiom. Moreover, derived classes must specify what's the intended
 to the CRTP idiom. Moreover, derived classes must specify what's the intended
 type for elapsed times.
 type for elapsed times.
 
 
-A process should expose publicly the following member functions whether
-required (note that it isn't required to define a function unless the derived
-class wants to _override_ the default behavior):
+A process should expose publicly the following member functions whether needed
+(note that it isn't required to define a function unless the derived class wants
+to _override_ the default behavior):
 
 
 * `void update(Delta, void *);`
 * `void update(Delta, void *);`
 
 

+ 1 - 1
src/entt/process/process.hpp

@@ -202,7 +202,7 @@ public:
      * @brief Returns true if a process is already terminated.
      * @brief Returns true if a process is already terminated.
      * @return True if the process is terminated, false otherwise.
      * @return True if the process is terminated, false otherwise.
      */
      */
-    [[nodiscard]] bool dead() const ENTT_NOEXCEPT {
+    [[nodiscard]] bool finished() const ENTT_NOEXCEPT {
         return current == state::FINISHED;
         return current == state::FINISHED;
     }
     }
 
 

+ 1 - 1
src/entt/process/scheduler.hpp

@@ -84,7 +84,7 @@ class scheduler {
 
 
         if(process->rejected()) {
         if(process->rejected()) {
             return true;
             return true;
-        } else if(process->dead()) {
+        } else if(process->finished()) {
             if(handler.next) {
             if(handler.next) {
                 handler = std::move(*handler.next);
                 handler = std::move(*handler.next);
                 // forces the process to exit the uninitialized state
                 // forces the process to exit the uninitialized state

+ 14 - 14
test/entt/process/process.cpp

@@ -46,7 +46,7 @@ TEST(Process, Basics) {
     fake_process<int> process{};
     fake_process<int> process{};
 
 
     ASSERT_FALSE(process.alive());
     ASSERT_FALSE(process.alive());
-    ASSERT_FALSE(process.dead());
+    ASSERT_FALSE(process.finished());
     ASSERT_FALSE(process.paused());
     ASSERT_FALSE(process.paused());
     ASSERT_FALSE(process.rejected());
     ASSERT_FALSE(process.rejected());
 
 
@@ -57,42 +57,42 @@ TEST(Process, Basics) {
     process.unpause();
     process.unpause();
 
 
     ASSERT_FALSE(process.alive());
     ASSERT_FALSE(process.alive());
-    ASSERT_FALSE(process.dead());
+    ASSERT_FALSE(process.finished());
     ASSERT_FALSE(process.paused());
     ASSERT_FALSE(process.paused());
     ASSERT_FALSE(process.rejected());
     ASSERT_FALSE(process.rejected());
 
 
     process.tick(0);
     process.tick(0);
 
 
     ASSERT_TRUE(process.alive());
     ASSERT_TRUE(process.alive());
-    ASSERT_FALSE(process.dead());
+    ASSERT_FALSE(process.finished());
     ASSERT_FALSE(process.paused());
     ASSERT_FALSE(process.paused());
     ASSERT_FALSE(process.rejected());
     ASSERT_FALSE(process.rejected());
 
 
     process.pause();
     process.pause();
 
 
     ASSERT_TRUE(process.alive());
     ASSERT_TRUE(process.alive());
-    ASSERT_FALSE(process.dead());
+    ASSERT_FALSE(process.finished());
     ASSERT_TRUE(process.paused());
     ASSERT_TRUE(process.paused());
     ASSERT_FALSE(process.rejected());
     ASSERT_FALSE(process.rejected());
 
 
     process.unpause();
     process.unpause();
 
 
     ASSERT_TRUE(process.alive());
     ASSERT_TRUE(process.alive());
-    ASSERT_FALSE(process.dead());
+    ASSERT_FALSE(process.finished());
     ASSERT_FALSE(process.paused());
     ASSERT_FALSE(process.paused());
     ASSERT_FALSE(process.rejected());
     ASSERT_FALSE(process.rejected());
 
 
     process.fail();
     process.fail();
 
 
     ASSERT_FALSE(process.alive());
     ASSERT_FALSE(process.alive());
-    ASSERT_FALSE(process.dead());
+    ASSERT_FALSE(process.finished());
     ASSERT_FALSE(process.paused());
     ASSERT_FALSE(process.paused());
     ASSERT_FALSE(process.rejected());
     ASSERT_FALSE(process.rejected());
 
 
     process.tick(0);
     process.tick(0);
 
 
     ASSERT_FALSE(process.alive());
     ASSERT_FALSE(process.alive());
-    ASSERT_FALSE(process.dead());
+    ASSERT_FALSE(process.finished());
     ASSERT_FALSE(process.paused());
     ASSERT_FALSE(process.paused());
     ASSERT_TRUE(process.rejected());
     ASSERT_TRUE(process.rejected());
 }
 }
@@ -106,7 +106,7 @@ TEST(Process, Succeeded) {
     process.tick({});
     process.tick({});
 
 
     ASSERT_FALSE(process.alive());
     ASSERT_FALSE(process.alive());
-    ASSERT_TRUE(process.dead());
+    ASSERT_TRUE(process.finished());
     ASSERT_FALSE(process.paused());
     ASSERT_FALSE(process.paused());
     ASSERT_FALSE(process.rejected());
     ASSERT_FALSE(process.rejected());
 
 
@@ -126,7 +126,7 @@ TEST(Process, Fail) {
     process.tick(0);
     process.tick(0);
 
 
     ASSERT_FALSE(process.alive());
     ASSERT_FALSE(process.alive());
-    ASSERT_FALSE(process.dead());
+    ASSERT_FALSE(process.finished());
     ASSERT_FALSE(process.paused());
     ASSERT_FALSE(process.paused());
     ASSERT_TRUE(process.rejected());
     ASSERT_TRUE(process.rejected());
 
 
@@ -147,7 +147,7 @@ TEST(Process, Data) {
     process.tick({}, &value);
     process.tick({}, &value);
 
 
     ASSERT_FALSE(process.alive());
     ASSERT_FALSE(process.alive());
-    ASSERT_TRUE(process.dead());
+    ASSERT_TRUE(process.finished());
     ASSERT_FALSE(process.paused());
     ASSERT_FALSE(process.paused());
     ASSERT_FALSE(process.rejected());
     ASSERT_FALSE(process.rejected());
 
 
@@ -167,7 +167,7 @@ TEST(Process, AbortNextTick) {
     process.tick(0);
     process.tick(0);
 
 
     ASSERT_FALSE(process.alive());
     ASSERT_FALSE(process.alive());
-    ASSERT_FALSE(process.dead());
+    ASSERT_FALSE(process.finished());
     ASSERT_FALSE(process.paused());
     ASSERT_FALSE(process.paused());
     ASSERT_TRUE(process.rejected());
     ASSERT_TRUE(process.rejected());
 
 
@@ -185,7 +185,7 @@ TEST(Process, AbortImmediately) {
     process.abort(true);
     process.abort(true);
 
 
     ASSERT_FALSE(process.alive());
     ASSERT_FALSE(process.alive());
-    ASSERT_FALSE(process.dead());
+    ASSERT_FALSE(process.finished());
     ASSERT_FALSE(process.paused());
     ASSERT_FALSE(process.paused());
     ASSERT_TRUE(process.rejected());
     ASSERT_TRUE(process.rejected());
 
 
@@ -209,7 +209,7 @@ TEST(ProcessAdaptor, Resolved) {
     process.tick(0);
     process.tick(0);
     process.tick(0);
     process.tick(0);
 
 
-    ASSERT_TRUE(process.dead());
+    ASSERT_TRUE(process.finished());
     ASSERT_TRUE(updated);
     ASSERT_TRUE(updated);
 }
 }
 
 
@@ -243,6 +243,6 @@ TEST(ProcessAdaptor, Data) {
     process.tick(0);
     process.tick(0);
     process.tick(0, &value);
     process.tick(0, &value);
 
 
-    ASSERT_TRUE(process.dead());
+    ASSERT_TRUE(process.finished());
     ASSERT_EQ(value, 42);
     ASSERT_EQ(value, 42);
 }
 }