diff --git a/modules/c2english/CGrammar.pm b/modules/c2english/CGrammar.pm index eff0a9b6..5a52e29b 100644 --- a/modules/c2english/CGrammar.pm +++ b/modules/c2english/CGrammar.pm @@ -1680,7 +1680,7 @@ atomic_type_specifier: type_specifier: /\s*/ - (typedef_name | 'void' | 'double' | 'float' | 'char' | 'short' | 'int' | 'long' + ('void' | 'signed' | 'unsigned' | 'FILE' | 'fpos_t' | 'bool' | '_Bool' @@ -1703,7 +1703,8 @@ type_specifier: | 'clock_t' | 'time_t' | struct_or_union_specifier | enum_specifier - | atomic_type_specifier + | atomic_type_specifier | typedef_name + | 'double' | 'float' | 'char' | 'short' | 'int' | 'long' ) .../\W/ { $return = $item[3]; } diff --git a/modules/c2english/c2eng.pl b/modules/c2english/c2eng.pl index 8efec339..e603420a 100755 --- a/modules/c2english/c2eng.pl +++ b/modules/c2english/c2eng.pl @@ -78,6 +78,7 @@ foreach my $arg (@ARGV) { $output =~ s/the function a generic-selection/the function resulting from a generic-selection/g; $output =~ s/\.\s+Then exit switch block/ and then exit switch block/g; $output =~ s/,\././g; + $output =~ s/const const/const/g; foreach my $quote (@quotes) { next unless $quote;