GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-11-27 06:19:25 +01:00
Code Issues Projects Releases Wiki Activity

compiler_vm: more compiler output beautification

Browse Source
This commit is contained in:
Pragmatic Software 2014-03-01 20:25:42 +00:00
parent 4d0e23243b
commit f4275a4cc8
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PBot/VERSION.pm
View File

@ -13,7 +13,7 @@ use warnings;
# These are set automatically by the build/commit script # These are set automatically by the build/commit script
use constant { use constant {
BUILD_NAME => "PBot", BUILD_NAME => "PBot",
BUILD_REVISION => 493, BUILD_REVISION => 494,
BUILD_DATE => "2014-03-01", BUILD_DATE => "2014-03-01",
}; };

9
modules/compiler_vm/compiler_vm_client.pl
View File

@ -934,6 +934,7 @@ if($output =~ m/^\s*$/) {
$output =~ s/In file included from prog.c:\d+:\d+:\s*//msg; $output =~ s/In file included from prog.c:\d+:\d+:\s*//msg;
$output =~ s/prog: prog.c:\d+: [^:]+: Assertion/Assertion/g; $output =~ s/prog: prog.c:\d+: [^:]+: Assertion/Assertion/g;
$output =~ s,/usr/include/[^:]+:\d+:\d+:\s+,,g;
unless(defined $got_paste or (defined $got_run and $got_run eq "paste")) { unless(defined $got_paste or (defined $got_run and $got_run eq "paste")) {
$output =~ s/ Line \d+ ://g; $output =~ s/ Line \d+ ://g;
@ -960,7 +961,13 @@ if($output =~ m/^\s*$/) {
$output =~ s/$right_quote/'/msg; $output =~ s/$right_quote/'/msg;
$output =~ s/`/'/msg; $output =~ s/`/'/msg;
$output =~ s/\t/ /g; $output =~ s/\t/ /g;
$output =~ s/(\d+:\d+:\s*)*\s*In function .main.:\s*//g; if($output =~ /In function '([^']+)':/) {
if($1 eq 'main') {
$output =~ s/(\d+:\d+:\s*)*\s?In function .main.:\s*//g;
} else {
$output =~ s/(\d+:\d+:\s*)*\s?In function .main.:\s?/In function 'main':/g;
}
}
$output =~ s/(\d+:\d+:\s*)*warning: unknown conversion type character 'b' in format \[-Wformat=?\]\s+(\d+:\d+:\s*)*warning: too many arguments for format \[-Wformat-extra-args\]/info: %b is a candide extension/g; $output =~ s/(\d+:\d+:\s*)*warning: unknown conversion type character 'b' in format \[-Wformat=?\]\s+(\d+:\d+:\s*)*warning: too many arguments for format \[-Wformat-extra-args\]/info: %b is a candide extension/g;
$output =~ s/(\d+:\d+:\s*)*warning: unknown conversion type character 'b' in format \[-Wformat=?\]//g; $output =~ s/(\d+:\d+:\s*)*warning: unknown conversion type character 'b' in format \[-Wformat=?\]//g;
$output =~ s/\s\(core dumped\)/./; $output =~ s/\s\(core dumped\)/./;