minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve parsing of setting types from settingtypes.txt for settings tab 

- Accept numbers prefixed with '+'
- Accept multiple spaces instead of just a single one where spaces are expected
- Allow flags to have an empty default value
This commit is contained in:
Rogier 2016-01-07 12:33:26 +01:00 committed by paramat
parent 106d4b7d05
commit 58babf8b19
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
builtin/mainmenu/tab_settings.lua
View File

@ -20,8 +20,8 @@ local FILENAME = "settingtypes.txt"
local CHAR_CLASSES = { local CHAR_CLASSES = {
SPACE = "[%s]", SPACE = "[%s]",
VARIABLE = "[%w_%-%.]", VARIABLE = "[%w_%-%.]",
INTEGER = "[-]?[%d]", INTEGER = "[+-]?[%d]",
FLOAT = "[-]?[%d%.]", FLOAT = "[+-]?[%d%.]",
FLAGS = "[%w_%-%.,]", FLAGS = "[%w_%-%.,]",
} }
@ -65,11 +65,11 @@ local function parse_setting_line(settings, line, read_all, base_level, allow_se
-- so we can later strip it from the rest of the line -- so we can later strip it from the rest of the line
.. "(" .. "("
.. "([" .. CHAR_CLASSES.VARIABLE .. "+)" -- variable name .. "([" .. CHAR_CLASSES.VARIABLE .. "+)" -- variable name
.. CHAR_CLASSES.SPACE .. CHAR_CLASSES.SPACE .. "*"
.. "%(([^%)]*)%)" -- readable name .. "%(([^%)]*)%)" -- readable name
.. CHAR_CLASSES.SPACE .. CHAR_CLASSES.SPACE .. "*"
.. "(" .. CHAR_CLASSES.VARIABLE .. "+)" -- type .. "(" .. CHAR_CLASSES.VARIABLE .. "+)" -- type
.. CHAR_CLASSES.SPACE .. "?" .. CHAR_CLASSES.SPACE .. "*"
.. ")") .. ")")
if not first_part then if not first_part then
@ -88,8 +88,8 @@ local function parse_setting_line(settings, line, read_all, base_level, allow_se
if setting_type == "int" then if setting_type == "int" then
local default, min, max = remaining_line:match("^" local default, min, max = remaining_line:match("^"
-- first int is required, the last 2 are optional -- first int is required, the last 2 are optional
.. "(" .. CHAR_CLASSES.INTEGER .. "+)" .. CHAR_CLASSES.SPACE .. "?" .. "(" .. CHAR_CLASSES.INTEGER .. "+)" .. CHAR_CLASSES.SPACE .. "*"
.. "(" .. CHAR_CLASSES.INTEGER .. "*)" .. CHAR_CLASSES.SPACE .. "?" .. "(" .. CHAR_CLASSES.INTEGER .. "*)" .. CHAR_CLASSES.SPACE .. "*"
.. "(" .. CHAR_CLASSES.INTEGER .. "*)" .. "(" .. CHAR_CLASSES.INTEGER .. "*)"
.. "$") .. "$")
@ -151,8 +151,8 @@ local function parse_setting_line(settings, line, read_all, base_level, allow_se
if setting_type == "float" then if setting_type == "float" then
local default, min, max = remaining_line:match("^" local default, min, max = remaining_line:match("^"
-- first float is required, the last 2 are optional -- first float is required, the last 2 are optional
.. "(" .. CHAR_CLASSES.FLOAT .. "+)" .. CHAR_CLASSES.SPACE .. "?" .. "(" .. CHAR_CLASSES.FLOAT .. "+)" .. CHAR_CLASSES.SPACE .. "*"
.. "(" .. CHAR_CLASSES.FLOAT .. "*)" .. CHAR_CLASSES.SPACE .. "?" .. "(" .. CHAR_CLASSES.FLOAT .. "*)" .. CHAR_CLASSES.SPACE .. "*"
.. "(" .. CHAR_CLASSES.FLOAT .. "*)" .. "(" .. CHAR_CLASSES.FLOAT .. "*)"
.."$") .."$")
@ -175,7 +175,11 @@ local function parse_setting_line(settings, line, read_all, base_level, allow_se
end end
if setting_type == "enum" then if setting_type == "enum" then
local default, values = remaining_line:match("^(.+)" .. CHAR_CLASSES.SPACE .. "(.+)$") local default, values = remaining_line:match("^"
-- first value (default) may be empty (i.e. is optional)
.. "(" .. CHAR_CLASSES.VARIABLE .. "*)" .. CHAR_CLASSES.SPACE .. "*"
.. "(" .. CHAR_CLASSES.FLAGS .. "+)"
.. "$")
if not default or values == "" then if not default or values == "" then
return "Invalid enum setting" return "Invalid enum setting"
@ -211,14 +215,22 @@ local function parse_setting_line(settings, line, read_all, base_level, allow_se
if setting_type == "flags" then if setting_type == "flags" then
local default, possible = remaining_line:match("^" local default, possible = remaining_line:match("^"
.. "(" .. CHAR_CLASSES.FLAGS .. "+)" .. CHAR_CLASSES.SPACE .. "" -- first value (default) may be empty (i.e. is optional)
.. "(" .. CHAR_CLASSES.FLAGS .. "+)" -- this is implemented by making the last value optional, and
-- swapping them around if it turns out empty.
.. "(" .. CHAR_CLASSES.FLAGS .. "+)" .. CHAR_CLASSES.SPACE .. "*"
.. "(" .. CHAR_CLASSES.FLAGS .. "*)"
.. "$") .. "$")
if not default or not possible then if not default or not possible then
return "Invalid flags setting" return "Invalid flags setting"
end end
if possible == "" then
possible = default
default = ""
end
table.insert(settings, { table.insert(settings, {
name = name, name = name,
readable_name = readable_name, readable_name = readable_name,