aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/intercopycontext.cpp4
-rw-r--r--src/lane.cpp6
-rw-r--r--src/linda.cpp2
-rw-r--r--src/universe.cpp2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/intercopycontext.cpp b/src/intercopycontext.cpp
index 0b4aabc..978a69b 100644
--- a/src/intercopycontext.cpp
+++ b/src/intercopycontext.cpp
@@ -335,10 +335,10 @@ void InterCopyContext::lookup_native_func() const
335 // when mode_ == LookupMode::FromKeeper, L is a keeper state and L2 is not, therefore L2 is the state where we want to raise the error 335 // when mode_ == LookupMode::FromKeeper, L is a keeper state and L2 is not, therefore L2 is the state where we want to raise the error
336 raise_luaL_error( 336 raise_luaL_error(
337 getErrL(), 337 getErrL(),
338 "%s%s: function '" STRINGVIEW_FMT "' not found in %s destination transfer database.", 338 "%s%s: function '%s' not found in %s destination transfer database.",
339 lua_isnil(L2, -1) ? "" : "INTERNAL ERROR IN ", 339 lua_isnil(L2, -1) ? "" : "INTERNAL ERROR IN ",
340 _from ? _from : "main", 340 _from ? _from : "main",
341 _fqn.size(), _fqn.data(), 341 _fqn.data(),
342 _to ? _to : "main"); 342 _to ? _to : "main");
343 return; 343 return;
344 } 344 }
diff --git a/src/lane.cpp b/src/lane.cpp
index 129c926..f4d4bd1 100644
--- a/src/lane.cpp
+++ b/src/lane.cpp
@@ -278,7 +278,7 @@ static int thread_index_number(lua_State* L_)
278 lua_replace(L_, -3); // L_: lane n error() "error" 278 lua_replace(L_, -3); // L_: lane n error() "error"
279 lua_pushinteger(L_, 3); // L_: lane n error() "error" 3 279 lua_pushinteger(L_, 3); // L_: lane n error() "error" 3
280 lua_call(L_, 2, 0); // error(tostring(errstring), 3) -> doesn't return // L_: lane n 280 lua_call(L_, 2, 0); // error(tostring(errstring), 3) -> doesn't return // L_: lane n
281 raise_luaL_error(L_, STRINGVIEW_FMT ": should not get here!", _lane->debugName.size(), _lane->debugName.data()); 281 raise_luaL_error(L_, "%s: should not get here!", _lane->debugName.data());
282 } else { 282 } else {
283 lua_pop(L_, 1); // L_: lane n {uv} 283 lua_pop(L_, 1); // L_: lane n {uv}
284 } 284 }
@@ -316,7 +316,7 @@ static int thread_index_string(lua_State* L_)
316 lua_rawget(L_, -2); // L_: mt value 316 lua_rawget(L_, -2); // L_: mt value
317 // only "cancel" and "join" are registered as functions, any other string will raise an error 317 // only "cancel" and "join" are registered as functions, any other string will raise an error
318 if (!lua_iscfunction(L_, -1)) { 318 if (!lua_iscfunction(L_, -1)) {
319 raise_luaL_error(L_, "can't index a lane with '" STRINGVIEW_FMT "'", _keystr.size(), _keystr.data()); 319 raise_luaL_error(L_, "can't index a lane with '%s'", _keystr.data());
320 } 320 }
321 return 1; 321 return 1;
322} 322}
@@ -345,7 +345,7 @@ static LUAG_FUNC(thread_index)
345 lua_pushvalue(L_, kKey); // L_: mt error "Unknown key: " k 345 lua_pushvalue(L_, kKey); // L_: mt error "Unknown key: " k
346 lua_concat(L_, 2); // L_: mt error "Unknown key: <k>" 346 lua_concat(L_, 2); // L_: mt error "Unknown key: <k>"
347 lua_call(L_, 1, 0); // error( "Unknown key: " .. key) -> doesn't return // L_: mt 347 lua_call(L_, 1, 0); // error( "Unknown key: " .. key) -> doesn't return // L_: mt
348 raise_luaL_error(L_, STRINGVIEW_FMT "[%s]: should not get here!", _lane->debugName.size(), _lane->debugName.data(), lua_typename(L_, lua_type(L_, kKey))); 348 raise_luaL_error(L_, "%s[%s]: should not get here!", _lane->debugName.data(), lua_typename(L_, lua_type(L_, kKey)));
349 } 349 }
350} 350}
351 351
diff --git a/src/linda.cpp b/src/linda.cpp
index dafac56..8d09903 100644
--- a/src/linda.cpp
+++ b/src/linda.cpp
@@ -54,7 +54,7 @@ static void check_key_types(lua_State* L_, int start_, int end_)
54 static constexpr std::array<std::reference_wrapper<UniqueKey const>, 3> kKeysToCheck{ kLindaBatched, kCancelError, kNilSentinel }; 54 static constexpr std::array<std::reference_wrapper<UniqueKey const>, 3> kKeysToCheck{ kLindaBatched, kCancelError, kNilSentinel };
55 for (UniqueKey const& _key : kKeysToCheck) { 55 for (UniqueKey const& _key : kKeysToCheck) {
56 if (_key.equals(L_, _i)) { 56 if (_key.equals(L_, _i)) {
57 raise_luaL_error(L_, "argument #%d: can't use " STRINGVIEW_FMT " as a key", _i, _key.debugName.size(), _key.debugName.data()); 57 raise_luaL_error(L_, "argument #%d: can't use %s as a key", _i, _key.debugName.data());
58 break; 58 break;
59 } 59 }
60 } 60 }
diff --git a/src/universe.cpp b/src/universe.cpp
index 3271e70..620be79 100644
--- a/src/universe.cpp
+++ b/src/universe.cpp
@@ -383,7 +383,7 @@ void Universe::terminateFreeRunningLanes(lua_State* L_, lua_Duration shutdownTim
383 Lane* _lane{ selfdestructFirst }; 383 Lane* _lane{ selfdestructFirst };
384 if (_lane != SELFDESTRUCT_END) { 384 if (_lane != SELFDESTRUCT_END) {
385 // this causes a leak because we don't call U's destructor (which could be bad if the still running lanes are accessing it) 385 // this causes a leak because we don't call U's destructor (which could be bad if the still running lanes are accessing it)
386 raise_luaL_error(L_, "Zombie thread '" STRINGVIEW_FMT "' refuses to die!", _lane->debugName.size(), _lane->debugName.data()); 386 raise_luaL_error(L_, "Zombie thread '%s' refuses to die!", _lane->debugName.data());
387 } 387 }
388 } 388 }
389} 389}