Fix unused vars etc. in internal Lua files.

Thanks to François Perrad.

diff --git a/src/host/genminilua.lua b/src/host/genminilua.lua
index e9a68297bbf21f2a242c239f2db3f6718078acbd..16a81a232ba3fd7acc01099389611cc159808295 100644 (file)
--- a/src/host/genminilua.lua
+++ b/src/host/genminilua.lua
@@ -157,11 +157,11 @@ local function merge_includes(src)
     if includes[name] then return "" end
     includes[name] = true
     local fp = assert(io.open(LUA_SOURCE..name, "r"))
-    local src = fp:read("*a")
+    local inc = fp:read("*a")
     assert(fp:close())
-    src = gsub(src, "#ifndef%s+%w+_h\n#define%s+%w+_h\n", "")
-    src = gsub(src, "#endif%s*$", "")
-    return merge_includes(src)
+    inc = gsub(inc, "#ifndef%s+%w+_h\n#define%s+%w+_h\n", "")
+    inc = gsub(inc, "#endif%s*$", "")
+    return merge_includes(inc)
   end)
 end
 

diff --git a/src/jit/dis_arm.lua b/src/jit/dis_arm.lua
index 661f661a948fe292ac2d856b8f987195734d8aa3..8ad902cd2a8ca325e35a743cce28bf15e8ca86a4 100644 (file)
--- a/src/jit/dis_arm.lua
+++ b/src/jit/dis_arm.lua
@@ -12,7 +12,7 @@
 
 local type = type
 local sub, byte, format = string.sub, string.byte, string.format
-local match, gmatch, gsub = string.match, string.gmatch, string.gsub
+local match, gmatch = string.match, string.gmatch
 local concat = table.concat
 local bit = require("bit")
 local band, bor, ror, tohex = bit.band, bit.bor, bit.ror, bit.tohex

diff --git a/src/jit/dis_mips.lua b/src/jit/dis_mips.lua
index 5b68b06974155568a5a4b5f538db56f22917669a..fe9cadb89f446d7af804e3625e071b42d45e217e 100644 (file)
--- a/src/jit/dis_mips.lua
+++ b/src/jit/dis_mips.lua
@@ -11,8 +11,8 @@
 ------------------------------------------------------------------------------
 
 local type = type
-local sub, byte, format = string.sub, string.byte, string.format
-local match, gmatch, gsub = string.match, string.gmatch, string.gsub
+local byte, format = string.byte, string.format
+local match, gmatch = string.match, string.gmatch
 local concat = table.concat
 local bit = require("bit")
 local band, bor, tohex = bit.band, bit.bor, bit.tohex

diff --git a/src/jit/dis_ppc.lua b/src/jit/dis_ppc.lua
index 8afecbe61800e69a1546f782888db9c3af2a9481..1a98c7ec6171565455952bb9cadd851aed591f13 100644 (file)
--- a/src/jit/dis_ppc.lua
+++ b/src/jit/dis_ppc.lua
@@ -13,7 +13,7 @@
 ------------------------------------------------------------------------------
 
 local type = type
-local sub, byte, format = string.sub, string.byte, string.format
+local byte, format = string.byte, string.format
 local match, gmatch, gsub = string.match, string.gmatch, string.gsub
 local concat = table.concat
 local bit = require("bit")

diff --git a/src/jit/dump.lua b/src/jit/dump.lua
index ec5f82761da2644599e02b5d7d050705f44fc84e..7b776422ec83aa2d9f91607b9036451c3c056043 100644 (file)
--- a/src/jit/dump.lua
+++ b/src/jit/dump.lua
@@ -63,9 +63,9 @@ local traceinfo, traceir, tracek = jutil.traceinfo, jutil.traceir, jutil.tracek
 local tracemc, tracesnap = jutil.tracemc, jutil.tracesnap
 local traceexitstub, ircalladdr = jutil.traceexitstub, jutil.ircalladdr
 local bit = require("bit")
-local band, shl, shr = bit.band, bit.lshift, bit.rshift
+local band, shr = bit.band, bit.rshift
 local sub, gsub, format = string.sub, string.gsub, string.format
-local byte, char, rep = string.byte, string.char, string.rep
+local byte, rep = string.byte, string.rep
 local type, tostring = type, tostring
 local stdout, stderr = io.stdout, io.stderr
 
@@ -207,7 +207,7 @@ local colortype_ansi = {
   "\027[35m%s\027[m",
 }
 
-local function colorize_text(s, t)
+local function colorize_text(s)
   return s
 end