git: eefddc38243d - stable/12 - lualoader: position hyphens at the beginning of character classes

[Kyle Evans]

The branch stable/12 has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=eefddc38243d53a6df41f72c17c65b17d8c46e9c

commit eefddc38243d53a6df41f72c17c65b17d8c46e9c
Author:     Kyle Evans <kevans at FreeBSD.org>
AuthorDate: 2021-01-31 15:51:39 +0000
Commit:     Kyle Evans <kevans at FreeBSD.org>
CommitDate: 2021-02-03 06:58:24 +0000

    lualoader: position hyphens at the beginning of character classes
    
    According to the Lua 5.4 manual section 6.4.1 ("Patterns"), the interaction
    between ranges and classes is not defined and hyphens must be specified at
    either the beginning or the end of a set if they are not escaped.
    
    Move all such occurrences to the beginning.
    
    (cherry picked from commit b24872cf7b13314669ed2136c0262bb2eb007695)
---
 stand/lua/config.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/stand/lua/config.lua b/stand/lua/config.lua
index 886d897b4621..6e779233373c 100644
--- a/stand/lua/config.lua
+++ b/stand/lua/config.lua
@@ -62,10 +62,10 @@ local MSG_FAILSYN_EOLESC = "Stray escape at end of line"
 local MSG_FAILSYN_EOLVAR = "Unescaped $ at end of line"
 local MSG_FAILSYN_BADVAR = "Malformed variable expression at position '%d'"
 
-local MODULEEXPR = '([%w-_]+)'
+local MODULEEXPR = '([-%w_]+)'
 local QVALEXPR = '"(.*)"'
 local QVALREPL = QVALEXPR:gsub('%%', '%%%%')
-local WORDEXPR = "([%w%d-][%w%d-_.]*)"
+local WORDEXPR = "([-%w%d][-%w%d_.]*)"
 local WORDREPL = WORDEXPR:gsub('%%', '%%%%')
 
 -- Entries that should never make it into the environment; each one should have
@@ -182,7 +182,7 @@ local function processEnvVar(value)
 					-- Skip the $
 					vinit = i + 1
 					vdelim = nil
-					vpat = "^([%w][%w%d-_.]*)"
+					vpat = "^([%w][-%w%d_.]*)"
 				end
 
 				local name = value:match(vpat, vinit)
@@ -346,7 +346,7 @@ local function getBlacklist()
 		return blacklist
 	end
 
-	for mod in blacklist_str:gmatch("[;, ]?([%w-_]+)[;, ]?") do
+	for mod in blacklist_str:gmatch("[;, ]?([-%w_]+)[;, ]?") do
 		blacklist[mod] = true
 	end
 	return blacklist