[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/9] decodetree: Tidy error_with_file
From: |
Richard Henderson |
Subject: |
[PULL 1/9] decodetree: Tidy error_with_file |
Date: |
Tue, 9 Jun 2020 09:24:56 -0700 |
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
- [PULL 0/9] decodetree: Add non-overlapping groups, Richard Henderson, 2020/06/09
- [PULL 2/9] decodetree: Rename MultiPattern to IncMultiPattern, Richard Henderson, 2020/06/09
- [PULL 1/9] decodetree: Tidy error_with_file,
Richard Henderson <=
- [PULL 3/9] decodetree: Split out MultiPattern from IncMultiPattern, Richard Henderson, 2020/06/09
- [PULL 4/9] decodetree: Allow group covering the entire insn space, Richard Henderson, 2020/06/09
- [PULL 6/9] decodetree: Implement non-overlapping groups, Richard Henderson, 2020/06/09
- [PULL 5/9] decodetree: Move semantic propagation into classes, Richard Henderson, 2020/06/09
- [PULL 8/9] decodetree: Drop check for less than 2 patterns in a group, Richard Henderson, 2020/06/09
- [PULL 7/9] tests/decode: Test non-overlapping groups, Richard Henderson, 2020/06/09
- [PULL 9/9] target/arm: Use a non-overlapping group for misc control, Richard Henderson, 2020/06/09
- Re: [PULL 0/9] decodetree: Add non-overlapping groups, Peter Maydell, 2020/06/11