diff --git a/scripts/README.md b/scripts/README.md
index 373f9f1330840c7cddf9fcf264d92f943c55c33b..4c31935b3af5221551a6682911c5110e6c36c73f 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -1,4 +1,4 @@
-#tsplot
+# tsplot
The `tsplot` script is a wrapper around matplotlib for displaying a collection of
time series plots.
@@ -77,7 +77,8 @@ of the timeseries data.
Use the `-o` or `--output` option to save the plot as an image, instead of
displaying it interactively.
-#profstats
+
+# profstats
`profstats` collects the profiling data output from multiple MPI ranks and performs
a simple statistical summary.
@@ -90,10 +91,222 @@ are reported instead.
Output is in CSV format.
-#PassiveCable.jl
+
+# cc-filter
+
+`cc-filter` is a general purpose line-by-line text processor, with some
+built-in rules for simplifying output comprising templated C++ identifiers.
+
+Full documentation for `cc-filter` can be obtained by running it with the
+`--man` option. The information below has been transcribed from this output.
+
+In the `filter` subdirectory there is a sample table `massif-strip-cxx`
+that will remove the C++ content from the valgrind massif tool output.
+This can be then be used without running the default rules with the following:
+```
+cc-filter -n -t filters/massif-strip-cxx
+```
+
+## Options
+
+#### **-n**, **--no-default-rules**
+
+Omit the built-in rules from the default list.
+
+#### **-N**, **--no-built-ins**
+
+Omit all rule, group, and macro definitions from the default table.
+
+#### **-r**, **--rule=RULE**
+
+Apply the rule or group of rules **RULE**.
+
+#### **-x**, **--exclude=RULE**
+
+Skip the application of the rule or group of rules **RULE**.
+
+#### **-t**, **--table=FILE**
+
+Add the macro, rule and table definitions in **FILE**.
+
+#### **-d**, **--define=DEF**
+
+Add an explicit definition.
+
+#### **-l**, **--list\[=CAT\]**
+
+By default, list the applicable rules and definitions. If **CAT** is
+`expand`, expand any macros in the definitions. If **CAT** is
+`group`, list the group definitions. If **CAT** is `macro`, list the
+macro definitions.
+
+#### **-h**, **--help**
+
+Print help summary and exit.
+
+#### **--man**
+
+Print the full documentation as a man page.
+
+## Description
+
+Rules are applied sequentially to each line of the input files in turn.
+The rules are taken from the built-in list, and from any rules defined
+in tables supplied by the `--table` option. If the table file is not an
+absolute path, it is looked for first in the current directory, and then
+relative to the directory in which `cc-filter` resides.
+
+The default list of rules comprises all the rules specified in the
+built-in list any supplied table, however no default list is used if a
+rules are specifically requested with the `--rule` option. The built-in
+rules are omitted from the default list if the `--no-default` option is
+given. Rules can be explicitly omitted with the `--exclude` option.
+
+Each line has any terminal newline stripped before processing, and then
+is subjected to each rule's action in turn via `$_`. If a rule introduces a
+newline character, the string is not split for processing by subsequent rules.
+(This is a limitation that may be addressed in the future.) If a rule
+sets `$_` to `undef`, the line is skipped and processing starts anew with
+the next input line.
+
+Tables can include groups of rules for ease of inclusion or omission
+with the `--rule` or `--exclude` options.
+
+For details on the table format and example tables, refer to the full
+documentation provided by `cc-filter --man`.
+
+## Example usage
+
+The rules applied by default can be listed with `cc-filter --list`, e.g.
+
+```
+$ cc-filter --list
+cxx:rm-allocator s/(?:,\s*)?%cxx:qualified%?allocator%cxx:template-args%//g
+cxx:rm-delete s/(?:,\s*)?%cxx:qualified%?default_delete%cxx:template-args%//g
+cxx:rm-std s/%cxx:std-ns%//g
+cxx:rm-std s/%cxx:gnu-internal-ns%//g
+cxx:rm-template-space s/%cxx:template-args%/$1=~s| *([<>]) *|\1|rg/eg
+cxx:unsigned-int s/\bunsigned\s+int\b/unsigned/g
+cxx:strip-qualified s/%cxx:qualified%//g
+cxx:strip-args s/(%cxx:identifier%%cxx:template-args%?)%cxx:paren-args%/$1(...)/g
+```
+
+These actions are as follows:
+
+* Remove `allocator<...>` entries from template argument lists (`cxx:rm-allocator`).
+
+* Remove `default_delete<...>` entries from template argument lists (`cxx:rm-delete`).
+
+* Remove `std::` qualifiers (`cxx:rm-std`).
+
+* Remove `__gnu_cxx::` qualifiers (`cxx:rm-std`).
+
+* Collapse spaces between template brackets (`cxx:rm-template-space`).
+
+* Replace occurances of `unsigned int` with `unsigned` (`cxx:unsigned-int`).
+
+* Strip all class or namespace qualifers (`cxx:strip-qualified`).
+
+* Replace argument lists of (regularly named) functions with `(...)` (`cxx:strip-args`).
+
+The rules are grouped, however, so the more invasive transformations can be
+straightforwardly enabled or disabled. The defined groups are listed with
+`cc-filter --list=group`:
+
+```
+cxx:tidy cxx:rm-template-space cxx:unsigned-int
+cxx:strip-all cxx:strip-qualified cxx:strip-args
+cxx:std-simplify cxx:rm-allocator cxx:rm-delete cxx:rm-std
+```
+
+`cc-filter --rule ccx:tidy` would perform only the space and `unsigned` transformations.
+`cc-filter --exclude ccx:strip-all` would leave arguments and non-standard namespace and class
+qualifications intact while applying the other transformations.
+
+One can see in the rule list the use of some in-built macros, such as `%cxx:template-args%`. These
+macro definitions can be listed with `cc-filter --list=macro`:
+
+```
+$ cc-filter --list=macro
+cxx:std-ns (?:(::)?\bstd::)
+cxx:identifier (\b[_\pL][_\pL\p{Nd}]*)
+cxx:gnu-internal-ns (?:(::)?\b__gnu_cxx::)
+cxx:template-args (<(?:(?>[^<>]+)|(?-1))*>)
+cxx:qualified (?:(::)?\b(\w+::)+)
+cxx:paren-args (\((?:(?>[^()]+)|(?-1))*\))
+```
+
+Rule definitions with macros expanded can be displayed with `--list=expand`, e.g.
+
+```
+$ cc-filter --rule cxx:rm-std --list=expand
+cxx:rm-std s/(?:(::)?\bstd::)//g
+cxx:rm-std s/(?:(::)?\b__gnu_cxx::)//g
+```
+
+### Built-in rules in action
+
+Consider the following error message generated by g++ (some of the middle lines and the full paths to gcc headers have been elided):
+
+```
+In file included from /.../g++/vector:62:0,
+ from badvec.cc:1:
+/.../g++/bits/stl_construct.h: In instantiation of 'void std::_Construct(_T1*, _Args&& ...) [with _T1 = long_namespace::bad; _Args = {const long_namespace::bad&}]':
+/.../g++/bits/stl_uninitialized.h:75:18: required from 'static _ForwardIterator std::__uninitialized_copy<_TrivialValueTypes>::__uninit_copy(_InputIterator, _InputIterator, _ForwardIterator) [with _InputIterator = const long_namespace::bad*; _ForwardIterator = long_namespace::bad*; bool _TrivialValueTypes = false]'
+[...]
+/.../g++/bits/stl_vector.h:379:2: required from 'std::vector<_Tp, _Alloc>::vector(std::initializer_list<_Tp>, const allocator_type&) [with _Tp = long_namespace::bad; _Alloc = std::allocator<long_namespace::bad>; std::vector<_Tp, _Alloc>::allocator_type = std::allocator<long_namespace::bad>]'
+badvec.cc:10:48: required from here
+/.../g++/bits/stl_construct.h:75:7: error: use of deleted function 'long_namespace::bad::bad(const long_namespace::bad&)'
+ { ::new(static_cast<void*>(__p)) _T1(std::forward<_Args>(__args)...); }
+ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+badvec.cc:6:5: note: declared here
+ bad(const bad&) = delete;
+ ^~~
+```
+
+Running this message through `cc-filter`:
+
+
+```
+In file included from /.../g++/vector:62:0,
+ from badvec.cc:1:
+/.../g++/bits/stl_construct.h: In instantiation of 'void _Construct(...) [with _T1 = bad; _Args = {const bad&}]':
+/.../g++/bits/stl_uninitialized.h:75:18: required from 'static _ForwardIterator __uninitialized_copy<_TrivialValueTypes>::__uninit_copy(...) [with _InputIterator = const bad*; _ForwardIterator = bad*; bool _TrivialValueTypes = false]'
+[...]
+/.../g++/bits/stl_vector.h:379:2: required from 'vector<_Tp, _Alloc>::vector(...) [with _Tp = bad; _Alloc = ; vector<_Tp, _Alloc>::allocator_type = ]'
+badvec.cc:10:48: required from here
+/.../g++/bits/stl_construct.h:75:7: error: use of deleted function 'bad(...)'
+ { ::new(...) _T1(...); }
+ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+badvec.cc:6:5: note: declared here
+ bad(...) = delete;
+ ^~~
+```
+
+If we wanted to retain the function call arguments, run with `cc-filter --exclude ccx:strip-args`:
+
+
+```
+In file included from /.../g++/vector:62:0,
+ from badvec.cc:1:
+/.../g++/bits/stl_construct.h: In instantiation of 'void _Construct(_T1*, _Args&& ...) [with _T1 = bad; _Args = {const bad&}]':
+/.../g++/bits/stl_uninitialized.h:75:18: required from 'static _ForwardIterator __uninitialized_copy<_TrivialValueTypes>::__uninit_copy(_InputIterator, _InputIterator, _ForwardIterator) [with _InputIterator = const bad*; _ForwardIterator = bad*; bool _TrivialValueTypes = false]'
+[...]
+/.../g++/bits/stl_vector.h:379:2: required from 'vector<_Tp, _Alloc>::vector(initializer_list<_Tp>, const allocator_type&) [with _Tp = bad; _Alloc = ; vector<_Tp, _Alloc>::allocator_type = ]'
+badvec.cc:10:48: required from here
+/.../g++/bits/stl_construct.h:75:7: error: use of deleted function 'bad(const bad&)'
+ { ::new(static_cast<void*>(__p)) _T1(forward<_Args>(__args)...); }
+ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+badvec.cc:6:5: note: declared here
+ bad(const bad&) = delete;
+ ^~~
+```
+
+
+# PassiveCable.jl
Compute analytic solutions to the simple passive cylindrical dendrite cable
-model with step current injection at one end from t=0.
+model with step current injection at one end from _t_ = 0.
This is used to generate validation data for the first Rallpack test.
diff --git a/scripts/cc-filter b/scripts/cc-filter
new file mode 100755
index 0000000000000000000000000000000000000000..e406b1091fb30bbcc6dd8955ae6fc01da7df5fcc
--- /dev/null
+++ b/scripts/cc-filter
@@ -0,0 +1,428 @@
+#!/usr/bin/env perl
+
+use warnings;
+use strict;
+use 5.014;
+
+=pod
+
+=head1 NAME
+
+cc-filter - Filter lines according to rule set
+
+=head1 SYNOPSIS
+
+cc-filter [OPTION]... [FILE]...
+
+Filter FILEs or standard input by a sequence of rules.
+Built-in rules simplify C++ function and template expressions.
+
+=head1 OPTIONS
+
+=over 20
+
+=item B<-n>, B<--no-default-rules>
+
+Omit the built-in rules from the default list.
+
+=item B<-N>, B<--no-built-ins>
+
+Omit all rule, group, and macro definitions from the default table.
+
+=item B<-r>, B<--rule=RULE>
+
+Apply the rule or group of rules B<RULE>.
+
+=item B<-x>, B<--exclude=RULE>
+
+Skip the application of the rule or group of rules B<RULE>.
+
+=item B<-t>, B<--table=FILE>
+
+Add the macro, rule and table definitions in B<FILE>.
+
+=item B<-d>, B<--define=DEF>
+
+Add an explicit definition.
+
+=item B<-l>, B<--list[=CAT]>
+
+By default, list the applicable rules and definitions.
+If B<CAT> is C<expand>, expand any macros in the definitions.
+If B<CAT> is C<group>, list the group definitions.
+If B<CAT> is C<macro>, list the macro definitions.
+
+=item B<-h>, B<--help>
+
+Print help summary and exit.
+
+=item B<--man>
+
+Print the full documentation as a man page.
+
+=back
+
+=head1 DESCRIPTION
+
+Rules are applied sequentially to each line of the input files in turn. The
+rules are taken from the built-in list, and from any rules defined in tables
+supplied by the C<--table> option. If the table file is not an absolute
+path, it is looked for first in the current directory, and then relative
+to the directory in which C<cc-filter> resides.
+
+The default list of rules comprises all the rules specified in the built-in
+list any supplied table, however no default list is used if a rules are
+specifically requested with the C<--rule> option. The built-in rules are
+omitted from the default list if the C<--no-default> option is given. Rules can
+be explicitly omitted with the C<--exclude> option.
+
+Each line has any terminal newline stripped before processing, and then
+is subjected to each rule's action in turn via `$_`. If a rule introduces a
+newline character, the string is not split for processing by subsequent rules.
+(This is a limitation that may be addressed in the future.) If a rule
+sets `$_` to `undef`, the line is skipped and processing starts anew with
+the next input line.
+
+Tables can include groups of rules for ease of inclusion or omission
+with the C<--rule> or C<--exclude> options.
+
+=head2 Table format
+
+Each line of the table is either blank, a comment line prefixed with '#', or an
+entry definition. Definitions are one of three types: macros, rules, or groups.
+
+=over 4
+
+=item Macros
+
+Macros supply text that is substituted in rule definitions.
+
+A macro definition has the form:
+
+=over 4
+
+C<macro> I<name> I<text>
+
+=back
+
+The I<name> of the macro may not contain any whitespace, and the I<text> of the
+macro definition cannot begin with whitespace.
+
+Every occurance of C<%>I<name>C<%> in a rule definition will be substituted with
+I<text>. Macro substitution is recursive: after all macro substitutions are
+performed, the rule definition will again be parsed for macros.
+
+=item Rules
+
+A rule definition has the form:
+
+=over 4
+
+C<rule> I<name> I<code>
+
+=back
+
+Rule I<name>s may not contain any whitespace.
+
+The I<code> entry of a rule undergoes macro expansion (only macros whose
+definitions have already been read will apply) and then is compiled to a perl
+subroutine that is expected to operate on C<$_> to provide a line
+transformation.
+
+If a rule is defined multiple times in the same table, the transformations
+are concatenated.
+
+If a rule is defined in a subsequent table, the new definition will replace
+the old definition.
+
+=item Groups
+
+A group definition has the form:
+
+=over 4
+
+C<group> I<name> I<rule-or-group-name>...
+
+=back
+
+Rule (or group) names comprising the definition are separated by whitespace,
+and must have already been defined in this or a previous table.
+
+Definitions added explicitly with the C<--define> option are treated as
+lines in a table that is parsed after all other tables.
+
+=back
+
+=head1 EXAMPLES
+
+Consider a table file C<example.tbl> with the lines:
+
+ # a comment comprises a # and any following characters, plus any
+ # preceding whitespace.
+ macro non-comment (^.*?)(?=\s*(?:#|$))
+ rule rev-text s/%non-comment%/$1=~s,[[:punct:]]+,,gr/e
+ rule rev-text s/%non-comment%/reverse(lc($1))/e
+
+This defines one rule, C<rev-text> which will remove punctuation in the
+text preceding a possible comment, and then lower-case and reverse it.
+
+ $ echo 'What, you egg! # ?!' | cc-filter -N --table example.tbl
+ gge uoy tahw # ?!
+
+We use the C<-N> (C<--no-built-ins>) option to ignore all built-in
+definitions.
+
+The actions need not be just regex replacements. For example,
+a L<Fizz buzz|https://en.wikipedia.org/wiki/Fizz_buzz> implementation:
+
+ $ cat fizzbuzz.tbl
+ rule fizz $_.=' fizz' unless $_%3
+ rule buzz $_.=' buzz' unless $_%5
+ rule done s/\d+\s+// if /z/
+ $ seq 16 | ./cc-filter -N -t fizzbuzz.tbl
+ 1
+ 2
+ fizz
+ 4
+ buzz
+ fizz
+ 7
+ 8
+ fizz
+ buzz
+ 11
+ fizz
+ 13
+ 14
+ fizz buzz
+ 16
+
+=cut
+
+BEGIN { $Pod::Usage::Formatter = 'Pod::Text::Termcap'; }
+
+use File::Spec::Functions qw/catfile file_name_is_absolute/;
+use FindBin;
+use Getopt::Long;
+use Pod::Usage;
+use Safe;
+
+my $builtins = << '_end_';
+macro cxx:template-args (<(?:(?>[^<>]+)|(?-1))*>)
+macro cxx:paren-args (\((?:(?>[^()]+)|(?-1))*\))
+macro cxx:qualified (?:(::)?\b(\w+::)+)
+macro cxx:std-ns (?:(::)?\bstd::)
+macro cxx:gnu-internal-ns (?:(::)?\b__gnu_cxx::)
+macro cxx:identifier (\b[_\pL][_\pL\p{Nd}]*)
+
+rule cxx:rm-allocator s/(?:,\s*)?%cxx:qualified%?allocator%cxx:template-args%//g
+rule cxx:rm-delete s/(?:,\s*)?%cxx:qualified%?default_delete%cxx:template-args%//g
+rule cxx:rm-std s/%cxx:std-ns%//g
+rule cxx:rm-std s/%cxx:gnu-internal-ns%//g
+group cxx:std-simplify cxx:rm-allocator cxx:rm-delete cxx:rm-std
+
+rule cxx:rm-template-space s/%cxx:template-args%/$1=~s| *([<>]) *|\1|rg/eg
+rule cxx:unsigned-int s/\bunsigned\s+int\b/unsigned/g
+group cxx:tidy cxx:rm-template-space cxx:unsigned-int
+
+rule cxx:strip-qualified s/%cxx:qualified%//g
+rule cxx:strip-args s/(%cxx:identifier%%cxx:template-args%?)%cxx:paren-args%/$1(...)/g
+group cxx:strip-all cxx:strip-qualified cxx:strip-args
+_end_
+
+my $opt_help = 0;
+my $opt_man = 0;
+my $opt_list = undef;
+my @opt_rules = ();
+my @opt_except = ();
+my @opt_tables = ();
+my @opt_defines = ();
+my $opt_nodefaultrules = 0;
+my $opt_nobuiltins = 0;
+
+GetOptions("n|no-default-rules" => \$opt_nodefaultrules,
+ "N|no-builtins" => \$opt_nobuiltins,
+ "l|list:s" => \$opt_list,
+ "r|rule=s" => \@opt_rules,
+ "d|define=s" => \@opt_defines,
+ "x|exclude=s" => \@opt_except,
+ "t|table=s" => \@opt_tables,
+ "h|help" => \$opt_help,
+ "man" => \$opt_man) or die "Try 'cc-filter --help' for more information.\n";
+
+pod2usage(-verbose=>1, -exitval=>0) if $opt_help;
+pod2usage(-verbose=>2, -exitval=>0) if $opt_man;
+
+my %macrotbl = ();
+my %ruletbl = ();
+my %grouptbl = ();
+my @rulelist = ();
+
+# parse builtin rules
+parse_ruletbl(\$builtins, \@rulelist, \%ruletbl, \%macrotbl, \%grouptbl) unless $opt_nobuiltins;
+@rulelist = () if $opt_nodefaultrules;
+
+# parse supplied tables
+parse_ruletbl($_, \@rulelist, \%ruletbl, \%macrotbl, \%grouptbl) foreach @opt_tables;
+
+# parse explicit definitions
+if (@opt_defines) {
+ my $def_tbl = join "\n", @opt_defines;
+ parse_ruletbl(\$def_tbl, \@rulelist, \%ruletbl, \%macrotbl, \%grouptbl);
+}
+
+# select rules to run (by default, all)
+if (@opt_rules) {
+ @rulelist = ();
+ foreach my $r (@opt_rules) {
+ if (exists $grouptbl{$r}) {
+ push @rulelist, expand_group($r, \%grouptbl);
+ }
+ elsif (exists $ruletbl{$r}) {
+ push @rulelist, $r;
+ }
+ else {
+ die "unrecognized rule or group: $r\n";
+ }
+ }
+}
+if (@opt_except) {
+ my %excl = ();
+ foreach my $r (@opt_except) {
+ if (exists $grouptbl{$r}) {
+ $excl{$_}++ foreach expand_group($r, \%grouptbl);
+ }
+ elsif (exists $ruletbl{$r}) {
+ $excl{$r}++;
+ }
+ else {
+ die "unrecognized rule or group: $r\n";
+ }
+ }
+ @rulelist = grep {!exists $excl{$_}} @rulelist;
+}
+
+# if requested, list applicable rules, applicable expanded rules, groups or macros
+if (defined $opt_list) {
+ if (!$opt_list || $opt_list =~ /^rule/) {
+ foreach my $r (@rulelist) {
+ print "$r\t$_->{definition}\n" foreach (@{$ruletbl{$r}});
+ }
+ }
+ elsif ($opt_list =~ /^expand/) {
+ foreach my $r (@rulelist) {
+ print "$r\t$_->{expanded}\n" foreach (@{$ruletbl{$r}});
+ }
+ }
+ elsif ($opt_list =~ /^group/) {
+ while (my ($name, $rulelist) = each %grouptbl) {
+ print "$name\t".join(' ',@$rulelist)."\n";
+ }
+ }
+ elsif ($opt_list =~ /^macro/) {
+ while (my ($name, $macrodef) = each %macrotbl) {
+ print "$name\t$macrodef\n";
+ }
+ }
+ exit 0;
+}
+
+# apply each rule to each line of input and emit
+line:
+while (<>) {
+ chomp;
+ foreach my $r (@rulelist) {
+ foreach my $entry (@{$ruletbl{$r}}) {
+ &{$entry->{sub}};
+ next line if not defined $_;
+ }
+ }
+ print "$_\n";
+}
+
+exit 0;
+
+sub parse_ruletbl {
+ my $safe = new Safe;
+ my ($file, $rules, $ruletbl, $macrotbl, $grouptbl) = @_;
+ my $filename = ref($file)? "<internal table>": $file;
+ my @local_rules = ();
+ my %local_ruletbl = ();
+
+ if (!ref($file) && ! -e $file && !file_name_is_absolute($file)) {
+ # look for file in script directory
+ $file = catfile($FindBin::Bin, $file);
+ }
+
+ open(my $fh, '<', $file) or die "Unable to open table file $filename: $!\n";
+ while (<$fh>) {
+ next if /^\s*#/ || /^\s+$/;
+
+ my ($type, $name, $value) = (/(rule|group|macro)\s*(\S+)\s*(.*)$/);
+ die "$filename:$.: unrecognized line type\n" unless defined($type);
+
+ if ($type eq 'macro') {
+ $macrotbl->{$name} = $value;
+ }
+ elsif ($type eq 'group') {
+ my @components = split(' ',$value);
+ foreach my $c (@components) {
+ next if exists $grouptbl->{$c};
+ next if exists $ruletbl->{$c};
+ next if exists $local_ruletbl{$c};
+ die "$filename:$.: unknown rule or group '$c'\n";
+ }
+ $grouptbl->{$name} = \@components;
+ }
+ else {
+ my $action = substitute_macros($value, $macrotbl);
+ my $sub = $safe->reval("sub { $action }");
+ die "$filename:$.: error compiling action: $@\n" if $@;
+
+ push @local_rules, $name unless exists $local_ruletbl{$name};
+ push @{$local_ruletbl{$name}}, {sub => $sub, definition => $value, expanded => $action};
+ }
+ }
+
+ # add or override rule table entries
+ while (my ($name, $entries) = each %local_ruletbl) {
+ $ruletbl->{$name} = $entries;
+ }
+
+ # remove overriden rules from the rule list, and append them to the end in order
+ @$rules = grep {!exists $local_ruletbl{$_}} @$rules;
+ push @$rules, @local_rules;
+}
+
+sub substitute_macros {
+ my ($text, $macros) = @_;
+
+ my $max_iter = 2*keys %$macros;
+ my $iter = 0;
+
+ my $match = '%('.join('|', map {quotemeta} keys %$macros).')%';
+ my $re = qr/$match/;
+
+ while ($text =~ s/$re/$macros->{$1}/eg) {
+ die "maximum macro recursion exceeded: $iter\n" if ++$iter>$max_iter;
+ }
+ return $text;
+}
+
+sub expand_group {
+ my ($name, $grouptbl, $seen) = @_;
+
+ return $name unless exists $grouptbl->{$name};
+
+ $seen = {} if not defined $seen;
+ my @expand = ();
+ for my $x (@{$grouptbl->{$name}}) {
+ if (exists $seen->{$x}) {
+ push @expand, $x;
+ }
+ else {
+ push @expand, expand_group($x, $grouptbl, {%$seen, $x=>1});
+ }
+ }
+ return @expand;
+}
diff --git a/scripts/filters/massif-strip-cxx b/scripts/filters/massif-strip-cxx
new file mode 100644
index 0000000000000000000000000000000000000000..f93400dc6776a8d52dfa0029de988f537017177d
--- /dev/null
+++ b/scripts/filters/massif-strip-cxx
@@ -0,0 +1,3 @@
+macro massif:hex (0x[[:xdigit:]]+)
+macro massif:fileline ([^()]+:\d+)
+rule massif:strip-cxx s/%massif:hex%:.*?(?:\(%massif:fileline%\))?\s*$/$1: $2/