From: Robert Zenz <Robert.Zenz@bonsaimind.org>
Date: Sat, 7 Nov 2015 15:31:32 +0000 (+0100)
Subject: Simplify regex used in check_modname_prefix and other improvements.
X-Git-Tag: 0.4.14~415
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0cf15470fc16e1ebc13a7d8445cfd4278c3caf8b;p=oweals%2Fminetest.git

Simplify regex used in check_modname_prefix and other improvements.

Simplified the regex used, added comments and changed the error message
to contain the correct mod name.
---

diff --git a/builtin/game/register.lua b/builtin/game/register.lua
index 840ade127..00bb23278 100644
--- a/builtin/game/register.lua
+++ b/builtin/game/register.lua
@@ -51,20 +51,24 @@ local forbidden_item_names = {
 
 local function check_modname_prefix(name)
 	if name:sub(1,1) == ":" then
-		-- Escape the modname prefix enforcement mechanism
+		-- If the name starts with a colon, we can skip the modname prefix
+		-- mechanism.
 		return name:sub(2)
 	else
-		-- Modname prefix enforcement
+		-- Enforce that the name starts with the correct mod name.
 		local expected_prefix = core.get_current_modname() .. ":"
 		if name:sub(1, #expected_prefix) ~= expected_prefix then
 			error("Name " .. name .. " does not follow naming conventions: " ..
-				"\"modname:\" or \":\" prefix required")
+				"\"" .. expected_prefix .. "\" or \":\" prefix required")
 		end
+		
+		-- Enforce that the name only contains letters, numbers and underscores.
 		local subname = name:sub(#expected_prefix+1)
-		if subname:find("[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]") then
+		if subname:find("[^%w_]") then
 			error("Name " .. name .. " does not follow naming conventions: " ..
 				"contains unallowed characters")
 		end
+		
 		return name
 	end
 end