From 7ed26f928e3de898977294adf359133bf83d96d1 Mon Sep 17 00:00:00 2001 From: Pragmatic Software Date: Mon, 3 Sep 2012 07:02:17 +0000 Subject: [PATCH] compiler_vm: fix \n after #include directives --- PBot/VERSION.pm | 4 ++-- modules/compiler_vm/compiler_vm_client.pl | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm index 6eacd2cf..b584258a 100644 --- a/PBot/VERSION.pm +++ b/PBot/VERSION.pm @@ -13,8 +13,8 @@ use warnings; # These are set automatically by the build/commit script use constant { BUILD_NAME => "PBot", - BUILD_REVISION => 380, - BUILD_DATE => "2012-08-31", + BUILD_REVISION => 381, + BUILD_DATE => "2012-09-02", }; 1; diff --git a/modules/compiler_vm/compiler_vm_client.pl b/modules/compiler_vm/compiler_vm_client.pl index b77b285c..c6b5d2bb 100755 --- a/modules/compiler_vm/compiler_vm_client.pl +++ b/modules/compiler_vm/compiler_vm_client.pl @@ -604,7 +604,7 @@ use constant { my $state = NORMAL; my $escaped = 0; -while($code =~ m/(.)/g) { +while($code =~ m/(.)/gs) { my $ch = $1; given ($ch) { @@ -865,6 +865,7 @@ if($output =~ m/^\s*$/) { $output =~ s/, '\\(\d{3})' \s*//g; $output =~ s/(\\000)+/\\0/g; $output =~ s/\\0[^">']+/\\0/g; + $output =~ s/= (\d+) '\\0'/= $1/g; $output =~ s/\\0"/"/g; $output =~ s/"\\0/"/g; $output =~ s/\.\.\.>/>/g;