GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-10-03 01:48:38 +02:00
Code Issues Projects Releases Wiki Activity

CGrammar: Limit "the result of the expression" to initializer expressions; improve grammar of bitwise assignments

Browse Source
This commit is contained in:
Pragmatic Software 2014-07-15 07:27:34 +00:00
parent 077978bfa1
commit ed73046d6b
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PBot/VERSION.pm
View File

@ -13,8 +13,8 @@ use warnings;
# These are set automatically by the build/commit script # These are set automatically by the build/commit script
use constant { use constant {
BUILD_NAME => "PBot", BUILD_NAME => "PBot",
BUILD_REVISION => 733, BUILD_REVISION => 734,
BUILD_DATE => "2014-07-13", BUILD_DATE => "2014-07-15",
}; };
1; 1;

14
modules/c2english/CGrammar.pm
View File

@ -546,11 +546,11 @@ assignment_operator:
| '&=' | '&='
{ {
if ($arg{context} =~ /for init/) { if ($arg{context} =~ /for init/) {
$return = ['bit-wise ANDing^L', 'by^L' ]; $return = ['bitwise-ANDing^L', 'by^L' ];
} elsif ($arg{context} =~ /statement$/) { } elsif ($arg{context} =~ /statement$/) {
$return = ['Bit-wise ANDed^L', 'by^L' ]; $return = ['Bitwise-AND^L', 'by^L' ];
} else { } 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/) { if ($arg{context} =~ /for init/) {
$return = ['bit-wise ORing^L', 'by^L']; $return = ['bitwise-ORing^L', 'by^L'];
} elsif ($arg{context} =~ /statement$/) { } elsif ($arg{context} =~ /statement$/) {
$return = ['Bit-wise ORed^L', 'by^L']; $return = ['Bitwise-OR^L', 'by^L'];
} else { } 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"; } if (defined $arg{context} and $arg{context} eq 'for conditional') { print STDERR "hmm2\n"; }
my $expression = join('', @{$item[1]}); 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 = 'the result of the expression ^L';
} }
$return .= $expression; $return .= $expression;