From e7b1ffbd4c22f66031eef045609c02435691bc21 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Mon, 15 Mar 2021 23:42:10 -0400 Subject: [PATCH] [uorb_graph][fix] broadens regex for ambiguous subscription arrays MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Beat Küng --- Tools/uorb_graph/create.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/uorb_graph/create.py b/Tools/uorb_graph/create.py index 5e20ba4565..f3cf18acd4 100755 --- a/Tools/uorb_graph/create.py +++ b/Tools/uorb_graph/create.py @@ -269,7 +269,7 @@ class Graph(object): # note: the source-file-string is pre-processed to remove whitespace -- regexes should ignore whitespace # note: the regexes should have at least 3 capture groups '()'; otherwise they break downstream code capture_cases_ambiguous = [ r"orb_copy\s*\(\s*(ORB_ID)\s*\(\s*(\w+)", - r"(?:uORB::)Subscription\s+\w+\s*(\[)\s*\w+\s*\]()", + r"(?:uORB::)Subscription[^\s]*\s+\w+\s*(\[)\s*\w+\s*\]()", r"(ORB_ID)\s*\(\s*(\w+)", ] self._ambiguities = Ambiguities( self._topic_blacklist, capture_cases_ambiguous)