-
Notifications
You must be signed in to change notification settings - Fork 42
feat(scripting): added logging functions #1574
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,5 @@ | ||
| print("Hello world!") | ||
|
|
||
| cubos.info("hello world", 123, 123.3) | ||
| cubos.warn("this is a warning", {}, function() cubos.info("ok") end) | ||
| cubos.error("this is an error") |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| #include "systems.hpp" | ||
|
|
||
| #include <string> | ||
| #include <cmath> | ||
|
|
||
| #include <cubos/engine/prelude.hpp> | ||
|
|
||
| using namespace cubos::core::tel; | ||
|
|
||
| static std::string formatArgs(lua_State *state) | ||
| { | ||
| std::string str; | ||
| int top = lua_gettop(state); | ||
|
|
||
| for (int i = 1; i <= top; i++) | ||
| { | ||
| int type = lua_type(state, i); | ||
|
|
||
| switch (type) | ||
| { | ||
| case LUA_TSTRING: | ||
| str.append(lua_tostring(state, i)); | ||
| break; | ||
| case LUA_TNUMBER: { | ||
| lua_Number n = lua_tonumber(state, i); | ||
|
|
||
| if (std::floor(n) == n) | ||
| { | ||
| str.append(std::to_string(static_cast<int>(n))); | ||
| } | ||
| else | ||
|
mcanais marked this conversation as resolved.
mcanais marked this conversation as resolved.
|
||
| { | ||
| str.append(std::to_string(n)); | ||
| } | ||
| break; | ||
| } | ||
| case LUA_TBOOLEAN: | ||
| str.append(lua_toboolean(state, i) ? "true" : "false"); | ||
|
mcanais marked this conversation as resolved.
|
||
| break; | ||
| case LUA_TNIL: | ||
| str.append("nil"); | ||
| break; | ||
| case LUA_TTABLE: | ||
| str.append("<table>"); | ||
| break; | ||
| case LUA_TFUNCTION: | ||
| str.append("<function>"); | ||
| break; | ||
| case LUA_TUSERDATA: | ||
| str.append("<userdata>"); | ||
| break; | ||
| case LUA_TLIGHTUSERDATA: | ||
| str.append("<lightuserdata>"); | ||
| break; | ||
| case LUA_TTHREAD: | ||
| str.append("<thread>"); | ||
| break; | ||
| } | ||
|
|
||
| if (i != top) | ||
|
mcanais marked this conversation as resolved.
|
||
| str.append(" "); | ||
| } | ||
|
mcanais marked this conversation as resolved.
|
||
|
|
||
| return str; | ||
| } | ||
|
|
||
| static void log(lua_State* state, Level logLevel) | ||
| { | ||
| std::string formattedArgs = formatArgs(state); | ||
| Logger::Location location; | ||
| lua_Debug debugInfo; | ||
|
|
||
| if (lua_getstack(state, 1, &debugInfo)) | ||
|
mcanais marked this conversation as resolved.
|
||
| { | ||
| if (lua_getinfo(state, "nSl", &debugInfo)) | ||
|
mcanais marked this conversation as resolved.
|
||
| { | ||
| location.function = debugInfo.name ? debugInfo.name : "undefined"; | ||
|
mcanais marked this conversation as resolved.
|
||
| location.file = debugInfo.short_src; | ||
| location.line = debugInfo.currentline; | ||
|
|
||
| Logger::write(logLevel, location, formattedArgs); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| namespace cubos::bindings::lua | ||
| { | ||
| int logInfo(lua_State* state) | ||
| { | ||
| log(state, Level::Info); | ||
| return 0; | ||
| }; | ||
|
|
||
| int logWarn(lua_State* state) | ||
| { | ||
| log(state, Level::Warn); | ||
| return 0; | ||
| }; | ||
|
|
||
| int logError(lua_State* state) | ||
| { | ||
| log(state, Level::Error); | ||
| return 0; | ||
| }; | ||
| } // namespace cubos::bindings::lua | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| /// @dir | ||
| /// @brief @ref lua-bindings-plugin plugin directory. | ||
|
|
||
| /// @file | ||
| /// @brief Logging lua api. | ||
| /// @ingroup lua-bindings-plugin | ||
| #pragma once | ||
|
|
||
| #include <cstdint> | ||
|
|
||
| #include <lua.hpp> | ||
|
|
||
| namespace cubos::bindings::lua | ||
| { | ||
| /// @brief Lua api function to log information. | ||
| /// @param state The current lua state. | ||
| /// @ingroup lua-bindings-plugin | ||
| int logInfo(lua_State* state); | ||
|
|
||
| /// @brief Lua api function to log a warning. | ||
| /// @param state The current lua state. | ||
| /// @ingroup lua-bindings-plugin | ||
| int logWarn(lua_State* state); | ||
|
|
||
| /// @brief Lua api function log an error. | ||
| /// @param state The current lua state. | ||
| /// @ingroup lua-bindings-plugin | ||
| int logError(lua_State* state); | ||
| } // namespace cubos::bindings::lua |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.