Merge automatic and manual code changes for new cell connections API

1 files changed, 9 insertions, 9 deletions

diff --git a/passes/cmds/splice.cc b/passes/cmds/splice.cc
index c8b3d0b0c..8b7e04062 100644
--- a/passes/cmds/splice.cc
+++ b/passes/cmds/splice.cc
@@ -74,9 +74,9 @@ struct SpliceWorker
 			cell->parameters["\\OFFSET"] = offset;
 			cell->parameters["\\A_WIDTH"] = sig_a.size();
 			cell->parameters["\\Y_WIDTH"] = sig.size();
-			cell->connections_["\\A"] = sig_a;
-			cell->connections_["\\Y"] = module->addWire(NEW_ID, sig.size());
-			new_sig = cell->connections_["\\Y"];
+			cell->set("\\A", sig_a);
+			cell->set("\\Y", module->addWire(NEW_ID, sig.size()));
+			new_sig = cell->get("\\Y");
 		}
 
 		sliced_signals_cache[sig] = new_sig;
@@ -130,10 +130,10 @@ struct SpliceWorker
 			RTLIL::Cell *cell = module->addCell(NEW_ID, "$concat");
 			cell->parameters["\\A_WIDTH"] = new_sig.size();
 			cell->parameters["\\B_WIDTH"] = sig2.size();
-			cell->connections_["\\A"] = new_sig;
-			cell->connections_["\\B"] = sig2;
-			cell->connections_["\\Y"] = module->addWire(NEW_ID, new_sig.size() + sig2.size());
-			new_sig = cell->connections_["\\Y"];
+			cell->set("\\A", new_sig);
+			cell->set("\\B", sig2);
+			cell->set("\\Y", module->addWire(NEW_ID, new_sig.size() + sig2.size()));
+			new_sig = cell->get("\\Y");
 		}
 
 		spliced_signals_cache[sig] = new_sig;
@@ -159,7 +159,7 @@ struct SpliceWorker
 			}
 
 		for (auto &it : module->cells)
-		for (auto &conn : it.second->connections_)
+		for (auto &conn : it.second->connections())
 			if (!ct.cell_known(it.second->type) || ct.cell_output(it.second->type, conn.first)) {
 				RTLIL::SigSpec sig = sigmap(conn.second);
 				driven_chunks.insert(sig);
@@ -232,7 +232,7 @@ struct SpliceWorker
 			it.first->port_output = false;
 			module->add(it.first);
 			module->add(new_port);
-			module->connections_.push_back(RTLIL::SigSig(new_port, it.second));
+			module->connect(RTLIL::SigSig(new_port, it.second));
 		}
 	}
 };