diff options
author | Benoit Germain <benoit.germain@ubisoft.com> | 2024-06-14 17:11:36 +0200 |
---|---|---|
committer | Benoit Germain <benoit.germain@ubisoft.com> | 2024-06-14 17:11:36 +0200 |
commit | 50f4c40bdb5667aa7053434dede2dd98f6f9e243 (patch) | |
tree | c443c9337e238ff2825b2da4c9749fdf97aa574f | |
parent | ec8574d298ef302bc4162d9b394e96bf08763632 (diff) | |
download | lanes-50f4c40bdb5667aa7053434dede2dd98f6f9e243.tar.gz lanes-50f4c40bdb5667aa7053434dede2dd98f6f9e243.tar.bz2 lanes-50f4c40bdb5667aa7053434dede2dd98f6f9e243.zip |
Wording fix: parameter → argument
-rw-r--r-- | deep_test/deep_test.cpp | 2 | ||||
-rw-r--r-- | deep_test/deeptest.lua | 2 | ||||
-rw-r--r-- | docs/index.html | 12 | ||||
-rw-r--r-- | make-vc.cmd | 2 | ||||
-rw-r--r-- | src/cancel.cpp | 2 | ||||
-rw-r--r-- | src/intercopycontext.cpp | 4 | ||||
-rw-r--r-- | src/keeper.cpp | 4 | ||||
-rw-r--r-- | src/lane.cpp | 2 | ||||
-rw-r--r-- | src/lane.h | 2 | ||||
-rw-r--r-- | src/lanes.cpp | 2 | ||||
-rw-r--r-- | src/lanes.lua | 14 | ||||
-rw-r--r-- | tests/argtable.lua | 8 | ||||
-rw-r--r-- | tests/assert.lua | 6 | ||||
-rw-r--r-- | tests/cyclic.lua | 4 | ||||
-rw-r--r-- | tests/finalizer.lua | 2 | ||||
-rw-r--r-- | tests/objects.lua | 2 |
16 files changed, 35 insertions, 35 deletions
diff --git a/deep_test/deep_test.cpp b/deep_test/deep_test.cpp index 7e16b2e..c071dc6 100644 --- a/deep_test/deep_test.cpp +++ b/deep_test/deep_test.cpp | |||
@@ -208,7 +208,7 @@ struct MyClonableUserdata | |||
208 | return 0; | 208 | return 0; |
209 | 209 | ||
210 | default: | 210 | default: |
211 | raise_luaL_error(L, "Lanes called clonable_lanesclone with unexpected parameters"); | 211 | raise_luaL_error(L, "Lanes called clonable_lanesclone with unexpected arguments"); |
212 | } | 212 | } |
213 | return 0; | 213 | return 0; |
214 | } | 214 | } |
diff --git a/deep_test/deeptest.lua b/deep_test/deeptest.lua index 1c34cf8..de282a1 100644 --- a/deep_test/deeptest.lua +++ b/deep_test/deeptest.lua | |||
@@ -78,7 +78,7 @@ local performTest = function( obj_) | |||
78 | assert(_n == (_val2 and 2 or 1)) | 78 | assert(_n == (_val2 and 2 or 1)) |
79 | printDeep( "out of linda:", _val1, _val2) | 79 | printDeep( "out of linda:", _val1, _val2) |
80 | 80 | ||
81 | -- send the object in a lane through parameter passing, the lane body returns it as return value, read the contents | 81 | -- send the object in a lane through argument passing, the lane body returns it as return value, read the contents |
82 | local g = lanes.gen( | 82 | local g = lanes.gen( |
83 | "package" | 83 | "package" |
84 | , { | 84 | , { |
diff --git a/docs/index.html b/docs/index.html index 06ce610..defb0ad 100644 --- a/docs/index.html +++ b/docs/index.html | |||
@@ -1137,7 +1137,7 @@ | |||
1137 | <p> | 1137 | <p> |
1138 | Communications between lanes is completely detached from the lane handles themselves. By itself, a lane can only provide return values once it is finished, or throw an error. | 1138 | Communications between lanes is completely detached from the lane handles themselves. By itself, a lane can only provide return values once it is finished, or throw an error. |
1139 | Needs to communicate during runtime are handled by <a href="http://en.wikipedia.org/wiki/Linda_%28coordination_language%29" target="_blank">Linda objects</a>, which are | 1139 | Needs to communicate during runtime are handled by <a href="http://en.wikipedia.org/wiki/Linda_%28coordination_language%29" target="_blank">Linda objects</a>, which are |
1140 | <a href="#deep_userdata">deep userdata</a> instances. They can be provided to a lane as startup parameters, upvalues or in some other Linda's message. | 1140 | <a href="#deep_userdata">deep userdata</a> instances. They can be provided to a lane as startup arguments, upvalues or in some other Linda's message. |
1141 | </p> | 1141 | </p> |
1142 | 1142 | ||
1143 | <p> | 1143 | <p> |
@@ -1175,7 +1175,7 @@ | |||
1175 | 1175 | ||
1176 | <ul> | 1176 | <ul> |
1177 | <li>Keys can be of boolean, number, string or light userdata type. Tables and functions can't be keys because their identity isn't preserved when transfered from one Lua state to another.</li> | 1177 | <li>Keys can be of boolean, number, string or light userdata type. Tables and functions can't be keys because their identity isn't preserved when transfered from one Lua state to another.</li> |
1178 | <li>values can be any type supported by inter-state copying (same <a href="#limitations">limits</a> as for function parameters and upvalues).</li> | 1178 | <li>values can be any type supported by inter-state copying (same <a href="#limitations">limits</a> as for function arguments and upvalues).</li> |
1179 | <li>consuming method is <tt>:receive</tt> (not in).</li> | 1179 | <li>consuming method is <tt>:receive</tt> (not in).</li> |
1180 | <li>non-consuming method is <tt>:get</tt> (not rd).</li> | 1180 | <li>non-consuming method is <tt>:get</tt> (not rd).</li> |
1181 | <li>two producer-side methods: <tt>:send</tt> and <tt>:set</tt> (not out).</li> | 1181 | <li>two producer-side methods: <tt>:send</tt> and <tt>:set</tt> (not out).</li> |
@@ -1539,7 +1539,7 @@ On the other side, you need to use a common Linda for waiting for multiple keys. | |||
1539 | <h3>Limitations on data passing</h3> | 1539 | <h3>Limitations on data passing</h3> |
1540 | 1540 | ||
1541 | <p> | 1541 | <p> |
1542 | Data passed between lanes (either as starting parameters, return values, upvalues or via Lindas) must conform to the following: | 1542 | Data passed between lanes (either as starting arguments, return values, upvalues or via Lindas) must conform to the following: |
1543 | <ul> | 1543 | <ul> |
1544 | <li>Coroutines cannot be passed. A coroutine's Lua state is tied to the Lua state that created it, and there is no way the mixed C/Lua stack of a coroutine can be transfered from one Lua state to another.</li> | 1544 | <li>Coroutines cannot be passed. A coroutine's Lua state is tied to the Lua state that created it, and there is no way the mixed C/Lua stack of a coroutine can be transfered from one Lua state to another.</li> |
1545 | <li>Lane handles cannot be passed between lanes.</li> | 1545 | <li>Lane handles cannot be passed between lanes.</li> |
@@ -1685,7 +1685,7 @@ static int clonable_lanesclone(lua_State* L) | |||
1685 | return 0; | 1685 | return 0; |
1686 | 1686 | ||
1687 | default: | 1687 | default: |
1688 | std::ignore = luaL_error(L, "Lanes called clonable_lanesclone with unexpected parameters"); | 1688 | std::ignore = luaL_error(L, "Lanes called clonable_lanesclone with unexpected arguments"); |
1689 | } | 1689 | } |
1690 | return 0; | 1690 | return 0; |
1691 | } | 1691 | } |
@@ -1800,7 +1800,7 @@ static MyDeepFactory g_MyDeepFactory; | |||
1800 | <h3>Beware with print and file output</h3> | 1800 | <h3>Beware with print and file output</h3> |
1801 | 1801 | ||
1802 | <p> | 1802 | <p> |
1803 | In multithreaded scenarios, giving multiple parameters to <tt>print()</tt> or <tt>file:write()</tt> may cause them to be overlapped in the output, something like this: | 1803 | In multithreaded scenarios, giving multiple arguments to <tt>print()</tt> or <tt>file:write()</tt> may cause them to be overlapped in the output, something like this: |
1804 | 1804 | ||
1805 | <table border="1" bgcolor="#FFFFE0" cellpadding="10" style="width:50%"><tr><td><pre> | 1805 | <table border="1" bgcolor="#FFFFE0" cellpadding="10" style="width:50%"><tr><td><pre> |
1806 | A: print(1, 2, 3, 4 ) | 1806 | A: print(1, 2, 3, 4 ) |
@@ -1821,7 +1821,7 @@ static MyDeepFactory g_MyDeepFactory; | |||
1821 | 1821 | ||
1822 | <p> | 1822 | <p> |
1823 | <ul> | 1823 | <ul> |
1824 | <li>Data passing (parameters, upvalues, <a href="#lindas">Linda</a> messages) is generally fast, doing two binary state-to-state copies (from source state to hidden state, hidden state to target state). Remember that not only the function you specify but also its upvalues, their upvalues, etc. etc. will get copied.</li> | 1824 | <li>Data passing (arguments, upvalues, <a href="#lindas">Linda</a> messages) is generally fast, doing two binary state-to-state copies (from source state to hidden state, hidden state to target state). Remember that not only the function you specify but also its upvalues, their upvalues, etc. etc. will get copied.</li> |
1825 | <li>Lane startup is fast (1000's of lanes a second), depending on the number of standard libraries initialized. Initializing all standard libraries is about 3-4 times slower than having no standard libraries at all. If you throw in a lot of lanes per second, make sure you give them minimal necessary set of libraries.</li> | 1825 | <li>Lane startup is fast (1000's of lanes a second), depending on the number of standard libraries initialized. Initializing all standard libraries is about 3-4 times slower than having no standard libraries at all. If you throw in a lot of lanes per second, make sure you give them minimal necessary set of libraries.</li> |
1826 | <li>Waiting Lindas are woken up (and execute some hidden Lua code) each time <u>any</u> key in the <a href="#lindas">Lindas</a> they are waiting for are changed. This may give essential slow-down (not measured, just a gut feeling) if a lot of <a href="#lindas">Linda</a> keys are used. Using separate <a href="#lindas">Lindas</a> for logically separate issues will help (which is good practice anyhow).</li> | 1826 | <li>Waiting Lindas are woken up (and execute some hidden Lua code) each time <u>any</u> key in the <a href="#lindas">Lindas</a> they are waiting for are changed. This may give essential slow-down (not measured, just a gut feeling) if a lot of <a href="#lindas">Linda</a> keys are used. Using separate <a href="#lindas">Lindas</a> for logically separate issues will help (which is good practice anyhow).</li> |
1827 | <li><a href="#lindas">Linda</a> objects are light. The memory footprint is two OS-level signalling objects (<tt>HANDLE</tt> or <tt>pthread_cond_t</tt>) for each, plus one C pointer for the proxies per each Lua state using the <a href="#lindas">Linda</a>. Barely nothing.</li> | 1827 | <li><a href="#lindas">Linda</a> objects are light. The memory footprint is two OS-level signalling objects (<tt>HANDLE</tt> or <tt>pthread_cond_t</tt>) for each, plus one C pointer for the proxies per each Lua state using the <a href="#lindas">Linda</a>. Barely nothing.</li> |
diff --git a/make-vc.cmd b/make-vc.cmd index f4cd412..c50db3f 100644 --- a/make-vc.cmd +++ b/make-vc.cmd | |||
@@ -215,7 +215,7 @@ REM --- | |||
215 | REM NOTE: 'timeit' is a funny thing; it does _not_ work with quoted | 215 | REM NOTE: 'timeit' is a funny thing; it does _not_ work with quoted |
216 | REM long paths, but it _does_ work without the quotes. I have no idea, | 216 | REM long paths, but it _does_ work without the quotes. I have no idea, |
217 | REM how it knows the spaces in paths apart from spaces in between | 217 | REM how it knows the spaces in paths apart from spaces in between |
218 | REM parameters. | 218 | REM arguments. |
219 | 219 | ||
220 | :LAUNCHTEST | 220 | :LAUNCHTEST |
221 | timeit %LUA_EXE% tests\launchtest.lua %2 %3 %4 | 221 | timeit %LUA_EXE% tests\launchtest.lua %2 %3 %4 |
diff --git a/src/cancel.cpp b/src/cancel.cpp index 990f5d4..755215f 100644 --- a/src/cancel.cpp +++ b/src/cancel.cpp | |||
@@ -168,7 +168,7 @@ LUAG_FUNC(thread_cancel) | |||
168 | bool _wake_lane{ _op != CancelOp::Soft }; | 168 | bool _wake_lane{ _op != CancelOp::Soft }; |
169 | if (lua_gettop(L_) >= 2) { | 169 | if (lua_gettop(L_) >= 2) { |
170 | if (!lua_isboolean(L_, 2)) { | 170 | if (!lua_isboolean(L_, 2)) { |
171 | raise_luaL_error(L_, "wake_lindas parameter is not a boolean"); | 171 | raise_luaL_error(L_, "wake_lindas argument is not a boolean"); |
172 | } | 172 | } |
173 | _wake_lane = lua_toboolean(L_, 2); | 173 | _wake_lane = lua_toboolean(L_, 2); |
174 | lua_remove(L_, 2); // argument is processed, remove it | 174 | lua_remove(L_, 2); // argument is processed, remove it |
diff --git a/src/intercopycontext.cpp b/src/intercopycontext.cpp index 34a1c95..85c1ebb 100644 --- a/src/intercopycontext.cpp +++ b/src/intercopycontext.cpp | |||
@@ -193,7 +193,7 @@ void InterCopyContext::copyFunction() const | |||
193 | // "value returned is the error code returned by the last call | 193 | // "value returned is the error code returned by the last call |
194 | // to the writer" (and we only return 0) | 194 | // to the writer" (and we only return 0) |
195 | // not sure this could ever fail but for memory shortage reasons | 195 | // not sure this could ever fail but for memory shortage reasons |
196 | // last parameter is Lua 5.4-specific (no stripping) | 196 | // last argument is Lua 5.4-specific (no stripping) |
197 | luaL_Buffer B{}; | 197 | luaL_Buffer B{}; |
198 | if (luaG_dump(L1, buf_writer, &B, U->stripFunctions) != 0) { | 198 | if (luaG_dump(L1, buf_writer, &B, U->stripFunctions) != 0) { |
199 | raise_luaL_error(getErrL(), "internal error: function dump failed."); | 199 | raise_luaL_error(getErrL(), "internal error: function dump failed."); |
@@ -482,7 +482,7 @@ void InterCopyContext::interCopyKeyValuePair() const | |||
482 | return; | 482 | return; |
483 | // we could raise an error instead of ignoring the table entry, like so: | 483 | // we could raise an error instead of ignoring the table entry, like so: |
484 | // raise_luaL_error(L1, "Unable to copy %s key '%s' because of value is of type '%s'", (vt == VT::NORMAL) ? "table" : "metatable", name, luaL_typename(L1, key_i)); | 484 | // raise_luaL_error(L1, "Unable to copy %s key '%s' because of value is of type '%s'", (vt == VT::NORMAL) ? "table" : "metatable", name, luaL_typename(L1, key_i)); |
485 | // maybe offer this possibility as a global configuration option, or a linda setting, or as a parameter of the call causing the transfer? | 485 | // maybe offer this possibility as a global configuration option, or a linda setting, or as a argument of the call causing the transfer? |
486 | } | 486 | } |
487 | 487 | ||
488 | char* _valPath{ nullptr }; | 488 | char* _valPath{ nullptr }; |
diff --git a/src/keeper.cpp b/src/keeper.cpp index 7038f2c..e058114 100644 --- a/src/keeper.cpp +++ b/src/keeper.cpp | |||
@@ -576,8 +576,8 @@ int keepercall_set(lua_State* const L_) | |||
576 | * Call a function ('func_name') in the keeper state, and pass on the returned | 576 | * Call a function ('func_name') in the keeper state, and pass on the returned |
577 | * values to 'L'. | 577 | * values to 'L'. |
578 | * | 578 | * |
579 | * 'linda': deep Linda pointer (used only as a unique table key, first parameter) | 579 | * 'linda': deep Linda pointer (used only as a unique table key, first argument) |
580 | * 'starting_index': first of the rest of parameters (none if 0) | 580 | * 'starting_index': first of the rest of arguments (none if 0) |
581 | * | 581 | * |
582 | * Returns: number of return values (pushed to 'L'), unset in case of error | 582 | * Returns: number of return values (pushed to 'L'), unset in case of error |
583 | */ | 583 | */ |
diff --git a/src/lane.cpp b/src/lane.cpp index e801cba..d4175c6 100644 --- a/src/lane.cpp +++ b/src/lane.cpp | |||
@@ -539,7 +539,7 @@ static void push_stack_trace(lua_State* L_, Lane::ErrorTraceLevel errorTraceLeve | |||
539 | 539 | ||
540 | // ################################################################################################# | 540 | // ################################################################################################# |
541 | //--- | 541 | //--- |
542 | // Run finalizers - if any - with the given parameters | 542 | // Run finalizers - if any - with the given arguments |
543 | // | 543 | // |
544 | // If 'rc' is nonzero, error message and stack index (the latter only when errorTraceLevel_ == 1) are available as: | 544 | // If 'rc' is nonzero, error message and stack index (the latter only when errorTraceLevel_ == 1) are available as: |
545 | // [-1]: stack trace (table) | 545 | // [-1]: stack trace (table) |
@@ -14,7 +14,7 @@ static constexpr RegistryUniqueKey kExtendedStackTraceRegKey{ 0x38147AD48FB426E2 | |||
14 | * of functions that Lanes will call after the executing 'pcall' has ended. | 14 | * of functions that Lanes will call after the executing 'pcall' has ended. |
15 | * | 15 | * |
16 | * We're NOT using the GC system for finalizer mainly because providing the | 16 | * We're NOT using the GC system for finalizer mainly because providing the |
17 | * error (and maybe stack trace) parameters to the finalizer functions would | 17 | * error (and maybe stack trace) arguments to the finalizer functions would |
18 | * anyways complicate that approach. | 18 | * anyways complicate that approach. |
19 | */ | 19 | */ |
20 | // xxh64 of string "kFinalizerRegKey" generated at https://www.pelock.com/products/hash-calculator | 20 | // xxh64 of string "kFinalizerRegKey" generated at https://www.pelock.com/products/hash-calculator |
diff --git a/src/lanes.cpp b/src/lanes.cpp index f1aa873..cab5944 100644 --- a/src/lanes.cpp +++ b/src/lanes.cpp | |||
@@ -217,7 +217,7 @@ LUAG_FUNC(register) | |||
217 | { | 217 | { |
218 | std::string_view const _name{ luaG_checkstring(L_, 1) }; | 218 | std::string_view const _name{ luaG_checkstring(L_, 1) }; |
219 | LuaType const _mod_type{ luaG_type(L_, 2) }; | 219 | LuaType const _mod_type{ luaG_type(L_, 2) }; |
220 | // ignore extra parameters, just in case | 220 | // ignore extra arguments, just in case |
221 | lua_settop(L_, 2); | 221 | lua_settop(L_, 2); |
222 | luaL_argcheck(L_, (_mod_type == LuaType::TABLE) || (_mod_type == LuaType::FUNCTION), 2, "unexpected module type"); | 222 | luaL_argcheck(L_, (_mod_type == LuaType::TABLE) || (_mod_type == LuaType::FUNCTION), 2, "unexpected module type"); |
223 | DEBUGSPEW_CODE(Universe* _U = Universe::Get(L_)); | 223 | DEBUGSPEW_CODE(Universe* _U = Universe::Get(L_)); |
diff --git a/src/lanes.lua b/src/lanes.lua index c860ba0..29fc4a9 100644 --- a/src/lanes.lua +++ b/src/lanes.lua | |||
@@ -158,12 +158,12 @@ local params_checker = function(settings_) | |||
158 | -- make a copy of the table to leave the provided one unchanged, *and* to help ensure it won't change behind our back | 158 | -- make a copy of the table to leave the provided one unchanged, *and* to help ensure it won't change behind our back |
159 | local settings = {} | 159 | local settings = {} |
160 | if type(settings_) ~= "table" then | 160 | if type(settings_) ~= "table" then |
161 | error "Bad parameter #1 to lanes.configure(), should be a table" | 161 | error "Bad argument #1 to lanes.configure(), should be a table" |
162 | end | 162 | end |
163 | -- any setting unknown to Lanes raises an error | 163 | -- any setting unknown to Lanes raises an error |
164 | for setting, _ in pairs(settings_) do | 164 | for setting, _ in pairs(settings_) do |
165 | if not param_checkers[setting] then | 165 | if not param_checkers[setting] then |
166 | error("Unknown parameter '" .. setting .. "' in configure options") | 166 | error("Unknown argument '" .. setting .. "' in configure options") |
167 | end | 167 | end |
168 | end | 168 | end |
169 | -- any setting not present in the provided parameters takes the default value | 169 | -- any setting not present in the provided parameters takes the default value |
@@ -176,7 +176,7 @@ local params_checker = function(settings_) | |||
176 | param = default_params[key] | 176 | param = default_params[key] |
177 | end | 177 | end |
178 | if not checker(param) then | 178 | if not checker(param) then |
179 | error("Bad parameter " .. key .. ": " .. tostring(param), 2) | 179 | error("Bad argument " .. key .. ": " .. tostring(param), 2) |
180 | end | 180 | end |
181 | settings[key] = param | 181 | settings[key] = param |
182 | end | 182 | end |
@@ -291,7 +291,7 @@ local opt_validators = | |||
291 | -- | 291 | -- |
292 | -- ... (more options may be introduced later) ... | 292 | -- ... (more options may be introduced later) ... |
293 | -- | 293 | -- |
294 | -- Calling with a function parameter ('lane_func') ends the string/table | 294 | -- Calling with a function argument ('lane_func') ends the string/table |
295 | -- modifiers, and prepares a lane generator. | 295 | -- modifiers, and prepares a lane generator. |
296 | 296 | ||
297 | -- receives a sequence of strings and tables, plus a function | 297 | -- receives a sequence of strings and tables, plus a function |
@@ -306,7 +306,7 @@ local gen = function(...) | |||
306 | 306 | ||
307 | -- we need at least a function | 307 | -- we need at least a function |
308 | if n == 0 then | 308 | if n == 0 then |
309 | error("No parameters!", 2) | 309 | error("No arguments!", 2) |
310 | end | 310 | end |
311 | 311 | ||
312 | -- all arguments but the last must be nil, strings, or tables | 312 | -- all arguments but the last must be nil, strings, or tables |
@@ -322,7 +322,7 @@ local gen = function(...) | |||
322 | elseif v == nil then | 322 | elseif v == nil then |
323 | -- skip | 323 | -- skip |
324 | else | 324 | else |
325 | error("Bad parameter " .. i .. ": " .. tv .. " " .. string_format("%q", tostring(v)), 2) | 325 | error("Bad argument " .. i .. ": " .. tv .. " " .. string_format("%q", tostring(v)), 2) |
326 | end | 326 | end |
327 | end | 327 | end |
328 | 328 | ||
@@ -330,7 +330,7 @@ local gen = function(...) | |||
330 | local func = select(n, ...) | 330 | local func = select(n, ...) |
331 | local functype = type(func) | 331 | local functype = type(func) |
332 | if functype ~= "function" and functype ~= "string" then | 332 | if functype ~= "function" and functype ~= "string" then |
333 | error("Last parameter not function or string: " .. functype .. " " .. string_format("%q", tostring(func)), 2) | 333 | error("Last argument not function or string: " .. functype .. " " .. string_format("%q", tostring(func)), 2) |
334 | end | 334 | end |
335 | 335 | ||
336 | -- check that the caller only provides reserved library names, and those only once | 336 | -- check that the caller only provides reserved library names, and those only once |
diff --git a/tests/argtable.lua b/tests/argtable.lua index 5ed5d4e..95ee825 100644 --- a/tests/argtable.lua +++ b/tests/argtable.lua | |||
@@ -1,7 +1,7 @@ | |||
1 | -- | 1 | -- |
2 | -- ARGTABLE.LUA Copyright (c) 2007, Asko Kauppi <akauppi@gmail.com> | 2 | -- ARGTABLE.LUA Copyright (c) 2007, Asko Kauppi <akauppi@gmail.com> |
3 | -- | 3 | -- |
4 | -- Command line parameter parsing | 4 | -- Command line argument parsing |
5 | -- | 5 | -- |
6 | -- NOTE: Wouldn't hurt having such a service built-in to Lua...? :P | 6 | -- NOTE: Wouldn't hurt having such a service built-in to Lua...? :P |
7 | -- | 7 | -- |
@@ -10,10 +10,10 @@ local m= {} | |||
10 | 10 | ||
11 | -- tbl= argtable(...) | 11 | -- tbl= argtable(...) |
12 | -- | 12 | -- |
13 | -- Returns a table with 1..N indices being 'value' parameters, and any | 13 | -- Returns a table with 1..N indices being 'value' arguments, and any |
14 | -- "-flag[=xxx]" or "--flag[=xxx]" parameters set to { flag=xxx/true }. | 14 | -- "-flag[=xxx]" or "--flag[=xxx]" arguments set to { flag=xxx/true }. |
15 | -- | 15 | -- |
16 | -- In other words, makes handling command line parameters simple. :) | 16 | -- In other words, makes handling command line arguments simple. :) |
17 | -- | 17 | -- |
18 | -- 15 --> { 15 } | 18 | -- 15 --> { 15 } |
19 | -- -20 --> { -20 } | 19 | -- -20 --> { -20 } |
diff --git a/tests/assert.lua b/tests/assert.lua index 85febfb..7bb4233 100644 --- a/tests/assert.lua +++ b/tests/assert.lua | |||
@@ -6,7 +6,7 @@ | |||
6 | -- | 6 | -- |
7 | -- This module allows shorthand use s.a. 'assert.table()' for asserting | 7 | -- This module allows shorthand use s.a. 'assert.table()' for asserting |
8 | -- variable types, and is also being used by Lua-super constraints system | 8 | -- variable types, and is also being used by Lua-super constraints system |
9 | -- for testing function parameter & return types. | 9 | -- for testing function argument & return types. |
10 | -- | 10 | -- |
11 | -- All in all, a worthy module and could be part of Lua future versions. | 11 | -- All in all, a worthy module and could be part of Lua future versions. |
12 | -- | 12 | -- |
@@ -182,7 +182,7 @@ assert= | |||
182 | return v | 182 | return v |
183 | end, | 183 | end, |
184 | 184 | ||
185 | -- Range assertion, with extra parameters per instance | 185 | -- Range assertion, with extra arguments per instance |
186 | -- | 186 | -- |
187 | -- Note: values may be of _any_ type that can do >=, <= comparisons. | 187 | -- Note: values may be of _any_ type that can do >=, <= comparisons. |
188 | -- | 188 | -- |
@@ -240,7 +240,7 @@ assert= | |||
240 | end | 240 | end |
241 | end | 241 | end |
242 | 242 | ||
243 | _assert( type(tbl)=="table", "Wrong parameter to assert['{}']" ) | 243 | _assert( type(tbl)=="table", "Wrong argument to assert['{}']" ) |
244 | 244 | ||
245 | return function( v, msg, lev ) | 245 | return function( v, msg, lev ) |
246 | lev= (lev or 1)+1 | 246 | lev= (lev or 1)+1 |
diff --git a/tests/cyclic.lua b/tests/cyclic.lua index fd6d4a0..ed4bdba 100644 --- a/tests/cyclic.lua +++ b/tests/cyclic.lua | |||
@@ -34,10 +34,10 @@ end | |||
34 | local L1= lanes.gen( "io", lane1 )() | 34 | local L1= lanes.gen( "io", lane1 )() |
35 | -- ...running | 35 | -- ...running |
36 | 36 | ||
37 | -- Getting the tables as parameters should also keep the linkage | 37 | -- Getting the tables as arguments should also keep the linkage |
38 | -- | 38 | -- |
39 | local function lane2( aa, bb ) | 39 | local function lane2( aa, bb ) |
40 | WR( "Via parameters:", same(aa,bb[1]), same(aa[1],bb) ) | 40 | WR( "Via arguments:", same(aa,bb[1]), same(aa[1],bb) ) |
41 | assert( aa[1]==bb ) | 41 | assert( aa[1]==bb ) |
42 | assert( bb[1]==aa ) | 42 | assert( bb[1]==aa ) |
43 | return true | 43 | return true |
diff --git a/tests/finalizer.lua b/tests/finalizer.lua index 3158c65..1412a67 100644 --- a/tests/finalizer.lua +++ b/tests/finalizer.lua | |||
@@ -44,7 +44,7 @@ end | |||
44 | 44 | ||
45 | -- | 45 | -- |
46 | -- This is called at the end of the lane; whether succesful or not. | 46 | -- This is called at the end of the lane; whether succesful or not. |
47 | -- Gets the 'error()' parameter as parameter ('nil' if normal return). | 47 | -- Gets the 'error()' argument as argument ('nil' if normal return). |
48 | -- | 48 | -- |
49 | cleanup = function(err) | 49 | cleanup = function(err) |
50 | io.stderr:write "------------------------ In Worker Finalizer -----------------------\n" | 50 | io.stderr:write "------------------------ In Worker Finalizer -----------------------\n" |
diff --git a/tests/objects.lua b/tests/objects.lua index 61c280d..ed460af 100644 --- a/tests/objects.lua +++ b/tests/objects.lua | |||
@@ -68,7 +68,7 @@ local mt_a= getmetatable(a) | |||
68 | local mt_b= getmetatable(b) | 68 | local mt_b= getmetatable(b) |
69 | assert(mt_a and mt_a==mt_b ) | 69 | assert(mt_a and mt_a==mt_b ) |
70 | 70 | ||
71 | local h= start_lane(a) -- 1st object as parameter | 71 | local h= start_lane(a) -- 1st object as argument |
72 | 72 | ||
73 | linda:send("", b ) -- 2nd object via Linda | 73 | linda:send("", b ) -- 2nd object via Linda |
74 | 74 | ||