:art: Submodule update and cleaning

diff --git a/ast b/ast
index 3b2a82bcd3731b0da50eb5f35b20b5e163de04e0..f4a41d4fa0f480b9fa2753961cb749b2bdfbe989 160000 (submodule)
--- a/ast
+++ b/ast
@@ -1 +1 @@
-Subproject commit 3b2a82bcd3731b0da50eb5f35b20b5e163de04e0
+Subproject commit f4a41d4fa0f480b9fa2753961cb749b2bdfbe989

diff --git a/src/emit/emit.c b/src/emit/emit.c
index d6f656f7f65e473c67c19b6611ed484494a4e7c6..6f6e3e191948b172bccc6bbf37adbc1a07c5ffbd 100644 (file)
--- a/src/emit/emit.c
+++ b/src/emit/emit.c
@@ -661,10 +661,6 @@ ANN static m_uint vararg_size(const Exp_Call* exp_call, const Vector kinds) {
   return size;
 }
 
-ANN static inline m_uint round2szint(const m_uint i) {
-  return ((i + (SZ_INT-1)) & ~(SZ_INT-1));
-}
-
 ANN static void emit_func_arg_vararg(const Emitter emit, const Exp_Call* exp_call) {
   const Instr instr = emit_add_instr(emit, VarargIni);
   const Vector kinds = new_vector(emit->gwion->mp);

diff --git a/src/parse/type_decl.c b/src/parse/type_decl.c
index 5e2e59b754bb0b59ca4468cfba603d7a7add9d79..4b37f0abc98c8cbf218d883b5b5b14ad489db5fe 100644 (file)
--- a/src/parse/type_decl.c
+++ b/src/parse/type_decl.c
@@ -10,9 +10,9 @@
 #include "parse.h"
 
 ANN Type type_decl_resolve(const Env env, const Type_Decl* td) {
-  Type t = find_type(env, td->xid);
-  CHECK_OO(t)
-  CHECK_OO((t = scan_type(env, t, td)))
+  const Type base = find_type(env, td->xid);
+  CHECK_OO(base)
+  const Type t = scan_type(env, base, td);
   return !td->array ? t : array_type(env, t, td->array->depth);
 }
 
@@ -50,7 +50,7 @@ ANN static void td_info_run(const Env env, struct td_info* info) {
 
 ANEW ANN static m_str td2str(const Env env, const Type_Decl* td) {
   m_uint depth = td->array ? td->array->depth : 0;
-  size_t l = id_list_len(td->xid)  + depth * 2;
+  const size_t l = id_list_len(td->xid)  + depth * 2;
   struct td_info info = { td->types, (m_str)xmalloc(l), l, l };
   type_path(info.str, td->xid);
   while(depth--) { td_add(&info, '['); td_add(&info, ']'); }
@@ -71,8 +71,6 @@ ANEW ANN m_str tl2str(const Env env, Type_List tl) {
   return info.str;
 }
 
-#include "vm.h"
-#include "gwion.h"
 ANN static inline void* type_unknown(const Env env, const ID_List id) {
   char path[id_list_len(id)];
   type_path(path, id);

diff --git a/util b/util
index 8e4f2a014ae963341c4ccedb6d994684e52b7122..b6da253a73b2ca3153168b43dc2b3e6b2025361b 160000 (submodule)
--- a/util
+++ b/util
@@ -1 +1 @@
-Subproject commit 8e4f2a014ae963341c4ccedb6d994684e52b7122
+Subproject commit b6da253a73b2ca3153168b43dc2b3e6b2025361b