Mike McCormack : widl: Implement dispinterfaces derived from an interface.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 609cd3027749067a70bcdfa5054be71669f19fcc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=609cd3027749067a70bcdfa505...

Author: Mike McCormack 
Date:   Tue Feb  6 18:09:17 2007 +0900

widl: Implement dispinterfaces derived from an interface.

---

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

diff --git a/tools/widl/parser.y b/tools/widl/parser.y
index 1741b83..9cd1b12 100644
--- a/tools/widl/parser.y
+++ b/tools/widl/parser.y
@@ -726,13 +726,13 @@ dispinterfacedef: dispinterfacehdr '{'
    					  if (!parse_only && do_header) write_dispinterface($$);
    					  if (!parse_only && do_idfile) write_diid($$);
    					}
-/* FIXME: not sure how to handle this yet
-	| dispinterfacehdr '{' interface '}'	{ $$ = $1;
-						  compute_method_indexes($$);
-						  if (!parse_only && do_header) write_interface($$);
-						  if (!parse_only && do_idfile) write_iid($$);
+	| dispinterfacehdr
+	 '{' interface ';' '}'			{ $$ = $1;
+						  $$->fields = $3->fields;
+						  $$->funcs = $3->funcs;
+						  if (!parse_only && do_header) write_dispinterface($$);
+						  if (!parse_only && do_idfile) write_diid($$);
    					}
-*/
    ;

inherit:					{ $$ = NULL; }