diff --git a/libkc3/buf_inspect.c b/libkc3/buf_inspect.c
index cdef8d3..162825f 100644
--- a/libkc3/buf_inspect.c
+++ b/libkc3/buf_inspect.c
@@ -836,6 +836,7 @@ sw buf_inspect_call_special_operator_size (const s_call *call)
sw buf_inspect_cast (s_buf *buf, const s_call *call)
{
s_tag *arg;
+ const s_sym *buf_inspect_type;
const s_sym *module;
sw r;
sw result = 0;
@@ -851,10 +852,15 @@ sw buf_inspect_cast (s_buf *buf, const s_call *call)
if ((r = buf_write_1(buf, " ")) < 0)
return r;
result += r;
+ buf_inspect_type = g_buf_inspect_type;
+ g_buf_inspect_type = module;
arg = &list_next(call->arguments)->tag;
- if ((r = buf_inspect_tag(buf, arg)) < 0)
+ if ((r = buf_inspect_tag(buf, arg)) < 0) {
+ g_buf_inspect_type = buf_inspect_type;
return r;
+ }
result += r;
+ g_buf_inspect_type = buf_inspect_type;
return result;
}
diff --git a/libtommath b/libtommath
index d481898..3bd6700 160000
--- a/libtommath
+++ b/libtommath
@@ -1 +1 @@
-Subproject commit d4818983e34f7faf8da74643027dc70e5a1beec7
+Subproject commit 3bd6700b68f2f8ebbc56d8990e5aef0d69b2ad3b
diff --git a/test/facts_test.c b/test/facts_test.c
index acfb04a..8d36fe6 100644
--- a/test/facts_test.c
+++ b/test/facts_test.c
@@ -415,18 +415,18 @@ TEST_CASE(facts_open_file)
"{{:a, :b}, {:c, :d}}",
"{a, b}",
"{{a, b}, {c, d}}",
- "0",
- "1",
- "10",
- "0x100",
- "0x10000",
- "0x100000000",
+ "(U8) 0",
+ "(U8) 1",
+ "(U8) 10",
+ "(U16) 0x100",
+ "(U32) 0x10000",
+ "(U64) 0x100000000",
"0x10000000000000000",
- "-1",
- "-10",
- "-0x100",
- "-0x10000",
- "-0x100000000",
+ "(S8) -1",
+ "(S8) -10",
+ "(S16) -0x100",
+ "(S32) -0x10000",
+ "(S64) -0x100000000",
"-0x10000000000000000",
NULL
};
@@ -441,18 +441,18 @@ TEST_CASE(facts_open_file)
"{{:b, :b}, {:c, :d}}",
"{b, b}",
"{{b, b}, {c, d}}",
- "2",
- "3",
- "11",
- "0x101",
- "0x10001",
- "0x100000001",
+ "(U8) 2",
+ "(U8) 3",
+ "(U8) 11",
+ "(U16) 0x101",
+ "(U32) 0x10001",
+ "(U64) 0x100000001",
"0x10000000000000001",
- "-2",
- "-11",
- "-0x101",
- "-0x10001",
- "-0x100000001",
+ "(S8) -2",
+ "(S8) -11",
+ "(S16) -0x101",
+ "(S32) -0x10001",
+ "(S64) -0x100000001",
"-0x10000000000000001",
NULL
};
@@ -502,7 +502,7 @@ TEST_CASE(facts_open_file)
exit(1);
}
str_init_1(&path, NULL, "facts_test_open_file.2.facts");
- TEST_EQ(facts_open_file(&facts, &path), 1524);
+ TEST_EQ(facts_open_file(&facts, &path), 1890);
TEST_EQ(facts_count(&facts), 46);
i = 0;
while (p[i]) {
@@ -534,7 +534,7 @@ TEST_CASE(facts_open_file)
exit(1);
}
str_init_1(&path, NULL, "facts_test_open_file.3.facts");
- TEST_EQ(facts_open_file(&facts, &path), 1551);
+ TEST_EQ(facts_open_file(&facts, &path), 3878);
TEST_EQ(facts_count(&facts), 0);
i = 0;
while (p[i]) {
diff --git a/test/facts_test_open_file.2.expected.facts b/test/facts_test_open_file.2.expected.facts
index 1ec9bf1..33ba6c6 100644
--- a/test/facts_test_open_file.2.expected.facts
+++ b/test/facts_test_open_file.2.expected.facts
@@ -3,17 +3,17 @@
add {a, a, a}
add {-18446744073709551616, -18446744073709551616, -18446744073709551616}
add {18446744073709551616, 18446744073709551616, 18446744073709551616}
-add {-4294967296, -4294967296, -4294967296}
-add {-65536, -65536, -65536}
-add {-256, -256, -256}
-add {-10, -10, -10}
-add {-1, -1, -1}
-add {0, 0, 0}
-add {1, 1, 1}
-add {10, 10, 10}
-add {256, 256, 256}
-add {65536, 65536, 65536}
-add {4294967296, 4294967296, 4294967296}
+add {(S64) -4294967296, (S64) -4294967296, (S64) -4294967296}
+add {(S32) -65536, (S32) -65536, (S32) -65536}
+add {(S16) -256, (S16) -256, (S16) -256}
+add {(S8) -10, (S8) -10, (S8) -10}
+add {(S8) -1, (S8) -1, (S8) -1}
+add {(U8) 0, (U8) 0, (U8) 0}
+add {(U8) 1, (U8) 1, (U8) 1}
+add {(U8) 10, (U8) 10, (U8) 10}
+add {(U16) 256, (U16) 256, (U16) 256}
+add {(U32) 65536, (U32) 65536, (U32) 65536}
+add {(U64) 4294967296, (U64) 4294967296, (U64) 4294967296}
add {[], [], []}
add {[[], []], [[], []], [[], []]}
add {"a", "a", "a"}
@@ -26,17 +26,17 @@ add {{{:a, :b}, {:c, :d}}, {{:a, :b}, {:c, :d}}, {{:a, :b}, {:c, :d}}}
add {b, b, b}
add {-18446744073709551617, -18446744073709551617, -18446744073709551617}
add {18446744073709551617, 18446744073709551617, 18446744073709551617}
-add {-4294967297, -4294967297, -4294967297}
-add {-65537, -65537, -65537}
-add {-257, -257, -257}
-add {-11, -11, -11}
-add {-2, -2, -2}
-add {2, 2, 2}
-add {3, 3, 3}
-add {11, 11, 11}
-add {257, 257, 257}
-add {65537, 65537, 65537}
-add {4294967297, 4294967297, 4294967297}
+add {(S64) -4294967297, (S64) -4294967297, (S64) -4294967297}
+add {(S32) -65537, (S32) -65537, (S32) -65537}
+add {(S16) -257, (S16) -257, (S16) -257}
+add {(S8) -11, (S8) -11, (S8) -11}
+add {(S8) -2, (S8) -2, (S8) -2}
+add {(U8) 2, (U8) 2, (U8) 2}
+add {(U8) 3, (U8) 3, (U8) 3}
+add {(U8) 11, (U8) 11, (U8) 11}
+add {(U16) 257, (U16) 257, (U16) 257}
+add {(U32) 65537, (U32) 65537, (U32) 65537}
+add {(U64) 4294967297, (U64) 4294967297, (U64) 4294967297}
add {[[] | []], [[] | []], [[] | []]}
add {[[[] | []], []], [[[] | []], []], [[[] | []], []]}
add {"b", "b", "b"}
diff --git a/test/facts_test_open_file.2.in.facts b/test/facts_test_open_file.2.in.facts
index 1ec9bf1..33ba6c6 100644
--- a/test/facts_test_open_file.2.in.facts
+++ b/test/facts_test_open_file.2.in.facts
@@ -3,17 +3,17 @@
add {a, a, a}
add {-18446744073709551616, -18446744073709551616, -18446744073709551616}
add {18446744073709551616, 18446744073709551616, 18446744073709551616}
-add {-4294967296, -4294967296, -4294967296}
-add {-65536, -65536, -65536}
-add {-256, -256, -256}
-add {-10, -10, -10}
-add {-1, -1, -1}
-add {0, 0, 0}
-add {1, 1, 1}
-add {10, 10, 10}
-add {256, 256, 256}
-add {65536, 65536, 65536}
-add {4294967296, 4294967296, 4294967296}
+add {(S64) -4294967296, (S64) -4294967296, (S64) -4294967296}
+add {(S32) -65536, (S32) -65536, (S32) -65536}
+add {(S16) -256, (S16) -256, (S16) -256}
+add {(S8) -10, (S8) -10, (S8) -10}
+add {(S8) -1, (S8) -1, (S8) -1}
+add {(U8) 0, (U8) 0, (U8) 0}
+add {(U8) 1, (U8) 1, (U8) 1}
+add {(U8) 10, (U8) 10, (U8) 10}
+add {(U16) 256, (U16) 256, (U16) 256}
+add {(U32) 65536, (U32) 65536, (U32) 65536}
+add {(U64) 4294967296, (U64) 4294967296, (U64) 4294967296}
add {[], [], []}
add {[[], []], [[], []], [[], []]}
add {"a", "a", "a"}
@@ -26,17 +26,17 @@ add {{{:a, :b}, {:c, :d}}, {{:a, :b}, {:c, :d}}, {{:a, :b}, {:c, :d}}}
add {b, b, b}
add {-18446744073709551617, -18446744073709551617, -18446744073709551617}
add {18446744073709551617, 18446744073709551617, 18446744073709551617}
-add {-4294967297, -4294967297, -4294967297}
-add {-65537, -65537, -65537}
-add {-257, -257, -257}
-add {-11, -11, -11}
-add {-2, -2, -2}
-add {2, 2, 2}
-add {3, 3, 3}
-add {11, 11, 11}
-add {257, 257, 257}
-add {65537, 65537, 65537}
-add {4294967297, 4294967297, 4294967297}
+add {(S64) -4294967297, (S64) -4294967297, (S64) -4294967297}
+add {(S32) -65537, (S32) -65537, (S32) -65537}
+add {(S16) -257, (S16) -257, (S16) -257}
+add {(S8) -11, (S8) -11, (S8) -11}
+add {(S8) -2, (S8) -2, (S8) -2}
+add {(U8) 2, (U8) 2, (U8) 2}
+add {(U8) 3, (U8) 3, (U8) 3}
+add {(U8) 11, (U8) 11, (U8) 11}
+add {(U16) 257, (U16) 257, (U16) 257}
+add {(U32) 65537, (U32) 65537, (U32) 65537}
+add {(U64) 4294967297, (U64) 4294967297, (U64) 4294967297}
add {[[] | []], [[] | []], [[] | []]}
add {[[[] | []], []], [[[] | []], []], [[[] | []], []]}
add {"b", "b", "b"}
diff --git a/test/facts_test_open_file.3.expected.facts b/test/facts_test_open_file.3.expected.facts
index 000d31f..fe6374a 100644
--- a/test/facts_test_open_file.3.expected.facts
+++ b/test/facts_test_open_file.3.expected.facts
@@ -3,17 +3,17 @@
add {a, a, a}
add {-18446744073709551616, -18446744073709551616, -18446744073709551616}
add {18446744073709551616, 18446744073709551616, 18446744073709551616}
-add {-4294967296, -4294967296, -4294967296}
-add {-65536, -65536, -65536}
-add {-256, -256, -256}
-add {-10, -10, -10}
-add {-1, -1, -1}
-add {0, 0, 0}
-add {1, 1, 1}
-add {10, 10, 10}
-add {256, 256, 256}
-add {65536, 65536, 65536}
-add {4294967296, 4294967296, 4294967296}
+add {(S64) -4294967296, (S64) -4294967296, (S64) -4294967296}
+add {(S32) -65536, (S32) -65536, (S32) -65536}
+add {(S16) -256, (S16) -256, (S16) -256}
+add {(S8) -10, (S8) -10, (S8) -10}
+add {(S8) -1, (S8) -1, (S8) -1}
+add {(U8) 0, (U8) 0, (U8) 0}
+add {(U8) 1, (U8) 1, (U8) 1}
+add {(U8) 10, (U8) 10, (U8) 10}
+add {(U16) 256, (U16) 256, (U16) 256}
+add {(U32) 65536, (U32) 65536, (U32) 65536}
+add {(U64) 4294967296, (U64) 4294967296, (U64) 4294967296}
add {[], [], []}
add {[[], []], [[], []], [[], []]}
add {"a", "a", "a"}
@@ -23,20 +23,43 @@ add {{a, b}, {a, b}, {a, b}}
add {{:a, :b}, {:a, :b}, {:a, :b}}
add {{{a, b}, {c, d}}, {{a, b}, {c, d}}, {{a, b}, {c, d}}}
add {{{:a, :b}, {:c, :d}}, {{:a, :b}, {:c, :d}}, {{:a, :b}, {:c, :d}}}
+add {b, b, b}
+add {-18446744073709551617, -18446744073709551617, -18446744073709551617}
+add {18446744073709551617, 18446744073709551617, 18446744073709551617}
+add {(S64) -4294967297, (S64) -4294967297, (S64) -4294967297}
+add {(S32) -65537, (S32) -65537, (S32) -65537}
+add {(S16) -257, (S16) -257, (S16) -257}
+add {(S8) -11, (S8) -11, (S8) -11}
+add {(S8) -2, (S8) -2, (S8) -2}
+add {(U8) 2, (U8) 2, (U8) 2}
+add {(U8) 3, (U8) 3, (U8) 3}
+add {(U8) 11, (U8) 11, (U8) 11}
+add {(U16) 257, (U16) 257, (U16) 257}
+add {(U32) 65537, (U32) 65537, (U32) 65537}
+add {(U64) 4294967297, (U64) 4294967297, (U64) 4294967297}
+add {[[] | []], [[] | []], [[] | []]}
+add {[[[] | []], []], [[[] | []], []], [[[] | []], []]}
+add {"b", "b", "b"}
+add {B, B, B}
+add {:b, :b, :b}
+add {{b, b}, {b, b}, {b, b}}
+add {{:b, :b}, {:b, :b}, {:b, :b}}
+add {{{b, b}, {c, d}}, {{b, b}, {c, d}}, {{b, b}, {c, d}}}
+add {{{:b, :b}, {:c, :d}}, {{:b, :b}, {:c, :d}}, {{:b, :b}, {:c, :d}}}
remove {a, a, a}
remove {-18446744073709551616, -18446744073709551616, -18446744073709551616}
remove {18446744073709551616, 18446744073709551616, 18446744073709551616}
-remove {-4294967296, -4294967296, -4294967296}
-remove {-65536, -65536, -65536}
-remove {-256, -256, -256}
-remove {-10, -10, -10}
-remove {-1, -1, -1}
-remove {0, 0, 0}
-remove {1, 1, 1}
-remove {10, 10, 10}
-remove {256, 256, 256}
-remove {65536, 65536, 65536}
-remove {4294967296, 4294967296, 4294967296}
+remove {(S64) -4294967296, (S64) -4294967296, (S64) -4294967296}
+remove {(S32) -65536, (S32) -65536, (S32) -65536}
+remove {(S16) -256, (S16) -256, (S16) -256}
+remove {(S8) -10, (S8) -10, (S8) -10}
+remove {(S8) -1, (S8) -1, (S8) -1}
+remove {(U8) 0, (U8) 0, (U8) 0}
+remove {(U8) 1, (U8) 1, (U8) 1}
+remove {(U8) 10, (U8) 10, (U8) 10}
+remove {(U16) 256, (U16) 256, (U16) 256}
+remove {(U32) 65536, (U32) 65536, (U32) 65536}
+remove {(U64) 4294967296, (U64) 4294967296, (U64) 4294967296}
remove {[], [], []}
remove {[[], []], [[], []], [[], []]}
remove {"a", "a", "a"}
@@ -46,6 +69,29 @@ remove {{a, b}, {a, b}, {a, b}}
remove {{:a, :b}, {:a, :b}, {:a, :b}}
remove {{{a, b}, {c, d}}, {{a, b}, {c, d}}, {{a, b}, {c, d}}}
remove {{{:a, :b}, {:c, :d}}, {{:a, :b}, {:c, :d}}, {{:a, :b}, {:c, :d}}}
+remove {b, b, b}
+remove {-18446744073709551617, -18446744073709551617, -18446744073709551617}
+remove {18446744073709551617, 18446744073709551617, 18446744073709551617}
+remove {(S64) -4294967297, (S64) -4294967297, (S64) -4294967297}
+remove {(S32) -65537, (S32) -65537, (S32) -65537}
+remove {(S16) -257, (S16) -257, (S16) -257}
+remove {(S8) -11, (S8) -11, (S8) -11}
+remove {(S8) -2, (S8) -2, (S8) -2}
+remove {(U8) 2, (U8) 2, (U8) 2}
+remove {(U8) 3, (U8) 3, (U8) 3}
+remove {(U8) 11, (U8) 11, (U8) 11}
+remove {(U16) 257, (U16) 257, (U16) 257}
+remove {(U32) 65537, (U32) 65537, (U32) 65537}
+remove {(U64) 4294967297, (U64) 4294967297, (U64) 4294967297}
+remove {[[] | []], [[] | []], [[] | []]}
+remove {[[[] | []], []], [[[] | []], []], [[[] | []], []]}
+remove {"b", "b", "b"}
+remove {B, B, B}
+remove {:b, :b, :b}
+remove {{b, b}, {b, b}, {b, b}}
+remove {{:b, :b}, {:b, :b}, {:b, :b}}
+remove {{{b, b}, {c, d}}, {{b, b}, {c, d}}, {{b, b}, {c, d}}}
+remove {{{:b, :b}, {:c, :d}}, {{:b, :b}, {:c, :d}}, {{:b, :b}, {:c, :d}}}
add {"a", "a", "a"}
add {:a, :a, :a}
add {A, A, A}
@@ -56,18 +102,18 @@ add {{:a, :b}, {:a, :b}, {:a, :b}}
add {{{:a, :b}, {:c, :d}}, {{:a, :b}, {:c, :d}}, {{:a, :b}, {:c, :d}}}
add {{a, b}, {a, b}, {a, b}}
add {{{a, b}, {c, d}}, {{a, b}, {c, d}}, {{a, b}, {c, d}}}
-add {0, 0, 0}
-add {1, 1, 1}
-add {10, 10, 10}
-add {256, 256, 256}
-add {65536, 65536, 65536}
-add {4294967296, 4294967296, 4294967296}
+add {(U8) 0, (U8) 0, (U8) 0}
+add {(U8) 1, (U8) 1, (U8) 1}
+add {(U8) 10, (U8) 10, (U8) 10}
+add {(U16) 256, (U16) 256, (U16) 256}
+add {(U32) 65536, (U32) 65536, (U32) 65536}
+add {(U64) 4294967296, (U64) 4294967296, (U64) 4294967296}
add {18446744073709551616, 18446744073709551616, 18446744073709551616}
-add {-1, -1, -1}
-add {-10, -10, -10}
-add {-256, -256, -256}
-add {-65536, -65536, -65536}
-add {-4294967296, -4294967296, -4294967296}
+add {(S8) -1, (S8) -1, (S8) -1}
+add {(S8) -10, (S8) -10, (S8) -10}
+add {(S16) -256, (S16) -256, (S16) -256}
+add {(S32) -65536, (S32) -65536, (S32) -65536}
+add {(S64) -4294967296, (S64) -4294967296, (S64) -4294967296}
add {-18446744073709551616, -18446744073709551616, -18446744073709551616}
add {"b", "b", "b"}
add {:b, :b, :b}
@@ -79,16 +125,16 @@ add {{:b, :b}, {:b, :b}, {:b, :b}}
add {{{:b, :b}, {:c, :d}}, {{:b, :b}, {:c, :d}}, {{:b, :b}, {:c, :d}}}
add {{b, b}, {b, b}, {b, b}}
add {{{b, b}, {c, d}}, {{b, b}, {c, d}}, {{b, b}, {c, d}}}
-add {2, 2, 2}
-add {3, 3, 3}
-add {11, 11, 11}
-add {257, 257, 257}
-add {65537, 65537, 65537}
-add {4294967297, 4294967297, 4294967297}
+add {(U8) 2, (U8) 2, (U8) 2}
+add {(U8) 3, (U8) 3, (U8) 3}
+add {(U8) 11, (U8) 11, (U8) 11}
+add {(U16) 257, (U16) 257, (U16) 257}
+add {(U32) 65537, (U32) 65537, (U32) 65537}
+add {(U64) 4294967297, (U64) 4294967297, (U64) 4294967297}
add {18446744073709551617, 18446744073709551617, 18446744073709551617}
-add {-2, -2, -2}
-add {-11, -11, -11}
-add {-257, -257, -257}
-add {-65537, -65537, -65537}
-add {-4294967297, -4294967297, -4294967297}
+add {(S8) -2, (S8) -2, (S8) -2}
+add {(S8) -11, (S8) -11, (S8) -11}
+add {(S16) -257, (S16) -257, (S16) -257}
+add {(S32) -65537, (S32) -65537, (S32) -65537}
+add {(S64) -4294967297, (S64) -4294967297, (S64) -4294967297}
add {-18446744073709551617, -18446744073709551617, -18446744073709551617}
diff --git a/test/facts_test_open_file.3.in.facts b/test/facts_test_open_file.3.in.facts
index d2b5e7b..f86b54d 100644
--- a/test/facts_test_open_file.3.in.facts
+++ b/test/facts_test_open_file.3.in.facts
@@ -3,17 +3,17 @@
add {a, a, a}
add {-18446744073709551616, -18446744073709551616, -18446744073709551616}
add {18446744073709551616, 18446744073709551616, 18446744073709551616}
-add {-4294967296, -4294967296, -4294967296}
-add {-65536, -65536, -65536}
-add {-256, -256, -256}
-add {-10, -10, -10}
-add {-1, -1, -1}
-add {0, 0, 0}
-add {1, 1, 1}
-add {10, 10, 10}
-add {256, 256, 256}
-add {65536, 65536, 65536}
-add {4294967296, 4294967296, 4294967296}
+add {(S64) -4294967296, (S64) -4294967296, (S64) -4294967296}
+add {(S32) -65536, (S32) -65536, (S32) -65536}
+add {(S16) -256, (S16) -256, (S16) -256}
+add {(S8) -10, (S8) -10, (S8) -10}
+add {(S8) -1, (S8) -1, (S8) -1}
+add {(U8) 0, (U8) 0, (U8) 0}
+add {(U8) 1, (U8) 1, (U8) 1}
+add {(U8) 10, (U8) 10, (U8) 10}
+add {(U16) 256, (U16) 256, (U16) 256}
+add {(U32) 65536, (U32) 65536, (U32) 65536}
+add {(U64) 4294967296, (U64) 4294967296, (U64) 4294967296}
add {[], [], []}
add {[[], []], [[], []], [[], []]}
add {"a", "a", "a"}
@@ -23,20 +23,43 @@ add {{a, b}, {a, b}, {a, b}}
add {{:a, :b}, {:a, :b}, {:a, :b}}
add {{{a, b}, {c, d}}, {{a, b}, {c, d}}, {{a, b}, {c, d}}}
add {{{:a, :b}, {:c, :d}}, {{:a, :b}, {:c, :d}}, {{:a, :b}, {:c, :d}}}
+add {b, b, b}
+add {-18446744073709551617, -18446744073709551617, -18446744073709551617}
+add {18446744073709551617, 18446744073709551617, 18446744073709551617}
+add {(S64) -4294967297, (S64) -4294967297, (S64) -4294967297}
+add {(S32) -65537, (S32) -65537, (S32) -65537}
+add {(S16) -257, (S16) -257, (S16) -257}
+add {(S8) -11, (S8) -11, (S8) -11}
+add {(S8) -2, (S8) -2, (S8) -2}
+add {(U8) 2, (U8) 2, (U8) 2}
+add {(U8) 3, (U8) 3, (U8) 3}
+add {(U8) 11, (U8) 11, (U8) 11}
+add {(U16) 257, (U16) 257, (U16) 257}
+add {(U32) 65537, (U32) 65537, (U32) 65537}
+add {(U64) 4294967297, (U64) 4294967297, (U64) 4294967297}
+add {[[] | []], [[] | []], [[] | []]}
+add {[[[] | []], []], [[[] | []], []], [[[] | []], []]}
+add {"b", "b", "b"}
+add {B, B, B}
+add {:b, :b, :b}
+add {{b, b}, {b, b}, {b, b}}
+add {{:b, :b}, {:b, :b}, {:b, :b}}
+add {{{b, b}, {c, d}}, {{b, b}, {c, d}}, {{b, b}, {c, d}}}
+add {{{:b, :b}, {:c, :d}}, {{:b, :b}, {:c, :d}}, {{:b, :b}, {:c, :d}}}
remove {a, a, a}
remove {-18446744073709551616, -18446744073709551616, -18446744073709551616}
remove {18446744073709551616, 18446744073709551616, 18446744073709551616}
-remove {-4294967296, -4294967296, -4294967296}
-remove {-65536, -65536, -65536}
-remove {-256, -256, -256}
-remove {-10, -10, -10}
-remove {-1, -1, -1}
-remove {0, 0, 0}
-remove {1, 1, 1}
-remove {10, 10, 10}
-remove {256, 256, 256}
-remove {65536, 65536, 65536}
-remove {4294967296, 4294967296, 4294967296}
+remove {(S64) -4294967296, (S64) -4294967296, (S64) -4294967296}
+remove {(S32) -65536, (S32) -65536, (S32) -65536}
+remove {(S16) -256, (S16) -256, (S16) -256}
+remove {(S8) -10, (S8) -10, (S8) -10}
+remove {(S8) -1, (S8) -1, (S8) -1}
+remove {(U8) 0, (U8) 0, (U8) 0}
+remove {(U8) 1, (U8) 1, (U8) 1}
+remove {(U8) 10, (U8) 10, (U8) 10}
+remove {(U16) 256, (U16) 256, (U16) 256}
+remove {(U32) 65536, (U32) 65536, (U32) 65536}
+remove {(U64) 4294967296, (U64) 4294967296, (U64) 4294967296}
remove {[], [], []}
remove {[[], []], [[], []], [[], []]}
remove {"a", "a", "a"}
@@ -46,3 +69,26 @@ remove {{a, b}, {a, b}, {a, b}}
remove {{:a, :b}, {:a, :b}, {:a, :b}}
remove {{{a, b}, {c, d}}, {{a, b}, {c, d}}, {{a, b}, {c, d}}}
remove {{{:a, :b}, {:c, :d}}, {{:a, :b}, {:c, :d}}, {{:a, :b}, {:c, :d}}}
+remove {b, b, b}
+remove {-18446744073709551617, -18446744073709551617, -18446744073709551617}
+remove {18446744073709551617, 18446744073709551617, 18446744073709551617}
+remove {(S64) -4294967297, (S64) -4294967297, (S64) -4294967297}
+remove {(S32) -65537, (S32) -65537, (S32) -65537}
+remove {(S16) -257, (S16) -257, (S16) -257}
+remove {(S8) -11, (S8) -11, (S8) -11}
+remove {(S8) -2, (S8) -2, (S8) -2}
+remove {(U8) 2, (U8) 2, (U8) 2}
+remove {(U8) 3, (U8) 3, (U8) 3}
+remove {(U8) 11, (U8) 11, (U8) 11}
+remove {(U16) 257, (U16) 257, (U16) 257}
+remove {(U32) 65537, (U32) 65537, (U32) 65537}
+remove {(U64) 4294967297, (U64) 4294967297, (U64) 4294967297}
+remove {[[] | []], [[] | []], [[] | []]}
+remove {[[[] | []], []], [[[] | []], []], [[[] | []], []]}
+remove {"b", "b", "b"}
+remove {B, B, B}
+remove {:b, :b, :b}
+remove {{b, b}, {b, b}, {b, b}}
+remove {{:b, :b}, {:b, :b}, {:b, :b}}
+remove {{{b, b}, {c, d}}, {{b, b}, {c, d}}, {{b, b}, {c, d}}}
+remove {{{:b, :b}, {:c, :d}}, {{:b, :b}, {:c, :d}}, {{:b, :b}, {:c, :d}}}
diff --git a/test/libkc3_test.c b/test/libkc3_test.c
index d239efd..0989b44 100644
--- a/test/libkc3_test.c
+++ b/test/libkc3_test.c
@@ -46,107 +46,107 @@ int main (int argc, char **argv)
return 1;
test_init(g_kc3_env.argv[0], &argc, &argv);
if (test_target("types")) {
- fprintf(stderr, "\ntypes\n");
+ fprintf(stderr, "\ntypes ");
types_test();
}
if (test_target("array")) {
- fprintf(stderr, "\narray\n");
+ fprintf(stderr, "\narray ");
array_test();
}
if (test_target("bool")) {
- fprintf(stderr, "\nbool\n");
+ fprintf(stderr, "\nbool ");
bool_test();
}
if (test_target("character")) {
- fprintf(stderr, "\ncharacter\n");
+ fprintf(stderr, "\ncharacter ");
character_test();
}
if (test_target("buf")) {
- fprintf(stderr, "\nbuf\n");
+ fprintf(stderr, "\nbuf ");
buf_test();
}
if (test_target("buf_parse")) {
- fprintf(stderr, "\nbuf_parse\n");
+ fprintf(stderr, "\nbuf_parse ");
buf_parse_test();
}
if (test_target("buf_inspect")) {
- fprintf(stderr, "\nbuf_inspect\n");
+ fprintf(stderr, "\nbuf_inspect ");
buf_inspect_test();
}
if (test_target("buf_file")) {
- fprintf(stderr, "\nbuf_file\n");
+ fprintf(stderr, "\nbuf_file ");
buf_file_test();
}
if (test_target("str")) {
- fprintf(stderr, "\nstr\n");
+ fprintf(stderr, "\nstr ");
str_test();
}
if (test_target("sym")) {
- fprintf(stderr, "\nsym\n");
+ fprintf(stderr, "\nsym ");
sym_test();
}
if (test_target("ident")) {
- fprintf(stderr, "\nident\n");
+ fprintf(stderr, "\nident ");
ident_test();
}
if (test_target("list")) {
- fprintf(stderr, "\nlist\n");
+ fprintf(stderr, "\nlist ");
list_test();
}
if (test_target("tuple")) {
- fprintf(stderr, "\ntuple\n");
+ fprintf(stderr, "\ntuple ");
tuple_test();
}
if (test_target("fn")) {
- fprintf(stderr, "\nfn\n");
+ fprintf(stderr, "\nfn ");
fn_test();
}
if (test_target("call")) {
- fprintf(stderr, "\ncall\n");
+ fprintf(stderr, "\ncall ");
call_test();
}
if (test_target("tag")) {
- fprintf(stderr, "\ntag\n");
+ fprintf(stderr, "\ntag ");
tag_test();
}
if (test_target("inspect")) {
- fprintf(stderr, "\ninspect\n");
+ fprintf(stderr, "\ninspect ");
inspect_test();
}
if (test_target("fact")) {
- fprintf(stderr, "\nfact\n");
+ fprintf(stderr, "\nfact ");
fact_test();
}
if (test_target("compare")) {
- fprintf(stderr, "\ncompare\n");
+ fprintf(stderr, "\ncompare ");
compare_test();
}
if (test_target("set__tag")) {
- fprintf(stderr, "\nset__tag\n");
+ fprintf(stderr, "\nset__tag ");
set__tag_test();
}
if (test_target("set__fact")) {
- fprintf(stderr, "\nset__fact\n");
+ fprintf(stderr, "\nset__fact ");
set__fact_test();
}
if (test_target("skiplist__fact")) {
- fprintf(stderr, "\nskiplist__fact\n");
+ fprintf(stderr, "\nskiplist__fact ");
skiplist__fact_test();
}
if (test_target("facts")) {
- fprintf(stderr, "\nfacts\n");
+ fprintf(stderr, "\nfacts ");
facts_test();
}
if (test_target("facts_cursor")) {
- fprintf(stderr, "\nfacts_cursor\n");
+ fprintf(stderr, "\nfacts_cursor ");
facts_cursor_test();
}
if (test_target("facts_with")) {
- fprintf(stderr, "\nfacts_with\n");
+ fprintf(stderr, "\nfacts_with ");
facts_with_test();
}
if (test_target("env")) {
- fprintf(stderr, "\nenv\n");
+ fprintf(stderr, "\nenv ");
env_test();
}
test_summary();
diff --git a/test/test.c b/test/test.c
index c2d89e5..e8e3019 100644
--- a/test/test.c
+++ b/test/test.c
@@ -125,7 +125,7 @@ void test_init (char *argv0, int *argc, char ***argv)
printf(" %s", *t);
t++;
}
- printf("\n");
+ fflush(stdout);
}
void test_ko (void)