Merge remote-tracking branch 'origin/refs/pull/1844/head'

12 files changed, 48 insertions, 16 deletions

diff --git a/src/luarocks/cmd/write_rockspec.lua b/src/luarocks/cmd/write_rockspec.lua
index b84c2803..5710c982 100644
--- a/src/luarocks/cmd/write_rockspec.lua
+++ b/src/luarocks/cmd/write_rockspec.lua
@@ -28,12 +28,17 @@ local lua_versions = {
    "5.2",
    "5.3",
    "5.4",
+   "5.5",
    "5.1,5.2",
    "5.2,5.3",
    "5.3,5.4",
+   "5.4,5.5",
    "5.1,5.2,5.3",
    "5.2,5.3,5.4",
+   "5.3,5.4,5.5",
    "5.1,5.2,5.3,5.4",
+   "5.2,5.3,5.4,5.5",
+   "5.1,5.2,5.3,5.4,5.5",
 }
 
 function write_rockspec.cmd_options(parser)
@@ -110,12 +115,17 @@ local lua_version_dep = {
    ["5.2"] = "lua ~> 5.2",
    ["5.3"] = "lua ~> 5.3",
    ["5.4"] = "lua ~> 5.4",
+   ["5.5"] = "lua ~> 5.5",
    ["5.1,5.2"] = "lua >= 5.1, < 5.3",
    ["5.2,5.3"] = "lua >= 5.2, < 5.4",
    ["5.3,5.4"] = "lua >= 5.3, < 5.5",
+   ["5.4,5.5"] = "lua >= 5.4, < 5.6",
    ["5.1,5.2,5.3"] = "lua >= 5.1, < 5.4",
    ["5.2,5.3,5.4"] = "lua >= 5.2, < 5.5",
+   ["5.3,5.4,5.5"] = "lua >= 5.3, < 5.6",
    ["5.1,5.2,5.3,5.4"] = "lua >= 5.1, < 5.5",
+   ["5.2,5.3,5.4,5.5"] = "lua >= 5.2, < 5.6",
+   ["5.1,5.2,5.3,5.4,5.5"] = "lua >= 5.1, < 5.6",
 }
 
 local simple_scm_protocols = {
diff --git a/src/luarocks/cmd/write_rockspec.tl b/src/luarocks/cmd/write_rockspec.tl
index 7354a683..2ec4eea9 100644
--- a/src/luarocks/cmd/write_rockspec.tl
+++ b/src/luarocks/cmd/write_rockspec.tl
@@ -28,12 +28,17 @@ local lua_versions = {
    "5.2",
    "5.3",
    "5.4",
+   "5.5",
    "5.1,5.2",
    "5.2,5.3",
    "5.3,5.4",
+   "5.4,5.5",
    "5.1,5.2,5.3",
    "5.2,5.3,5.4",
-   "5.1,5.2,5.3,5.4"
+   "5.3,5.4,5.5",
+   "5.1,5.2,5.3,5.4",
+   "5.2,5.3,5.4,5.5",
+   "5.1,5.2,5.3,5.4,5.5",
 }
 
 function write_rockspec.cmd_options(parser: Parser)
@@ -110,12 +115,17 @@ local lua_version_dep = {
    ["5.2"] = "lua ~> 5.2",
    ["5.3"] = "lua ~> 5.3",
    ["5.4"] = "lua ~> 5.4",
+   ["5.5"] = "lua ~> 5.5",
    ["5.1,5.2"] = "lua >= 5.1, < 5.3",
    ["5.2,5.3"] = "lua >= 5.2, < 5.4",
    ["5.3,5.4"] = "lua >= 5.3, < 5.5",
+   ["5.4,5.5"] = "lua >= 5.4, < 5.6",
    ["5.1,5.2,5.3"] = "lua >= 5.1, < 5.4",
    ["5.2,5.3,5.4"] = "lua >= 5.2, < 5.5",
+   ["5.3,5.4,5.5"] = "lua >= 5.3, < 5.6",
    ["5.1,5.2,5.3,5.4"] = "lua >= 5.1, < 5.5",
+   ["5.2,5.3,5.4,5.5"] = "lua >= 5.2, < 5.6",
+   ["5.1,5.2,5.3,5.4,5.5"] = "lua >= 5.1, < 5.6",
 }
 
 local simple_scm_protocols = {
diff --git a/src/luarocks/core/util.lua b/src/luarocks/core/util.lua
index a6ff0fcb..40ba213d 100644
--- a/src/luarocks/core/util.lua
+++ b/src/luarocks/core/util.lua
@@ -96,7 +96,7 @@ function util.show_table(t, tname, top_indent)
             else
                cart = cart .. " = {\n"
                for k, v in pairs(value) do
-                  k = basic_serialize(k)
+                  local k = basic_serialize(k)
                   local fname = ("%s[%s]"):format(name, k)
                   field = ("[%s]"):format(k)
 
diff --git a/src/luarocks/core/util.tl b/src/luarocks/core/util.tl
index b1bbea05..1a6fefca 100644
--- a/src/luarocks/core/util.tl
+++ b/src/luarocks/core/util.tl
@@ -96,7 +96,7 @@ function util.show_table(t: {any:any}, tname: string, top_indent: string): strin
             else
                cart = cart .. " = {\n"
                for k, v in pairs(value) do
-                  k = basic_serialize(k)
+                  local k = basic_serialize(k)
                   local fname = ("%s[%s]"):format(name, k)
                   field = ("[%s]"):format(k)
                   -- three spaces between levels
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index 13b531f6..90c11bd5 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -705,15 +705,19 @@ function deps.scan_deps(results, mdeps, name, version, deps_mode)
 end
 
 local function lua_h_exists(d, luaver)
-   local major, minor = luaver:match("(%d+)%.(%d+)")
-   local luanum = ("%s%02d"):format(major, math.tointeger(minor))
+   local major_s, minor_s = luaver:match("(%d+)%.(%d+)")
+   local major, minor = math.tointeger(major_s), math.tointeger(minor_s)
 
    local lua_h = dir.path(d, "lua.h")
    local fd = io.open(lua_h)
    if fd then
       local data = fd:read("*a")
       fd:close()
-      if data:match("LUA_VERSION_NUM%s*" .. tostring(luanum)) then
+      if vers.parse_version(("%d.%d"):format(major, minor)) >= vers.parse_version("5.5") then
+         if data:match("LUA_VERSION_MAJOR_N%s+" .. major) and data:match("LUA_VERSION_MINOR_N%s+" .. minor) then
+            return d ~= nil
+         end
+      elseif data:match("LUA_VERSION_NUM%s*" .. ("%d%02d"):format(major, minor)) then
          return d ~= nil
       end
       return nil, "Lua header lua.h found at " .. d .. " does not match Lua version " .. luaver .. ". You can use `luarocks config variables.LUA_INCDIR <path>` to set the correct location.", "dependency", 2
diff --git a/src/luarocks/deps.tl b/src/luarocks/deps.tl
index 98fad54d..55006a95 100644
--- a/src/luarocks/deps.tl
+++ b/src/luarocks/deps.tl
@@ -705,15 +705,19 @@ function deps.scan_deps(results: {string: string}, mdeps: {string: {string: {Que
 end
 
 local function lua_h_exists(d: string, luaver: string): boolean, string, string, integer
-   local major, minor = luaver:match("(%d+)%.(%d+)")
-   local luanum = ("%s%02d"):format(major, math.tointeger(minor))
+   local major_s, minor_s = luaver:match("(%d+)%.(%d+)")
+   local major, minor = math.tointeger(major_s), math.tointeger(minor_s)
 
    local lua_h = dir.path(d, "lua.h")
    local fd = io.open(lua_h)
    if fd then
       local data = fd:read("*a")
       fd:close()
-      if data:match("LUA_VERSION_NUM%s*" .. tostring(luanum)) then
+      if vers.parse_version(("%d.%d"):format(major, minor)) >= vers.parse_version("5.5") then
+         if data:match("LUA_VERSION_MAJOR_N%s+" .. major) and data:match("LUA_VERSION_MINOR_N%s+" .. minor) then
+            return d ~= nil
+         end
+      elseif data:match("LUA_VERSION_NUM%s*" .. ("%d%02d"):format(major, minor)) then
          return d ~= nil
       end
       return nil, "Lua header lua.h found at " .. d .. " does not match Lua version " .. luaver .. ". You can use `luarocks config variables.LUA_INCDIR <path>` to set the correct location.", "dependency", 2
diff --git a/src/luarocks/fs/lua.lua b/src/luarocks/fs/lua.lua
index 0f1ee55e..45324c77 100644
--- a/src/luarocks/fs/lua.lua
+++ b/src/luarocks/fs/lua.lua
@@ -213,6 +213,7 @@ function fs_lua.modules(at)
    local path = package.path:sub(-1, -1) == ";" and package.path or package.path .. ";"
    local paths = {}
    for location in path:gmatch("(.-);") do
+      local location = location
       if location:lower() == "?.lua" then
          location = "./?.lua"
       end
diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua
index 86cbb45b..56f04b19 100644
--- a/src/luarocks/fs/win32/tools.lua
+++ b/src/luarocks/fs/win32/tools.lua
@@ -131,6 +131,7 @@ function tools.find(at)
    local pipe = io.popen(fs.command_at(at, fs.quiet_stderr(vars.FIND), true))
    for file in pipe:lines() do
       -- Windows find is a bit different
+      local file = file
       local first_two = file:sub(1,2)
       if first_two == ".\\" or first_two == "./" then file=file:sub(3) end
       if file ~= "." then
@@ -223,7 +224,7 @@ local function get_system_users()
    local result = {}
    local fd = assert(io.popen("wmic UserAccount get name"))
    for user in fd:lines() do
-      user = user:gsub("%s+$", "")
+      local user = user:gsub("%s+$", "")
       if not exclude[user] then
          table.insert(result, user)
       end
diff --git a/src/luarocks/tools/patch.lua b/src/luarocks/tools/patch.lua
index d1575cb0..5b00e9b1 100644
--- a/src/luarocks/tools/patch.lua
+++ b/src/luarocks/tools/patch.lua
@@ -188,6 +188,7 @@ function patch.read_patch(filename, data)
    local lineno = 0
 
    for line in file_lines(fp) do
+      local line = line
       lineno = lineno + 1
       if state == 'header' then
          if startswith(line, "--- ") then
diff --git a/src/luarocks/tools/patch.tl b/src/luarocks/tools/patch.tl
index 553964e3..2cfd3841 100644
--- a/src/luarocks/tools/patch.tl
+++ b/src/luarocks/tools/patch.tl
@@ -188,6 +188,7 @@ function patch.read_patch(filename: string, data: string): Files, boolean
   local lineno = 0
 
   for line in file_lines(fp) do
+    local line = line
     lineno = lineno + 1
     if state == 'header' then
       if startswith(line, "--- ") then
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index ffa53b09..b35c63ce 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -160,7 +160,7 @@ function util.variable_substitutions(tbl, vars)
 end
 
 function util.lua_versions(sort)
-   local versions = { "5.1", "5.2", "5.3", "5.4" }
+   local versions = { "5.1", "5.2", "5.3", "5.4", "5.5" }
    local i = 0
    if sort == "descending" then
       i = #versions + 1
@@ -286,7 +286,7 @@ local function collect_rockspecs(versions, paths, unnamed_paths, subdir)
    local vers = require("luarocks.core.vers")
    if fs.is_dir(subdir) then
       for file in fs.dir(subdir) do
-         file = dir.path(subdir, file)
+         local file = dir.path(subdir, file)
 
          if file:match("rockspec$") and fs.is_file(file) then
             local rock, version = path.parse_name(file)
@@ -550,7 +550,7 @@ function util.get_rocks_provided(rockspec)
       rocks_provided["bit32"] = lv .. "-1"
    end
 
-   if lv == "5.3" or lv == "5.4" then
+   if lv == "5.3" or lv == "5.4" or lv == "5.5" then
       rocks_provided["utf8"] = lv .. "-1"
    end
 
diff --git a/src/luarocks/util.tl b/src/luarocks/util.tl
index b68883e5..f2fb5a5a 100644
--- a/src/luarocks/util.tl
+++ b/src/luarocks/util.tl
@@ -160,7 +160,7 @@ function util.variable_substitutions<K>(tbl: {K: string}, vars: {string: string}
 end
 
 function util.lua_versions(sort?: string): function(): string
-   local versions = { "5.1", "5.2", "5.3", "5.4" }
+   local versions = { "5.1", "5.2", "5.3", "5.4", "5.5" }
    local i = 0
    if sort == "descending" then
       i = #versions + 1
@@ -286,7 +286,7 @@ local function collect_rockspecs(versions: {string: string}, paths: {string: str
    local vers = require("luarocks.core.vers")
    if fs.is_dir(subdir) then
       for file in fs.dir(subdir) do
-         file = dir.path(subdir, file)
+         local file = dir.path(subdir, file)
 
          if file:match("rockspec$") and fs.is_file(file) then
             local rock, version = path.parse_name(file)
@@ -550,7 +550,7 @@ function util.get_rocks_provided(rockspec?: Rockspec): {string: string}
       rocks_provided["bit32"] = lv.."-1"
    end
 
-   if lv == "5.3" or lv == "5.4" then
+   if lv == "5.3" or lv == "5.4" or lv == "5.5" then
       rocks_provided["utf8"] = lv.."-1"
    end