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

compiler_vm: do not automatically pull in #include prelude if #include detected in code

Browse Source
This commit is contained in:
Pragmatic Software 2011-01-29 20:50:44 +00:00
parent 3255bdcd93
commit 514484a1e6
2 changed files with 7 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 => 279, BUILD_REVISION => 280,
BUILD_DATE => "2011-01-29", BUILD_DATE => "2011-01-29",
}; };

7
modules/compiler_vm/compiler_vm_client.pl
View File

@ -568,7 +568,12 @@ $code =~ s/#include <([^>]+)>/#include <$1>\n/g;
$code =~ s/#([^ ]+) (.*?)\\n/#$1 $2\n/g; $code =~ s/#([^ ]+) (.*?)\\n/#$1 $2\n/g;
$code =~ s/#([\w\d_]+)\\n/#$1\n/g; $code =~ s/#([\w\d_]+)\\n/#$1\n/g;
my $precode = $preludes{$lang} . $code; my $precode;
if($code =~ m/#include/) {
$precode = $code;
} else {
$precode = $preludes{$lang} . $code;
}
$code = ''; $code = '';
if($lang eq 'C' or $lang eq 'C99' or $lang eq 'C++') { if($lang eq 'C' or $lang eq 'C99' or $lang eq 'C++') {