diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm index 20de070b..47fa3767 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 => 737, + BUILD_REVISION => 738, BUILD_DATE => "2014-07-17", }; diff --git a/modules/c2english/CGrammar.pm b/modules/c2english/CGrammar.pm index 85e3dd08..bbbc91ac 100644 --- a/modules/c2english/CGrammar.pm +++ b/modules/c2english/CGrammar.pm @@ -358,7 +358,8 @@ jump_statement: if ($arg{context} =~ /switch/ or $arg{context} =~ /case/) { $return = "Exit switch block.\n"; } elsif (length $arg{context}) { - $return = "Break from the $arg{context}.\n"; + my ($context) = $arg{context} =~ /([^|]+)/; + $return = "Break from the $context.\n"; } else { $return = "Break from the current block.\n"; } @@ -395,7 +396,7 @@ expression_statement: } } else { $return = $expression; - $return .= ".\n" unless $arg{context} =~ /for conditional$/; + $return .= ".\n" unless $arg{context} =~ /for (init|conditional)$/; } }