Skip to content

Commit c57ac63

Browse files
committed
Rename to m_concatenatedFilename
Signed-off-by: Bartłomiej Chmiel <bchmiel@antmicro.com>
1 parent 2965c02 commit c57ac63

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/V3EmitMk.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ class EmitMk final {
3333

3434
struct FileOrConcatenatedFilesList final {
3535
std::string m_fileName;
36-
std::vector<std::string> m_concatenatedFileNames{};
36+
std::vector<std::string> m_concatenatedFilenames{};
3737

3838
// Concatenating file score for debugTestConcatenation
3939
std::int64_t m_dbgScore = 0;
4040

41-
bool isConcatenatingFile() const { return !m_concatenatedFileNames.empty(); }
41+
bool isConcatenatingFile() const { return !m_concatenatedFilenames.empty(); }
4242
};
4343

4444
struct FilenameWithScore final {
@@ -215,7 +215,7 @@ class EmitMk final {
215215
<< entry.m_fileName
216216
<< " (concatenating file; total score: "
217217
<< entry.m_dbgScore << ")" << endl);
218-
for (const auto& f : entry.m_concatenatedFileNames) {
218+
for (const auto& f : entry.m_concatenatedFilenames) {
219219
DEBUG_LOG_OUTPUT_FILE_LIST_MSG(logMsgPrefixListEntry(1) << f << endl);
220220
}
221221
} else {
@@ -234,7 +234,7 @@ class EmitMk final {
234234
auto ofIt = outputFiles.begin();
235235
while (ifIt != inputFiles.end() && ofIt != outputFiles.end()) {
236236
if (ofIt->isConcatenatingFile()) {
237-
for (const auto& ocf : ofIt->m_concatenatedFileNames) {
237+
for (const auto& ocf : ofIt->m_concatenatedFilenames) {
238238
UASSERT(ifIt != inputFiles.end(),
239239
"More output files than input files. First extra file: " << ocf);
240240
UASSERT(ifIt->m_filename == ocf,
@@ -509,19 +509,19 @@ class EmitMk final {
509509
if (bucketScore == 0 || fileIt->m_score == 0 || diffNow > diffIfAdded) {
510510
// Bucket score will be better with the file in it.
511511
bucketScore += fileIt->m_score;
512-
bucket.m_concatenatedFileNames.push_back(std::move(fileIt->m_filename));
512+
bucket.m_concatenatedFilenames.push_back(std::move(fileIt->m_filename));
513513
} else {
514514
// Best possible bucket score reached, process next bucket.
515515
break;
516516
}
517517
}
518518

519-
if (bucket.m_concatenatedFileNames.size() == 1) {
519+
if (bucket.m_concatenatedFilenames.size() == 1) {
520520
// Unwrap the bucket if it contains only one file.
521521
FileOrConcatenatedFilesList file;
522-
file.m_fileName = bucket.m_concatenatedFileNames.front();
522+
file.m_fileName = bucket.m_concatenatedFilenames.front();
523523
outputFiles.push_back(std::move(file));
524-
} else if (bucket.m_concatenatedFileNames.size() > 1) {
524+
} else if (bucket.m_concatenatedFilenames.size() > 1) {
525525
bucket.m_dbgScore = bucketScore;
526526
outputFiles.push_back(std::move(bucket));
527527
}
@@ -531,7 +531,7 @@ class EmitMk final {
531531
for (; fileIt != list.m_files.end(); ++fileIt) {
532532
// The Work List is out of buckets, but some files were left.
533533
// Add them to the last bucket.
534-
outputFiles.back().m_concatenatedFileNames.push_back(fileIt->m_filename);
534+
outputFiles.back().m_concatenatedFilenames.push_back(fileIt->m_filename);
535535
}
536536
}
537537

@@ -546,7 +546,7 @@ class EmitMk final {
546546

547547
V3OutCFile concatenatingFile{v3Global.opt.makeDir() + "/" + entry.m_fileName + ".cpp"};
548548
concatenatingFile.putsHeader();
549-
for (const auto& file : entry.m_concatenatedFileNames) {
549+
for (const auto& file : entry.m_concatenatedFilenames) {
550550
concatenatingFile.puts("#include \"" + file + ".cpp\"\n");
551551
}
552552
}

0 commit comments

Comments
 (0)