1 files changed, 33 insertions, 4 deletions

diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c
index d1af2a5..3f15ae8 100644
--- a/scripts/kconfig/expr.c
+++ b/scripts/kconfig/expr.c
@@ -52,12 +52,19 @@ struct expr *expr_alloc_and(struct expr *e1, struct expr *e2)
 {
 	if (!e1)
 		return e2;
 	return e2 ? expr_alloc_two(E_AND, e1, e2) : e1;
 }
 
+struct expr *expr_alloc_or(struct expr *e1, struct expr *e2)
+{
+	if (!e1)
+		return e2;
+	return e2 ? expr_alloc_two(E_OR, e1, e2) : e1;
+}
+
 struct expr *expr_copy(struct expr *org)
 {
 	struct expr *e;
 
 	if (!org)
 		return NULL;
@@ -155,15 +162,28 @@ static void __expr_eliminate_eq(enum expr_type type, struct expr **ep1, struct e
 		;
 	}
 }
 
 void expr_eliminate_eq(struct expr **ep1, struct expr **ep2)
 {
-	if (!e1 || !e2 || e1->type != e2->type)
+	if (!e1 || !e2)
 		return;
-	__expr_eliminate_eq(e1->type, ep1, ep2);
+	switch (e1->type) {
+	case E_OR:
+	case E_AND:
+		__expr_eliminate_eq(e1->type, ep1, ep2);
+	default:
+		;
+	}
+	if (e1->type != e2->type) switch (e2->type) {
+	case E_OR:
+	case E_AND:
+		__expr_eliminate_eq(e2->type, ep1, ep2);
+	default:
+		;
+	}
 	e1 = expr_eliminate_yn(e1);
 	e2 = expr_eliminate_yn(e2);
 }
 
 #undef e1
 #undef e2
@@ -192,12 +212,13 @@ int expr_eq(struct expr *e1, struct expr *e2)
 		       e1->left.sym == e2->left.sym);
 		expr_free(e1);
 		expr_free(e2);
 		trans_count = old_count;
 		return res;
 	case E_CHOICE:
+	case E_RANGE:
 	case E_NONE:
 		/* panic */;
 	}
 
 	print_expr(0, e1, 0);
 	printf(" = ");
@@ -894,12 +915,13 @@ struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct symb
 				return expr_copy(e);
 		}
 		break;
 	case E_SYMBOL:
 		return expr_alloc_comp(type, e->left.sym, sym);
 	case E_CHOICE:
+	case E_RANGE:
 	case E_NONE:
 		/* panic */;
 	}
 	return NULL;
 }
 
@@ -911,13 +933,13 @@ tristate expr_calc_value(struct expr *e)
 	if (!e)
 		return yes;
 
 	switch (e->type) {
 	case E_SYMBOL:
 		sym_calc_value(e->left.sym);
-		return S_TRI(e->left.sym->curr);
+		return e->left.sym->curr.tri;
 	case E_AND:
 		val1 = expr_calc_value(e->left.expr);
 		val2 = expr_calc_value(e->right.expr);
 		return E_AND(val1, val2);
 	case E_OR:
 		val1 = expr_calc_value(e->left.expr);
@@ -1014,17 +1036,24 @@ void expr_print(struct expr *e, void (*fn)(void *, const char *), void *data, in
 	case E_AND:
 		expr_print(e->left.expr, fn, data, E_AND);
 		fn(data, " && ");
 		expr_print(e->right.expr, fn, data, E_AND);
 		break;
 	case E_CHOICE:
+		fn(data, e->right.sym->name);
 		if (e->left.expr) {
-			expr_print(e->left.expr, fn, data, E_CHOICE);
 			fn(data, " ^ ");
+			expr_print(e->left.expr, fn, data, E_CHOICE);
 		}
+		break;
+	case E_RANGE:
+		fn(data, "[");
+		fn(data, e->left.sym->name);
+		fn(data, " ");
 		fn(data, e->right.sym->name);
+		fn(data, "]");
 		break;
 	default:
 	  {
 		char buf[32];
 		sprintf(buf, "<unknown type %d>", e->type);
 		fn(data, buf);