Commit f8be57778e745252e381494c49a697cd6fdfe454
2023-01-30T11:02:23
wip remove alloca
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188
diff --git a/libc3/skiplist.h.in b/libc3/skiplist.h.in
index ee97918..62c7781 100644
--- a/libc3/skiplist.h.in
+++ b/libc3/skiplist.h.in
@@ -38,6 +38,7 @@ skiplist_delete___NAME$ (s_skiplist___NAME$ *skiplist);
s_skiplist_node___NAME$ *
skiplist_find___NAME$ (s_skiplist___NAME$ *skiplist, _TYPE$ value);
+/* do not call directly */
s_skiplist___NAME$ *
skiplist_init___NAME$ (s_skiplist___NAME$ *skiplist, u8 max_height, f64 spacing);
diff --git a/libc3/skiplist__fact.h b/libc3/skiplist__fact.h
index 20f97e6..eef0d42 100644
--- a/libc3/skiplist__fact.h
+++ b/libc3/skiplist__fact.h
@@ -38,6 +38,7 @@ skiplist_delete__fact (s_skiplist__fact *skiplist);
s_skiplist_node__fact *
skiplist_find__fact (s_skiplist__fact *skiplist, s_fact * value);
+/* do not call directly */
s_skiplist__fact *
skiplist_init__fact (s_skiplist__fact *skiplist, u8 max_height, f64 spacing);
diff --git a/test/skiplist__fact_test.c b/test/skiplist__fact_test.c
index 81a4666..d8514f2 100644
--- a/test/skiplist__fact_test.c
+++ b/test/skiplist__fact_test.c
@@ -23,25 +23,11 @@
do { \
test_context("skiplist_insert__fact(" # test ") -> " \
# expected_length); \
- TEST_ASSERT(skiplist_insert__fact(&skiplist, (test))); \
- TEST_EQ(skiplist.length, (expected_length)); \
+ TEST_ASSERT(skiplist_insert__fact(skiplist, (test))); \
+ TEST_EQ(skiplist->length, (expected_length)); \
test_context(NULL); \
} while (0)
-#define SKIPLIST__FACT_TEST_INIT_CLEAN(max_height_, spacing) \
- do { \
- s_skiplist__fact skiplist; \
- TEST_ASSERT(skiplist_init__fact(&skiplist, max_height_, \
- spacing)); \
- TEST_ASSERT(skiplist.head); \
- TEST_ASSERT(skiplist.compare); \
- TEST_EQ(skiplist.length, 0); \
- TEST_EQ(skiplist.max_height, max_height_); \
- TEST_EQ(skiplist.head->height, max_height_); \
- skiplist_clean__fact(&skiplist); \
- test_ok(); \
- } while (0)
-
#define SKIPLIST__FACT_TEST_NEW_DELETE(max_height_, spacing) \
do { \
s_skiplist__fact *skiplist; \
@@ -60,21 +46,19 @@
do { \
test_context("skiplist_remove__fact(" # test ") -> " \
# expected_length); \
- skiplist_remove__fact(&skiplist, (test)); \
- TEST_EQ(skiplist.length, (expected_length)); \
+ skiplist_remove__fact(skiplist, (test)); \
+ TEST_EQ(skiplist->length, (expected_length)); \
test_context(NULL); \
} while (0)
void skiplist__fact_test ();
void skiplist__fact_test_find ();
void skiplist__fact_test_insert ();
-void skiplist__fact_test_init_clean ();
void skiplist__fact_test_new_delete ();
void skiplist__fact_test_remove ();
void skiplist__fact_test ()
{
- skiplist__fact_test_init_clean();
skiplist__fact_test_new_delete();
skiplist__fact_test_insert();
skiplist__fact_test_remove();
@@ -114,25 +98,25 @@ void skiplist__fact_test_find ()
NULL
};
const double *s;
- s_skiplist__fact skiplist;
+ s_skiplist__fact *skiplist;
const double spacing[] = {2.0, 2.4, 3.0, 0.0};
for (h = height; *h; h++) {
for (s = spacing; *s != 0.0; s++) {
- skiplist_init__fact(&skiplist, *h, *s);
+ skiplist = skiplist_new__fact(*h, *s);
i = 0;
while (p[i]) {
fact_test_init_1(fact + i, p[i]);
- skiplist_insert__fact(&skiplist, fact + i);
- TEST_ASSERT(skiplist_find__fact(&skiplist, fact + i));
+ skiplist_insert__fact(skiplist, fact + i);
+ TEST_ASSERT(skiplist_find__fact(skiplist, fact + i));
i++;
}
- i = skiplist.length;
+ i = skiplist->length;
while (i--) {
- skiplist_remove__fact(&skiplist, fact + i);
- TEST_ASSERT(! skiplist_find__fact(&skiplist, fact + i));
+ skiplist_remove__fact(skiplist, fact + i);
+ TEST_ASSERT(! skiplist_find__fact(skiplist, fact + i));
fact_test_clean_1(fact + i);
}
- skiplist_clean__fact(&skiplist);
+ skiplist_delete__fact(skiplist);
}
}
}
@@ -171,7 +155,7 @@ void skiplist__fact_test_insert ()
NULL
};
s_fact fact[24];
- s_skiplist__fact skiplist;
+ s_skiplist__fact *skiplist;
i = 0;
while (p[i]) {
fact_test_init_1(fact + i, p[i]);
@@ -179,13 +163,13 @@ void skiplist__fact_test_insert ()
}
for (h = height; *h; h++) {
for (s = spacing; *s != 0.0; s++) {
- skiplist_init__fact(&skiplist, *h, *s);
+ skiplist = skiplist_new__fact(*h, *s);
i = 0;
while (p[i]) {
SKIPLIST__FACT_TEST_INSERT(fact + i, i + 1);
i++;
}
- skiplist_clean__fact(&skiplist);
+ skiplist_delete__fact(skiplist);
}
}
i = 0;
@@ -195,19 +179,6 @@ void skiplist__fact_test_insert ()
}
}
-void skiplist__fact_test_init_clean ()
-{
- const u8 *h;
- const u8 height[] = {2, 3, 4, 5, 6, 7, 8, 9, 10, 20, 30, 0};
- const double *s;
- const double spacing[] = {2.0, 2.4, 3.0, 0.0};
- for (h = height; *h; h++) {
- for (s = spacing; *s != 0.0; s++) {
- SKIPLIST__FACT_TEST_INIT_CLEAN(*h, *s);
- }
- }
-}
-
void skiplist__fact_test_new_delete ()
{
const u8 *h;
@@ -254,23 +225,23 @@ void skiplist__fact_test_remove ()
NULL
};
const double *s;
- s_skiplist__fact skiplist;
+ s_skiplist__fact *skiplist;
const double spacing[] = {2.0, 2.4, 3.0, 0.0};
for (h = height; *h; h++) {
for (s = spacing; *s != 0.0; s++) {
- skiplist_init__fact(&skiplist, *h, *s);
+ skiplist = skiplist_new__fact(*h, *s);
i = 0;
while (p[i]) {
fact_test_init_1(fact + i, p[i]);
- skiplist_insert__fact(&skiplist, fact + i);
+ skiplist_insert__fact(skiplist, fact + i);
i++;
}
- i = skiplist.length;
+ i = skiplist->length;
while (i--) {
SKIPLIST__FACT_TEST_REMOVE(fact + i, i);
fact_test_clean_1(fact + i);
}
- skiplist_clean__fact(&skiplist);
+ skiplist_delete__fact(skiplist);
}
}
}