ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

widl: Make 'attrs' field of type_t const.

This commit is contained in:
Robert Shearman 2006-02-07 12:32:57 +01:00 committed by Alexandre Julliard
parent e9ec85a01a
commit 4e40675032
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/widl/header.c
View File

@ -490,7 +490,7 @@ void write_externdef(const var_t *v)
fprintf(header, ";\n\n"); fprintf(header, ";\n\n");
} }
void write_library(const char *name, attr_t *attr) { void write_library(const char *name, const attr_t *attr) {
const UUID *uuid = get_attrp(attr, ATTR_UUID); const UUID *uuid = get_attrp(attr, ATTR_UUID);
fprintf(header, "\n"); fprintf(header, "\n");
write_guid("LIBID", name, uuid); write_guid("LIBID", name, uuid);
@ -521,7 +521,7 @@ const var_t* get_explicit_handle_var(const func_t* func)
/********** INTERFACES **********/ /********** INTERFACES **********/
int is_object(attr_t *a) int is_object(const attr_t *a)
{ {
while (a) { while (a) {
if (a->type == ATTR_OBJECT || a->type == ATTR_ODL) return 1; if (a->type == ATTR_OBJECT || a->type == ATTR_ODL) return 1;
@ -530,12 +530,12 @@ int is_object(attr_t *a)
return 0; return 0;
} }
int is_local(attr_t *a) int is_local(const attr_t *a)
{ {
return is_attr(a, ATTR_LOCAL); return is_attr(a, ATTR_LOCAL);
} }
const var_t *is_callas(attr_t *a) const var_t *is_callas(const attr_t *a)
{ {
return get_attrp(a, ATTR_CALLAS); return get_attrp(a, ATTR_CALLAS);
} }

8
tools/widl/header.h
View File

@ -28,9 +28,9 @@ extern int is_void(const type_t *t, const var_t *v);
extern void write_name(FILE *h, const var_t *v); extern void write_name(FILE *h, const var_t *v);
extern const char* get_name(const var_t *v); extern const char* get_name(const var_t *v);
extern void write_type(FILE *h, type_t *t, const var_t *v, const char *n); extern void write_type(FILE *h, type_t *t, const var_t *v, const char *n);
extern int is_object(attr_t *a); extern int is_object(const attr_t *a);
extern int is_local(attr_t *a); extern int is_local(const attr_t *a);
extern const var_t *is_callas(attr_t *a); extern const var_t *is_callas(const attr_t *a);
extern void write_args(FILE *h, var_t *arg, const char *name, int obj, int do_indent); extern void write_args(FILE *h, var_t *arg, const char *name, int obj, int do_indent);
extern void write_array(FILE *h, const expr_t *v, int field); extern void write_array(FILE *h, const expr_t *v, int field);
extern void write_forward(type_t *iface); extern void write_forward(type_t *iface);
@ -41,7 +41,7 @@ extern void write_typedef(type_t *type, const var_t *names);
extern void write_expr(FILE *h, const expr_t *e, int brackets); extern void write_expr(FILE *h, const expr_t *e, int brackets);
extern void write_constdef(const var_t *v); extern void write_constdef(const var_t *v);
extern void write_externdef(const var_t *v); extern void write_externdef(const var_t *v);
extern void write_library(const char *name, attr_t *attr); extern void write_library(const char *name, const attr_t *attr);
extern void write_user_types(void); extern void write_user_types(void);
extern const var_t* get_explicit_handle_var(const func_t* func); extern const var_t* get_explicit_handle_var(const func_t* func);

9
tools/widl/parser.y
View File

@ -623,11 +623,12 @@ dispinterface: tDISPINTERFACE aIDENTIFIER { $$ = get_type(0, $2, 0); }
| tDISPINTERFACE aKNOWNTYPE { $$ = get_type(0, $2, 0); } | tDISPINTERFACE aKNOWNTYPE { $$ = get_type(0, $2, 0); }
; ;
dispinterfacehdr: attributes dispinterface { $$ = $2; dispinterfacehdr: attributes dispinterface { attr_t *attrs;
$$ = $2;
if ($$->defined) yyerror("multiple definition error\n"); if ($$->defined) yyerror("multiple definition error\n");
$$->attrs = $1; attrs = make_attr(ATTR_DISPINTERFACE);
$$->attrs = make_attr(ATTR_DISPINTERFACE); LINK(attrs, $1);
LINK($$->attrs, $1); $$->attrs = attrs;
$$->ref = find_type("IDispatch", 0); $$->ref = find_type("IDispatch", 0);
if (!$$->ref) yyerror("IDispatch is undefined\n"); if (!$$->ref) yyerror("IDispatch is undefined\n");
$$->defined = TRUE; $$->defined = TRUE;

2
tools/widl/widltypes.h
View File

@ -183,7 +183,7 @@ struct _type_t {
char *name; char *name;
unsigned char type; unsigned char type;
struct _type_t *ref; struct _type_t *ref;
attr_t *attrs; const attr_t *attrs;
func_t *funcs; func_t *funcs;
var_t *fields; var_t *fields;
int ignore, is_const, sign; int ignore, is_const, sign;