From 99aea7fe633957ba93b733a23ef502144e659574 Mon Sep 17 00:00:00 2001 From: Pragmatic Software Date: Fri, 27 Jun 2014 11:38:54 +0000 Subject: [PATCH] CGrammar: Fix translation of multiple type specifiers, e.g. `long double` no longer becomes `double long` --- PBot/VERSION.pm | 2 +- modules/c2english/CGrammar.pm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm index 14ebe1a4..6d8b8f3e 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 => 681, + BUILD_REVISION => 682, BUILD_DATE => "2014-06-27", }; diff --git a/modules/c2english/CGrammar.pm b/modules/c2english/CGrammar.pm index ca36a602..1c480946 100644 --- a/modules/c2english/CGrammar.pm +++ b/modules/c2english/CGrammar.pm @@ -1270,12 +1270,12 @@ declaration_specifiers: if ($decl_spec) { $return .= " $decl_spec"; } } } - | comment(?) type_specifier declaration_specifiers(?) + | comment(?) type_specifier(s) declaration_specifiers(?) { my $decl_spec = join(' ', @{$item{'declaration_specifiers(?)'}}); $return = join('',@{$item{'comment(?)'}}); $return .= "$decl_spec " if $decl_spec; - $return .= $item{type_specifier}; + $return .= join(' ', @{$item{'type_specifier(s)'}}); } | comment(?) type_qualifier declaration_specifiers(?) {