1 files changed, 14 insertions, 65 deletions

diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index 896a296..cc616f1 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -20,6 +20,2 @@ struct file {
         struct file *parent;
-#ifdef CML1
-        struct statement *stmt;
-        struct statement *last_stmt;
-#endif
         char *name;
@@ -38,3 +34,3 @@ typedef enum tristate {
 enum expr_type {
-        E_NONE, E_OR, E_AND, E_NOT, E_EQUAL, E_UNEQUAL, E_CHOICE, E_SYMBOL
+        E_NONE, E_OR, E_AND, E_NOT, E_EQUAL, E_UNEQUAL, E_CHOICE, E_SYMBOL, E_RANGE
 };
@@ -47,7 +43,3 @@ union expr_data {
 struct expr {
-#ifdef CML1
-        int token;
-#else
         enum expr_type type;
-#endif
         union expr_data left, right;
@@ -55,6 +47,2 @@ struct expr {
 
-        #define E_TRI(ev)((ev).tri)
-        #define E_EXPR(ev)((ev).expr)
-        #define E_CALC(ev)(E_TRI(ev) = expr_calc_value(E_EXPR(ev)))
-
         #define E_OR(dep1, dep2)(((dep1)>(dep2))?(dep1):(dep2))
@@ -68,8 +56,4 @@ struct expr_value {
 
-        #define S_VAL(sv)((sv).value)
-        #define S_TRI(sv)((sv).tri)
-        #define S_EQ(sv1, sv2)(S_VAL(sv1) == S_VAL(sv2) || !strcmp(S_VAL(sv1), S_VAL(sv2)))
-
 struct symbol_value {
-        void *value;
+        void *val;
         tristate tri;
@@ -85,8 +69,4 @@ struct symbol {
         char *help;
-#ifdef CML1
-        int type;
-#else
         enum symbol_type type;
-#endif
-        struct symbol_value curr, def;
+        struct symbol_value curr, user;
         tristate visible;
@@ -95,3 +75,3 @@ struct symbol {
         struct expr *dep, *dep2;
-        struct menu *menu;
+        struct expr_value rev_dep;
 };
@@ -100,12 +80,2 @@ struct symbol {
 
-#ifdef CML1
-        #define SYMBOL_UNKNOWN  S_UNKNOWN
-        #define SYMBOL_BOOLEAN  S_BOOLEAN
-        #define SYMBOL_TRISTATE         S_TRISTATE
-        #define SYMBOL_INT      S_INT
-        #define SYMBOL_HEX      S_HEX
-        #define SYMBOL_STRING   S_STRING
-        #define SYMBOL_OTHER    S_OTHER
-#endif
-
         #define SYMBOL_YES      0x0001
@@ -124,2 +94,5 @@ struct symbol {
         #define SYMBOL_AUTO     0x1000
+        #define SYMBOL_CHECKED  0x2000
+        #define SYMBOL_CHECK_DONE0x4000
+        #define SYMBOL_WARNED   0x8000
 
@@ -130,3 +103,3 @@ struct symbol {
 enum prop_type {
-        P_UNKNOWN, P_PROMPT, P_COMMENT, P_MENU, P_ROOTMENU, P_DEFAULT, P_CHOICE
+        P_UNKNOWN, P_PROMPT, P_COMMENT, P_MENU, P_DEFAULT, P_CHOICE, P_SELECT, P_RANGE
 };
@@ -136,12 +109,6 @@ struct property {
         struct symbol *sym;
-#ifdef CML1
-        int token;
-#else
         enum prop_type type;
-#endif
         const char *text;
-        struct symbol *def;
         struct expr_value visible;
-        struct expr *dep;
-        struct expr *dep2;
+        struct expr *expr;
         struct menu *menu;
@@ -149,5 +116,2 @@ struct property {
         int lineno;
-#ifdef CML1
-        struct property *next_pos;
-#endif
 };
@@ -157,5 +121,7 @@ struct property {
                 if (st->type == (tok))
-#define for_all_prompts(sym, st) for_all_properties(sym, st, P_PROMPT)
 #define for_all_defaults(sym, st) for_all_properties(sym, st, P_DEFAULT)
 #define for_all_choices(sym, st) for_all_properties(sym, st, P_CHOICE)
+#define for_all_prompts(sym, st) \
+        for (st = sym->prop; st; st = st->next) \
+                if (st->text)
 
@@ -176,2 +142,3 @@ struct menu {
         #define MENU_CHANGED    0x0001
+        #define MENU_ROOT       0x0002
 
@@ -186,9 +153,3 @@ extern struct symbol *modules_sym;
 extern int cdebug;
-extern int print_type;
 struct expr *expr_alloc_symbol(struct symbol *sym);
-#ifdef CML1
-struct expr *expr_alloc_one(int token, struct expr *ce);
-struct expr *expr_alloc_two(int token, struct expr *e1, struct expr *e2);
-struct expr *expr_alloc_comp(int token, struct symbol *s1, struct symbol *s2);
-#else
 struct expr *expr_alloc_one(enum expr_type type, struct expr *ce);
@@ -196,4 +157,4 @@ struct expr *expr_alloc_two(enum expr_type type, struct expr *e1, struct expr *e
 struct expr *expr_alloc_comp(enum expr_type type, struct symbol *s1, struct symbol *s2);
-#endif
 struct expr *expr_alloc_and(struct expr *e1, struct expr *e2);
+struct expr *expr_alloc_or(struct expr *e1, struct expr *e2);
 struct expr *expr_copy(struct expr *org);
@@ -217,13 +178,2 @@ void print_expr(int mask, struct expr *e, int prevtoken);
 
-#ifdef CML1
-static inline int expr_is_yes(struct expr *e)
-{
-        return !e || (e->token == WORD && e->left.sym == &symbol_yes);
-}
-
-static inline int expr_is_no(struct expr *e)
-{
-        return e && (e->token == WORD && e->left.sym == &symbol_no);
-}
-#else
 static inline int expr_is_yes(struct expr *e)
@@ -238,3 +188,2 @@ static inline int expr_is_no(struct expr *e)
 #endif
-#endif