From d328901799c25c822001d9853651daf5b2a64b2f Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 29 Mar 2020 21:01:19 +0200 Subject: [PATCH] DEF reader fix: TAPER has to disable NONDEFAULTRULE for the segment --- .../streamers/lefdef/db_plugin/dbDEFImporter.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index 5ee27d495..b5efc29b8 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -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::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; }