:art: rename require => import

diff --git a/plug b/plug
index 730d0849dd264a9bade1ea7c3746715d0068443c..b932136274811c52694dc7f2d3c9de0832e6b64b 160000 (submodule)
--- 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 92fbb9a90ba297af0211116ec5618e81954023f7..a6c37acbbf6c6f6f0bcb7f89349bae36d599c0ba 100644 (file)
--- 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 01646ae7a81b72d68841c89c610e5ed467c326f4..8f806880c9296b7badc272799c1a49b1cef08147 100644 (file)
--- 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 ef38782f3d8b0ae4c7365a33a048f405e1a8ed83..6169266559f17936cd44fefdafc909b38d9c62b1 100644 (file)
--- 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 8958ace4e630c97052c2de0e4eb51eca81da4554..bcbe8c9e811ff280b0238f4ff73b52934a7b9f72 100644 (file)
--- 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 c6e79b56cd39b5c8a9bef5b0fc1811d62547bf8e..d50dfbafa7e430766becf3982c7300d7ba58b6ca 100644 (file)
--- 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 122ac5fe987c64ebd8705c5cbd22045a61adf431..9d0928c1598c7144197d3b086a0bee0528ce0a68 100644 (file)
--- 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 a7e9493ba6871fee3164320e7359b246fbae11af..b385c34cfbe7ccd02bccff36a446c2238acbc670 100644 (file)
--- 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 0d9b74966e9a74416132ec51959e7340a6d4bbef..d5e5542f385872449d34a6e821945b4d1ee7f3b8 100644 (file)
--- 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 832778b69effdbc8d24ef4195b93cd6660305e70..a0aeef7f2de96c726131c8ffbe49246a4e50eba6 100644 (file)
--- 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 264e0021ee3e91921bcc9359cabc165ec1edcaec..6eb3670ad0f4499c3650d9925ec5e7945e966fd9 100644 (file)
--- 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 c07b0f834a858367ef122bc7b0d3ca39c612a3c6..57307bc29497217449182a3ef3ffd5f0aebbb58d 100644 (file)
--- 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 55d995a999732db7b32d910dff286b38e42c53cb..591b14e81a35c24754b74fb0d23dc24dd146e920 100644 (file)
--- 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 ed03ba6a40b30f10f2b68ee4a32cf0d0130d9ed4..97b775becd8197afa496ad0ac739f75d4ca91072 100644 (file)
--- 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 b6ea861dec319cb95d98c95ac7796614f6cd7984..ef61424190599d517d4103eed779d38ce86c6240 100644 (file)
--- 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 973b043488827bd06913b577c26821e064e43c6a..f4f75d0e1fadf9bb5a1f20991b274a0a76513d99 100644 (file)
--- 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 eda3576025309e71fc69e1b66d5e0c8dd8bed390..4ea4a97cb3412a25772140bd61524c95a68ece8b 100644 (file)
--- 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 6fb2d2c2e0bf3c7ae747b866b1044d8ef2b314b9..c81f573964f7bf0c7d8918a1b537444797941b99 100644 (file)
--- 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 ff98b7fef86d600c0c54c8058914d7132d16b3aa..63a716d199c3950216ce2b9f6b6c2d9ed8caf394 100644 (file)
--- 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 a2682e7c01f446d9ce318a98257fd04b35db8b45..b1801d0f3c905fe4761e7d37b074e86e054277a4 100644 (file)
--- 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 8fc00484be882fa47c0271a50ce6347324518985..5943bf3a588acfe0523da0d6afe7c27e19ae5a8f 100644 (file)
--- 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 d48ebc5eab6493654eaef6510d2635c91959dbc3..622052f58e457439a6c29c5f38665d7daa70cf4c 100644 (file)
--- 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 8379ec6a57d32c95d2a9a444c714a8734c8c28e6..9466decc1be727458b2e624f1c7d817a1ed59999 100644 (file)
--- 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 67843c25b69c216bb55cf20dfcc541367590d454..5e9747e5f49387495ef64c92b0259df21c2a8d84 100644 (file)
--- 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 3bb8daecf6ed2f2745784e2619cc39820b79dc0c..efe07cd08ae3bb89f154f44cc28d21dd6482d8ff 100644 (file)
--- 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 fc189c8068fec4f0d2ce381d8de04605598608e7..61f54de9af5125f33e1409198076a23501f527b0 100644 (file)
--- 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 a427bc71e964317a1131698d2b45c79813a0b479..9dbb6c5965f85a53d8f10c83e1e36e3f8f21614c 100644 (file)
--- 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 c67df8af37cb9473c7d5046247acfdbbdce8b001..e000218bcf666c8ae6aacda4441069cf1e034043 100644 (file)
--- 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 24e85719b5d9b09d6581c35245a72246318d2737..ac0e0d54ba6a2c470213aeea0dc75881c3505ffa 100644 (file)
--- 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 5edc24f9e20fb9097fb21a2996ff8d48de163d36..69a957a2691adb0d461acae48993ffdd90abb8e6 100644 (file)
--- 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 c2dc94339af0eb18dd9d4a8ad917359bf85ca0f1..317de91f291c93a3f426bc288712512a78dd0e16 100644 (file)
--- 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 331e47024cb7906fa95c34f42dba61d2bfe5c481..e0928a3fb6d8beced34b0b80c72629d36063f086 100644 (file)
--- 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 631c2a11efd4f2d3961f9b03f85aeae3041dee9c..73c50c0d45449e5f5bc5878ef2a940b5b392aa0a 100644 (file)
--- 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 cfeeab173f0f4d5f275163a11b2a39680446c23c..2fb66a10d8abbc48dd1a161d6cf1d1281fcb643d 100644 (file)
--- 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 83974670a5362e4e122a1816ad3c63dd108885bb..124ab9c4914b637bacecd433a9a944c744960e20 100644 (file)
--- 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 1979793fdc6fbb67227b1a5024ec20eca7f05d2b..0d320bf8df7a64375b4a8bedb1fb240508f1aceb 100644 (file)
--- 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 b011054c2ea61e16edc8346e000a591730183500..740ffe61eb027206eb98b4327693d9d632f6d326 100644 (file)
--- 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 607031798cc5f5656dcd17ae75d6fd1d6d240552..bd590e861f895668e3a4412cdae5bd3169fc6ee2 100644 (file)
--- 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 91f4674f056259daa96f7ff10339db421a5a2ba1..9cdf57c966f3c16b85244b03d5732593f66fbc85 100644 (file)
--- 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 9223e112cd10ef18148f432f72f43fa00a03a0ec..eaaff14a869a0da8a1af34269623d25af4b23870 100644 (file)
--- 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 0fd80fbc9e51cc7028c51ce55ee31edd53f52c4a..ed0ff7a4e019b9fa8b287310610bfb17cede04b3 100644 (file)
--- 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 2fc7ae7e42a652da01c35ad948ba5c821b6872b8..1d4b257adcd2ee61ad1d67e9ef6c1e2545a1d5d4 100644 (file)
--- 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 6bc71724677904ff1957039ec7af40d0b9137720..f2ce7c238c7bd896a1430b5869828f3fa6b53f47 100644 (file)
--- 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 76e1027a57ae94f8970198d942b3378ae1836de0..f063328744bb53080dce3a0b8b72da10ca393bc2 100644 (file)
--- 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 b2dc86c240a078a881b87dbe2cc8ef23e475db00..d5fb5ca271d9f89c8594589b78c28be4e495df86 100644 (file)
--- 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 6be95ab7b4a387ab3c1a3aa0fb2d36e5d763f455..d26dc6484948a2f75ddebd8262d8f3b6b5856a83 100644 (file)
--- 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 234a3b48a0f164a20ed5c1a0b36edfa34542bf8e..16832a86da2074c9d67f7ddbab1aff93586a4ef9 100644 (file)
--- 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 0e7cd1f9f83af0daf644e8dd9196fb3d84708fb5..31b70266961b0492ffb0351fffa5efaefbb2a1b0 100644 (file)
--- 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 62325e5bce4e9e0afe554081987f6b657f5634aa..c0cb84adc1338685bdb84a959a6a3c7fdb238b48 100644 (file)
--- 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 d7413bb5aea0bce69f5447cee609cf305d883488..e735ba71c74b813a5bee9719a2269820fb9db8c2 100644 (file)
--- 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 28fda930167be0a188ce6888d6cd4f1ff3e7c8ab..ce617bb57a41979391e144245cd830b5f86b1819 100644 (file)
--- 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 dd0758180727b26a26dfbdfe1bf164b36afe284c..ec6d8146cf6c417a344410f5f736affca7d8a587 100644 (file)
--- 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 933e07b6e8e35c90b7001265bfa89cc426c96c97..9882c422d70611997923ebaff4d5b30cd3898f34 100644 (file)
--- 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 9cd444064d431c894698202224fe1cf67835dc83..5655ed542cd4c0109daebc569368f6cd2c1e1daa 100644 (file)
--- 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 233e1f2e50b510c5cb132d04be97a41b631d79c2..288427a78bdcc182ca063f1b5fa4562205774c54 100644 (file)
--- 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 0eec0eba09c40504cb54a2af4106bf087f39579d..229d6a40c0a329637c8690d43f067fa18db35fb0 100644 (file)
--- 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 f94a3bd50fe775d83d6f0e6b340b7d106fde76e7..a6d93b7f5799eadb55521dcba480c2ecaefbcbad 100644 (file)
--- 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 715f056502001821c2b7b369736ea19ac44b7fb2..59b5fe3504fb2fd684ab4d10636d88999cfbda55 100644 (file)
--- 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 57d81272f41d8db7778ad05fd3a8b4d95a9ee6cf..119f88abd6173087e90742e1d7f864748c5b9aa3 100644 (file)
--- 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 d3ecf58236539e06027cab317956b41c0a9c90d8..e07304087c3f70d2478bc43c530670f7bc3765b7 100644 (file)
--- 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 b65012fa8d9c99147194b2341e4c85bd4c841ee1..87a93362d4cf769bcdc10f85560afcd19decc768 100644 (file)
--- 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 849d12aae3b4c1ea60d0d4f591c3b2a81e086baa..4cce8a0977e3fbc23e56b9349c2280423f7ee327 100644 (file)
--- 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 8a3ec9b26eef4c90b9b9a10587af8e5fea857f44..49be12cca02c5e0c10281025b759810af3a8274d 100644 (file)
--- 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 c1b0f5ecb56cbfe12d5321df308d0ef50c0c60c0..bff45f17114f917dc558942208ba797104ed8fe1 100644 (file)
--- 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 c98fc082d5c38ffe85375fa44985467edd132918..42c584c55d785e7bf2c5956ba06de702e5e06b99 100644 (file)
--- 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 cf2a999d8b5a213fa5d436f4134f762f3270cec0..1ef7f36a4356f107a6f856705b3a78f89ffdc76b 100644 (file)
--- 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 9bbb846b338b4ed6093941b0439061d3b3a0c9fe..90866b2dc635e3fbf069c9ec21f8d6a1196f89fa 100644 (file)
--- 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 27d1a6996357b6257388cbde168fc75004f0c5f2..88f7810ecb417f3390258e652e198e81f5463570 100644 (file)
--- 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 a743ff4ef5af602b142ea2154fff7029b4b402ec..a5cbcf4b9c64bc3dd4fd4fbb901c5b1ba5688dfa 100644 (file)
--- 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 38216c55453331253e79211611249da42f3e1e8e..58730694e11a2030a2abd84abb88b101df48c1df 100644 (file)
--- a/tests/plug/union_name.gw
+++ b/tests/plug/union_name.gw
@@ -1,3 +1,3 @@
-#require union_name
+#import union_name
 <<< my_union >>>;
 <<<my_union.i>>>;

diff --git a/tests/plug/union_tmpl.gw b/tests/plug/union_tmpl.gw
index a7ac5d4dc30b26bcb0854fc4b39c306af7a4ea2a..433f177c544fa3ffa0dcb85b309c1138d7b027f9 100644 (file)
--- 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 c70c688b80b02223cd6d9528380bf0038a29c85f..b499f12f155bd91bf29a019511e2525b40e28a32 100644 (file)
--- 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 06566c780b4c2325c6a5e361791d6f1c20407d60..ac613c34ed0ab439d71b41ab2df9c2969d53e600 100644 (file)
--- 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 b888fa14797b3e8136ea2c2d42c49ddc486b4ac6..28903bec76125065689c68921f4d729e3603217c 100644 (file)
--- 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 48f8b5758200c06a95a33cf42bae6daf699034b0..314379c4a96489f9ab4f09d408eef77cc7b5613f 100644 (file)
--- 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 85078c1a15c6b3a4d7c8aedb69427de28d4a7553..3f45535185fb27d99b7487e26464a85dadcdded1 100644 (file)
--- 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);