oasis

commit: adc036f58ed4722f363abebce69223af9059b0ad
parent d921287a261883e205eef33f077cee89027a030b
Author: Michael Forney <mforney@mforney.org>
Date:   Sun, 21 Jun 2020 15:42:14 -0700

Style

Diffstat:
M
ninja.lua
11
+++++------
M
pkg/mpv/gen.lua
8
++++----
M
pkg/python/gen.lua
10
+++++-----

3 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/ninja.lua b/ninja.lua
@@ -11,13 +11,12 @@ function string.hassuffix(s, suffix)
 end
 
 -- collects the results of an iterator into a table
-local function collect(fn, s, i)
-	local results, nresults = {}, 0
-	for val in fn, s, i do
-		nresults = nresults + 1
-		results[nresults] = val
+local function collect(f, s, i)
+	local t = {}
+	for v in f, s, i do
+		t[#t + 1] = v
 	end
-	return results
+	return t
 end
 
 -- collects the keys of a table into a sorted table
diff --git a/pkg/mpv/gen.lua b/pkg/mpv/gen.lua
@@ -113,15 +113,15 @@ do
 	end
 end
 
-local sources = {}
+local srcs = {}
 for line in iterlines('sources.txt', 1) do
 	local i = line:find(' ', 1, true)
 	local add = true
 	if not i or eval(line, i + 1) then
-		sources[line:sub(1, i and i - 1)] = true
+		srcs[line:sub(1, i and i - 1)] = true
 	end
 end
-sources = table.keys(sources)
+srcs = table.keys(srcs)
 
 if options['HAVE_ALSA'] then
 	cflags{'-isystem $builddir/pkg/alsa-lib/include'}
@@ -172,7 +172,7 @@ exe('mpv', {
 	'ta/ta.c',
 	'ta/ta_talloc.c',
 	'ta/ta_utils.c',
-	sources,
+	srcs,
 	expand{'$builddir/pkg/', libs},
 })
 file('bin/mpv', '755', '$outdir/mpv')
diff --git a/pkg/python/gen.lua b/pkg/python/gen.lua
@@ -34,21 +34,21 @@ if modules['zlib'] then
 	table.insert(libs, 'zlib/libz.a')
 end
 
-local sources = {}
+local srcs = {}
 sub('modules.ninja', function()
 	cflags{'-D Py_BUILD_CORE_BUILTIN'}
 
 	for _, mod in pairs(modules) do
 		for _, src in ipairs(mod) do
 			local obj = src..'.o'
-			if not sources[obj] then
+			if not srcs[obj] then
 				cc('Modules/'..src)
-				sources[obj] = true
+				srcs[obj] = true
 			end
 		end
 	end
 end)
-sources = table.keys(sources)
+srcs = table.keys(srcs)
 
 cflags{'-D Py_BUILD_CORE'}
 
@@ -86,7 +86,7 @@ cc('Python/sysmodule.c', nil, {
 	cflags=string.format([[$cflags -D 'ABIFLAGS="%s"']], abiflags),
 })
 
-lib('libpython.a', {expand{'Modules/', sources}, paths[[
+lib('libpython.a', {expand{'Modules/', srcs}, paths[[
 	Modules/(
 		getbuildinfo.c.o
 		getpath.c.o