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

Small refactoring

This commit is contained in:
Matthias Koefferlein 2025-05-17 00:57:36 +02:00
parent 5c27fedfe5
commit baed5bd822
4 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc
View File

@ -1082,9 +1082,12 @@ LEFDEFReaderState::lef_importer ()
} }
void void
LEFDEFReaderState::read_lef (tl::InputStream &stream, db::Layout &layout) LEFDEFReaderState::read_lef (const std::string &fn, db::Layout &layout)
{ {
tl::InputStream stream (fn);
lef_importer ().read (stream, layout, *this); lef_importer ().read (stream, layout, *this);
m_lef_files_read.insert (fn);
} }
void void

11
src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h
View File

@ -1413,7 +1413,7 @@ public:
* *
* Multiple LEF files can be read. * Multiple LEF files can be read.
*/ */
void read_lef (tl::InputStream &stream, db::Layout &layout); void read_lef (const std::string &fn, db::Layout &layout);
/** /**
* @brief Provided for test purposes * @brief Provided for test purposes
@ -1428,15 +1428,6 @@ public:
return m_lef_files_read.find (fn) != m_lef_files_read.end (); return m_lef_files_read.find (fn) != m_lef_files_read.end ();
} }
/**
* @brief Registers a LEF file
* After registration, the same file will report "already_read"
*/
void register_lef_file (const std::string &fn)
{
m_lef_files_read.insert (fn);
}
/** /**
* @brief Gets the stored macro layouts * @brief Gets the stored macro layouts
*/ */

10
src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc
View File

@ -187,11 +187,8 @@ LEFDEFReader::read_lefdef (db::Layout &layout, const db::LoadLayoutOptions &opti
tl::SelfTimer timer (tl::verbosity () >= 21, tl::to_string (tr ("Reading LEF file: ")) + *lp); tl::SelfTimer timer (tl::verbosity () >= 21, tl::to_string (tr ("Reading LEF file: ")) + *lp);
tl::InputStream lef_stream (norm_lp);
tl::log << tl::to_string (tr ("Reading")) << " " << *lp; tl::log << tl::to_string (tr ("Reading")) << " " << *lp;
state->read_lef (lef_stream, layout); state->read_lef (norm_lp, layout);
state->register_lef_file (norm_lp);
} }
@ -220,11 +217,8 @@ LEFDEFReader::read_lefdef (db::Layout &layout, const db::LoadLayoutOptions &opti
tl::SelfTimer timer (tl::verbosity () >= 21, tl::to_string (tr ("Reading LEF file: ")) + lp); tl::SelfTimer timer (tl::verbosity () >= 21, tl::to_string (tr ("Reading LEF file: ")) + lp);
tl::InputStream lef_stream (norm_lp);
tl::log << tl::to_string (tr ("Reading")) << " " << lp; tl::log << tl::to_string (tr ("Reading")) << " " << lp;
state->read_lef (lef_stream, layout); state->read_lef (norm_lp, layout);
state->register_lef_file (norm_lp);
} }

3
src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc
View File

@ -95,8 +95,7 @@ static db::LayerMap read (db::Layout &layout, const char *lef_dir, const char *f
ex.read_word_or_quoted (f); ex.read_word_or_quoted (f);
fn += f; fn += f;
tl::InputStream stream (fn); ld.read_lef (fn, layout);
ld.read_lef (stream, layout);
any_lef = true; any_lef = true;