diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm index 42077466..6cfad94d 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 => 432, - BUILD_DATE => "2013-09-13", + BUILD_REVISION => 433, + BUILD_DATE => "2013-09-16", }; 1; diff --git a/modules/c2english.pl b/modules/c2english.pl index 51755387..77ff7b73 100755 --- a/modules/c2english.pl +++ b/modules/c2english.pl @@ -81,6 +81,7 @@ $output =~ s/whose initial value is/with value being/g; $output =~ s/each element of which is a(n?)/of type a$1/g; $output =~ s/\s+s\s*$//g; $output =~ s/variable/object/g; +$output =~ s/of type a pointer/of type pointer/g; $output =~ s/of type a character/of type char/g; $output =~ s/of type an integer/of type int/g; $output =~ s/to a character/to char/g; diff --git a/modules/compiler_vm/compiler_vm_client.pl b/modules/compiler_vm/compiler_vm_client.pl index 74bca634..a50f3a40 100755 --- a/modules/compiler_vm/compiler_vm_client.pl +++ b/modules/compiler_vm/compiler_vm_client.pl @@ -874,11 +874,11 @@ if($lang eq 'C89' or $lang eq 'C99' or $lang eq 'C11' or $lang eq 'C++') { $precode =~ s/^{(.*)}$/$1/s; if(not $has_main and not $got_nomain) { - $code = "$prelude\n\n$code\n\nint main(void) {\n$precode\n;\nreturn 0;\n}\n"; + $code = "$prelude\n$code" . "int main(void) {\n$precode\n;\nreturn 0;\n}\n"; $nooutput = "No warnings, errors or output."; } else { print "code: [$code]; precode: [$precode]\n" if $debug; - $code = "$prelude\n\n$precode\n\n$code\n"; + $code = "$prelude\n$precode\n\n$code\n"; $nooutput = "No warnings, errors or output."; } } else {