:shirt: Clean headers (use gwion_env.h)

diff --git a/include/context.h b/include/env/context.h
similarity index 100%
rename from include/context.h
rename to include/env/context.h

diff --git a/include/env.h b/include/env/env.h
similarity index 100%
rename from include/env.h
rename to include/env/env.h

diff --git a/include/func.h b/include/env/func.h
similarity index 100%
rename from include/func.h
rename to include/env/func.h

diff --git a/include/nspc.h b/include/env/nspc.h
similarity index 100%
rename from include/nspc.h
rename to include/env/nspc.h

diff --git a/include/oo.h b/include/env/oo.h
similarity index 100%
rename from include/oo.h
rename to include/env/oo.h

diff --git a/include/type.h b/include/env/type.h
similarity index 100%
rename from include/type.h
rename to include/env/type.h

diff --git a/include/value.h b/include/env/value.h
similarity index 100%
rename from include/value.h
rename to include/env/value.h

diff --git a/include/gwion_env.h b/include/gwion_env.h
new file mode 100644 (file)
index 0000000..c6b9527
--- /dev/null
+++ b/include/gwion_env.h
@@ -0,0 +1,12 @@
+#ifndef __GWION_ENV
+#define __GWION_ENV
+
+#include "env/oo.h"
+#include "env/nspc.h"
+#include "env/env.h"
+
+#include "env/value.h"
+#include "env/type.h"
+#include "env/func.h"
+#include "env/context.h"
+#endif

diff --git a/include/parse.h b/include/parse.h
index a37ff5c899f774a699715483963be8ca21ee0265..4cbf523bc20d68874b74440e4b4fc8400508a005 100644 (file)
--- a/include/parse.h
+++ b/include/parse.h
@@ -27,6 +27,18 @@ else if(GET_FLAG(a, protect)) \
 typedef m_bool (*_exp_func)(const void*, const void*);
 static inline m_bool dummy_func(const void*a NUSED,
   const void*b NUSED) { return 1; }
+
+#define DECL_PRIM_FUNC(prefix)                                              \
+static const _exp_func prim_func[] = {                                      \
+  (_exp_func)prefix##__primary_id,      (_exp_func)prefix##__primary_num,   \
+  (_exp_func)prefix##__primary_float,   (_exp_func)prefix##__primary_str,   \
+  (_exp_func)prefix##__primary_array,   (_exp_func)prefix##__primary_hack,  \
+  (_exp_func)prefix##__primary_complex, (_exp_func)prefix##__primary_polar, \
+  (_exp_func)prefix##__primary_vec,     (_exp_func)prefix##__primary_tuple, \
+  (_exp_func)prefix##__primary_unpack,  (_exp_func)prefix##__primary_char,  \
+  (_exp_func)prefix##__primary_nil                                          \
+}
+
 #define DECL_EXP_FUNC(prefix)                                                                     \
 static const _exp_func exp_func[] = {                                                             \
   (_exp_func)prefix##_exp_decl,    (_exp_func)prefix##_exp_binary, (_exp_func)prefix##_exp_unary, \
@@ -35,6 +47,17 @@ static const _exp_func exp_func[] = {
   (_exp_func)prefix##_exp_dot,     (_exp_func)prefix##_exp_lambda, (_exp_func)prefix##_exp_typeof \
 };
 
+#define DECL_STMT_FUNC(prefix)                                          \
+static const _exp_func stmt_func[] = {                                  \
+  (_exp_func)prefix##__stmt_exp,    (_exp_func)prefix##__stmt_while,    \
+  (_exp_func)prefix##__stmt_until,  (_exp_func)prefix##__stmt_for,      \
+  (_exp_func)prefix##__stmt_auto,   (_exp_func)prefix##__stmt_loop,     \
+  (_exp_func)prefix##__stmt_if,     (_exp_func)prefix##__stmt_code,     \
+  (_exp_func)prefix##__stmt_break,  (_exp_func)prefix##__stmt_continue, \
+  (_exp_func)prefix##__stmt_return, (_exp_func)prefix##__stmt_match,    \
+  (_exp_func)prefix##__stmt_jump,                                       \
+};
+
 #define DECL_SECTION_FUNC(prefix)                                                                 \
 static const _exp_func section_func[] = {                                                         \
   (_exp_func)prefix##_stmt_list, (_exp_func)prefix##_func_def, (_exp_func)prefix##_class_def,     \

diff --git a/src/arg.c b/src/arg.c
index 2c6e48ed15efebe2ddcfcdafda53719accb9cc99..d22587e6d02b5b0c3bf86e64d565acb4bc4d56fb 100644 (file)
--- a/src/arg.c
+++ b/src/arg.c
@@ -1,9 +1,7 @@
-#include <string.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
+#include "gwion_env.h"
 #include "soundinfo.h"
-#include "oo.h"
-#include "env.h"
 #include "vm.h"
 #include "gwion.h"
 #include "arg.h"

diff --git a/src/compile.c b/src/compile.c
index 991761f1b16dbaad729da82d4ab844af96ad8901..c1947b90f22db8bbc0a0318ae1de015f2975a1ba 100644 (file)
--- a/src/compile.c
+++ b/src/compile.c
@@ -1,13 +1,8 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
 #include "instr.h"
-#include "type.h"
 #include "emit.h"
 #include "compile.h"
 #include "gwion.h"

diff --git a/src/emit/emit.c b/src/emit/emit.c
index f9319a8d2a13237debb08f57280117d065a87c92..ca90a3dfb4037ba364673e12fc38644f4eaee5da 100644 (file)
--- a/src/emit/emit.c
+++ b/src/emit/emit.c
@@ -1,19 +1,12 @@
-#include <stdlib.h>
-#include <string.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
 #include "gwion.h"
-#include "type.h"
-#include "nspc.h"
-#include "value.h"
 #include "instr.h"
 #include "emit.h"
 #include "object.h"
 #include "array.h"
-#include "func.h"
 #include "traverse.h"
 #include "template.h"
 #include "escape.h"

diff --git a/src/emit/emitter.c b/src/emit/emitter.c
index d5c19dd8904b4835c1ea0f55df20df3772d5a9ab..2527bf4c7830dcbfe312caacd8dad93ca96cb74a 100644 (file)
--- a/src/emit/emitter.c
+++ b/src/emit/emitter.c
@@ -1,12 +1,8 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
 #include "gwion.h"
-#include "type.h"
-#include "nspc.h"
-#include "value.h"
 #include "instr.h"
 #include "emit.h"
 #include "escape.h"

diff --git a/src/emit/escape.c b/src/emit/escape.c
index e0c7ca47297e241c7724b4a29270bc9321de13e1..3bef0a789203632b20efa4cec4cbe087e31e3a80 100644 (file)
--- a/src/emit/escape.c
+++ b/src/emit/escape.c
@@ -1,7 +1,6 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
+#include "gwion_env.h"
 #include "vm.h"
 #include "instr.h"
 #include "emit.h"

diff --git a/src/emit/memoize.c b/src/emit/memoize.c
index 4e80f2b090289b33499468221948c96051d0caba..30ac5e33d50efdd8eff816c5cd8fdb778185a692 100644 (file)
--- a/src/emit/memoize.c
+++ b/src/emit/memoize.c
@@ -1,14 +1,10 @@
-#include <string.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
+#include "gwion_env.h"
 #include "vm.h"
 #include "instr.h"
 #include "emit.h"
 #include "gwion.h"
-#include "type.h"
-#include "func.h"
 #include "memoize.h"
 
 struct Memoize_ {

diff --git a/src/gwion.c b/src/gwion.c
index 088bd3a5b63b94b39ae162503cf0a5df2f0095a6..7f64b80c9f12015350fb6b663592f1cf7b3bf69c 100644 (file)
--- a/src/gwion.c
+++ b/src/gwion.c
@@ -1,13 +1,7 @@
-#include <string.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "context.h"
-#include "type.h"
-#include "func.h"
-#include "value.h"
 #include "instr.h"
 #include "emit.h"
 #include "engine.h"

diff --git a/src/gwiondata.c b/src/gwiondata.c
index a8dc8468a2ad4c63392470d8748bcc1326291039..9c5e0435a41066d9e503c56bd6825c78622b527a 100644 (file)
--- a/src/gwiondata.c
+++ b/src/gwiondata.c
@@ -1,8 +1,7 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
+#include "gwion_env.h"
 #include "gwiondata.h"
-#include "oo.h"
-#include "env.h"
 #include "vm.h"
 #include "instr.h"
 #include "gwion.h"

diff --git a/src/import/cdef.c b/src/import/cdef.c
index c2d235ae150657268c4211d07ea723b81dfcd739..abf8d2ec0e1bd224743e9affdd7c1f8b4fd5f0bb 100644 (file)
--- a/src/import/cdef.c
+++ b/src/import/cdef.c
@@ -3,17 +3,12 @@
 #include <ctype.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
-#include "value.h"
 #include "traverse.h"
 #include "instr.h"
 #include "object.h"
 #include "emit.h"
-#include "func.h"
-#include "nspc.h"
 #include "gwion.h"
 #include "operator.h"
 #include "import.h"

diff --git a/src/import/checker.c b/src/import/checker.c
index c588538e02254f7e79a8eb5cfd0d94fd4de3bd69..be695536b52d1dd93357f524894d44b4f2b75701 100644 (file)
--- a/src/import/checker.c
+++ b/src/import/checker.c
@@ -4,17 +4,12 @@
 #include <ctype.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
-#include "value.h"
 #include "traverse.h"
 #include "instr.h"
 #include "object.h"
 #include "emit.h"
-#include "func.h"
-#include "nspc.h"
 #include "gwion.h"
 #include "operator.h"
 #include "import.h"

diff --git a/src/import/enum.c b/src/import/enum.c
index bce6e62c6fdb9137cf26eaa716e2332b43ab373d..7fa751180974e5ab52b8f24d492cec2d3d3fb823 100644 (file)
--- a/src/import/enum.c
+++ b/src/import/enum.c
@@ -3,17 +3,12 @@
 
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
-#include "value.h"
 #include "traverse.h"
 #include "instr.h"
 #include "object.h"
 #include "emit.h"
-#include "func.h"
-#include "nspc.h"
 #include "gwion.h"
 #include "operator.h"
 #include "import.h"

diff --git a/src/import/fdef.c b/src/import/fdef.c
index 94c65b961d34a83dac8be9ff3d84d8029aee836e..221ace4f243615155578c497c3b50f234b637158 100644 (file)
--- a/src/import/fdef.c
+++ b/src/import/fdef.c
@@ -3,17 +3,12 @@
 #include <ctype.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
-#include "value.h"
 #include "traverse.h"
-#include "instr.h"
 #include "object.h"
+#include "instr.h"
 #include "emit.h"
-#include "func.h"
-#include "nspc.h"
 #include "gwion.h"
 #include "operator.h"
 #include "import.h"

diff --git a/src/import/internals.c b/src/import/internals.c
index ea13b36875bde5278ebdf65741dbc63f4768c084..476c2848e5a249f1238ac97a2825d6561040f763 100644 (file)
--- a/src/import/internals.c
+++ b/src/import/internals.c
@@ -1,10 +1,7 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
-#include "value.h"
 #include "traverse.h"
 #include "instr.h"
 #include "object.h"

diff --git a/src/import/item.c b/src/import/item.c
index 23137bfc198d77d3f75bb87d54e0492d0fbdc8ea..c623f4212e00e496d64ca349e6e09cc27004fb82 100644 (file)
--- a/src/import/item.c
+++ b/src/import/item.c
@@ -1,10 +1,7 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
-#include "value.h"
 #include "traverse.h"
 #include "instr.h"
 #include "object.h"

diff --git a/src/import/oper.c b/src/import/oper.c
index 548355649ccfd3af23d481a199e59442356d40e0..b95717088d3df87bb3b5e6c308c76b5a073f162a 100644 (file)
--- a/src/import/oper.c
+++ b/src/import/oper.c
@@ -3,17 +3,12 @@
 #include <ctype.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
-#include "value.h"
 #include "traverse.h"
 #include "instr.h"
 #include "object.h"
 #include "emit.h"
-#include "func.h"
-#include "nspc.h"
 #include "gwion.h"
 #include "operator.h"
 #include "import.h"

diff --git a/src/import/special.c b/src/import/special.c
index 85d46b5c8997a4823b8dc0562466bccedb62ef7b..4a7be1402c2fe2c6ce3fb6bddae8da15f7bc80c2 100644 (file)
--- a/src/import/special.c
+++ b/src/import/special.c
@@ -3,17 +3,12 @@
 #include <ctype.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
-#include "value.h"
 #include "traverse.h"
 #include "instr.h"
 #include "object.h"
 #include "emit.h"
-#include "func.h"
-#include "nspc.h"
 #include "gwion.h"
 #include "operator.h"
 #include "import.h"

diff --git a/src/import/tdef.c b/src/import/tdef.c
index 29a19d98e3eadf1790a2d7665961d35543abb49e..d1f9a79869831aafe97d0788423e7b835081ae16 100644 (file)
--- a/src/import/tdef.c
+++ b/src/import/tdef.c
@@ -3,17 +3,12 @@
 #include <ctype.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
-#include "value.h"
 #include "traverse.h"
 #include "instr.h"
 #include "object.h"
 #include "emit.h"
-#include "func.h"
-#include "nspc.h"
 #include "gwion.h"
 #include "operator.h"
 #include "import.h"

diff --git a/src/import/type.c b/src/import/type.c
index 68b4f03ca8213cf3174092deadc986f448628b14..af6e68e0cff4165723809ac9281751f4b457d805 100644 (file)
--- a/src/import/type.c
+++ b/src/import/type.c
@@ -3,17 +3,12 @@
 #include <ctype.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
-#include "value.h"
 #include "traverse.h"
 #include "instr.h"
 #include "object.h"
 #include "emit.h"
-#include "func.h"
-#include "nspc.h"
 #include "gwion.h"
 #include "operator.h"
 #include "import.h"

diff --git a/src/import/udef.c b/src/import/udef.c
index 7a93bdcb7c99e8331a6b151e9eb8a931f1718915..2b052f624b9f5faadcb7e743e56cd946226349fc 100644 (file)
--- a/src/import/udef.c
+++ b/src/import/udef.c
@@ -3,17 +3,12 @@
 #include <ctype.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
-#include "value.h"
 #include "traverse.h"
 #include "instr.h"
 #include "object.h"
 #include "emit.h"
-#include "func.h"
-#include "nspc.h"
 #include "gwion.h"
 #include "operator.h"
 #include "import.h"

diff --git a/src/lib/array.c b/src/lib/array.c
index bd350c26e37ae8ef5c3cbd3c8280864a6a41829f..cbcc5ac22411f1f911bf28e27ef0f7282124d210 100644 (file)
--- a/src/lib/array.c
+++ b/src/lib/array.c
@@ -2,16 +2,13 @@
 #include <string.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
 #include "gwion.h"
-#include "type.h"
 #include "instr.h"
 #include "object.h"
 #include "array.h"
 #include "emit.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "traverse.h"

diff --git a/src/lib/complex.c b/src/lib/complex.c
index e2efac55acd1b5beac3f75de7bbb13b4963bd2f0..41a83747170f7913e677c933b2664945721a9c77 100644 (file)
--- a/src/lib/complex.c
+++ b/src/lib/complex.c
@@ -1,14 +1,11 @@
 #include <complex.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "instr.h"
 #include "object.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/src/lib/engine.c b/src/lib/engine.c
index 63ac4f4099330378596ec4c52866446e22a40d46..75a7ba31e8a2548c9c1c56349623f02bf6d23283 100644 (file)
--- a/src/lib/engine.c
+++ b/src/lib/engine.c
@@ -1,18 +1,13 @@
 #include <string.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
 #include "instr.h"
-#include "nspc.h"
-#include "type.h"
 #include "object.h"
 #include "emit.h"
-#include "env.h"
 #include "vm.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"

diff --git a/src/lib/event.c b/src/lib/event.c
index f6a5bd0ba180127f63c178fe0aa372215c4519b2..1e90b1de246013f8aeb82ca5d3f607daf7369cae 100644 (file)
--- a/src/lib/event.c
+++ b/src/lib/event.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
 #include "gwion.h"
-#include "type.h"
 #include "instr.h"
 #include "object.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"

diff --git a/src/lib/func.c b/src/lib/func.c
index 4c36b831ac60f190155068c75de832deb734d067..3130b193d5e236d4d284c72fda7e677983638971 100644 (file)
--- a/src/lib/func.c
+++ b/src/lib/func.c
@@ -1,17 +1,12 @@
 #include <string.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
 #include "gwion.h"
-#include "type.h"
-#include "value.h"
-#include "func.h"
 #include "instr.h"
 #include "emit.h"
 #include "object.h"
-#include "nspc.h"
 #include "operator.h"
 #include "import.h"
 #include "traverse.h"

diff --git a/src/lib/gack.c b/src/lib/gack.c
index 9b0d3620cde8b4e156608524a9eb3323ebb91dbd..dedcf095c41d13b1cb77ed4084badb87ad5f6ed4 100644 (file)
--- a/src/lib/gack.c
+++ b/src/lib/gack.c
@@ -3,15 +3,11 @@
 #include <complex.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
-#include "func.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gack.h"

diff --git a/src/lib/instr.c b/src/lib/instr.c
index ffeb0c2f17809386df23470f873b92065f7b2181..4b64d823fc0c974093482cb37630959ea4c9acc8 100644 (file)
--- a/src/lib/instr.c
+++ b/src/lib/instr.c
@@ -2,20 +2,17 @@
 #include <string.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "instr.h"
 #include "object.h"
-#include "func.h"
 #include "array.h"
-#include "nspc.h"
 #include "shreduler_private.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
+#include "emit.h"
+#include "template.h"
 
 INSTR(DTOR_EOC) {
   const M_Object o = *(M_Object*)MEM(0);
@@ -25,11 +22,6 @@ INSTR(DTOR_EOC) {
   vm_shred_exit(shred);
 }
 
-#include "gwion.h"
-#include "emit.h"
-#include "value.h"
-#include "template.h"
-
 INSTR(PopArrayClass) {
   POP_REG(shred, SZ_INT);
   const M_Object obj = *(M_Object*)REG(-SZ_INT);

diff --git a/src/lib/modules.c b/src/lib/modules.c
index 932c9172425f0420b7271f1634014dcf111cc38a..48508e630cd5105785113b26fcd62f85398b6888 100644 (file)
--- a/src/lib/modules.c
+++ b/src/lib/modules.c
@@ -2,18 +2,14 @@
 #include <math.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
+#include "gwion_env.h"
 #include "vm.h"
 #include "gwion.h"
-#include "type.h"
 #include "instr.h"
 #include "object.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "ugen.h"
-#include "func.h"
 #include "gwi.h"
 
 static DTOR(basic_dtor) {

diff --git a/src/lib/object.c b/src/lib/object.c
index 7457d6bef97cc5f3f4ea0814f1686f122613e348..d5d0b5ffc4b8259a9038abcf158ad961f8271e0a 100644 (file)
--- a/src/lib/object.c
+++ b/src/lib/object.c
@@ -2,13 +2,9 @@
 #include <string.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
 #include "gwion.h"
-#include "type.h"
-#include "nspc.h"
-#include "value.h"
 #include "instr.h"
 #include "object.h"
 #include "operator.h"
@@ -16,7 +12,6 @@
 #include "emit.h"
 #include "traverse.h"
 #include "parse.h"
-#include "func.h"
 #include "specialid.h"
 
 #include "gwi.h"

diff --git a/src/lib/opfunc.c b/src/lib/opfunc.c
index 0b6045c726318f8d9904ce3168e87e122f3c9905..d5e72a101f7f7cf184e281a653923ae3eddc66ef 100644 (file)
--- a/src/lib/opfunc.c
+++ b/src/lib/opfunc.c
@@ -1,10 +1,7 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
-#include "value.h"
 #include "instr.h"
 #include "object.h"
 #include "emit.h"

diff --git a/src/lib/prim.c b/src/lib/prim.c
index eaf7dbb03b65c9b50cdc82aaad7d3046604230a6..7a80bbca19c6c18397c30fe61211c4addd1cb0b3 100644 (file)
--- a/src/lib/prim.c
+++ b/src/lib/prim.c
@@ -1,14 +1,11 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
 #include "gwion.h"
-#include "type.h"
 #include "instr.h"
 #include "object.h"
 #include "emit.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"

diff --git a/src/lib/ptr.c b/src/lib/ptr.c
index e26911c69caeaa774696529afd616ca838f5cd87..3a82cb25c56610a496dff187c29f9680b9642361 100644 (file)
--- a/src/lib/ptr.c
+++ b/src/lib/ptr.c
@@ -2,15 +2,11 @@
 #include <string.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
 #include "gwion.h"
-#include "type.h"
-#include "nspc.h"
 #include "instr.h"
 #include "object.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "emit.h"

diff --git a/src/lib/shred.c b/src/lib/shred.c
index 85d4e8c136748990b84c9d86115faed9f30536db..7110732bf7d423feafc9fc3fe74695efcd8ffac3 100644 (file)
--- a/src/lib/shred.c
+++ b/src/lib/shred.c
@@ -1,16 +1,12 @@
-#include <string.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
+#include "gwion_env.h"
 #include "gwion_thread.h"
-#include "oo.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "instr.h"
 #include "object.h"
 #include "shreduler_private.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "emit.h"
@@ -236,7 +232,7 @@ ANN void fork_clean(const VM_Shred shred, const Vector v) {
   }
   vector_release(v);
 }
-#include "nspc.h"
+
 GWION_IMPORT(shred) {
   const Type t_shred = gwi_class_ini(gwi,  "Shred", NULL);
   gwi_class_xtor(gwi, NULL, shred_dtor);

diff --git a/src/lib/string.c b/src/lib/string.c
index f7229f172ad10773f924338d5a7ab60514a90351..c51a02ae9cc9a3005b401d92c047a15b8065e458 100644 (file)
--- a/src/lib/string.c
+++ b/src/lib/string.c
@@ -4,19 +4,15 @@
 #include <math.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "instr.h"
 #include "object.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "emit.h"
 #include "specialid.h"
-#include "func.h"
 #include "gwi.h"
 
 ANN static void push_string(const VM_Shred shred, const M_Object obj, const m_str c) {

diff --git a/src/lib/tuple.c b/src/lib/tuple.c
index 120cd231392fdcbb93181d26f1869ddb6e872586..22ab761e0ed232f19b0278077801aab82c67fe07 100644 (file)
--- a/src/lib/tuple.c
+++ b/src/lib/tuple.c
@@ -1,22 +1,16 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
 #include "instr.h"
-#include "nspc.h"
-#include "type.h"
 #include "object.h"
 #include "emit.h"
-#include "env.h"
 #include "vm.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"
 #include "traverse.h"
-#include "value.h"
 #include "object.h"
 #include "parse.h"
 #include "tuple.h"

diff --git a/src/lib/ugen.c b/src/lib/ugen.c
index ffd2f1003b2ddd4d1c4da6e2fac00ab794616824..3c44d32b22d7a19ca6505699fd87fd74ff20dea3 100644 (file)
--- a/src/lib/ugen.c
+++ b/src/lib/ugen.c
@@ -1,14 +1,10 @@
-#include <stdlib.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
+#include "gwion_env.h"
 #include "vm.h"
 #include "gwion.h"
-#include "type.h"
-#include "instr.h"
 #include "object.h"
-#include "value.h"
+#include "instr.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"

diff --git a/src/lib/vararg.c b/src/lib/vararg.c
index 49f674493b0c542b7b4db043ae1c5953f2e7b04a..ba52aa5c9900411524d26d91068682ccef5935af 100644 (file)
--- a/src/lib/vararg.c
+++ b/src/lib/vararg.c
@@ -1,24 +1,18 @@
-#include <stdlib.h>
-#include <string.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "instr.h"
 #include "emit.h"
 #include "object.h"
 #include "vararg.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"
 #include "specialid.h"
 #include "traverse.h"
 #include "parse.h"
-#include "func.h"
 
 void free_vararg(MemPool p, struct Vararg_* arg) {
   xfree(arg->d);

diff --git a/src/lib/vec.c b/src/lib/vec.c
index 4ac56f667ab82e53c0937558063f379b96ab8e0c..e1a25bcbef6979f28ad4d276b59443bdf38b1251 100644 (file)
--- a/src/lib/vec.c
+++ b/src/lib/vec.c
@@ -1,13 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "instr.h"
 #include "object.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "driver.h"

diff --git a/src/main.c b/src/main.c
index 281e6a2a30460ea5360232078dd7436632930db3..eb630d987b2fd16cbf224687fcf588869b2ffb03 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,9 +1,8 @@
 #include <signal.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
 #include "gwion.h"
 #include "arg.h"
 

diff --git a/src/oo/context.c b/src/oo/context.c
index 555dc4fd5811850ff8e1bcdafe8d073432c41cbe..6cf65e9001885474932b70a2597f5e45dba513ae 100644 (file)
--- a/src/oo/context.c
+++ b/src/oo/context.c
@@ -1,13 +1,8 @@
-#include <stdlib.h>
-#include <string.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
-#include "nspc.h"
+#include "gwion_env.h"
 #include "vm.h"
 #include "gwion.h"
-#include "context.h"
 
 ANN static void free_context(const Context a, Gwion gwion) {
   REM_REF(a->nspc, gwion)

diff --git a/src/oo/env.c b/src/oo/env.c
index 1ca4259033a340c30dde92030df7bc53ecc210fc..cbcefeb71cb05762339148d409447433bed5b72f 100644 (file)
--- a/src/oo/env.c
+++ b/src/oo/env.c
@@ -1,18 +1,10 @@
-#include <stdlib.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
-#include "value.h"
 #include "traverse.h"
-#include "type.h"
-#include "context.h"
-#include "nspc.h"
-#include "mpool.h"
 #include "vm.h"
 #include "parse.h"
 

diff --git a/src/oo/env_utils.c b/src/oo/env_utils.c
index 7bec6eb5dbae0c09307a39749c379cb0ef7d0673..fcadeb4013bc33a2e816509aa932b4526641e3df 100644 (file)
--- a/src/oo/env_utils.c
+++ b/src/oo/env_utils.c
@@ -1,13 +1,7 @@
-#include <stdlib.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
-#include "value.h"
+#include "gwion_env.h"
 #include "traverse.h"
-#include "type.h"
-#include "context.h"
-#include "nspc.h"
 #include "vm.h"
 #include "parse.h"
 

diff --git a/src/oo/nspc.c b/src/oo/nspc.c
index 2dde7770342e8c8b4dc789a9c718425157601278..54d0f3607702b73a33b7dcc356574a23a7d29e09 100644 (file)
--- a/src/oo/nspc.c
+++ b/src/oo/nspc.c
@@ -1,13 +1,7 @@
-#include <stdlib.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
-#include "nspc.h"
-#include "value.h"
-#include "func.h"
 #include "object.h"
 #include "gwion.h"
 #include "operator.h"

diff --git a/src/oo/type.c b/src/oo/type.c
index b02966c5cbcbe0b43c6bb4adc8ee93ba91cf9a86..5cd0d2bfa6757afa19709bd1579b2a83e970bba8 100644 (file)
--- a/src/oo/type.c
+++ b/src/oo/type.c
@@ -1,16 +1,11 @@
-#include <string.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
-#include "type.h"
-#include "nspc.h"
+#include "gwion_env.h"
 #include "vm.h"
 #include "traverse.h"
 #include "parse.h"
 #include "gwion.h"
 #include "tuple.h"
-#include "context.h"
 
 ANN static void free_type(Type a, Gwion gwion) {
   if(GET_FLAG(a, template) || GET_FLAG(a, global)) {

diff --git a/src/oo/value.c b/src/oo/value.c
index 9007e86c109139c9bf5bfe5a004c7e4d9a658f5c..13cfdd6cc2b5c8a2990511b1611a1d6e58554a15 100644 (file)
--- a/src/oo/value.c
+++ b/src/oo/value.c
@@ -1,12 +1,8 @@
-#include <stdlib.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
+#include "gwion_env.h"
 #include "vm.h"
 #include "gwion.h"
-#include "value.h"
-#include "type.h"
 
 ANN static void free_value(Value a, Gwion gwion) {
   const Type t = a->type;

diff --git a/src/parse/check.c b/src/parse/check.c
index ee100fc65d64d1834d18e84a3e64d1454a4d2169..e3df1ea93a66b3eb59ae998cb1091fce7550e9d6 100644 (file)
--- a/src/parse/check.c
+++ b/src/parse/check.c
@@ -1,12 +1,7 @@
-#include <string.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
-#include "value.h"
-#include "func.h"
 #include "instr.h"
 #include "object.h"
 #include "traverse.h"
@@ -15,12 +10,10 @@
 #include "operator.h"
 #include "import.h"
 #include "parse.h"
-#include "nspc.h"
 #include "match.h"
 #include "tuple.h"
 #include "emit.h"
 #include "specialid.h"
-#include "context.h"
 
 ANN static Type   check_exp(const Env env, Exp exp);
 ANN static m_bool check_stmt_list(const Env env, Stmt_List list);

diff --git a/src/parse/did_you_mean.c b/src/parse/did_you_mean.c
index e06b7a812db5cf8b7349a06c55f5ae70d025d375..83e81bbba581fd3a4530cbb02a2854d64f704843 100644 (file)
--- a/src/parse/did_you_mean.c
+++ b/src/parse/did_you_mean.c
@@ -1,13 +1,6 @@
-//#include <stdlib.h>
-#include <string.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
-#include "nspc.h"
-#include "value.h"
-#include "env.h"
-#include "type.h"
+#include "gwion_env.h"
 
 #ifdef min
 #undef min

diff --git a/src/parse/func.c b/src/parse/func.c
index 1e42b9c23aea2a1b1908d06a3c368eafc44dcba6..3bc7c7dc3a2f9c7df32398d8ddbdbfc692fea541 100644 (file)
--- a/src/parse/func.c
+++ b/src/parse/func.c
@@ -1,14 +1,8 @@
-#include <stdlib.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
 #include "gwion.h"
-#include "type.h"
-#include "nspc.h"
-#include "func.h"
-#include "value.h"
 
 ANN static void free_func(Func a, Gwion gwion) {
   if(GET_FLAG(a, template) && !GET_FLAG(a, builtin)/* && a->def->d.code*/)
@@ -26,12 +20,6 @@ ANN Func new_func(MemPool p, const m_str name, const Func_Def def) {
   return func;
 }
 
-#include <string.h>
-#include "env.h"
-#include "type.h"
-#include "vm.h"
-#include "gwion.h"
-
 ANN2(1,2) Symbol func_symbol(const Env env, const m_str nspc, const m_str base,
     const m_str tmpl, const m_uint i) {
   const size_t base_len = strlen(base);

diff --git a/src/parse/operator.c b/src/parse/operator.c
index 1484c1560ad37b10e0573065d63db5694517594e..45b5773c43278efaa85f078bd774e45c50080cfc 100644 (file)
--- a/src/parse/operator.c
+++ b/src/parse/operator.c
@@ -2,16 +2,11 @@
 #include <string.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
 #include "gwion.h"
-#include "type.h"
 #include "instr.h"
 #include "emit.h"
-#include "value.h"
-#include "func.h"
-#include "nspc.h"
 #include "operator.h"
 
 typedef Type (*f_type)(const Env env, const Exp exp);

diff --git a/src/parse/scan0.c b/src/parse/scan0.c
index 53a0230142f43c394762f8033ba5dcfe1eae4a20..106eba98c4e7296fe766e0a122811217fc19f085 100644 (file)
--- a/src/parse/scan0.c
+++ b/src/parse/scan0.c
@@ -1,12 +1,7 @@
 #include <string.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
-#include "type.h"
-#include "value.h"
-#include "func.h"
-#include "nspc.h"
+#include "gwion_env.h"
 #include "vm.h"
 #include "traverse.h"
 #include "template.h"
@@ -17,8 +12,6 @@
 #include "operator.h"
 #include "import.h"
 
-#include "context.h"
-
 static inline void add_type(const Env env, const Nspc nspc, const Type t) {
   nspc_add_type_front(nspc, insert_symbol(t->name), t);
 }

diff --git a/src/parse/scan1.c b/src/parse/scan1.c
index 0abc6ec7947d38bbf64e1f30fa7253f7f0f00faf..c2d04e6a45f261c2bdf6e8ed1abc53da4b97b90d 100644 (file)
--- a/src/parse/scan1.c
+++ b/src/parse/scan1.c
@@ -1,16 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
-#include "type.h"
-#include "nspc.h"
-#include "value.h"
-#include "func.h"
+#include "gwion_env.h"
 #include "vm.h"
 #include "traverse.h"
 #include "template.h"
 #include "parse.h"
-#include "context.h"
 
 ANN static m_bool scan1_stmt_list(const Env env, Stmt_List list);
 ANN static m_bool scan1_stmt(const Env env, Stmt stmt);

diff --git a/src/parse/scan2.c b/src/parse/scan2.c
index 852a8e02c225f6d5ad40b96d9840af655c26463b..e6fe1bca40828f40e0f22034c14c85804effa671 100644 (file)
--- a/src/parse/scan2.c
+++ b/src/parse/scan2.c
@@ -1,22 +1,15 @@
-#include <string.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
-#include "value.h"
-#include "func.h"
 #include "template.h"
 #include "traverse.h"
 #include "parse.h"
-#include "nspc.h"
 #include "operator.h"
 #include "object.h"
 #include "instr.h"
 #include "import.h"
 #include "tuple.h"
-#include "context.h"
 
 ANN static m_bool scan2_stmt(const Env, const Stmt);
 ANN static m_bool scan2_stmt_list(const Env, Stmt_List);

diff --git a/src/parse/scanx.c b/src/parse/scanx.c
index 7414900d9adc02842ee931029495fe7291ff76d4..d9b52969194b05705cb4206fcdaee7ad6151e005 100644 (file)
--- a/src/parse/scanx.c
+++ b/src/parse/scanx.c
@@ -1,10 +1,6 @@
-#include <string.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
-#include "type.h"
-#include "nspc.h"
+#include "gwion_env.h"
 #include "vm.h"
 #include "template.h"
 #include "traverse.h"

diff --git a/src/parse/stage.c b/src/parse/stage.c
index 8d58202050f27453afcb0b55eb187411ac46957e..126462342b8daf01eff7da66558a7fd79234c121 100644 (file)
--- a/src/parse/stage.c
+++ b/src/parse/stage.c
@@ -1,9 +1,6 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
-#include "value.h"
-#include "type.h"
+#include "gwion_env.h"
 
 ANN m_uint union_push(const Env env, const Union_Def udef) {
   const Type type = udef->xid ? udef->value->type : udef->type_xid ?

diff --git a/src/parse/template.c b/src/parse/template.c
index 4e61c8ea9309128664c1a7470b7fbb0a9850ffd0..0fb1e23f7fed26cfc27c670f4a3b0199d5f98fcb 100644 (file)
--- a/src/parse/template.c
+++ b/src/parse/template.c
@@ -1,13 +1,7 @@
-#include <string.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
-#include "func.h"
-#include "value.h"
-#include "nspc.h"
 #include "traverse.h"
 #include "template.h"
 #include "vm.h"

diff --git a/src/parse/traverse.c b/src/parse/traverse.c
index dba8c910cef6b088c3061475e581f539e094aa0b..c56134d5957b632dbe5cbf8f4f65688170c56b03 100644 (file)
--- a/src/parse/traverse.c
+++ b/src/parse/traverse.c
@@ -1,7 +1,6 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
+#include "gwion_env.h"
 #include "traverse.h"
 
 ANN m_bool traverse_ast(const Env env, const Ast ast) {

diff --git a/src/parse/type_decl.c b/src/parse/type_decl.c
index 9f4f02594216cd37497bfb98ef6fc4041cc0fb76..42290b6e1500e69a7d693454007f7cf52b26d3b5 100644 (file)
--- a/src/parse/type_decl.c
+++ b/src/parse/type_decl.c
@@ -1,22 +1,13 @@
-#include <stdlib.h>
-#include <string.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
-#include "nspc.h"
-#include "type.h"
+#include "gwion_env.h"
 #include "vm.h"
 #include "traverse.h"
 #include "parse.h"
 
-#include "context.h"
-
 #define STR_NONNULL ":nonnull"
 #define STRLEN_NONNULL strlen(STR_NONNULL)
 
-#include "func.h"
-
 ANN Type type_nonnull(const Env env, const Type base) {
   char c[strlen(base->name) + 9];
   sprintf(c, "%s%s", base->name, STR_NONNULL);

diff --git a/src/parse/type_utils.c b/src/parse/type_utils.c
index 2b710574462935554e0771e7ae8094291a934beb..5486ebb5dce7e7c6780c37ebde3368f76a3df8b1 100644 (file)
--- a/src/parse/type_utils.c
+++ b/src/parse/type_utils.c
@@ -1,9 +1,6 @@
-#include <stdlib.h>
-#include <string.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
+#include "gwion_env.h"
 #include "vm.h"
 #include "traverse.h"
 #include "parse.h"

diff --git a/src/pass.c b/src/pass.c
index 9c2684f8a7c60640122db53491fa2b6dc677030b..0ef7fb6929b8d4c5cf89a062515dae72b964988d 100644 (file)
--- a/src/pass.c
+++ b/src/pass.c
@@ -1,8 +1,7 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
 #include "instr.h"
 #include "emit.h"
 #include "gwion.h"

diff --git a/src/plug.c b/src/plug.c
index dd11e1aa8cc6bcef4e91e7312ad365d7b66c3128..b702d2c4f95c38a494b7bab8de6344c2377679d7 100644 (file)
--- a/src/plug.c
+++ b/src/plug.c
@@ -1,4 +1,3 @@
-#include <string.h>
 #ifndef BUILD_ON_WINDOWS
 #include <glob.h>
 #include <dlfcn.h>
@@ -7,15 +6,12 @@
 #endif
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
+#include "gwion_env.h"
 #include "vm.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "instr.h"
 #include "object.h"
-#include "type.h"
 #include "import.h"
 
 typedef m_bool (*import)(Gwi);

diff --git a/src/vm/driver.c b/src/vm/driver.c
index da06f6f9a69dbb94b9f8d4f42ac38a3f1ce4044a..71028033366428a2d95fcb8b6235b4102d1438d8 100644 (file)
--- a/src/vm/driver.c
+++ b/src/vm/driver.c
@@ -1,13 +1,8 @@
-#include <stdlib.h>
-#include <string.h>
-#include <string.h>
 #include <time.h>
-#include <stdio.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
 #include "gwion.h"
 #include "driver.h"
 

diff --git a/src/vm/shreduler.c b/src/vm/shreduler.c
index 6d1e437105286f7a97f1af33a61b8917ea31bcb8..baea4e952fd4361b0c7f22bc868158a8952f03e6 100644 (file)
--- a/src/vm/shreduler.c
+++ b/src/vm/shreduler.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
 #include "object.h"
 #include "driver.h"

diff --git a/src/vm/vm.c b/src/vm/vm.c
index 444a7d7321d6908ccad7396d7ad9dd2355a55fbb..f690029e05ec52b7a982c977b41ef736cfb1d87b 100644 (file)
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -1,26 +1,17 @@
-#include <stdlib.h>
-#include <string.h>
 #include <time.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "nspc.h"//dot func
-#include "func.h"//dot func
-#include "type.h"
 #include "instr.h"
 #include "object.h"
 #include "ugen.h"
 #include "shreduler_private.h"
 #include "emit.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "map_private.h"
-
-#include "value.h"
 #include "gack.h"
 #include "array.h"
 

diff --git a/src/vm/vm_code.c b/src/vm/vm_code.c
index e56f90354cf3477d7fef5b9224058b9299ea3abd..dcb7d47e3c10831f34af0a5041c4c0b5b13df02e 100644 (file)
--- a/src/vm/vm_code.c
+++ b/src/vm/vm_code.c
@@ -1,18 +1,12 @@
-#include <stdlib.h>
-#include <string.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
-#include "func.h"
 #include "instr.h"
 #include "object.h"
 #include "array.h"
 #include "memoize.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/src/vm/vm_name.c b/src/vm/vm_name.c
index e16c0c254628952279507f9cba0780e9095ae858..19b0b004a22c38da1477708fd69c07acf859811a 100644 (file)
--- a/src/vm/vm_name.c
+++ b/src/vm/vm_name.c
@@ -1,6 +1,3 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
 

diff --git a/src/vm/vm_shred.c b/src/vm/vm_shred.c
index e81944fd3362b1de8f7bf59e0cacf352beedebcd..eca7b796684182a8aeadc011151c6517996bac23 100644 (file)
--- a/src/vm/vm_shred.c
+++ b/src/vm/vm_shred.c
@@ -1,9 +1,6 @@
-#include <stdlib.h>
-#include <string.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
+#include "gwion_env.h"
 #include "vm.h"
 #include "object.h"
 #include "gwion.h"