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: Improve translation of structure postfix productions; concatenate contexts for multiple context

Browse Source
This commit is contained in:
Pragmatic Software 2014-07-01 16:16:40 +00:00
parent f4fdd9f221
commit b66e9502d7
3 changed files with 103 additions and 49 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 => 686, BUILD_REVISION => 687,
BUILD_DATE => "2014-06-29", BUILD_DATE => "2014-07-01",
}; };
1; 1;

146
modules/c2english/CGrammar.pm
View File

@ -339,7 +339,7 @@ jump_statement:
} }
expression_statement: expression_statement:
expression(?) ';' expression[context => "$arg{context}|statement"](?) ';'
{ {
my $expression = join('',@{$item[1]}); my $expression = join('',@{$item[1]});
if (!$expression) { if (!$expression) {
@ -386,7 +386,7 @@ assignment_expression:
my $assignment_expression = $item{assignment_expression}; my $assignment_expression = $item{assignment_expression};
my $assignment_operator = $item{assignment_operator}; my $assignment_operator = $item{assignment_operator};
if ($arg{context} eq 'statement' or $arg{context} eq 'for init') { if (ref $assignment_operator eq 'ARRAY') {
$return .= "${$item{assignment_operator}}[0] $item{unary_expression} "; $return .= "${$item{assignment_operator}}[0] $item{unary_expression} ";
$return .= "${$item{assignment_operator}}[1] " if $assignment_expression !~ /the result of/; $return .= "${$item{assignment_operator}}[1] " if $assignment_expression !~ /the result of/;
$return .= $assignment_expression; $return .= $assignment_expression;
@ -403,7 +403,14 @@ conditional_expression:
my $op1 = $item{conditional_ternary_expression}->[0]; my $op1 = $item{conditional_ternary_expression}->[0];
my $op2 = $item{conditional_ternary_expression}->[1]; my $op2 = $item{conditional_ternary_expression}->[1];
my $expression = ::istrue $item{logical_OR_AND_expression}; my $expression = ::istrue $item{logical_OR_AND_expression};
$return = "$op1 if $expression otherwise $op2";
if($arg{context} =~ /statement$/) {
$return = "$op1 if $expression otherwise to $op2";
} elsif($arg{context} =~ /assignment expression$/) {
$return = "$op1 if $expression otherwise to be $op2";
} else {
$return = "$op1 if $expression otherwise $op2";
}
} else { } else {
$return = $item{logical_OR_AND_expression}; $return = $item{logical_OR_AND_expression};
} }
@ -417,7 +424,7 @@ conditional_ternary_expression:
assignment_operator: assignment_operator:
'=' '='
{ {
if ($arg{context} eq 'statement') { if ($arg{context} =~ /statement$/) {
$return = ['Assign to^L', 'the value^L' ]; $return = ['Assign to^L', 'the value^L' ];
} elsif ($arg{context} eq 'for init') { } elsif ($arg{context} eq 'for init') {
$return = ['assigning to^L', 'the value^L' ]; $return = ['assigning to^L', 'the value^L' ];
@ -427,7 +434,7 @@ assignment_operator:
} }
| '+=' | '+='
{ {
if ($arg{context} eq 'statement') { if ($arg{context} =~ /statement$/) {
$return = ['Increment^L','by^L']; $return = ['Increment^L','by^L'];
} elsif ($arg{context} eq 'for init') { } elsif ($arg{context} eq 'for init') {
$return = ['incrementing^L','by^L']; $return = ['incrementing^L','by^L'];
@ -437,7 +444,7 @@ assignment_operator:
} }
| '-=' | '-='
{ {
if ($arg{context} eq 'statement') { if ($arg{context} =~ /statement$/) {
$return = ['Decrement^L', 'by^L']; $return = ['Decrement^L', 'by^L'];
} elsif ($arg{context} eq 'for init') { } elsif ($arg{context} eq 'for init') {
$return = ['decrementing^L' , 'by^L']; $return = ['decrementing^L' , 'by^L'];
@ -447,7 +454,7 @@ assignment_operator:
} }
| '*=' | '*='
{ {
if ($arg{context} eq 'statement') { if ($arg{context} =~ /statement$/) {
$return = ['Multiply^L' , 'by^L']; $return = ['Multiply^L' , 'by^L'];
} elsif ($arg{context} eq 'for init') { } elsif ($arg{context} eq 'for init') {
$return = ['multiplying^L' , 'by^L']; $return = ['multiplying^L' , 'by^L'];
@ -457,7 +464,7 @@ assignment_operator:
} }
| '/=' | '/='
{ {
if ($arg{context} eq 'statement') { if ($arg{context} =~ /statement$/) {
$return = ['Divide^L' , 'by^L' ]; $return = ['Divide^L' , 'by^L' ];
} elsif ($arg{context} eq 'for init') { } elsif ($arg{context} eq 'for init') {
$return = ['dividing^L' , 'by^L' ]; $return = ['dividing^L' , 'by^L' ];
@ -467,7 +474,7 @@ assignment_operator:
} }
| '%=' | '%='
{ {
if ($arg{context} eq 'statement') { if ($arg{context} =~ /statement$/) {
$return = ['Reduce^L', 'to modulo ^L'] ; $return = ['Reduce^L', 'to modulo ^L'] ;
} elsif ($arg{context} eq 'for init') { } elsif ($arg{context} eq 'for init') {
$return = ['reducing^L', 'to modulo ^L'] ; $return = ['reducing^L', 'to modulo ^L'] ;
@ -477,7 +484,7 @@ assignment_operator:
} }
| '<<=' | '<<='
{ {
if ($arg{context} eq 'statement') { if ($arg{context} =~ /statement$/) {
$return = ['Bit-shift^L', 'left by^L']; $return = ['Bit-shift^L', 'left by^L'];
} elsif ($arg{context} eq 'for init') { } elsif ($arg{context} eq 'for init') {
$return = ['bit-shifting^L', 'left by^L']; $return = ['bit-shifting^L', 'left by^L'];
@ -487,7 +494,7 @@ assignment_operator:
} }
| '>>=' | '>>='
{ {
if ($arg{context} eq 'statement') { if ($arg{context} =~ /statement$/) {
$return = ['Bit-shift^L', 'right by^L']; $return = ['Bit-shift^L', 'right by^L'];
} elsif ($arg{context} eq 'for init') { } elsif ($arg{context} eq 'for init') {
$return = ['bit-shifting^L', 'right by^L']; $return = ['bit-shifting^L', 'right by^L'];
@ -497,7 +504,7 @@ assignment_operator:
} }
| '&=' | '&='
{ {
if ($arg{context} eq 'statement') { if ($arg{context} =~ /statement$/) {
$return = ['Bit-wise ANDed^L', 'by^L' ]; $return = ['Bit-wise ANDed^L', 'by^L' ];
} elsif ($arg{context} eq 'for init') { } elsif ($arg{context} eq 'for init') {
$return = ['bit-wise ANDing^L', 'by^L' ]; $return = ['bit-wise ANDing^L', 'by^L' ];
@ -507,7 +514,7 @@ assignment_operator:
} }
| '^=' | '^='
{ {
if ($arg{context} eq 'statement') { if ($arg{context} =~ /statement$/) {
$return = ['Exclusive-OR^L','by^L']; $return = ['Exclusive-OR^L','by^L'];
} elsif ($arg{context} eq 'for init') { } elsif ($arg{context} eq 'for init') {
$return = ['exclusive-ORing^L','by^L']; $return = ['exclusive-ORing^L','by^L'];
@ -517,7 +524,7 @@ assignment_operator:
} }
| '|=' | '|='
{ {
if ($arg{context} eq 'statement') { if ($arg{context} =~ /statement$/) {
$return = ['Bit-wise ORed^L', 'by^L']; $return = ['Bit-wise ORed^L', 'by^L'];
} elsif ($arg{context} eq 'for init') { } elsif ($arg{context} eq 'for init') {
$return = ['bit-wise ORing^L', 'by^L']; $return = ['bit-wise ORing^L', 'by^L'];
@ -606,7 +613,7 @@ declaration:
my $inits = 0; my $inits = 0;
while(@init_list) { while(@init_list) {
$inits++; $inits++;
if(not $arg{context} eq 'struct memember') { if(not $arg{context} eq 'struct member') {
if($arg{context} eq 'for init') { if($arg{context} eq 'for init') {
$return .= "letting "; $return .= "letting ";
} else { } else {
@ -832,18 +839,26 @@ unary_expression:
{ $return = $item{postfix_expression}; } { $return = $item{postfix_expression}; }
| '++' unary_expression | '++' unary_expression
{ {
if ($arg{context} eq 'statement' ) { if ($arg{context} =~ /statement$/ ) {
$return = "pre-increment $item{unary_expression}"; $return = "pre-increment $item{unary_expression}";
} else { } else {
$return = "pre-incremented $item{unary_expression}"; if($item{unary_expression} =~ s/^the member//) {
$return = "the pre-incremented member $item{unary_expression}";
} else {
$return = "pre-incremented $item{unary_expression}";
}
} }
} }
| '--' unary_expression | '--' unary_expression
{ {
if ($arg{context} eq 'statement' ) { if ($arg{context} =~ /statement$/ ) {
$return = "Pre-decrement $item{unary_expression}"; $return = "Pre-decrement $item{unary_expression}";
} else { } else {
$return = "pre-decremented $item{unary_expression}"; if($item{unary_expression} =~ s/^the member//) {
$return = "the pre-decremented member $item{unary_expression}";
} else {
$return = "pre-decremented $item{unary_expression}";
}
} }
} }
| unary_operator cast_expression | unary_operator cast_expression
@ -893,10 +908,9 @@ postfix_productions:
} }
1; 1;
} }
| # array reference and plain expression | ('[' expression[context => 'array_address'] ']'
( '[' expression[context => 'array_address'] ']'
{ $return = $item{expression}; } { $return = $item{expression}; }
)(s) postfix_productions[context => 'array_address'](?) )(s) postfix_productions[context => "$arg{context}|array_address"](?)
{ {
my $expression = ''; my $expression = '';
if (@{$item[-2]}) { if (@{$item[-2]}) {
@ -910,7 +924,11 @@ postfix_productions:
$expression++; $expression++;
my ($last_digit) = $expression =~ /(\d)$/; my ($last_digit) = $expression =~ /(\d)$/;
if($last_digit == 1) { if($last_digit == 1) {
$expression .= 'st'; if($expression =~ /11$/) {
$expression .= 'th';
} else {
$expression .= 'st';
}
} elsif($last_digit == 2) { } elsif($last_digit == 2) {
$expression .= 'nd'; $expression .= 'nd';
} elsif($last_digit == 3) { } elsif($last_digit == 3) {
@ -921,7 +939,8 @@ postfix_productions:
if($arg{context} eq 'function call') { if($arg{context} eq 'function call') {
$return = "the $expression element of^L"; $return = "the $expression element of^L";
} else { } else {
$return = "the $expression element of ^L$arg{primary_expression}^L"; $return = "the $expression element of^L";
$return .= " $arg{primary_expression}" if $arg{primary_expression};
} }
} elsif($expression =~ /^-\s*\d+$/) { } elsif($expression =~ /^-\s*\d+$/) {
$expression *= -1; $expression *= -1;
@ -936,50 +955,77 @@ postfix_productions:
$return = "$postfix $return"; $return = "$postfix $return";
} }
} }
| '.' identifier postfix_productions[context => 'struct access'](?) | '.' identifier postfix_productions[context => "$arg{context}|struct access"](?)
{ {
my $identifier = $item[-2]; my $identifier = $item[-2];
my $postfix = $item[-1]->[0]; my $postfix = $item[-1]->[0];
if ($identifier) {
if($arg{context} eq 'array_address') {
$return = "the member $identifier of^L";
} else {
$return = "the member $identifier of^L";
$return .= " $arg{primary_expression}" if $arg{primary_expression};
}
}
if($postfix) { if($postfix) {
if(ref $postfix eq 'ARRAY') { if(ref $postfix eq 'ARRAY') {
$return = "$postfix->[0] $return $postfix->[1]"; $return = "$postfix->[0] the member $identifier $postfix->[1] of";
} else { } else {
$return = "$postfix $return"; if($arg{context} =~ /conditional/ or $arg{context} =~ /assignment expression/) {
$return = "$postfix member $identifier of";
$return .= " the" unless $arg{context} =~ /array_address/;
} else {
$postfix =~ s/ the(\^L)?$/$1/;
$return = "$postfix the member $identifier of";
$return .= " the" unless $arg{context} =~ /array_address/;
}
if($arg{primary_expression}) {
$return =~ s/ the(\^L)?$/$1/;
$return .= " ^L$arg{primary_expression}"
}
}
} else {
if($arg{context} =~ /array_address/) {
$return = "the member $identifier of^L";
} else {
$return = "the member $identifier of the^L";
if($arg{primary_expression}) {
$return =~ s/ the(\^L)?$/$1/;
$return .= " $arg{primary_expression}";
}
} }
} }
1;
} }
| '->' identifier postfix_productions[context => 'struct access'](?) | '->' identifier postfix_productions[context => "$arg{context}|struct access"](?)
{ {
my $identifier = $item[-2]; my $identifier = $item[-2];
my $postfix = $item[-1]->[0]; my $postfix = $item[-1]->[0];
if ($identifier) {
$return = "the member $identifier of the structure pointed to by $arg{primary_expression}";
}
if($postfix) { if($postfix) {
if(ref $postfix eq 'ARRAY') { if(ref $postfix eq 'ARRAY') {
$return = "$postfix->[0] $return $postfix->[1]"; $return = "$postfix->[0] the member $identifier $postfix->[1] of the structure pointed to by^L";
} else { } else {
$return = "$postfix $return"; if($arg{context} =~ /conditional/ or $arg{context} =~ /assignment expression/) {
$return = "$postfix member $identifier of the structure pointed to by the^L";
} else {
$postfix =~ s/ the(\^L)?$/$1/;
$return = "$postfix the member $identifier of the structure pointed to by the^L";
}
} }
} else {
$return = "the member $identifier of the structure pointed to by the^L";
} }
if($arg{primary_expression}) {
$return =~ s/ the(\^L)?$/$1/;
$return .= " $arg{primary_expression}";
}
1;
} }
| ('++')(s) | ('++')(s)
{ {
my $increment = join('',@{$item[-1]}); my $increment = join('',@{$item[-1]});
if ($increment) { if ($increment) {
if($arg{context} eq 'struct access' or $arg{context} =~ /statement/) { if($arg{context} =~ /struct access/) {
if($arg{context} =~ /conditional/ or $arg{context} =~ /assignment expression/) {
$return = "the post-incremented";
} else {
$return = "post-increment";
}
} elsif($arg{context} =~ /statement/) {
$return = ['increment', 'by one']; $return = ['increment', 'by one'];
} else { } else {
$return = "post-incremented $arg{primary_expression}"; $return = "post-incremented $arg{primary_expression}";
@ -990,8 +1036,14 @@ postfix_productions:
{ {
my $increment = join('',@{$item[-1]}); my $increment = join('',@{$item[-1]});
if ($increment) { if ($increment) {
if($arg{context} eq 'struct access' or $arg{context} =~ /statement/) { if($arg{context} =~ /struct access/) {
$return = ['decrement', 'by one']; if($arg{context} =~ /conditional/ or $arg{context} =~ /assignment expression/) {
$return = "the post-decremented";
} else {
$return = "post-decrement";
}
} elsif($arg{context} =~ /statement/) {
$return = ['decrement', 'by one'];
} else { } else {
$return = "post-decremented $arg{primary_expression}"; $return = "post-decremented $arg{primary_expression}";
} }
@ -1062,7 +1114,7 @@ primary_expression:
} }
$expression .= ')'; $expression .= ')';
if($arg{context} eq 'statement') { if($arg{context} =~ /statement$/) {
$return = "Evaluate the expression "; $return = "Evaluate the expression ";
} else { } else {
$return = "The result of the expression "; $return = "The result of the expression ";

2
modules/c2english/c2eng.pl
View File

@ -79,6 +79,8 @@ foreach my $arg (@ARGV) {
$output =~ s/the value the member/the value of the member/g; $output =~ s/the value the member/the value of the member/g;
$output =~ s/the value the/the/g; $output =~ s/the value the/the/g;
$output =~ s/of evaluate/of/g; $output =~ s/of evaluate/of/g;
$output =~ s/the evaluate the/the/g;
$output =~ s/by evaluate the/by the/g;
foreach my $quote (@quotes) { foreach my $quote (@quotes) {
next unless $quote; next unless $quote;