diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/keeper.cpp | 4 | ||||
| -rw-r--r-- | src/lanes.cpp | 10 | ||||
| -rw-r--r-- | src/lanes.lua | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/keeper.cpp b/src/keeper.cpp index 4af0d86..179109a 100644 --- a/src/keeper.cpp +++ b/src/keeper.cpp | |||
| @@ -11,10 +11,9 @@ | |||
| 11 | -- | 11 | -- |
| 12 | -- C implementation replacement of the original keeper.lua | 12 | -- C implementation replacement of the original keeper.lua |
| 13 | -- | 13 | -- |
| 14 | --[[ | ||
| 15 | =============================================================================== | 14 | =============================================================================== |
| 16 | 15 | ||
| 17 | Copyright (C) 2011-2024 Benoit Germain <bnt.germain@gmail.com> | 16 | Copyright (C) 2011-2026 Benoit Germain <bnt.germain@gmail.com> |
| 18 | 17 | ||
| 19 | Permission is hereby granted, free of charge, to any person obtaining a copy | 18 | Permission is hereby granted, free of charge, to any person obtaining a copy |
| 20 | of this software and associated documentation files (the "Software"), to deal | 19 | of this software and associated documentation files (the "Software"), to deal |
| @@ -35,7 +34,6 @@ | |||
| 35 | THE SOFTWARE. | 34 | THE SOFTWARE. |
| 36 | 35 | ||
| 37 | =============================================================================== | 36 | =============================================================================== |
| 38 | ]]-- | ||
| 39 | */ | 37 | */ |
| 40 | #include "_pch.hpp" | 38 | #include "_pch.hpp" |
| 41 | #include "keeper.hpp" | 39 | #include "keeper.hpp" |
diff --git a/src/lanes.cpp b/src/lanes.cpp index 5b9eb2b..74a9d95 100644 --- a/src/lanes.cpp +++ b/src/lanes.cpp | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * LANES.CPP Copyright (c) 2007-08, Asko Kauppi | 2 | * LANES.CPP Copyright (c) 2007-08, Asko Kauppi |
| 3 | * Copyright (C) 2009-24, Benoit Germain | 3 | * Copyright (C) 2009-26, Benoit Germain |
| 4 | * | 4 | * |
| 5 | * Multithreading in Lua. | 5 | * Multithreading in Lua. |
| 6 | * | 6 | * |
| @@ -56,7 +56,7 @@ | |||
| 56 | =============================================================================== | 56 | =============================================================================== |
| 57 | 57 | ||
| 58 | Copyright (C) 2007-10 Asko Kauppi <akauppi@gmail.com> | 58 | Copyright (C) 2007-10 Asko Kauppi <akauppi@gmail.com> |
| 59 | 2011-24 Benoit Germain <bnt.germain@gmail.com> | 59 | 2011-26 Benoit Germain <bnt.germain@gmail.com> |
| 60 | 60 | ||
| 61 | Permission is hereby granted, free of charge, to any person obtaining a copy | 61 | Permission is hereby granted, free of charge, to any person obtaining a copy |
| 62 | of this software and associated documentation files (the "Software"), to deal | 62 | of this software and associated documentation files (the "Software"), to deal |
| @@ -267,7 +267,8 @@ namespace { | |||
| 267 | 267 | ||
| 268 | // Read the priority-is-native flag and optional priority integer from the lane_new() argument stack. | 268 | // Read the priority-is-native flag and optional priority integer from the lane_new() argument stack. |
| 269 | // Validates the mapped priority range if native mode is not requested. | 269 | // Validates the mapped priority range if native mode is not requested. |
| 270 | [[nodiscard]] static LanePriority ResolveLanePriority(lua_State* const L_, StackIndex const prinIdx_, StackIndex const prioIdx_) | 270 | [[nodiscard]] |
| 271 | static LanePriority ResolveLanePriority(lua_State* const L_, StackIndex const prinIdx_, StackIndex const prioIdx_) | ||
| 271 | { | 272 | { |
| 272 | NativePrioFlag const _native{ static_cast<bool>(lua_toboolean(L_, prinIdx_)) }; | 273 | NativePrioFlag const _native{ static_cast<bool>(lua_toboolean(L_, prinIdx_)) }; |
| 273 | if (lua_isnoneornil(L_, prioIdx_)) { | 274 | if (lua_isnoneornil(L_, prioIdx_)) { |
| @@ -373,7 +374,8 @@ namespace { | |||
| 373 | // Push the optional error handler onto L2, then transfer the lane body (a Lua function or | 374 | // Push the optional error handler onto L2, then transfer the lane body (a Lua function or |
| 374 | // a string to be compiled) from L_ into L2_. Returns the error handler count (0 or 1) so | 375 | // a string to be compiled) from L_ into L2_. Returns the error handler count (0 or 1) so |
| 375 | // the caller can assert the correct L2 stack depth after arguments are transferred. | 376 | // the caller can assert the correct L2 stack depth after arguments are transferred. |
| 376 | [[nodiscard]] static int TransferLaneBody(Universe* const U_, lua_State* const L_, lua_State* const L2_, StackIndex const funcIdx_, Lane* const lane_) | 377 | [[nodiscard]] |
| 378 | static int TransferLaneBody(Universe* const U_, lua_State* const L_, lua_State* const L2_, StackIndex const funcIdx_, Lane* const lane_) | ||
| 377 | { | 379 | { |
| 378 | int const _errorHandlerCount{ lane_->pushErrorHandler() }; // L_: [fixed] args... L2: eh? | 380 | int const _errorHandlerCount{ lane_->pushErrorHandler() }; // L_: [fixed] args... L2: eh? |
| 379 | LuaType const _func_type{ luaW_type(L_, funcIdx_) }; | 381 | LuaType const _func_type{ luaW_type(L_, funcIdx_) }; |
diff --git a/src/lanes.lua b/src/lanes.lua index 43ebfd5..98b1bf6 100644 --- a/src/lanes.lua +++ b/src/lanes.lua | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | =============================================================================== | 12 | =============================================================================== |
| 13 | 13 | ||
| 14 | Copyright (C) 2007-10 Asko Kauppi <akauppi@gmail.com> | 14 | Copyright (C) 2007-10 Asko Kauppi <akauppi@gmail.com> |
| 15 | Copyright (C) 2010-24 Benoit Germain <bnt.germain@gmail.com> | 15 | Copyright (C) 2010-26 Benoit Germain <bnt.germain@gmail.com> |
| 16 | 16 | ||
| 17 | Permission is hereby granted, free of charge, to any person obtaining a copy | 17 | Permission is hereby granted, free of charge, to any person obtaining a copy |
| 18 | of this software and associated documentation files (the "Software"), to deal | 18 | of this software and associated documentation files (the "Software"), to deal |
| @@ -875,10 +875,10 @@ local configure = function(settings_) | |||
| 875 | -- | 875 | -- |
| 876 | lanes.ABOUT = | 876 | lanes.ABOUT = |
| 877 | { | 877 | { |
| 878 | author= "Asko Kauppi <akauppi@gmail.com>, Benoit Germain <bnt.germain@gmail.com>", | 878 | author = "Asko Kauppi <akauppi@gmail.com>, Benoit Germain <bnt.germain@gmail.com>", |
| 879 | description= "Running multiple Lua states in parallel", | 879 | description = "Running multiple Lua states in parallel", |
| 880 | license= "MIT/X11", | 880 | license = "MIT/X11", |
| 881 | copyright= "Copyright (c) 2007-10, Asko Kauppi; (c) 2011-23, Benoit Germain", | 881 | copyright = "Copyright (c) 2007-10, Asko Kauppi; (c) 2011-26, Benoit Germain", |
| 882 | version = assert(core.version) | 882 | version = assert(core.version) |
| 883 | } | 883 | } |
| 884 | 884 | ||
