GitHub
/
pbot
mirror of https://github.com/pragma-/pbot.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

CGrammar: Improve enumeration translation

This commit is contained in:
Pragmatic Software 2014-06-09 10:18:26 +00:00
parent ffab2c6f3b
commit 9992119b11
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PBot/VERSION.pm
View File

@ -13,7 +13,7 @@ use warnings;
# These are set automatically by the build/commit script
use constant {
BUILD_NAME => "PBot",
BUILD_REVISION => 622,
BUILD_REVISION => 623,
BUILD_DATE => "2014-06-09",
};

15
modules/c2english/CGrammar.pm
View File

@ -1137,7 +1137,7 @@ typedef_name:
foreach (@defined_types) {
if ($item{identifier} eq $_) {
$answer = 1;
$return = ($item{identifier} =~ m/^[aeiouy]/ ? 'an ' : 'a ') . $item{identifier};
$return = ($item{identifier} =~ m/^`[aeiouy]/ ? 'an ' : 'a ') . $item{identifier};
}
}
if (!$answer) { undef $answer; }
@ -1218,21 +1218,22 @@ enum_specifier:
{
$return .= 'an enumeration';
if (@{$item{'identifier(?)'}}){
$return .= ' of ' . join('',@{$item{'identifier(?)'}});
}
my @enumerator_list = @{$item{enumerator_list}};
if(@enumerator_list == 1) {
$return .= " of $enumerator_list[0]";
$return .= " comprising $enumerator_list[0]";
} else {
my $last = pop @enumerator_list;
$return .= ' of ' . join(', ', @enumerator_list) . " and $last";
$return .= ' comprising ' . join(', ', @enumerator_list) . " and $last";
}
if (@{$item{'identifier(?)'}}){
$return .= ' identified as ' . join('',@{$item{'identifier(?)'}});
}
}
| 'enum' identifier
{ $return = ($item{identifer} =~ m/^[aieouy]/ ? 'an ' : 'a ') . "$item{identifier} enumeration"; }
{ $return = "an enumeration of type $item{identifier}"; }
enumerator_list: