From 098a53e318003e40499bdcfc6f6de81a13fb3b2b Mon Sep 17 00:00:00 2001 From: Simon Hancock Date: Wed, 17 Jan 2024 13:49:50 +0000 Subject: [PATCH] Tools: Updates to log message units and help text parse.py: Remove lone bullet points rendered on replay messages enum_parse.py: Tweak regex on enum parser to handle comments like: "FRED = 10, ///< text" --- Tools/autotest/logger_metadata/emit_rst.py | 3 ++- Tools/autotest/logger_metadata/enum_parse.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Tools/autotest/logger_metadata/emit_rst.py b/Tools/autotest/logger_metadata/emit_rst.py index 7e513a0cc82f0..dfaa8fea159ce 100644 --- a/Tools/autotest/logger_metadata/emit_rst.py +++ b/Tools/autotest/logger_metadata/emit_rst.py @@ -76,7 +76,8 @@ def emit(self, doccos, enumerations): # Add the new row rows.append([f, ftypeunit, fdesc]) - print(self.tablify(rows), file=self.fh) + if rows: + print(self.tablify(rows), file=self.fh) print("", file=self.fh) self.stop() diff --git a/Tools/autotest/logger_metadata/enum_parse.py b/Tools/autotest/logger_metadata/enum_parse.py index 3826160de2004..81aad8c432648 100755 --- a/Tools/autotest/logger_metadata/enum_parse.py +++ b/Tools/autotest/logger_metadata/enum_parse.py @@ -35,7 +35,7 @@ def match_enum_line(self, line): # attempts to extract name, value and comment from line. # Match: " FRED, // optional comment" - m = re.match("\s*([A-Z0-9_a-z]+)\s*,? *(?:// *(.*) *)?$", line) + m = re.match("\s*([A-Z0-9_a-z]+)\s*,? *(?://[/>]* *(.*) *)?$", line) if m is not None: return (m.group(1), None, m.group(2)) @@ -45,7 +45,7 @@ def match_enum_line(self, line): return (m.group(1), None, m.group(2)) # Match: " FRED = 17, // optional comment" - m = re.match("\s*([A-Z0-9_a-z]+)\s*=\s*([-0-9]+)\s*,?(?:\s*//\s*(.*) *)?$", + m = re.match("\s*([A-Z0-9_a-z]+)\s*=\s*([-0-9]+)\s*,?(?:\s*//[/<]*\s*(.*) *)?$", line) if m is not None: return (m.group(1), m.group(2), m.group(3))