Signed-off-by: Zebediah Figura z.figura12@gmail.com --- This patch fixes proxy generation for pointers to arrays; however, header generation is still broken since we don't respect C precedence rules.
tools/widl/header.h | 1 - tools/widl/parser.y | 120 +++++++++++++++++++++++++++---------------------- tools/widl/widltypes.h | 2 - 3 files changed, 66 insertions(+), 57 deletions(-)
diff --git a/tools/widl/header.h b/tools/widl/header.h index 3798af0..6222a48 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -48,7 +48,6 @@ extern int need_proxy_delegation(const statement_list_t *stmts); extern int need_inline_stubs_file(const statement_list_t *stmts); extern const var_t *is_callas(const attr_list_t *list); extern void write_args(FILE *h, const var_list_t *arg, const char *name, int obj, int do_indent); -extern void write_array(FILE *h, array_dims_t *v, int field); extern const type_t* get_explicit_generic_handle_type(const var_t* var); extern const var_t *get_func_handle_var( const type_t *iface, const var_t *func, unsigned char *explicit_fc, unsigned char *implicit_fc ); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 36a5fae..005163f 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -72,7 +72,7 @@ static attr_t *make_attr(enum attr_type type); static attr_t *make_attrv(enum attr_type type, unsigned int val); static attr_t *make_attrp(enum attr_type type, void *val); static expr_list_t *append_expr(expr_list_t *list, expr_t *expr); -static array_dims_t *append_array(array_dims_t *list, expr_t *expr); +static type_t *append_array(type_t *chain, expr_t *expr); static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const 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 ifref_list_t *append_ifref(ifref_list_t *list, ifref_t *iface); @@ -82,7 +82,7 @@ static declarator_list_t *append_declarator(declarator_list_t *list, declarator_ static declarator_t *make_declarator(var_t *var); static type_t *make_safearray(type_t *type); static typelib_t *make_library(const char *name, const attr_list_t *attrs); -static type_t *append_ptrchain_type(type_t *ptrchain, type_t *type); +static type_t *append_chain_type(type_t *chain, type_t *type); static warning_list_t *append_warning(warning_list_t *, int);
static type_t *reg_typedefs(decl_spec_t *decl_spec, var_list_t *names, attr_list_t *attrs); @@ -141,7 +141,6 @@ static struct namespace *current_namespace = &global_namespace; str_list_t *str_list; expr_t *expr; expr_list_t *expr_list; - array_dims_t *array_dims; type_t *type; var_t *var; var_list_t *var_list; @@ -977,7 +976,7 @@ decl_spec_no_type:
declarator: '*' m_type_qual_list declarator %prec PPTR - { $$ = $3; $$->type = append_ptrchain_type($$->type, type_new_pointer(pointer_default, NULL, $2)); } + { $$ = $3; $$->type = append_chain_type($$->type, type_new_pointer(pointer_default, NULL, $2)); } | callconv declarator { $$ = $2; if ($$->func_type) $$->func_type->attrs = append_attr($$->func_type->attrs, make_attrp(ATTR_CALLCONV, $1)); else if ($$->type) $$->type->attrs = append_attr($$->type->attrs, make_attrp(ATTR_CALLCONV, $1)); } | direct_declarator @@ -986,9 +985,9 @@ declarator: direct_declarator: ident { $$ = make_declarator($1); } | '(' declarator ')' { $$ = $2; } - | direct_declarator array { $$ = $1; $$->array = append_array($$->array, $2); } + | direct_declarator array { $$ = $1; $$->type = append_array($$->type, $2); } | direct_declarator '(' m_args ')' { $$ = $1; - $$->func_type = append_ptrchain_type($$->type, type_new_function($3)); + $$->func_type = append_chain_type($$->type, type_new_function($3)); $$->type = NULL; } ; @@ -996,7 +995,7 @@ direct_declarator: /* abstract declarator */ abstract_declarator: '*' m_type_qual_list m_abstract_declarator %prec PPTR - { $$ = $3; $$->type = append_ptrchain_type($$->type, type_new_pointer(pointer_default, NULL, $2)); } + { $$ = $3; $$->type = append_chain_type($$->type, type_new_pointer(pointer_default, NULL, $2)); } | callconv m_abstract_declarator { $$ = $2; if ($$->func_type) $$->func_type->attrs = append_attr($$->func_type->attrs, make_attrp(ATTR_CALLCONV, $1)); else if ($$->type) $$->type->attrs = append_attr($$->type->attrs, make_attrp(ATTR_CALLCONV, $1)); } | abstract_direct_declarator @@ -1005,7 +1004,7 @@ abstract_declarator: /* abstract declarator without accepting direct declarator */ abstract_declarator_no_direct: '*' m_type_qual_list m_any_declarator %prec PPTR - { $$ = $3; $$->type = append_ptrchain_type($$->type, type_new_pointer(pointer_default, NULL, $2)); } + { $$ = $3; $$->type = append_chain_type($$->type, type_new_pointer(pointer_default, NULL, $2)); } | callconv m_any_declarator { $$ = $2; if ($$->func_type) $$->func_type->attrs = append_attr($$->func_type->attrs, make_attrp(ATTR_CALLCONV, $1)); else if ($$->type) $$->type->attrs = append_attr($$->type->attrs, make_attrp(ATTR_CALLCONV, $1)); } ; @@ -1018,16 +1017,16 @@ m_abstract_declarator: { $$ = make_declarator(NULL); } /* abstract direct declarator */ abstract_direct_declarator: '(' abstract_declarator_no_direct ')' { $$ = $2; } - | abstract_direct_declarator array { $$ = $1; $$->array = append_array($$->array, $2); } - | array { $$ = make_declarator(NULL); $$->array = append_array($$->array, $1); } + | abstract_direct_declarator array { $$ = $1; $$->type = append_array($$->type, $2); } + | array { $$ = make_declarator(NULL); $$->type = append_array($$->type, $1); } | '(' m_args ')' { $$ = make_declarator(NULL); - $$->func_type = append_ptrchain_type($$->type, type_new_function($2)); + $$->func_type = append_chain_type($$->type, type_new_function($2)); $$->type = NULL; } | abstract_direct_declarator '(' m_args ')' { $$ = $1; - $$->func_type = append_ptrchain_type($$->type, type_new_function($3)); + $$->func_type = append_chain_type($$->type, type_new_function($3)); $$->type = NULL; } ; @@ -1035,7 +1034,7 @@ abstract_direct_declarator: /* abstract or non-abstract declarator */ any_declarator: '*' m_type_qual_list m_any_declarator %prec PPTR - { $$ = $3; $$->type = append_ptrchain_type($$->type, type_new_pointer(pointer_default, NULL, $2)); } + { $$ = $3; $$->type = append_chain_type($$->type, type_new_pointer(pointer_default, NULL, $2)); } | callconv m_any_declarator { $$ = $2; $$->type->attrs = append_attr($$->type->attrs, make_attrp(ATTR_CALLCONV, $1)); } | any_direct_declarator ; @@ -1043,7 +1042,7 @@ any_declarator: /* abstract or non-abstract declarator without accepting direct declarator */ any_declarator_no_direct: '*' m_type_qual_list m_any_declarator %prec PPTR - { $$ = $3; $$->type = append_ptrchain_type($$->type, type_new_pointer(pointer_default, NULL, $2)); } + { $$ = $3; $$->type = append_chain_type($$->type, type_new_pointer(pointer_default, NULL, $2)); } | callconv m_any_declarator { $$ = $2; $$->type->attrs = append_attr($$->type->attrs, make_attrp(ATTR_CALLCONV, $1)); } ;
@@ -1058,16 +1057,16 @@ m_any_declarator: { $$ = make_declarator(NULL); } any_direct_declarator: ident { $$ = make_declarator($1); } | '(' any_declarator_no_direct ')' { $$ = $2; } - | any_direct_declarator array { $$ = $1; $$->array = append_array($$->array, $2); } - | array { $$ = make_declarator(NULL); $$->array = append_array($$->array, $1); } + | any_direct_declarator array { $$ = $1; $$->type = append_array($$->type, $2); } + | array { $$ = make_declarator(NULL); $$->type = append_array($$->type, $1); } | '(' m_args ')' { $$ = make_declarator(NULL); - $$->func_type = append_ptrchain_type($$->type, type_new_function($2)); + $$->func_type = append_chain_type($$->type, type_new_function($2)); $$->type = NULL; } | any_direct_declarator '(' m_args ')' { $$ = $1; - $$->func_type = append_ptrchain_type($$->type, type_new_function($3)); + $$->func_type = append_chain_type($$->type, type_new_function($3)); $$->type = NULL; } ; @@ -1341,16 +1340,19 @@ static expr_list_t *append_expr(expr_list_t *list, expr_t *expr) return list; }
-static array_dims_t *append_array(array_dims_t *list, expr_t *expr) +static type_t *append_array(type_t *chain, expr_t *expr) { - if (!expr) return list; - if (!list) - { - list = xmalloc( sizeof(*list) ); - list_init( list ); - } - list_add_tail( list, &expr->entry ); - return list; + type_t *array; + + if (!expr) + return chain; + + /* An array is always a reference pointer unless explicitly marked otherwise + * (regardless of what the default pointer attribute is). */ + array = type_new_array(NULL, NULL, FALSE, expr->is_const ? expr->cval : 0, + expr->is_const ? NULL : expr, NULL, FC_RP); + + return append_chain_type(chain, array); }
static struct list type_pool = LIST_INIT(type_pool); @@ -1423,16 +1425,32 @@ static int is_allowed_range_type(const type_t *type) } }
-static type_t *append_ptrchain_type(type_t *ptrchain, type_t *type) +static type_t *get_array_or_ptr_ref(type_t *type) { - type_t *ptrchain_type; - if (!ptrchain) - return type; - for (ptrchain_type = ptrchain; type_pointer_get_ref(ptrchain_type); ptrchain_type = type_pointer_get_ref(ptrchain_type)) - ; - assert(ptrchain_type->type_type == TYPE_POINTER); - ptrchain_type->details.pointer.ref = type; - return ptrchain; + if (is_ptr(type)) + return type_pointer_get_ref(type); + else if (is_array(type)) + return type_array_get_element(type); + return NULL; +} + +static type_t *append_chain_type(type_t *chain, type_t *type) +{ + type_t *chain_type; + + if (!chain) + return type; + for (chain_type = chain; get_array_or_ptr_ref(chain_type); chain_type = get_array_or_ptr_ref(chain_type)) + ; + + if (is_ptr(chain_type)) + chain_type->details.pointer.ref = type; + else if (is_array(chain_type)) + chain_type->details.array.elem = type; + else + assert(0); + + return chain; }
static warning_list_t *append_warning(warning_list_t *list, int num) @@ -1458,7 +1476,6 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl expr_list_t *lengs = get_attrp(attrs, ATTR_LENGTHIS); expr_t *dim; type_t **ptype; - array_dims_t *arr = decl ? decl->array : NULL; type_t *func_type = decl ? decl->func_type : NULL; type_t *type = decl_spec->type;
@@ -1477,13 +1494,13 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl }
/* add type onto the end of the pointers in pident->type */ - v->type = append_ptrchain_type(decl ? decl->type : NULL, type); + v->type = append_chain_type(decl ? decl->type : NULL, type); v->stgclass = decl_spec->stgclass; v->attrs = attrs;
/* check for pointer attribute being applied to non-pointer, non-array * type */ - if (!arr) + if (!is_array(v->type)) { int ptr_attr = get_attrv(v->attrs, ATTR_POINTERTYPE); const type_t *ptr = NULL; @@ -1522,12 +1539,19 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl { type_t *t = type;
- if (!is_ptr(v->type) && !arr) + if (!is_ptr(v->type) && !is_array(v->type)) error_loc("'%s': [string] attribute applied to non-pointer, non-array type\n", v->name);
- while (is_ptr(t)) - t = type_pointer_get_ref(t); + for (;;) + { + if (is_ptr(t)) + t = type_pointer_get_ref(t); + else if (is_array(t)) + t = type_array_get_element(t); + else + break; + }
if (type_get_type(t) != TYPE_BASIC && (get_basic_fc(t) != FC_CHAR && @@ -1550,17 +1574,6 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl v->name);
ptype = &v->type; - if (arr) LIST_FOR_EACH_ENTRY_REV(dim, arr, expr_t, entry) - { - /* An array is always a reference pointer unless explicitly marked otherwise - * (regardless of what the default pointer attribute is). */ - *ptype = type_new_array(NULL, *ptype, FALSE, - dim->is_const ? dim->cval : 0, - dim->is_const ? NULL : dim, NULL, - FC_RP); - } - - ptype = &v->type; if (sizes) LIST_FOR_EACH_ENTRY(dim, sizes, expr_t, entry) { if (dim->type != EXPR_VOID) @@ -1736,7 +1749,6 @@ static declarator_t *make_declarator(var_t *var) d->var = var ? var : make_var(NULL); d->type = NULL; d->func_type = NULL; - d->array = NULL; d->bits = NULL; return d; } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index a391964..7891a1d 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -59,7 +59,6 @@ typedef struct list expr_list_t; typedef struct list var_list_t; typedef struct list declarator_list_t; typedef struct list ifref_list_t; -typedef struct list array_dims_t; typedef struct list user_type_list_t; typedef struct list context_handle_list_t; typedef struct list generic_handle_list_t; @@ -465,7 +464,6 @@ struct _declarator_t { var_t *var; type_t *type; type_t *func_type; - array_dims_t *array; expr_t *bits;
/* parser-internal */