oasis

commit: 481eb203bf31b482514b0befd2126d751b3e9d28
parent 9614d6ff951521d68a37101fb36d477c47819dd7
Author: Michael Forney <mforney@mforney.org>
Date:   Sun, 21 Jun 2020 14:38:52 -0700

Simplify object collection slightly

Diffstat:
M
ninja.lua
13
++++++-------

1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/ninja.lua b/ninja.lua
@@ -304,18 +304,16 @@ function objects(srcs, deps)
 end
 
 function link(out, files, args)
-	local objs, nobjs = {}, 0
-	local deps, ndeps = {}, 0
+	local objs = {}
+	local deps = {}
 	for _, file in ipairs(files) do
 		if not file:hasprefix('$') then
 			file = '$outdir/'..file
 		end
 		if file:hassuffix('.d') then
-			ndeps = ndeps + 1
-			deps[ndeps] = file
+			deps[#deps + 1] = file
 		else
-			nobjs = nobjs + 1
-			objs[nobjs] = file
+			objs[#objs + 1] = file
 		end
 	end
 	out = '$outdir/'..out
@@ -325,7 +323,8 @@ function link(out, files, args)
 	if next(deps) then
 		local rsp = out..'.rsp'
 		build('awk', rsp, {deps, '|', '$basedir/scripts/rsp.awk'}, {expr='-f $basedir/scripts/rsp.awk'})
-		objs = {objs, '|', rsp}
+		objs[#objs + 1] = '|'
+		objs[#objs + 1] = rsp
 		args.ldlibs = '@'..rsp
 	end
 	build('link', out, objs, args)