widl #18: don't set ATTR_{IN|OUT} attributes by default
Huw D M Davies
h.davies1 at physics.ox.ac.uk
Thu Jan 20 09:32:47 CST 2005
Huw Davies <huw at codeweavers.com>
Don't set ATTR_IN or ATTR_OUT by default - this essentially
reverts rev. 1.21. The proxy code must explicitly add these if
they're needed.
--
Huw Davies
huw at codeweavers.com
Index: tools/widl/parser.y
===================================================================
RCS file: /home/wine/wine/tools/widl/parser.y,v
retrieving revision 1.33
diff -u -p -r1.33 parser.y
--- tools/widl/parser.y 10 Jan 2005 16:08:36 -0000 1.33
+++ tools/widl/parser.y 20 Jan 2005 15:28:15 -0000
@@ -290,31 +290,19 @@ args: arg
arg: attributes type pident array { $$ = $3;
set_type($$, $2, $4);
$$->attrs = $1;
- if (!is_attr($$->attrs, ATTR_OUT) &&
- !is_attr($$->attrs, ATTR_IN)) {
- attr_t *a = make_attr(ATTR_IN);
- LINK(a, $$->attrs); $$->attrs = a;
- }
}
| type pident array { $$ = $2;
set_type($$, $1, $3);
- $$->attrs = make_attr(ATTR_IN);
}
| attributes type pident '(' m_args ')' { $$ = $3;
$$->ptr_level--;
set_type($$, $2, NULL);
$$->attrs = $1;
$$->args = $5;
- if (!is_attr($$->attrs, ATTR_OUT) &&
- !is_attr($$->attrs, ATTR_IN)) {
- attr_t *a = make_attr(ATTR_IN);
- LINK(a, $$->attrs); $$->attrs = a;
- }
}
| type pident '(' m_args ')' { $$ = $2;
$$->ptr_level--;
set_type($$, $1, NULL);
- $$->attrs = make_attr(ATTR_IN);
$$->args = $4;
}
;
@@ -526,10 +514,6 @@ funcdef:
$$ = make_func($4, $6);
if (is_attr($4->attrs, ATTR_IN)) {
yyerror("Inapplicable attribute");
- }
- if (!is_attr($4->attrs, ATTR_OUT)) {
- attr_t *a = make_attr(ATTR_OUT);
- LINK(a, $4->attrs); $4->attrs = a;
}
}
;
More information about the wine-patches
mailing list