Refactoring: Renamed RTLIL::Module::cells to cells_

[yosys.git] / kernel / consteval.h

diff --git a/kernel/consteval.h b/kernel/consteval.h
index 7b1b798c8fe379db4bda756b53b04d1e7e4d4aeb..1727d91cf51dd6a91593a9db52b70aba8c25a5df 100644 (file)
--- a/kernel/consteval.h
+++ b/kernel/consteval.h
@@ -40,10 +40,10 @@ struct ConstEval
                ct.setup_internals();
                ct.setup_stdcells();
 
-               for (auto &it : module->cells) {
+               for (auto &it : module->cells_) {
                        if (!ct.cell_known(it.second->type))
                                continue;
-                       for (auto &it2 : it.second->connections)
+                       for (auto &it2 : it.second->connections())
                                if (ct.cell_output(it.second->type, it2.first))
                                        sig2driver.insert(assign_map(it2.second), it.second);
                }
@@ -87,22 +87,22 @@ struct ConstEval
        {
                RTLIL::SigSpec sig_a, sig_b, sig_s, sig_y;
 
-               assert(cell->connections.count("\\Y") > 0);
-               sig_y = values_map(assign_map(cell->connections["\\Y"]));
+               assert(cell->has("\\Y"));
+               sig_y = values_map(assign_map(cell->get("\\Y")));
                if (sig_y.is_fully_const())
                        return true;
 
-               if (cell->connections.count("\\S") > 0) {
-                       sig_s = cell->connections["\\S"];
+               if (cell->has("\\S")) {
+                       sig_s = cell->get("\\S");
                        if (!eval(sig_s, undef, cell))
                                return false;
                }
 
-               if (cell->connections.count("\\A") > 0)
-                       sig_a = cell->connections["\\A"];
+               if (cell->has("\\A"))
+                       sig_a = cell->get("\\A");
 
-               if (cell->connections.count("\\B") > 0)
-                       sig_b = cell->connections["\\B"];
+               if (cell->has("\\B"))
+                       sig_b = cell->get("\\B");
 
                if (cell->type == "$mux" || cell->type == "$pmux" || cell->type == "$safe_pmux" || cell->type == "$_MUX_")
                {