From 330f0dafb0a0c82168a4c1d60dba4ecea147ff0d Mon Sep 17 00:00:00 2001
From: fennecdjay <astor.jeremie@wanadoo.fr>
Date: Sun, 17 Feb 2019 15:33:16 +0100
Subject: [PATCH] :art: Fix compiler warnings

---
 src/emit/emit.c   | 2 +-
 src/lib/instr.c   | 9 ++++-----
 src/parse/check.c | 6 +++---
 src/parse/scan2.c | 8 ++++----
 src/vm/vm.c       | 3 ++-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/emit/emit.c b/src/emit/emit.c
index e5e5a6ae..3cd48b7e 100644
--- a/src/emit/emit.c
+++ b/src/emit/emit.c
@@ -272,7 +272,7 @@ ANN static m_bool emit_symbol_builtin(const Emitter emit, const Exp_Primary* pri
     } else if(v->d.ptr)
       memcpy(&instr->m_val, v->d.ptr, v->type->size);
     else
-      instr->m_val = v->d.ptr;
+      instr->m_val = (m_uint)v->d.ptr;
     instr->m_val2 = size;
   }
   return GW_OK;
diff --git a/src/lib/instr.c b/src/lib/instr.c
index 04f70ac0..7f111921 100644
--- a/src/lib/instr.c
+++ b/src/lib/instr.c
@@ -117,14 +117,13 @@ INSTR(DotTmpl) {
     char str[instr->m_val2 + strlen(t->name) + 1];
     strcpy(str, name);
     strcpy(str + instr->m_val2, t->name);
-    const Value value = nspc_lookup_value1(t->nspc, insert_symbol(str));
     const Func f = nspc_lookup_func1(t->nspc, insert_symbol(str));
     if(f) {
       if(!f->code) {
-      const Emitter emit = shred->info->vm->gwion->emit;
-emit->env->name = "runtime";
-  const Value v = f->value_ref;
-m_str start = strchr(name, '<');
+        const Emitter emit = shred->info->vm->gwion->emit;
+        emit->env->name = "runtime";
+        const Value v = f->value_ref;
+        m_str start = strchr(name, '<');
 m_str end = strchr(name, '@');
 char c[instr->m_val2];
 strcpy(c, start + 1);
diff --git a/src/parse/check.c b/src/parse/check.c
index fc809229..b6ef1b57 100644
--- a/src/parse/check.c
+++ b/src/parse/check.c
@@ -442,9 +442,9 @@ ANN Func find_template_match(const Env env, const Value value, const Exp_Call* e
    Value v = nspc_lookup_value1(t->nspc, value->d.func_ref->def->name);
    if(!v)
      goto next;
-     const Func f = _find_template_match(env, v, exp);
-     if(f)
-       return f;
+   const Func f = _find_template_match(env, v, exp);
+   if(f)
+     return f;
    next:
      t = t->parent;
   }
diff --git a/src/parse/scan2.c b/src/parse/scan2.c
index 05753c15..7ab64c34 100644
--- a/src/parse/scan2.c
+++ b/src/parse/scan2.c
@@ -494,10 +494,10 @@ ANN m_bool scan2_func_def(const Env env, const Func_Def f) { GWDEBUG_EXE
     const Symbol sym  = func_symbol(env->curr->name, func_name, NULL, overload ? ++overload->offset : 0);
     func_name = s_name(sym);
   } else {
-if(f->func)
-  func_name = f->func->name;
-else
-    func_name = func_tmpl_name(env, f);
+    if(f->func)
+      func_name = f->func->name;
+    else
+      func_name = func_tmpl_name(env, f);
     const Func func = nspc_lookup_func1(env->curr, insert_symbol(func_name));
     if(func) {
       f->ret_type = type_decl_resolve(env, f->td);
diff --git a/src/vm/vm.c b/src/vm/vm.c
index c43f0fc8..ec67d591 100644
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -19,6 +19,7 @@
 #include "map_private.h"
 
 #include "value.h"
+#include "gack.h"
 
 
 static inline uint64_t splitmix64_stateless(uint64_t index) {
@@ -309,7 +310,7 @@ regpushother:
   reg += instr->m_val2;
   DISPATCH();
 regpushaddr:
-  *(m_bit**)reg =  &instr->m_val;
+  *(m_uint**)reg =  &instr->m_val;
   reg += SZ_INT;
   DISPATCH()
 regpushmem:
-- 
2.43.0