userdata支持__pairs

actboy168 · actboy168 · commit 06aff628d5b0 · 2025-09-25T19:55:38.000+08:00
diff --git a/extension/script/backend/worker/variables.lua b/extension/script/backend/worker/variables.lua
@@ -934,9 +934,9 @@ local function extandUserdata(varRef)
         end
     end
 
-    local members = {}
     local loct = rdebug.userdata_pairs(u)
     if loct then
+        local members = {}
         for i = 1, #loct, 3 do
             local key, value, valueref = loct[i], loct[i + 1], loct[i + 2]
             local key_type = rdebug.type(key)
@@ -954,9 +954,8 @@ local function extandUserdata(varRef)
             end
         end
         table.sort(members, function(a, b) return a.name < b.name end)
-        table.move(members, 1, #members, #vars + 1)
+        table.move(members, 1, #members, #vars + 1, vars)
     end
-
     return vars
 end
 
diff --git a/src/luadebug/rdebug_visitor.cpp b/src/luadebug/rdebug_visitor.cpp
@@ -275,18 +275,18 @@ namespace luadebug::visitor {
         if (!copy_from_dbg(L, hL, area, 1, LUADBG_TUSERDATA)) {
             return 0;
         }
-        if (lua_getmetatable(hL, -1) == 0) {
+        if (!lua_getmetatable(hL, -1)) {
             lua_pop(hL, 1);
             return 0;
         }
         lua_getfield(hL, -1, "__pairs");
-        if (LUA_TFUNCTION == lua_type(hL, -1)) {
+        if (LUA_TFUNCTION != lua_type(hL, -1)) {
             lua_pop(hL, 3);
             return 0;
         }
         lua_remove(hL, -2);
         lua_insert(hL, -2);
-        if (!debug_pcall(hL, 1, 3, 0)) {
+        if (debug_pcall(hL, 1, 3, 0)) {
             lua_pop(hL, 1);
             return 0;
         }
@@ -300,7 +300,7 @@ namespace luadebug::visitor {
             lua_pushvalue(hL, -3);
             lua_remove(hL, -4);
             // next, t, next, t, k
-            if (!debug_pcall(hL, 2, 2, 0)) {
+            if (debug_pcall(hL, 2, 2, 0)) {
                 lua_pop(hL, 3);
                 return 0;
             }
@@ -309,27 +309,27 @@ namespace luadebug::visitor {
                 lua_pop(hL, 4);
                 return 1;
             }
-            if (copy_to_dbg(hL, L) == LUA_TNONE) {
+            if (copy_to_dbg(hL, L, -2) == LUA_TNONE) {
                 refvalue::create(L, 1, refvalue::USERDATA_KEY { index });
             }
             luadbg_rawseti(L, -2, ++n);
-            lua_pop(hL, 1);
 
             if (getref) {
                 refvalue::create(L, 1, refvalue::USERDATA_VAL { index });
-                if (copy_to_dbg(hL, L) == LUA_TNONE) {
+                if (copy_to_dbg(hL, L, -1) == LUA_TNONE) {
                     luadbg_pushvalue(L, -1);
                 }
                 luadbg_rawseti(L, -3, ++n);
             } else {
-                if (copy_to_dbg(hL, L) == LUA_TNONE) {
+                if (copy_to_dbg(hL, L, -1) == LUA_TNONE) {
                     refvalue::create(L, 1, refvalue::USERDATA_VAL { index });
                 }
             }
-            ++index;
             luadbg_rawseti(L, -2, ++n);
+            lua_pop(hL, 1);
+
+            ++index;
         }
-        return 1;
     }
 
     template <bool getref = true>
diff --git a/src/luadebug/util/refvalue.cpp b/src/luadebug/util/refvalue.cpp
@@ -237,18 +237,18 @@ namespace luadebug::refvalue {
             lua_pop(hL, 1);
             return LUA_TNONE;
         }
-        if (lua_getmetatable(hL, -1) == 0) {
+        if (!lua_getmetatable(hL, -1)) {
             lua_pop(hL, 1);
             return LUA_TNONE;
         }
         lua_getfield(hL, -1, "__pairs");
-        if (LUA_TFUNCTION == lua_type(hL, -1)) {
+        if (LUA_TFUNCTION != lua_type(hL, -1)) {
             lua_pop(hL, 3);
             return LUA_TNONE;
         }
         lua_remove(hL, -2);
         lua_insert(hL, -2);
-        if (!debug_pcall(hL, 1, 3, 0)) {
+        if (debug_pcall(hL, 1, 3, 0)) {
             lua_pop(hL, 1);
             return LUA_TNONE;
         }
@@ -259,7 +259,7 @@ namespace luadebug::refvalue {
             lua_pushvalue(hL, -3);
             lua_remove(hL, -4);
             // next, t, next, t, k
-            if (!debug_pcall(hL, 2, 2, 0)) {
+            if (debug_pcall(hL, 2, 2, 0)) {
                 lua_pop(hL, 3);
                 return LUA_TNONE;
             }
@@ -287,18 +287,18 @@ namespace luadebug::refvalue {
             lua_pop(hL, 1);
             return LUA_TNONE;
         }
-        if (lua_getmetatable(hL, -1) == 0) {
+        if (!lua_getmetatable(hL, -1)) {
             lua_pop(hL, 1);
             return LUA_TNONE;
         }
         lua_getfield(hL, -1, "__pairs");
-        if (LUA_TFUNCTION == lua_type(hL, -1)) {
+        if (LUA_TFUNCTION != lua_type(hL, -1)) {
             lua_pop(hL, 3);
             return LUA_TNONE;
         }
         lua_remove(hL, -2);
         lua_insert(hL, -2);
-        if (!debug_pcall(hL, 1, 3, 0)) {
+        if (debug_pcall(hL, 1, 3, 0)) {
             lua_pop(hL, 1);
             return LUA_TNONE;
         }
@@ -309,7 +309,7 @@ namespace luadebug::refvalue {
             lua_pushvalue(hL, -3);
             lua_remove(hL, -4);
             // next, t, next, t, k
-            if (!debug_pcall(hL, 2, 2, 0)) {
+            if (debug_pcall(hL, 2, 2, 0)) {
                 lua_pop(hL, 3);
                 return LUA_TNONE;
             }

Original file line number	Diff line number	Diff line change
`@@ -275,18 +275,18 @@ namespace luadebug::visitor {`
`275`	`275`	`if (!copy_from_dbg(L, hL, area, 1, LUADBG_TUSERDATA)) {`
`276`	`276`	`return 0;`
`277`	`277`	`}`
`278`		`- if (lua_getmetatable(hL, -1) == 0) {`
	`278`	`+ if (!lua_getmetatable(hL, -1)) {`
`279`	`279`	`lua_pop(hL, 1);`
`280`	`280`	`return 0;`
`281`	`281`	`}`
`282`	`282`	`lua_getfield(hL, -1, "__pairs");`
`283`		`- if (LUA_TFUNCTION == lua_type(hL, -1)) {`
	`283`	`+ if (LUA_TFUNCTION != lua_type(hL, -1)) {`
`284`	`284`	`lua_pop(hL, 3);`
`285`	`285`	`return 0;`
`286`	`286`	`}`
`287`	`287`	`lua_remove(hL, -2);`
`288`	`288`	`lua_insert(hL, -2);`
`289`		`- if (!debug_pcall(hL, 1, 3, 0)) {`
	`289`	`+ if (debug_pcall(hL, 1, 3, 0)) {`
`290`	`290`	`lua_pop(hL, 1);`
`291`	`291`	`return 0;`
`292`	`292`	`}`
`@@ -300,7 +300,7 @@ namespace luadebug::visitor {`
`300`	`300`	`lua_pushvalue(hL, -3);`
`301`	`301`	`lua_remove(hL, -4);`
`302`	`302`	`// next, t, next, t, k`
`303`		`- if (!debug_pcall(hL, 2, 2, 0)) {`
	`303`	`+ if (debug_pcall(hL, 2, 2, 0)) {`
`304`	`304`	`lua_pop(hL, 3);`
`305`	`305`	`return 0;`
`306`	`306`	`}`
`@@ -309,27 +309,27 @@ namespace luadebug::visitor {`
`309`	`309`	`lua_pop(hL, 4);`
`310`	`310`	`return 1;`
`311`	`311`	`}`
`312`		`- if (copy_to_dbg(hL, L) == LUA_TNONE) {`
	`312`	`+ if (copy_to_dbg(hL, L, -2) == LUA_TNONE) {`
`313`	`313`	`refvalue::create(L, 1, refvalue::USERDATA_KEY { index });`
`314`	`314`	`}`
`315`	`315`	`luadbg_rawseti(L, -2, ++n);`
`316`		`- lua_pop(hL, 1);`
`317`	`316`
`318`	`317`	`if (getref) {`
`319`	`318`	`refvalue::create(L, 1, refvalue::USERDATA_VAL { index });`
`320`		`- if (copy_to_dbg(hL, L) == LUA_TNONE) {`
	`319`	`+ if (copy_to_dbg(hL, L, -1) == LUA_TNONE) {`
`321`	`320`	`luadbg_pushvalue(L, -1);`
`322`	`321`	`}`
`323`	`322`	`luadbg_rawseti(L, -3, ++n);`
`324`	`323`	`} else {`
`325`		`- if (copy_to_dbg(hL, L) == LUA_TNONE) {`
	`324`	`+ if (copy_to_dbg(hL, L, -1) == LUA_TNONE) {`
`326`	`325`	`refvalue::create(L, 1, refvalue::USERDATA_VAL { index });`
`327`	`326`	`}`
`328`	`327`	`}`
`329`		`- ++index;`
`330`	`328`	`luadbg_rawseti(L, -2, ++n);`
	`329`	`+ lua_pop(hL, 1);`
	`330`	`+`
	`331`	`+ ++index;`
`331`	`332`	`}`
`332`		`- return 1;`
`333`	`333`	`}`
`334`	`334`
`335`	`335`	`template <bool getref = true>`