changeset 499:d3ea59fce7dc

core: rename action-stack fields
author David Demelier <markand@malikania.fr>
date Tue, 28 Feb 2023 13:50:35 +0100
parents 41267f6e344d
children d7855791a2b8
files libmlk-core/mlk/core/action-script.c libmlk-core/mlk/core/action-script.h tests/test-action-script.c
diffstat 3 files changed, 20 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/libmlk-core/mlk/core/action-script.c	Tue Feb 28 13:47:00 2023 +0100
+++ b/libmlk-core/mlk/core/action-script.c	Tue Feb 28 13:50:35 2023 +0100
@@ -27,22 +27,22 @@
 static inline struct mlk_action *
 current(struct mlk_action_script *s)
 {
-	if (s->cur >= s->size)
+	if (s->cur >= s->len)
 		return NULL;
 
 	return s->actions[s->cur];
 }
 
 void
-mlk_action_script_init(struct mlk_action_script *s, struct mlk_action **actions, size_t max)
+mlk_action_script_init(struct mlk_action_script *s, struct mlk_action **actions, size_t cap)
 {
 	assert(s);
 
 	s->actions = actions;
-	s->max = max;
-	s->size = s->cur = 0;
+	s->cap = cap;
+	s->len = s->cur = 0;
 
-	for (size_t i = 0; i < max; ++i)
+	for (size_t i = 0; i < s->cap; ++i)
 		s->actions[i] = NULL;
 }
 
@@ -63,10 +63,10 @@
 	assert(s);
 	assert(a);
 
-	if (s->size >= s->max)
+	if (s->len >= s->cap)
 		return MLK_ERR_NO_MEM;
 
-	s->actions[s->size++] = a;
+	s->actions[s->len++] = a;
 
 	return 0;
 }
@@ -103,7 +103,7 @@
 			mlk_action_start(a);
 	}
 
-	return s->cur >= s->size;
+	return s->cur >= s->len;
 }
 
 void
@@ -122,7 +122,7 @@
 {
 	assert(s);
 
-	return s->cur >= s->size;
+	return s->cur >= s->len;
 }
 
 void
@@ -130,7 +130,7 @@
 {
 	assert(s);
 
-	for (size_t i = 0; i < s->size; ++i)
+	for (size_t i = 0; i < s->len; ++i)
 		mlk_action_finish(s->actions[i]);
 
 	memset(s, 0, sizeof (*s));
--- a/libmlk-core/mlk/core/action-script.h	Tue Feb 28 13:47:00 2023 +0100
+++ b/libmlk-core/mlk/core/action-script.h	Tue Feb 28 13:50:35 2023 +0100
@@ -29,8 +29,8 @@
 
 struct mlk_action_script {
 	struct mlk_action **actions;
-	size_t size;
-	size_t max;
+	size_t cap;
+	size_t len;
 	size_t cur;
 };
 
--- a/tests/test-action-script.c	Tue Feb 28 13:47:00 2023 +0100
+++ b/tests/test-action-script.c	Tue Feb 28 13:50:35 2023 +0100
@@ -102,8 +102,8 @@
 
 	mlk_action_script_init(&sc, actions, 10);
 
-	DT_EQ_SIZE(sc.size, 0U);
-	DT_EQ_SIZE(sc.max, 10U);
+	DT_EQ_SIZE(sc.len, 0U);
+	DT_EQ_SIZE(sc.cap, 10U);
 	DT_EQ_SIZE(sc.cur, 0U);
 }
 
@@ -117,21 +117,21 @@
 	mlk_action_script_init(&sc, array, 3);
 
 	DT_ASSERT(mlk_action_script_append(&sc, &actions[0]) == 0);
-	DT_EQ_SIZE(sc.size, 1U);
-	DT_EQ_SIZE(sc.max, 3U);
+	DT_EQ_SIZE(sc.len, 1U);
+	DT_EQ_SIZE(sc.cap, 3U);
 	DT_EQ_SIZE(sc.cur, 0U);
 	DT_EQ_PTR(sc.actions[0], &actions[0]);
 
 	DT_ASSERT(mlk_action_script_append(&sc, &actions[1]) == 0);
-	DT_EQ_SIZE(sc.size, 2U);
-	DT_EQ_SIZE(sc.max, 3U);
+	DT_EQ_SIZE(sc.len, 2U);
+	DT_EQ_SIZE(sc.cap, 3U);
 	DT_EQ_SIZE(sc.cur, 0U);
 	DT_EQ_PTR(sc.actions[0], &actions[0]);
 	DT_EQ_PTR(sc.actions[1], &actions[1]);
 
 	DT_ASSERT(mlk_action_script_append(&sc, &actions[2]) == 0);
-	DT_EQ_SIZE(sc.size, 3U);
-	DT_EQ_SIZE(sc.max, 3U);
+	DT_EQ_SIZE(sc.len, 3U);
+	DT_EQ_SIZE(sc.cap, 3U);
 	DT_EQ_SIZE(sc.cur, 0U);
 	DT_EQ_PTR(sc.actions[0], &actions[0]);
 	DT_EQ_PTR(sc.actions[1], &actions[1]);