Improve GetStackAsString output and formatting

ElunaLuaEngine · Nov 10, 2024 · 58b9753 · 58b9753
1 parent b59c832
commit 58b9753
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 16 deletions.
diff --git a/methods/CMangos/GlobalMethods.h b/methods/CMangos/GlobalMethods.h
@@ -2522,14 +2522,27 @@ namespace LuaGlobalFunctions
 
     static std::string GetStackAsString(Eluna* E)
     {
-        std::ostringstream oss;
+        std::string output;
         int top = lua_gettop(E->L);
         for (int i = 1; i <= top; ++i)
         {
-            oss << luaL_tolstring(E->L, i, NULL);
-            lua_pop(E->L, 1);
+            if (lua_isstring(E->L, i))
+            {
+                output += lua_tostring(E->L, i);
+            }
+            else
+            {
+                lua_getglobal(E->L, "tostring");
+                lua_pushvalue(E->L, i);
+                lua_call(E->L, 1, 1);
+                output += lua_tostring(E->L, -1);
+                lua_pop(E->L, 1);
+            }
+
+            if (i < top)
+                output += "\t";
         }
-        return oss.str();
+        return output;
     }
 
     /**

diff --git a/methods/Mangos/GlobalMethods.h b/methods/Mangos/GlobalMethods.h
@@ -2279,14 +2279,27 @@ namespace LuaGlobalFunctions
 
     static std::string GetStackAsString(Eluna* E)
     {
-        std::ostringstream oss;
+        std::string output;
         int top = lua_gettop(E->L);
         for (int i = 1; i <= top; ++i)
         {
-            oss << luaL_tolstring(E->L, i, NULL);
-            lua_pop(E->L, 1);
+            if (lua_isstring(E->L, i))
+            {
+                output += lua_tostring(E->L, i);
+            }
+            else
+            {
+                lua_getglobal(E->L, "tostring");
+                lua_pushvalue(E->L, i);
+                lua_call(E->L, 1, 1);
+                output += lua_tostring(E->L, -1);
+                lua_pop(E->L, 1);
+            }
+
+            if (i < top)
+                output += "\t";
         }
-        return oss.str();
+        return output;
     }
 
     /**

diff --git a/methods/TrinityCore/GlobalMethods.h b/methods/TrinityCore/GlobalMethods.h
@@ -2404,14 +2404,27 @@ namespace LuaGlobalFunctions
 
     static std::string GetStackAsString(Eluna* E)
     {
-        std::ostringstream oss;
+        std::string output;
         int top = lua_gettop(E->L);
         for (int i = 1; i <= top; ++i)
         {
-            oss << luaL_tolstring(E->L, i, NULL);
-            lua_pop(E->L, 1);
+            if (lua_isstring(E->L, i))
+            {
+                output += lua_tostring(E->L, i);
+            }
+            else
+            {
+                lua_getglobal(E->L, "tostring");
+                lua_pushvalue(E->L, i);
+                lua_call(E->L, 1, 1);
+                output += lua_tostring(E->L, -1);
+                lua_pop(E->L, 1);
+            }
+
+            if (i < top)
+                output += "\t";
         }
-        return oss.str();
+        return output;
     }
 
     /**

diff --git a/methods/VMangos/GlobalMethods.h b/methods/VMangos/GlobalMethods.h
@@ -2222,14 +2222,27 @@ namespace LuaGlobalFunctions
 
     static std::string GetStackAsString(Eluna* E)
     {
-        std::ostringstream oss;
+        std::string output;
         int top = lua_gettop(E->L);
         for (int i = 1; i <= top; ++i)
         {
-            oss << luaL_tolstring(E->L, i, NULL);
-            lua_pop(E->L, 1);
+            if (lua_isstring(E->L, i))
+            {
+                output += lua_tostring(E->L, i);
+            }
+            else
+            {
+                lua_getglobal(E->L, "tostring");
+                lua_pushvalue(E->L, i);
+                lua_call(E->L, 1, 1);
+                output += lua_tostring(E->L, -1);
+                lua_pop(E->L, 1);
+            }
+
+            if (i < top)
+                output += "\t";
         }
-        return oss.str();
+        return output;
     }
 
     /**