Simplify parse.c

diff --git a/scripts/parse_kconfig/parse.c b/scripts/parse_kconfig/parse.c
index 6dc08cec655e0bb5dc4a851e703c122b216cfa18..79c256aba1622cbb9390892e0a1e84a6132a387f 100644 (file)
--- a/scripts/parse_kconfig/parse.c
+++ b/scripts/parse_kconfig/parse.c
@@ -78,10 +78,9 @@ void build_symlist() {
     struct property *prop;
     for_all_symbols(i, sym) {
         if (sym->type == S_BOOLEAN || sym->type == S_TRISTATE) {
-            if (sym->name == NULL) {
-                sym->name = malloc((9 + 7) * sizeof(char));
-                sprintf(sym->name, "NONAMEGEN%d", noname_num++);
-            }
+            if (sym->name == NULL)
+                asprintf(&sym->name, "NONAMEGEN%d", noname_num++);
+
             symlist_add(gsymlist, sym->name);
         }
     }
@@ -96,251 +95,251 @@ void cpy_dep() {
     unsigned el_id;
     struct boolexpr *boolsym;
     for_all_symbols(i, sym) {
-        if (sym->type == S_BOOLEAN || sym->type == S_TRISTATE) {
-            el_id = symlist_id(gsymlist, sym->name);
-            el = &(gsymlist->array[el_id - 1]);
-            boolsym = boolexpr_sym(gsymlist, sym, false, NULL);
-            Iprintf("Processing: %s\n", sym->name);
-            // Visibility
-            for_all_prompts(sym, prop) {
-                Dprintf(" Prompt: %s\n", prop->text);
-                if (prop->visible.expr != NULL) {
-                    doutput_expr(prop->visible.expr);
-                    struct boolexpr *vis =
-                        boolexpr_kconfig(gsymlist, prop->visible.expr,
-                                         false, NULL);
-                    if (el->vis == NULL) {
-                        el->vis = vis;
-                    } else {
-                        el->vis = boolexpr_or(el->vis, vis);
-                    }
-                } else if (el->vis == NULL) {
-                    el->vis = boolexpr_true();
-                }
-            }
-            if (el->vis == NULL)
-                el->vis = boolexpr_false();
-            // Symbol is choice.. special treatment required
-            if (sym_is_choice(sym)) {
-                Dprintf(" Is Choice\n");
-                goto choice_exception;
-            }
-            // Default value
-            struct boolexpr **defexpr = NULL;
-            size_t defexpr_size = 0;
-            int z;
-            bool exitdef = false;
-            for_all_defaults(sym, prop) {
-                Dprintf(" Default value:\n");
-                doutput_expr(prop->expr);
-                struct boolexpr *def =
-                    boolexpr_kconfig(gsymlist, prop->expr, true, NULL);
-                struct boolexpr *vis;
-                if (prop->visible.expr != NULL)
-                    vis = boolexpr_kconfig(gsymlist, prop->visible.expr,
-                            false, NULL);
-                else
-                    vis = boolexpr_true();
-                if (vis->type != BT_TRUE) {
-                    defexpr = realloc(defexpr,
-                            ++defexpr_size * sizeof(struct boolexpr *));
-                    defexpr[defexpr_size - 1] = boolexpr_copy(vis);
-                } else {
-                    ++defexpr_size;
-                    exitdef = true;
-                }
-                def = boolexpr_and(def, vis);
-                for (z = 0; z < ((int)defexpr_size - 1); z++) {
-                    def = boolexpr_and(def, boolexpr_not(
-                                boolexpr_copy(defexpr[z])));
-                }
-                if (el->def == NULL)
-                    el->def = def;
-                else
-                    el->def = boolexpr_or(el->def, def);
-                if (exitdef)
-                    break;
-            }
-            if (defexpr != NULL) {
-                for (z = 0; z < defexpr_size - 1; z++) {
-                    boolexpr_free(defexpr[z]);
-                }
-                free(defexpr);
-            }
-            if (el->def == NULL)
-                el->def = boolexpr_false();
-            // Dependency expression
-            if (sym->dir_dep.expr != NULL) {
-                Dprintf(" Dependency:\n");
-                doutput_expr(sym->dir_dep.expr);
-                el->dep =
-                    boolexpr_kconfig(gsymlist, sym->dir_dep.expr, false, NULL);
-            } else
-                el->dep = boolexpr_true();
-            // Reverse dependency expression
-            if (sym->rev_dep.expr != NULL) {
-                Dprintf(" Reverse dependency:\n");
-                doutput_expr(sym->rev_dep.expr);
-                el->rev_dep =
-                    boolexpr_kconfig(gsymlist, sym->rev_dep.expr, false, NULL);
-            } else
-                el->rev_dep = boolexpr_false();
+        if (sym->type != S_BOOLEAN && sym->type != S_TRISTATE)
+           continue;
+       el_id = symlist_id(gsymlist, sym->name);
+       el = &(gsymlist->array[el_id - 1]);
+       boolsym = boolexpr_sym(gsymlist, sym, false, NULL);
+       Iprintf("Processing: %s\n", sym->name);
+       // Visibility
+       for_all_prompts(sym, prop) {
+           Dprintf(" Prompt: %s\n", prop->text);
+           if (prop->visible.expr != NULL) {
+               doutput_expr(prop->visible.expr);
+               struct boolexpr *vis =
+                   boolexpr_kconfig(gsymlist, prop->visible.expr,
+                                    false, NULL);
+               if (el->vis == NULL) {
+                   el->vis = vis;
+               } else {
+                   el->vis = boolexpr_or(el->vis, vis);
+               }
+           } else if (el->vis == NULL) {
+               el->vis = boolexpr_true();
+           }
+       }
+       if (el->vis == NULL)
+           el->vis = boolexpr_false();
+       // Symbol is choice.. special treatment required
+       if (sym_is_choice(sym)) {
+           Dprintf(" Is Choice\n");
+           goto choice_exception;
+       }
+       // Default value
+       struct boolexpr **defexpr = NULL;
+       size_t defexpr_size = 0;
+       int z;
+       bool exitdef = false;
+       for_all_defaults(sym, prop) {
+           Dprintf(" Default value:\n");
+           doutput_expr(prop->expr);
+           struct boolexpr *def =
+               boolexpr_kconfig(gsymlist, prop->expr, true, NULL);
+           struct boolexpr *vis;
+           if (prop->visible.expr != NULL)
+               vis = boolexpr_kconfig(gsymlist, prop->visible.expr,
+                                      false, NULL);
+           else
+               vis = boolexpr_true();
+           if (vis->type != BT_TRUE) {
+               defexpr = realloc(defexpr,
+                                 ++defexpr_size * sizeof(struct boolexpr *));
+               defexpr[defexpr_size - 1] = boolexpr_copy(vis);
+           } else {
+               ++defexpr_size;
+               exitdef = true;
+           }
+           def = boolexpr_and(def, vis);
+           for (z = 0; z < ((int)defexpr_size - 1); z++) {
+               def = boolexpr_and(def, boolexpr_not(
+                                      boolexpr_copy(defexpr[z])));
+           }
+           if (el->def == NULL)
+               el->def = def;
+           else
+               el->def = boolexpr_or(el->def, def);
+           if (exitdef)
+               break;
+       }
+       if (defexpr != NULL) {
+           for (z = 0; z < defexpr_size - 1; z++) {
+               boolexpr_free(defexpr[z]);
+           }
+           free(defexpr);
+       }
+       if (el->def == NULL)
+           el->def = boolexpr_false();
+       // Dependency expression
+       if (sym->dir_dep.expr != NULL) {
+           Dprintf(" Dependency:\n");
+           doutput_expr(sym->dir_dep.expr);
+           el->dep =
+               boolexpr_kconfig(gsymlist, sym->dir_dep.expr, false, NULL);
+       } else
+           el->dep = boolexpr_true();
+       // Reverse dependency expression
+       if (sym->rev_dep.expr != NULL) {
+           Dprintf(" Reverse dependency:\n");
+           doutput_expr(sym->rev_dep.expr);
+           el->rev_dep =
+               boolexpr_kconfig(gsymlist, sym->rev_dep.expr, false, NULL);
+       } else
+           el->rev_dep = boolexpr_false();
 
-            if (el->dep->type != BT_FALSE && el->dep->type != BT_TRUE)
-                cnf_boolexpr(gsymlist, el->dep);
-            if (el->rev_dep->type != BT_FALSE
-                && el->rev_dep->type != BT_TRUE)
-                cnf_boolexpr(gsymlist, el->rev_dep);
-            if (el->def->type != BT_FALSE && el->def->type != BT_TRUE)
-                cnf_boolexpr(gsymlist, el->def);
-            if (el->vis->type != BT_FALSE && el->vis->type != BT_TRUE)
-                cnf_boolexpr(gsymlist, el->vis);
-            // (!sym || dep) && (sym || !rev_dep) &&
-            // && (sym || !dep || !def || vis) &&
-            // (!sym || rev_dep || def || vis)
-            if (el->dep->type != BT_TRUE) {
-                output_rules_symbol(-1 * boolsym->id);
-                if (el->dep->type != BT_FALSE) {
-                    output_rules_symbol(el->dep->id);
-                }
-                output_rules_endterm();
-            }
-            if (el->rev_dep->type != BT_FALSE) {
-                output_rules_symbol(boolsym->id);
-                if (el->rev_dep->type != BT_TRUE) {
-                    output_rules_symbol(-1 * el->rev_dep->id);
-                }
-                output_rules_endterm();
-            }
-            if (el->dep->type != BT_FALSE && el->def->type != BT_FALSE
-                && el->vis->type != BT_TRUE) {
-                output_rules_symbol(boolsym->id);
-                if (el->dep->type != BT_TRUE) {
-                    output_rules_symbol(-1 * el->dep->id);
-                }
-                if (el->def->type != BT_TRUE) {
-                    output_rules_symbol(-1 * el->def->id);
-                }
-                if (el->vis->type != BT_FALSE) {
-                    output_rules_symbol(el->vis->id);
-                }
-                output_rules_endterm();
-            }
-            if (el->rev_dep->type != BT_TRUE && el->def->type != BT_TRUE
-                && el->vis->type != BT_TRUE) {
-                output_rules_symbol(-1 * boolsym->id);
-                if (el->rev_dep->type != BT_FALSE) {
-                    output_rules_symbol(el->rev_dep->id);
-                }
-                if (el->def->type != BT_FALSE) {
-                    output_rules_symbol(el->def->id);
-                }
-                if (el->vis->type != BT_FALSE) {
-                    output_rules_symbol(el->vis->id);
-                }
-                output_rules_endterm();
-            }
+       if (el->dep->type != BT_FALSE && el->dep->type != BT_TRUE)
+           cnf_boolexpr(gsymlist, el->dep);
+       if (el->rev_dep->type != BT_FALSE
+           && el->rev_dep->type != BT_TRUE)
+           cnf_boolexpr(gsymlist, el->rev_dep);
+       if (el->def->type != BT_FALSE && el->def->type != BT_TRUE)
+           cnf_boolexpr(gsymlist, el->def);
+       if (el->vis->type != BT_FALSE && el->vis->type != BT_TRUE)
+           cnf_boolexpr(gsymlist, el->vis);
+       // (!sym || dep) && (sym || !rev_dep) &&
+       // && (sym || !dep || !def || vis) &&
+       // (!sym || rev_dep || def || vis)
+       if (el->dep->type != BT_TRUE) {
+           output_rules_symbol(-1 * boolsym->id);
+           if (el->dep->type != BT_FALSE) {
+               output_rules_symbol(el->dep->id);
+           }
+           output_rules_endterm();
+       }
+       if (el->rev_dep->type != BT_FALSE) {
+           output_rules_symbol(boolsym->id);
+           if (el->rev_dep->type != BT_TRUE) {
+               output_rules_symbol(-1 * el->rev_dep->id);
+           }
+           output_rules_endterm();
+       }
+       if (el->dep->type != BT_FALSE && el->def->type != BT_FALSE
+           && el->vis->type != BT_TRUE) {
+           output_rules_symbol(boolsym->id);
+           if (el->dep->type != BT_TRUE) {
+               output_rules_symbol(-1 * el->dep->id);
+           }
+           if (el->def->type != BT_TRUE) {
+               output_rules_symbol(-1 * el->def->id);
+           }
+           if (el->vis->type != BT_FALSE) {
+               output_rules_symbol(el->vis->id);
+           }
+           output_rules_endterm();
+       }
+       if (el->rev_dep->type != BT_TRUE && el->def->type != BT_TRUE
+           && el->vis->type != BT_TRUE) {
+           output_rules_symbol(-1 * boolsym->id);
+           if (el->rev_dep->type != BT_FALSE) {
+               output_rules_symbol(el->rev_dep->id);
+           }
+           if (el->def->type != BT_FALSE) {
+               output_rules_symbol(el->def->id);
+           }
+           if (el->vis->type != BT_FALSE) {
+               output_rules_symbol(el->vis->id);
+           }
+           output_rules_endterm();
+       }
 
-            boolexpr_free(el->def);
-            boolexpr_free(el->vis);
-            boolexpr_free(el->dep);
-            boolexpr_free(el->rev_dep);
+       boolexpr_free(el->def);
+       boolexpr_free(el->vis);
+       boolexpr_free(el->dep);
+       boolexpr_free(el->rev_dep);
 
-            continue;
+       continue;
 
-          choice_exception:
-            // Add exclusive rules for choice symbol
-            if (sym->rev_dep.expr != NULL) {
-                Dprintf(" Dependency:\n");
-                doutput_expr(sym->rev_dep.expr);
-                el->rev_dep =
-                    boolexpr_kconfig(gsymlist, sym->rev_dep.expr, true, NULL);
-            } else
-                el->rev_dep = boolexpr_true();
-            for_all_choices(sym, prop) {
-                struct symbol *symw;
-                struct expr *exprw;
-                unsigned *symx = NULL;
-                size_t symx_size = 0;
-                int x, y;
-                expr_list_for_each_sym(prop->expr, exprw, symw) {
-                    symx_size++;
-                    symx = realloc(symx, symx_size * sizeof(unsigned));
-                    symx[symx_size - 1] = symlist_id(gsymlist, symw->name);
-                    output_rules_symbol(symx[symx_size - 1]);
-                }
-                output_rules_symbol(-(int)
-                                    el_id);
-                output_rules_endterm();
-                for (x = 0; x < symx_size - 1; x++) {
-                    for (y = x + 1; y < symx_size; y++) {
-                        output_rules_symbol(-(int)
-                                            symx[x]);
-                        output_rules_symbol(-(int)
-                                            symx[y]);
-                        output_rules_endterm();
-                    }
-                }
-                free(symx);
-                symx = NULL;
-            }
-            if (el->rev_dep->type != BT_FALSE && el->rev_dep->type != BT_TRUE)
-                cnf_boolexpr(gsymlist, el->rev_dep);
-            if (el->vis->type != BT_FALSE && el->vis->type != BT_TRUE)
-                cnf_boolexpr(gsymlist, el->vis);
-            // (!sym || rev_dep) && (!sym || !rev_dep || vis)
-            // For nonoptional per list symbol add:
-            // (sym || !rev_dep || !vis || !dir_dep_of_list))
-            if (el->rev_dep->type != BT_TRUE) {
-                output_rules_symbol(-1 * boolsym->id);
-                if (el->rev_dep->type != BT_FALSE) {
-                    output_rules_symbol(el->rev_dep->id);
-                }
-                output_rules_endterm();
-            }
-            if (el->rev_dep->type != BT_FALSE && el->vis->type != BT_TRUE) {
-                output_rules_symbol(-1 * boolsym->id);
-                if (el->rev_dep->type != BT_TRUE) {
-                    output_rules_symbol(-1 * el->rev_dep->id);
-                }
-                if (el->vis != BT_FALSE) {
-                    output_rules_symbol(el->vis->id);
-                }
-                output_rules_endterm();
-            }
-            if (!sym_is_optional(sym)) {
-                for_all_choices(sym, prop) {
-                    struct symbol *symw;
-                    struct expr *exprw;
-                    expr_list_for_each_sym(prop->expr, exprw, symw) {
-                        struct boolexpr *wdep;
-                        if (symw->dir_dep.expr != NULL) {
-                            struct symbol *settrue[] = {sym, NULL};
-                            wdep =
-                                boolexpr_kconfig(gsymlist, symw->dir_dep.expr,
-                                        false, settrue);
-                        } else
-                            wdep = boolexpr_true();
-                        cnf_boolexpr(gsymlist, wdep);
-                        if (el->rev_dep->type != BT_FALSE
-                            && el->vis->type != BT_FALSE
-                            && wdep->type != BT_FALSE) {
-                            output_rules_symbol(boolsym->id);
-                            if (el->rev_dep->type != BT_TRUE) {
-                                output_rules_symbol(-1 * el->rev_dep->id);
-                            }
-                            if (el->vis->type != BT_TRUE) {
-                                output_rules_symbol(-1 * el->vis->id);
-                            }
-                            if (wdep->type != BT_TRUE
-                                && wdep->id != boolsym->id) {
-                                output_rules_symbol(-1 * wdep->id);
-                            }
-                            output_rules_endterm();
-                        }
-                    }
-                }
-            }
-        }
+    choice_exception:
+       // Add exclusive rules for choice symbol
+       if (sym->rev_dep.expr != NULL) {
+           Dprintf(" Dependency:\n");
+           doutput_expr(sym->rev_dep.expr);
+           el->rev_dep =
+               boolexpr_kconfig(gsymlist, sym->rev_dep.expr, true, NULL);
+       } else
+           el->rev_dep = boolexpr_true();
+       for_all_choices(sym, prop) {
+           struct symbol *symw;
+           struct expr *exprw;
+           unsigned *symx = NULL;
+           size_t symx_size = 0;
+           int x, y;
+           expr_list_for_each_sym(prop->expr, exprw, symw) {
+               symx_size++;
+               symx = realloc(symx, symx_size * sizeof(unsigned));
+               symx[symx_size - 1] = symlist_id(gsymlist, symw->name);
+               output_rules_symbol(symx[symx_size - 1]);
+           }
+           output_rules_symbol(-(int)
+                               el_id);
+           output_rules_endterm();
+           for (x = 0; x < symx_size - 1; x++) {
+               for (y = x + 1; y < symx_size; y++) {
+                   output_rules_symbol(-(int)
+                                       symx[x]);
+                   output_rules_symbol(-(int)
+                                       symx[y]);
+                   output_rules_endterm();
+               }
+           }
+           free(symx);
+           symx = NULL;
+       }
+       if (el->rev_dep->type != BT_FALSE && el->rev_dep->type != BT_TRUE)
+           cnf_boolexpr(gsymlist, el->rev_dep);
+       if (el->vis->type != BT_FALSE && el->vis->type != BT_TRUE)
+           cnf_boolexpr(gsymlist, el->vis);
+       // (!sym || rev_dep) && (!sym || !rev_dep || vis)
+       // For nonoptional per list symbol add:
+       // (sym || !rev_dep || !vis || !dir_dep_of_list))
+       if (el->rev_dep->type != BT_TRUE) {
+           output_rules_symbol(-1 * boolsym->id);
+           if (el->rev_dep->type != BT_FALSE) {
+               output_rules_symbol(el->rev_dep->id);
+           }
+           output_rules_endterm();
+       }
+       if (el->rev_dep->type != BT_FALSE && el->vis->type != BT_TRUE) {
+           output_rules_symbol(-1 * boolsym->id);
+           if (el->rev_dep->type != BT_TRUE) {
+               output_rules_symbol(-1 * el->rev_dep->id);
+           }
+           if (el->vis != BT_FALSE) {
+               output_rules_symbol(el->vis->id);
+           }
+           output_rules_endterm();
+       }
+       if (!sym_is_optional(sym)) {
+           for_all_choices(sym, prop) {
+               struct symbol *symw;
+               struct expr *exprw;
+               expr_list_for_each_sym(prop->expr, exprw, symw) {
+                   struct boolexpr *wdep;
+                   if (symw->dir_dep.expr != NULL) {
+                       struct symbol *settrue[] = {sym, NULL};
+                       wdep =
+                           boolexpr_kconfig(gsymlist, symw->dir_dep.expr,
+                                            false, settrue);
+                   } else
+                       wdep = boolexpr_true();
+                   cnf_boolexpr(gsymlist, wdep);
+                   if (el->rev_dep->type != BT_FALSE
+                       && el->vis->type != BT_FALSE
+                       && wdep->type != BT_FALSE) {
+                       output_rules_symbol(boolsym->id);
+                       if (el->rev_dep->type != BT_TRUE) {
+                           output_rules_symbol(-1 * el->rev_dep->id);
+                       }
+                       if (el->vis->type != BT_TRUE) {
+                           output_rules_symbol(-1 * el->vis->id);
+                       }
+                       if (wdep->type != BT_TRUE
+                           && wdep->id != boolsym->id) {
+                           output_rules_symbol(-1 * wdep->id);
+                       }
+                       output_rules_endterm();
+                   }
+               }
+           }
+       }
     }
 }