Revert ":art: Remove pos from Implicit"

This reverts commit a33aea9e0ea755c26be653f0cf840a39861a2818.

diff --git a/include/operator.h b/include/operator.h
index 0e3f95002fa37e6851e1e90696ef879cbf33c1fc..309693378197cfd0ff1d912fb53ef611dc090f04 100644 (file)
--- a/include/operator.h
+++ b/include/operator.h
@@ -25,6 +25,7 @@ struct Op_Import {
 struct Implicit {
   Exp e;
   Type  t;
+  loc_t pos;
 };
 ANN m_bool add_op(const Gwion gwion, const struct Op_Import*);
 ANN Type   op_check(const Env, struct Op_Import*);

diff --git a/src/emit/emit.c b/src/emit/emit.c
index 90022be6c1b16b02822a20e14930d5894bafcd6d..7f8aabf7074e67ae4a8599dab9b21c38a409ab53 100644 (file)
--- a/src/emit/emit.c
+++ b/src/emit/emit.c
@@ -1102,7 +1102,7 @@ ANN static m_bool emit_exp_unary(const Emitter emit, const Exp_Unary* unary) {
 
 ANN static m_bool emit_implicit_cast(const Emitter emit,
     const restrict Exp  from, const restrict Type to) {
-  const struct Implicit imp = { .e=from, .t=to };
+  const struct Implicit imp = { from, to, from->pos };
   struct Op_Import opi = { .op=insert_symbol("@implicit"), .lhs=from->type, .rhs=to, .data=(m_uint)&imp };
   return op_emit_bool(emit, &opi);
 }

diff --git a/src/parse/check.c b/src/parse/check.c
index ceda1a8db7885a00fcb41f02640176803b93887b..d6e94243e2e78b93ba7f71d98ff2b80606d2433a 100644 (file)
--- a/src/parse/check.c
+++ b/src/parse/check.c
@@ -30,7 +30,7 @@ ANN m_bool check_class_def(const Env env, const Class_Def class_def);
 
 ANN static m_bool _check_implicit(const Env env, const m_str str,
       const Exp e, const Type t) {
-  struct Implicit imp = { .e=e, .t=t };
+  struct Implicit imp = { .e=e, .t=t, .pos=e->pos };
   struct Op_Import opi = { .op=insert_symbol(str), .lhs=e->type,
         .rhs=t, .data=(uintptr_t)&imp, .pos=e->pos };
   CHECK_OB(op_check(env, &opi))
@@ -40,7 +40,7 @@ ANN static m_bool _check_implicit(const Env env, const m_str str,
 
 ANN static m_bool check_internal(const Env env, const Symbol sym,
       const Exp e, const Type t) {
-  struct Implicit imp = { .e=e, .t=t };
+  struct Implicit imp = { .e=e, .t=t, .pos=e->pos };
   struct Op_Import opi = { .op=sym, .lhs=e->type,
         .rhs=t, .data=(uintptr_t)&imp, .pos=e->pos };
   CHECK_OB(op_check(env, &opi))