:art: Clean headers

diff --git a/include/specialid.h b/include/specialid.h
index 4a1daee97c9253fd0c1b0ba601449c57790f8a9f..ebb7e1407b74070ff061e4307ab4bfe026afb102 100644 (file)
--- a/include/specialid.h
+++ b/include/specialid.h
@@ -3,7 +3,7 @@
 
 struct SpecialId_;
 typedef Type (*idck)(const Env, const Exp_Primary*);
-typedef Instr (*idem)(const Emitter, const Exp_Primary*);
+typedef struct Instr_* (*idem)(const Emitter, const Exp_Primary*);
 
 struct SpecialId_ {
   Type type;
@@ -24,10 +24,5 @@ ANN static inline Type specialid_type(const Env env,
   return spid->ck ? spid->ck(env, prim) : spid->type;
 }
 
-ANN static inline Instr specialid_instr(const Emitter emit,
-    struct SpecialId_ *spid, const Exp_Primary* prim) {
-  return spid->exec ? emit_add_instr(emit, spid->exec) : spid->em(emit, prim);
-}
-
 ANN struct SpecialId_* specialid_get(const Gwion, const Symbol);
 #endif

diff --git a/src/emit/emit.c b/src/emit/emit.c
index 17d18020481111a582705ad1469954851aa47f64..2792173156ac2dd96e1a629820358aac02f23b1e 100644 (file)
--- a/src/emit/emit.c
+++ b/src/emit/emit.c
@@ -465,6 +465,11 @@ ANN static m_bool emit_exp_slice(const Emitter emit, const Exp_Slice* range) {
   return GW_OK;
 }
 
+ANN static inline Instr specialid_instr(const Emitter emit,
+    struct SpecialId_ *spid, const Exp_Primary* prim) {
+  return spid->exec ? emit_add_instr(emit, spid->exec) : spid->em(emit, prim);
+}
+
 ANN static m_bool emit_prim_id(const Emitter emit, const Symbol *data) {
   struct SpecialId_ * spid = specialid_get(emit->gwion, *data);
   if(spid)

diff --git a/src/parse/check.c b/src/parse/check.c
index bf1c580c73cd2decdaf778f9905f96d81110d82f..3620034191097919733bf3e7077d3fa0c388ac7a 100644 (file)
--- a/src/parse/check.c
+++ b/src/parse/check.c
@@ -11,7 +11,6 @@
 #include "import.h"
 #include "parse.h"
 #include "match.h"
-#include "emit.h"
 #include "specialid.h"
 #include "tmp_resolve.h"