diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm index 2ac0284e..37648bd6 100644 --- a/PBot/VERSION.pm +++ b/PBot/VERSION.pm @@ -13,7 +13,7 @@ use warnings; # These are set automatically by the build/commit script use constant { BUILD_NAME => "PBot", - BUILD_REVISION => 741, + BUILD_REVISION => 742, BUILD_DATE => "2014-07-21", }; diff --git a/modules/c2english.pl b/modules/c2english.pl index 013a1633..6f340e59 100755 --- a/modules/c2english.pl +++ b/modules/c2english.pl @@ -19,7 +19,7 @@ if($code =~ s/^-f\s+//) { } my ($has_function, $has_main, $got_nomain); -my $prelude_base = "#define _XOPEN_SOURCE 9001\n#define __USE_XOPEN\n#include \n#include \n#include \n#include \n#include \n#include \n#include \n#include \n#include \n#include \n#include \n#include \n#include \n#include \n#define _Atomic\n#define _Static_assert(a, b)\n\n"; +my $prelude_base = "#define _XOPEN_SOURCE 9001\n#define __USE_XOPEN\n#include \n#include \n#include \n#include \n#include \n#include \n#include \n#include \n#include \n#include \n#include \n#include \n#include \n#include \n#include \n#define _Atomic\n#define _Static_assert(a, b)\n\n"; my $prelude = $prelude_base; print "code before: [$code]\n" if $debug; @@ -290,8 +290,8 @@ $code =~ s/\|n/\n/g; $code =~ s/^\s+//; $code =~ s/\s+$//; $code =~ s/;\s*;\n/;\n/gs; -$code =~ s/;(\s*\/\*.*?\*\/\s*);\n/;$1/gs; -$code =~ s/;(\s*\/\/.*?\s*);\n/;$1/gs; +$code =~ s/(;)?(\s*\/\*.*?\*\/\s*);\n/$1$2/gs; +$code =~ s/(;)?(\s*\/\/.*?\s*);\n/$1$2/gs; $code =~ s/({|})\n\s*;\n/$1\n/gs; $code =~ s/(?:\n\n)+/\n\n/g; diff --git a/modules/c2english/CGrammar.pm b/modules/c2english/CGrammar.pm index 391e29b6..21038441 100644 --- a/modules/c2english/CGrammar.pm +++ b/modules/c2english/CGrammar.pm @@ -467,6 +467,7 @@ assignment_expression: if (ref $assignment_operator eq 'ARRAY') { $return .= "${$item{assignment_operator}}[0] $item{unary_expression} "; + ${$item{assignment_operator}}[1] =~ s/the value/the result of the expression/ if $assignment_expression =~ / /; $return .= "${$item{assignment_operator}}[1] " if $assignment_expression !~ /the result of/; $return .= $assignment_expression; } else { @@ -1840,7 +1841,7 @@ comment_cxx: $return =~ s|^//\s*||; $return =~ s/\n*$//; $return =~ s/"/\\"/g; - $return = "\nQuick comment: \"$return\".\n"; + $return = "\nA quick comment: \"$return\".\n"; } constant: