GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2025-02-16 21:40:46 +01:00
Code Issues Projects Releases Wiki Activity

Allow expand_macros.pl to #include stuff to expand

Browse Source
This commit is contained in:
Pragmatic Software 2013-11-28 05:36:41 +00:00
parent b042e073db
commit 9c1a077d2e
2 changed files with 3 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 => 474, BUILD_REVISION => 475,
BUILD_DATE => "2013-11-27", BUILD_DATE => "2013-11-27",
}; };

3
modules/expand_macros.pl
View File

@ -156,7 +156,7 @@ while($code =~ m/(.)/msg) {
print "code after \\n additions: [$code]\n" if $debug; print "code after \\n additions: [$code]\n" if $debug;
$code =~ s/#include [<"'].*?['">]//gm; #$code =~ s/#include [<"'].*?['">]//gm;
print "code after include removal: [$code]\n" if $debug; print "code after include removal: [$code]\n" if $debug;
@ -289,6 +289,7 @@ close $fh;
my ($ret, $result) = execute(5, "gcc -E prog.c"); my ($ret, $result) = execute(5, "gcc -E prog.c");
$result =~ s/.*# \d+ "prog.c"(\s+\d+)*//ms;
$result =~ s/^#.*$//gm; $result =~ s/^#.*$//gm;
$result =~ s/[\n\r]/ /gm; $result =~ s/[\n\r]/ /gm;
$result =~ s/\s+/ /gm; $result =~ s/\s+/ /gm;