From: Rémi Bernon rbernon@codeweavers.com
--- tools/widl/expr.c | 4 ++-- tools/widl/parser.y | 2 +- tools/widl/widl.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/widl/expr.c b/tools/widl/expr.c index b5417591f13..61d3c60405b 100644 --- a/tools/widl/expr.c +++ b/tools/widl/expr.c @@ -133,11 +133,11 @@ expr_t *make_exprl(enum expr_type type, int val) return e; }
-expr_t *make_exprd(enum expr_type type, double val) +expr_t *expr_double( double val ) { expr_t *e = xmalloc( sizeof(expr_t) ); memset( e, 0, sizeof(*e) ); - e->type = type; + e->type = EXPR_DOUBLE; e->u.dval = val; e->is_const = TRUE; e->cval = val; diff --git a/tools/widl/parser.y b/tools/widl/parser.y index e1a68477c79..5cca5491e89 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -836,7 +836,7 @@ m_expr
expr: aNUM { $$ = make_exprl(EXPR_NUM, $1); } | aHEXNUM { $$ = make_exprl(EXPR_HEXNUM, $1); } - | aDOUBLE { $$ = make_exprd(EXPR_DOUBLE, $1); } + | aDOUBLE { $$ = expr_double( $aDOUBLE ); } | tFALSE { $$ = make_exprl(EXPR_TRUEFALSE, 0); } | tNULL { $$ = make_exprl(EXPR_NUM, 0); } | tTRUE { $$ = make_exprl(EXPR_TRUEFALSE, 1); } diff --git a/tools/widl/widl.h b/tools/widl/widl.h index c84d23bdb29..97c2acc8923 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -141,7 +141,7 @@ struct expr_loc
extern expr_t *expr_void(void); extern expr_t *make_exprl( enum expr_type type, int val ); -extern expr_t *make_exprd( enum expr_type type, double val ); +extern expr_t *expr_double( double val ); extern expr_t *make_exprs( enum expr_type type, char *val ); extern expr_t *make_exprt( enum expr_type type, var_t *var, expr_t *expr ); extern expr_t *make_expr1( enum expr_type type, expr_t *expr );