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

widl: Change alls calls to error in the parser to error_loc so that line number information is printed.

This commit is contained in:
Rob Shearman 2008-04-15 21:52:35 +01:00 committed by Alexandre Julliard
parent 4efff32291
commit 4b56ff7238
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/widl/parser.y
View File

@ -1190,7 +1190,7 @@ static expr_t *make_expr1(enum expr_type type, expr_t *expr)
{ {
expr_t *e; expr_t *e;
if (type == EXPR_ADDRESSOF && expr->type != EXPR_IDENTIFIER) if (type == EXPR_ADDRESSOF && expr->type != EXPR_IDENTIFIER)
error("address-of operator applied to invalid expression\n"); error_loc("address-of operator applied to invalid expression\n");
e = xmalloc(sizeof(expr_t)); e = xmalloc(sizeof(expr_t));
e->type = type; e->type = type;
e->ref = expr; e->ref = expr;
@ -1394,7 +1394,7 @@ static void set_type(var_t *v, type_t *type, const pident_t *pident, array_dims_
} }
} }
else if (!arr && ptr_attr) else if (!arr && ptr_attr)
error("%s: pointer attribute applied to non-pointer type\n", v->name); error_loc("%s: pointer attribute applied to non-pointer type\n", v->name);
} }
if (pident && pident->is_func) { if (pident && pident->is_func) {
@ -1416,7 +1416,7 @@ static void set_type(var_t *v, type_t *type, const pident_t *pident, array_dims_
if (arr) LIST_FOR_EACH_ENTRY_REV(dim, arr, expr_t, entry) if (arr) LIST_FOR_EACH_ENTRY_REV(dim, arr, expr_t, entry)
{ {
if (sizeless) if (sizeless)
error("%s: only the first array dimension can be unspecified\n", v->name); error_loc("%s: only the first array dimension can be unspecified\n", v->name);
if (dim->is_const) if (dim->is_const)
{ {
@ -1424,10 +1424,10 @@ static void set_type(var_t *v, type_t *type, const pident_t *pident, array_dims_
size_t size = type_memsize(v->type, &align); size_t size = type_memsize(v->type, &align);
if (dim->cval <= 0) if (dim->cval <= 0)
error("%s: array dimension must be positive\n", v->name); error_loc("%s: array dimension must be positive\n", v->name);
if (0xffffffffuL / size < (unsigned long) dim->cval) if (0xffffffffuL / size < (unsigned long) dim->cval)
error("%s: total array size is too large\n", v->name); error_loc("%s: total array size is too large\n", v->name);
else if (0xffffuL < size * dim->cval) else if (0xffffuL < size * dim->cval)
v->type = make_type(RPC_FC_LGFARRAY, v->type); v->type = make_type(RPC_FC_LGFARRAY, v->type);
else else
@ -1453,10 +1453,10 @@ static void set_type(var_t *v, type_t *type, const pident_t *pident, array_dims_
atype = *ptype = duptype(*ptype, 0); atype = *ptype = duptype(*ptype, 0);
if (atype->type == RPC_FC_SMFARRAY || atype->type == RPC_FC_LGFARRAY) if (atype->type == RPC_FC_SMFARRAY || atype->type == RPC_FC_LGFARRAY)
error("%s: cannot specify size_is for a fixed sized array\n", v->name); error_loc("%s: cannot specify size_is for a fixed sized array\n", v->name);
if (atype->type != RPC_FC_CARRAY && !is_ptr(atype)) if (atype->type != RPC_FC_CARRAY && !is_ptr(atype))
error("%s: size_is attribute applied to illegal type\n", v->name); error_loc("%s: size_is attribute applied to illegal type\n", v->name);
atype->type = RPC_FC_CARRAY; atype->type = RPC_FC_CARRAY;
atype->size_is = dim; atype->size_is = dim;
@ -1464,7 +1464,7 @@ static void set_type(var_t *v, type_t *type, const pident_t *pident, array_dims_
ptype = &(*ptype)->ref; ptype = &(*ptype)->ref;
if (*ptype == NULL) if (*ptype == NULL)
error("%s: too many expressions in size_is attribute\n", v->name); error_loc("%s: too many expressions in size_is attribute\n", v->name);
} }
ptype = &v->type; ptype = &v->type;
@ -1482,14 +1482,14 @@ static void set_type(var_t *v, type_t *type, const pident_t *pident, array_dims_
else if (atype->type == RPC_FC_CARRAY) else if (atype->type == RPC_FC_CARRAY)
atype->type = RPC_FC_CVARRAY; atype->type = RPC_FC_CVARRAY;
else else
error("%s: length_is attribute applied to illegal type\n", v->name); error_loc("%s: length_is attribute applied to illegal type\n", v->name);
atype->length_is = dim; atype->length_is = dim;
} }
ptype = &(*ptype)->ref; ptype = &(*ptype)->ref;
if (*ptype == NULL) if (*ptype == NULL)
error("%s: too many expressions in length_is attribute\n", v->name); error_loc("%s: too many expressions in length_is attribute\n", v->name);
} }
if (has_varconf && !last_array(v->type)) if (has_varconf && !last_array(v->type))