Simplify deleteblocks chat command argument parsing

[oweals/minetest.git] / builtin / common / misc_helpers.lua

diff --git a/builtin/common/misc_helpers.lua b/builtin/common/misc_helpers.lua
index dc358e65a2fb233e9f806c40d586237bf63d8aac..deeba788ea49ae551e62c6b7f550b0556f1479c7 100644 (file)
--- a/builtin/common/misc_helpers.lua
+++ b/builtin/common/misc_helpers.lua
@@ -155,33 +155,33 @@ function dump(o, indent, nested, level)
 end
 
 --------------------------------------------------------------------------------
-function string.split(str, delim, include_empty, max_splits)
+-- Localize functions to avoid table lookups (better performance).
+local table_insert = table.insert
+local str_sub, str_find = string.sub, string.find
+function string.split(str, delim, include_empty, max_splits, sep_is_pattern)
        delim = delim or ","
-       max_splits = max_splits or 0
-       local fields = {}
-       local num_splits = 0
-       local last_pos = 0
-       for part, pos in str:gmatch("(.-)[" .. delim .. "]()") do
-               last_pos = pos
-               if include_empty or part ~= "" then
-                       num_splits = num_splits + 1
-                       fields[num_splits] = part
-                       if max_splits > 0 and num_splits + 1 >= max_splits then
-                               break
-                       end
+       max_splits = max_splits or -1
+       local items = {}
+       local pos, len, seplen = 1, #str, #delim
+       local plain = not sep_is_pattern
+       max_splits = max_splits + 1
+       repeat
+               local np, npe = str_find(str, delim, pos, plain)
+               np, npe = (np or (len+1)), (npe or (len+1))
+               if (not np) or (max_splits == 1) then
+                       np = len + 1
+                       npe = np
                end
-       end
-       -- Handle the last field
-       if max_splits <= 0 or num_splits <= max_splits then
-               local last_part = str:sub(last_pos)
-               if include_empty or last_part ~= "" then
-                       fields[num_splits + 1] = last_part
+               local s = str_sub(str, pos, np - 1)
+               if include_empty or (s ~= "") then
+                       max_splits = max_splits - 1
+                       table_insert(items, s)
                end
-       end
-       return fields
+               pos = npe + 1
+       until (max_splits == 0) or (pos > (len + 1))
+       return items
 end
 
-
 --------------------------------------------------------------------------------
 function file_exists(filename)
        local f = io.open(filename, "r")
@@ -351,8 +351,8 @@ end
 --------------------------------------------------------------------------------
 
 if INIT == "game" then
-       local dirs1 = {8, 17, 6, 15}
-       local dirs2 = {22, 21, 20, 23}
+       local dirs1 = {9, 18, 7, 12}
+       local dirs2 = {20, 23, 22, 21}
 
        function core.rotate_and_place(itemstack, placer, pointed_thing,
                                infinitestacks, orient_flags)
@@ -498,10 +498,47 @@ function core.explode_scrollbar_event(evt)
 end
 
 --------------------------------------------------------------------------------
-function core.pos_to_string(pos)
-       return "(" .. pos.x .. "," .. pos.y .. "," .. pos.z .. ")"
+function core.pos_to_string(pos, decimal_places)
+       local x = pos.x
+       local y = pos.y
+       local z = pos.z
+       if decimal_places ~= nil then
+               x = string.format("%." .. decimal_places .. "f", x)
+               y = string.format("%." .. decimal_places .. "f", y)
+               z = string.format("%." .. decimal_places .. "f", z)
+       end
+       return "(" .. x .. "," .. y .. "," .. z .. ")"
+end
+
+--------------------------------------------------------------------------------
+function core.string_to_pos(value)
+       if value == nil then
+               return nil
+       end
+
+       local p = {}
+       p.x, p.y, p.z = string.match(value, "^([%d.-]+)[, ] *([%d.-]+)[, ] *([%d.-]+)$")
+       if p.x and p.y and p.z then
+               p.x = tonumber(p.x)
+               p.y = tonumber(p.y)
+               p.z = tonumber(p.z)
+               return p
+       end
+       local p = {}
+       p.x, p.y, p.z = string.match(value, "^%( *([%d.-]+)[, ] *([%d.-]+)[, ] *([%d.-]+) *%)$")
+       if p.x and p.y and p.z then
+               p.x = tonumber(p.x)
+               p.y = tonumber(p.y)
+               p.z = tonumber(p.z)
+               return p
+       end
+       return nil
 end
 
+assert(core.string_to_pos("10.0, 5, -2").x == 10)
+assert(core.string_to_pos("( 10.0, 5, -2)").z == -2)
+assert(core.string_to_pos("asd, 5, -2)") == nil)
+
 --------------------------------------------------------------------------------
 function table.copy(t, seen)
        local n = {}