Dan Hipschman : widl: Ignore libraries in imported IDL files.
Alexandre Julliard
julliard at winehq.org
Wed Mar 19 07:28:15 CDT 2008
Module: wine
Branch: master
Commit: d37b1a4969896d69d782b7ec55fc4e85690af0a7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d37b1a4969896d69d782b7ec55fc4e85690af0a7
Author: Dan Hipschman <dsh at linux.ucla.edu>
Date: Tue Mar 18 18:30:28 2008 -0700
widl: Ignore libraries in imported IDL files.
---
tools/widl/parser.y | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/tools/widl/parser.y b/tools/widl/parser.y
index 499ae15..aff7c4c 100644
--- a/tools/widl/parser.y
+++ b/tools/widl/parser.y
@@ -320,6 +320,7 @@ imp_statements: {}
| imp_statements moduledef { if (!parse_only) add_typelib_entry($2); }
| imp_statements statement {}
| imp_statements importlib {}
+ | imp_statements librarydef {}
;
int_statements: { $$ = NULL; }
@@ -363,12 +364,12 @@ importlib: tIMPORTLIB '(' aSTRING ')' { if(!parse_only) add_importlib($3); }
libraryhdr: tLIBRARY aIDENTIFIER { $$ = $2; }
;
-library_start: attributes libraryhdr '{' { start_typelib($2, $1);
+library_start: attributes libraryhdr '{' { if (!parse_only) start_typelib($2, $1);
if (!parse_only && do_header) write_library($2, $1);
if (!parse_only && do_idfile) write_libid($2, $1);
}
;
-librarydef: library_start imp_statements '}' { end_typelib(); }
+librarydef: library_start imp_statements '}' { if (!parse_only) end_typelib(); }
;
m_args: { $$ = NULL; }
More information about the wine-cvs
mailing list