From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org
Subject: [PULL 1/9] decodetree: Tidy error_with_file
Date: Tue, 9 Jun 2020 09:24:56 -0700 [thread overview]
Message-ID: <20200609162504.780080-2-richard.henderson@linaro.org> (raw)
In-Reply-To: <20200609162504.780080-1-richard.henderson@linaro.org>
Use proper varargs to print the arguments.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
scripts/decodetree.py | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/scripts/decodetree.py b/scripts/decodetree.py
index f9d204aa36..b559db3086 100755
--- a/scripts/decodetree.py
+++ b/scripts/decodetree.py
@@ -51,23 +51,27 @@ def error_with_file(file, lineno, *args):
global output_file
global output_fd
+ prefix = ''
+ if file:
+ prefix += '{0}:'.format(file)
if lineno:
- r = '{0}:{1}: error:'.format(file, lineno)
- elif input_file:
- r = '{0}: error:'.format(file)
- else:
- r = 'error:'
- for a in args:
- r += ' ' + str(a)
- r += '\n'
- sys.stderr.write(r)
+ prefix += '{0}:'.format(lineno)
+ if prefix:
+ prefix += ' '
+ print(prefix, end='error: ', file=sys.stderr)
+ print(*args, file=sys.stderr)
+
if output_file and output_fd:
output_fd.close()
os.remove(output_file)
exit(1)
+# end error_with_file
+
def error(lineno, *args):
- error_with_file(input_file, lineno, args)
+ error_with_file(input_file, lineno, *args)
+# end error
+
def output(*args):
global output_fd
--
2.25.1
next prev parent reply other threads:[~2020-06-09 16:26 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-09 16:24 [PULL 0/9] decodetree: Add non-overlapping groups Richard Henderson
2020-06-09 16:24 ` Richard Henderson [this message]
2020-06-09 16:24 ` [PULL 2/9] decodetree: Rename MultiPattern to IncMultiPattern Richard Henderson
2020-06-09 16:24 ` [PULL 3/9] decodetree: Split out MultiPattern from IncMultiPattern Richard Henderson
2020-06-09 16:24 ` [PULL 4/9] decodetree: Allow group covering the entire insn space Richard Henderson
2020-06-09 16:25 ` [PULL 5/9] decodetree: Move semantic propagation into classes Richard Henderson
2020-06-09 16:25 ` [PULL 6/9] decodetree: Implement non-overlapping groups Richard Henderson
2020-06-09 16:25 ` [PULL 7/9] tests/decode: Test " Richard Henderson
2020-06-09 16:25 ` [PULL 8/9] decodetree: Drop check for less than 2 patterns in a group Richard Henderson
2020-06-09 16:25 ` [PULL 9/9] target/arm: Use a non-overlapping group for misc control Richard Henderson
2020-06-11 12:07 ` [PULL 0/9] decodetree: Add non-overlapping groups Peter Maydell
2020-08-01 17:42 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200609162504.780080-2-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).