diff options
| author | Peter Johnson <peter@tortall.net> | 2006-10-18 05:36:51 +0000 |
|---|---|---|
| committer | Peter Johnson <peter@tortall.net> | 2006-10-18 05:36:51 +0000 |
| commit | fd04b1aef6f7d987a66c36dba424cf4863ea224d (patch) | |
| tree | e15c5373b6fa0a3d57e296426487fb73d05ae9fa /libyasm/value.c | |
| parent | d1823e2e176d6a8101edfe911476a331d7003697 (diff) | |
| download | yasm-fd04b1aef6f7d987a66c36dba424cf4863ea224d.tar.gz | |
Don't mix EQU expansion with other expr leveling; we could get confused
with certain combinations.
(2nd half of #83)
This also hides some internals of yasm_expr_level_tree.
svn path=/trunk/yasm/; revision=1655
Diffstat (limited to 'libyasm/value.c')
| -rw-r--r-- | libyasm/value.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libyasm/value.c b/libyasm/value.c index 6ef16855..84d21243 100644 --- a/libyasm/value.c +++ b/libyasm/value.c @@ -431,8 +431,9 @@ yasm_value_finalize_expr(yasm_value *value, yasm_expr *e, unsigned int size) return 0; } - yasm_value_initialize(value, yasm_expr__level_tree - (e, 1, 1, 0, 0, NULL, NULL, NULL), size); + yasm_value_initialize(value, + yasm_expr__level_tree(e, 1, 1, 0, 0, NULL, NULL), + size); /* quit early if there was an issue in simplify() */ if (yasm_error_occurred()) @@ -473,8 +474,7 @@ yasm_value_finalize_expr(yasm_value *value, yasm_expr *e, unsigned int size) if (value_finalize_scan(value, value->abs, 0)) return 1; - value->abs = yasm_expr__level_tree(value->abs, 1, 1, 0, 0, NULL, NULL, - NULL); + value->abs = yasm_expr__level_tree(value->abs, 1, 1, 0, 0, NULL, NULL); /* Simplify 0 in abs to NULL */ if (value->abs->op == YASM_EXPR_IDENT |