|
@@ -4833,13 +4833,31 @@ sub process {
|
|
|
}
|
|
|
|
|
|
}
|
|
|
+
|
|
|
+ # Make $define_stmt single line, comment-free, etc
|
|
|
+ my @stmt_array = split('\n', $define_stmt);
|
|
|
+ my $first = 1;
|
|
|
+ $define_stmt = "";
|
|
|
+ foreach my $l (@stmt_array) {
|
|
|
+ $l =~ s/\\$//;
|
|
|
+ if ($first) {
|
|
|
+ $define_stmt = $l;
|
|
|
+ $first = 0;
|
|
|
+ } elsif ($l =~ /^[\+ ]/) {
|
|
|
+ $define_stmt .= substr($l, 1);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $define_stmt =~ s/$;//g;
|
|
|
+ $define_stmt =~ s/\s+/ /g;
|
|
|
+ $define_stmt = trim($define_stmt);
|
|
|
+
|
|
|
# check if any macro arguments are reused (ignore '...' and 'type')
|
|
|
foreach my $arg (@def_args) {
|
|
|
next if ($arg =~ /\.\.\./);
|
|
|
next if ($arg =~ /^type$/i);
|
|
|
my $tmp = $define_stmt;
|
|
|
$tmp =~ s/\b(typeof|__typeof__|__builtin\w+|typecheck\s*\(\s*$Type\s*,|\#+)\s*\(*\s*$arg\s*\)*\b//g;
|
|
|
- $tmp =~ s/\#\s*$arg\b//g;
|
|
|
+ $tmp =~ s/\#+\s*$arg\b//g;
|
|
|
$tmp =~ s/\b$arg\s*\#\#//g;
|
|
|
my $use_cnt = $tmp =~ s/\b$arg\b//g;
|
|
|
if ($use_cnt > 1) {
|