:art: Class_Body was Ast

diff --git a/ast b/ast
index af63abc5d9f76ffcf128ee7784068a3a8283f5a8..511f61502bebcfc02df1e651d9d742b74072e4ed 160000 (submodule)
--- a/ast
+++ b/ast
@@ -1 +1 @@
-Subproject commit af63abc5d9f76ffcf128ee7784068a3a8283f5a8
+Subproject commit 511f61502bebcfc02df1e651d9d742b74072e4ed

diff --git a/include/gwi.h b/include/gwi.h
index 07ac3f2c0261ba31c0efe5aef40e8d473febf751..6cee9bca6b9c08c7d952db13b2ee8f5c5770077d 100644 (file)
--- a/include/gwi.h
+++ b/include/gwi.h
@@ -5,7 +5,7 @@
 
 struct Gwi_ {
   struct Gwion_* gwion;
-  Class_Body body;
+  Ast body;
   struct ImportCK *ck;
   struct OperCK *oper; // _misc
   loc_t loc;

diff --git a/include/gwion_all.h b/include/gwion_all.h
index 21c56409917aa46bce51c57062392957fdec882a..f11b0be86ba6551d9015d78f8da6d53ab96ca6a7 100644 (file)
--- a/include/gwion_all.h
+++ b/include/gwion_all.h
@@ -1,6 +1,7 @@
 #ifndef __GWION_ALL
 #include "gwion_ast.h"
 #include "gwion_util.h"
+#include "gwion_env.h"
 #include "arg.h"
 #include "array.h"
 #include "compile.h"
@@ -9,9 +10,7 @@
 #include "driver.h"
 #include "emit.h"
 #include "engine.h"
-#include "env.h"
 #include "escape.h"
-#include "func.h"
 #include "gack.h"
 #include "gwi.h"
 #include "gwion.h"
@@ -20,9 +19,7 @@
 #include "instr.h"
 #include "lang_private.h"
 #include "memoize.h"
-#include "nspc.h"
 #include "object.h"
-#include "oo.h"
 #include "opcode.h"
 #include "operator.h"
 #include "parse.h"
@@ -32,9 +29,7 @@
 #include "switch.h"
 #include "template.h"
 #include "traverse.h"
-#include "type.h"
 #include "ugen.h"
-#include "value.h"
 #include "vararg.h"
 #include "vm.h"
 #endif

diff --git a/include/import/internals.h b/include/import/internals.h
index 09aa34fb636f8251c3a1682fca9648088c6f6128..d014f5c6964c07d7e8a841118e0fa52ed73c6fec 100644 (file)
--- a/include/import/internals.h
+++ b/include/import/internals.h
@@ -6,7 +6,7 @@
 #define ENV_ERR_B(pos, a,...) { env_err(env, pos, (a), ## __VA_ARGS__); return GW_ERROR; }
 #define ENV_ERR_O(pos, a,...) { env_err(env, pos, (a), ## __VA_ARGS__); return NULL; }
 
-ANN void gwi_body(const Gwi, const Class_Body);
+ANN void gwi_body(const Gwi, const Ast);
 
 ANN Exp make_exp(const Gwi gwi, const m_str type, const m_str name);
 

diff --git a/src/import/fdef.c b/src/import/fdef.c
index 221ace4f243615155578c497c3b50f234b637158..ea6d189c9aa16689e36893411ac83362e1072b93 100644 (file)
--- a/src/import/fdef.c
+++ b/src/import/fdef.c
@@ -60,7 +60,7 @@ ANEW ANN static Func_Def import_fdef(const Gwi gwi, ImportCK *ck) {
 
 ANN static m_bool section_fdef(const Gwi gwi, const Func_Def fdef) {
   Section* section = new_section_func_def(gwi->gwion->mp, fdef);
-  const Class_Body body = new_class_body(gwi->gwion->mp, section, NULL);
+  const Ast body = new_ast(gwi->gwion->mp, section, NULL);
   gwi_body(gwi, body);
   return GW_OK;
 }

diff --git a/src/import/internals.c b/src/import/internals.c
index 476c2848e5a249f1238ac97a2825d6561040f763..8f0f85f8491d2b681806bd8e5932999cfc5c60e3 100644 (file)
--- a/src/import/internals.c
+++ b/src/import/internals.c
@@ -10,7 +10,7 @@
 #include "import.h"
 #include "gwi.h"
 
-void gwi_body(const Gwi gwi, const Class_Body body) {
+void gwi_body(const Gwi gwi, const Ast body) {
   const Class_Def cdef = gwi->gwion->env->class_def->e->def;
   if(!cdef->body)
     cdef->body = body;

diff --git a/src/import/item.c b/src/import/item.c
index c623f4212e00e496d64ca349e6e09cc27004fb82..3459da6e2a7567723c97c49b9ddd7bd64f456397 100644 (file)
--- a/src/import/item.c
+++ b/src/import/item.c
@@ -22,7 +22,7 @@ ANN static m_int gwi_item_tmpl(const Gwi gwi) {
   const Stmt stmt = new_stmt_exp(mp, ae_stmt_exp, gwi->ck->exp);
   const Stmt_List slist = new_stmt_list(mp, stmt, NULL);
   Section* section = new_section_stmt_list(mp, slist);
-  const Class_Body body = new_class_body(mp, section, NULL);
+  const Ast body = new_ast(mp, section, NULL);
   gwi_body(gwi, body);
   mp_free2(gwi->gwion->mp, sizeof(ImportCK), gwi->ck);
   gwi->ck = NULL;

diff --git a/src/lib/shred.c b/src/lib/shred.c
index 7110732bf7d423feafc9fc3fe74695efcd8ffac3..9793382b39dac61b8fc0a13e3bcab0416f7588a3 100644 (file)
--- a/src/lib/shred.c
+++ b/src/lib/shred.c
@@ -238,7 +238,7 @@ GWION_IMPORT(shred) {
   gwi_class_xtor(gwi, NULL, shred_dtor);
   gwi->gwion->type[et_shred] = t_shred;
 
-  gwi_item_ini(gwi, "int", "@me");
+  gwi_item_ini(gwi, "@internal", "@me");
   GWI_BB(gwi_item_end(gwi, ae_flag_const, NULL))
 
   gwi_item_ini(gwi, "int", "cancel");
@@ -308,7 +308,7 @@ GWION_IMPORT(shred) {
   gwi_class_xtor(gwi, NULL, fork_dtor);
   gwi->gwion->type[et_fork] = t_fork;
 
-  gwi_item_ini(gwi, "int", "@thread");
+  gwi_item_ini(gwi, "@internal", "@thread");
   GWI_BB((o_fork_thread = gwi_item_end(gwi, ae_flag_const, NULL)))
   gwi_item_ini(gwi, "int", "is_done");
   GWI_BB((o_fork_done = gwi_item_end(gwi, ae_flag_const, NULL)))
@@ -316,7 +316,7 @@ GWION_IMPORT(shred) {
   GWI_BB((o_fork_ev = gwi_item_end(gwi, ae_flag_const, NULL)))
   gwi_item_ini(gwi, "int", "retsize");
   GWI_BB((o_fork_retsize = gwi_item_end(gwi, ae_flag_const, NULL)))
-  gwi_item_ini(gwi, "int", "@orig");
+  gwi_item_ini(gwi, "@internal", "@orig");
   GWI_BB((o_fork_orig = gwi_item_end(gwi, ae_flag_const, NULL)))
   o_fork_retval = t_fork->nspc->info->offset;
   GWI_BB(gwi_union_ini(gwi, NULL, NULL))

diff --git a/src/lib/tuple.c b/src/lib/tuple.c
index 22ab761e0ed232f19b0278077801aab82c67fe07..9182190d6db6b68bdf3ecc1ebc5ad0d6b80ad552 100644 (file)
--- a/src/lib/tuple.c
+++ b/src/lib/tuple.c
@@ -300,7 +300,7 @@ ANN Type tuple_type(const Env env, const Vector v, const loc_t pos) {
     curr = slist;
   }
   Section * section = new_section_stmt_list(env->gwion->mp, base);
-  Class_Body body = new_class_body(env->gwion->mp, section, NULL);
+  Ast body = new_ast(env->gwion->mp, section, NULL);
   const ID_List ilist = new_id_list(env->gwion->mp, insert_symbol(env->gwion->type[et_tuple]->name),
       loc_cpy(env->gwion->mp, pos));
   Type_Decl *td = new_type_decl(env->gwion->mp, ilist);

diff --git a/src/parse/scan0.c b/src/parse/scan0.c
index 106eba98c4e7296fe766e0a122811217fc19f085..92ff12625824f992694dc415213f9a03d349c367 100644 (file)
--- a/src/parse/scan0.c
+++ b/src/parse/scan0.c
@@ -234,7 +234,7 @@ ANN static void union_tmpl(const Env env, const Union_Def udef) {
   if(tmpl_base(udef->tmpl)) {
     assert(udef->type_xid);
     const Class_Def cdef = new_class_def(env->gwion->mp, udef->flag, udef->type_xid,
-        NULL, (Class_Body)udef->l, loc_cpy(env->gwion->mp, udef->pos));
+        NULL, (Ast)udef->l, loc_cpy(env->gwion->mp, udef->pos));
     udef->type->e->def = cdef;
     cdef->base.tmpl = udef->tmpl;
     cdef->base.type = udef->type;

diff --git a/src/parse/scanx.c b/src/parse/scanx.c
index d9b52969194b05705cb4206fcdaee7ad6151e005..21232f87815219bed0308ae6129ae8cf0164f872 100644 (file)
--- a/src/parse/scanx.c
+++ b/src/parse/scanx.c
@@ -6,7 +6,7 @@
 #include "traverse.h"
 #include "parse.h"
 
-ANN static inline m_bool _body(const Env e, Class_Body b, const _exp_func f) {
+ANN static inline m_bool _body(const Env e, Ast b, const _exp_func f) {
   do CHECK_BB(f(e, b->section))
   while((b = b->next));
   return GW_OK;

diff --git a/tests/import/array.c b/tests/import/array.c
index bd19d6c63492ad120e608c631ac2f9d978beeabd..f8f342ca4829576bfbd5750da0dccd09514d3e02 100644 (file)
--- a/tests/import/array.c
+++ b/tests/import/array.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"

diff --git a/tests/import/array_in_var_name.c b/tests/import/array_in_var_name.c
index 4ebb96e12a8ba01176028aa5c1bafade4ee04b7c..1dc4ff706012670037e06430f97f9603970ab56d 100644 (file)
--- a/tests/import/array_in_var_name.c
+++ b/tests/import/array_in_var_name.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"

diff --git a/tests/import/array_in_var_name_fail.c b/tests/import/array_in_var_name_fail.c
index 31aabf9353f3787916598727fa27c6c06bc10e06..605bdb96396c1accea6f61fadc911c8f479cf8e2 100644 (file)
--- a/tests/import/array_in_var_name_fail.c
+++ b/tests/import/array_in_var_name_fail.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"

diff --git a/tests/import/array_incoherent_in_var_name.c b/tests/import/array_incoherent_in_var_name.c
index 466e25c359c2959f45e289e3b4a6dc71106dee5d..3a534285c16d0261f17a1326633a00c287231585 100644 (file)
--- a/tests/import/array_incoherent_in_var_name.c
+++ b/tests/import/array_incoherent_in_var_name.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"

diff --git a/tests/import/array_invalid_in_var_name.c b/tests/import/array_invalid_in_var_name.c
index 5538321dd6d60ea441ab79ff2695b48617942fed..185f57df00767ed969a0943d2c40b6e01751280b 100644 (file)
--- a/tests/import/array_invalid_in_var_name.c
+++ b/tests/import/array_invalid_in_var_name.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"

diff --git a/tests/import/basic_module.c b/tests/import/basic_module.c
index 712f2a55f424af9f19927d8c162fb687921450c4..11a37841593b90c1cebc723433cce84ffe52f050 100644 (file)
--- a/tests/import/basic_module.c
+++ b/tests/import/basic_module.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 "gwion.h"
 
 GWMODSTR(basic_module)

diff --git a/tests/import/callback.c b/tests/import/callback.c
index 84a69c25ce6b00fc204877ed6e3e2b36908ee8c6..9d917cb99f7067bc1ac725a6e6c58202ed6778b6 100644 (file)
--- a/tests/import/callback.c
+++ b/tests/import/callback.c
@@ -1,17 +1,13 @@
 #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 "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
-#include "func.h"
 #include "gwi.h"
 
 struct ret_info {

diff --git a/tests/import/checker.c b/tests/import/checker.c
index 72756d9287d23176ace2679795a04c2cbe015280..759143556eeddb52834b751c911fe0c8571544b2 100644 (file)
--- a/tests/import/checker.c
+++ b/tests/import/checker.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"

diff --git a/tests/import/class_template.c b/tests/import/class_template.c
index d48a3330e4d520b9cc36db70efab302a99824662..1bc3adb2568a6e9f30ce02a441bce225c8c32d90 100644 (file)
--- a/tests/import/class_template.c
+++ b/tests/import/class_template.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"

diff --git a/tests/import/class_template_fail.c b/tests/import/class_template_fail.c
index 8b2052789f34311db09af6efd5b2b00248b1cd50..ecb9ecc1c6eb621094bfd144ca1125ab28c4b305 100644 (file)
--- a/tests/import/class_template_fail.c
+++ b/tests/import/class_template_fail.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"

diff --git a/tests/import/class_template_invalid.c b/tests/import/class_template_invalid.c
index 677304c955f27c9e3d00fd0208ceb8799f0e8fbf..8c7da6116fd12a2a28b3f3bb14ad7aadbde05bb9 100644 (file)
--- a/tests/import/class_template_invalid.c
+++ b/tests/import/class_template_invalid.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"

diff --git a/tests/import/compile_file.c b/tests/import/compile_file.c
index 32e91d27021bf6ac35678e899d8052bfad248540..39a7a194202289f61644787cdc1a748e7ccb45cc 100644 (file)
--- a/tests/import/compile_file.c
+++ b/tests/import/compile_file.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"

diff --git a/tests/import/compile_string.c b/tests/import/compile_string.c
index 3d0cb0ee1d44d549f08f585a1ada69b75791a419..d1c522c911d34bf9d209bbbb5ee663de9076cc36 100644 (file)
--- a/tests/import/compile_string.c
+++ b/tests/import/compile_string.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"

diff --git a/tests/import/coverage.c b/tests/import/coverage.c
index 7dfbb227e29508c60a0c2ded10c90a15ce8f58ba..26f374b51e32855a817f2d95b7a3aa4d1d7da5c5 100644 (file)
--- a/tests/import/coverage.c
+++ b/tests/import/coverage.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"

diff --git a/tests/import/driver.c b/tests/import/driver.c
index 06d3cc6f2fbf518c821a60cbb6ebefae2e783061..7f1628e55d13150b9ceb8e50e0a9b00b7205b489 100644 (file)
--- a/tests/import/driver.c
+++ b/tests/import/driver.c
@@ -2,8 +2,7 @@
 #include <unistd.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
+#include "gwion_env.h"
 #include "vm.h"
 #include "driver.h"
 #include "gwion.h"

diff --git a/tests/import/empty_union.c b/tests/import/empty_union.c
index bb1a9346f13c9e41927de7103bc281f32e2e12c1..9cf0af19aaa980b357f7a44b859660c0e981e393 100644 (file)
--- a/tests/import/empty_union.c
+++ b/tests/import/empty_union.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/tests/import/end_class.c b/tests/import/end_class.c
index 388fa82eed73d279cb692c0fa86d4c2c07e9f73b..84324621b74af8c9322e228330e2fa03c9e4b925 100644 (file)
--- a/tests/import/end_class.c
+++ b/tests/import/end_class.c
@@ -1,12 +1,8 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "absyn.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "object.h"
 #include "instr.h"

diff --git a/tests/import/enum.c b/tests/import/enum.c
index ba9394b77c3d86ee1d402fe56f5f18e6a3616294..543f698d520315f4661178060b255a4b05db6dfc 100644 (file)
--- a/tests/import/enum.c
+++ b/tests/import/enum.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/tests/import/enum_fail.c b/tests/import/enum_fail.c
index 8071ad4373cad8c39d53282c3fe51dbe9df62b92..f49dde9c7c99cae4a1de3efff1ce0012eb2bae89 100644 (file)
--- a/tests/import/enum_fail.c
+++ b/tests/import/enum_fail.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/tests/import/enum_fail2.c b/tests/import/enum_fail2.c
index 6f5550b0586d304f2ff9f2060475a18e1088a4f7..2c5131be0f401380ef74a6baa22bf7b992d037d1 100644 (file)
--- a/tests/import/enum_fail2.c
+++ b/tests/import/enum_fail2.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/tests/import/enum_fail3.c b/tests/import/enum_fail3.c
index e74e5f6359b6bb20f61b54294fa828c1ce4a398f..2834167886b36be0aa7d737d6d61500e7f06a182 100644 (file)
--- a/tests/import/enum_fail3.c
+++ b/tests/import/enum_fail3.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/tests/import/extend_array.c b/tests/import/extend_array.c
index cebb84a233ab7aeae203f6afbe0ab5297bfc296b..a829f59aefc5e358b142309e9df42b002d7da763 100644 (file)
--- a/tests/import/extend_array.c
+++ b/tests/import/extend_array.c
@@ -1,15 +1,11 @@
 #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 "instr.h"
-#include "vm.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"

diff --git a/tests/import/fail_on_next_arg.c b/tests/import/fail_on_next_arg.c
index e7cb07e4f772aabfe7e932140b92f6b12cb2c5a8..bce8309bdb1862d5953614e63389a1c405938de6 100644 (file)
--- a/tests/import/fail_on_next_arg.c
+++ b/tests/import/fail_on_next_arg.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"
 
 GWION_IMPORT(fail_on_next_arg) {

diff --git a/tests/import/fail_on_next_arg2.c b/tests/import/fail_on_next_arg2.c
index b5ff24b407bc559003d413dbbc5feb1896b7e36e..329b036627bed563fdf3db56868a42bd992dcd66 100644 (file)
--- a/tests/import/fail_on_next_arg2.c
+++ b/tests/import/fail_on_next_arg2.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"
 
 GWION_IMPORT(fail_on_next_arg) {

diff --git a/tests/import/fptr.c b/tests/import/fptr.c
index 3fe02521f632f175f025de04913711c457e4218a..b78b9b5c35d8de7f7aca5b4c4837c117a292e4f0 100644 (file)
--- a/tests/import/fptr.c
+++ b/tests/import/fptr.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/tests/import/fptr_tmpl.c b/tests/import/fptr_tmpl.c
index d142ebb7ea945eb5fc4a31fa0ff10e74652aeb95..4adb3e307c8b4c09c3cf4d81c85a8104ba76c305 100644 (file)
--- a/tests/import/fptr_tmpl.c
+++ b/tests/import/fptr_tmpl.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/tests/import/fptr_tmpl_fail.c b/tests/import/fptr_tmpl_fail.c
index 13c195fc132bfb608a70811dd8ce20ab6afd7403..2ec528c32ce4d47fb39588f2a6978b745ec85b3e 100644 (file)
--- a/tests/import/fptr_tmpl_fail.c
+++ b/tests/import/fptr_tmpl_fail.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/tests/import/func_fail.c b/tests/import/func_fail.c
index 68d34e6afeb0a8521ac82c509686db61d7115e50..d38bcd683fe8c3b920fe94b8e3051d94257f3142 100644 (file)
--- a/tests/import/func_fail.c
+++ b/tests/import/func_fail.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 "instr.h"

diff --git a/tests/import/func_fail2.c b/tests/import/func_fail2.c
index ce023ed021c5d0b06c598d66aa2ddf1aafa98bd7..ade635789e301391cd92207bb24467461b839d80 100644 (file)
--- a/tests/import/func_fail2.c
+++ b/tests/import/func_fail2.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 "instr.h"

diff --git a/tests/import/func_fail3.c b/tests/import/func_fail3.c
index 56ff79a65099324f2af5256dbf52958b4671712c..09402e9a2dd8ecee805685778b1ee7fa16fd4f20 100644 (file)
--- a/tests/import/func_fail3.c
+++ b/tests/import/func_fail3.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 "instr.h"

diff --git a/tests/import/func_fail4.c b/tests/import/func_fail4.c
index 02d0fdb95a1835473c4e4e7e494cbbcb7d9a0d11..06c7f384c2861f8ac344d144b95920e7838ccbdb 100644 (file)
--- a/tests/import/func_fail4.c
+++ b/tests/import/func_fail4.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 "instr.h"

diff --git a/tests/import/func_subscript_not_empty.c b/tests/import/func_subscript_not_empty.c
index bcd6cef3ea716596ab24ff2694e873220977943c..a9a6afc39629e715114d89982f482e88d107a491 100644 (file)
--- a/tests/import/func_subscript_not_empty.c
+++ b/tests/import/func_subscript_not_empty.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 "instr.h"

diff --git a/tests/import/func_tmpl.c b/tests/import/func_tmpl.c
index be22fbb6bb0fc864b09de38c7390ee6a08192850..0214bd24a2a24fce620e8ed4306a054d2bb9c10b 100644 (file)
--- a/tests/import/func_tmpl.c
+++ b/tests/import/func_tmpl.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 "instr.h"

diff --git a/tests/import/func_tmpl_fail.c b/tests/import/func_tmpl_fail.c
index 5790b326e45240862ac9e0d4c334a2a3ce8b8ddd..f01dddad1c611116b7f6ab0157cd817197497358 100644 (file)
--- a/tests/import/func_tmpl_fail.c
+++ b/tests/import/func_tmpl_fail.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 "instr.h"

diff --git a/tests/import/func_too_many_arg.c b/tests/import/func_too_many_arg.c
index ce2b06cc96fdbb30066fb5343832ee959dd50ba7..6bf4baae6b71f8d9d1cfe16693eb46df1e450ed0 100644 (file)
--- a/tests/import/func_too_many_arg.c
+++ b/tests/import/func_too_many_arg.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 "instr.h"

diff --git a/tests/import/get_module.c b/tests/import/get_module.c
index 19b72862ed396d543f8b683315dbe14201c1c5df..d0ecf040fa659134ad8ba3c8be3d73716273b1d7 100644 (file)
--- a/tests/import/get_module.c
+++ b/tests/import/get_module.c
@@ -2,11 +2,8 @@
 #include <unistd.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "type.h"
-#include "value.h"
 #include "object.h"
 #include "driver.h"
 #include "gwion.h"

diff --git a/tests/import/global_func.c b/tests/import/global_func.c
index 26c5dc91187a414b79bd9cbda548ba11f63c4261..88bae08b32a2fa158d38935f5b29decb545f9e1e 100644 (file)
--- a/tests/import/global_func.c
+++ b/tests/import/global_func.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 "instr.h"

diff --git a/tests/import/global_var.c b/tests/import/global_var.c
index 6d9f9e2e0afa4a4185e809caac8bee8ea8ab43b6..7ec972004435d7e99b08c2ce4c69e8f4cdabf5e7 100644 (file)
--- a/tests/import/global_var.c
+++ b/tests/import/global_var.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"

diff --git a/tests/import/invalid_arg.c b/tests/import/invalid_arg.c
index 86e80dc19a97e9995408bcfda93486bc3019462a..04a99a345e0eda427d524367f8c6361958ae9e21 100644 (file)
--- a/tests/import/invalid_arg.c
+++ b/tests/import/invalid_arg.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/tests/import/invalid_array.c b/tests/import/invalid_array.c
index f0fe091a0f1091617fa56cd7d5e449da9d49a519..92bb664c67e4178d63595159f1f910a52a40aa1d 100644 (file)
--- a/tests/import/invalid_array.c
+++ b/tests/import/invalid_array.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/tests/import/invalid_func.c b/tests/import/invalid_func.c
index a8c20c5caa5806e310e3c8952d05ef57b3408b43..a2796a9e22980dbe8f1b1e8a27b8a886067c2aed 100644 (file)
--- a/tests/import/invalid_func.c
+++ b/tests/import/invalid_func.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/tests/import/invalid_names.c b/tests/import/invalid_names.c
index 54a2f5461666c30880a050e7caf27d109f1c6d40..6ee7f34081436fd6eb5f8fed7c77938ead9e8b00 100644 (file)
--- a/tests/import/invalid_names.c
+++ b/tests/import/invalid_names.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"
 
 GWION_IMPORT(trig) {

diff --git a/tests/import/invalid_type1.c b/tests/import/invalid_type1.c
index 113a14c99fa3645a69f6cf13bbf74557c9095d00..b17e225e6474b6a8dcdca19b4569575fce82dcfa 100644 (file)
--- a/tests/import/invalid_type1.c
+++ b/tests/import/invalid_type1.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/tests/import/invalid_type2.c b/tests/import/invalid_type2.c
index aa54c393d7f90f88d1362864d7382952958aed65..3b1f3fd00d3c19cb97e472a990041da6f06057dc 100644 (file)
--- a/tests/import/invalid_type2.c
+++ b/tests/import/invalid_type2.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/tests/import/invalid_type3.c b/tests/import/invalid_type3.c
index 76525f675feb51adbe6e75595a635aa3935f460b..118a0206e419df5607932a7a6ace75a980f93a09 100644 (file)
--- a/tests/import/invalid_type3.c
+++ b/tests/import/invalid_type3.c
@@ -1,14 +1,10 @@
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "absyn.h"
-#include "oo.h"
+#include "gwion_env.h"
 #include "vm.h"
-#include "env.h"
-#include "type.h"
 #include "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/tests/import/mk_type_array.c b/tests/import/mk_type_array.c
index 46ca55715fdd19106123eab7f9062f8962c943a4..765ea034b9eb75dc41759a0c834a2e3750381de3 100644 (file)
--- a/tests/import/mk_type_array.c
+++ b/tests/import/mk_type_array.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"

diff --git a/tests/import/module.c b/tests/import/module.c
index 6f5324b287e61c3b04067aa3161ef3288427d97c..d65ee7542647a377c73576a934011ea29583e7e4 100644 (file)
--- a/tests/import/module.c
+++ b/tests/import/module.c
@@ -2,8 +2,7 @@
 #include <unistd.h>
 #include "gwion_util.h"
 #include "gwion_ast.h"
-#include "oo.h"
-#include "env.h"
+#include "gwion_env.h"
 #include "vm.h"
 #include "driver.h"
 #include "gwion.h"

diff --git a/tests/import/no_import.c b/tests/import/no_import.c
index 959d35c576dd2df0208798d7facc26044b54f7b5..3793a9a6cce1487f4d4fa1989caeca07e60a7f46 100644 (file)
--- a/tests/import/no_import.c
+++ b/tests/import/no_import.c
@@ -1,12 +1,9 @@
 #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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"

diff --git a/tests/import/not_importing.c b/tests/import/not_importing.c
index 836ab3c005e455d4a671df05d359bf42faff9f18..6cda2e4195b59e404baf94dda052895830693e08 100644 (file)
--- a/tests/import/not_importing.c
+++ b/tests/import/not_importing.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/tests/import/op_already_imported.c b/tests/import/op_already_imported.c
index faf524fa0d96acacbf04da1d50ce62880916cee2..1b3eec5e71a939b1f6274cee680f25ac40307353 100644 (file)
--- a/tests/import/op_already_imported.c
+++ b/tests/import/op_already_imported.c
@@ -1,15 +1,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 "instr.h"
 #include "object.h"
 #include "instr.h"
 #include "vm.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"

diff --git a/tests/import/specialid_emit.c b/tests/import/specialid_emit.c
index 2b4305c3e0c1d92bd1084d429e963319c965e275..efcdcd4877c1d729a4a1d4a581854d4d87e364a3 100644 (file)
--- a/tests/import/specialid_emit.c
+++ b/tests/import/specialid_emit.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "emit.h"

diff --git a/tests/import/static_string.c b/tests/import/static_string.c
index 42e1393924270bbbfabb4abffdf61c44f4a4bceb..2fb1ac8f5cb8b2e0d17c4f1094d842168830e002 100644 (file)
--- a/tests/import/static_string.c
+++ b/tests/import/static_string.c
@@ -1,14 +1,11 @@
 #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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"

diff --git a/tests/import/str2decl.c b/tests/import/str2decl.c
index 9b3b987195cbec1caac321ecb1f95543b287819c..c8d9d9d9e98be473c719fb21818017b470d590e3 100644 (file)
--- a/tests/import/str2decl.c
+++ b/tests/import/str2decl.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"
 
 GWION_IMPORT(str2decl) {

diff --git a/tests/import/str2list_fail.c b/tests/import/str2list_fail.c
index d39cc23198e3f38e3a62a5767d13a22f8d4abb5a..dbcc6e7f52d7642710639f68c57f2e8e454d1b74 100644 (file)
--- a/tests/import/str2list_fail.c
+++ b/tests/import/str2list_fail.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"

diff --git a/tests/import/template_arg.c b/tests/import/template_arg.c
index e69eb5d9049045d1b577471f29d551a40c287343..ba1a75a48990039f9388089955d6950e4a049749 100644 (file)
--- a/tests/import/template_arg.c
+++ b/tests/import/template_arg.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/tests/import/test.log b/tests/import/test.log
deleted file mode 100644 (file)
index 5e4c6f9..0000000
--- a/tests/import/test.log
+++ /dev/null
@@ -1,157 +0,0 @@
-coverage.gw ==219564== Memcheck, a memory error detector
-==219564== Copyright (C) 2002-2017, and GNU GPL'd, by Julian Seward et al.
-==219564== Using Valgrind-3.15.0 and LibVEX; rerun with -h for copyright info
-==219564== Command: ./../../gwion -p. -m dummy -d dummy coverage.gw
-==219564== Parent PID: 219275
-==219564== 
-==219564== Invalid read of size 8
-==219564==    at 0x145464: path_valid (checker.c:67)
-==219564==    by 0x145774: ck2list (checker.c:172)
-==219564==    by 0x145813: str2decl (checker.c:226)
-==219564==    by 0x12CC24: make_exp (union.c:24)
-==219564==    by 0x12C78F: gwi_item_ini (item.c:18)
-==219564==    by 0x4848958: import (coverage.c:81)
-==219564==    by 0x11DB4E: type_engine_init (engine.c:162)
-==219564==    by 0x117059: gwion_engine (gwion.c:41)
-==219564==    by 0x117059: gwion_ini (gwion.c:84)
-==219564==    by 0x116502: main (main.c:23)
-==219564==  Address 0x0 is not stack'd, malloc'd or (recently) free'd
-==219564== 
-==219564== 
-==219564== Process terminating with default action of signal 11 (SIGSEGV): dumping core
-==219564==  Access not within mapped region at address 0x0
-==219564==    at 0x145464: path_valid (checker.c:67)
-==219564==    by 0x145774: ck2list (checker.c:172)
-==219564==    by 0x145813: str2decl (checker.c:226)
-==219564==    by 0x12CC24: make_exp (union.c:24)
-==219564==    by 0x12C78F: gwi_item_ini (item.c:18)
-==219564==    by 0x4848958: import (coverage.c:81)
-==219564==    by 0x11DB4E: type_engine_init (engine.c:162)
-==219564==    by 0x117059: gwion_engine (gwion.c:41)
-==219564==    by 0x117059: gwion_ini (gwion.c:84)
-==219564==    by 0x116502: main (main.c:23)
-==219564==  If you believe this happened as a result of a stack
-==219564==  overflow in your program's main thread (unlikely but
-==219564==  possible), you can try to increase the size of the
-==219564==  main thread stack using the --main-stacksize= flag.
-==219564==  The main thread stack size used in this run was 8388608.
-==219564== 
-==219564== HEAP SUMMARY:
-==219564==     in use at exit: 9,096,690 bytes in 460 blocks
-==219564==   total heap usage: 893 allocs, 433 frees, 9,197,246 bytes allocated
-==219564== 
-==219564== LEAK SUMMARY:
-==219564==    definitely lost: 0 bytes in 0 blocks
-==219564==    indirectly lost: 0 bytes in 0 blocks
-==219564==      possibly lost: 0 bytes in 0 blocks
-==219564==    still reachable: 9,096,690 bytes in 460 blocks
-==219564==         suppressed: 0 bytes in 0 blocks
-==219564== Rerun with --leak-check=full to see details of leaked memory
-==219564== 
-==219564== For lists of detected and suppressed errors, rerun with: -s
-==219564== ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
-class_template.gw ==347445== Memcheck, a memory error detector
-==347445== Copyright (C) 2002-2017, and GNU GPL'd, by Julian Seward et al.
-==347445== Using Valgrind-3.15.0 and LibVEX; rerun with -h for copyright info
-==347445== Command: ./../../gwion -p. -m dummy -d dummy class_template.gw
-==347445== Parent PID: 347195
-==347445== 
-==347445== 
-==347445== HEAP SUMMARY:
-==347445==     in use at exit: 9,102,463 bytes in 496 blocks
-==347445==   total heap usage: 1,005 allocs, 509 frees, 9,211,355 bytes allocated
-==347445== 
-==347445== LEAK SUMMARY:
-==347445==    definitely lost: 0 bytes in 0 blocks
-==347445==    indirectly lost: 0 bytes in 0 blocks
-==347445==      possibly lost: 0 bytes in 0 blocks
-==347445==    still reachable: 9,102,463 bytes in 496 blocks
-==347445==         suppressed: 0 bytes in 0 blocks
-==347445== Rerun with --leak-check=full to see details of leaked memory
-==347445== 
-==347445== For lists of detected and suppressed errors, rerun with: -s
-==347445== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-coverage.gw ==347621== Memcheck, a memory error detector
-==347621== Copyright (C) 2002-2017, and GNU GPL'd, by Julian Seward et al.
-==347621== Using Valgrind-3.15.0 and LibVEX; rerun with -h for copyright info
-==347621== Command: ./../../gwion -p. -m dummy -d dummy coverage.gw
-==347621== Parent PID: 347195
-==347621== 
-==347621== 
-==347621== HEAP SUMMARY:
-==347621==     in use at exit: 9,098,349 bytes in 468 blocks
-==347621==   total heap usage: 916 allocs, 448 frees, 9,204,177 bytes allocated
-==347621== 
-==347621== LEAK SUMMARY:
-==347621==    definitely lost: 0 bytes in 0 blocks
-==347621==    indirectly lost: 0 bytes in 0 blocks
-==347621==      possibly lost: 0 bytes in 0 blocks
-==347621==    still reachable: 9,098,349 bytes in 468 blocks
-==347621==         suppressed: 0 bytes in 0 blocks
-==347621== Rerun with --leak-check=full to see details of leaked memory
-==347621== 
-==347621== For lists of detected and suppressed errors, rerun with: -s
-==347621== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-enum.gw ==347758== Memcheck, a memory error detector
-==347758== Copyright (C) 2002-2017, and GNU GPL'd, by Julian Seward et al.
-==347758== Using Valgrind-3.15.0 and LibVEX; rerun with -h for copyright info
-==347758== Command: ./../../gwion -p. -m dummy -d dummy enum.gw
-==347758== Parent PID: 347195
-==347758== 
-==347758== 
-==347758== HEAP SUMMARY:
-==347758==     in use at exit: 9,101,889 bytes in 467 blocks
-==347758==   total heap usage: 920 allocs, 453 frees, 9,211,349 bytes allocated
-==347758== 
-==347758== LEAK SUMMARY:
-==347758==    definitely lost: 0 bytes in 0 blocks
-==347758==    indirectly lost: 0 bytes in 0 blocks
-==347758==      possibly lost: 0 bytes in 0 blocks
-==347758==    still reachable: 9,101,889 bytes in 467 blocks
-==347758==         suppressed: 0 bytes in 0 blocks
-==347758== Rerun with --leak-check=full to see details of leaked memory
-==347758== 
-==347758== For lists of detected and suppressed errors, rerun with: -s
-==347758== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-extend_array.gw ==347895== Memcheck, a memory error detector
-==347895== Copyright (C) 2002-2017, and GNU GPL'd, by Julian Seward et al.
-==347895== Using Valgrind-3.15.0 and LibVEX; rerun with -h for copyright info
-==347895== Command: ./../../gwion -p. -m dummy -d dummy extend_array.gw
-==347895== Parent PID: 347195
-==347895== 
-==347895== 
-==347895== HEAP SUMMARY:
-==347895==     in use at exit: 9,092,505 bytes in 463 blocks
-==347895==   total heap usage: 886 allocs, 423 frees, 9,196,621 bytes allocated
-==347895== 
-==347895== LEAK SUMMARY:
-==347895==    definitely lost: 0 bytes in 0 blocks
-==347895==    indirectly lost: 0 bytes in 0 blocks
-==347895==      possibly lost: 0 bytes in 0 blocks
-==347895==    still reachable: 9,092,505 bytes in 463 blocks
-==347895==         suppressed: 0 bytes in 0 blocks
-==347895== Rerun with --leak-check=full to see details of leaked memory
-==347895== 
-==347895== For lists of detected and suppressed errors, rerun with: -s
-==347895== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-fptr.gw ==348011== Memcheck, a memory error detector
-==348011== Copyright (C) 2002-2017, and GNU GPL'd, by Julian Seward et al.
-==348011== Using Valgrind-3.15.0 and LibVEX; rerun with -h for copyright info
-==348011== Command: ./../../gwion -p. -m dummy -d dummy fptr.gw
-==348011== Parent PID: 347195
-==348011== 
-==348011== 
-==348011== HEAP SUMMARY:
-==348011==     in use at exit: 9,097,889 bytes in 485 blocks
-==348011==   total heap usage: 914 allocs, 429 frees, 9,202,357 bytes allocated
-==348011== 
-==348011== LEAK SUMMARY:
-==348011==    definitely lost: 0 bytes in 0 blocks
-==348011==    indirectly lost: 0 bytes in 0 blocks
-==348011==      possibly lost: 0 bytes in 0 blocks
-==348011==    still reachable: 9,097,889 bytes in 485 blocks
-==348011==         suppressed: 0 bytes in 0 blocks
-==348011== Rerun with --leak-check=full to see details of leaked memory
-==348011== 
-==348011== For lists of detected and suppressed errors, rerun with: -s
-==348011== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/tests/import/trig.c b/tests/import/trig.c
index 04cdf3d0907e93f465f68f4d1bfc5a84af77ef0e..0ebcf3b88d9d9afa098e88027c9528f3a854106d 100644 (file)
--- a/tests/import/trig.c
+++ b/tests/import/trig.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 TICK(trig_tick) {

diff --git a/tests/import/typedef.c b/tests/import/typedef.c
index d820abcffeb781e13535098507d6a12e354cf43c..ffe78fe6c397e58a8e229a6f7d657fbdba9f8b7a 100644 (file)
--- a/tests/import/typedef.c
+++ b/tests/import/typedef.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/tests/import/typedef_fail.c b/tests/import/typedef_fail.c
index a81d793d1d3f065e768af5bcb3b7208996f5729d..e3151146ceadadd25c17bebc60070952048714a8 100644 (file)
--- a/tests/import/typedef_fail.c
+++ b/tests/import/typedef_fail.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/tests/import/typedef_tmpl.c b/tests/import/typedef_tmpl.c
index f4a738dc587eb7d83586bd58545b12091dc0a22d..1ae96db9070b5e250ca718ddecece593aa5db767 100644 (file)
--- a/tests/import/typedef_tmpl.c
+++ b/tests/import/typedef_tmpl.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/tests/import/ugen_connect.c b/tests/import/ugen_connect.c
index dff5f5ac608ecbad4be6b7f37f8af03f3804f010..1bf34584d548c5bb1c76076ad9be37511e6f5e1a 100644 (file)
--- a/tests/import/ugen_connect.c
+++ b/tests/import/ugen_connect.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 #include "gwi.h"

diff --git a/tests/import/union.c b/tests/import/union.c
index b76c32509fb697ea41ca8e9a7d02a8b7c2526809..9e2fc88432068ae8f341fd3e53f15d874da7c0fc 100644 (file)
--- a/tests/import/union.c
+++ b/tests/import/union.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/tests/import/union_fail_exp.c b/tests/import/union_fail_exp.c
index 32d43199386449b193625cc29b8a736f39d3cd40..09d40f7700daee76d3971068b5cf7800283b9d94 100644 (file)
--- a/tests/import/union_fail_exp.c
+++ b/tests/import/union_fail_exp.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/tests/import/union_member.c b/tests/import/union_member.c
index 9007bb4697503aa5ddff88389389eefeaedab1b4..1d36fa0f2d286edd743722018068ab76efdf7a92 100644 (file)
--- a/tests/import/union_member.c
+++ b/tests/import/union_member.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/tests/import/union_name.c b/tests/import/union_name.c
index 702356e0315fe842e290f47bd666c950e9a0778d..b92ec03f49f521b7ba11c7123e2c90ee77a93112 100644 (file)
--- a/tests/import/union_name.c
+++ b/tests/import/union_name.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/tests/import/union_tmpl.c b/tests/import/union_tmpl.c
index 800cf5518ef128d047a813d0efce2d23b0d22edc..aa65700d0abef5bde899ea844e5c0eb38c2713e7 100644 (file)
--- a/tests/import/union_tmpl.c
+++ b/tests/import/union_tmpl.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/tests/import/union_tmpl_fail.c b/tests/import/union_tmpl_fail.c
index cf93e12bbf63127bc33631bb395a2a8c448744aa..57da35a86a8e630a45b00fb0a697b08b0b2b21be 100644 (file)
--- a/tests/import/union_tmpl_fail.c
+++ b/tests/import/union_tmpl_fail.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/tests/import/union_tmpl_fail2.c b/tests/import/union_tmpl_fail2.c
index 7a0bbf187cad56217825bdd5268fe0f271df440f..994dd3ee22b697d47abdc29f7900382881a7ec63 100644 (file)
--- a/tests/import/union_tmpl_fail2.c
+++ b/tests/import/union_tmpl_fail2.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/tests/import/union_tmpl_fail3.c b/tests/import/union_tmpl_fail3.c
index 12d25306a6e1fe53369d02c7a3590baa8fe9a221..f8fa4eb9884b45b47beb859c294f3c3b1030fb39 100644 (file)
--- a/tests/import/union_tmpl_fail3.c
+++ b/tests/import/union_tmpl_fail3.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 "object.h"
 #include "instr.h"
 #include "gwion.h"
-#include "value.h"
 #include "operator.h"
 #include "import.h"
 

diff --git a/tests/import/variadic.c b/tests/import/variadic.c
index 4cf7fcf363de04eca86f5436ace8b21adff65bcf..6b00bdbf83a38ee2645dd01eae4892792fa513cf 100644 (file)
--- a/tests/import/variadic.c
+++ b/tests/import/variadic.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 "vararg.h"

diff --git a/tests/import/vm_remove.c b/tests/import/vm_remove.c
index 101333da9fba0c2b438a3d9d7596c86066a59047..a0f17f47b6e51fb0af800d95665c21f501888875 100644 (file)
--- a/tests/import/vm_remove.c
+++ b/tests/import/vm_remove.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 "instr.h"