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

WIP: a small refactoring.

This commit is contained in:
Matthias Koefferlein 2019-05-10 00:18:58 +02:00
parent ea28530c55
commit dda7ee8b60
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -678,7 +678,7 @@ LayoutToNetlistStandardReader::read_device (db::LayoutToNetlist *l2n, db::Circui
std::map<std::pair<const db::DeviceAbstract *, db::Vector>, size_t>::const_iterator a = abstracts.find (std::make_pair (i->device_abstract, offset)); std::map<std::pair<const db::DeviceAbstract *, db::Vector>, size_t>::const_iterator a = abstracts.find (std::make_pair (i->device_abstract, offset));
if (a != abstracts.end () && a->second < insts.size ()) { if (a != abstracts.end () && a->second < insts.size ()) {
Connections ref (net->cluster_id (), i->device_abstract->cluster_id_for_terminal (i->other_terminal_id), dbu_inv * i->offset); Connections ref (net->cluster_id (), i->device_abstract->cluster_id_for_terminal (i->other_terminal_id));
connections [insts [a->second]].push_back (ref); connections [insts [a->second]].push_back (ref);
} }
@ -690,7 +690,7 @@ LayoutToNetlistStandardReader::read_device (db::LayoutToNetlist *l2n, db::Circui
std::map<std::pair<const db::DeviceAbstract *, db::Vector>, size_t>::const_iterator a = abstracts.find (std::make_pair (dm, db::Vector ())); std::map<std::pair<const db::DeviceAbstract *, db::Vector>, size_t>::const_iterator a = abstracts.find (std::make_pair (dm, db::Vector ()));
if (a != abstracts.end () && a->second < insts.size ()) { if (a != abstracts.end () && a->second < insts.size ()) {
Connections ref (net->cluster_id (), dm->cluster_id_for_terminal (tid), db::Vector ()); Connections ref (net->cluster_id (), dm->cluster_id_for_terminal (tid));
connections [insts [a->second]].push_back (ref); connections [insts [a->second]].push_back (ref);
} }
@ -790,7 +790,7 @@ LayoutToNetlistStandardReader::read_subcircuit (db::LayoutToNetlist *l2n, db::Ci
subcircuit->connect_pin (sc_pin->id (), net); subcircuit->connect_pin (sc_pin->id (), net);
db::Net *sc_net = circuit_ref->net_for_pin (sc_pin->id ()); db::Net *sc_net = circuit_ref->net_for_pin (sc_pin->id ());
if (sc_net) { if (sc_net) {
refs.push_back (Connections (net->cluster_id (), sc_net->cluster_id (), db::Vector ())); refs.push_back (Connections (net->cluster_id (), sc_net->cluster_id ()));
} }
} else { } else {

5
src/db/db/dbLayoutToNetlistReader.h
View File

@ -74,12 +74,11 @@ private:
struct Connections struct Connections
{ {
Connections (size_t _from_cluster, size_t _to_cluster, const db::Vector &_offset) Connections (size_t _from_cluster, size_t _to_cluster)
: from_cluster (_from_cluster), to_cluster (_to_cluster), offset (_offset) : from_cluster (_from_cluster), to_cluster (_to_cluster)
{ } { }
size_t from_cluster, to_cluster; size_t from_cluster, to_cluster;
db::Vector offset;
}; };
tl::TextInputStream m_stream; tl::TextInputStream m_stream;