Skip to content

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

widl: Rename ifref_list_t to typeref_list_t.

Signed-off-by: 's avatarRémi Bernon <rbernon@codeweavers.com> Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 7987c6f9
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 23 deletions
tools/widl/parser.y
View file @ 84966c9b
...@@ -57,7 +57,7 @@ static attr_t *make_custom_attr(UUID *id, expr_t *pval); ...@@ -57,7 +57,7 @@ static attr_t *make_custom_attr(UUID *id, expr_t *pval);
static expr_list_t *append_expr(expr_list_t *list, expr_t *expr); static expr_list_t *append_expr(expr_list_t *list, expr_t *expr);
static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, declarator_t *decl, int top); static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, declarator_t *decl, int top);
static var_list_t *set_var_types(attr_list_t *attrs, decl_spec_t *decl_spec, declarator_list_t *decls); static var_list_t *set_var_types(attr_list_t *attrs, decl_spec_t *decl_spec, declarator_list_t *decls);
static ifref_list_t *append_typeref(ifref_list_t *list, typeref_t *ref); static typeref_list_t *append_typeref(typeref_list_t *list, typeref_t *ref);
static typeref_t *make_typeref(type_t *type); static typeref_t *make_typeref(type_t *type);
static var_list_t *append_var_list(var_list_t *list, var_list_t *vars); static var_list_t *append_var_list(var_list_t *list, var_list_t *vars);
static declarator_list_t *append_declarator(declarator_list_t *list, declarator_t *p); static declarator_list_t *append_declarator(declarator_list_t *list, declarator_t *p);
...@@ -138,7 +138,7 @@ static typelib_t *current_typelib; ...@@ -138,7 +138,7 @@ static typelib_t *current_typelib;
warning_t *warning; warning_t *warning;
warning_list_t *warning_list; warning_list_t *warning_list;
typeref_t *typeref; typeref_t *typeref;
ifref_list_t *ifref_list; typeref_list_t *typeref_list;
char *str; char *str;
UUID *uuid; UUID *uuid;
unsigned int num; unsigned int num;
...@@ -294,8 +294,8 @@ static typelib_t *current_typelib; ...@@ -294,8 +294,8 @@ static typelib_t *current_typelib;
%type <type> type_parameter %type <type> type_parameter
%type <type_list> type_parameters %type <type_list> type_parameters
%type <typeref> class_interface %type <typeref> class_interface
%type <ifref_list> class_interfaces %type <typeref_list> class_interfaces
%type <ifref_list> requires required_types %type <typeref_list> requires required_types
%type <var> arg ne_union_field union_field s_field case enum enum_member declaration %type <var> arg ne_union_field union_field s_field case enum enum_member declaration
%type <var> funcdef %type <var> funcdef
%type <var_list> m_args arg_list args dispint_meths %type <var_list> m_args arg_list args dispint_meths
...@@ -1814,7 +1814,7 @@ static var_list_t *set_var_types(attr_list_t *attrs, decl_spec_t *decl_spec, dec ...@@ -1814,7 +1814,7 @@ static var_list_t *set_var_types(attr_list_t *attrs, decl_spec_t *decl_spec, dec
return var_list; return var_list;
} }
static ifref_list_t *append_typeref(ifref_list_t *list, typeref_t *ref) static typeref_list_t *append_typeref(typeref_list_t *list, typeref_t *ref)
{ {
if (!ref) return list; if (!ref) return list;
if (!list) if (!list)
......
tools/widl/typetree.c
View file @ 84966c9b
...@@ -425,7 +425,7 @@ type_t *type_interface_declare(char *name, struct namespace *namespace) ...@@ -425,7 +425,7 @@ type_t *type_interface_declare(char *name, struct namespace *namespace)
return type; return type;
} }
type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, ifref_list_t *requires) type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, typeref_list_t *requires)
{ {
if (iface->defined) if (iface->defined)
error_loc("interface %s already defined at %s:%d\n", error_loc("interface %s already defined at %s:%d\n",
...@@ -526,7 +526,7 @@ type_t *type_coclass_declare(char *name) ...@@ -526,7 +526,7 @@ type_t *type_coclass_declare(char *name)
return type; return type;
} }
type_t *type_coclass_define(type_t *coclass, attr_list_t *attrs, ifref_list_t *ifaces) type_t *type_coclass_define(type_t *coclass, attr_list_t *attrs, typeref_list_t *ifaces)
{ {
if (coclass->defined) if (coclass->defined)
error_loc("coclass %s already defined at %s:%d\n", error_loc("coclass %s already defined at %s:%d\n",
...@@ -546,10 +546,10 @@ type_t *type_runtimeclass_declare(char *name, struct namespace *namespace) ...@@ -546,10 +546,10 @@ type_t *type_runtimeclass_declare(char *name, struct namespace *namespace)
return type; return type;
} }
type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, ifref_list_t *ifaces) type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, typeref_list_t *ifaces)
{ {
typeref_t *ref, *required, *tmp; typeref_t *ref, *required, *tmp;
ifref_list_t *requires; typeref_list_t *requires;
if (runtimeclass->defined) if (runtimeclass->defined)
error_loc("runtimeclass %s already defined at %s:%d\n", error_loc("runtimeclass %s already defined at %s:%d\n",
...@@ -614,7 +614,7 @@ type_t *type_parameterized_interface_declare(char *name, struct namespace *names ...@@ -614,7 +614,7 @@ type_t *type_parameterized_interface_declare(char *name, struct namespace *names
return type; return type;
} }
type_t *type_parameterized_interface_define(type_t *type, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, ifref_list_t *requires) type_t *type_parameterized_interface_define(type_t *type, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, typeref_list_t *requires)
{ {
type_t *iface; type_t *iface;
if (type->defined) if (type->defined)
......
tools/widl/typetree.h
View file @ 84966c9b
...@@ -53,17 +53,17 @@ type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *unio ...@@ -53,17 +53,17 @@ type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *unio
type_t *type_new_bitfield(type_t *field_type, const expr_t *bits); type_t *type_new_bitfield(type_t *field_type, const expr_t *bits);
type_t *type_runtimeclass_declare(char *name, struct namespace *namespace); type_t *type_runtimeclass_declare(char *name, struct namespace *namespace);
type_t *type_interface_declare(char *name, struct namespace *namespace); type_t *type_interface_declare(char *name, struct namespace *namespace);
type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, ifref_list_t *requires); type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, typeref_list_t *requires);
type_t *type_dispinterface_declare(char *name); type_t *type_dispinterface_declare(char *name);
type_t *type_dispinterface_define(type_t *iface, attr_list_t *attrs, var_list_t *props, var_list_t *methods); type_t *type_dispinterface_define(type_t *iface, attr_list_t *attrs, var_list_t *props, var_list_t *methods);
type_t *type_dispinterface_define_from_iface(type_t *dispiface, attr_list_t *attrs, type_t *iface); type_t *type_dispinterface_define_from_iface(type_t *dispiface, attr_list_t *attrs, type_t *iface);
type_t *type_module_define(type_t* module, attr_list_t *attrs, statement_list_t *stmts); type_t *type_module_define(type_t* module, attr_list_t *attrs, statement_list_t *stmts);
type_t *type_coclass_define(type_t *coclass, attr_list_t *attrs, ifref_list_t *ifaces); type_t *type_coclass_define(type_t *coclass, attr_list_t *attrs, typeref_list_t *ifaces);
type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, ifref_list_t *ifaces); type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, typeref_list_t *ifaces);
type_t *type_apicontract_declare(char *name, struct namespace *namespace); type_t *type_apicontract_declare(char *name, struct namespace *namespace);
type_t *type_apicontract_define(type_t *apicontract, attr_list_t *attrs); type_t *type_apicontract_define(type_t *apicontract, attr_list_t *attrs);
type_t *type_parameterized_interface_declare(char *name, struct namespace *namespace, type_list_t *params); type_t *type_parameterized_interface_declare(char *name, struct namespace *namespace, type_list_t *params);
type_t *type_parameterized_interface_define(type_t *type, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, ifref_list_t *requires); type_t *type_parameterized_interface_define(type_t *type, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, typeref_list_t *requires);
int type_is_equal(const type_t *type1, const type_t *type2); int type_is_equal(const type_t *type1, const type_t *type2);
const char *type_get_name(const type_t *type, enum name_type name_type); const char *type_get_name(const type_t *type, enum name_type name_type);
char *gen_name(void); char *gen_name(void);
...@@ -183,7 +183,7 @@ static inline type_t *type_iface_get_inherit(const type_t *type) ...@@ -183,7 +183,7 @@ static inline type_t *type_iface_get_inherit(const type_t *type)
return type->details.iface->inherit; return type->details.iface->inherit;
} }
static inline ifref_list_t *type_iface_get_requires(const type_t *type) static inline typeref_list_t *type_iface_get_requires(const type_t *type)
{ {
type = type_get_real_type(type); type = type_get_real_type(type);
assert(type_get_type(type) == TYPE_INTERFACE); assert(type_get_type(type) == TYPE_INTERFACE);
...@@ -341,14 +341,14 @@ static inline type_t *type_alias_get_aliasee_type(const type_t *type) ...@@ -341,14 +341,14 @@ static inline type_t *type_alias_get_aliasee_type(const type_t *type)
return type->details.alias.aliasee.type; return type->details.alias.aliasee.type;
} }
static inline ifref_list_t *type_coclass_get_ifaces(const type_t *type) static inline typeref_list_t *type_coclass_get_ifaces(const type_t *type)
{ {
type = type_get_real_type(type); type = type_get_real_type(type);
assert(type_get_type(type) == TYPE_COCLASS); assert(type_get_type(type) == TYPE_COCLASS);
return type->details.coclass.ifaces; return type->details.coclass.ifaces;
} }
static inline ifref_list_t *type_runtimeclass_get_ifaces(const type_t *type) static inline typeref_list_t *type_runtimeclass_get_ifaces(const type_t *type)
{ {
type = type_get_real_type(type); type = type_get_real_type(type);
assert(type_get_type(type) == TYPE_RUNTIMECLASS); assert(type_get_type(type) == TYPE_RUNTIMECLASS);
...@@ -357,7 +357,7 @@ static inline ifref_list_t *type_runtimeclass_get_ifaces(const type_t *type) ...@@ -357,7 +357,7 @@ static inline ifref_list_t *type_runtimeclass_get_ifaces(const type_t *type)
static inline type_t *type_runtimeclass_get_default_iface(const type_t *type) static inline type_t *type_runtimeclass_get_default_iface(const type_t *type)
{ {
ifref_list_t *ifaces = type_runtimeclass_get_ifaces(type); typeref_list_t *ifaces = type_runtimeclass_get_ifaces(type);
typeref_t *ref; typeref_t *ref;
if (!ifaces) return NULL; if (!ifaces) return NULL;
......
tools/widl/widltypes.h
View file @ 84966c9b
...@@ -60,7 +60,7 @@ typedef struct list str_list_t; ...@@ -60,7 +60,7 @@ typedef struct list str_list_t;
typedef struct list expr_list_t; typedef struct list expr_list_t;
typedef struct list var_list_t; typedef struct list var_list_t;
typedef struct list declarator_list_t; typedef struct list declarator_list_t;
typedef struct list ifref_list_t; typedef struct list typeref_list_t;
typedef struct list user_type_list_t; typedef struct list user_type_list_t;
typedef struct list context_handle_list_t; typedef struct list context_handle_list_t;
typedef struct list generic_handle_list_t; typedef struct list generic_handle_list_t;
...@@ -386,7 +386,7 @@ struct iface_details ...@@ -386,7 +386,7 @@ struct iface_details
struct _type_t *inherit; struct _type_t *inherit;
struct _type_t *disp_inherit; struct _type_t *disp_inherit;
struct _type_t *async_iface; struct _type_t *async_iface;
ifref_list_t *requires; typeref_list_t *requires;
}; };
struct module_details struct module_details
...@@ -406,7 +406,7 @@ struct array_details ...@@ -406,7 +406,7 @@ struct array_details
struct coclass_details struct coclass_details
{ {
ifref_list_t *ifaces; typeref_list_t *ifaces;
}; };
struct basic_details struct basic_details
...@@ -433,7 +433,7 @@ struct alias_details ...@@ -433,7 +433,7 @@ struct alias_details
struct runtimeclass_details struct runtimeclass_details
{ {
ifref_list_t *ifaces; typeref_list_t *ifaces;
}; };
struct parameterized_details struct parameterized_details
......
tools/widl/write_msft.c
View file @ 84966c9b
...@@ -2336,7 +2336,7 @@ static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls) ...@@ -2336,7 +2336,7 @@ static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls)
MSFT_RefRecord *ref, *first = NULL, *first_source = NULL; MSFT_RefRecord *ref, *first = NULL, *first_source = NULL;
int have_default = 0, have_default_source = 0; int have_default = 0, have_default_source = 0;
const attr_t *attr; const attr_t *attr;
ifref_list_t *ifaces; typeref_list_t *ifaces;
if (-1 < cls->typelib_idx) if (-1 < cls->typelib_idx)
return; return;
......
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