Commit 01b92a6873591d91aaef574cd83527a9b2a9bef4
2023-01-30T17:13:03
shutdown -> clean
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
diff --git a/c3s/c3s.c b/c3s/c3s.c
index 129b6a3..0198494 100644
--- a/c3s/c3s.c
+++ b/c3s/c3s.c
@@ -61,9 +61,7 @@ sw buf_xfer_spaces (s_buf *out, s_buf *in)
int main (int argc, char **argv)
{
- s_module c3;
s_env env;
- s_facts facts;
s8 i[BUF_SIZE];
s_buf in;
s_tag input;
@@ -71,9 +69,7 @@ int main (int argc, char **argv)
s_buf out;
sw r;
s_tag result;
- libc3_init();
- facts_init(&facts);
- c3_init(&c3, &facts);
+ c3_init();
if (argc < 1)
return usage(argv[0]);
buf_init(&in, false, sizeof(i), i);
@@ -108,9 +104,7 @@ int main (int argc, char **argv)
env_clean(&env);
buf_readline_close(&in);
buf_file_close(&out);
- c3_clean(&c3);
- facts_clean(&facts);
- libc3_shutdown();
+ c3_clean();
return 0;
}
diff --git a/ic3/ic3.c b/ic3/ic3.c
index b43a2e8..5555b90 100644
--- a/ic3/ic3.c
+++ b/ic3/ic3.c
@@ -61,9 +61,7 @@ sw buf_xfer_spaces (s_buf *out, s_buf *in)
int main (int argc, char **argv)
{
- s_module c3;
s_env env;
- s_facts facts;
s8 i[BUF_SIZE];
s_buf in;
s_tag input;
@@ -71,9 +69,7 @@ int main (int argc, char **argv)
s_buf out;
sw r;
s_tag result;
- libc3_init();
- facts_init(&facts);
- c3_init(&c3, &facts);
+ c3_init();
if (argc < 1)
return usage(argv[0]);
buf_init(&in, false, sizeof(i), i);
@@ -107,9 +103,7 @@ int main (int argc, char **argv)
env_clean(&env);
buf_linenoise_close(&in);
buf_file_close(&out);
- c3_clean(&c3);
- facts_clean(&facts);
- libc3_shutdown();
+ c3_clean();
return 0;
}
diff --git a/libc3/c3.c b/libc3/c3.c
index e18f43a..5e29d93 100644
--- a/libc3/c3.c
+++ b/libc3/c3.c
@@ -18,7 +18,7 @@
s_env g_c3_env = {0};
-void libc3_init ()
+void c3_init ()
{
env_init(&g_c3_env);
#ifdef DEBUG
@@ -27,12 +27,12 @@ void libc3_init ()
#endif
}
-void libc3_shutdown ()
+void c3_clean ()
{
- sym_delete_all();
- env_clean(&g_c3_env);
#ifdef DEBUG
buf_file_close(&g_debug_buf);
buf_clean(&g_debug_buf);
#endif
+ sym_delete_all();
+ env_clean(&g_c3_env);
}
diff --git a/libc3/c3.h b/libc3/c3.h
index 7064c80..c174f33 100644
--- a/libc3/c3.h
+++ b/libc3/c3.h
@@ -42,8 +42,7 @@
extern s_env g_c3_env;
-/* libc3 */
-void libc3_init ();
-void libc3_shutdown ();
+void c3_init ();
+void c3_clean ();
#endif /* C3_H */
diff --git a/test/libc3_test.c b/test/libc3_test.c
index 05199f9..ed15289 100644
--- a/test/libc3_test.c
+++ b/test/libc3_test.c
@@ -40,7 +40,7 @@ void types_test ();
int main (int argc, char **argv)
{
test_init(argc, argv);
- libc3_init();
+ c3_init();
if (test_target("types")) {
printf("\ntypes\n");
types_test();
@@ -130,7 +130,7 @@ int main (int argc, char **argv)
facts_with_test();
}
test_summary();
- test_shutdown();
- libc3_shutdown();
+ test_clean();
+ c3_clean();
return 0;
}
diff --git a/test/test.c b/test/test.c
index 987ad72..172f823 100644
--- a/test/test.c
+++ b/test/test.c
@@ -30,6 +30,10 @@ char g_test_targets_env[TARGETS_MAX * TARGET_NAME_MAX];
char *g_test_targets_env_v[TARGETS_MAX + 1];
const char **g_test_targets = {NULL};
+void test_clean ()
+{
+}
+
void test_context (const char *context)
{
g_test_context = context;
@@ -136,10 +140,6 @@ void test_ok ()
g_test_last_ok = 1;
}
-void test_shutdown ()
-{
-}
-
void test_summary ()
{
fprintf(stderr, "\n");
diff --git a/test/test.h b/test/test.h
index 2b3e151..4bf2dea 100644
--- a/test/test.h
+++ b/test/test.h
@@ -145,12 +145,12 @@ extern long g_test_last_ok;
extern long g_test_ok;
extern const char **g_test_targets;
+void test_clean ();
void test_context (const char *context);
int test_file_compare (const char *path_a, const char *path_b);
void test_init (int argc, char **argv);
void test_ko ();
void test_ok ();
-void test_shutdown ();
void test_summary ();
int test_target (const char *target);