We had macros named the same as a set of enumeration values. It is legal code but very confusing to read - so rename the macros from E_* to EXPR_*
Unified · Split
| @@ -300,7 +300,7 @@ load: · 299 unmodified lines | ||
| 300 | 300 | cs->def[def].val = sym; |
| 301 | 301 | break; |
| 302 | 302 | } |
| 303 | − cs->def[def].tri = E_OR(cs->def[def].tri, sym->def[def].tri); | |
| 303 | + cs->def[def].tri = EXPR_OR(cs->def[def].tri, sym->def[def].tri); | |
| 304 | 304 | } |
| 305 | 305 | } |
| 306 | 306 | fclose(in); |
| @@ -955,14 +955,14 @@ tristate expr_calc_value(struct expr *e) · 954 unmodified lines | ||
| 955 | 955 | case E_AND: |
| 956 | 956 | val1 = expr_calc_value(e->left.expr); |
| 957 | 957 | val2 = expr_calc_value(e->right.expr); |
| 958 | − return E_AND(val1, val2); | |
| 958 | + return EXPR_AND(val1, val2); | |
| 959 | 959 | case E_OR: |
| 960 | 960 | val1 = expr_calc_value(e->left.expr); |
| 961 | 961 | val2 = expr_calc_value(e->right.expr); |
| 962 | − return E_OR(val1, val2); | |
| 962 | + return EXPR_OR(val1, val2); | |
| 963 | 963 | case E_NOT: |
| 964 | 964 | val1 = expr_calc_value(e->left.expr); |
| 965 | − return E_NOT(val1); | |
| 965 | + return EXPR_NOT(val1); | |
| 966 | 966 | case E_EQUAL: |
| 967 | 967 | sym_calc_value(e->left.sym); |
| 968 | 968 | sym_calc_value(e->right.sym); |
| @@ -45,9 +45,9 @@ struct expr { · 44 unmodified lines | ||
| 45 | 45 | union expr_data left, right; |
| 46 | 46 | }; |
| 47 | 47 | |
| 48 | −#define E_OR(dep1, dep2) (((dep1)>(dep2))?(dep1):(dep2)) | |
| 49 | −#define E_AND(dep1, dep2) (((dep1)<(dep2))?(dep1):(dep2)) | |
| 50 | −#define E_NOT(dep) (2-(dep)) | |
| 48 | +#define EXPR_OR(dep1, dep2) (((dep1)>(dep2))?(dep1):(dep2)) | |
| 49 | +#define EXPR_AND(dep1, dep2) (((dep1)<(dep2))?(dep1):(dep2)) | |
| 50 | +#define EXPR_NOT(dep) (2-(dep)) | |
| 51 | 51 | |
| 52 | 52 | struct expr_value { |
| 53 | 53 | struct expr *expr; |
| @@ -199,7 +199,7 @@ static void sym_calc_visibility(struct symbol *sym) · 198 unmodified lines | ||
| 199 | 199 | tri = no; |
| 200 | 200 | for_all_prompts(sym, prop) { |
| 201 | 201 | prop->visible.tri = expr_calc_value(prop->visible.expr); |
| 202 | − tri = E_OR(tri, prop->visible.tri); | |
| 202 | + tri = EXPR_OR(tri, prop->visible.tri); | |
| 203 | 203 | } |
| 204 | 204 | if (tri == mod && (sym->type != S_TRISTATE || modules_val == no)) |
| 205 | 205 | tri = yes; |
| @@ -303,7 +303,7 @@ void sym_calc_value(struct symbol *sym) · 97 unmodified lines | ||
| 303 | 303 | if (sym_is_choice_value(sym) && sym->visible == yes) { |
| 304 | 304 | prop = sym_get_choice_prop(sym); |
| 305 | 305 | newval.tri = (prop_get_symbol(prop)->curr.val == sym) ? yes : no; |
| 306 | − } else if (E_OR(sym->visible, sym->rev_dep.tri) != no) { | |
| 306 | + } else if (EXPR_OR(sym->visible, sym->rev_dep.tri) != no) { | |
| 307 | 307 | sym->flags |= SYMBOL_WRITE; |
| 308 | 308 | if (sym_has_value(sym)) |
| 309 | 309 | newval.tri = sym->def[S_DEF_USER].tri; |
| @@ -312,7 +312,7 @@ void sym_calc_value(struct symbol *sym) · 2 unmodified lines | ||
| 312 | 312 | if (prop) |
| 313 | 313 | newval.tri = expr_calc_value(prop->expr); |
| 314 | 314 | } |
| 315 | − newval.tri = E_OR(E_AND(newval.tri, sym->visible), sym->rev_dep.tri); | |
| 315 | + newval.tri = EXPR_OR(EXPR_AND(newval.tri, sym->visible), sym->rev_dep.tri); | |
| 316 | 316 | } else if (!sym_is_choice(sym)) { |
| 317 | 317 | prop = sym_get_default_prop(sym); |
| 318 | 318 | if (prop) { |