GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2025-02-28 03:20:54 +01:00
Code Issues Projects Releases Wiki Activity

Fix show/undo/replace/etc (need args stripped first); undo once again updates last-code record

Browse Source
This commit is contained in:
Pragmatic Software 2013-09-13 11:32:15 +00:00
parent 2720071dbd
commit d739415a29
2 changed files with 22 additions and 9 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 => 429, BUILD_REVISION => 430,
BUILD_DATE => "2013-09-13", BUILD_DATE => "2013-09-13",
}; };

29
modules/compiler_vm/compiler_vm_client.pl
View File

@ -19,6 +19,8 @@ my $nooutput = 'No output.';
my $warn_unterminated_define = 0; my $warn_unterminated_define = 0;
my $save_last_code = 0; my $save_last_code = 0;
my $unshift_last_code = 0;
my $only_show = 0;
my %languages = ( my %languages = (
'C11' => "gcc -std=c11 -pedantic -Wall -Wextra -Wno-unused -Wfloat-equal -Wfatal_errors", 'C11' => "gcc -std=c11 -pedantic -Wall -Wextra -Wno-unused -Wfloat-equal -Wfatal_errors",
@ -156,7 +158,10 @@ if(open FILE, "< last_code.txt") {
close FILE; close FILE;
} }
if($code =~ m/^\s*show\s*$/i) { my $subcode = $code;
while ($subcode =~ s/^\s*(-[^ ]+)\s*//) {}
if($subcode =~ m/^\s*show\s*$/i) {
if(defined $last_code[0]) { if(defined $last_code[0]) {
print "$nick: $last_code[0]\n"; print "$nick: $last_code[0]\n";
} else { } else {
@ -165,7 +170,7 @@ if($code =~ m/^\s*show\s*$/i) {
exit 0; exit 0;
} }
if($code =~ m/^\s*diff\s*$/i) { if($subcode =~ m/^\s*diff\s*$/i) {
if($#last_code < 1) { if($#last_code < 1) {
print "$nick: Not enough recent code to diff.\n" print "$nick: Not enough recent code to diff.\n"
} else { } else {
@ -188,7 +193,7 @@ if($code =~ m/^\s*diff\s*$/i) {
my $got_run = undef; my $got_run = undef;
if($code =~ m/^\s*(run|paste)\s*$/i) { if($subcode =~ m/^\s*(run|paste)\s*$/i) {
$got_run = lc $1; $got_run = lc $1;
if(defined $last_code[0]) { if(defined $last_code[0]) {
$code = $last_code[0]; $code = $last_code[0];
@ -197,7 +202,6 @@ if($code =~ m/^\s*(run|paste)\s*$/i) {
exit 0; exit 0;
} }
} else { } else {
my $subcode = $code;
my $got_undo = 0; my $got_undo = 0;
my $got_sub = 0; my $got_sub = 0;
@ -560,13 +564,14 @@ if($code =~ m/^\s*(run|paste)\s*$/i) {
} }
} }
$save_last_code = 1;
unless ($got_undo and not $got_changes) { unless ($got_undo and not $got_changes) {
$save_last_code = 1; $unshift_last_code = 1;
} }
if($got_undo and not $got_changes) { if($got_undo and not $got_changes) {
print "$nick: $code\n"; $only_show = 1;
exit 0;
} }
} }
@ -589,7 +594,10 @@ $args .= "$1 " while $code =~ s/^\s*(-[^ ]+)\s*//;
$args =~ s/\s+$//; $args =~ s/\s+$//;
if($save_last_code) { if($save_last_code) {
unshift @last_code, $extracted_args . (length $args ? $args . ' ' . $code : $code); if($unshift_last_code) {
unshift @last_code, $extracted_args . (length $args ? $args . ' ' . $code : $code);
}
open FILE, "> last_code.txt"; open FILE, "> last_code.txt";
my $i = 0; my $i = 0;
@ -601,6 +609,11 @@ if($save_last_code) {
close FILE; close FILE;
} }
if($only_show) {
print "$nick: $code\n";
exit 0;
}
unless($got_run) { unless($got_run) {
open FILE, ">> log.txt"; open FILE, ">> log.txt";
print FILE "------------------------------------------------------------------------\n"; print FILE "------------------------------------------------------------------------\n";