Module Name: src
Committed By: rillig
Date: Sun Jun 13 19:41:12 UTC 2021
Modified Files:
src/tests/lib/libcurses/slave: lint.lua
Log Message:
tests/libcurses: improve code locality in linter
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libcurses/slave/lint.lua
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libcurses/slave/lint.lua
diff -u src/tests/lib/libcurses/slave/lint.lua:1.4 src/tests/lib/libcurses/slave/lint.lua:1.5
--- src/tests/lib/libcurses/slave/lint.lua:1.4 Sun Jun 13 19:25:08 2021
+++ src/tests/lib/libcurses/slave/lint.lua Sun Jun 13 19:41:12 2021
@@ -1,5 +1,5 @@
#! /usr/bin/lua
--- $NetBSD: lint.lua,v 1.4 2021/06/13 19:25:08 rillig Exp $
+-- $NetBSD: lint.lua,v 1.5 2021/06/13 19:41:12 rillig Exp $
--[[
@@ -53,29 +53,27 @@ local function check_args(errors)
for lineno, line in ipairs(lines) do
- local line_argc = num(line:match("^\tARGC%((%d)"))
- local line_arg = line:match("^\tARG_[%w_]+%(")
-
+ local line_argc = num(line:match("^\tARGC%((%d+)"))
if line_argc and line_argc > 0 then
curr_argc, curr_arg = line_argc, 0
+ goto next
end
- if line_arg and not curr_arg then
- errors:add("%s:%d: ARG without preceding ARGC", fname, lineno)
- end
-
- if not line_arg and curr_arg and not line_argc then
- errors:add("%s:%d: expecting ARG %d, got %s",
- fname, lineno, curr_arg, line)
- curr_argc, curr_arg = nil, nil
- end
-
+ local line_arg = line:match("^\tARG_[%w_]+%(")
if line_arg and curr_arg then
curr_arg = curr_arg + 1
if curr_arg == curr_argc then
curr_argc, curr_arg = nil, nil
end
+ elseif line_arg then
+ errors:add("%s:%d: ARG without preceding ARGC", fname, lineno)
+ elseif curr_arg then
+ errors:add("%s:%d: expecting ARG %d, got %s",
+ fname, lineno, curr_arg, line)
+ curr_argc, curr_arg = nil, nil
end
+
+ ::next::
end
end
