From a0c98b443937fddfefee7a539e5bf96b9e872d53 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Astor?= Date: Fri, 7 May 2021 13:07:31 +0200 Subject: [PATCH] :art: rename require => import --- plug | 2 +- src/parse/scan0.c | 2 +- tests/error/require_fail.gw | 2 +- tests/module/get_module.gw | 2 +- tests/plug/array.gw | 2 +- tests/plug/array_in_var_name.gw | 2 +- tests/plug/array_in_var_name_fail.gw | 2 +- tests/plug/array_incoherent_in_var_name.gw | 2 +- tests/plug/array_invalid_in_var_name.gw | 2 +- tests/plug/callback.gw | 2 +- tests/plug/class_template.gw | 2 +- tests/plug/class_template_fail.gw | 2 +- tests/plug/class_template_invalid.gw | 2 +- tests/plug/compile_file.gw | 2 +- tests/plug/compile_string.gw | 2 +- tests/plug/coverage.gw | 4 ++-- tests/plug/deps.gw | 2 +- tests/plug/empty_union.gw | 2 +- tests/plug/end_class.gw | 2 +- tests/plug/enum.gw | 2 +- tests/plug/enum_fail.gw | 2 +- tests/plug/enum_fail2.gw | 2 +- tests/plug/enum_fail3.gw | 2 +- tests/plug/extend_array.gw | 2 +- tests/plug/fail_on_next_arg.gw | 2 +- tests/plug/fail_on_next_arg2.gw | 2 +- tests/plug/fptr.gw | 2 +- tests/plug/fptr_tmpl.gw | 2 +- tests/plug/fptr_tmpl_fail.gw | 2 +- tests/plug/func_fail.gw | 2 +- tests/plug/func_fail2.gw | 2 +- tests/plug/func_fail3.gw | 2 +- tests/plug/func_fail4.gw | 2 +- tests/plug/func_subscript_not_empty.gw | 2 +- tests/plug/func_tmpl.gw | 2 +- tests/plug/func_tmpl_fail.gw | 2 +- tests/plug/func_too_many_arg.gw | 2 +- tests/plug/global_func.gw | 2 +- tests/plug/global_var.gw | 2 +- tests/plug/invalid_arg.gw | 2 +- tests/plug/invalid_array.gw | 2 +- tests/plug/invalid_func.gw | 2 +- tests/plug/invalid_names.gw | 2 +- tests/plug/invalid_names0.gw | 2 +- tests/plug/invalid_names1.gw | 2 +- tests/plug/invalid_names2.gw | 2 +- tests/plug/invalid_names3.gw | 2 +- tests/plug/invalid_type1.gw | 2 +- tests/plug/invalid_type2.gw | 2 +- tests/plug/invalid_type3.gw | 2 +- tests/plug/mk_type_array.gw | 2 +- tests/plug/no_import.gw | 2 +- tests/plug/not_importing.gw | 2 +- tests/plug/op_already_imported.gw | 2 +- tests/plug/pass.gw | 2 +- tests/plug/specialid_emit.gw | 2 +- tests/plug/static_string.gw | 2 +- tests/plug/str2decl.gw | 2 +- tests/plug/str2list_fail.gw | 2 +- tests/plug/struct.gw | 2 +- tests/plug/template_arg.gw | 2 +- tests/plug/trig.gw | 2 +- tests/plug/typedef.gw | 2 +- tests/plug/typedef_fail.gw | 2 +- tests/plug/typedef_tmpl.gw | 2 +- tests/plug/ugen_connect.gw | 2 +- tests/plug/union.gw | 2 +- tests/plug/union_fail_exp.gw | 2 +- tests/plug/union_member.gw | 2 +- tests/plug/union_name.gw | 2 +- tests/plug/union_tmpl.gw | 2 +- tests/plug/union_tmpl_fail.gw | 2 +- tests/plug/union_tmpl_fail2.gw | 2 +- tests/plug/union_tmpl_fail3.gw | 2 +- tests/plug/variadic.gw | 2 +- tests/plug/vm_remove.gw | 2 +- 76 files changed, 77 insertions(+), 77 deletions(-) diff --git a/plug b/plug index 730d0849..b9321362 160000 --- a/plug +++ b/plug @@ -1 +1 @@ -Subproject commit 730d0849dd264a9bade1ea7c3746715d0068443c +Subproject commit b932136274811c52694dc7f2d3c9de0832e6b64b diff --git a/src/parse/scan0.c b/src/parse/scan0.c index 92fbb9a9..a6c37acb 100644 --- a/src/parse/scan0.c +++ b/src/parse/scan0.c @@ -344,7 +344,7 @@ ANN static m_bool scan0_stmt_list(const Env env, Stmt_List list) { do if(list->stmt->stmt_type == ae_stmt_pp) { if(list->stmt->d.stmt_pp.pp_type == ae_pp_include) env->name = list->stmt->d.stmt_pp.data; - else if(list->stmt->d.stmt_pp.pp_type == ae_pp_require) + else if(list->stmt->d.stmt_pp.pp_type == ae_pp_import) CHECK_BB(plugin_ini(env->gwion, list->stmt->d.stmt_pp.data)); } while((list = list->next)); return GW_OK; diff --git a/tests/error/require_fail.gw b/tests/error/require_fail.gw index 01646ae7..8f806880 100644 --- a/tests/error/require_fail.gw +++ b/tests/error/require_fail.gw @@ -1,4 +1,4 @@ -#require NonExisting +#import NonExisting var ftbl f; <<< var SinOsc s >>>; diff --git a/tests/module/get_module.gw b/tests/module/get_module.gw index ef38782f..61692665 100644 --- a/tests/module/get_module.gw +++ b/tests/module/get_module.gw @@ -1,2 +1,2 @@ -#require get_module +#import get_module <<< __file__ >>>; diff --git a/tests/plug/array.gw b/tests/plug/array.gw index 8958ace4..bcbe8c9e 100644 --- a/tests/plug/array.gw +++ b/tests/plug/array.gw @@ -1,2 +1,2 @@ -#require array +#import array <<< __file__ >>>; diff --git a/tests/plug/array_in_var_name.gw b/tests/plug/array_in_var_name.gw index c6e79b56..d50dfbaf 100644 --- a/tests/plug/array_in_var_name.gw +++ b/tests/plug/array_in_var_name.gw @@ -1,2 +1,2 @@ -#require array_in_var_name +#import array_in_var_name <<< __file__ >>>; diff --git a/tests/plug/array_in_var_name_fail.gw b/tests/plug/array_in_var_name_fail.gw index 122ac5fe..9d0928c1 100644 --- a/tests/plug/array_in_var_name_fail.gw +++ b/tests/plug/array_in_var_name_fail.gw @@ -1,2 +1,2 @@ -#require array_in_var_name_fail +#import array_in_var_name_fail <<< __file__ >>>; diff --git a/tests/plug/array_incoherent_in_var_name.gw b/tests/plug/array_incoherent_in_var_name.gw index a7e9493b..b385c34c 100644 --- a/tests/plug/array_incoherent_in_var_name.gw +++ b/tests/plug/array_incoherent_in_var_name.gw @@ -1,2 +1,2 @@ -#require array_incoherent_in_var_name +#import array_incoherent_in_var_name <<< __file__ >>>; diff --git a/tests/plug/array_invalid_in_var_name.gw b/tests/plug/array_invalid_in_var_name.gw index 0d9b7496..d5e5542f 100644 --- a/tests/plug/array_invalid_in_var_name.gw +++ b/tests/plug/array_invalid_in_var_name.gw @@ -1,2 +1,2 @@ -#require array_invalid_in_var_name +#import array_invalid_in_var_name <<< __file__ >>>; diff --git a/tests/plug/callback.gw b/tests/plug/callback.gw index 832778b6..a0aeef7f 100644 --- a/tests/plug/callback.gw +++ b/tests/plug/callback.gw @@ -1,2 +1,2 @@ -#require callback +#import callback <<< __file__ >>>; diff --git a/tests/plug/class_template.gw b/tests/plug/class_template.gw index 264e0021..6eb3670a 100644 --- a/tests/plug/class_template.gw +++ b/tests/plug/class_template.gw @@ -1,3 +1,3 @@ -#require class_template +#import class_template var ClassTemplate:[int, int] ct; <<< ct.key >>>; diff --git a/tests/plug/class_template_fail.gw b/tests/plug/class_template_fail.gw index c07b0f83..57307bc2 100644 --- a/tests/plug/class_template_fail.gw +++ b/tests/plug/class_template_fail.gw @@ -1,2 +1,2 @@ -#require class_template_fail +#import class_template_fail <<< __file__ >>>; diff --git a/tests/plug/class_template_invalid.gw b/tests/plug/class_template_invalid.gw index 55d995a9..591b14e8 100644 --- a/tests/plug/class_template_invalid.gw +++ b/tests/plug/class_template_invalid.gw @@ -1,2 +1,2 @@ -#require class_template_invalid +#import class_template_invalid <<< __file__ >>>; diff --git a/tests/plug/compile_file.gw b/tests/plug/compile_file.gw index ed03ba6a..97b775be 100644 --- a/tests/plug/compile_file.gw +++ b/tests/plug/compile_file.gw @@ -1,2 +1,2 @@ -#require compile_file +#import compile_file <<< __file__ >>>; diff --git a/tests/plug/compile_string.gw b/tests/plug/compile_string.gw index b6ea861d..ef614241 100644 --- a/tests/plug/compile_string.gw +++ b/tests/plug/compile_string.gw @@ -1,2 +1,2 @@ -#require compile_string +#import compile_string <<< __file__ >>>; diff --git a/tests/plug/coverage.gw b/tests/plug/coverage.gw index 973b0434..f4f75d0e 100644 --- a/tests/plug/coverage.gw +++ b/tests/plug/coverage.gw @@ -1,5 +1,5 @@ -#require coverage -#require coverage +#import coverage +#import coverage <<< var float f >>>; var Coverage c; diff --git a/tests/plug/deps.gw b/tests/plug/deps.gw index eda35760..4ea4a97c 100644 --- a/tests/plug/deps.gw +++ b/tests/plug/deps.gw @@ -1,3 +1,3 @@ -#require deps +#import deps <<< __file__ >>>; diff --git a/tests/plug/empty_union.gw b/tests/plug/empty_union.gw index 6fb2d2c2..c81f5739 100644 --- a/tests/plug/empty_union.gw +++ b/tests/plug/empty_union.gw @@ -1,2 +1,2 @@ -#require empty_union +#import empty_union <<< __file__ >>>; diff --git a/tests/plug/end_class.gw b/tests/plug/end_class.gw index ff98b7fe..63a716d1 100644 --- a/tests/plug/end_class.gw +++ b/tests/plug/end_class.gw @@ -1,2 +1,2 @@ -#require end_class +#import end_class <<< __file__ >>>; diff --git a/tests/plug/enum.gw b/tests/plug/enum.gw index a2682e7c..b1801d0f 100644 --- a/tests/plug/enum.gw +++ b/tests/plug/enum.gw @@ -1,4 +1,4 @@ -#require enum +#import enum #! untyped global enum <<< ENUM0 >>>; <<< ENUM1 >>>; diff --git a/tests/plug/enum_fail.gw b/tests/plug/enum_fail.gw index 8fc00484..5943bf3a 100644 --- a/tests/plug/enum_fail.gw +++ b/tests/plug/enum_fail.gw @@ -1,2 +1,2 @@ -#require enum_fail +#import enum_fail <<< __file__ >>>; diff --git a/tests/plug/enum_fail2.gw b/tests/plug/enum_fail2.gw index d48ebc5e..622052f5 100644 --- a/tests/plug/enum_fail2.gw +++ b/tests/plug/enum_fail2.gw @@ -1,2 +1,2 @@ -#require enum_fail2 +#import enum_fail2 <<< __file__ >>>; diff --git a/tests/plug/enum_fail3.gw b/tests/plug/enum_fail3.gw index 8379ec6a..9466decc 100644 --- a/tests/plug/enum_fail3.gw +++ b/tests/plug/enum_fail3.gw @@ -1,2 +1,2 @@ -#require enum_fail3 +#import enum_fail3 <<< __file__ >>>; diff --git a/tests/plug/extend_array.gw b/tests/plug/extend_array.gw index 67843c25..5e9747e5 100644 --- a/tests/plug/extend_array.gw +++ b/tests/plug/extend_array.gw @@ -1,4 +1,4 @@ -#require extend_array +#import extend_array var ArrayExt a; <<< a >>>; <<< a.size() >>>; diff --git a/tests/plug/fail_on_next_arg.gw b/tests/plug/fail_on_next_arg.gw index 3bb8daec..efe07cd0 100644 --- a/tests/plug/fail_on_next_arg.gw +++ b/tests/plug/fail_on_next_arg.gw @@ -1,2 +1,2 @@ -#require fail_on_next_arg +#import fail_on_next_arg <<< __file__ >>>; diff --git a/tests/plug/fail_on_next_arg2.gw b/tests/plug/fail_on_next_arg2.gw index fc189c80..61f54de9 100644 --- a/tests/plug/fail_on_next_arg2.gw +++ b/tests/plug/fail_on_next_arg2.gw @@ -1,2 +1,2 @@ -#require fail_on_next_arg2 +#import fail_on_next_arg2 <<< __file__ >>>; diff --git a/tests/plug/fptr.gw b/tests/plug/fptr.gw index a427bc71..9dbb6c59 100644 --- a/tests/plug/fptr.gw +++ b/tests/plug/fptr.gw @@ -1,4 +1,4 @@ -#require fptr +#import fptr fun void test(){ <<< "test" >>>; } var PtrType ptr; test(); diff --git a/tests/plug/fptr_tmpl.gw b/tests/plug/fptr_tmpl.gw index c67df8af..e000218b 100644 --- a/tests/plug/fptr_tmpl.gw +++ b/tests/plug/fptr_tmpl.gw @@ -1,2 +1,2 @@ -#require fptr_tmpl +#import fptr_tmpl <<< __file__ >>>; diff --git a/tests/plug/fptr_tmpl_fail.gw b/tests/plug/fptr_tmpl_fail.gw index 24e85719..ac0e0d54 100644 --- a/tests/plug/fptr_tmpl_fail.gw +++ b/tests/plug/fptr_tmpl_fail.gw @@ -1,2 +1,2 @@ -#require fptr_tmpl_fail +#import fptr_tmpl_fail <<< __file__ >>>; diff --git a/tests/plug/func_fail.gw b/tests/plug/func_fail.gw index 5edc24f9..69a957a2 100644 --- a/tests/plug/func_fail.gw +++ b/tests/plug/func_fail.gw @@ -1,2 +1,2 @@ -#require func_fail +#import func_fail <<< __file__ >>>; diff --git a/tests/plug/func_fail2.gw b/tests/plug/func_fail2.gw index c2dc9433..317de91f 100644 --- a/tests/plug/func_fail2.gw +++ b/tests/plug/func_fail2.gw @@ -1,2 +1,2 @@ -#require func_fail2 +#import func_fail2 <<< __file__ >>>; diff --git a/tests/plug/func_fail3.gw b/tests/plug/func_fail3.gw index 331e4702..e0928a3f 100644 --- a/tests/plug/func_fail3.gw +++ b/tests/plug/func_fail3.gw @@ -1,2 +1,2 @@ -#require func_fail3 +#import func_fail3 <<< __file__ >>>; diff --git a/tests/plug/func_fail4.gw b/tests/plug/func_fail4.gw index 631c2a11..73c50c0d 100644 --- a/tests/plug/func_fail4.gw +++ b/tests/plug/func_fail4.gw @@ -1,2 +1,2 @@ -#require func_fail4 +#import func_fail4 <<< __file__ >>>; diff --git a/tests/plug/func_subscript_not_empty.gw b/tests/plug/func_subscript_not_empty.gw index cfeeab17..2fb66a10 100644 --- a/tests/plug/func_subscript_not_empty.gw +++ b/tests/plug/func_subscript_not_empty.gw @@ -1,2 +1,2 @@ -#require func_subscript_not_empty +#import func_subscript_not_empty <<< __file__ >>>; diff --git a/tests/plug/func_tmpl.gw b/tests/plug/func_tmpl.gw index 83974670..124ab9c4 100644 --- a/tests/plug/func_tmpl.gw +++ b/tests/plug/func_tmpl.gw @@ -1,3 +1,3 @@ -#require func_tmpl +#import func_tmpl test:[int](1); test(1); diff --git a/tests/plug/func_tmpl_fail.gw b/tests/plug/func_tmpl_fail.gw index 1979793f..0d320bf8 100644 --- a/tests/plug/func_tmpl_fail.gw +++ b/tests/plug/func_tmpl_fail.gw @@ -1,2 +1,2 @@ -#require func_tmpl_fail +#import func_tmpl_fail <<< __file__ >>>; diff --git a/tests/plug/func_too_many_arg.gw b/tests/plug/func_too_many_arg.gw index b011054c..740ffe61 100644 --- a/tests/plug/func_too_many_arg.gw +++ b/tests/plug/func_too_many_arg.gw @@ -1,2 +1,2 @@ -#require func_too_many_arg +#import func_too_many_arg <<< __file__ >>>; diff --git a/tests/plug/global_func.gw b/tests/plug/global_func.gw index 60703179..bd590e86 100644 --- a/tests/plug/global_func.gw +++ b/tests/plug/global_func.gw @@ -1,3 +1,3 @@ -#require global_func +#import global_func <<< test >>>; <<< 1 => test >>>; diff --git a/tests/plug/global_var.gw b/tests/plug/global_var.gw index 91f4674f..9cdf57c9 100644 --- a/tests/plug/global_var.gw +++ b/tests/plug/global_var.gw @@ -1,4 +1,4 @@ -#require global_var +#import global_var <<< i >>>; <<< "other test" => i >>>; <<< 12 => f >>>; diff --git a/tests/plug/invalid_arg.gw b/tests/plug/invalid_arg.gw index 9223e112..eaaff14a 100644 --- a/tests/plug/invalid_arg.gw +++ b/tests/plug/invalid_arg.gw @@ -1,2 +1,2 @@ -#require invalid_arg +#import invalid_arg <<< __file__ >>>; diff --git a/tests/plug/invalid_array.gw b/tests/plug/invalid_array.gw index 0fd80fbc..ed0ff7a4 100644 --- a/tests/plug/invalid_array.gw +++ b/tests/plug/invalid_array.gw @@ -1,2 +1,2 @@ -#require invalid_array +#import invalid_array <<< __file__ >>>; diff --git a/tests/plug/invalid_func.gw b/tests/plug/invalid_func.gw index 2fc7ae7e..1d4b257a 100644 --- a/tests/plug/invalid_func.gw +++ b/tests/plug/invalid_func.gw @@ -1,2 +1,2 @@ -#require invalid_func +#import invalid_func <<< __file__ >>>; diff --git a/tests/plug/invalid_names.gw b/tests/plug/invalid_names.gw index 6bc71724..f2ce7c23 100644 --- a/tests/plug/invalid_names.gw +++ b/tests/plug/invalid_names.gw @@ -1,2 +1,2 @@ -#require invalid_names +#import invalid_names <<< __file__ >>>; diff --git a/tests/plug/invalid_names0.gw b/tests/plug/invalid_names0.gw index 76e1027a..f0633287 100644 --- a/tests/plug/invalid_names0.gw +++ b/tests/plug/invalid_names0.gw @@ -1,2 +1,2 @@ -#require invalid_names0 +#import invalid_names0 <<< __file__ >>>; diff --git a/tests/plug/invalid_names1.gw b/tests/plug/invalid_names1.gw index b2dc86c2..d5fb5ca2 100644 --- a/tests/plug/invalid_names1.gw +++ b/tests/plug/invalid_names1.gw @@ -1,2 +1,2 @@ -#require invalid_names1 +#import invalid_names1 <<< __file__ >>>; diff --git a/tests/plug/invalid_names2.gw b/tests/plug/invalid_names2.gw index 6be95ab7..d26dc648 100644 --- a/tests/plug/invalid_names2.gw +++ b/tests/plug/invalid_names2.gw @@ -1,2 +1,2 @@ -#require invalid_names2 +#import invalid_names2 <<< __file__ >>>; diff --git a/tests/plug/invalid_names3.gw b/tests/plug/invalid_names3.gw index 234a3b48..16832a86 100644 --- a/tests/plug/invalid_names3.gw +++ b/tests/plug/invalid_names3.gw @@ -1,2 +1,2 @@ -#require invalid_names3 +#import invalid_names3 <<< __file__ >>>; diff --git a/tests/plug/invalid_type1.gw b/tests/plug/invalid_type1.gw index 0e7cd1f9..31b70266 100644 --- a/tests/plug/invalid_type1.gw +++ b/tests/plug/invalid_type1.gw @@ -1,2 +1,2 @@ -#require invalid_type1 +#import invalid_type1 <<< __file__ >>>; diff --git a/tests/plug/invalid_type2.gw b/tests/plug/invalid_type2.gw index 62325e5b..c0cb84ad 100644 --- a/tests/plug/invalid_type2.gw +++ b/tests/plug/invalid_type2.gw @@ -1,2 +1,2 @@ -#require invalid_type2 +#import invalid_type2 <<< __file__ >>>; diff --git a/tests/plug/invalid_type3.gw b/tests/plug/invalid_type3.gw index d7413bb5..e735ba71 100644 --- a/tests/plug/invalid_type3.gw +++ b/tests/plug/invalid_type3.gw @@ -1,2 +1,2 @@ -#require invalid_type3 +#import invalid_type3 <<< __file__ >>>; diff --git a/tests/plug/mk_type_array.gw b/tests/plug/mk_type_array.gw index 28fda930..ce617bb5 100644 --- a/tests/plug/mk_type_array.gw +++ b/tests/plug/mk_type_array.gw @@ -1,2 +1,2 @@ -#require mk_type_array +#import mk_type_array <<< __file__ >>>; diff --git a/tests/plug/no_import.gw b/tests/plug/no_import.gw index dd075818..ec6d8146 100644 --- a/tests/plug/no_import.gw +++ b/tests/plug/no_import.gw @@ -1,2 +1,2 @@ -#require no_import +#import no_import <<< __file__ >>>; diff --git a/tests/plug/not_importing.gw b/tests/plug/not_importing.gw index 933e07b6..9882c422 100644 --- a/tests/plug/not_importing.gw +++ b/tests/plug/not_importing.gw @@ -1,2 +1,2 @@ -#require not_importing +#import not_importing <<< __file__ >>>; diff --git a/tests/plug/op_already_imported.gw b/tests/plug/op_already_imported.gw index 9cd44406..5655ed54 100644 --- a/tests/plug/op_already_imported.gw +++ b/tests/plug/op_already_imported.gw @@ -1,3 +1,3 @@ -#require op_already_imported +#import op_already_imported #! [contains] already imported <<< 1 >>>; diff --git a/tests/plug/pass.gw b/tests/plug/pass.gw index 233e1f2e..288427a7 100644 --- a/tests/plug/pass.gw +++ b/tests/plug/pass.gw @@ -1,2 +1,2 @@ -#require pass +#import pass <<< __file__ >>>; diff --git a/tests/plug/specialid_emit.gw b/tests/plug/specialid_emit.gw index 0eec0eba..229d6a40 100644 --- a/tests/plug/specialid_emit.gw +++ b/tests/plug/specialid_emit.gw @@ -1,2 +1,2 @@ -#require specialid_emit +#import specialid_emit <<< testid >>>; diff --git a/tests/plug/static_string.gw b/tests/plug/static_string.gw index f94a3bd5..a6d93b7f 100644 --- a/tests/plug/static_string.gw +++ b/tests/plug/static_string.gw @@ -1,3 +1,3 @@ -#require static_string +#import static_string #!<<< StaticString.self >>>; <<< self >>>; diff --git a/tests/plug/str2decl.gw b/tests/plug/str2decl.gw index 715f0565..59b5fe35 100644 --- a/tests/plug/str2decl.gw +++ b/tests/plug/str2decl.gw @@ -1,2 +1,2 @@ -#require str2td +#import str2td <<< __file__ >>>; diff --git a/tests/plug/str2list_fail.gw b/tests/plug/str2list_fail.gw index 57d81272..119f88ab 100644 --- a/tests/plug/str2list_fail.gw +++ b/tests/plug/str2list_fail.gw @@ -1,2 +1,2 @@ -#require str2list_fail +#import str2list_fail <<< __file__ >>>; diff --git a/tests/plug/struct.gw b/tests/plug/struct.gw index d3ecf582..e0730408 100644 --- a/tests/plug/struct.gw +++ b/tests/plug/struct.gw @@ -1,4 +1,4 @@ -#require struct +#import struct <<< var float f >>>; var Struct c; diff --git a/tests/plug/template_arg.gw b/tests/plug/template_arg.gw index b65012fa..87a93362 100644 --- a/tests/plug/template_arg.gw +++ b/tests/plug/template_arg.gw @@ -1,2 +1,2 @@ -#require template_arg +#import template_arg <<< __file__ >>>; diff --git a/tests/plug/trig.gw b/tests/plug/trig.gw index 849d12aa..4cce8a09 100644 --- a/tests/plug/trig.gw +++ b/tests/plug/trig.gw @@ -1,4 +1,4 @@ -#require trig +#import trig var Trig trig => dac; adc :=> trig; adc :=< trig; diff --git a/tests/plug/typedef.gw b/tests/plug/typedef.gw index 8a3ec9b2..49be12cc 100644 --- a/tests/plug/typedef.gw +++ b/tests/plug/typedef.gw @@ -1,4 +1,4 @@ -#require typedef +#import typedef var Typedef t; #!fun int test(int i) { <<< i >>>; } #!test @=> t; diff --git a/tests/plug/typedef_fail.gw b/tests/plug/typedef_fail.gw index c1b0f5ec..bff45f17 100644 --- a/tests/plug/typedef_fail.gw +++ b/tests/plug/typedef_fail.gw @@ -1,2 +1,2 @@ -#require typedef_fail +#import typedef_fail <<< __file__ >>>; diff --git a/tests/plug/typedef_tmpl.gw b/tests/plug/typedef_tmpl.gw index c98fc082..42c584c5 100644 --- a/tests/plug/typedef_tmpl.gw +++ b/tests/plug/typedef_tmpl.gw @@ -1,2 +1,2 @@ -#require typedef_tmpl +#import typedef_tmpl <<< __file__ >>>; diff --git a/tests/plug/ugen_connect.gw b/tests/plug/ugen_connect.gw index cf2a999d..1ef7f36a 100644 --- a/tests/plug/ugen_connect.gw +++ b/tests/plug/ugen_connect.gw @@ -1,2 +1,2 @@ -#require ugen_connect +#import ugen_connect <<< __file__ >>>; diff --git a/tests/plug/union.gw b/tests/plug/union.gw index 9bbb846b..90866b2d 100644 --- a/tests/plug/union.gw +++ b/tests/plug/union.gw @@ -1,4 +1,4 @@ -#require union +#import union var Union u; <<< u.i >>>; <<< 12 => u.f >>>; diff --git a/tests/plug/union_fail_exp.gw b/tests/plug/union_fail_exp.gw index 27d1a699..88f7810e 100644 --- a/tests/plug/union_fail_exp.gw +++ b/tests/plug/union_fail_exp.gw @@ -1,2 +1,2 @@ -#require union_fail_exp +#import union_fail_exp <<< __file__ >>>; diff --git a/tests/plug/union_member.gw b/tests/plug/union_member.gw index a743ff4e..a5cbcf4b 100644 --- a/tests/plug/union_member.gw +++ b/tests/plug/union_member.gw @@ -1,2 +1,2 @@ -#require union_member +#import union_member <<< __file__ >>>; diff --git a/tests/plug/union_name.gw b/tests/plug/union_name.gw index 38216c55..58730694 100644 --- a/tests/plug/union_name.gw +++ b/tests/plug/union_name.gw @@ -1,3 +1,3 @@ -#require union_name +#import union_name <<< my_union >>>; <<>>; diff --git a/tests/plug/union_tmpl.gw b/tests/plug/union_tmpl.gw index a7ac5d4d..433f177c 100644 --- a/tests/plug/union_tmpl.gw +++ b/tests/plug/union_tmpl.gw @@ -1,3 +1,3 @@ -#require union_tmpl +#import union_tmpl <<< var U:[Event] u>>>; <<< u.a >>>; diff --git a/tests/plug/union_tmpl_fail.gw b/tests/plug/union_tmpl_fail.gw index c70c688b..b499f12f 100644 --- a/tests/plug/union_tmpl_fail.gw +++ b/tests/plug/union_tmpl_fail.gw @@ -1,2 +1,2 @@ -#require union_tmpl_fail +#import union_tmpl_fail <<< __file__ >>>; diff --git a/tests/plug/union_tmpl_fail2.gw b/tests/plug/union_tmpl_fail2.gw index 06566c78..ac613c34 100644 --- a/tests/plug/union_tmpl_fail2.gw +++ b/tests/plug/union_tmpl_fail2.gw @@ -1,2 +1,2 @@ -#require union_tmpl_fail2 +#import union_tmpl_fail2 <<< __file__ >>>; diff --git a/tests/plug/union_tmpl_fail3.gw b/tests/plug/union_tmpl_fail3.gw index b888fa14..28903bec 100644 --- a/tests/plug/union_tmpl_fail3.gw +++ b/tests/plug/union_tmpl_fail3.gw @@ -1,2 +1,2 @@ -#require union_tmpl_fail3 +#import union_tmpl_fail3 <<< __file__ >>>; diff --git a/tests/plug/variadic.gw b/tests/plug/variadic.gw index 48f8b575..314379c4 100644 --- a/tests/plug/variadic.gw +++ b/tests/plug/variadic.gw @@ -1,4 +1,4 @@ -#require variadic +#import variadic <<< "test builtin variadic fun" >>>; var Variadic v; "iiii" => var string format; diff --git a/tests/plug/vm_remove.gw b/tests/plug/vm_remove.gw index 85078c1a..3f455351 100644 --- a/tests/plug/vm_remove.gw +++ b/tests/plug/vm_remove.gw @@ -1,3 +1,3 @@ -#require vm_remove +#import vm_remove test(12); test(1); -- 2.43.0