eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-20 10:19:19 +02:00
Code Issues 123 Wiki Activity

reformat: use auto on certain types

Browse Source
This commit is contained in:
jerrrrycho
2026-07-04 05:22:52 +02:00
parent f61068ff89
commit 20e7a99516
118 changed files with 2118 additions and 2063 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripting/PyInt.cpp
View File

@@ -169,7 +169,7 @@ void render_task::run()
auto *commandsPO = PyObject_CallMethod(m_renderer, const_cast<char *>("getCommands"), nullptr);
if (commandsPO != nullptr)
{
std::vector<std::string> commands = python_external_utils::PyObjectToStringArray(commandsPO);
const std::vector<std::string> commands = python_external_utils::PyObjectToStringArray(commandsPO);
Py_DECREF(commandsPO);
// we perform any actions ONLY when there are any commands in buffer
@@ -180,7 +180,7 @@ void render_task::run()
std::string baseCmd;
int p1 = 0, p2 = 0;
size_t pos1 = cmd.find(';');
const size_t pos1 = cmd.find(';');
if (pos1 == std::string::npos)
{
baseCmd = cmd;
@@ -189,7 +189,7 @@ void render_task::run()
{
baseCmd = cmd.substr(0, pos1);
size_t pos2 = cmd.find(';', pos1 + 1);
const size_t pos2 = cmd.find(';', pos1 + 1);
if (pos2 == std::string::npos)
{
p1 = std::stoi(cmd.substr(pos1 + 1));
@@ -346,7 +346,7 @@ void python_taskqueue::exit()
// which the previous code did not do (cancel() is a no-op stub).
{
std::lock_guard<std::mutex> lock(m_tasks.mutex);
for (auto &task : m_tasks.data)
for (const auto &task : m_tasks.data)
{
task->cancel();
}
@@ -359,7 +359,7 @@ void python_taskqueue::exit()
// reclaim cached python objects while the interpreter is still alive,
// so no Py_DECREF lands on a finalized interpreter during later teardown
acquire_lock();
for (auto &entry : m_renderers)
for (const auto &entry : m_renderers)
{
Py_XDECREF(entry.second);
}
@@ -593,7 +593,7 @@ void python_taskqueue::update()
{
std::lock_guard<std::mutex> lock(m_uploadtasks.mutex);
for (auto &task : m_uploadtasks.data)
for (const auto &task : m_uploadtasks.data)
task->upload();
m_uploadtasks.data.clear();
@@ -674,7 +674,7 @@ std::vector<std::string> python_external_utils::PyObjectToStringArray(PyObject *
return emptyIfError;
}
Py_ssize_t size = PySequence_Size(pyList);
const Py_ssize_t size = PySequence_Size(pyList);
for (Py_ssize_t i = 0; i < size; ++i)
{
PyObject *item = PySequence_GetItem(pyList, i); // Increments reference count

62
scripting/lua.cpp
View File

@@ -57,14 +57,14 @@ std::string lua::get_error() const
void lua::interpret(const std::string& file) const
{
if (luaL_dofile(state, file.c_str())) {
std::string str = lua_tostring(state, -1);
const std::string str = lua_tostring(state, -1);
ErrorLog("lua: Runtime error: " + str, logtype::lua);
}
}
int lua::atpanic(lua_State *s)
{
std::string err = lua_tostring(s, -1);
const std::string err = lua_tostring(s, -1);
ErrorLog("lua: Runtime error: " + err, logtype::lua);
return 0;
}
@@ -124,11 +124,11 @@ memcell_values lua::get_memcell_values(lua_State *L, int idx)
int lua::scriptapi_event_create(lua_State *L)
{
std::string name = lua_tostring(L, 1);
double delay = lua_tonumber(L, 2);
double randomdelay = lua_tonumber(L, 3);
const std::string name = lua_tostring(L, 1);
const double delay = lua_tonumber(L, 2);
const double randomdelay = lua_tonumber(L, 3);
lua_pushvalue(L, 4);
int funcRef = luaL_ref(L, LUA_REGISTRYINDEX);
const int funcRef = luaL_ref(L, LUA_REGISTRYINDEX);
basic_event *event = new lua_event(L, funcRef);
event->m_name = name;
@@ -144,7 +144,7 @@ int lua::scriptapi_event_create(lua_State *L)
int lua::scriptapi_event_find(lua_State *L)
{
std::string name = lua_tostring(L, 1);
const std::string name = lua_tostring(L, 1);
basic_event *event = simulation::Events.FindEvent(name);
if (event)
{
@@ -157,15 +157,15 @@ int lua::scriptapi_event_find(lua_State *L)
int lua::scriptapi_event_exists(lua_State *L)
{
std::string name = lua_tostring(L, 1);
basic_event *event = simulation::Events.FindEvent(name);
const std::string name = lua_tostring(L, 1);
const basic_event *event = simulation::Events.FindEvent(name);
lua_pushboolean(L, event != nullptr);
return 1;
}
int lua::scriptapi_event_getname(lua_State *L)
{
auto *event = static_cast<basic_event *>(lua_touserdata(L, 1));
const auto *event = static_cast<basic_event *>(lua_touserdata(L, 1));
if (event)
{
lua_pushstring(L, event->m_name.c_str());
@@ -177,8 +177,8 @@ int lua::scriptapi_event_getname(lua_State *L)
int lua::scriptapi_event_dispatch(lua_State *L)
{
auto *event = static_cast<basic_event *>(lua_touserdata(L, 1));
auto *activator = static_cast<TDynamicObject *>(lua_touserdata(L, 2));
double delay = lua_tonumber(L, 3);
const auto *activator = static_cast<TDynamicObject *>(lua_touserdata(L, 2));
const double delay = lua_tonumber(L, 3);
if (event)
simulation::Events.AddToQuery(event, activator, delay);
return 0;
@@ -186,9 +186,9 @@ int lua::scriptapi_event_dispatch(lua_State *L)
int lua::scriptapi_event_dispatch_n(lua_State *L)
{
std::string name = lua_tostring(L, 1);
auto *activator = static_cast<TDynamicObject *>(lua_touserdata(L, 2));
double delay = lua_tonumber(L, 3);
const std::string name = lua_tostring(L, 1);
const auto *activator = static_cast<TDynamicObject *>(lua_touserdata(L, 2));
const double delay = lua_tonumber(L, 3);
basic_event *event = simulation::Events.FindEvent(name);
if (event)
simulation::Events.AddToQuery(event, activator, delay);
@@ -199,7 +199,7 @@ int lua::scriptapi_event_dispatch_n(lua_State *L)
int lua::scriptapi_track_find(lua_State *L)
{
std::string name = lua_tostring(L, 1);
const std::string name = lua_tostring(L, 1);
TTrack *track = simulation::Paths.find(name);
if (track)
{
@@ -223,7 +223,7 @@ int lua::scriptapi_track_isoccupied(lua_State *L)
int lua::scriptapi_track_isoccupied_n(lua_State *L)
{
std::string name = lua_tostring(L, 1);
const std::string name = lua_tostring(L, 1);
TTrack *track = simulation::Paths.find(name);
if (track)
{
@@ -236,7 +236,7 @@ int lua::scriptapi_track_isoccupied_n(lua_State *L)
int lua::scriptapi_isolated_find(lua_State *L)
{
std::string name = lua_tostring(L, 1);
const std::string name = lua_tostring(L, 1);
TIsolated *isolated = TIsolated::Find(name);
if (isolated)
{
@@ -260,7 +260,7 @@ int lua::scriptapi_isolated_isoccupied(lua_State *L)
int lua::scriptapi_isolated_isoccupied_n(lua_State *L)
{
std::string name = lua_tostring(L, 1);
const std::string name = lua_tostring(L, 1);
TIsolated *isolated = TIsolated::Find(name);
if (isolated)
{
@@ -273,7 +273,7 @@ int lua::scriptapi_isolated_isoccupied_n(lua_State *L)
int lua::scriptapi_train_getname(lua_State *L)
{
auto *dyn = static_cast<TDynamicObject *>(lua_touserdata(L, 1));
const auto *dyn = static_cast<TDynamicObject *>(lua_touserdata(L, 1));
if (dyn && dyn->Mechanik)
{
lua_pushstring(L, dyn->Mechanik->TrainName().c_str());
@@ -284,11 +284,11 @@ int lua::scriptapi_train_getname(lua_State *L)
int lua::scriptapi_dynobj_putvalues(lua_State *L)
{
auto *dyn = static_cast<TDynamicObject *>(lua_touserdata(L, 1));
const auto *dyn = static_cast<TDynamicObject *>(lua_touserdata(L, 1));
auto [str, num1, num2] = get_memcell_values(L, 2);
if (!dyn)
return 0;
TLocation loc{};
const TLocation loc{};
if (dyn->Mechanik)
dyn->Mechanik->PutCommand(str, num1, num2, loc);
else
@@ -298,7 +298,7 @@ int lua::scriptapi_dynobj_putvalues(lua_State *L)
int lua::scriptapi_memcell_find(lua_State *L)
{
std::string str = lua_tostring(L, 1);
const std::string str = lua_tostring(L, 1);
TMemCell *mc = simulation::Memory.find(str);
if (mc)
{
@@ -311,15 +311,15 @@ int lua::scriptapi_memcell_find(lua_State *L)
int lua::scriptapi_memcell_read(lua_State *L)
{
auto *mc = static_cast<TMemCell *>(lua_touserdata(L, 1));
const auto *mc = static_cast<TMemCell *>(lua_touserdata(L, 1));
push_memcell_values(L, mc);
return 1;
}
int lua::scriptapi_memcell_read_n(lua_State *L)
{
std::string str = lua_tostring(L, 1);
TMemCell *mc = simulation::Memory.find(str);
const std::string str = lua_tostring(L, 1);
const TMemCell *mc = simulation::Memory.find(str);
push_memcell_values(L, mc);
if (!mc)
ErrorLog("lua: missing memcell: " + str);
@@ -338,7 +338,7 @@ int lua::scriptapi_memcell_update(lua_State *L)
int lua::scriptapi_memcell_update_n(lua_State *L)
{
std::string mstr = lua_tostring(L, 1);
const std::string mstr = lua_tostring(L, 1);
auto [str, num1, num2] = get_memcell_values(L, 2);
TMemCell *mc = simulation::Memory.find(mstr);
if (mc)
@@ -351,22 +351,22 @@ int lua::scriptapi_memcell_update_n(lua_State *L)
int lua::scriptapi_random(lua_State *L)
{
double a = lua_tonumber(L, 1);
double b = lua_tonumber(L, 2);
const double a = lua_tonumber(L, 1);
const double b = lua_tonumber(L, 2);
lua_pushnumber(L, Random(a, b));
return 1;
}
int lua::scriptapi_writelog(lua_State *L)
{
std::string txt = lua_tostring(L, 1);
const std::string txt = lua_tostring(L, 1);
WriteLog("lua: log: " + txt, logtype::lua);
return 0;
}
int lua::scriptapi_writeerrorlog(lua_State *L)
{
std::string txt = lua_tostring(L, 1);
const std::string txt = lua_tostring(L, 1);
ErrorLog("lua: log: " + txt, logtype::lua);
return 0;
}

14
scripting/pythonscreenviewer.cpp
View File

@@ -7,25 +7,25 @@
void texture_window_resize(GLFWwindow *win, int w, int h)
{
auto texwindow = (python_screen_viewer*)glfwGetWindowUserPointer(win);
const auto texwindow = (python_screen_viewer*)glfwGetWindowUserPointer(win);
texwindow->notify_window_size(win, w, h);
}
void texture_window_fb_resize(GLFWwindow *win, int w, int h)
{
auto texwindow = (python_screen_viewer*)glfwGetWindowUserPointer(win);
const auto texwindow = (python_screen_viewer*)glfwGetWindowUserPointer(win);
texwindow->notify_window_fb_size(win, w, h);
}
void texture_window_mouse_button(GLFWwindow *win, int button, int action, int mods)
{
auto texwindow = (python_screen_viewer*)glfwGetWindowUserPointer(win);
const auto texwindow = (python_screen_viewer*)glfwGetWindowUserPointer(win);
texwindow->notify_click(win, button, action);
}
void texture_window_cursor_pos(GLFWwindow *win, double x, double y)
{
auto texwindow = (python_screen_viewer*)glfwGetWindowUserPointer(win);
const auto texwindow = (python_screen_viewer*)glfwGetWindowUserPointer(win);
texwindow->notify_cursor_pos(win, x, y);
}
@@ -187,7 +187,7 @@ void python_screen_viewer::threadfunc()
void python_screen_viewer::notify_window_fb_size(GLFWwindow *window, int w, int h)
{
for (auto &conf : m_windows) {
for (const auto &conf : m_windows) {
if (conf->window == window) {
conf->fb_size.x = w;
conf->fb_size.y = h;
@@ -198,7 +198,7 @@ void python_screen_viewer::notify_window_fb_size(GLFWwindow *window, int w, int
void python_screen_viewer::notify_window_size(GLFWwindow *window, int w, int h)
{
for (auto &conf : m_windows) {
for (const auto &conf : m_windows) {
if (conf->window == window) {
conf->window_size.x = w;
conf->window_size.y = h;
@@ -209,7 +209,7 @@ void python_screen_viewer::notify_window_size(GLFWwindow *window, int w, int h)
void python_screen_viewer::notify_cursor_pos(GLFWwindow *window, double x, double y)
{
for (auto &conf : m_windows) {
for (const auto &conf : m_windows) {
if (conf->window == window) {
conf->cursor_pos.x = x;
conf->cursor_pos.y = y;