some util fixes (Packtable)

4 files changed, 21 insertions, 7 deletions

diff --git a/src/luarocks/core/util.tl b/src/luarocks/core/util.tl
index e278ebf0..e9c21dac 100644
--- a/src/luarocks/core/util.tl
+++ b/src/luarocks/core/util.tl
@@ -16,7 +16,7 @@ local type CompFn = util.CompFn
 -- @param spec string: "*l" by default, to read a single line.
 -- May be used to read more, passing, for instance, "*a".
 -- @return string: the output of the program.
-function util.popen_read(cmd: string, spec: string): string
+function util.popen_read(cmd: string, spec?: string): string
    local tmpfile: string = (dir_sep == "\\")
                    and (os.getenv("TMP") .. "/luarocks-" .. tostring(math.floor(math.random() * 10000)))
                    or os.tmpname()
diff --git a/src/luarocks/path.tl b/src/luarocks/path.tl
index 4bf2e47c..ffcf26c8 100644
--- a/src/luarocks/path.tl
+++ b/src/luarocks/path.tl
@@ -171,7 +171,7 @@ end
 -- @param file_name string: pathname of a rock or rockspec
 -- @return (string, string, string) or nil: name, version and arch
 -- or nil if name could not be parsed
-function path.parse_name(file_name: string): string
+function path.parse_name(file_name: string): string, string, string
    if file_name:match("%.rock$") then
       return dir.base_name(file_name):match("(.*)-([^-]+-%d+)%.([^.]+)%.rock$")
    else
diff --git a/src/luarocks/util.lua b/src/luarocks/util-original.lua
index de9157fc..de9157fc 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util-original.lua
diff --git a/src/luarocks/util.tl b/src/luarocks/util.tl
index bc6ddecd..868e1552 100644
--- a/src/luarocks/util.tl
+++ b/src/luarocks/util.tl
@@ -15,7 +15,7 @@ local record util
    sortedpairs: function<K, V, S>({K : V}, CompFn | {K | {K, S}}): function(): K, V, S
    deep_merge: function({any : any}, {any : any})
    deep_merge_under: function({any : any}, {any : any})
-   popen_read: function(string, string): string
+   popen_read: function(string, ?string): string
    show_table: function({any : any}, string, string): string
    printerr: function(...: string | number)
    warning: function(string)
@@ -24,7 +24,7 @@ local record util
 
    record Fn
       fn: function(...: any)
-      args: {any: any}
+      args: table.PackTable<any>
    end
 
    record Parser --?
@@ -34,6 +34,7 @@ local record util
       flag: function(Parser, string): Parser
       hidden: function(Parser, boolean): Parser
    end
+
 end
 
 util.cleanup_path = core.cleanup_path --tlcheck acting funny
@@ -92,7 +93,7 @@ function util.run_scheduled_functions()
    end
    for i = #scheduled_functions, 1, -1 do
       local item = scheduled_functions[i]
-      item.fn(table.unpack(item.args, 1, item.args.n)) --! here a list and onn line 52 we produse a record
+      item.fn(table.unpack(item.args, 1, item.args.n))
    end
 end
 
@@ -148,7 +149,7 @@ function util.variable_substitutions(tbl: {string: string}, vars: {string: strin
 
    local updated = {}
    for k, v in pairs(tbl) do
-      if type(v) == "string" then
+      if v is string then
          updated[k] = v:gsub(var_format_pattern, vars)
          if warn_failed_matches(updated[k]) then
             updated[k] = updated[k]:gsub(var_format_pattern, "")
@@ -284,7 +285,7 @@ end
 -- @param unnamed_paths table: An array of rockspec paths that don't contain rock
 -- name and version in regular format.
 -- @param subdir string: path to subdirectory.
-local function collect_rockspecs(versions: {string: vers.Version}, paths: {string: string}, unnamed_paths: {string}, subdir: string) --! fs stuff
+local function collect_rockspecs(versions: {string: string}, paths: {string: string}, unnamed_paths: {string}, subdir: string) --! fs stuff
    local fs = require("luarocks.fs")
    local dir = require("luarocks.dir")
    local path = require("luarocks.path")
@@ -512,6 +513,19 @@ do
       --    end
       -- end
 
+      -- local function insert_lua_variants(names, luaver)
+      --    local variants = {
+      --       "lua" .. luaver .. exe_suffix,
+      --       "lua" .. luaver:gsub("%.", "") .. exe_suffix,
+      --       "lua-" .. luaver .. exe_suffix,
+      --       "lua-" .. luaver:gsub("%.", "") .. exe_suffix,
+      --    }
+      --    for _, name in ipairs(variants) do
+      --       names[name] = luaver
+      --       table.insert(names, name)
+      --    end
+      -- end
+
       find_lua_bindir = function(prefix: string, luaver: string, verbose: string): string, string, string
          local names: HashArrayRecord = {}
          if luaver then