GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-11-26 22:09:26 +01:00
Code Issues Projects Releases Wiki Activity

Minor C grammar improvements

Browse Source
This commit is contained in:
Pragmatic Software 2016-02-21 01:41:47 -08:00
parent 00d5cef482
commit bd19b134c3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/c2english/CGrammar.pm
View File

@ -1265,7 +1265,7 @@ argument_expression_list:
my $last = ''; my $last = '';
if (@arg_exp_list > 2) { if (@arg_exp_list > 2) {
$last = pop @arg_exp_list; $last = pop @arg_exp_list;
$return = 's ' . join(', ^L', @arg_exp_list) . ", and ^L$last"; $return = 's ' . join(', ^L', @arg_exp_list) . " and ^L$last";
} elsif (@arg_exp_list == 2 ) { } elsif (@arg_exp_list == 2 ) {
$return = "s ^L$arg_exp_list[0] and ^L$arg_exp_list[1]"; $return = "s ^L$arg_exp_list[0] and ^L$arg_exp_list[1]";
} else { } else {
@ -1443,7 +1443,7 @@ identifier_list:
{ {
my @identifier_list = @{$item[1]}; my @identifier_list = @{$item[1]};
if ($#identifier_list > 1) { if ($#identifier_list > 1) {
$return = join(', ', @identifier_list) . ', and ' . $item{identifier}; $return = join(', ', @identifier_list) . ' and ' . $item{identifier};
} elsif ($#identifier_list == 1) { } elsif ($#identifier_list == 1) {
$return = $identifier_list[1] . ' and ' . $item{identifier}; $return = $identifier_list[1] . ' and ' . $item{identifier};
} else { } else {
@ -1751,7 +1751,7 @@ struct_declaration_list:
my @declarations = @{$item{'struct_declaration(s)'}}; my @declarations = @{$item{'struct_declaration(s)'}};
if ($#declarations > 1) { if ($#declarations > 1) {
$finaldec = pop @declarations; $finaldec = pop @declarations;
$return = join(', ', @declarations ) . ', and ' . $finaldec ; $return = join(', ', @declarations ) . ' and ' . $finaldec;
} elsif ($#declarations == 1) { } elsif ($#declarations == 1) {
$return = join(' and ', @declarations); $return = join(' and ', @declarations);
} else { } else {
@ -1810,7 +1810,7 @@ enum_specifier:
$return .= " comprising $enumerator_list[0]"; $return .= " comprising $enumerator_list[0]";
} else { } else {
my $last = pop @enumerator_list; my $last = pop @enumerator_list;
$return .= ' comprising ' . join(', ', @enumerator_list) . ", and $last"; $return .= ' comprising ' . join(', ', @enumerator_list) . " and $last";
} }
} }
@ -1904,7 +1904,7 @@ constant:
$return = "a $modifier" . 'tab'; $return = "a $modifier" . 'tab';
} elsif ($constant eq q('\v')) { } elsif ($constant eq q('\v')) {
$return = "a $modifier" . 'vertical tab'; $return = "a $modifier" . 'vertical tab';
} elsif ($constant eq q('\b')) { } elsif ($constant eq q('\a')) {
$return = 'an alert character' if not length $modifier; $return = 'an alert character' if not length $modifier;
$return = "a $modifier" . 'alert character' if length $modifier; $return = "a $modifier" . 'alert character' if length $modifier;
} elsif ($constant eq q('\r')) { } elsif ($constant eq q('\r')) {