GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-10-01 17:16:39 +02:00
Code Issues Projects Releases Wiki Activity

CGrammar: Remove "the list" from initializer lists; restore skipping of whitespace to struct/union/enum specifier

Browse Source
This commit is contained in:
Pragmatic Software 2014-07-02 16:54:02 +00:00
parent 7b42e9220e
commit 07f9ef6120
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PBot/VERSION.pm
View File

@ -13,7 +13,7 @@ use warnings;
# These are set automatically by the build/commit script # These are set automatically by the build/commit script
use constant { use constant {
BUILD_NAME => "PBot", BUILD_NAME => "PBot",
BUILD_REVISION => 693, BUILD_REVISION => 694,
BUILD_DATE => "2014-07-02", BUILD_DATE => "2014-07-02",
}; };

8
modules/c2english/CGrammar.pm
View File

@ -819,7 +819,7 @@ initializer:
} }
} }
| '{' comment(?) initializer_list (',' )(?) '}' | '{' comment(?) initializer_list (',' )(?) '}'
{ $return = 'the list { ' . $item{'initializer_list'} . ' }'; } { $return = '{ ' . $item{'initializer_list'} . ' }'; }
initializer_list: initializer_list:
<leftop: initializer ',' initializer > <leftop: initializer ',' initializer >
@ -1129,7 +1129,7 @@ postfix_expression:
| '(' type_name ')' '{' initializer_list '}' postfix_productions[context => "$arg{context}|compound literal"](?) | '(' type_name ')' '{' initializer_list '}' postfix_productions[context => "$arg{context}|compound literal"](?)
{ {
my $postfix = $item[-1]->[0]; my $postfix = $item[-1]->[0];
$return = "A compound-literal of type $item{type_name} initialized to the list { $item{initializer_list} }"; $return = "A compound-literal of type $item{type_name} initialized to { $item{initializer_list} }";
$return = "$postfix $return" if $postfix; $return = "$postfix $return" if $postfix;
} }
@ -1462,8 +1462,8 @@ type_specifier:
| 'div_t' | 'ldiv_t' | 'lldiv_t' | 'imaxdiv_t' | 'div_t' | 'ldiv_t' | 'lldiv_t' | 'imaxdiv_t'
| 'cnd_t' | 'thrd_t' | 'tss_t' | 'mtx_t' | 'tss_dtor_t' | 'thrd_start_t' | 'once_flag' | 'cnd_t' | 'thrd_t' | 'tss_t' | 'mtx_t' | 'tss_dtor_t' | 'thrd_start_t' | 'once_flag'
| 'clock_t' | 'time_t' | 'clock_t' | 'time_t'
| struct_or_union_specifier | <skip:'[\s]*'> struct_or_union_specifier
| enum_specifier | <skip:'[\s]*'> enum_specifier
| typedef_name) .../\W/ | typedef_name) .../\W/
{ $return = $item[3]; } { $return = $item[3]; }