diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm index 8ec29a7c..f7c84eb5 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 => 734, - BUILD_DATE => "2014-07-15", + BUILD_REVISION => 735, + BUILD_DATE => "2014-07-16", }; 1; diff --git a/modules/c2english/CGrammar.pm b/modules/c2english/CGrammar.pm index c6ec5d11..1a17e35a 100644 --- a/modules/c2english/CGrammar.pm +++ b/modules/c2english/CGrammar.pm @@ -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} =~ /initializer expression$/ and $expression =~ / / and $expression !~ /^the .*? number \S+$/i) { + if($arg{context} =~ /initializer expression$/ and $expression =~ / / and $expression !~ /^the .*? number \S+$/i and $expression !~ /^the result of the/) { $return = 'the result of the expression ^L'; } $return .= $expression; @@ -1835,6 +1835,8 @@ constant: $return = 'a backspace character'; } elsif ($constant eq q('\'')) { $return = 'a single-quote'; + } elsif ($constant eq q(' ')) { + $return = 'a space'; } else { $return = $constant; }