Rémi Bernon : widl: Fold inherit cases by using typename rule in qualified_type.
Alexandre Julliard
julliard at winehq.org
Mon Feb 8 15:46:41 CST 2021
Module: wine
Branch: master
Commit: 509daf4d23c475a10ae120e0f7644cfa2056b375
URL: https://source.winehq.org/git/wine.git/?a=commit;h=509daf4d23c475a10ae120e0f7644cfa2056b375
Author: Rémi Bernon <rbernon at codeweavers.com>
Date: Mon Feb 8 09:30:47 2021 +0100
widl: Fold inherit cases by using typename rule in qualified_type.
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
tools/widl/parser.y | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/tools/widl/parser.y b/tools/widl/parser.y
index d3a79e9fcb7..bbf71a2e3ef 100644
--- a/tools/widl/parser.y
+++ b/tools/widl/parser.y
@@ -892,7 +892,7 @@ namespace_pfx:
;
qualified_type:
- aKNOWNTYPE { $$ = find_type_or_error(current_namespace, $1); }
+ typename { $$ = find_type_or_error(current_namespace, $1); }
| namespace_pfx typename { $$ = find_type_or_error($1, $2); }
;
@@ -960,11 +960,6 @@ interfacedef: attributes interface inherit
'{' int_statements '}' semicolon_opt { $$ = type_interface_define($2, $1, $3, $5);
check_async_uuid($$);
}
-/* MIDL is able to import the definition of a base class from inside the
- * definition of a derived class, I'll try to support it with this rule */
- | attributes interface ':' aIDENTIFIER
- '{' import int_statements '}'
- semicolon_opt { $$ = type_interface_define($2, $1, find_type_or_error(current_namespace, $4), $7); }
| dispinterfacedef semicolon_opt { $$ = $1; }
;
More information about the wine-cvs
mailing list