Make Lua chunknames standardized across platforms and formats #6920
Conversation
This file contains 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 makes things consistent across script components and Lua modules and between bytecode and source code
britzl
commented
Aug 29, 2022
| @@ -330,7 +330,7 @@ local function stack(start) | |||
| if not source then break end | |||
|
|
|||
| local src = source.source | |||
| if src:find("[@=]") == 1 then | |||
| if src:find("@") == 1 then | |||
There was a problem hiding this comment.
We can now safely revert this patch since we no longer provide filenames starting with = (see script_module.cpp)
britzl
commented
Aug 29, 2022
| @@ -633,8 +633,8 @@ local function debug_hook(event, line) | |||
| -- Unfortunately, there is no reliable/quick way to figure out | |||
| -- what is the filename and what is the source code. | |||
| -- If the name doesn't start with `@`, assume it's a file name if it's all on one line. | |||
| if find(file, "^[@=]") or not find(file, "[\r\n]") then | |||
| file = gsub(gsub(file, "^[@=]", ""), "\\", "/") | |||
| if find(file, "^@") or not find(file, "[\r\n]") then | |||
britzl
commented
Aug 29, 2022
| int LuaLoad(lua_State *L, dmLuaDDF::LuaSource *source) | ||
| { | ||
| const char *buf; | ||
| uint32_t size; | ||
| GetLuaSource(source, &buf, &size); | ||
| char tmp[DMPATH_MAX_PATH]; | ||
| return luaL_loadbuffer(L, buf, size, PrefixFilename(FindSuitableChunkname(source->m_Filename), '=', tmp, sizeof(tmp))); | ||
| return luaL_loadbuffer(L, buf, size, source->m_Filename); |
There was a problem hiding this comment.
Always use the filename provided by LuaBuilder
britzl
commented
Aug 29, 2022
| @@ -142,7 +102,7 @@ namespace dmScript | |||
| return 1; | |||
| } | |||
|
|
|||
| if (!LuaLoadModule(L, module->m_Script, module->m_ScriptSize, name)) | |||
| if (!LuaLoadModule(L, module->m_Script, module->m_ScriptSize, module->m_Filename)) | |||
There was a problem hiding this comment.
We do the same for Lua modules. Always use what LuaBuilder.java has provided as filename.
JCash
previously approved these changes
Aug 30, 2022
com.dynamo.cr/com.dynamo.cr.bob/src/com/dynamo/bob/pipeline/LuaBuilder.java
Outdated
Show resolved
Hide resolved
| dmStrlCpy(&buf[1], input, size-1); | ||
| return buf; | ||
| } | ||
|
|
--skip-ci
JCash
previously approved these changes
Aug 30, 2022
|
@matgis discovered issues with hotreload of Lua modules (scripts work fine). We need to look into this first. |
…ndidates Show options when there are multiple candidates for a partial console path
matgis
approved these changes
Aug 31, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Engine
The chunk/filename set at runtime is not consistent between Lua modules and script components. The same is true for bytecode when compared to source code.
Examples:
The file
game/foo.luawas either given=game.fooor@game/foo.luadepending on wether it was compiled to bytecode or not. The same kind of differences could be observed for script components.With this change all Lua scripts and modules will use the same naming convention which is
@path/to/file.luaor@path/to/file.script. The @ is used so that Lua will show the last 60 of long filenames.Editor User-facing changes
.luamodules.Editor Technical changes
on-click!callback for acode.viewregion is now called with an additionalMouseEventargument.Fixes #6485