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

19 files changed, 83 insertions, 33 deletions

diff --git a/GNUmakefile b/GNUmakefile
index 46be0cc6..37cfdf7d 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -16,7 +16,7 @@ buildbinarydir = ./build-binary
 
 LUAROCKS_FILES = $(shell find src/luarocks/ -type f -name '*.lua')
 
-LUA_ENV_VARS = LUA_PATH LUA_PATH_5_2 LUA_PATH_5_3 LUA_PATH_5_4 LUA_CPATH LUA_CPATH_5_2 LUA_CPATH_5_3 LUA_CPATH_5_4
+LUA_ENV_VARS = LUA_PATH LUA_PATH_5_2 LUA_PATH_5_3 LUA_PATH_5_4 LUA_PATH_5_5 LUA_CPATH LUA_CPATH_5_2 LUA_CPATH_5_3 LUA_CPATH_5_4 LUA_CPATH_5_5
 
 all: build
 
diff --git a/binary/all_in_one b/binary/all_in_one
index 9b675eba..e3d595d7 100755
--- a/binary/all_in_one
+++ b/binary/all_in_one
@@ -69,7 +69,7 @@ local function reindent_c(input)
    local indent = 0
    local previous_is_blank = true
    for line in input:gmatch("([^\n]*)") do
-      line = line:match("^[ \t]*(.-)[ \t]*$")
+      local line = line:match("^[ \t]*(.-)[ \t]*$")
 
       local is_blank = (#line == 0)
       local do_print =
diff --git a/binary/luaposix-35.1-1.rockspec b/binary/luaposix-35.1-1.rockspec
index 1940c755..0f23d39d 100644
--- a/binary/luaposix-35.1-1.rockspec
+++ b/binary/luaposix-35.1-1.rockspec
@@ -14,7 +14,7 @@ description = {
 }
 
 dependencies = {
-   'lua >= 5.1, < 5.5',
+   'lua >= 5.1, < 5.6',
 }
 
 do
diff --git a/configure b/configure
index cc3e9dab..4c294105 100755
--- a/configure
+++ b/configure
@@ -120,7 +120,7 @@ Where to install files provided by rocks:
                                - Default is [PREFIX]
 
 Where is your Lua interpreter:
-  --lua-version=VERSION        Use specific Lua version: 5.1, 5.2, 5.3, or 5.4
+  --lua-version=VERSION        Use specific Lua version: 5.1, 5.2, 5.3, 5.4 or 5.5
                                - Default is auto-detected.
   --with-lua-bin=LUA_BINDIR    Location of your Lua binar(y/ies).
                                - Default is the directory of the
@@ -151,7 +151,7 @@ EOF
 # -------------
 
 detect_lua_version() {
-   detected_lua=$($1 -e 'print(_VERSION:match(" (5%.[1234])$"))' 2> /dev/null)
+   detected_lua=$($1 -e 'print(_VERSION:match(" (5%.[12345])$"))' 2> /dev/null)
    if [ "$detected_lua" != "nil" ]
    then
       if [ "$LUA_VERSION_SET" != "yes" ]
@@ -258,7 +258,7 @@ do
       [ -n "$value" ] || die "Missing value in flag $key."
       LUA_VERSION="$value"
       case "$LUA_VERSION" in
-      5.1|5.2|5.3|5.4) ;;
+      5.1|5.2|5.3|5.4|5.5) ;;
       *) die "Invalid Lua version in flag $key."
       esac
       LUA_VERSION_SET=yes
@@ -362,8 +362,11 @@ case "$LUA_VERSION" in
 5.4)
    names="lua5.4 lua54 lua-5.4 lua-54 lua"
    ;;
+5.5)
+   names="lua5.5 lua55 lua-5.5 lua-55 lua"
+   ;;
 *)
-   names="lua5.4 lua54 lua-5.4 lua-54 lua5.3 lua53 lua-5.3 lua-53 lua5.2 lua52 lua-5.2 lua-52 lua5.1 lua51 lua-5.1 lua-51 luajit lua"
+   names="lua5.5 lua55 lua-5.5 lua-55 lua5.4 lua54 lua-5.4 lua-54 lua5.3 lua53 lua-5.3 lua-53 lua5.2 lua52 lua-5.2 lua-52 lua5.1 lua51 lua-5.1 lua-51 luajit lua"
    ;;
 esac
 
@@ -438,7 +441,12 @@ check_incdir() {
    do
       if [ -f "$lua_h" ]
       then
-         grep "LUA_VERSION_NUM.*$LUA_VERSION" "$lua_h" > /dev/null 2> /dev/null && return
+         if [ "$LUA_VERSION" = "5.5" ]
+         then
+            grep "LUA_VERSION_MINOR_N.*5" "$lua_h" > /dev/null 2> /dev/null && return
+         else
+            grep "LUA_VERSION_NUM.*$LUA_VERSION" "$lua_h" > /dev/null 2> /dev/null && return
+         fi
       fi
       tried="$tried $lua_h"
    done
diff --git a/install.bat b/install.bat
index 6dd71125..25fc697e 100644
--- a/install.bat
+++ b/install.bat
@@ -136,7 +136,7 @@ Configuring the destinations:
                if you create a self contained installation.

                

 Configuring the Lua interpreter:

-/LV [version]  Lua version to use; either 5.1, 5.2, 5.3, or 5.4.

+/LV [version]  Lua version to use; either 5.1, 5.2, 5.3, 5.4 or 5.5.

                Default is auto-detected.

 /LUA [dir]     Location where Lua is installed - e.g. c:\lua\5.1\

                If not provided, the installer will search the system

@@ -258,8 +258,8 @@ local function check_flags()
                         die("Bundled Lua version is 5.1, cannot install "..vars.LUA_VERSION)

                 end

         end

-        if not vars.LUA_VERSION:match("^5%.[1234]$") then

-                die("Bad argument: /LV must either be 5.1, 5.2, 5.3, or 5.4")

+        if not vars.LUA_VERSION:match("^5%.[12345]$") then

+                die("Bad argument: /LV must either be 5.1, 5.2, 5.3, 5.4 or 5.5")

         end

   if USE_MSVC_MANUAL and USE_MINGW then

     die("Cannot combine option /MSVC and /MW")

@@ -277,7 +277,7 @@ local function detect_lua_version(interpreter_path)
         local full_version = handler:read("*a")

         handler:close()

 

-        local version = full_version:match(" (5%.[1234])$")

+        local version = full_version:match(" (5%.[12345])$")

         if not version then

                 return nil, "unknown interpreter version '" .. full_version .. "'"

         end

@@ -289,7 +289,7 @@ local function look_for_interpreter(directory)
         if lua_version_set then

                 names = {S"lua$LUA_VERSION.exe", S"lua$LUA_SHORTV.exe"}

         else

-                names = {"lua5.4.exe", "lua54.exe", "lua5.3.exe", "lua53.exe", "lua5.2.exe", "lua52.exe", "lua5.1.exe", "lua51.exe"}

+                names = {"lua5.5.exe", "lua55.exe", "lua5.4.exe", "lua54.exe", "lua5.3.exe", "lua53.exe", "lua5.2.exe", "lua52.exe", "lua5.1.exe", "lua51.exe"}

         end

         table.insert(names, "lua.exe")

         table.insert(names, "luajit.exe")

@@ -622,7 +622,7 @@ local function get_possible_lua_directories()
         local directories = {}

         for dir in path:gmatch("[^;]+") do

                 -- Remove trailing backslashes, but not from a drive letter like `C:\`.

-                dir = dir:gsub("([^:])\\+$", "%1")

+                local dir = dir:gsub("([^:])\\+$", "%1")

                 -- Remove trailing `bin` subdirectory, the searcher will check there anyway.

                 if dir:upper():match("[:\\]BIN$") then

                         dir = dir:sub(1, -5)

@@ -1024,7 +1024,7 @@ end
 if not exec(S[[XCOPY /S src\luarocks\*.* "$LUADIR\luarocks" >NUL]]) then

         die()

 end

-if vars.LUA_VERSION ~= "5.3" or vars.LUA_VERSION ~= "5.4" then

+if vars.LUA_VERSION ~= "5.3" or vars.LUA_VERSION ~= "5.4" or vars.LUA_VERSION ~= "5.5" then

         -- Copy the vendored lua-copmat53 source files

         if not exists(S[[$LUADIR\compat53]]) then

                 if not mkdir(S[[$LUADIR\compat53]]) then

@@ -1058,6 +1058,12 @@ IF NOT "%LUA_PATH_5_2%"=="" (
 IF NOT "%LUA_PATH_5_3%"=="" (

    SET "LUA_PATH_5_3=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH_5_3%"

 )

+IF NOT "%LUA_PATH_5_4%"=="" (

+   SET "LUA_PATH_5_4=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH_5_4%"

+)

+IF NOT "%LUA_PATH_5_5%"=="" (

+   SET "LUA_PATH_5_5=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH_5_5%"

+)

 SET "PATH=$BINDIR;%PATH%"

 "$LUA" "$BINDIR\]]..c..[[.lua" %*

 SET EXITCODE=%ERRORLEVEL%

diff --git a/spec/init_spec.lua b/spec/init_spec.lua
index 88bd23a5..6cc0dd90 100644
--- a/spec/init_spec.lua
+++ b/spec/init_spec.lua
@@ -153,13 +153,13 @@ describe("luarocks init #integration", function()
          lfs.mkdir(myproject)
          lfs.chdir(myproject)
 
-         assert(run.luarocks("init --lua-versions=5.1,5.2,5.3,5.4"))
+         assert(run.luarocks("init --lua-versions=5.1,5.2,5.3,5.4,5.5"))
          local rockspec_name = myproject .. "/myproject-dev-1.rockspec"
          assert.truthy(lfs.attributes(rockspec_name))
          local fd = assert(io.open(rockspec_name, "rb"))
          local data = fd:read("*a")
          fd:close()
-         assert.truthy(data:find("lua >= 5.1, < 5.5", 1, true))
+         assert.truthy(data:find("lua >= 5.1, < 5.6", 1, true))
       end, finally)
    end)
 
diff --git a/spec/util/test_env.lua b/spec/util/test_env.lua
index 390ba01c..4b359b7f 100644
--- a/spec/util/test_env.lua
+++ b/spec/util/test_env.lua
@@ -250,6 +250,10 @@ function test_env.execute_helper(command, print_command, env_variables)
       "LUA_CPATH_5_2",
       "LUA_PATH_5_3",
       "LUA_CPATH_5_3",
+      "LUA_PATH_5_4",
+      "LUA_CPATH_5_4",
+      "LUA_PATH_5_5",
+      "LUA_CPATH_5_5",
       "LUAROCKS_SYSCONFDIR",
    }
 
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