:art: Update tests

diff --git a/tests/module/get_module.c b/tests/module/get_module.c
index 3a27ad0538e351d22daf3a1ed3daa341e0a19ee6..b57af46a8d3d802d2a7e9d8be07506d35163956a 100644 (file)
--- 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 f8f342ca4829576bfbd5750da0dccd09514d3e02..b76f5f0b81386bc211790868bd0bc922d983331a 100644 (file)
--- 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 1dc4ff706012670037e06430f97f9603970ab56d..aaf8567067f69725e611579ae55d648cb6097810 100644 (file)
--- 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 7d4ed74b7719f889a7b8e509875daffd8bfa7262..235246d0c7dff46a8096e42a6134dc5b71652313 100644 (file)
--- 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 3a534285c16d0261f17a1326633a00c287231585..04299027f171b2d7d74309316954fe8dbae24ac2 100644 (file)
--- 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 185f57df00767ed969a0943d2c40b6e01751280b..c0c41944f9f68b02a1d0864c4d6a5ed714ab5969 100644 (file)
--- 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 9d917cb99f7067bc1ac725a6e6c58202ed6778b6..af45e0cd1a1992aafa1d9b09508de4aac22ea0a9 100644 (file)
--- 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 e8124a8a3e3354bc4d99807a325ed2c595310197..4a22db45f635c30fbbda0a87ea309aeee420526d 100644 (file)
--- 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 b766a45e91f03a4593c40f0d14ac0699ebccf5a6..99941a83e5de3cd6f8c106d7fbfed630cf3651c2 100644 (file)
--- 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 0ef547e3899c8a28abe89a32ddd7a875eb009ff1..4b3e6fbc394a0d3c9a44260e1c3916df8d25e8b7 100644 (file)
--- 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 39a7a194202289f61644787cdc1a748e7ccb45cc..e2bd0cc5c26930a033dfe93efd864667a75d70ba 100644 (file)
--- 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 d1c522c911d34bf9d209bbbb5ee663de9076cc36..46ed5c8949db83bea21d59dae19aa976158608f6 100644 (file)
--- 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 4f89da3f8d39b1e4787f27eccd137a7d9de07cc7..ccb769cd6b6ba9c48c35492ce955ef73c77a03df 100644 (file)
--- 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 7f57c64119ac6164972c8ad375b8483a81a7d062..5448becdc25a4cd7cac95429493a6a951a00759b 100644 (file)
--- 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 78ba7a8da4130e792900528721b3ae2804877e24..2b10e1df78089a3392e101296d6e5d5ec5e26b39 100644 (file)
--- 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 543f698d520315f4661178060b255a4b05db6dfc..c7961d4670e75c2240834775a93aca6985403e0c 100644 (file)
--- 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 f49dde9c7c99cae4a1de3efff1ce0012eb2bae89..d500aedcd7c9870ef9849162fa218d0503750316 100644 (file)
--- 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 2c5131be0f401380ef74a6baa22bf7b992d037d1..8af6c474e90e474ef20999012d772a1cd9c61265 100644 (file)
--- 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 2834167886b36be0aa7d737d6d61500e7f06a182..63291dcaa2fd1dab9fdf02446194cfc15ce73d0c 100644 (file)
--- 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 a829f59aefc5e358b142309e9df42b002d7da763..be46b12fe5137caf77b4939d4a13de7e349c8137 100644 (file)
--- 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 b78b9b5c35d8de7f7aca5b4c4837c117a292e4f0..05ce1e88e0c14fab4e47836d7f4c69158c54aeca 100644 (file)
--- 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 4fbbf11089e83cd41fc8593febb1fc53d9b3209b..370f629d63f9e9f8e858949edfe8b766611d523e 100644 (file)
--- 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 e00773d25aca3e0b6a4ea7722b9ca6a16452567f..08483e404d0f84efa9f12f5198f3982dc54bc181 100644 (file)
--- 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 d38bcd683fe8c3b920fe94b8e3051d94257f3142..9a53e09420093656a2f1c6abb57729ce0c18181c 100644 (file)
--- 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 d848eaa673128c7a2e5747814c47bbbacbc63814..e7fd722258df0e3a27374aa75796ab7559b45f8d 100644 (file)
--- 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 efd5c20876433f4805c9823890205508d473b2fb..b2292dc1ca620514453c6f09d1ed455e6af8a965 100644 (file)
--- 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 0bb4c59b1eb3e0850e0f84a6e88621cc73a8a7ac..31a87811e88d23c5668969ba1f2424812427e2cb 100644 (file)
--- 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 a9a6afc39629e715114d89982f482e88d107a491..8e007f590278a456100d5fe2b2c371b55b419d44 100644 (file)
--- 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 5f3c22c9d9c62b5c5577c8802bde8a27d008bb87..5d3e73a74d9723623585e8e4770d736a848cc8f7 100644 (file)
--- 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 b61758cebadea14d2303cb961abe76c7f699530a..362e853babfa18a67d30df4f4ab6df8f85184443 100644 (file)
--- 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 6bf4baae6b71f8d9d1cfe16693eb46df1e450ed0..88a735d6d456a5975e58df87bb019c298acc8553 100644 (file)
--- 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 88bae08b32a2fa158d38935f5b29decb545f9e1e..6b47cd53d0f3ce2d0830f740feaa89093eaacc3a 100644 (file)
--- 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 7ec972004435d7e99b08c2ce4c69e8f4cdabf5e7..1032deaf760b4c10e8d39adbaf2b48cd1e532f24 100644 (file)
--- 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 04a99a345e0eda427d524367f8c6361958ae9e21..02c58e77b5209f36aef23f2d7fe5587e1ae76d9f 100644 (file)
--- 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 92bb664c67e4178d63595159f1f910a52a40aa1d..baf33fc2df9fc45c9128c9d3952841b044ecb6ec 100644 (file)
--- 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 a2796a9e22980dbe8f1b1e8a27b8a886067c2aed..cd5c6c54e6d98a6931f5b3505b172d97628f43dd 100644 (file)
--- 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 b17e225e6474b6a8dcdca19b4569575fce82dcfa..879b6f6528e780b8b81f638af2c7a48a913f4047 100644 (file)
--- 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 3b1f3fd00d3c19cb97e472a990041da6f06057dc..bc2061fcda8367786f32c99ea7ff9148366a4023 100644 (file)
--- 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 118a0206e419df5607932a7a6ace75a980f93a09..18728785a4601a9c6565dbe73e67a9d6bd66cd88 100644 (file)
--- 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 765ea034b9eb75dc41759a0c834a2e3750381de3..5c5ee32502059fe440533837ce2784e35ff4aa48 100644 (file)
--- 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 3793a9a6cce1487f4d4fa1989caeca07e60a7f46..9fceb1c191126dd2d134ce17881a444f5c232db2 100644 (file)
--- 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 6cda2e4195b59e404baf94dda052895830693e08..3d7dbd3b741a4e13d6606e44fb2edf254935d94a 100644 (file)
--- 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 4a527ec757a5f8d9dc8499db0469e328292141c4..d32770da3a8455a2f66f469cb03d81d23a0d94b7 100644 (file)
--- 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 72be714647fd7f61aab3cb8ca1643bb1029d84f5..b082eb878d6571986ec9f69ecaa141dcbbdf8112 100644 (file)
--- 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 efcdcd4877c1d729a4a1d4a581854d4d87e364a3..a64d925f0567298fa98452679957c45772b40e77 100644 (file)
--- 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 2fb1ac8f5cb8b2e0d17c4f1094d842168830e002..af57b7cbbbb174fe19e7504b2c1c117d5318b4a2 100644 (file)
--- 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 416c8ecd1fc07d26aa04fbecfe9b4df3405fc204..0d5047267faf8a4a251db9c62fe5c9914bbcbd41 100644 (file)
--- 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 dbcc6e7f52d7642710639f68c57f2e8e454d1b74..ddca56cb4444fc231988cbf174c3ccc7c574ee8b 100644 (file)
--- 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 0f95038c408a1a0a1141cdf7c8ec52c34158c36e..5c8d1a211128d40d4ee8ae78befbf729b3d5ae07 100644 (file)
--- 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 ba1a75a48990039f9388089955d6950e4a049749..3974407182222053c695961c3cbf07f6521ec8fa 100644 (file)
--- 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 ffe78fe6c397e58a8e229a6f7d657fbdba9f8b7a..634859ebc18f2b4dce8c6dc6e5af6f84e4f57265 100644 (file)
--- 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 a2a4dfc1f27dc26cdb1e4f2fa3bb5f3e3f99b9ef..714e63bd15502d2641ca7dbbe9c15f4cfc4f2f7a 100644 (file)
--- 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 4457541952e3bd18127fcd18878c40fee0f10fe0..a82a59888907acfdfa5663f0b85a7c4c70847c31 100644 (file)
--- 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 1bf34584d548c5bb1c76076ad9be37511e6f5e1a..450102f0364856ed265eaea33118d367794b7c26 100644 (file)
--- 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 5dd8357fe0ff1221402a949e4681fc957f55d156..54b26d79a69e53e664fa8e5a6d744b9815074a4b 100644 (file)
--- 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 6d4bc0447d3ad40dfaae2c32178140994cb068cf..dc89fc93b9298be4b98d02837a677fde9b40e704 100644 (file)
--- 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 830e3181fb8bba9a298b4b24b91468d00abb65af..c7e25327d98b7671c9557b1c05b468d4dc4b10e6 100644 (file)
--- 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 671280d2fe6ee5d4fa275644e6d336616debd86c..166b6242d76c1c3cd4ddf4dcff11653caa32a8a3 100644 (file)
--- 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 83aee39ea617d7329322a16f469eeb5491306768..a3979944bb491abc598af9f7eb0c46538a9bc42a 100644 (file)
--- 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 83aee39ea617d7329322a16f469eeb5491306768..a3979944bb491abc598af9f7eb0c46538a9bc42a 100644 (file)
--- 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 cc23bc1b27be21a7f30e481d4cc955ea40818fdb..7a65b7e8fdf205daef0e68ed7ac58c540c8648cd 100644 (file)
--- 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 83aee39ea617d7329322a16f469eeb5491306768..a3979944bb491abc598af9f7eb0c46538a9bc42a 100644 (file)
--- 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 a34b3e2f7ac0d4064f6e87508542ced42b3d3098..5ad04f6b6bfc48180ba0f97dcd2870292337292b 100644 (file)
--- 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 a0f17f47b6e51fb0af800d95665c21f501888875..b700d1e3b9d60313f75fc9eae28221d802d2a58b 100644 (file)
--- 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"