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

widl: Add a string list type and use it for the endpoint attribute.

This commit is contained in:
Alexandre Julliard 2007-02-07 17:54:33 +01:00
parent 24ded9e69a
commit cc9a07f194
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tools/widl/parser.y
View File

@ -64,6 +64,7 @@
# endif # endif
#endif #endif
static str_list_t *append_str(str_list_t *list, char *str);
static attr_list_t *append_attr(attr_list_t *list, attr_t *attr); static attr_list_t *append_attr(attr_list_t *list, attr_t *attr);
static attr_t *make_attr(enum attr_type type); static attr_t *make_attr(enum attr_type type);
static attr_t *make_attrv(enum attr_type type, unsigned long val); static attr_t *make_attrv(enum attr_type type, unsigned long val);
@ -122,6 +123,7 @@ static void check_arg(var_t *arg);
%union { %union {
attr_t *attr; attr_t *attr;
attr_list_t *attr_list; attr_list_t *attr_list;
str_list_t *str_list;
expr_t *expr; expr_t *expr;
expr_list_t *expr_list; expr_list_t *expr_list;
array_dims_t *array_dims; array_dims_t *array_dims;
@ -223,6 +225,7 @@ static void check_arg(var_t *arg);
%type <attr> attribute %type <attr> attribute
%type <attr_list> m_attributes attributes attrib_list %type <attr_list> m_attributes attributes attrib_list
%type <str_list> str_list
%type <expr> m_expr expr expr_const %type <expr> m_expr expr expr_const
%type <expr_list> m_exprs /* exprs expr_list */ expr_list_const %type <expr_list> m_exprs /* exprs expr_list */ expr_list_const
%type <array_dims> array array_list %type <array_dims> array array_list
@ -386,6 +389,10 @@ attrib_list: attribute { $$ = append_attr( NULL, $1 );
| attrib_list ']' '[' attribute { $$ = append_attr( $1, $4 ); } | attrib_list ']' '[' attribute { $$ = append_attr( $1, $4 ); }
; ;
str_list: aSTRING { $$ = append_str( NULL, $1 ); }
| str_list ',' aSTRING { $$ = append_str( $1, $3 ); }
;
attribute: { $$ = NULL; } attribute: { $$ = NULL; }
| tAGGREGATABLE { $$ = make_attr(ATTR_AGGREGATABLE); } | tAGGREGATABLE { $$ = make_attr(ATTR_AGGREGATABLE); }
| tAPPOBJECT { $$ = make_attr(ATTR_APPOBJECT); } | tAPPOBJECT { $$ = make_attr(ATTR_APPOBJECT); }
@ -406,7 +413,7 @@ attribute: { $$ = NULL; }
| tDISPLAYBIND { $$ = make_attr(ATTR_DISPLAYBIND); } | tDISPLAYBIND { $$ = make_attr(ATTR_DISPLAYBIND); }
| tDLLNAME '(' aSTRING ')' { $$ = make_attrp(ATTR_DLLNAME, $3); } | tDLLNAME '(' aSTRING ')' { $$ = make_attrp(ATTR_DLLNAME, $3); }
| tDUAL { $$ = make_attr(ATTR_DUAL); } | tDUAL { $$ = make_attr(ATTR_DUAL); }
| tENDPOINT '(' aSTRING ')' { $$ = make_attrp(ATTR_ENDPOINT, $3); } | tENDPOINT '(' str_list ')' { $$ = make_attrp(ATTR_ENDPOINT, $3); }
| tENTRY '(' aSTRING ')' { $$ = make_attrp(ATTR_ENTRY_STRING, $3); } | tENTRY '(' aSTRING ')' { $$ = make_attrp(ATTR_ENTRY_STRING, $3); }
| tENTRY '(' expr_const ')' { $$ = make_attrp(ATTR_ENTRY_ORDINAL, $3); } | tENTRY '(' expr_const ')' { $$ = make_attrp(ATTR_ENTRY_ORDINAL, $3); }
| tEXPLICITHANDLE { $$ = make_attr(ATTR_EXPLICIT_HANDLE); } | tEXPLICITHANDLE { $$ = make_attr(ATTR_EXPLICIT_HANDLE); }
@ -907,6 +914,22 @@ void init_types(void)
decl_builtin("handle_t", RPC_FC_BIND_PRIMITIVE); decl_builtin("handle_t", RPC_FC_BIND_PRIMITIVE);
} }
static str_list_t *append_str(str_list_t *list, char *str)
{
struct str_list_entry_t *entry;
if (!str) return list;
if (!list)
{
list = xmalloc( sizeof(*list) );
list_init( list );
}
entry = xmalloc( sizeof(*entry) );
entry->str = str;
list_add_tail( list, &entry->entry );
return list;
}
static attr_list_t *append_attr(attr_list_t *list, attr_t *attr) static attr_list_t *append_attr(attr_list_t *list, attr_t *attr)
{ {
if (!attr) return list; if (!attr) return list;

7
tools/widl/widltypes.h
View File

@ -47,6 +47,7 @@ typedef struct _importinfo_t importinfo_t;
typedef struct _typelib_t typelib_t; typedef struct _typelib_t typelib_t;
typedef struct list attr_list_t; typedef struct list attr_list_t;
typedef struct list str_list_t;
typedef struct list func_list_t; typedef struct list func_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;
@ -162,6 +163,12 @@ enum type_kind
TKIND_MAX TKIND_MAX
}; };
struct str_list_entry_t
{
char *str;
struct list entry;
};
struct _attr_t { struct _attr_t {
enum attr_type type; enum attr_type type;
union { union {