Fix doxygen "too many nodes" filter

The "too many nodes" warnings were previously filtered out by the python
file. However the regex in the python before this commit does not match
the exact message from the current version of doxygen. This commit
removes the expected warnings from the list file and makes the python
work as it was previously intended, by fixing the regex to match either
the current or previous warning texts.

Author: thomasspriggs

scripts/expected_doxygen_warnings.txt

@@ -1,15 +0,0 @@
-warning: Include graph for 'goto_instrument_parse_options.cpp' not generated, too many nodes (93), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.
-warning: Included by graph for 'goto_model.h' not generated, too many nodes (95), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.
-warning: Included by graph for 'arith_tools.h' not generated, too many nodes (167), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.
-warning: Included by graph for 'c_types.h' not generated, too many nodes (128), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.
-warning: Included by graph for 'config.h' not generated, too many nodes (79), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.
-warning: Included by graph for 'invariant.h' not generated, too many nodes (172), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.
-warning: Included by graph for 'irep.h' not generated, too many nodes (80), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.
-warning: Included by graph for 'message.h' not generated, too many nodes (97), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.
-warning: Included by graph for 'namespace.h' not generated, too many nodes (88), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.
-warning: Included by graph for 'pointer_expr.h' not generated, too many nodes (122), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.
-warning: Included by graph for 'prefix.h' not generated, too many nodes (63), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.
-warning: Included by graph for 'simplify_expr.h' not generated, too many nodes (67), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.
-warning: Included by graph for 'std_code.h' not generated, too many nodes (71), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.
-warning: Included by graph for 'std_expr.h' not generated, too many nodes (178), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.
-warning: Included by graph for 'symbol_table.h' not generated, too many nodes (71), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.

scripts/filter_expected_warnings.py

@@ -81,8 +81,9 @@ def print_warnings_not_in_other_list(self, other, prefix):
 def ignore_too_many_nodes(all_lines):
     """Filter out lines about graphs with too many nodes."""
     too_many_nodes_expr = re.compile(
-        r'warning: Include(d by)? graph for .* not generated, too many nodes. '
-        + r'Consider increasing DOT_GRAPH_MAX_NODES.')
+        r'warning: Include(d by)? graph for .* not generated, too many '
+        + r'nodes( \(\d+\), threshold is 60)?\. Consider increasing '
+        + r'DOT_GRAPH_MAX_NODES\.')
     return [x for x in all_lines if not too_many_nodes_expr.match(x)]