Commit 43170d76a65b2f06052fb124ad8eeb3ec437745e

Thomas de Grivel 2023-07-22T19:10:22

make tests pass after refactor

diff --git a/libc3/buf_inspect_u.c.in b/libc3/buf_inspect_u.c.in
index 356b153..20342fb 100644
--- a/libc3/buf_inspect_u.c.in
+++ b/libc3/buf_inspect_u.c.in
@@ -65,7 +65,7 @@ sw buf_inspect_u_bits$_base (s_buf *buf,
 }
 
 sw buf_inspect_u_bits$_base_size (const s_str *base,
-                                      const u_bits$ *u)
+                                  const u_bits$ *u)
 {
   uw radix;
   sw size = 0;
diff --git a/libc3/buf_inspect_u16.c b/libc3/buf_inspect_u16.c
index 819e395..b405955 100644
--- a/libc3/buf_inspect_u16.c
+++ b/libc3/buf_inspect_u16.c
@@ -65,7 +65,7 @@ sw buf_inspect_u16_base (s_buf *buf,
 }
 
 sw buf_inspect_u16_base_size (const s_str *base,
-                                      const u16 *u)
+                                  const u16 *u)
 {
   uw radix;
   sw size = 0;
diff --git a/libc3/buf_inspect_u32.c b/libc3/buf_inspect_u32.c
index 35ca7b3..ad8d0bb 100644
--- a/libc3/buf_inspect_u32.c
+++ b/libc3/buf_inspect_u32.c
@@ -65,7 +65,7 @@ sw buf_inspect_u32_base (s_buf *buf,
 }
 
 sw buf_inspect_u32_base_size (const s_str *base,
-                                      const u32 *u)
+                                  const u32 *u)
 {
   uw radix;
   sw size = 0;
diff --git a/libc3/buf_inspect_u64.c b/libc3/buf_inspect_u64.c
index 6ec11a6..c782094 100644
--- a/libc3/buf_inspect_u64.c
+++ b/libc3/buf_inspect_u64.c
@@ -65,7 +65,7 @@ sw buf_inspect_u64_base (s_buf *buf,
 }
 
 sw buf_inspect_u64_base_size (const s_str *base,
-                                      const u64 *u)
+                                  const u64 *u)
 {
   uw radix;
   sw size = 0;
diff --git a/libc3/buf_inspect_u64_hex.c b/libc3/buf_inspect_u64_hex.c
new file mode 100644
index 0000000..e1fe0f8
--- /dev/null
+++ b/libc3/buf_inspect_u64_hex.c
@@ -0,0 +1,25 @@
+/* c3
+ * Copyright 2022,2023 kmx.io <contact@kmx.io>
+ *
+ * Permission is hereby granted to use this software granted the above
+ * copyright notice and this permission paragraph are included in all
+ * copies and substantial portions of this software.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS-IS" WITHOUT ANY GUARANTEE OF
+ * PURPOSE AND PERFORMANCE. IN NO EVENT WHATSOEVER SHALL THE
+ * AUTHOR BE CONSIDERED LIABLE FOR THE USE AND PERFORMANCE OF
+ * THIS SOFTWARE.
+ */
+/* Gen from buf_inspect_u_base.c.in BITS=64 bits=64 BASE=hexadecimal */
+#include "c3.h"
+
+sw buf_inspect_u64_hexadecimal (s_buf *buf, const u64 *u)
+{
+  return buf_inspect_u64_base(buf, &g_c3_base_hexadecimal, u);
+}
+
+sw buf_inspect_u64_hexadecimal_size (const u64 *u)
+{
+  return buf_inspect_u64_base_size(&g_c3_base_hexadecimal,
+                                       u);
+}
diff --git a/libc3/buf_inspect_u64_hex.h b/libc3/buf_inspect_u64_hex.h
new file mode 100644
index 0000000..f9f858a
--- /dev/null
+++ b/libc3/buf_inspect_u64_hex.h
@@ -0,0 +1,16 @@
+/* c3
+ * Copyright 2022,2023 kmx.io <contact@kmx.io>
+ *
+ * Permission is hereby granted to use this software granted the above
+ * copyright notice and this permission paragraph are included in all
+ * copies and substantial portions of this software.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS-IS" WITHOUT ANY GUARANTEE OF
+ * PURPOSE AND PERFORMANCE. IN NO EVENT WHATSOEVER SHALL THE
+ * AUTHOR BE CONSIDERED LIABLE FOR THE USE AND PERFORMANCE OF
+ * THIS SOFTWARE.
+ */
+/* Gen from buf_inspect_u_base.h.in BITS=64 bits=64 BASE=_BASE$ */
+
+sw buf_inspect_u64__BASE$ (s_buf *buf, const u64 *u);
+sw buf_inspect_u64__BASE$_size (const u64 *u);
diff --git a/libc3/buf_inspect_u8.c b/libc3/buf_inspect_u8.c
index 1377f0a..da260b0 100644
--- a/libc3/buf_inspect_u8.c
+++ b/libc3/buf_inspect_u8.c
@@ -65,7 +65,7 @@ sw buf_inspect_u8_base (s_buf *buf,
 }
 
 sw buf_inspect_u8_base_size (const s_str *base,
-                                      const u8 *u)
+                                  const u8 *u)
 {
   uw radix;
   sw size = 0;
diff --git a/libc3/buf_inspect_u_base.c.in b/libc3/buf_inspect_u_base.c.in
index 40d2c68..018b406 100644
--- a/libc3/buf_inspect_u_base.c.in
+++ b/libc3/buf_inspect_u_base.c.in
@@ -11,6 +11,7 @@
  * THIS SOFTWARE.
  */
 /* Gen from buf_inspect_u_base.c.in BITS=_BITS$ bits=_bits$ BASE=_BASE$ */
+#include "c3.h"
 
 sw buf_inspect_u_bits$__BASE$ (s_buf *buf, const u_bits$ *u)
 {
diff --git a/libc3/buf_inspect_u_base.h.in b/libc3/buf_inspect_u_base.h.in
new file mode 100644
index 0000000..8add330
--- /dev/null
+++ b/libc3/buf_inspect_u_base.h.in
@@ -0,0 +1,16 @@
+/* c3
+ * Copyright 2022,2023 kmx.io <contact@kmx.io>
+ *
+ * Permission is hereby granted to use this software granted the above
+ * copyright notice and this permission paragraph are included in all
+ * copies and substantial portions of this software.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS-IS" WITHOUT ANY GUARANTEE OF
+ * PURPOSE AND PERFORMANCE. IN NO EVENT WHATSOEVER SHALL THE
+ * AUTHOR BE CONSIDERED LIABLE FOR THE USE AND PERFORMANCE OF
+ * THIS SOFTWARE.
+ */
+/* Gen from buf_inspect_u_base.h.in BITS=_BITS$ bits=_bits$ BASE=_BASE$ */
+
+sw buf_inspect_u_bits$__BASE$ (s_buf *buf, const u_bits$ *u);
+sw buf_inspect_u_bits$__BASE$_size (const u_bits$ *u);
diff --git a/libc3/buf_inspect_uw.c b/libc3/buf_inspect_uw.c
index 67d2829..f3179e8 100644
--- a/libc3/buf_inspect_uw.c
+++ b/libc3/buf_inspect_uw.c
@@ -65,7 +65,7 @@ sw buf_inspect_uw_base (s_buf *buf,
 }
 
 sw buf_inspect_uw_base_size (const s_str *base,
-                                      const uw *u)
+                                  const uw *u)
 {
   uw radix;
   sw size = 0;
diff --git a/libc3/gen.mk b/libc3/gen.mk
index 25e256d..ef9abbd 100644
--- a/libc3/gen.mk
+++ b/libc3/gen.mk
@@ -20,6 +20,7 @@ GENERATED_FILES = \
 	buf_inspect_u16.c buf_inspect_u16.h \
 	buf_inspect_u32.c buf_inspect_u32.h \
 	buf_inspect_u64.c buf_inspect_u64.h \
+	buf_inspect_u64_hex.c buf_inspect_u64_hex.h \
 	buf_inspect_uw.c buf_inspect_uw.h \
 	buf_parse_s8.c buf_parse_s8.h \
 	buf_parse_s16.c buf_parse_s16.h \
@@ -130,6 +131,9 @@ SED_BITS_64 = sed \
 	-e 's/_BITS[$$]/64/g' \
 	-e 's/_bits[$$]/64/g'
 
+SED_BITS_64_HEX = ${SED_BITS_64} \
+	-e 's/_BASE[$$]/hexadecimal/g'
+
 buf_inspect_s64.c: buf_inspect_s.c.in gen.mk
 	${SED_BITS_64} < buf_inspect_s.c.in > buf_inspect_s64.c
 
@@ -142,6 +146,12 @@ buf_inspect_u64.c: buf_inspect_u.c.in gen.mk
 buf_inspect_u64.h: buf_inspect_u.h.in gen.mk
 	${SED_BITS_64} < buf_inspect_u.h.in > buf_inspect_u64.h
 
+buf_inspect_u64_hex.c: buf_inspect_u_base.c.in gen.mk
+	${SED_BITS_64_HEX} < buf_inspect_u_base.c.in > buf_inspect_u64_hex.c
+
+buf_inspect_u64_hex.h: buf_inspect_u_base.h.in gen.mk
+	${SED_BITS_64} < buf_inspect_u_base.h.in > buf_inspect_u64_hex.h
+
 buf_parse_s64.c: buf_parse_s.c.in gen.mk
 	${SED_BITS_64} < buf_parse_s.c.in > buf_parse_s64.c
 
diff --git a/libc3/sources.mk b/libc3/sources.mk
index 062df41..65e55e4 100644
--- a/libc3/sources.mk
+++ b/libc3/sources.mk
@@ -16,6 +16,7 @@ HEADERS = \
 	buf_inspect_u16.h \
 	buf_inspect_u32.h \
 	buf_inspect_u64.h \
+	buf_inspect_u64_hex.h \
 	buf_inspect_u8.h \
 	buf_inspect_uw.h \
 	buf_parse.h \
@@ -97,6 +98,7 @@ SOURCES = \
 	buf_inspect_u16.c \
 	buf_inspect_u32.c \
 	buf_inspect_u64.c \
+	buf_inspect_u64_hex.c \
 	buf_inspect_u8.c \
 	buf_inspect_uw.c \
 	buf_parse.c \
@@ -173,6 +175,7 @@ LO_SOURCES = \
 	buf_inspect_u16.c \
 	buf_inspect_u32.c \
 	buf_inspect_u64.c \
+	buf_inspect_u64_hex.c \
 	buf_inspect_u8.c \
 	buf_inspect_uw.c \
 	buf_parse.c \
diff --git a/libc3/sources.sh b/libc3/sources.sh
index cf90cb9..8fbdde8 100644
--- a/libc3/sources.sh
+++ b/libc3/sources.sh
@@ -1,4 +1,4 @@
 # sources.sh generated by update_sources
-HEADERS='abs.h arg.h array.h binding.h bool.h buf.h buf_file.h buf_inspect.h buf_inspect_s16.h buf_inspect_s32.h buf_inspect_s64.h buf_inspect_s8.h buf_inspect_sw.h buf_inspect_u16.h buf_inspect_u32.h buf_inspect_u64.h buf_inspect_u8.h buf_inspect_uw.h buf_parse.h buf_parse_c.h buf_parse_s16.h buf_parse_s32.h buf_parse_s64.h buf_parse_s8.h buf_parse_sw.h buf_parse_u16.h buf_parse_u32.h buf_parse_u64.h buf_parse_u8.h buf_parse_uw.h buf_save.h c3.h c_types.h call.h ceiling.h cfn.h character.h compare.h config.h env.h error.h error_handler.h eval.h fact.h facts.h facts_cursor.h facts_spec.h facts_spec_cursor.h facts_with.h facts_with_cursor.h float.h fn.h frame.h hash.h ident.h integer.h io.h list.h log.h module.h operator.h quote.h set__fact.h set__tag.h set_cursor__fact.h set_cursor__tag.h set_item__fact.h set_item__tag.h sha1.h sign.h skiplist__fact.h skiplist_node__fact.h str.h sym.h tag.h tuple.h type.h types.h ucd.h '
-SOURCES='abs.c arg.c array.c binding.c bool.c buf.c buf_file.c buf_inspect.c buf_inspect_s16.c buf_inspect_s32.c buf_inspect_s64.c buf_inspect_s8.c buf_inspect_sw.c buf_inspect_u16.c buf_inspect_u32.c buf_inspect_u64.c buf_inspect_u8.c buf_inspect_uw.c buf_parse.c buf_parse_c.c buf_parse_s16.c buf_parse_s32.c buf_parse_s64.c buf_parse_s8.c buf_parse_sw.c buf_parse_u16.c buf_parse_u32.c buf_parse_u64.c buf_parse_u8.c buf_parse_uw.c buf_save.c c3.c call.c ceiling.c cfn.c character.c compare.c env.c error.c error_handler.c eval.c fact.c facts.c facts_cursor.c facts_spec.c facts_spec_cursor.c facts_with.c facts_with_cursor.c fn.c frame.c hash.c ident.c integer.c io.c list.c log.c module.c operator.c quote.c set__fact.c set__tag.c set_cursor__fact.c set_cursor__tag.c set_item__fact.c set_item__tag.c sign.c skiplist__fact.c skiplist_node__fact.c str.c sym.c tag.c tuple.c type.c ucd.c '
-LO_SOURCES='abs.c arg.c array.c binding.c bool.c buf.c buf_file.c buf_inspect.c buf_inspect_s16.c buf_inspect_s32.c buf_inspect_s64.c buf_inspect_s8.c buf_inspect_sw.c buf_inspect_u16.c buf_inspect_u32.c buf_inspect_u64.c buf_inspect_u8.c buf_inspect_uw.c buf_parse.c buf_parse_c.c buf_parse_s16.c buf_parse_s32.c buf_parse_s64.c buf_parse_s8.c buf_parse_sw.c buf_parse_u16.c buf_parse_u32.c buf_parse_u64.c buf_parse_u8.c buf_parse_uw.c buf_save.c c3.c call.c ceiling.c cfn.c character.c compare.c env.c error.c error_handler.c eval.c fact.c facts.c facts_cursor.c facts_spec.c facts_spec_cursor.c facts_with.c facts_with_cursor.c fn.c frame.c hash.c ident.c integer.c io.c list.c log.c module.c operator.c quote.c set__fact.c set__tag.c set_cursor__fact.c set_cursor__tag.c set_item__fact.c set_item__tag.c sign.c skiplist__fact.c skiplist_node__fact.c str.c sym.c tag.c tuple.c type.c ucd.c ../libtommath/bn_cutoffs.c ../libtommath/bn_mp_2expt.c ../libtommath/bn_mp_abs.c ../libtommath/bn_mp_add.c ../libtommath/bn_mp_add_d.c ../libtommath/bn_mp_and.c ../libtommath/bn_mp_clamp.c ../libtommath/bn_mp_clear.c ../libtommath/bn_mp_clear_multi.c ../libtommath/bn_mp_cmp.c ../libtommath/bn_mp_cmp_d.c ../libtommath/bn_mp_cmp_mag.c ../libtommath/bn_mp_cnt_lsb.c ../libtommath/bn_mp_complement.c ../libtommath/bn_mp_copy.c ../libtommath/bn_mp_count_bits.c ../libtommath/bn_mp_div.c ../libtommath/bn_mp_div_2.c ../libtommath/bn_mp_div_2d.c ../libtommath/bn_mp_div_3.c ../libtommath/bn_mp_div_d.c ../libtommath/bn_mp_dr_is_modulus.c ../libtommath/bn_mp_dr_reduce.c ../libtommath/bn_mp_dr_setup.c ../libtommath/bn_mp_error_to_string.c ../libtommath/bn_mp_exch.c ../libtommath/bn_mp_exptmod.c ../libtommath/bn_mp_gcd.c ../libtommath/bn_mp_get_i32.c ../libtommath/bn_mp_get_i64.c ../libtommath/bn_mp_get_mag_u32.c ../libtommath/bn_mp_get_mag_u64.c ../libtommath/bn_mp_grow.c ../libtommath/bn_mp_init.c ../libtommath/bn_mp_init_copy.c ../libtommath/bn_mp_init_multi.c ../libtommath/bn_mp_init_size.c ../libtommath/bn_mp_invmod.c ../libtommath/bn_mp_lcm.c ../libtommath/bn_mp_lshd.c ../libtommath/bn_mp_mod.c ../libtommath/bn_mp_mod_2d.c ../libtommath/bn_mp_montgomery_calc_normalization.c ../libtommath/bn_mp_montgomery_reduce.c ../libtommath/bn_mp_montgomery_setup.c ../libtommath/bn_mp_mul.c ../libtommath/bn_mp_mul_2.c ../libtommath/bn_mp_mul_2d.c ../libtommath/bn_mp_mul_d.c ../libtommath/bn_mp_mulmod.c ../libtommath/bn_mp_neg.c ../libtommath/bn_mp_or.c ../libtommath/bn_mp_radix_size.c ../libtommath/bn_mp_reduce.c ../libtommath/bn_mp_reduce_2k.c ../libtommath/bn_mp_reduce_2k_l.c ../libtommath/bn_mp_reduce_2k_setup.c ../libtommath/bn_mp_reduce_2k_setup_l.c ../libtommath/bn_mp_reduce_is_2k.c ../libtommath/bn_mp_reduce_is_2k_l.c ../libtommath/bn_mp_reduce_setup.c ../libtommath/bn_mp_rshd.c ../libtommath/bn_mp_set.c ../libtommath/bn_mp_sqr.c ../libtommath/bn_mp_sqrt.c ../libtommath/bn_mp_sub.c ../libtommath/bn_mp_sub_d.c ../libtommath/bn_mp_xor.c ../libtommath/bn_mp_zero.c ../libtommath/bn_s_mp_add.c ../libtommath/bn_s_mp_balance_mul.c ../libtommath/bn_s_mp_exptmod.c ../libtommath/bn_s_mp_exptmod_fast.c ../libtommath/bn_s_mp_invmod_fast.c ../libtommath/bn_s_mp_invmod_slow.c ../libtommath/bn_s_mp_karatsuba_mul.c ../libtommath/bn_s_mp_karatsuba_sqr.c ../libtommath/bn_s_mp_montgomery_reduce_fast.c ../libtommath/bn_s_mp_mul_digs.c ../libtommath/bn_s_mp_mul_digs_fast.c ../libtommath/bn_s_mp_mul_high_digs.c ../libtommath/bn_s_mp_mul_high_digs_fast.c ../libtommath/bn_s_mp_rand_platform.c ../libtommath/bn_s_mp_sqr.c ../libtommath/bn_s_mp_sqr_fast.c ../libtommath/bn_s_mp_sub.c ../libtommath/bn_s_mp_toom_mul.c ../libtommath/bn_s_mp_toom_sqr.c '
+HEADERS='abs.h arg.h array.h binding.h bool.h buf.h buf_file.h buf_inspect.h buf_inspect_s16.h buf_inspect_s32.h buf_inspect_s64.h buf_inspect_s8.h buf_inspect_sw.h buf_inspect_u16.h buf_inspect_u32.h buf_inspect_u64.h buf_inspect_u64_hex.h buf_inspect_u8.h buf_inspect_uw.h buf_parse.h buf_parse_c.h buf_parse_s16.h buf_parse_s32.h buf_parse_s64.h buf_parse_s8.h buf_parse_sw.h buf_parse_u16.h buf_parse_u32.h buf_parse_u64.h buf_parse_u8.h buf_parse_uw.h buf_save.h c3.h c_types.h call.h ceiling.h cfn.h character.h compare.h config.h env.h error.h error_handler.h eval.h fact.h facts.h facts_cursor.h facts_spec.h facts_spec_cursor.h facts_with.h facts_with_cursor.h float.h fn.h frame.h hash.h ident.h integer.h io.h list.h log.h module.h operator.h quote.h set__fact.h set__tag.h set_cursor__fact.h set_cursor__tag.h set_item__fact.h set_item__tag.h sha1.h sign.h skiplist__fact.h skiplist_node__fact.h str.h sym.h tag.h tuple.h type.h types.h ucd.h '
+SOURCES='abs.c arg.c array.c binding.c bool.c buf.c buf_file.c buf_inspect.c buf_inspect_s16.c buf_inspect_s32.c buf_inspect_s64.c buf_inspect_s8.c buf_inspect_sw.c buf_inspect_u16.c buf_inspect_u32.c buf_inspect_u64.c buf_inspect_u64_hex.c buf_inspect_u8.c buf_inspect_uw.c buf_parse.c buf_parse_c.c buf_parse_s16.c buf_parse_s32.c buf_parse_s64.c buf_parse_s8.c buf_parse_sw.c buf_parse_u16.c buf_parse_u32.c buf_parse_u64.c buf_parse_u8.c buf_parse_uw.c buf_save.c c3.c call.c ceiling.c cfn.c character.c compare.c env.c error.c error_handler.c eval.c fact.c facts.c facts_cursor.c facts_spec.c facts_spec_cursor.c facts_with.c facts_with_cursor.c fn.c frame.c hash.c ident.c integer.c io.c list.c log.c module.c operator.c quote.c set__fact.c set__tag.c set_cursor__fact.c set_cursor__tag.c set_item__fact.c set_item__tag.c sign.c skiplist__fact.c skiplist_node__fact.c str.c sym.c tag.c tuple.c type.c ucd.c '
+LO_SOURCES='abs.c arg.c array.c binding.c bool.c buf.c buf_file.c buf_inspect.c buf_inspect_s16.c buf_inspect_s32.c buf_inspect_s64.c buf_inspect_s8.c buf_inspect_sw.c buf_inspect_u16.c buf_inspect_u32.c buf_inspect_u64.c buf_inspect_u64_hex.c buf_inspect_u8.c buf_inspect_uw.c buf_parse.c buf_parse_c.c buf_parse_s16.c buf_parse_s32.c buf_parse_s64.c buf_parse_s8.c buf_parse_sw.c buf_parse_u16.c buf_parse_u32.c buf_parse_u64.c buf_parse_u8.c buf_parse_uw.c buf_save.c c3.c call.c ceiling.c cfn.c character.c compare.c env.c error.c error_handler.c eval.c fact.c facts.c facts_cursor.c facts_spec.c facts_spec_cursor.c facts_with.c facts_with_cursor.c fn.c frame.c hash.c ident.c integer.c io.c list.c log.c module.c operator.c quote.c set__fact.c set__tag.c set_cursor__fact.c set_cursor__tag.c set_item__fact.c set_item__tag.c sign.c skiplist__fact.c skiplist_node__fact.c str.c sym.c tag.c tuple.c type.c ucd.c ../libtommath/bn_cutoffs.c ../libtommath/bn_mp_2expt.c ../libtommath/bn_mp_abs.c ../libtommath/bn_mp_add.c ../libtommath/bn_mp_add_d.c ../libtommath/bn_mp_and.c ../libtommath/bn_mp_clamp.c ../libtommath/bn_mp_clear.c ../libtommath/bn_mp_clear_multi.c ../libtommath/bn_mp_cmp.c ../libtommath/bn_mp_cmp_d.c ../libtommath/bn_mp_cmp_mag.c ../libtommath/bn_mp_cnt_lsb.c ../libtommath/bn_mp_complement.c ../libtommath/bn_mp_copy.c ../libtommath/bn_mp_count_bits.c ../libtommath/bn_mp_div.c ../libtommath/bn_mp_div_2.c ../libtommath/bn_mp_div_2d.c ../libtommath/bn_mp_div_3.c ../libtommath/bn_mp_div_d.c ../libtommath/bn_mp_dr_is_modulus.c ../libtommath/bn_mp_dr_reduce.c ../libtommath/bn_mp_dr_setup.c ../libtommath/bn_mp_error_to_string.c ../libtommath/bn_mp_exch.c ../libtommath/bn_mp_exptmod.c ../libtommath/bn_mp_gcd.c ../libtommath/bn_mp_get_i32.c ../libtommath/bn_mp_get_i64.c ../libtommath/bn_mp_get_mag_u32.c ../libtommath/bn_mp_get_mag_u64.c ../libtommath/bn_mp_grow.c ../libtommath/bn_mp_init.c ../libtommath/bn_mp_init_copy.c ../libtommath/bn_mp_init_multi.c ../libtommath/bn_mp_init_size.c ../libtommath/bn_mp_invmod.c ../libtommath/bn_mp_lcm.c ../libtommath/bn_mp_lshd.c ../libtommath/bn_mp_mod.c ../libtommath/bn_mp_mod_2d.c ../libtommath/bn_mp_montgomery_calc_normalization.c ../libtommath/bn_mp_montgomery_reduce.c ../libtommath/bn_mp_montgomery_setup.c ../libtommath/bn_mp_mul.c ../libtommath/bn_mp_mul_2.c ../libtommath/bn_mp_mul_2d.c ../libtommath/bn_mp_mul_d.c ../libtommath/bn_mp_mulmod.c ../libtommath/bn_mp_neg.c ../libtommath/bn_mp_or.c ../libtommath/bn_mp_radix_size.c ../libtommath/bn_mp_reduce.c ../libtommath/bn_mp_reduce_2k.c ../libtommath/bn_mp_reduce_2k_l.c ../libtommath/bn_mp_reduce_2k_setup.c ../libtommath/bn_mp_reduce_2k_setup_l.c ../libtommath/bn_mp_reduce_is_2k.c ../libtommath/bn_mp_reduce_is_2k_l.c ../libtommath/bn_mp_reduce_setup.c ../libtommath/bn_mp_rshd.c ../libtommath/bn_mp_set.c ../libtommath/bn_mp_sqr.c ../libtommath/bn_mp_sqrt.c ../libtommath/bn_mp_sub.c ../libtommath/bn_mp_sub_d.c ../libtommath/bn_mp_xor.c ../libtommath/bn_mp_zero.c ../libtommath/bn_s_mp_add.c ../libtommath/bn_s_mp_balance_mul.c ../libtommath/bn_s_mp_exptmod.c ../libtommath/bn_s_mp_exptmod_fast.c ../libtommath/bn_s_mp_invmod_fast.c ../libtommath/bn_s_mp_invmod_slow.c ../libtommath/bn_s_mp_karatsuba_mul.c ../libtommath/bn_s_mp_karatsuba_sqr.c ../libtommath/bn_s_mp_montgomery_reduce_fast.c ../libtommath/bn_s_mp_mul_digs.c ../libtommath/bn_s_mp_mul_digs_fast.c ../libtommath/bn_s_mp_mul_high_digs.c ../libtommath/bn_s_mp_mul_high_digs_fast.c ../libtommath/bn_s_mp_rand_platform.c ../libtommath/bn_s_mp_sqr.c ../libtommath/bn_s_mp_sqr_fast.c ../libtommath/bn_s_mp_sub.c ../libtommath/bn_s_mp_toom_mul.c ../libtommath/bn_s_mp_toom_sqr.c '
diff --git a/sources.mk b/sources.mk
index 66537f3..29e3953 100644
--- a/sources.mk
+++ b/sources.mk
@@ -204,6 +204,9 @@ C3_C_SOURCES = \
 	libc3/buf_inspect_u64.h \
 	libc3/buf_inspect_uw.c \
 	libc3/buf_inspect_uw.h \
+	libc3/buf_inspect_u64_hex.c \
+	libc3/buf_inspect_u64_hex.h \
+	libc3/buf_inspect_u_base.h.in \
 	test/facts_cursor_test.c \
 	test/facts_test.c \
 	test/facts_with_test.c \
diff --git a/sources.sh b/sources.sh
index 4ad0a7e..65fa66b 100644
--- a/sources.sh
+++ b/sources.sh
@@ -1,4 +1,4 @@
 # sources.sh generated by update_sources
 C3_CONFIGURES='c3c/configure c3s/configure c3s/update_sources ic3/configure ic3/update_sources libc3/update_sources libc3/configure libtommath/configure libtommath/update_sources test/configure test/update_sources ucd2c/configure '
 C3_MAKEFILES='c3c/Makefile c3s/Makefile ic3/Makefile libc3/Makefile libc3/gen.mk libtommath/Makefile test/Makefile ucd2c/Makefile '
-C3_C_SOURCES='c3c/c3c.c c3s/buf_readline.c c3s/c3s.c c3s/buf_readline.h ic3/buf_linenoise.c ic3/ic3.c ic3/buf_linenoise.h ic3/linenoise.c libc3/arg.c libc3/arg.h libc3/facts.c libc3/binding.c libc3/binding.h libc3/facts_with_cursor.c libc3/array.c libc3/array.h libc3/buf.c libc3/buf_parse.c libc3/integer.h libc3/types.h libc3/type.c libc3/buf_parse_s8.c libc3/buf_parse_s8.h libc3/buf_parse_s16.c libc3/buf_parse_s16.h libc3/buf_parse_s32.c libc3/buf_parse_s32.h libc3/buf_parse_s64.c libc3/buf_file.c libc3/buf_file.h libc3/bool.c libc3/io.h libc3/io.c libc3/abs.h libc3/ceiling.c libc3/buf_parse_c.c libc3/buf_parse_c.h libc3/buf_save.c libc3/buf_parse.h libc3/compare.c libc3/buf_inspect.c libc3/set_cursor__fact.c libc3/set_cursor__fact.h libc3/set_cursor__tag.c libc3/set_cursor__tag.h libc3/set_item__fact.c libc3/set_item__fact.h libc3/set_item__tag.c libc3/set_item__tag.h libc3/call.c libc3/bool.h libc3/buf_save.h libc3/fact.h libc3/error.c libc3/list.h libc3/c3.c libc3/c3.h libc3/tag.c libc3/error.h libc3/env.h libc3/character.h libc3/compare.h libc3/operator.h libc3/operator.c libc3/tag.h libc3/sign.h libc3/buf.h libc3/buf_parse_s64.h libc3/buf_parse_sw.c libc3/buf_parse_sw.h libc3/buf_parse_u8.c libc3/buf_parse_u8.h libc3/buf_parse_u16.c libc3/buf_parse_u16.h libc3/buf_parse_u32.c libc3/ident.c libc3/error_handler.c libc3/frame.c libc3/set_cursor.c.in libc3/set_cursor.h.in libc3/set_item.c.in libc3/set_item.h.in libc3/error_handler.h libc3/eval.c libc3/eval.h libc3/fact.c libc3/facts.h libc3/facts_cursor.c libc3/fn.h libc3/ceiling.h libc3/buf_inspect.h libc3/buf_parse_u32.h libc3/buf_parse_u64.c libc3/buf_parse_u64.h libc3/buf_parse_uw.c libc3/buf_parse_uw.h libc3/set__fact.c libc3/set__fact.h libc3/set__tag.c libc3/set__tag.h libc3/env.c libc3/facts_cursor.h libc3/facts_spec.c libc3/frame.h libc3/sign.c libc3/facts_spec.h libc3/facts_spec_cursor.c libc3/hash.c libc3/facts_spec_cursor.h libc3/facts_with.c libc3/facts_with.h libc3/hash.h libc3/cfn.h libc3/buf_parse_u.c.in libc3/abs.c libc3/facts_with_cursor.h libc3/ident.h libc3/str.c libc3/c_types.h libc3/skiplist__fact.c libc3/skiplist__fact.h libc3/skiplist_node__fact.c libc3/skiplist_node__fact.h libc3/buf_parse_s.c.in libc3/integer.c libc3/list.c libc3/log.c libc3/log.h libc3/sym.h libc3/module.c libc3/quote.c libc3/quote.h libc3/character.c libc3/cfn.c libc3/fn.c libc3/module.h libc3/set.c.in libc3/call.h libc3/set.h.in libc3/sha1.h libc3/skiplist.c.in libc3/skiplist.h.in libc3/skiplist_node.c.in libc3/skiplist_node.h.in libc3/str.h libc3/sym.c libc3/tuple.c libc3/tuple.h libc3/ucd.c libc3/ucd.h libc3/type.h libc3/buf_parse_s.h.in libc3/buf_parse_u.h.in libc3/float.h libc3/buf_inspect_s_base.c.in libc3/buf_inspect_s.c.in libc3/buf_inspect_s8.c libc3/buf_inspect_s.h.in libc3/buf_inspect_s8.h libc3/buf_inspect_s16.c libc3/buf_inspect_s16.h libc3/buf_inspect_s64.c libc3/buf_inspect_u.c.in libc3/buf_inspect_s32.c libc3/buf_inspect_u8.c libc3/buf_inspect_s32.h libc3/buf_inspect_s64.h libc3/buf_inspect_sw.c libc3/buf_inspect_sw.h libc3/buf_inspect_u_base.c.in libc3/buf_inspect_u8.h libc3/buf_inspect_u.h.in libc3/buf_inspect_u16.c libc3/buf_inspect_u16.h libc3/buf_inspect_u32.c libc3/buf_inspect_u32.h libc3/buf_inspect_u64.c libc3/buf_inspect_u64.h libc3/buf_inspect_uw.c libc3/buf_inspect_uw.h test/facts_cursor_test.c test/facts_test.c test/facts_with_test.c test/set__fact_test.c test/set__tag_test.c test/test.c test/tag_test.c test/sym_test.c test/tag_test.h test/tuple_test.c test/types_test.c test/skiplist__fact_test.c test/fact_test.c test/compare_test.h test/fact_test.h test/str_test.c test/list_test.c test/hash_test.c test/compare_test.c test/call_test.c test/ident_test.c test/libc3_test.c test/buf_inspect_test.c test/test.h test/bool_test.c test/cfn_test.c test/buf_parse_test_s8.c test/buf_parse_test_s32.c test/buf_parse_test_s64.c test/buf_parse_test_u16.c test/buf_parse_test_u8.c test/buf_parse_test_u32.c test/buf_parse_test_u64.c test/buf_parse_test.h test/buf_test.c test/env_test.c test/buf_parse_test_su.h test/character_test.c test/buf_parse_test.c test/buf_parse_test_s16.c test/buf_file_test.c ucd2c/ucd.h ucd2c/ucd2c.c '
+C3_C_SOURCES='c3c/c3c.c c3s/buf_readline.c c3s/c3s.c c3s/buf_readline.h ic3/buf_linenoise.c ic3/ic3.c ic3/buf_linenoise.h ic3/linenoise.c libc3/arg.c libc3/arg.h libc3/facts.c libc3/binding.c libc3/binding.h libc3/facts_with_cursor.c libc3/array.c libc3/array.h libc3/buf.c libc3/buf_parse.c libc3/integer.h libc3/types.h libc3/type.c libc3/buf_parse_s8.c libc3/buf_parse_s8.h libc3/buf_parse_s16.c libc3/buf_parse_s16.h libc3/buf_parse_s32.c libc3/buf_parse_s32.h libc3/buf_parse_s64.c libc3/buf_file.c libc3/buf_file.h libc3/bool.c libc3/io.h libc3/io.c libc3/abs.h libc3/ceiling.c libc3/buf_parse_c.c libc3/buf_parse_c.h libc3/buf_save.c libc3/buf_parse.h libc3/compare.c libc3/buf_inspect.c libc3/set_cursor__fact.c libc3/set_cursor__fact.h libc3/set_cursor__tag.c libc3/set_cursor__tag.h libc3/set_item__fact.c libc3/set_item__fact.h libc3/set_item__tag.c libc3/set_item__tag.h libc3/call.c libc3/bool.h libc3/buf_save.h libc3/fact.h libc3/error.c libc3/list.h libc3/c3.c libc3/c3.h libc3/tag.c libc3/error.h libc3/env.h libc3/character.h libc3/compare.h libc3/operator.h libc3/operator.c libc3/tag.h libc3/sign.h libc3/buf.h libc3/buf_parse_s64.h libc3/buf_parse_sw.c libc3/buf_parse_sw.h libc3/buf_parse_u8.c libc3/buf_parse_u8.h libc3/buf_parse_u16.c libc3/buf_parse_u16.h libc3/buf_parse_u32.c libc3/ident.c libc3/error_handler.c libc3/frame.c libc3/set_cursor.c.in libc3/set_cursor.h.in libc3/set_item.c.in libc3/set_item.h.in libc3/error_handler.h libc3/eval.c libc3/eval.h libc3/fact.c libc3/facts.h libc3/facts_cursor.c libc3/fn.h libc3/ceiling.h libc3/buf_inspect.h libc3/buf_parse_u32.h libc3/buf_parse_u64.c libc3/buf_parse_u64.h libc3/buf_parse_uw.c libc3/buf_parse_uw.h libc3/set__fact.c libc3/set__fact.h libc3/set__tag.c libc3/set__tag.h libc3/env.c libc3/facts_cursor.h libc3/facts_spec.c libc3/frame.h libc3/sign.c libc3/facts_spec.h libc3/facts_spec_cursor.c libc3/hash.c libc3/facts_spec_cursor.h libc3/facts_with.c libc3/facts_with.h libc3/hash.h libc3/cfn.h libc3/buf_parse_u.c.in libc3/abs.c libc3/facts_with_cursor.h libc3/ident.h libc3/str.c libc3/c_types.h libc3/skiplist__fact.c libc3/skiplist__fact.h libc3/skiplist_node__fact.c libc3/skiplist_node__fact.h libc3/buf_parse_s.c.in libc3/integer.c libc3/list.c libc3/log.c libc3/log.h libc3/sym.h libc3/module.c libc3/quote.c libc3/quote.h libc3/character.c libc3/cfn.c libc3/fn.c libc3/module.h libc3/set.c.in libc3/call.h libc3/set.h.in libc3/sha1.h libc3/skiplist.c.in libc3/skiplist.h.in libc3/skiplist_node.c.in libc3/skiplist_node.h.in libc3/str.h libc3/sym.c libc3/tuple.c libc3/tuple.h libc3/ucd.c libc3/ucd.h libc3/type.h libc3/buf_parse_s.h.in libc3/buf_parse_u.h.in libc3/float.h libc3/buf_inspect_s_base.c.in libc3/buf_inspect_s.c.in libc3/buf_inspect_s8.c libc3/buf_inspect_s.h.in libc3/buf_inspect_s8.h libc3/buf_inspect_s16.c libc3/buf_inspect_s16.h libc3/buf_inspect_s64.c libc3/buf_inspect_u.c.in libc3/buf_inspect_s32.c libc3/buf_inspect_u8.c libc3/buf_inspect_s32.h libc3/buf_inspect_s64.h libc3/buf_inspect_sw.c libc3/buf_inspect_sw.h libc3/buf_inspect_u_base.c.in libc3/buf_inspect_u8.h libc3/buf_inspect_u.h.in libc3/buf_inspect_u16.c libc3/buf_inspect_u16.h libc3/buf_inspect_u32.c libc3/buf_inspect_u32.h libc3/buf_inspect_u64.c libc3/buf_inspect_u64.h libc3/buf_inspect_uw.c libc3/buf_inspect_uw.h libc3/buf_inspect_u64_hex.c libc3/buf_inspect_u64_hex.h libc3/buf_inspect_u_base.h.in test/facts_cursor_test.c test/facts_test.c test/facts_with_test.c test/set__fact_test.c test/set__tag_test.c test/test.c test/tag_test.c test/sym_test.c test/tag_test.h test/tuple_test.c test/types_test.c test/skiplist__fact_test.c test/fact_test.c test/compare_test.h test/fact_test.h test/str_test.c test/list_test.c test/hash_test.c test/compare_test.c test/call_test.c test/ident_test.c test/libc3_test.c test/buf_inspect_test.c test/test.h test/bool_test.c test/cfn_test.c test/buf_parse_test_s8.c test/buf_parse_test_s32.c test/buf_parse_test_s64.c test/buf_parse_test_u16.c test/buf_parse_test_u8.c test/buf_parse_test_u32.c test/buf_parse_test_u64.c test/buf_parse_test.h test/buf_test.c test/env_test.c test/buf_parse_test_su.h test/character_test.c test/buf_parse_test.c test/buf_parse_test_s16.c test/buf_file_test.c ucd2c/ucd.h ucd2c/ucd2c.c '