kc3-lang/kc3

diff --git a/sources.mk b/sources.mk
index 303d5f2..ece62fb 100644
--- a/sources.mk
+++ b/sources.mk
@@ -1,4 +1,174 @@
 # sources.mk generated by update_sources
-C3_CONFIGURES = c3c/configure c3s/configure c3s/update_sources ic3/configure ic3/update_sources libc3/configure libc3/update_sources test/configure test/update_sources ucd2c/configure  libtommath/configure
-C3_MAKEFILES = c3c/Makefile c3s/Makefile ic3/Makefile libc3/Makefile libc3/gen.mk test/Makefile ucd2c/Makefile  libtommath/Makefile
-C3_C_SOURCES = c3c/c3c.c c3s/buf_readline.c c3s/c3s.c c3s/buf_readline.h ic3/buf_linenoise.c ic3/buf_linenoise.h ic3/ic3.c ic3/linenoise.c libc3/arg.c libc3/arg.h libc3/binding.c libc3/binding.h libc3/bool.c libc3/bool.h libc3/set__fact.c libc3/set__fact.h libc3/set__tag.c libc3/set__tag.h libc3/set_cursor__fact.c libc3/set_cursor__fact.h libc3/set_cursor__tag.c libc3/buf.c libc3/buf.h libc3/buf_file.c libc3/buf_file.h libc3/buf_inspect.c libc3/buf_inspect.h libc3/buf_parse.c libc3/buf_parse.h libc3/buf_parse_c.c libc3/buf_parse_c.h libc3/buf_save.c libc3/log.h 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/skiplist__fact.c libc3/skiplist__fact.h libc3/compare.c libc3/compare.h libc3/buf_save.h libc3/env.c libc3/env.h libc3/c_types.h libc3/call.c libc3/call.h libc3/character.c libc3/debug.c libc3/debug.h libc3/log.c libc3/error.c libc3/error.h libc3/error_handler.c libc3/error_handler.h libc3/eval.c libc3/eval.h libc3/fact.h libc3/facts.c libc3/facts.h libc3/facts_cursor.c libc3/facts_cursor.h libc3/facts_spec.c libc3/facts_spec.h libc3/facts_spec_cursor.c libc3/facts_spec_cursor.h libc3/character.h libc3/skiplist_node__fact.c libc3/skiplist_node__fact.h libc3/c3.c libc3/facts_with.c libc3/facts_with.h libc3/facts_with_cursor.c libc3/facts_with_cursor.h libc3/fn.c libc3/fn.h libc3/frame.c libc3/frame.h libc3/hash.c libc3/hash.h libc3/ident.c libc3/ident.h libc3/integer.c libc3/integer.h libc3/list.c libc3/list.h libc3/module.h libc3/quote.c libc3/quote.h libc3/types.h libc3/c3.h libc3/set.c.in libc3/set.h.in libc3/set_cursor.c.in libc3/set_cursor.h.in libc3/str.c libc3/set_item.c.in libc3/set_item.h.in libc3/fact.c 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/sym.h libc3/tag.c libc3/tuple.c libc3/tuple.h libc3/ucd.c libc3/ucd.h libc3/tag.h libc3/module.c libc3/sha1.h test/bool_test.c test/buf_file_test.c test/buf_inspect_test.c test/buf_parse_test.c test/buf_test.c test/call_test.c test/character_test.c test/hash_test.c test/fact_test.c test/fact_test.h test/facts_cursor_test.c test/facts_test.c test/facts_with_test.c test/ident_test.c test/libc3_test.c test/tuple_test.c test/list_test.c test/set__fact_test.c test/set__tag_test.c test/compare_test.h test/skiplist__fact_test.c test/str_test.c test/test.c test/test.h test/sym_test.c test/tag_test.c test/tag_test.h test/types_test.c test/compare_test.c  ucd2c/ucd.h ucd2c/ucd2c.c
+C3_CONFIGURES = \
+	c3c/configure \
+	c3s/configure \
+	c3s/update_sources \
+	ic3/configure \
+	ic3/update_sources \
+	libc3/configure \
+	libc3/update_sources \
+	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/logs/Makefile \
+	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/buf_linenoise.h \
+	ic3/ic3.c \
+	ic3/linenoise.c \
+	libc3/arg.c \
+	libc3/arg.h \
+	libc3/binding.c \
+	libc3/binding.h \
+	libc3/bool.c \
+	libc3/bool.h \
+	libc3/set__tag.c \
+	libc3/set__tag.h \
+	libc3/set_item__tag.c \
+	libc3/set_item__tag.h \
+	libc3/set_cursor__tag.c \
+	libc3/set_cursor__tag.h \
+	libc3/skiplist_node__fact.c \
+	libc3/buf.c \
+	libc3/buf.h \
+	libc3/buf_file.c \
+	libc3/buf_file.h \
+	libc3/buf_inspect.c \
+	libc3/buf_inspect.h \
+	libc3/buf_parse.c \
+	libc3/buf_parse.h \
+	libc3/buf_parse_c.c \
+	libc3/buf_parse_c.h \
+	libc3/buf_save.c \
+	libc3/log.h \
+	libc3/skiplist_node__fact.h \
+	libc3/skiplist__fact.c \
+	libc3/skiplist__fact.h \
+	libc3/set_item__fact.c \
+	libc3/set_item__fact.h \
+	libc3/set__fact.c \
+	libc3/set_cursor__fact.c \
+	libc3/compare.c \
+	libc3/compare.h \
+	libc3/buf_save.h \
+	libc3/env.c \
+	libc3/env.h \
+	libc3/c_types.h \
+	libc3/call.c \
+	libc3/call.h \
+	libc3/character.c \
+	libc3/debug.c \
+	libc3/debug.h \
+	libc3/log.c \
+	libc3/error.c \
+	libc3/error.h \
+	libc3/error_handler.c \
+	libc3/error_handler.h \
+	libc3/eval.c \
+	libc3/eval.h \
+	libc3/fact.h \
+	libc3/facts.c \
+	libc3/facts.h \
+	libc3/facts_cursor.c \
+	libc3/facts_cursor.h \
+	libc3/facts_spec.c \
+	libc3/facts_spec.h \
+	libc3/facts_spec_cursor.c \
+	libc3/facts_spec_cursor.h \
+	libc3/character.h \
+	libc3/set__fact.h \
+	libc3/set_cursor__fact.h \
+	libc3/c3.c \
+	libc3/facts_with.c \
+	libc3/facts_with.h \
+	libc3/facts_with_cursor.c \
+	libc3/facts_with_cursor.h \
+	libc3/fn.c \
+	libc3/fn.h \
+	libc3/frame.c \
+	libc3/frame.h \
+	libc3/hash.c \
+	libc3/hash.h \
+	libc3/ident.c \
+	libc3/ident.h \
+	libc3/integer.c \
+	libc3/integer.h \
+	libc3/list.c \
+	libc3/list.h \
+	libc3/module.h \
+	libc3/quote.c \
+	libc3/quote.h \
+	libc3/types.h \
+	libc3/c3.h \
+	libc3/set.c.in \
+	libc3/set.h.in \
+	libc3/set_cursor.c.in \
+	libc3/set_cursor.h.in \
+	libc3/str.c \
+	libc3/set_item.c.in \
+	libc3/set_item.h.in \
+	libc3/fact.c \
+	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/sym.h \
+	libc3/tag.c \
+	libc3/tuple.c \
+	libc3/tuple.h \
+	libc3/ucd.c \
+	libc3/ucd.h \
+	libc3/tag.h \
+	libc3/module.c \
+	libc3/sha1.h \
+	test/bool_test.c \
+	test/buf_file_test.c \
+	test/buf_inspect_test.c \
+	test/buf_parse_test.c \
+	test/buf_test.c \
+	test/call_test.c \
+	test/character_test.c \
+	test/hash_test.c \
+	test/fact_test.c \
+	test/fact_test.h \
+	test/facts_cursor_test.c \
+	test/facts_test.c \
+	test/facts_with_test.c \
+	test/ident_test.c \
+	test/libc3_test.c \
+	test/tuple_test.c \
+	test/list_test.c \
+	test/set__fact_test.c \
+	test/set__tag_test.c \
+	test/compare_test.h \
+	test/skiplist__fact_test.c \
+	test/str_test.c \
+	test/test.c \
+	test/test.h \
+	test/sym_test.c \
+	test/tag_test.c \
+	test/tag_test.h \
+	test/types_test.c \
+	test/compare_test.c \
+	ucd2c/ucd.h \
+	ucd2c/ucd2c.c \
+
diff --git a/sources.sh b/sources.sh
index f6933db..5a3b789 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/configure libc3/update_sources test/configure test/update_sources ucd2c/configure  libtommath/configure'
-C3_MAKEFILES='c3c/Makefile c3s/Makefile ic3/Makefile libc3/Makefile libc3/gen.mk test/Makefile ucd2c/Makefile  libtommath/Makefile'
-C3_C_SOURCES='c3c/c3c.c c3s/buf_readline.c c3s/c3s.c c3s/buf_readline.h ic3/buf_linenoise.c ic3/buf_linenoise.h ic3/ic3.c ic3/linenoise.c libc3/arg.c libc3/arg.h libc3/binding.c libc3/binding.h libc3/bool.c libc3/bool.h libc3/set__fact.c libc3/set__fact.h libc3/set__tag.c libc3/set__tag.h libc3/set_cursor__fact.c libc3/set_cursor__fact.h libc3/set_cursor__tag.c libc3/buf.c libc3/buf.h libc3/buf_file.c libc3/buf_file.h libc3/buf_inspect.c libc3/buf_inspect.h libc3/buf_parse.c libc3/buf_parse.h libc3/buf_parse_c.c libc3/buf_parse_c.h libc3/buf_save.c libc3/log.h 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/skiplist__fact.c libc3/skiplist__fact.h libc3/compare.c libc3/compare.h libc3/buf_save.h libc3/env.c libc3/env.h libc3/c_types.h libc3/call.c libc3/call.h libc3/character.c libc3/debug.c libc3/debug.h libc3/log.c libc3/error.c libc3/error.h libc3/error_handler.c libc3/error_handler.h libc3/eval.c libc3/eval.h libc3/fact.h libc3/facts.c libc3/facts.h libc3/facts_cursor.c libc3/facts_cursor.h libc3/facts_spec.c libc3/facts_spec.h libc3/facts_spec_cursor.c libc3/facts_spec_cursor.h libc3/character.h libc3/skiplist_node__fact.c libc3/skiplist_node__fact.h libc3/c3.c libc3/facts_with.c libc3/facts_with.h libc3/facts_with_cursor.c libc3/facts_with_cursor.h libc3/fn.c libc3/fn.h libc3/frame.c libc3/frame.h libc3/hash.c libc3/hash.h libc3/ident.c libc3/ident.h libc3/integer.c libc3/integer.h libc3/list.c libc3/list.h libc3/module.h libc3/quote.c libc3/quote.h libc3/types.h libc3/c3.h libc3/set.c.in libc3/set.h.in libc3/set_cursor.c.in libc3/set_cursor.h.in libc3/str.c libc3/set_item.c.in libc3/set_item.h.in libc3/fact.c 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/sym.h libc3/tag.c libc3/tuple.c libc3/tuple.h libc3/ucd.c libc3/ucd.h libc3/tag.h libc3/module.c libc3/sha1.h test/bool_test.c test/buf_file_test.c test/buf_inspect_test.c test/buf_parse_test.c test/buf_test.c test/call_test.c test/character_test.c test/hash_test.c test/fact_test.c test/fact_test.h test/facts_cursor_test.c test/facts_test.c test/facts_with_test.c test/ident_test.c test/libc3_test.c test/tuple_test.c test/list_test.c test/set__fact_test.c test/set__tag_test.c test/compare_test.h test/skiplist__fact_test.c test/str_test.c test/test.c test/test.h test/sym_test.c test/tag_test.c test/tag_test.h test/types_test.c test/compare_test.c  ucd2c/ucd.h ucd2c/ucd2c.c'
+C3_CONFIGURES='c3c/configure c3s/configure c3s/update_sources ic3/configure ic3/update_sources libc3/configure libc3/update_sources 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/logs/Makefile 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/buf_linenoise.h ic3/ic3.c ic3/linenoise.c libc3/arg.c libc3/arg.h libc3/binding.c libc3/binding.h libc3/bool.c libc3/bool.h libc3/set__tag.c libc3/set__tag.h libc3/set_item__tag.c libc3/set_item__tag.h libc3/set_cursor__tag.c libc3/set_cursor__tag.h libc3/skiplist_node__fact.c libc3/buf.c libc3/buf.h libc3/buf_file.c libc3/buf_file.h libc3/buf_inspect.c libc3/buf_inspect.h libc3/buf_parse.c libc3/buf_parse.h libc3/buf_parse_c.c libc3/buf_parse_c.h libc3/buf_save.c libc3/log.h libc3/skiplist_node__fact.h libc3/skiplist__fact.c libc3/skiplist__fact.h libc3/set_item__fact.c libc3/set_item__fact.h libc3/set__fact.c libc3/set_cursor__fact.c libc3/compare.c libc3/compare.h libc3/buf_save.h libc3/env.c libc3/env.h libc3/c_types.h libc3/call.c libc3/call.h libc3/character.c libc3/debug.c libc3/debug.h libc3/log.c libc3/error.c libc3/error.h libc3/error_handler.c libc3/error_handler.h libc3/eval.c libc3/eval.h libc3/fact.h libc3/facts.c libc3/facts.h libc3/facts_cursor.c libc3/facts_cursor.h libc3/facts_spec.c libc3/facts_spec.h libc3/facts_spec_cursor.c libc3/facts_spec_cursor.h libc3/character.h libc3/set__fact.h libc3/set_cursor__fact.h libc3/c3.c libc3/facts_with.c libc3/facts_with.h libc3/facts_with_cursor.c libc3/facts_with_cursor.h libc3/fn.c libc3/fn.h libc3/frame.c libc3/frame.h libc3/hash.c libc3/hash.h libc3/ident.c libc3/ident.h libc3/integer.c libc3/integer.h libc3/list.c libc3/list.h libc3/module.h libc3/quote.c libc3/quote.h libc3/types.h libc3/c3.h libc3/set.c.in libc3/set.h.in libc3/set_cursor.c.in libc3/set_cursor.h.in libc3/str.c libc3/set_item.c.in libc3/set_item.h.in libc3/fact.c 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/sym.h libc3/tag.c libc3/tuple.c libc3/tuple.h libc3/ucd.c libc3/ucd.h libc3/tag.h libc3/module.c libc3/sha1.h test/bool_test.c test/buf_file_test.c test/buf_inspect_test.c test/buf_parse_test.c test/buf_test.c test/call_test.c test/character_test.c test/hash_test.c test/fact_test.c test/fact_test.h test/facts_cursor_test.c test/facts_test.c test/facts_with_test.c test/ident_test.c test/libc3_test.c test/tuple_test.c test/list_test.c test/set__fact_test.c test/set__tag_test.c test/compare_test.h test/skiplist__fact_test.c test/str_test.c test/test.c test/test.h test/sym_test.c test/tag_test.c test/tag_test.h test/types_test.c test/compare_test.c ucd2c/ucd.h ucd2c/ucd2c.c '
diff --git a/update_sources b/update_sources
index 2218acb..d9bde6e 100755
--- a/update_sources
+++ b/update_sources
@@ -6,24 +6,18 @@ set -e
 echo "# sources.mk generated by update_sources" > ${SOURCES_MK}
 echo "# sources.sh generated by update_sources" > ${SOURCES_SH}
 
-C3_CONFIGURES="$(find c3c c3s ic3 libc3 test ucd2c -name configure -or -name update_sources)"
-C3_CONFIGURES="$(echo "${C3_CONFIGURES}" | tr '\n' ' ')"
-C3_CONFIGURES="${C3_CONFIGURES} libtommath/configure"
-echo "C3_CONFIGURES = $C3_CONFIGURES" >> ${SOURCES_MK}
-echo "C3_CONFIGURES='$C3_CONFIGURES'" >> ${SOURCES_SH}
+C3_CONFIGURES="$(find c3c c3s ic3 libc3 libtommath test ucd2c -name configure -or -name update_sources)"
+sources C3_CONFIGURES "$C3_CONFIGURES"
 
-C3_MAKEFILES="$(find c3c c3s ic3 libc3 test ucd2c -name Makefile -or -name gen.mk)"
-C3_MAKEFILES="$(echo "${C3_MAKEFILES}" | tr '\n' ' ')"
-C3_MAKEFILES="${C3_MAKEFILES} libtommath/Makefile"
-echo "C3_MAKEFILES = $C3_MAKEFILES" >> ${SOURCES_MK}
-echo "C3_MAKEFILES='$C3_MAKEFILES'" >> ${SOURCES_SH}
+C3_MAKEFILES="$(find c3c c3s ic3 libc3 libtommath test ucd2c -name Makefile -or -name gen.mk)"
+sources C3_MAKEFILES "$C3_MAKEFILES"
 
 C3_C_SOURCES="$(find c3c c3s ic3 libc3 test -name "[a-z]*.c" -or -name "[a-z]*.h" -or -name "[a-z]*.c.in" -or -name "[a-z]*.h.in")"
 C3_C_SOURCES="$(echo "${C3_C_SOURCES}" | grep -Ev '^libc3/config[.]h$')"
-C3_C_SOURCES="$(echo "${C3_C_SOURCES}" | tr '\n' ' ')"
-C3_C_SOURCES="$C3_C_SOURCES ucd2c/ucd.h ucd2c/ucd2c.c"
-echo "C3_C_SOURCES = $C3_C_SOURCES" >> ${SOURCES_MK}
-echo "C3_C_SOURCES='$C3_C_SOURCES'" >> ${SOURCES_SH}
+C3_C_SOURCES="$C3_C_SOURCES
+ucd2c/ucd.h
+ucd2c/ucd2c.c"
+sources C3_C_SOURCES "$C3_C_SOURCES"
 
 update_sources_mk
 update_sources_sh