From: Alfredo Deza Date: Fri, 6 Oct 2017 12:57:01 +0000 (-0400) Subject: doc parse two lines for getting the context X-Git-Tag: v13.0.1~648^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9e2a52ccec4a5c833dd861ae528d52efbc0f9e5f;p=ceph-ci.git doc parse two lines for getting the context So that signatures can get parsed when they are split like: PG::RecoveryState::RepWaitBackfillReserved::react( const RemoteReservationCanceled &evt) Signed-off-by: Alfredo Deza --- diff --git a/doc/scripts/gen_state_diagram.py b/doc/scripts/gen_state_diagram.py index 94c1f03eee5..a7399bb201c 100755 --- a/doc/scripts/gen_state_diagram.py +++ b/doc/scripts/gen_state_diagram.py @@ -84,14 +84,22 @@ class StateMachineRenderer(object): ) def read_input(self, input_lines): + previous_line = None for line in input_lines: self.get_state(line) self.get_event(line) - self.get_context(line) - - def get_context(self, line): - match = re.search(r"(\w+::)*::(?P\w+)::\w+\(const (?P\w+)", - line) + # pass two lines at a time to get the context so that regexes can + # match on split signatures + self.get_context(line, previous_line) + previous_line = line + + def get_context(self, line, previous_line): + match = re.search(r"(\w+::)*::(?P\w+)::\w+\(const (?P\w+)", line) + if match is None and previous_line is not None: + # it is possible that we need to match on the previous line as well, so join + # them to make them one line and try and get this matching + joined_line = ' '.join([previous_line, line]) + match = re.search(r"(\w+::)*::(?P\w+)::\w+\(\s*const (?P\w+)", joined_line) if match is not None: self.context.append((match.group('tag'), self.context_depth, match.group('event'))) if '{' in line: