ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

widl: Allow attributes before and after typedef-keyword.

This commit is contained in:
Kai Tietz 2013-08-08 15:59:27 +02:00 committed by Alexandre Julliard
parent 499f05433a
commit d8318121a2
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/widl/parser.y
View File

@ -122,6 +122,7 @@ static statement_t *make_statement_import(const char *str);
static statement_t *make_statement_typedef(var_list_t *names); static statement_t *make_statement_typedef(var_list_t *names);
static statement_list_t *append_statement(statement_list_t *list, statement_t *stmt); static statement_list_t *append_statement(statement_list_t *list, statement_t *stmt);
static statement_list_t *append_statements(statement_list_t *, statement_list_t *); static statement_list_t *append_statements(statement_list_t *, statement_list_t *);
static attr_list_t *append_attribs(attr_list_t *, attr_list_t *);
%} %}
%union { %union {
@ -1093,9 +1094,10 @@ type: tVOID { $$ = type_new_void(); }
| tSAFEARRAY '(' type ')' { $$ = make_safearray($3); } | tSAFEARRAY '(' type ')' { $$ = make_safearray($3); }
; ;
typedef: tTYPEDEF m_attributes decl_spec declarator_list typedef: m_attributes tTYPEDEF m_attributes decl_spec declarator_list
{ reg_typedefs($3, $4, check_typedef_attrs($2)); { $1 = append_attribs($1, $3);
$$ = make_statement_typedef($4); reg_typedefs($4, $5, check_typedef_attrs($1));
$$ = make_statement_typedef($5);
} }
; ;
@ -2802,6 +2804,14 @@ static statement_list_t *append_statements(statement_list_t *l1, statement_list_
return l1; return l1;
} }
static attr_list_t *append_attribs(attr_list_t *l1, attr_list_t *l2)
{
if (!l2) return l1;
if (!l1 || l1 == l2) return l2;
list_move_tail (l1, l2);
return l1;
}
static statement_list_t *append_statement(statement_list_t *list, statement_t *stmt) static statement_list_t *append_statement(statement_list_t *list, statement_t *stmt)
{ {
if (!stmt) return list; if (!stmt) return list;