diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm index 60bdcca1..94e53918 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 => 721, - BUILD_DATE => "2014-07-07", + BUILD_REVISION => 722, + BUILD_DATE => "2014-07-09", }; 1; diff --git a/modules/c2english/CGrammar.pm b/modules/c2english/CGrammar.pm index 98f2e027..05f8b600 100644 --- a/modules/c2english/CGrammar.pm +++ b/modules/c2english/CGrammar.pm @@ -622,7 +622,12 @@ rel_add_mul_shift_expression: cast_expression ...';' { $return = $item{cast_expression}; } | - { $return = join('' , @{$item[1]}); } + { + if($arg{context} =~ /expression/) { + $return = 'the result of the expression '; + } + $return .= join('' , @{$item[1]}); + } closure: ',' | ';' | ')' @@ -853,7 +858,7 @@ init_declarator: initializer: designation initializer { $return = "$item[1] $item[2]"; } - | comment(?) assignment_expression comment(?) + | comment(?) assignment_expression[context => "$arg{context}|initializer expression"] comment(?) { $return = $item[2];