diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm index 3666cc93..8ec29a7c 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 => 733, - BUILD_DATE => "2014-07-13", + BUILD_REVISION => 734, + BUILD_DATE => "2014-07-15", }; 1; diff --git a/modules/c2english/CGrammar.pm b/modules/c2english/CGrammar.pm index a5e6fd58..c6ec5d11 100644 --- a/modules/c2english/CGrammar.pm +++ b/modules/c2english/CGrammar.pm @@ -546,11 +546,11 @@ assignment_operator: | '&=' { if ($arg{context} =~ /for init/) { - $return = ['bit-wise ANDing^L', 'by^L' ]; + $return = ['bitwise-ANDing^L', 'by^L' ]; } elsif ($arg{context} =~ /statement$/) { - $return = ['Bit-wise ANDed^L', 'by^L' ]; + $return = ['Bitwise-AND^L', 'by^L' ]; } else { - $return = 'which is bit-wise ANDed by^L'; + $return = 'which is bitwise-ANDed by^L'; } } | '^=' @@ -566,11 +566,11 @@ assignment_operator: | '|=' { if ($arg{context} =~ /for init/) { - $return = ['bit-wise ORing^L', 'by^L']; + $return = ['bitwise-ORing^L', 'by^L']; } elsif ($arg{context} =~ /statement$/) { - $return = ['Bit-wise ORed^L', 'by^L']; + $return = ['Bitwise-OR^L', 'by^L']; } else { - $return = 'which is bit-wise ORed by^L'; + $return = 'which is bitwise-ORed by^L'; } } @@ -585,7 +585,7 @@ logical_OR_AND_expression: { if (defined $arg{context} and $arg{context} eq 'for conditional') { print STDERR "hmm2\n"; } my $expression = join('', @{$item[1]}); - if($arg{context} =~ /expression$/ and $expression =~ / / and $expression !~ /^the result of/i) { + if($arg{context} =~ /initializer expression$/ and $expression =~ / / and $expression !~ /^the .*? number \S+$/i) { $return = 'the result of the expression ^L'; } $return .= $expression;