diff options
| -rw-r--r-- | clang/test/Analysis/exploded-graph-rewriter/node_labels.dot | 17 | ||||
| -rwxr-xr-x | clang/utils/analyzer/exploded-graph-rewriter.py | 29 |
2 files changed, 30 insertions, 16 deletions
diff --git a/clang/test/Analysis/exploded-graph-rewriter/node_labels.dot b/clang/test/Analysis/exploded-graph-rewriter/node_labels.dot index db56c0585c1..b8f69192a6c 100644 --- a/clang/test/Analysis/exploded-graph-rewriter/node_labels.dot +++ b/clang/test/Analysis/exploded-graph-rewriter/node_labels.dot @@ -1,6 +1,11 @@ -// RUN: %exploded_graph_rewriter %s | FileCheck %s -check-prefixes=CHECK,LIGHT -// RUN: %exploded_graph_rewriter %s --dark | FileCheck %s \ -// RUN: -check-prefixes CHECK,DARK +// RUN: %exploded_graph_rewriter %s \ +// RUN: | FileCheck %s -check-prefixes=CHECK,LIGHT,COLOR +// RUN: %exploded_graph_rewriter %s --dark \ +// RUN: | FileCheck %s -check-prefixes CHECK,DARK,COLOR +// RUN: %exploded_graph_rewriter %s --gray \ +// RUN: | FileCheck %s -check-prefixes=CHECK,LIGHT,GRAY +// RUN: %exploded_graph_rewriter %s --gray --dark \ +// RUN: | FileCheck %s -check-prefixes CHECK,DARK,GRAY // FIXME: Substitution doesn't seem to work on Windows. // UNSUPPORTED: system-windows @@ -23,10 +28,12 @@ Node0x1 [shape=record,label= // CHECK: Node0x2 [ // CHECK-SAME: <tr><td> -// CHECK-SAME: <font color="red"><b>Bug Report Attached</b></font> +// COLOR-SAME: <font color="red"><b>Bug Report Attached</b></font> +// GRAY-SAME: <b>Bug Report Attached</b> // CHECK-SAME: </td></tr> // CHECK-SAME: <tr><td> -// CHECK-SAME: <font color="cornflowerblue"><b>Sink Node</b></font> +// COLOR-SAME: <font color="cornflowerblue"><b>Sink Node</b></font> +// GRAY-SAME: <b>Sink Node</b> // CHECK-SAME: </td></tr> Node0x2 [shape=record,label= "{ diff --git a/clang/utils/analyzer/exploded-graph-rewriter.py b/clang/utils/analyzer/exploded-graph-rewriter.py index 0926ba2511e..b78789f0b64 100755 --- a/clang/utils/analyzer/exploded-graph-rewriter.py +++ b/clang/utils/analyzer/exploded-graph-rewriter.py @@ -384,24 +384,28 @@ class ExplodedGraph(object): # A visitor that dumps the ExplodedGraph into a DOT file with fancy HTML-based # syntax highlighing. class DotDumpVisitor(object): - def __init__(self, do_diffs, dark_mode): + def __init__(self, do_diffs, dark_mode, gray_mode): super(DotDumpVisitor, self).__init__() self._do_diffs = do_diffs self._dark_mode = dark_mode + self._gray_mode = gray_mode @staticmethod def _dump_raw(s): print(s, end='') - @staticmethod - def _dump(s): - print(s.replace('&', '&') - .replace('{', '\\{') - .replace('}', '\\}') - .replace('\\<', '<') - .replace('\\>', '>') - .replace('\\l', '<br />') - .replace('|', '\\|'), end='') + def _dump(self, s): + s = s.replace('&', '&') \ + .replace('{', '\\{') \ + .replace('}', '\\}') \ + .replace('\\<', '<') \ + .replace('\\>', '>') \ + .replace('\\l', '<br />') \ + .replace('|', '\\|') + if self._gray_mode: + s = re.sub(r'<font color="[a-z0-9]*">', '', s) + s = re.sub(r'</font>', '', s) + self._dump_raw(s) @staticmethod def _diff_plus_minus(is_added): @@ -835,6 +839,9 @@ def main(): parser.add_argument('--dark', action='store_const', dest='dark', const=True, default=False, help='dark mode') + parser.add_argument('--gray', action='store_const', dest='gray', + const=True, default=False, + help='black-and-white mode') args = parser.parse_args() logging.basicConfig(level=args.loglevel) @@ -845,7 +852,7 @@ def main(): graph.add_raw_line(raw_line) explorer = BasicExplorer() - visitor = DotDumpVisitor(args.diff, args.dark) + visitor = DotDumpVisitor(args.diff, args.dark, args.gray) explorer.explore(graph, visitor) |
