Replace more deprecated functions

[worldedit.git] / worldedit / code.lua

diff --git a/worldedit/code.lua b/worldedit/code.lua
index fb04ce9bb9c6e615f4207ef642443bd9ef5ea3a7..a939debb7191689480db9ce90d5b82829eff1ec5 100644 (file)
--- a/worldedit/code.lua
+++ b/worldedit/code.lua
@@ -1,48 +1,35 @@
-worldedit = worldedit or {}\r
-local minetest = minetest --local copy of global\r
+--- Lua code execution functions.\r
+-- @module worldedit.code\r
 \r
---modifies positions `pos1` and `pos2` so that each component of `pos1` is less than or equal to its corresponding conent of `pos2`, returning two new positions\r
-worldedit.sort_pos = function(pos1, pos2)\r
-       pos1 = {x=pos1.x, y=pos1.y, z=pos1.z}\r
-       pos2 = {x=pos2.x, y=pos2.y, z=pos2.z}\r
-       if pos1.x > pos2.x then\r
-               pos2.x, pos1.x = pos1.x, pos2.x\r
+--- Executes `code` as a Lua chunk in the global namespace.\r
+-- @return An error message if the code fails, or nil on success.\r
+function worldedit.lua(code)\r
+       local func, err = loadstring(code)\r
+       if not func then  -- Syntax error\r
+               return err\r
        end\r
-       if pos1.y > pos2.y then\r
-               pos2.y, pos1.y = pos1.y, pos2.y\r
-       end\r
-       if pos1.z > pos2.z then\r
-               pos2.z, pos1.z = pos1.z, pos2.z\r
-       end\r
-       return pos1, pos2\r
-end\r
-\r
---executes `code` as a Lua chunk in the global namespace, returning an error if the code fails or nil otherwise\r
-worldedit.lua = function(code)\r
-       local operation, message = loadstring(code)\r
-       if operation == nil then --code parsing failed\r
-               return message\r
-       end\r
-       local status, message = pcall(operation)\r
-       if status == nil then --operation failed\r
-               return message\r
+       local good, err = pcall(func)\r
+       if not good then  -- Runtime error\r
+               return err\r
        end\r
        return nil\r
 end\r
 \r
---executes `code` as a Lua chunk in the global namespace with the variable pos available, for each node in a region defined by positions `pos1` and `pos2`, returning an error if the code fails or nil otherwise\r
-worldedit.luatransform = function(pos1, pos2, code)\r
-       local pos1, pos2 = worldedit.sort_pos(pos1, pos2)\r
 \r
-       local factory, message = loadstring("return function(pos) " .. code .. " end")\r
-       if factory == nil then --code parsing failed\r
-               return message\r
+--- Executes `code` as a Lua chunk in the global namespace with the variable\r
+-- pos available, for each node in a region defined by positions `pos1` and\r
+-- `pos2`.\r
+-- @return An error message if the code fails, or nil on success.\r
+function worldedit.luatransform(pos1, pos2, code)\r
+       pos1, pos2 = worldedit.sort_pos(pos1, pos2)\r
+\r
+       local factory, err = loadstring("return function(pos) " .. code .. " end")\r
+       if not factory then  -- Syntax error\r
+               return err\r
        end\r
-       local operation = factory()\r
+       local func = factory()\r
 \r
-       --make area stay loaded\r
-       local manip = minetest.get_voxel_manip()\r
-       manip:read_from_map(pos1, pos2)\r
+       worldedit.keep_loaded(pos1, pos2)\r
 \r
        local pos = {x=pos1.x, y=0, z=0}\r
        while pos.x <= pos2.x do\r
@@ -50,9 +37,9 @@ worldedit.luatransform = function(pos1, pos2, code)
                while pos.y <= pos2.y do\r
                        pos.z = pos1.z\r
                        while pos.z <= pos2.z do\r
-                               local status, message = pcall(operation, pos)\r
-                               if status == nil then --operation failed\r
-                                       return message\r
+                               local good, err = pcall(func, pos)\r
+                               if not good then -- Runtime error\r
+                                       return err\r
                                end\r
                                pos.z = pos.z + 1\r
                        end\r
@@ -61,4 +48,5 @@ worldedit.luatransform = function(pos1, pos2, code)
                pos.x = pos.x + 1\r
        end\r
        return nil\r
-end
\ No newline at end of file
+end\r
+\r