From 17b54049451a5040dba80a93c01261fc48d577fa Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Astor?= Date: Tue, 5 Jan 2021 14:24:27 +0100 Subject: [PATCH] :art: Update tests --- tests/module/get_module.c | 2 +- tests/plug/array.c | 2 +- tests/plug/array_in_var_name.c | 2 +- tests/plug/array_in_var_name_fail.c | 2 +- tests/plug/array_incoherent_in_var_name.c | 2 +- tests/plug/array_invalid_in_var_name.c | 2 +- tests/plug/callback.c | 2 +- tests/plug/class_template.c | 2 +- tests/plug/class_template_fail.c | 2 +- tests/plug/class_template_invalid.c | 2 +- tests/plug/compile_file.c | 2 +- tests/plug/compile_string.c | 2 +- tests/plug/coverage.c | 2 +- tests/plug/deps.c | 2 +- tests/plug/empty_union.c | 2 +- tests/plug/enum.c | 2 +- tests/plug/enum_fail.c | 2 +- tests/plug/enum_fail2.c | 2 +- tests/plug/enum_fail3.c | 2 +- tests/plug/extend_array.c | 2 +- tests/plug/fptr.c | 2 +- tests/plug/fptr_tmpl.c | 2 +- tests/plug/fptr_tmpl_fail.c | 2 +- tests/plug/func_fail.c | 2 +- tests/plug/func_fail2.c | 2 +- tests/plug/func_fail3.c | 2 +- tests/plug/func_fail4.c | 2 +- tests/plug/func_subscript_not_empty.c | 2 +- tests/plug/func_tmpl.c | 2 +- tests/plug/func_tmpl_fail.c | 2 +- tests/plug/func_too_many_arg.c | 2 +- tests/plug/global_func.c | 2 +- tests/plug/global_var.c | 2 +- tests/plug/invalid_arg.c | 2 +- tests/plug/invalid_array.c | 2 +- tests/plug/invalid_func.c | 2 +- tests/plug/invalid_type1.c | 2 +- tests/plug/invalid_type2.c | 2 +- tests/plug/invalid_type3.c | 2 +- tests/plug/mk_type_array.c | 2 +- tests/plug/no_import.c | 2 +- tests/plug/not_importing.c | 2 +- tests/plug/op_already_imported.c | 3 +-- tests/plug/pass.c | 2 +- tests/plug/specialid_emit.c | 2 +- tests/plug/static_string.c | 2 +- tests/plug/str2decl.c | 2 +- tests/plug/str2list_fail.c | 2 +- tests/plug/struct.c | 2 +- tests/plug/template_arg.c | 2 +- tests/plug/typedef.c | 2 +- tests/plug/typedef_fail.c | 2 +- tests/plug/typedef_tmpl.c | 2 +- tests/plug/ugen_connect.c | 2 +- tests/plug/union.c | 2 +- tests/plug/union_fail_exp.c | 2 +- tests/plug/union_member.c | 2 +- tests/plug/union_name.c | 2 +- tests/plug/union_tmpl.c | 2 +- tests/plug/union_tmpl_fail.c | 2 +- tests/plug/union_tmpl_fail2.c | 2 +- tests/plug/union_tmpl_fail3.c | 2 +- tests/plug/variadic.c | 17 +++++++++-------- tests/plug/vm_remove.c | 2 +- 64 files changed, 72 insertions(+), 72 deletions(-) diff --git a/tests/module/get_module.c b/tests/module/get_module.c index 3a27ad05..b57af46a 100644 --- a/tests/module/get_module.c +++ b/tests/module/get_module.c @@ -4,9 +4,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "driver.h" #include "gwion.h" +#include "object.h" #include "instr.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/array.c b/tests/plug/array.c index f8f342ca..b76f5f0b 100644 --- a/tests/plug/array.c +++ b/tests/plug/array.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "gwi.h" diff --git a/tests/plug/array_in_var_name.c b/tests/plug/array_in_var_name.c index 1dc4ff70..aaf85670 100644 --- a/tests/plug/array_in_var_name.c +++ b/tests/plug/array_in_var_name.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "gwi.h" diff --git a/tests/plug/array_in_var_name_fail.c b/tests/plug/array_in_var_name_fail.c index 7d4ed74b..235246d0 100644 --- a/tests/plug/array_in_var_name_fail.c +++ b/tests/plug/array_in_var_name_fail.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "gwi.h" diff --git a/tests/plug/array_incoherent_in_var_name.c b/tests/plug/array_incoherent_in_var_name.c index 3a534285..04299027 100644 --- a/tests/plug/array_incoherent_in_var_name.c +++ b/tests/plug/array_incoherent_in_var_name.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "gwi.h" diff --git a/tests/plug/array_invalid_in_var_name.c b/tests/plug/array_invalid_in_var_name.c index 185f57df..c0c41944 100644 --- a/tests/plug/array_invalid_in_var_name.c +++ b/tests/plug/array_invalid_in_var_name.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "gwi.h" diff --git a/tests/plug/callback.c b/tests/plug/callback.c index 9d917cb9..af45e0cd 100644 --- a/tests/plug/callback.c +++ b/tests/plug/callback.c @@ -3,9 +3,9 @@ #include "gwion_env.h" #include "vm.h" #include "instr.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "gwi.h" diff --git a/tests/plug/class_template.c b/tests/plug/class_template.c index e8124a8a..4a22db45 100644 --- a/tests/plug/class_template.c +++ b/tests/plug/class_template.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "gwi.h" diff --git a/tests/plug/class_template_fail.c b/tests/plug/class_template_fail.c index b766a45e..99941a83 100644 --- a/tests/plug/class_template_fail.c +++ b/tests/plug/class_template_fail.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "gwi.h" diff --git a/tests/plug/class_template_invalid.c b/tests/plug/class_template_invalid.c index 0ef547e3..4b3e6fbc 100644 --- a/tests/plug/class_template_invalid.c +++ b/tests/plug/class_template_invalid.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "gwi.h" diff --git a/tests/plug/compile_file.c b/tests/plug/compile_file.c index 39a7a194..e2bd0cc5 100644 --- a/tests/plug/compile_file.c +++ b/tests/plug/compile_file.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "gwi.h" diff --git a/tests/plug/compile_string.c b/tests/plug/compile_string.c index d1c522c9..46ed5c89 100644 --- a/tests/plug/compile_string.c +++ b/tests/plug/compile_string.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "gwi.h" diff --git a/tests/plug/coverage.c b/tests/plug/coverage.c index 4f89da3f..ccb769cd 100644 --- a/tests/plug/coverage.c +++ b/tests/plug/coverage.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "gwi.h" diff --git a/tests/plug/deps.c b/tests/plug/deps.c index 7f57c641..5448becd 100644 --- a/tests/plug/deps.c +++ b/tests/plug/deps.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "gwi.h" diff --git a/tests/plug/empty_union.c b/tests/plug/empty_union.c index 78ba7a8d..2b10e1df 100644 --- a/tests/plug/empty_union.c +++ b/tests/plug/empty_union.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/enum.c b/tests/plug/enum.c index 543f698d..c7961d46 100644 --- a/tests/plug/enum.c +++ b/tests/plug/enum.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/enum_fail.c b/tests/plug/enum_fail.c index f49dde9c..d500aedc 100644 --- a/tests/plug/enum_fail.c +++ b/tests/plug/enum_fail.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/enum_fail2.c b/tests/plug/enum_fail2.c index 2c5131be..8af6c474 100644 --- a/tests/plug/enum_fail2.c +++ b/tests/plug/enum_fail2.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/enum_fail3.c b/tests/plug/enum_fail3.c index 28341678..63291dca 100644 --- a/tests/plug/enum_fail3.c +++ b/tests/plug/enum_fail3.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/extend_array.c b/tests/plug/extend_array.c index a829f59a..be46b12f 100644 --- a/tests/plug/extend_array.c +++ b/tests/plug/extend_array.c @@ -3,9 +3,9 @@ #include "gwion_env.h" #include "vm.h" #include "instr.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "gwi.h" diff --git a/tests/plug/fptr.c b/tests/plug/fptr.c index b78b9b5c..05ce1e88 100644 --- a/tests/plug/fptr.c +++ b/tests/plug/fptr.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/fptr_tmpl.c b/tests/plug/fptr_tmpl.c index 4fbbf110..370f629d 100644 --- a/tests/plug/fptr_tmpl.c +++ b/tests/plug/fptr_tmpl.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/fptr_tmpl_fail.c b/tests/plug/fptr_tmpl_fail.c index e00773d2..08483e40 100644 --- a/tests/plug/fptr_tmpl_fail.c +++ b/tests/plug/fptr_tmpl_fail.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/func_fail.c b/tests/plug/func_fail.c index d38bcd68..9a53e094 100644 --- a/tests/plug/func_fail.c +++ b/tests/plug/func_fail.c @@ -3,8 +3,8 @@ #include "gwion_env.h" #include "vm.h" #include "instr.h" -#include "object.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "instr.h" diff --git a/tests/plug/func_fail2.c b/tests/plug/func_fail2.c index d848eaa6..e7fd7222 100644 --- a/tests/plug/func_fail2.c +++ b/tests/plug/func_fail2.c @@ -3,8 +3,8 @@ #include "gwion_env.h" #include "vm.h" #include "instr.h" -#include "object.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "instr.h" diff --git a/tests/plug/func_fail3.c b/tests/plug/func_fail3.c index efd5c208..b2292dc1 100644 --- a/tests/plug/func_fail3.c +++ b/tests/plug/func_fail3.c @@ -3,8 +3,8 @@ #include "gwion_env.h" #include "vm.h" #include "instr.h" -#include "object.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "instr.h" diff --git a/tests/plug/func_fail4.c b/tests/plug/func_fail4.c index 0bb4c59b..31a87811 100644 --- a/tests/plug/func_fail4.c +++ b/tests/plug/func_fail4.c @@ -3,8 +3,8 @@ #include "gwion_env.h" #include "vm.h" #include "instr.h" -#include "object.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "instr.h" diff --git a/tests/plug/func_subscript_not_empty.c b/tests/plug/func_subscript_not_empty.c index a9a6afc3..8e007f59 100644 --- a/tests/plug/func_subscript_not_empty.c +++ b/tests/plug/func_subscript_not_empty.c @@ -3,8 +3,8 @@ #include "gwion_env.h" #include "vm.h" #include "instr.h" -#include "object.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "instr.h" diff --git a/tests/plug/func_tmpl.c b/tests/plug/func_tmpl.c index 5f3c22c9..5d3e73a7 100644 --- a/tests/plug/func_tmpl.c +++ b/tests/plug/func_tmpl.c @@ -3,8 +3,8 @@ #include "gwion_env.h" #include "vm.h" #include "instr.h" -#include "object.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "instr.h" diff --git a/tests/plug/func_tmpl_fail.c b/tests/plug/func_tmpl_fail.c index b61758ce..362e853b 100644 --- a/tests/plug/func_tmpl_fail.c +++ b/tests/plug/func_tmpl_fail.c @@ -3,8 +3,8 @@ #include "gwion_env.h" #include "vm.h" #include "instr.h" -#include "object.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "instr.h" diff --git a/tests/plug/func_too_many_arg.c b/tests/plug/func_too_many_arg.c index 6bf4baae..88a735d6 100644 --- a/tests/plug/func_too_many_arg.c +++ b/tests/plug/func_too_many_arg.c @@ -3,8 +3,8 @@ #include "gwion_env.h" #include "vm.h" #include "instr.h" -#include "object.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "instr.h" diff --git a/tests/plug/global_func.c b/tests/plug/global_func.c index 88bae08b..6b47cd53 100644 --- a/tests/plug/global_func.c +++ b/tests/plug/global_func.c @@ -3,8 +3,8 @@ #include "gwion_env.h" #include "vm.h" #include "instr.h" -#include "object.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "instr.h" diff --git a/tests/plug/global_var.c b/tests/plug/global_var.c index 7ec97200..1032deaf 100644 --- a/tests/plug/global_var.c +++ b/tests/plug/global_var.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "gwi.h" diff --git a/tests/plug/invalid_arg.c b/tests/plug/invalid_arg.c index 04a99a34..02c58e77 100644 --- a/tests/plug/invalid_arg.c +++ b/tests/plug/invalid_arg.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/invalid_array.c b/tests/plug/invalid_array.c index 92bb664c..baf33fc2 100644 --- a/tests/plug/invalid_array.c +++ b/tests/plug/invalid_array.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/invalid_func.c b/tests/plug/invalid_func.c index a2796a9e..cd5c6c54 100644 --- a/tests/plug/invalid_func.c +++ b/tests/plug/invalid_func.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/invalid_type1.c b/tests/plug/invalid_type1.c index b17e225e..879b6f65 100644 --- a/tests/plug/invalid_type1.c +++ b/tests/plug/invalid_type1.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/invalid_type2.c b/tests/plug/invalid_type2.c index 3b1f3fd0..bc2061fc 100644 --- a/tests/plug/invalid_type2.c +++ b/tests/plug/invalid_type2.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/invalid_type3.c b/tests/plug/invalid_type3.c index 118a0206..18728785 100644 --- a/tests/plug/invalid_type3.c +++ b/tests/plug/invalid_type3.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/mk_type_array.c b/tests/plug/mk_type_array.c index 765ea034..5c5ee325 100644 --- a/tests/plug/mk_type_array.c +++ b/tests/plug/mk_type_array.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "gwi.h" diff --git a/tests/plug/no_import.c b/tests/plug/no_import.c index 3793a9a6..9fceb1c1 100644 --- a/tests/plug/no_import.c +++ b/tests/plug/no_import.c @@ -2,8 +2,8 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/not_importing.c b/tests/plug/not_importing.c index 6cda2e41..3d7dbd3b 100644 --- a/tests/plug/not_importing.c +++ b/tests/plug/not_importing.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/op_already_imported.c b/tests/plug/op_already_imported.c index 4a527ec7..d32770da 100644 --- a/tests/plug/op_already_imported.c +++ b/tests/plug/op_already_imported.c @@ -3,10 +3,9 @@ #include "gwion_env.h" #include "vm.h" #include "instr.h" -#include "object.h" -#include "instr.h" #include "vm.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "gwi.h" diff --git a/tests/plug/pass.c b/tests/plug/pass.c index 72be7146..b082eb87 100644 --- a/tests/plug/pass.c +++ b/tests/plug/pass.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "gwi.h" diff --git a/tests/plug/specialid_emit.c b/tests/plug/specialid_emit.c index efcdcd48..a64d925f 100644 --- a/tests/plug/specialid_emit.c +++ b/tests/plug/specialid_emit.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "emit.h" diff --git a/tests/plug/static_string.c b/tests/plug/static_string.c index 2fb1ac8f..af57b7cb 100644 --- a/tests/plug/static_string.c +++ b/tests/plug/static_string.c @@ -3,9 +3,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "gwi.h" diff --git a/tests/plug/str2decl.c b/tests/plug/str2decl.c index 416c8ecd..0d504726 100644 --- a/tests/plug/str2decl.c +++ b/tests/plug/str2decl.c @@ -5,8 +5,8 @@ #include "gwion_env.h" #include "vm.h" #include "gwion.h" -#include "instr.h" #include "object.h" +#include "instr.h" #include "operator.h" #include "import.h" #include "ugen.h" diff --git a/tests/plug/str2list_fail.c b/tests/plug/str2list_fail.c index dbcc6e7f..ddca56cb 100644 --- a/tests/plug/str2list_fail.c +++ b/tests/plug/str2list_fail.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "gwi.h" diff --git a/tests/plug/struct.c b/tests/plug/struct.c index 0f95038c..5c8d1a21 100644 --- a/tests/plug/struct.c +++ b/tests/plug/struct.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "gwi.h" diff --git a/tests/plug/template_arg.c b/tests/plug/template_arg.c index ba1a75a4..39744071 100644 --- a/tests/plug/template_arg.c +++ b/tests/plug/template_arg.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/typedef.c b/tests/plug/typedef.c index ffe78fe6..634859eb 100644 --- a/tests/plug/typedef.c +++ b/tests/plug/typedef.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/typedef_fail.c b/tests/plug/typedef_fail.c index a2a4dfc1..714e63bd 100644 --- a/tests/plug/typedef_fail.c +++ b/tests/plug/typedef_fail.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/typedef_tmpl.c b/tests/plug/typedef_tmpl.c index 44575419..a82a5988 100644 --- a/tests/plug/typedef_tmpl.c +++ b/tests/plug/typedef_tmpl.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/ugen_connect.c b/tests/plug/ugen_connect.c index 1bf34584..450102f0 100644 --- a/tests/plug/ugen_connect.c +++ b/tests/plug/ugen_connect.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "gwi.h" diff --git a/tests/plug/union.c b/tests/plug/union.c index 5dd8357f..54b26d79 100644 --- a/tests/plug/union.c +++ b/tests/plug/union.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/union_fail_exp.c b/tests/plug/union_fail_exp.c index 6d4bc044..dc89fc93 100644 --- a/tests/plug/union_fail_exp.c +++ b/tests/plug/union_fail_exp.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/union_member.c b/tests/plug/union_member.c index 830e3181..c7e25327 100644 --- a/tests/plug/union_member.c +++ b/tests/plug/union_member.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/union_name.c b/tests/plug/union_name.c index 671280d2..166b6242 100644 --- a/tests/plug/union_name.c +++ b/tests/plug/union_name.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/union_tmpl.c b/tests/plug/union_tmpl.c index 83aee39e..a3979944 100644 --- a/tests/plug/union_tmpl.c +++ b/tests/plug/union_tmpl.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/union_tmpl_fail.c b/tests/plug/union_tmpl_fail.c index 83aee39e..a3979944 100644 --- a/tests/plug/union_tmpl_fail.c +++ b/tests/plug/union_tmpl_fail.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/union_tmpl_fail2.c b/tests/plug/union_tmpl_fail2.c index cc23bc1b..7a65b7e8 100644 --- a/tests/plug/union_tmpl_fail2.c +++ b/tests/plug/union_tmpl_fail2.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/union_tmpl_fail3.c b/tests/plug/union_tmpl_fail3.c index 83aee39e..a3979944 100644 --- a/tests/plug/union_tmpl_fail3.c +++ b/tests/plug/union_tmpl_fail3.c @@ -2,9 +2,9 @@ #include "gwion_ast.h" #include "gwion_env.h" #include "vm.h" -#include "object.h" #include "instr.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" diff --git a/tests/plug/variadic.c b/tests/plug/variadic.c index a34b3e2f..5ad04f6b 100644 --- a/tests/plug/variadic.c +++ b/tests/plug/variadic.c @@ -3,8 +3,8 @@ #include "gwion_env.h" #include "vm.h" #include "instr.h" -#include "object.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "vararg.h" @@ -22,16 +22,17 @@ static MFUN(m_variadic) { struct Vararg_* arg = *(struct Vararg_**)vararg_obj->data; m_uint i = 0; - while(i < arg->s) { + const m_uint offset = *(m_uint*)(vararg_obj->data + SZ_INT * 3); + while(i < *(m_uint*)(vararg_obj->data + SZ_INT * 5)) { if(*str == 'i') { - gw_out("%"INT_F "\n", *(m_int*)(arg->d + arg->o)); - arg->o += SZ_INT; + gw_out("%"INT_F "\n", *(m_int*)(arg->d + offset)); + *(m_uint*)(vararg_obj->data + SZ_INT * 3) += SZ_INT; } else if(*str == 'f') { - gw_out("%f\n", *(m_float*)(arg->d + arg->o)); - arg->o += SZ_FLOAT; + gw_out("%f\n", *(m_float*)(arg->d + offset)); + *(m_uint*)(vararg_obj->data + SZ_INT * 3) += SZ_FLOAT; } else if(*str == 'o') { - gw_out("%p\n", (void*)*(M_Object*)(arg->d + arg->o)); - arg->o += SZ_INT; + gw_out("%p\n", (void*)*(M_Object*)(arg->d + offset)); + *(m_uint*)(vararg_obj->data + SZ_INT * 3) += SZ_INT; } ++i; str++; diff --git a/tests/plug/vm_remove.c b/tests/plug/vm_remove.c index a0f17f47..b700d1e3 100644 --- a/tests/plug/vm_remove.c +++ b/tests/plug/vm_remove.c @@ -3,8 +3,8 @@ #include "gwion_env.h" #include "vm.h" #include "instr.h" -#include "object.h" #include "gwion.h" +#include "object.h" #include "operator.h" #include "import.h" #include "instr.h" -- 2.43.0