3
0
mirror of https://github.com/pragma-/pbot.git synced 2024-12-23 03:02:47 +01:00

Better output

This commit is contained in:
Pragmatic Software 2010-04-25 23:24:47 +00:00
parent 1daa155229
commit 6006edafae
2 changed files with 11 additions and 7 deletions

View File

@ -83,16 +83,14 @@ if($text =~ /<span class="heading">Output:<\/span>.+?<div class="code">(.*)<\/di
$output = decode_entities($output); $output = decode_entities($output);
$output = HTML::FormatText->new->format(parse_html($output)); $output = HTML::FormatText->new->format(parse_html($output));
$output =~ s/[\n\r]/ /g; $output =~ s/^\s+//;
$output =~ s/\s+/ /g;
$output =~ s/^\s+//g;
$output =~ s/\s+$//g;
$output =~ s/ Line \d+ ://g; $output =~ s/ Line \d+ ://g;
$output =~ s/ \(first use in this function\)//g; $output =~ s/ \(first use in this function\)//g;
$output =~ s/error: \(Each undeclared identifier is reported only once.*?\)//g; $output =~ s/error: \(Each undeclared identifier is reported only once.*?\)//g;
$output =~ s/error: (.*?) error/error: $1; error/g; $output =~ s/error: (.*?).error/error: $1; error/g;
print FILE localtime . "\n";
print FILE "$nick: [ $url ] $output\n\n"; print FILE "$nick: [ $url ] $output\n\n";
close FILE; close FILE;
print "$nick: $output\n"; print "$nick: $output\n";

View File

@ -12,6 +12,9 @@ my $result;
my %languages = ( my %languages = (
'Ada' => { 'id' => '7', 'name' => 'Ada (gnat-4.3.2)' }, 'Ada' => { 'id' => '7', 'name' => 'Ada (gnat-4.3.2)' },
'asm' => { 'id' => '13', 'name' => 'Assembler (nasm-2.07)' },
'nasm' => { 'id' => '13', 'name' => 'Assembler (nasm-2.07)' },
'Assembler' => { 'id' => '13', 'name' => 'Assembler (nasm-2.07)' },
'Assembler' => { 'id' => '13', 'name' => 'Assembler (nasm-2.07)' }, 'Assembler' => { 'id' => '13', 'name' => 'Assembler (nasm-2.07)' },
'gawk' => { 'id' => '104', 'name' => 'AWK (gawk) (gawk-3.1.6)' }, 'gawk' => { 'id' => '104', 'name' => 'AWK (gawk) (gawk-3.1.6)' },
'mawk' => { 'id' => '105', 'name' => 'AWK (mawk) (mawk-1.3.3)' }, 'mawk' => { 'id' => '105', 'name' => 'AWK (mawk) (mawk-1.3.3)' },
@ -138,10 +141,10 @@ my $MEMORYLIMIT = 17;
my $ILLEGAL_SYSCALL = 19; my $ILLEGAL_SYSCALL = 19;
my $INTERNAL_ERROR = 20; my $INTERNAL_ERROR = 20;
if($result->{result} == $COMPILER_ERROR) { #if($result->{result} == $COMPILER_ERROR) {
$output .= $result->{cmpinfo}; $output .= $result->{cmpinfo};
$output =~ s/[\n\r]/ /g; $output =~ s/[\n\r]/ /g;
} #}
if($result->{signal}) { if($result->{signal}) {
$output .= "\n[Signal: $result->{signal}]"; $output .= "\n[Signal: $result->{signal}]";
@ -177,6 +180,9 @@ $output =~ s/error: \(Each undeclared identifier is reported only once.*?\)//msg
$output =~ s/prog\.c[:\d\s]*//g; $output =~ s/prog\.c[:\d\s]*//g;
$output =~ s/error: (.*?) error/error: $1; error/msg; $output =~ s/error: (.*?) error/error: $1; error/msg;
$output = "No output." if $output =~ m/^\s+$/;
print FILE localtime . "\n";
print FILE "$nick: [ http://ideone.com/$url ] $output\n\n"; print FILE "$nick: [ http://ideone.com/$url ] $output\n\n";
close FILE; close FILE;
print "$nick: $output\n"; print "$nick: $output\n";