Don't remove an expired xline on add, simply drop duplicates (1.1 behaviour). This...

[user/henk/code/inspircd.git] / make / run-cc.pl

diff --git a/make/run-cc.pl b/make/run-cc.pl
index d4c976982c369004b1244ac577c459c935cdb94a..4c5bb18cb39060212fae9e8d91225364eecc2b9c 100755 (executable)
--- a/make/run-cc.pl
+++ b/make/run-cc.pl
@@ -1,5 +1,17 @@
 #!/usr/bin/perl
 
+#       +------------------------------------+
+#       | Inspire Internet Relay Chat Daemon |
+#       +------------------------------------+
+#
+#  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+# See: http://www.inspircd.org/wiki/index.php/Credits
+#
+# This program is free but copyrighted software; see
+#      the file COPYING for details.
+#
+# ---------------------------------------------------
+
 ### THIS IS DESIGNED TO BE RUN BY MAKE! DO NOT RUN FROM THE SHELL (because it MIGHT sigterm the shell)! ###
 
 use strict;
@@ -26,9 +38,8 @@ my $location = "";
 my @msgfilters = (
        [ qr/^(.*) warning: cannot pass objects of non-POD type `(.*)' through `\.\.\.'; call will abort at runtime/ => sub {
                my ($msg, $where, $type) = @_;
-               print $location;
+               my $errstr = $location . "$where error: cannot pass objects of non-POD type `$type' through `...'\n";
                $location = "";
-               my $errstr = "$where error: cannot pass objects of non-POD type `$type' through `...'\n";
                if ($type =~ m/::(basic_)?string/) {
                        $errstr .= "$where (Did you forget to call c_str()?)\n";
                }
@@ -39,12 +50,14 @@ my @msgfilters = (
        [ qr/^In file included from .*[,:]$/ => sub {
                my ($msg) = @_;
                $location = "$msg\n";
+               return undef;
        } ],
 
        # Continuation of an include stack.
        [ qr/^                 from .*[,:]$/ => sub {
                my ($msg) = @_;
                $location .= "$msg\n";
+               return undef;
        } ],
 
        # A function, method, constructor, or destructor is the site of a problem
@@ -56,22 +69,44 @@ my @msgfilters = (
                } else {
                        $location .= "$msg\n";
                }
+               return undef;
        } ],
 
        [ qr/^.* warning: / => sub {
                my ($msg) = @_;
-               print $location;
+               my $str = $location . "\e[33;1m$msg\e[0m\n";
+               $showncmdline = 1;
                $location = "";
-               print STDERR "\e[33;1m$msg\e[0m\n";
+               return $str;
        } ],
 
        [ qr/^.* error: / => sub {
                my ($msg) = @_;
-               print STDERR "An error occured when executing:\e[37;1m $cc " . join(' ', @ARGV) . "\n" unless $showncmdline;
+               my $str = "";
+               $str = "An error occured when executing:\e[37;1m $cc " . join(' ', @ARGV) . "\n" unless $showncmdline;
                $showncmdline = 1;
-               print $location;
+               $str .= $location . "\e[31;1m$msg\e[0m\n";
                $location = "";
-               print STDERR "\e[31;1m$msg\e[0m\n";
+               return $str;
+       } ],
+
+       [ qr/./ => sub {
+               my ($msg) = @_;
+               $msg = $location . $msg;
+               $location = "";
+               $msg =~ s/std::basic_string\<char\, std\:\:char_traits\<char\>, std::allocator\<char\> \>(\s+|)/std::string/g;
+               $msg =~ s/std::basic_string\<char\, .*?irc_char_traits\<char\>, std::allocator\<char\> \>(\s+|)/irc::string/g;
+               for my $stl (qw(deque vector list)) {
+                       $msg =~ s/std::$stl\<(\S+), std::allocator\<\1\> \>/std::$stl\<$1\>/g;
+                       $msg =~ s/std::$stl\<(std::pair\<\S+, \S+\>), std::allocator\<\1 \> \>/std::$stl<$1 >/g;
+               }
+               $msg =~ s/std::map\<(\S+), (\S+), std::less\<\1\>, std::allocator\<std::pair\<const \1, \2\> \> \>/std::map<$1, $2>/g;
+               # Warning: These filters are GNU C++ specific!
+               $msg =~ s/__gnu_cxx::__normal_iterator\<(\S+)\*, std::vector\<\1\> \>/std::vector<$1>::iterator/g;
+               $msg =~ s/__gnu_cxx::__normal_iterator\<(std::pair\<\S+, \S+\>)\*, std::vector\<\1 \> \>/std::vector<$1 >::iterator/g;
+               $msg =~ s/__gnu_cxx::__normal_iterator\<char\*, std::string\>/std::string::iterator/g;
+               $msg =~ s/__gnu_cxx::__normal_iterator\<char\*, irc::string\>/irc::string::iterator/g;
+               return $msg;
        } ],
 );
 
@@ -138,20 +173,24 @@ if ($pid) {
        # Now read each line of stderr
 LINE:  while (defined(my $line = <$r_stderr>)) {
                chomp $line;
+
                for my $filter (@msgfilters) {
                        my @caps;
                        if (@caps = ($line =~ $filter->[0])) {
                                $@ = "";
-                               eval {
+                               $line = eval {
                                        $filter->[1]->($line, @caps);
                                };
                                if ($@) {
+                                       # Note that $line is undef now.
                                        $fail = 1;
                                        print STDERR $@;
                                }
-                               next LINE;
+                               next LINE unless defined($line);
                        }
                }
+               # Chomp off newlines again, in case the filters put some back in.
+               chomp $line;
                print STDERR "$line\n";
        }
        waitpid $pid, 0;