@@ -33,12 +33,12 @@ class EmitMk final {
33
33
34
34
struct FileOrConcatenatedFilesList final {
35
35
std::string m_fileName;
36
- std::vector<std::string> m_concatenatedFileNames {};
36
+ std::vector<std::string> m_concatenatedFilenames {};
37
37
38
38
// Concatenating file score for debugTestConcatenation
39
39
std::int64_t m_dbgScore = 0 ;
40
40
41
- bool isConcatenatingFile () const { return !m_concatenatedFileNames .empty (); }
41
+ bool isConcatenatingFile () const { return !m_concatenatedFilenames .empty (); }
42
42
};
43
43
44
44
struct FilenameWithScore final {
@@ -215,7 +215,7 @@ class EmitMk final {
215
215
<< entry.m_fileName
216
216
<< " (concatenating file; total score: "
217
217
<< entry.m_dbgScore << " )" << endl);
218
- for (const auto & f : entry.m_concatenatedFileNames ) {
218
+ for (const auto & f : entry.m_concatenatedFilenames ) {
219
219
DEBUG_LOG_OUTPUT_FILE_LIST_MSG (logMsgPrefixListEntry (1 ) << f << endl);
220
220
}
221
221
} else {
@@ -234,7 +234,7 @@ class EmitMk final {
234
234
auto ofIt = outputFiles.begin ();
235
235
while (ifIt != inputFiles.end () && ofIt != outputFiles.end ()) {
236
236
if (ofIt->isConcatenatingFile ()) {
237
- for (const auto & ocf : ofIt->m_concatenatedFileNames ) {
237
+ for (const auto & ocf : ofIt->m_concatenatedFilenames ) {
238
238
UASSERT (ifIt != inputFiles.end (),
239
239
" More output files than input files. First extra file: " << ocf);
240
240
UASSERT (ifIt->m_filename == ocf,
@@ -509,19 +509,19 @@ class EmitMk final {
509
509
if (bucketScore == 0 || fileIt->m_score == 0 || diffNow > diffIfAdded) {
510
510
// Bucket score will be better with the file in it.
511
511
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 ));
513
513
} else {
514
514
// Best possible bucket score reached, process next bucket.
515
515
break ;
516
516
}
517
517
}
518
518
519
- if (bucket.m_concatenatedFileNames .size () == 1 ) {
519
+ if (bucket.m_concatenatedFilenames .size () == 1 ) {
520
520
// Unwrap the bucket if it contains only one file.
521
521
FileOrConcatenatedFilesList file;
522
- file.m_fileName = bucket.m_concatenatedFileNames .front ();
522
+ file.m_fileName = bucket.m_concatenatedFilenames .front ();
523
523
outputFiles.push_back (std::move (file));
524
- } else if (bucket.m_concatenatedFileNames .size () > 1 ) {
524
+ } else if (bucket.m_concatenatedFilenames .size () > 1 ) {
525
525
bucket.m_dbgScore = bucketScore;
526
526
outputFiles.push_back (std::move (bucket));
527
527
}
@@ -531,7 +531,7 @@ class EmitMk final {
531
531
for (; fileIt != list.m_files .end (); ++fileIt) {
532
532
// The Work List is out of buckets, but some files were left.
533
533
// 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 );
535
535
}
536
536
}
537
537
@@ -546,7 +546,7 @@ class EmitMk final {
546
546
547
547
V3OutCFile concatenatingFile{v3Global.opt .makeDir () + " /" + entry.m_fileName + " .cpp" };
548
548
concatenatingFile.putsHeader ();
549
- for (const auto & file : entry.m_concatenatedFileNames ) {
549
+ for (const auto & file : entry.m_concatenatedFilenames ) {
550
550
concatenatingFile.puts (" #include \" " + file + " .cpp\"\n " );
551
551
}
552
552
}
0 commit comments