Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tools: param_parse.py: correct extraction of enum class in nested classes 

It was putting AP_HAL::AnalogIn::PowerStatusFlag in AP_HAL::AnalogIn
This commit is contained in:
Peter Barker 2024-02-02 14:25:57 +11:00 committed by Andrew Tridgell
parent 857547ba55
commit ecae3a462c
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Tools/autotest/logger_metadata/enum_parse.py
View File

@ -92,6 +92,10 @@ class EnumDocco(object):
raise ValueError("Failed to match (%s)" % line)
def enumerations_from_file(self, source_file):
def debug(x):
pass
# if source_file == "/home/pbarker/rc/ardupilot/libraries/AP_HAL/AnalogIn.h":
# debug = print
state_outside = "outside"
state_inside = "inside"
@ -103,6 +107,7 @@ class EnumDocco(object):
in_class = None
while True:
line = f.readline()
# debug(f"{state} line: {line}")
if line == "":
break
line = line.rstrip()
@ -113,7 +118,7 @@ class EnumDocco(object):
if re.match("class .*;", line) is not None:
# forward-declaration of a class
continue
m = re.match("class *(\w+)", line)
m = re.match("class *([:\w]+)", line)
if m is not None:
in_class = m.group(1)
continue
@ -125,6 +130,7 @@ class EnumDocco(object):
if m is not None:
# all one one line! Thanks!
enum_name = m.group(2)
debug("ol: %s: %s" % (source_file, enum_name))
entries_string = m.group(3)
entry_names = [x.strip() for x in entries_string.split(",")]
count = 0
@ -139,7 +145,7 @@ class EnumDocco(object):
m = re.match(".*enum\s*(class)? *([\w]+)\s*(?::.*_t)? *{", line)
if m is not None:
enum_name = m.group(2)
# print("%s: %s" % (source_file, enum_name))
debug("%s: %s" % (source_file, enum_name))
entries = []
last_value = None
state = state_inside
@ -172,7 +178,7 @@ class EnumDocco(object):
if name is None:
skip_enumeration = True
continue
# print(" name=(%s) value=(%s) comment=(%s)\n" % (name, value, comment))
debug(" name=(%s) value=(%s) comment=(%s)\n" % (name, value, comment))
if value is None:
if last_value is None:
value = 0
@ -190,6 +196,7 @@ class EnumDocco(object):
class Enumeration(object):
def __init__(self, name, entries):
# print("creating enum %s" % name)
self.name = name
self.entries = entries
@ -246,4 +253,4 @@ if __name__ == '__main__':
sys.exit(1)
s.run()
print("Enumerations: %s" % s.enumerations)
# print("Enumerations: %s" % s.enumerations)

7
Tools/autotest/logger_metadata/parse.py
View File

@ -325,15 +325,20 @@ class LoggerDocco(object):
def parse_file(self, filepath):
with open(filepath) as f:
# print("Opened (%s)" % filepath)
# print("Opened (%s)" % filepath)
lines = f.readlines()
f.close()
def debug(x):
pass
# if filepath == "/home/pbarker/rc/ardupilot/libraries/AP_HAL/AnalogIn.h":
# debug = print
state_outside = "outside"
state_inside = "inside"
messagedef = ""
state = state_outside
docco = None
for line in lines:
debug(f"{state}: {line}")
if messagedef:
messagedef = messagedef + line
if "}" in line or ";" in line: