From 5f9fb29e7eb6af99e3b7a2861ff765da78df9e67 Mon Sep 17 00:00:00 2001 From: Pragmatic Software Date: Thu, 10 Jul 2014 12:24:29 +0000 Subject: [PATCH] CGrammar: Add some missing lowercasing specifiers --- PBot/VERSION.pm | 4 ++-- modules/c2english/CGrammar.pm | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm index 0fc4a67f..1e9ab770 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 => 723, - BUILD_DATE => "2014-07-09", + BUILD_REVISION => 724, + BUILD_DATE => "2014-07-10", }; 1; diff --git a/modules/c2english/CGrammar.pm b/modules/c2english/CGrammar.pm index 6527bfb7..ec281ba2 100644 --- a/modules/c2english/CGrammar.pm +++ b/modules/c2english/CGrammar.pm @@ -624,7 +624,7 @@ rel_add_mul_shift_expression: | { my $expression = join('', @{$item[1]}); - if($arg{context} =~ /expression/ and $expression =~ / /) { + if($arg{context} =~ /expression/ and $expression =~ / / and $expression !~ /the result of the expression/i) { $return = 'the result of the expression '; } $return .= $expression; @@ -1210,12 +1210,12 @@ argument_expression_list: my $last = ''; if (@arg_exp_list > 2) { $last = pop @arg_exp_list; - $return = 's ' . join(', ', @arg_exp_list) . ", and $last"; + $return = 's ' . join(', ^L', @arg_exp_list) . ", and ^L$last"; } elsif (@arg_exp_list == 2 ) { - $return = "s $arg_exp_list[0] and $arg_exp_list[1]"; + $return = "s ^L$arg_exp_list[0] and ^L$arg_exp_list[1]"; } else { if ($arg_exp_list[0]) { - $return = " $arg_exp_list[0]"; + $return = " ^L$arg_exp_list[0]"; } else { $return = ''; }