patch 2

3 files changed, 79 insertions, 73 deletions

diff --git a/src/luarocks/fs.d.tl b/src/luarocks/fs.d.tl
index 17cf0517..a2218cd6 100644
--- a/src/luarocks/fs.d.tl
+++ b/src/luarocks/fs.d.tl
@@ -27,6 +27,8 @@ local record fs
    Q: function(string): string
    download: function(string, string): boolean, string
    set_permissions: function(string, string, string)
+   -- patch
+   absolute_name: function(string, ?string): string
 end
 
 return fs
diff --git a/src/luarocks/fun.tl b/src/luarocks/fun.tl
index 16873dc2..e2d43d5d 100644
--- a/src/luarocks/fun.tl
+++ b/src/luarocks/fun.tl
@@ -16,7 +16,7 @@ function fun.concat<K>(xs: {K}, ys: {K}): {K}
    return rs
 end
 
-function fun.contains<K>(xs: {K}, v: K): boolean --? same logic as above fine?
+function fun.contains<K>(xs: {K}, v: any): boolean --? same logic as above fine?
    for _, x in ipairs(xs) do
       if v == x then
          return true
diff --git a/src/luarocks/tools/patch.tl b/src/luarocks/tools/patch.tl
index 05b447da..bd6c3d63 100644
--- a/src/luarocks/tools/patch.tl
+++ b/src/luarocks/tools/patch.tl
@@ -14,7 +14,7 @@ local record patch
     crlf: number
     cr: number
   end
-  record Hunks
+  record Hunk
     startsrc: number
     linessrc: number
     starttgt: number
@@ -22,24 +22,27 @@ local record patch
     invalid: boolean
     text: {string}
   end
+  record Files
+    source: {string | number} --!
+    target: {string | number}
+    epoch: {boolean}
+    hunks: {{Hunk}}
+    fileends: {Lineends}
+    hunkends: {Lineends}
+  end
 end
 
 local fs = require("luarocks.fs")
 local fun = require("luarocks.fun")
 
 local type Lineends = patch.Lineends
-local type Hunks = patch.Hunks
-
--- local io = io
--- local os = os
--- local string = string
--- local table = table
--- local format = string.format
+local type Hunk = patch.Hunk
+local type Files = patch.Files
 
 -- logging
 local debugmode = false
-local function debug(_) end --!
-local function info(_) end
+local function debug(_: string) end --!
+local function info(_: string) end
 local function warning(s: string) io.stderr:write(s .. '\n') end
 
 -- Returns boolean whether string s2 starts with string s.
@@ -148,7 +151,7 @@ local function match_epoch(str: string): string
   return str:match("[^0-9]1969[^0-9]") or str:match("[^0-9]1970[^0-9]")
 end
 
-function patch.read_patch(filename: string, data: string)
+function patch.read_patch(filename: string, data: string): Files, boolean
   -- define possible file regions that will direct the parser flow
   local state = 'header'
     -- 'header'    - comments before the patch body
@@ -159,17 +162,17 @@ function patch.read_patch(filename: string, data: string)
 
   local all_ok = true
   local lineends: Lineends = {lf=0, crlf=0, cr=0}
-  local files = {source={}, target={}, epoch={}, hunks: {{Hunks}}={}, fileends={}, hunkends: {Lineends}={}}
+  local files: Files = {source={}, target={}, epoch={}, hunks: {{Hunk}}={}, fileends={}, hunkends: {Lineends}={}}
   local nextfileno = 0
   local nexthunkno = 0    --: even if index starts with 0 user messages
                           --  number hunks from 1
 
   -- hunkinfo holds parsed values, hunkactual - calculated
-  local hunkinfo: Hunks = {
+  local hunkinfo: Hunk = {
     startsrc=nil, linessrc=nil, starttgt=nil, linestgt=nil,
     invalid=false, text={}
   }
-  local hunkactual: Hunks = {linessrc=nil, linestgt=nil}
+  local hunkactual: Hunk = {linessrc=nil, linestgt=nil}
 
   info(string.format("reading patch %s", filename)) --!
 
@@ -224,7 +227,7 @@ function patch.read_patch(filename: string, data: string)
           warning(string.format("invalid hunk no.%d at %d for target file %s",
                          nexthunkno, lineno, files.target[nextfileno]))
           -- add hunk status node
-          table.insert(files.hunks[nextfileno], table_copy(hunkinfo)) --! cast
+          table.insert(files.hunks[nextfileno], table_copy(hunkinfo as {any: any}) as Hunk)
           files.hunks[nextfileno][nexthunkno].invalid = true
           all_ok = false
           state = 'hunkskip'
@@ -237,13 +240,13 @@ function patch.read_patch(filename: string, data: string)
           warning(string.format("extra hunk no.%d lines at %d for target %s",
                          nexthunkno, lineno, files.target[nextfileno]))
           -- add hunk status node
-          table.insert(files.hunks[nextfileno], table_copy(hunkinfo))
+          table.insert(files.hunks[nextfileno], table_copy(hunkinfo as {any: any}) as Hunk)
           files.hunks[nextfileno][nexthunkno].invalid = true
           state = 'hunkskip'
       elseif hunkinfo.linessrc == hunkactual.linessrc and
              hunkinfo.linestgt == hunkactual.linestgt
       then
-          table.insert(files.hunks[nextfileno], table_copy(hunkinfo))
+          table.insert(files.hunks[nextfileno], table_copy(hunkinfo as {any: any}) as Hunk)
           state = 'hunkskip'
 
           -- detect mixed window/unix line ends
@@ -264,18 +267,18 @@ function patch.read_patch(filename: string, data: string)
       elseif startswith(line, "--- ") then
         state = 'filenames'
         if debugmode and #files.source > 0 then
-            debug(format("- %2d hunks for %s", #files.hunks[nextfileno],
+            debug(string.format("- %2d hunks for %s", #files.hunks[nextfileno],
                          files.source[nextfileno]))
         end
       end
       -- state is 'hunkskip', 'hunkhead', or 'filenames'
     end
-    local advance
+    local advance: boolean
     if state == 'filenames' then
       if startswith(line, "--- ") then
         if fun.contains(files.source, nextfileno) then
           all_ok = false
-          warning(format("skipping invalid patch for %s",
+          warning(string.format("skipping invalid patch for %s",
                          files.source[nextfileno+1]))
           table.remove(files.source, nextfileno+1)
           -- double source filename line is encountered
@@ -287,7 +290,7 @@ function patch.read_patch(filename: string, data: string)
         local match, rest = line:match("^%-%-%- ([^ \t\r\n]+)(.*)")
         if not match then
           all_ok = false
-          warning(format("skipping invalid filename at line %d", lineno+1))
+          warning(string.format("skipping invalid filename at line %d", lineno+1))
           state = 'header'
         else
           if match_epoch(rest) then
@@ -298,7 +301,7 @@ function patch.read_patch(filename: string, data: string)
       elseif not startswith(line, "+++ ") then
         if fun.contains(files.source, nextfileno) then
           all_ok = false
-          warning(format("skipping invalid patch with no target for %s",
+          warning(string.format("skipping invalid patch with no target for %s",
                          files.source[nextfileno+1]))
           table.remove(files.source, nextfileno+1)
         else
@@ -309,7 +312,7 @@ function patch.read_patch(filename: string, data: string)
       else
         if fun.contains(files.target, nextfileno) then
           all_ok = false
-          warning(format("skipping invalid patch - double target at line %d",
+          warning(string.format("skipping invalid patch - double target at line %d",
                          lineno+1))
           table.remove(files.source, nextfileno+1)
           table.remove(files.target, nextfileno+1)
@@ -325,7 +328,7 @@ function patch.read_patch(filename: string, data: string)
           local match, rest = line:match(re_filename)
           if not match then
             all_ok = false
-            warning(format(
+            warning(string.format(
               "skipping invalid patch - no target filename at line %d",
               lineno+1))
             state = 'header'
@@ -337,8 +340,8 @@ function patch.read_patch(filename: string, data: string)
             end
             nexthunkno = 0
             table.insert(files.hunks, {})
-            table.insert(files.hunkends, table_copy(lineends))
-            table.insert(files.fileends, table_copy(lineends))
+            table.insert(files.hunkends, table_copy(lineends as {any: any}) as Lineends)
+            table.insert(files.fileends, table_copy(lineends as {any: any}) as Lineends)
             state = 'hunkhead'
             advance = true
           end
@@ -349,17 +352,17 @@ function patch.read_patch(filename: string, data: string)
     if not advance and state == 'hunkhead' then
       local m1, m2, m3, m4 = match_linerange(line)
       if not m1 then
-        if not fun.contains(files.hunks, nextfileno-1) then
+        if not fun.contains(files.hunks, nextfileno-1) then --!
           all_ok = false
-          warning(format("skipping invalid patch with no hunks for file %s",
+          warning(string.format("skipping invalid patch with no hunks for file %s",
                          files.target[nextfileno]))
         end
         state = 'header'
       else
         hunkinfo.startsrc = tonumber(m1)
-        hunkinfo.linessrc = tonumber(m2 or 1)
+        hunkinfo.linessrc = tonumber(tonumber(m2) or 1) --!
         hunkinfo.starttgt = tonumber(m3)
-        hunkinfo.linestgt = tonumber(m4 or 1)
+        hunkinfo.linestgt = tonumber(tonumber(m4) or 1)
         hunkinfo.invalid = false
         hunkinfo.text = {}
 
@@ -373,24 +376,24 @@ function patch.read_patch(filename: string, data: string)
     end
   end
   if state ~= 'hunkskip' then
-    warning(format("patch file incomplete - %s", filename))
+    warning(string.format("patch file incomplete - %s", filename))
     all_ok = false
     -- os.exit(?)
   else
     -- duplicated message when an eof is reached
     if debugmode and #files.source > 0 then
-      debug(format("- %2d hunks for %s", #files.hunks[nextfileno],
+      debug(string.format("- %2d hunks for %s", #files.hunks[nextfileno],
                    files.source[nextfileno]))
     end
   end
 
   local sum = 0; for _,hset in ipairs(files.hunks) do sum = sum + #hset end
-  info(format("total files: %d  total hunks: %d", #files.source, sum))
+  info(string.format("total files: %d  total hunks: %d", #files.source, sum))
   fp:close()
   return files, all_ok
 end
 
-local function find_hunk(file, h, hno)
+local function find_hunk(file: {string}, h: Hunk, hno: number): boolean
   for fuzz=0,2 do
     local lineno = h.startsrc
     for i=0,#file do
@@ -400,7 +403,7 @@ local function find_hunk(file, h, hno)
         if l > fuzz then
           -- todo: \ No newline at the end of file
           if startswith(hline, " ") or startswith(hline, "-") then
-            local line = file[lineno]
+            local line = file[lineno as integer] --! cast
             lineno = lineno + 1
             if not line or #line == 0 then
               found = false
@@ -416,7 +419,7 @@ local function find_hunk(file, h, hno)
       if found then
         local offset = location - h.startsrc - fuzz
         if offset ~= 0 then
-          warning(format("Hunk %d found at offset %d%s...", hno, offset, fuzz == 0 and "" or format(" (fuzz %d)", fuzz)))
+          warning(string.format("Hunk %d found at offset %d%s...", hno, offset, fuzz == 0 and "" or string.format(" (fuzz %d)", fuzz)))
         end
         h.startsrc = location
         h.starttgt = h.starttgt + offset
@@ -432,8 +435,8 @@ local function find_hunk(file, h, hno)
   return false
 end
 
-local function load_file(filename)
-  local fp = assert(io.open(filename))
+local function load_file(filename: string): {string}
+  local fp = assert(io.open(filename) as (FILE, string)) --! cast
   local file = {}
   local readline = file_lines(fp)
   while true do
@@ -445,15 +448,15 @@ local function load_file(filename)
   return file
 end
 
-local function find_hunks(file, hunks)
+local function find_hunks(file: {string}, hunks: {Hunk})
   for hno, h in ipairs(hunks) do
     find_hunk(file, h, hno)
   end
 end
 
-local function check_patched(file, hunks)
-  local lineno = 1
-  local ok, err = pcall(function()
+local function check_patched(file: {string}, hunks: {Hunk}): boolean
+  local lineno: integer = 1
+  local ok, err: boolean, string = pcall(function()
     if #file == 0 then
       error('nomatch', 0)
     end
@@ -462,7 +465,7 @@ local function check_patched(file, hunks)
       if #file < h.starttgt then
         error('nomatch', 0)
       end
-      lineno = h.starttgt
+      lineno = h.starttgt as integer --! cast
       for _, hline in ipairs(h.text) do
         -- todo: \ No newline at the end of file
         if not startswith(hline, "-") and not startswith(hline, "\\") then
@@ -472,7 +475,7 @@ local function check_patched(file, hunks)
             error('nomatch', 0)
           end
           if endlstrip(line) ~= endlstrip(hline:sub(2)) then
-            warning(format("file is not patched - failed hunk: %d", hno))
+            warning(string.format("file is not patched - failed hunk: %d", hno))
             error('nomatch', 0)
           end
         end
@@ -483,9 +486,9 @@ local function check_patched(file, hunks)
   return err ~= 'nomatch'
 end
 
-local function patch_hunks(srcname, tgtname, hunks)
-  local src = assert(io.open(srcname, "rb"))
-  local tgt = assert(io.open(tgtname, "wb"))
+local function patch_hunks(srcname: string, tgtname: string, hunks: {Hunk}): boolean
+  local src = assert(io.open(srcname, "rb") as (FILE, string)) --! cast
+  local tgt = assert(io.open(tgtname, "wb") as (FILE, string)) --! cast
 
   local src_readline = file_lines(src)
 
@@ -498,7 +501,7 @@ local function patch_hunks(srcname, tgtname, hunks)
   local srclineno = 1
   local lineends = {['\n']=0, ['\r\n']=0, ['\r']=0}
   for hno, h in ipairs(hunks) do
-    debug(format("processing hunk %d for file %s", hno, tgtname))
+    debug(string.format("processing hunk %d for file %s", hno, tgtname))
     -- skip to line just before hunk starts
     while srclineno < h.startsrc do
       local line = src_readline()
@@ -527,10 +530,10 @@ local function patch_hunks(srcname, tgtname, hunks)
         local line2write = hline:sub(2)
         -- detect if line ends are consistent in source file
         local sum = 0
-        for _,v in pairs(lineends) do if v > 0 then sum=sum+1 end end
+        for _,v in pairs(lineends as {string:any}) do if v as integer > 0 then sum=sum+1 end end --! unchecked
         if sum == 1 then
-          local newline
-          for k,v in pairs(lineends) do if v ~= 0 then newline = k end end
+          local newline: string
+          for k,v in pairs(lineends as {string:any}) do if v ~= 0 then newline = k end end
           tgt:write(endlstrip(line2write) .. newline)
         else -- newlines are mixed or unknown
           tgt:write(line2write)
@@ -546,7 +549,7 @@ local function patch_hunks(srcname, tgtname, hunks)
   return true
 end
 
-local function strip_dirs(filename, strip)
+local function strip_dirs(filename: string, strip: integer): string
   if strip == nil then return filename end
   for _=1,strip do
     filename=filename:gsub("^[^/]*/", "")
@@ -554,7 +557,7 @@ local function strip_dirs(filename, strip)
   return filename
 end
 
-local function write_new_file(filename, hunk)
+local function write_new_file(filename: string, hunk: Hunk): boolean, string
   local fh = io.open(filename, "wb")
   if not fh then return false end
   for _, hline in ipairs(hunk.text) do
@@ -568,12 +571,12 @@ local function write_new_file(filename, hunk)
   return true
 end
 
-local function patch_file(source, target, epoch, hunks, strip, create_delete)
+local function patch_file(source: string, target: string, epoch: boolean, hunks: {Hunk}, strip: integer, create_delete: boolean): boolean, string
   local create_file = false
   if create_delete then
     local is_src_epoch = epoch and #hunks == 1 and hunks[1].startsrc == 0 and hunks[1].linessrc == 0
     if is_src_epoch or source == "/dev/null" then
-      info(format("will create %s", target))
+      info(string.format("will create %s", target))
       create_file = true
     end
   end
@@ -586,13 +589,14 @@ local function patch_file(source, target, epoch, hunks, strip, create_delete)
     f2patch = strip_dirs(target, strip)
     f2patch = fs.absolute_name(f2patch)
     if not exists(f2patch) then  --FIX:if f2patch nil
-      warning(format("source/target file does not exist\n--- %s\n+++ %s",
+      warning(string.format("source/target file does not exist\n--- %s\n+++ %s",
               source, f2patch))
       return false
     end
   end
-  if not isfile(f2patch) then
-    warning(format("not a file - %s", f2patch))
+  -- if not isfile(f2patch) then --!
+  if not isfile() then --!
+    warning(string.format("not a file - %s", f2patch))
     return false
   end
 
@@ -605,7 +609,7 @@ local function patch_file(source, target, epoch, hunks, strip, create_delete)
   local hunkfind = {}
   local validhunks = 0
   local canpatch = false
-  local hunklineno
+  local hunklineno: integer
   if not file then
     return nil, "failed reading file " .. source
   end
@@ -616,14 +620,14 @@ local function patch_file(source, target, epoch, hunks, strip, create_delete)
       if not ok then
         return false
       end
-      info(format("successfully removed %s", source))
+      info(string.format("successfully removed %s", source))
       return true
     end
   end
 
   find_hunks(file, hunks)
 
-  local function process_line(line, lineno)
+  local function process_line(line: string, lineno: number): boolean
     if not hunk or lineno < hunk.startsrc then
       return false
     end
@@ -643,7 +647,7 @@ local function patch_file(source, target, epoch, hunks, strip, create_delete)
       if endlstrip(line) == hunkfind[hunklineno] then
         hunklineno = hunklineno + 1
       else
-        debug(format("hunk no.%d doesn't match source file %s",
+        debug(string.format("hunk no.%d doesn't match source file %s",
                      hunkno, source))
         -- file may be already patched, but check other hunks anyway
         hunkno = hunkno + 1
@@ -657,7 +661,7 @@ local function patch_file(source, target, epoch, hunks, strip, create_delete)
     end
     -- check if processed line is the last line
     if lineno == hunk.startsrc + #hunkfind - 1 then
-      debug(format("file %s hunk no.%d -- is ready to be patched",
+      debug(string.format("file %s hunk no.%d -- is ready to be patched",
                    source, hunkno))
       hunkno = hunkno + 1
       validhunks = validhunks + 1
@@ -683,16 +687,16 @@ local function patch_file(source, target, epoch, hunks, strip, create_delete)
   end
   if not done then
     if hunkno <= #hunks and not create_file then
-      warning(format("premature end of source file %s at hunk %d",
+      warning(string.format("premature end of source file %s at hunk %d",
                      source, hunkno))
       return false
     end
   end
   if validhunks < #hunks then
     if check_patched(file, hunks) then
-      warning(format("already patched  %s", source))
+      warning(string.format("already patched  %s", source))
     elseif not create_file then
-      warning(format("source file is different - %s", source))
+      warning(string.format("source file is different - %s", source))
       return false
     end
   end
@@ -701,30 +705,30 @@ local function patch_file(source, target, epoch, hunks, strip, create_delete)
   end
   local backupname = source .. ".orig"
   if exists(backupname) then
-    warning(format("can't backup original file to %s - aborting",
+    warning(string.format("can't backup original file to %s - aborting",
                    backupname))
     return false
   end
   local ok = os.rename(source, backupname)
   if not ok then
-    warning(format("failed backing up %s when patching", source))
+    warning(string.format("failed backing up %s when patching", source))
     return false
   end
   patch_hunks(backupname, source, hunks)
-  info(format("successfully patched %s", source))
+  info(string.format("successfully patched %s", source))
   os.remove(backupname)
   return true
 end
 
-function patch.apply_patch(the_patch, strip, create_delete)
+function patch.apply_patch(the_patch: Files, strip: integer, create_delete: boolean): boolean
   local all_ok = true
   local total = #the_patch.source
   for fileno, source in ipairs(the_patch.source) do
     local target = the_patch.target[fileno]
     local hunks = the_patch.hunks[fileno]
     local epoch = the_patch.epoch[fileno]
-    info(format("processing %d/%d:\t %s", fileno, total, source))
-    local ok = patch_file(source, target, epoch, hunks, strip, create_delete)
+    info(string.format("processing %d/%d:\t %s", fileno, total, source))
+    local ok = patch_file(tostring(source), tostring(target), epoch, hunks, strip, create_delete)
     all_ok = all_ok and ok
   end
   -- todo: check for premature eof