Alexandre Julliard : widl: Fix parsing of function calling conventions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7d2869457f4198aa09e92a692e6e64cbd4968270
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7d2869457f4198aa09e92a692e...

Author: Alexandre Julliard 
Date:   Fri Aug 27 13:49:56 2010 +0200

widl: Fix parsing of function calling conventions.

---

tools/widl/parser.y |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/widl/parser.y b/tools/widl/parser.y
index db071a7..1900d77 100644
--- a/tools/widl/parser.y
+++ b/tools/widl/parser.y
@@ -926,7 +926,8 @@ decl_spec_no_type:
 declarator:
      '*' m_type_qual_list declarator %prec PPTR
    					{ $$ = $3; $$->type = append_ptrchain_type($$->type, type_new_pointer(pointer_default, NULL, $2)); }
-	| callconv declarator			{ $$ = $2; $$->type->attrs = append_attr($$->type->attrs, make_attrp(ATTR_CALLCONV, $1)); }
+	| callconv declarator			{ $$ = $2; if ($$->func_type) $$->func_type->attrs = append_attr($$->func_type->attrs, make_attrp(ATTR_CALLCONV, $1));
+						           else if ($$->type) $$->type->attrs = append_attr($$->type->attrs, make_attrp(ATTR_CALLCONV, $1)); }
    | direct_declarator
    ;

@@ -944,7 +945,8 @@ direct_declarator:
 abstract_declarator:
      '*' m_type_qual_list m_abstract_declarator %prec PPTR
    					{ $$ = $3; $$->type = append_ptrchain_type($$->type, type_new_pointer(pointer_default, NULL, $2)); }
-	| callconv m_abstract_declarator	{ $$ = $2; $$->type->attrs = append_attr($$->type->attrs, make_attrp(ATTR_CALLCONV, $1)); }
+	| callconv m_abstract_declarator	{ $$ = $2; if ($$->func_type) $$->func_type->attrs = append_attr($$->func_type->attrs, make_attrp(ATTR_CALLCONV, $1));
+						           else if ($$->type) $$->type->attrs = append_attr($$->type->attrs, make_attrp(ATTR_CALLCONV, $1)); }
    | abstract_direct_declarator
    ;

@@ -952,7 +954,8 @@ abstract_declarator:
 abstract_declarator_no_direct:
      '*' m_type_qual_list m_any_declarator %prec PPTR
    					{ $$ = $3; $$->type = append_ptrchain_type($$->type, type_new_pointer(pointer_default, NULL, $2)); }
-	| callconv m_any_declarator		{ $$ = $2; $$->type->attrs = append_attr($$->type->attrs, make_attrp(ATTR_CALLCONV, $1)); }
+	| callconv m_any_declarator		{ $$ = $2; if ($$->func_type) $$->func_type->attrs = append_attr($$->func_type->attrs, make_attrp(ATTR_CALLCONV, $1));
+						           else if ($$->type) $$->type->attrs = append_attr($$->type->attrs, make_attrp(ATTR_CALLCONV, $1)); }
    ;

/* abstract declarator or empty */