diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm index 7cf9e728..aefcbc10 100644 --- a/PBot/VERSION.pm +++ b/PBot/VERSION.pm @@ -13,7 +13,7 @@ use warnings; # These are set automatically by the build/commit script use constant { BUILD_NAME => "PBot", - BUILD_REVISION => 718, + BUILD_REVISION => 719, BUILD_DATE => "2014-07-07", }; diff --git a/modules/c2english/CGrammar.pm b/modules/c2english/CGrammar.pm index 08e3060f..644e193b 100644 --- a/modules/c2english/CGrammar.pm +++ b/modules/c2english/CGrammar.pm @@ -1658,7 +1658,7 @@ struct_or_union_specifier: my $identifier = join('',@{$item{'identifier(?)'}}); $return = join('',@{$item{'comment(?)'}}) . $item{struct_or_union}; if ($identifier) { $return .= " tagged $identifier"; } - my $plural = $item{struct_declaration_list} =~ / and / ? 's' : ''; + my $plural = $item{struct_declaration_list} =~ / and (?!returning)/ ? 's' : ''; $return .= ", with member$plural $item{struct_declaration_list},"; } | struct_or_union identifier