From eeb63b8901a9c049f1bb594abb9ce9b4a9c47620 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Mon, 11 Jan 2021 16:39:43 +0000 Subject: zlib -> libdeflate (#5085) + Use libdeflate + Use std::byte * Fix passing temporary to string_view + Emulate make_unique_for_overwrite --- src/Bindings/ManualBindings_BlockArea.cpp | 50 ++++++++++++++++++++++++++----- 1 file changed, 42 insertions(+), 8 deletions(-) (limited to 'src/Bindings/ManualBindings_BlockArea.cpp') diff --git a/src/Bindings/ManualBindings_BlockArea.cpp b/src/Bindings/ManualBindings_BlockArea.cpp index 5af150599..5f281fadc 100644 --- a/src/Bindings/ManualBindings_BlockArea.cpp +++ b/src/Bindings/ManualBindings_BlockArea.cpp @@ -435,7 +435,17 @@ static int tolua_cBlockArea_LoadFromSchematicFile(lua_State * a_LuaState) return L.ApiParamError("Invalid 'self', must not be nil"); } - L.Push(cSchematicFileSerializer::LoadFromSchematicFile(*self, fileName)); + try + { + cSchematicFileSerializer::LoadFromSchematicFile(*self, fileName); + L.Push(true); + } + catch (const std::exception & Oops) + { + LOGWARNING(Oops.what()); + L.LogStackTrace(); + L.Push(false); + } return 1; } @@ -457,7 +467,7 @@ static int tolua_cBlockArea_LoadFromSchematicString(lua_State * a_LuaState) return 0; } cBlockArea * self; - AString data; + ContiguousByteBuffer data; if (!L.GetStackValues(1, self, data)) { return L.ApiParamError("Cannot read the parameters"); @@ -467,7 +477,17 @@ static int tolua_cBlockArea_LoadFromSchematicString(lua_State * a_LuaState) return L.ApiParamError("Invalid 'self', must not be nil"); } - L.Push(cSchematicFileSerializer::LoadFromSchematicString(*self, data)); + try + { + cSchematicFileSerializer::LoadFromSchematicString(*self, data); + L.Push(true); + } + catch (const std::exception & Oops) + { + LOGWARNING(Oops.what()); + L.LogStackTrace(); + L.Push(false); + } return 1; } @@ -625,7 +645,17 @@ static int tolua_cBlockArea_SaveToSchematicFile(lua_State * a_LuaState) return L.ApiParamError("Invalid 'self', must not be nil"); } - L.Push(cSchematicFileSerializer::SaveToSchematicFile(*self, fileName)); + try + { + cSchematicFileSerializer::SaveToSchematicFile(*self, fileName); + L.Push(true); + } + catch (const std::exception & Oops) + { + LOGWARNING(Oops.what()); + L.LogStackTrace(); + L.Push(false); + } return 1; } @@ -655,13 +685,17 @@ static int tolua_cBlockArea_SaveToSchematicString(lua_State * a_LuaState) return L.ApiParamError("Invalid 'self', must not be nil"); } - AString data; - if (cSchematicFileSerializer::SaveToSchematicString(*self, data)) + try { - L.Push(data); + L.Push(cSchematicFileSerializer::SaveToSchematicString(*self).GetView()); return 1; } - return 0; + catch (const std::exception & Oops) + { + LOGWARNING(Oops.what()); + L.LogStackTrace(); + return 0; + } } -- cgit v1.2.3