luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WIP: renaming sub_circuit->subcircuit for consistency

This commit is contained in:
Matthias Koefferlein 2018-12-27 02:02:17 +01:00
parent f0f620b1cd
commit bfae347ffb
5 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/db/db/dbNetlist.cc
View File

@ -505,10 +505,10 @@ Circuit &Circuit::operator= (const Circuit &other)
}
std::map<const SubCircuit *, SubCircuit *> sc_table;
for (const_sub_circuit_iterator i = other.begin_sub_circuits (); i != other.end_sub_circuits (); ++i) {
for (const_subcircuit_iterator i = other.begin_subcircuits (); i != other.end_subcircuits (); ++i) {
SubCircuit *sc = new SubCircuit (*i);
sc_table [i.operator-> ()] = sc;
add_sub_circuit (sc);
add_subcircuit (sc);
}
for (const_net_iterator i = other.begin_nets (); i != other.end_nets (); ++i) {
@ -562,7 +562,7 @@ void Circuit::clear ()
m_pins.clear ();
m_devices.clear ();
m_nets.clear ();
m_sub_circuits.clear ();
m_subcircuits.clear ();
m_device_id_table.clear ();
m_subcircuit_id_table.clear ();
m_valid_device_id_table = false;
@ -642,29 +642,29 @@ Device *Circuit::device_by_id (size_t id)
return d != m_device_id_table.end () ? d->second : 0;
}
void Circuit::add_sub_circuit (SubCircuit *sub_circuit)
void Circuit::add_subcircuit (SubCircuit *subcircuit)
{
size_t id = 0;
if (! m_sub_circuits.empty ()) {
tl_assert (m_sub_circuits.back () != 0);
id = m_sub_circuits.back ()->id ();
if (! m_subcircuits.empty ()) {
tl_assert (m_subcircuits.back () != 0);
id = m_subcircuits.back ()->id ();
}
sub_circuit->set_id (id + 1);
subcircuit->set_id (id + 1);
m_sub_circuits.push_back (sub_circuit);
m_subcircuits.push_back (subcircuit);
invalidate_subcircuit_id_table ();
}
void Circuit::remove_sub_circuit (SubCircuit *sub_circuit)
void Circuit::remove_subcircuit (SubCircuit *subcircuit)
{
m_sub_circuits.erase (sub_circuit);
m_subcircuits.erase (subcircuit);
invalidate_subcircuit_id_table ();
}
void Circuit::validate_subcircuit_id_table ()
{
m_subcircuit_id_table.clear ();
for (sub_circuit_iterator d = begin_sub_circuits (); d != end_sub_circuits (); ++d) {
for (subcircuit_iterator d = begin_subcircuits (); d != end_subcircuits (); ++d) {
m_subcircuit_id_table.insert (std::make_pair (d->id (), d.operator-> ()));
}
@ -689,7 +689,7 @@ SubCircuit *Circuit::subcircuit_by_id (size_t id)
void Circuit::translate_circuits (const std::map<const Circuit *, Circuit *> &map)
{
for (sub_circuit_iterator i = m_sub_circuits.begin (); i != m_sub_circuits.end (); ++i) {
for (subcircuit_iterator i = m_subcircuits.begin (); i != m_subcircuits.end (); ++i) {
std::map<const Circuit *, Circuit *>::const_iterator m = map.find (i->circuit ());
tl_assert (m != map.end ());
i->set_circuit (m->second);

28
src/db/db/dbNetlist.h
View File

@ -859,9 +859,9 @@ public:
typedef tl::shared_collection<Net> net_list;
typedef net_list::const_iterator const_net_iterator;
typedef net_list::iterator net_iterator;
typedef tl::shared_collection<SubCircuit> sub_circuit_list;
typedef sub_circuit_list::const_iterator const_sub_circuit_iterator;
typedef sub_circuit_list::iterator sub_circuit_iterator;
typedef tl::shared_collection<SubCircuit> subcircuit_list;
typedef subcircuit_list::const_iterator const_subcircuit_iterator;
typedef subcircuit_list::iterator subcircuit_iterator;
/**
* @brief Constructor
@ -1093,12 +1093,12 @@ public:
*
* The circuit takes over ownership of the object.
*/
void add_sub_circuit (SubCircuit *sub_circuit);
void add_subcircuit (SubCircuit *subcircuit);
/**
* @brief Deletes a subcircuit from the circuit
*/
void remove_sub_circuit (SubCircuit *sub_circuit);
void remove_subcircuit (SubCircuit *subcircuit);
/**
* @brief Gets the subcircuit from a given ID (const version)
@ -1120,33 +1120,33 @@ public:
/**
* @brief Begin iterator for the subcircuits of the circuit (non-const version)
*/
sub_circuit_iterator begin_sub_circuits ()
subcircuit_iterator begin_subcircuits ()
{
return m_sub_circuits.begin ();
return m_subcircuits.begin ();
}
/**
* @brief End iterator for the subcircuits of the circuit (non-const version)
*/
sub_circuit_iterator end_sub_circuits ()
subcircuit_iterator end_subcircuits ()
{
return m_sub_circuits.end ();
return m_subcircuits.end ();
}
/**
* @brief Begin iterator for the subcircuits of the circuit (const version)
*/
const_sub_circuit_iterator begin_sub_circuits () const
const_subcircuit_iterator begin_subcircuits () const
{
return m_sub_circuits.begin ();
return m_subcircuits.begin ();
}
/**
* @brief End iterator for the subcircuits of the circuit (const version)
*/
const_sub_circuit_iterator end_sub_circuits () const
const_subcircuit_iterator end_subcircuits () const
{
return m_sub_circuits.end ();
return m_subcircuits.end ();
}
/**
@ -1198,7 +1198,7 @@ private:
net_list m_nets;
pin_list m_pins;
device_list m_devices;
sub_circuit_list m_sub_circuits;
subcircuit_list m_subcircuits;
Netlist *mp_netlist;
std::vector<Net::pin_iterator> m_pin_refs;
bool m_valid_device_id_table;

6
src/db/db/gsiDeclDbNetlist.cc
View File

@ -581,7 +581,7 @@ static db::Device *create_device1 (db::Circuit *c, db::DeviceClass *dc, const st
static db::SubCircuit *create_subcircuit1 (db::Circuit *c, db::Circuit *cc, const std::string &name)
{
db::SubCircuit *sc = new db::SubCircuit (cc, name);
c->add_sub_circuit (sc);
c->add_subcircuit (sc);
return sc;
}
@ -671,10 +671,10 @@ Class<db::Circuit> decl_dbCircuit ("db", "Circuit",
"\n"
"For more details see the \\SubCircuit class."
) +
gsi::method ("remove_subcircuit", &db::Circuit::remove_sub_circuit, gsi::arg ("subcircuit"),
gsi::method ("remove_subcircuit", &db::Circuit::remove_subcircuit, gsi::arg ("subcircuit"),
"@brief Removes the given subcircuit from the circuit\n"
) +
gsi::iterator ("each_subcircuit", (db::Circuit::sub_circuit_iterator (db::Circuit::*) ()) &db::Circuit::begin_sub_circuits, (db::Circuit::sub_circuit_iterator (db::Circuit::*) ()) &db::Circuit::end_sub_circuits,
gsi::iterator ("each_subcircuit", (db::Circuit::subcircuit_iterator (db::Circuit::*) ()) &db::Circuit::begin_subcircuits, (db::Circuit::subcircuit_iterator (db::Circuit::*) ()) &db::Circuit::end_subcircuits,
"@brief Iterates over the subcircuits of the circuit"
) +
gsi::method ("netlist", (db::Netlist *(db::Circuit::*) ()) &db::Circuit::netlist,

4
src/db/unit_tests/dbNetlistDeviceExtractorTests.cc
View File

@ -350,7 +350,7 @@ public:
subcircuit = new db::SubCircuit (k->second);
db::CplxTrans dbu_trans (layout->dbu ());
subcircuit->set_trans (dbu_trans * i->inst ().complex_trans () * dbu_trans.inverted ());
circuit->add_sub_circuit (subcircuit);
circuit->add_subcircuit (subcircuit);
subcircuits.insert (std::make_pair (i->inst (), subcircuit));
} else {
@ -530,7 +530,7 @@ static std::string netlist2string (const db::Netlist &nl)
res += std::string (" D") + d->device_class ()->name () + " " + device_name (*d) + " (" + ts + ")\n";
}
for (db::Circuit::const_sub_circuit_iterator sc = c->begin_sub_circuits (); sc != c->end_sub_circuits (); ++sc) {
for (db::Circuit::const_subcircuit_iterator sc = c->begin_subcircuits (); sc != c->end_subcircuits (); ++sc) {
std::string ps;
const db::SubCircuit &subcircuit = *sc;
for (db::Circuit::const_pin_iterator p = sc->circuit ()->begin_pins (); p != sc->circuit ()->end_pins (); ++p) {

14
src/db/unit_tests/dbNetlistTests.cc
View File

@ -220,7 +220,7 @@ static std::string netlist2 (const db::Circuit &c)
res += " D" + d->name () + ":" + pins + "\n";
}
for (db::Circuit::const_sub_circuit_iterator s = c.begin_sub_circuits (); s != c.end_sub_circuits (); ++s) {
for (db::Circuit::const_subcircuit_iterator s = c.begin_subcircuits (); s != c.end_subcircuits (); ++s) {
if (! s->circuit ()) {
continue;
}
@ -415,13 +415,13 @@ TEST(4_NetlistSubcircuits)
db::SubCircuit *sc1 = new db::SubCircuit (c2);
sc1->set_name ("sc1");
c1->add_sub_circuit (sc1);
c1->add_subcircuit (sc1);
EXPECT_EQ (sc1->id (), size_t (1));
EXPECT_EQ (c1->subcircuit_by_id (sc1->id ()) == sc1, true);
db::SubCircuit *sc2 = new db::SubCircuit (c2);
sc2->set_name ("sc2");
c1->add_sub_circuit (sc2);
c1->add_subcircuit (sc2);
EXPECT_EQ (sc2->id (), size_t (2));
EXPECT_EQ (c1->subcircuit_by_id (sc2->id ()) == sc2, true);
@ -656,10 +656,10 @@ TEST(8_NetSubCircuitsEditing)
cc2.add_pin (db::Pin ("B"));
db::SubCircuit *sc1 = new db::SubCircuit (&cc1, "sc1");
c.add_sub_circuit (sc1);
c.add_subcircuit (sc1);
db::SubCircuit *sc2 = new db::SubCircuit (&cc2, "sc2");
c.add_sub_circuit (sc2);
c.add_subcircuit (sc2);
db::Net *n1 = new db::Net ();
n1->set_name ("n1");
@ -722,8 +722,8 @@ TEST(8_NetSubCircuitsEditing)
delete sc1;
sc1 = 0;
EXPECT_EQ (c.begin_sub_circuits ()->name (), "sc2");
EXPECT_EQ (++c.begin_sub_circuits () == c.end_sub_circuits (), true);
EXPECT_EQ (c.begin_subcircuits ()->name (), "sc2");
EXPECT_EQ (++c.begin_subcircuits () == c.end_subcircuits (), true);
EXPECT_EQ (net2string (*n1), "sc2:B");
EXPECT_EQ (net2string (*n2), "sc2:A");