-15

scripts/kconfig/expr.c

reviewed

··· 90 90 break; 91 91 case E_AND: 92 92 case E_OR: 93 93 - case E_LIST: 94 93 e->left.expr = expr_copy(org->left.expr); 95 94 e->right.expr = expr_copy(org->right.expr); 96 95 break; ··· 285 286 expr_free(e2); 286 287 trans_count = old_count; 287 288 return res; 288 288 - case E_LIST: 289 289 case E_RANGE: 290 290 case E_NONE: 291 291 /* panic */; ··· 674 676 case E_LTH: 675 677 case E_UNEQUAL: 676 678 case E_SYMBOL: 677 677 - case E_LIST: 678 679 break; 679 680 default: 680 681 e->left.expr = expr_transform(e->left.expr); ··· 944 947 break; 945 948 case E_SYMBOL: 946 949 return expr_alloc_comp(type, e->left.sym, sym); 947 947 - case E_LIST: 948 950 case E_RANGE: 949 951 case E_NONE: 950 952 /* panic */; ··· 1093 1097 if (t2 == E_OR) 1094 1098 return 1; 1095 1099 /* fallthrough */ 1096 1096 - case E_OR: 1097 1097 - if (t2 == E_LIST) 1098 1098 - return 1; 1099 1099 - /* fallthrough */ 1100 1100 default: 1101 1101 break; 1102 1102 } ··· 1164 1172 expr_print(e->left.expr, fn, data, E_AND); 1165 1173 fn(data, NULL, " && "); 1166 1174 expr_print(e->right.expr, fn, data, E_AND); 1167 1167 - break; 1168 1168 - case E_LIST: 1169 1169 - fn(data, e->right.sym, e->right.sym->name); 1170 1170 - if (e->left.expr) { 1171 1171 - fn(data, NULL, " ^ "); 1172 1172 - expr_print(e->left.expr, fn, data, E_LIST); 1173 1173 - } 1174 1175 break; 1175 1176 case E_RANGE: 1176 1177 fn(data, NULL, "[");

+1 -1

scripts/kconfig/expr.h

reviewed

··· 26 26 enum expr_type { 27 27 E_NONE, E_OR, E_AND, E_NOT, 28 28 E_EQUAL, E_UNEQUAL, E_LTH, E_LEQ, E_GTH, E_GEQ, 29 29 - E_LIST, E_SYMBOL, E_RANGE 29 29 + E_SYMBOL, E_RANGE 30 30 }; 31 31 32 32 union expr_data {

+1 -2

scripts/kconfig/symbol.c

reviewed

··· 1316 1316 1317 1317 struct symbol *prop_get_symbol(struct property *prop) 1318 1318 { 1319 1319 - if (prop->expr && (prop->expr->type == E_SYMBOL || 1320 1320 - prop->expr->type == E_LIST)) 1319 1319 + if (prop->expr && prop->expr->type == E_SYMBOL) 1321 1320 return prop->expr->left.sym; 1322 1321 return NULL; 1323 1322 }