StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

expr: use ExprCreate in more places 

Signed-off-by: Ran Benita <ran234@gmail.com>
master
Ran Benita 2013-12-01 10:31:27 +02:00
parent fd98d64bba
commit 4a7bfb6844
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/xkbcomp/ast-build.c
View File

@ -149,14 +149,10 @@ ExprDef *
ExprCreateUnary(enum expr_op_type op, enum expr_value_type type, ExprCreateUnary(enum expr_op_type op, enum expr_value_type type,
ExprDef *child) ExprDef *child)
{ {
ExprDef *expr = malloc(sizeof(*expr)); ExprDef *expr = ExprCreate(op, type);
if (!expr) if (!expr)
return NULL; return NULL;
expr->common.type = STMT_EXPR;
expr->common.next = NULL;
expr->op = op;
expr->value_type = type;
expr->value.child = child; expr->value.child = child;
return expr; return expr;
@ -165,20 +161,15 @@ ExprCreateUnary(enum expr_op_type op, enum expr_value_type type,
ExprDef * ExprDef *
ExprCreateBinary(enum expr_op_type op, ExprDef *left, ExprDef *right) ExprCreateBinary(enum expr_op_type op, ExprDef *left, ExprDef *right)
{ {
ExprDef *expr = malloc(sizeof(*expr)); ExprDef *expr = ExprCreate(op, EXPR_TYPE_UNKNOWN);
if (!expr) if (!expr)
return NULL; return NULL;
expr->common.type = STMT_EXPR;
expr->common.next = NULL;
expr->op = op;
if (op == EXPR_ASSIGN || left->value_type == EXPR_TYPE_UNKNOWN) if (op == EXPR_ASSIGN || left->value_type == EXPR_TYPE_UNKNOWN)
expr->value_type = right->value_type; expr->value_type = right->value_type;
else if (left->value_type == right->value_type || else if (left->value_type == right->value_type ||
right->value_type == EXPR_TYPE_UNKNOWN) right->value_type == EXPR_TYPE_UNKNOWN)
expr->value_type = left->value_type; expr->value_type = left->value_type;
else
expr->value_type = EXPR_TYPE_UNKNOWN;
expr->value.binary.left = left; expr->value.binary.left = left;
expr->value.binary.right = right; expr->value.binary.right = right;
@ -394,13 +385,10 @@ LedNameCreate(int ndx, ExprDef *name, bool virtual)
ExprDef * ExprDef *
ActionCreate(xkb_atom_t name, ExprDef *args) ActionCreate(xkb_atom_t name, ExprDef *args)
{ {
ExprDef *act = malloc(sizeof(*act)); ExprDef *act = ExprCreate(EXPR_ACTION_DECL, EXPR_TYPE_UNKNOWN);
if (!act) if (!act)
return NULL; return NULL;
act->common.type = STMT_EXPR;
act->common.next = NULL;
act->op = EXPR_ACTION_DECL;
act->value.action.name = name; act->value.action.name = name;
act->value.action.args = args; act->value.action.args = args;
@ -410,9 +398,9 @@ ActionCreate(xkb_atom_t name, ExprDef *args)
ExprDef * ExprDef *
CreateKeysymList(xkb_keysym_t sym) CreateKeysymList(xkb_keysym_t sym)
{ {
ExprDef *def; ExprDef *def = ExprCreate(EXPR_KEYSYM_LIST, EXPR_TYPE_SYMBOLS);
if (!def)
def = ExprCreate(EXPR_KEYSYM_LIST, EXPR_TYPE_SYMBOLS); return NULL;
darray_init(def->value.list.syms); darray_init(def->value.list.syms);
darray_init(def->value.list.symsMapIndex); darray_init(def->value.list.symsMapIndex);