Skip to content

W
wine-winehq
Commit 3e16b374 authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard
Browse files
Options

widl: Support declaring multiple namespaces at once.

Using the namespace A.B.C {} syntax, used in a few some places in WinRT IDLs. Signed-off-by: 's avatarRémi Bernon <rbernon@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 85ff05a5
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 8 deletions
tools/widl/parser.y
View file @ 3e16b374
...@@ -70,8 +70,8 @@ static struct namespace *find_namespace_or_error(struct namespace *namespace, co ...@@ -70,8 +70,8 @@ static struct namespace *find_namespace_or_error(struct namespace *namespace, co
static var_t *reg_const(var_t *var); static var_t *reg_const(var_t *var);
static void push_namespace(const char *name); static void push_namespaces(str_list_t *names);
static void pop_namespace(const char *name); static void pop_namespaces(str_list_t *names);
static void push_parameters_namespace(const char *name); static void push_parameters_namespace(const char *name);
static void pop_parameters_namespace(const char *name); static void pop_parameters_namespace(const char *name);
...@@ -293,7 +293,7 @@ static typelib_t *current_typelib; ...@@ -293,7 +293,7 @@ static typelib_t *current_typelib;
%type <type> dispinterfaceref %type <type> dispinterfaceref
%type <type> dispinterface dispinterfacedef %type <type> dispinterface dispinterfacedef
%type <type> module moduledef %type <type> module moduledef
%type <str> namespacedef %type <str_list> namespacedef
%type <type> base_type int_std %type <type> base_type int_std
%type <type> enumdef structdef uniondef typedecl %type <type> enumdef structdef uniondef typedecl
%type <type> type unqualified_type qualified_type %type <type> type unqualified_type qualified_type
...@@ -385,8 +385,8 @@ imp_decl_statements: { $$ = NULL; } ...@@ -385,8 +385,8 @@ imp_decl_statements: { $$ = NULL; }
imp_decl_block: tDECLARE '{' imp_decl_statements '}' { $$ = $3; } imp_decl_block: tDECLARE '{' imp_decl_statements '}' { $$ = $3; }
gbl_statements: { $$ = NULL; } gbl_statements: { $$ = NULL; }
| gbl_statements namespacedef '{' { push_namespace($2); } gbl_statements '}' | gbl_statements namespacedef '{' { push_namespaces($2); } gbl_statements '}'
{ pop_namespace($2); $$ = append_statements($1, $5); } { pop_namespaces($2); $$ = append_statements($1, $5); }
| gbl_statements interface ';' { $$ = append_statement($1, make_statement_reference($2)); } | gbl_statements interface ';' { $$ = append_statement($1, make_statement_reference($2)); }
| gbl_statements dispinterface ';' { $$ = append_statement($1, make_statement_reference($2)); } | gbl_statements dispinterface ';' { $$ = append_statement($1, make_statement_reference($2)); }
| gbl_statements interfacedef { $$ = append_statement($1, make_statement_type_decl($2)); } | gbl_statements interfacedef { $$ = append_statement($1, make_statement_type_decl($2)); }
...@@ -412,8 +412,8 @@ gbl_statements: { $$ = NULL; } ...@@ -412,8 +412,8 @@ gbl_statements: { $$ = NULL; }
imp_statements: { $$ = NULL; } imp_statements: { $$ = NULL; }
| imp_statements interface ';' { $$ = append_statement($1, make_statement_reference($2)); } | imp_statements interface ';' { $$ = append_statement($1, make_statement_reference($2)); }
| imp_statements dispinterface ';' { $$ = append_statement($1, make_statement_reference($2)); } | imp_statements dispinterface ';' { $$ = append_statement($1, make_statement_reference($2)); }
| imp_statements namespacedef '{' { push_namespace($2); } imp_statements '}' | imp_statements namespacedef '{' { push_namespaces($2); } imp_statements '}'
{ pop_namespace($2); $$ = append_statements($1, $5); } { pop_namespaces($2); $$ = append_statements($1, $5); }
| imp_statements interfacedef { $$ = append_statement($1, make_statement_type_decl($2)); } | imp_statements interfacedef { $$ = append_statement($1, make_statement_type_decl($2)); }
| imp_statements delegatedef { $$ = append_statement($1, make_statement_type_decl($2)); } | imp_statements delegatedef { $$ = append_statement($1, make_statement_type_decl($2)); }
| imp_statements coclass ';' { $$ = $1; reg_type($2, $2->name, current_namespace, 0); } | imp_statements coclass ';' { $$ = $1; reg_type($2, $2->name, current_namespace, 0); }
...@@ -992,7 +992,8 @@ apicontract_def: attributes apicontract '{' '}' semicolon_opt ...@@ -992,7 +992,8 @@ apicontract_def: attributes apicontract '{' '}' semicolon_opt
{ $$ = type_apicontract_define($2, $1); } { $$ = type_apicontract_define($2, $1); }
; ;
namespacedef: tNAMESPACE aIDENTIFIER { $$ = $2; } namespacedef: tNAMESPACE aIDENTIFIER { $$ = append_str( NULL, $2 ); }
| namespacedef '.' aIDENTIFIER { $$ = append_str( $1, $3 ); }
; ;
class_interfaces: { $$ = NULL; } class_interfaces: { $$ = NULL; }
...@@ -2041,6 +2042,20 @@ static void pop_namespace(const char *name) ...@@ -2041,6 +2042,20 @@ static void pop_namespace(const char *name)
current_namespace = current_namespace->parent; current_namespace = current_namespace->parent;
} }
static void push_namespaces(str_list_t *names)
{
const struct str_list_entry_t *name;
LIST_FOR_EACH_ENTRY(name, names, const struct str_list_entry_t, entry)
push_namespace(name->str);
}
static void pop_namespaces(str_list_t *names)
{
const struct str_list_entry_t *name;
LIST_FOR_EACH_ENTRY_REV(name, names, const struct str_list_entry_t, entry)
pop_namespace(name->str);
}
static void push_parameters_namespace(const char *name) static void push_parameters_namespace(const char *name)
{ {
struct namespace *namespace; struct namespace *namespace;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment