diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm index f18e0f3a..35c3eaa6 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 => 699, + BUILD_REVISION => 700, BUILD_DATE => "2014-07-03", }; diff --git a/modules/c2english/CGrammar.pm b/modules/c2english/CGrammar.pm index 68c539fc..13ea19f5 100644 --- a/modules/c2english/CGrammar.pm +++ b/modules/c2english/CGrammar.pm @@ -788,6 +788,7 @@ declaration: $return .= " $initializers[0]->[1]"; } } + $return =~ s/,$//; $return .= ".\n" unless $arg{context} eq 'for init'; } } @@ -1552,7 +1553,7 @@ struct_or_union_specifier: $return = join('',@{$item{'comment(?)'}}) . $item{struct_or_union}; if ($identifier) { $return .= " tagged $identifier"; } my $plural = $item{struct_declaration_list} =~ / and / ? 's' : ''; - $return .= " with member$plural $item{struct_declaration_list}"; + $return .= ", with member$plural $item{struct_declaration_list},"; } | struct_or_union identifier {