Keep dynamic weapon actions bound to their labels

Nenyoo/lib/tests/load_yim_test.lua

@@ -311,5 +311,21 @@ end
 for _, failure in ipairs(failures) do print(failure) end
 assert(#failures == 0, string.format("%d action callbacks failed", #failures))
 assert(menu_back_calls > 0, "Gun Van Close action did not leave its submenu")
+-- A filtered list changes ordinal positions. An action must still select its
+-- original weapon rather than whatever weapon moved into that position.
+local weapon_filter, pistol_action, set_weapon_action
+for _, input in ipairs(inputs) do
+    if input.label == "Weapon Name" then weapon_filter = input.callback end
+end
+for _, action in ipairs(actions) do
+    if action.label == "Pistol" then pistol_action = action.callback end
+    if action.label == "Set Weapon" then set_weapon_action = action.callback end
+end
+assert(weapon_filter and pistol_action and set_weapon_action, "Missing Gun Van editor controls")
+memory.tunable = function() return 123456 end
+weapon_filter("Pistol")
+pistol_action()
+set_weapon_action()
+assert(memory_values[123456] == util.joaat("WEAPON_PISTOL"), "Filtered Gun Van row selected another weapon")
 print(string.format("Ultimate Menu loaded: %d nodes, %d lists, %d actions, %d ImGui sections",
     next_ref, counters.list, counters.action, #compat.imgui_sections))

Nenyoo/lib/tests/lua_runner.c

@@ -0,0 +1,18 @@
+#include <stdio.h>
+#include "lua.h"
+#include "lauxlib.h"
+#include "lualib.h"
+
+int main(int argc, char **argv) {
+    if (argc != 2) {
+        fprintf(stderr, "usage: lua_runner <test.lua>\n");
+        return 2;
+    }
+    lua_State *lua = luaL_newstate();
+    if (!lua) return 2;
+    luaL_openlibs(lua);
+    int result = luaL_dofile(lua, argv[1]);
+    if (result != LUA_OK) fprintf(stderr, "%s\n", lua_tostring(lua, -1));
+    lua_close(lua);
+    return result == LUA_OK ? 0 : 1;
+}

Nenyoo/lib/yim_compat.lua

@@ -340,21 +340,23 @@ local function ancestors(extra)
     if extra then out[type(extra) == "table" and extra.id or extra] = true end
     return out
 end
-local function source_key(counters, fallback)
+local function source_key(counters, fallback, label)
     for level = 3, 12 do
         local info = debug.getinfo(level, "Sl")
         if not info then break end
         if info.source and info.source:find("Ultimate_Menu_Legacy.lua", 1, true) then
             local line = info.currentline
-            counters[line] = (counters[line] or 0) + 1
-            return tostring(line) .. ":" .. counters[line]
+            local key = tostring(line)
+            if label ~= nil then key = key .. ":" .. tostring(label) end
+            counters[key] = (counters[key] or 0) + 1
+            return key .. ":" .. counters[key]
         end
     end
     return fallback
 end
-local function next_id()
+local function next_id(label)
     widget_index = widget_index + 1
-    return source_key(widget_occurrences, tostring(widget_index))
+    return source_key(widget_occurrences, tostring(widget_index), label)
 end
 local function label_for_menu(label)
     if label:sub(1, 2) ~= "##" then return label:gsub("##.*$", "") end
@@ -371,7 +373,7 @@ local function event_for(id, value)
     return current_event and current_event.id == id and current_event.value == value
 end
 local function register_action(label, value)
-    local id = next_id()
+    local id = next_id(label)
     local section = current_section
     if not section.widget_refs[id] then
         local path = ancestors()
@@ -387,7 +389,7 @@ ImGui = {}
 function ImGui.Button(label) return register_action(label, true) end
 function ImGui.Selectable(label) return register_action(label, true) end
 function ImGui.Checkbox(label, value)
-    local id = next_id()
+    local id = next_id(label)
     local section = current_section
     if not section.widget_refs[id] then
         local path = ancestors()
@@ -400,7 +402,7 @@ function ImGui.Checkbox(label, value)
     return value, false
 end
 local function numeric_input(label, value, as_float)
-    local id = next_id()
+    local id = next_id(label)
     local section = current_section
     if not section.widget_refs[id] then
         local path = ancestors()
@@ -420,7 +422,7 @@ function ImGui.InputInt(label, value) return numeric_input(label, value, false)
 function ImGui.InputFloat(label, value) return numeric_input(label, value, true) end
 function ImGui.DragInt(label, value) return numeric_input(label, value, false) end
 function ImGui.SliderInt(label, value, min_value, max_value)
-    local id = next_id()
+    local id = next_id(label)
     local section = current_section
     if not section.widget_refs[id] then
         local path = ancestors()
@@ -433,7 +435,7 @@ function ImGui.SliderInt(label, value, min_value, max_value)
     return value, false
 end
 function ImGui.InputText(label, value)
-    local id = next_id()
+    local id = next_id(label)
     local section = current_section
     if not section.widget_refs[id] then
         local path = ancestors()
@@ -446,7 +448,7 @@ function ImGui.InputText(label, value)
     return value, false
 end
 function ImGui.Combo(label, selected, choices, count)
-    local id = next_id()
+    local id = next_id(label)
     local section = current_section
     local menu_label = label_for_menu(label)
     if not section.containers_by_id[id] then
@@ -529,7 +531,7 @@ function ImGui.CloseCurrentPopup()
 end
 function ImGui.BeginTabBar() return true end
 function ImGui.BeginTabItem(label)
-    local id = next_id()
+    local id = next_id(label)
     local ref = current_section.containers_by_id[id]
     if not ref then
         ref = menu.list(current_parent(), label, {}, "")