GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-10-03 01:48:38 +02:00
Code Issues Projects Releases Wiki Activity

compiler_vm: Fix #include parsing logic against mismatched #include <foo" tokens

Browse Source
This commit is contained in:
Pragmatic Software 2014-07-04 13:04:27 +00:00
parent 9b93a33acf
commit 9c5b307bef
2 changed files with 13 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 => 703, BUILD_REVISION => 704,
BUILD_DATE => "2014-07-04", BUILD_DATE => "2014-07-04",
}; };

13
modules/compiler_vm/compiler_vm_client.pl
View File

@ -4,6 +4,8 @@
use strict; use strict;
use feature "switch"; use feature "switch";
no if $] >= 5.018, warnings => "experimental::smartmatch";
use IPC::Open2; use IPC::Open2;
use Text::Balanced qw(extract_bracketed extract_delimited); use Text::Balanced qw(extract_bracketed extract_delimited);
use IO::Socket; use IO::Socket;
@ -119,6 +121,7 @@ sub compile {
my $date = time; my $date = time;
sleep 1;
print $compiler "compile:$lang:$args:$input:$date\n"; print $compiler "compile:$lang:$args:$input:$date\n";
print $compiler "$code\n"; print $compiler "$code\n";
print $compiler "compile:end\n"; print $compiler "compile:end\n";
@ -778,7 +781,13 @@ while($code =~ m/(.)/msg) {
} elsif($ch eq '#' and not $cpp and not $escaped and not $single_quote and not $double_quote) { } elsif($ch eq '#' and not $cpp and not $escaped and not $single_quote and not $double_quote) {
$cpp = 1; $cpp = 1;
if($code =~ m/include\s*[<"]([^>"]*)[>"]/msg) { if($code =~ m/include\s*<([^>\n]*)>/msg) {
my $match = $1;
$pos = pos $code;
substr ($code, $pos, 0) = "\n";
pos $code = $pos;
$cpp = 0;
} elsif($code =~ m/include\s*"([^"\n]*)"/msg) {
my $match = $1; my $match = $1;
$pos = pos $code; $pos = pos $code;
substr ($code, $pos, 0) = "\n"; substr ($code, $pos, 0) = "\n";
@ -1120,6 +1129,8 @@ if($output =~ m/^\s*$/) {
$output =~ s/\s*process\s*\d+\s*is\s*executing\s*new\s*program:\s*.*?\s*Error\s*in\s*re-setting\s*breakpoint\s*\d+:\s*.*?No\s*symbol\s*table\s*is\s*loaded.\s*\s*Use\s*the\s*"file"\s*command.//s; $output =~ s/\s*process\s*\d+\s*is\s*executing\s*new\s*program:\s*.*?\s*Error\s*in\s*re-setting\s*breakpoint\s*\d+:\s*.*?No\s*symbol\s*table\s*is\s*loaded.\s*\s*Use\s*the\s*"file"\s*command.//s;
$output =~ s/\](\d+:\d+:\s*)*warning:/]\n$1warning:/g; $output =~ s/\](\d+:\d+:\s*)*warning:/]\n$1warning:/g;
$output =~ s/\](\d+:\d+:\s*)*error:/]\n$1error:/g; $output =~ s/\](\d+:\d+:\s*)*error:/]\n$1error:/g;
$output =~ s/\s+no output/ no output/;
$output =~ s/^\s+no output/no output/;
} }
if($warn_unterminated_define == 1) { if($warn_unterminated_define == 1) {