DEF reader fix: TAPER has to disable NONDEFAULTRULE for the segment

This commit is contained in:
Matthias Koefferlein 2020-03-29 21:01:19 +02:00
parent 44503facea
commit d328901799
1 changed files with 6 additions and 4 deletions

View File

@ -475,12 +475,13 @@ DEFImporter::do_read (db::Layout &layout)
take ();
}
taperrule.clear ();
do {
std::string ln = get ();
taperrule.clear ();
const std::string *rulename = 0;
db::Coord w = 0;
if (specialnets) {
w = db::coord_traits<db::Coord>::rounded (get_double () * scale);
@ -507,8 +508,10 @@ DEFImporter::do_read (db::Layout &layout)
while (true) {
if (test ("TAPER")) {
taperrule.clear ();
rulename = &taperrule;
} else if (test ("TAPERRULE")) {
taperrule = get ();
rulename = &taperrule;
} else if (test ("STYLE")) {
sn = get_long ();
} else {
@ -520,8 +523,7 @@ DEFImporter::do_read (db::Layout &layout)
if (! specialnets) {
const std::string *rulename = &taperrule;
if (rulename->empty ()) {
if (! rulename) {
rulename = &nondefaultrule;
}