Merge pull request #3910 from alainmarcel/alainmarcel-patch-1

module spec regexp
chipsalliance · Oct 17, 2023 · ea57e33 · ea57e33
2 parents 6b20406 + a418b11
commit ea57e33
Showing 1 changed file with 35 additions and 33 deletions.
diff --git a/src/SourceCompile/Compiler.cpp b/src/SourceCompile/Compiler.cpp
@@ -211,39 +211,41 @@ bool Compiler::ppinit_() {
       fileSystem->collect(libFileId,
                           m_commandLineParser->getSymbolTable()->getSymbol(ext),
                           m_commandLineParser->getSymbolTable(), fileIds);
-      std::copy_if(
-          fileIds.begin(), fileIds.end(),
-          std::inserter(libFileIdSet, libFileIdSet.end()),
-          [&](const PathId& libFileId) {
-            if (sourceFiles.find(libFileId) == sourceFiles.end()) {
-              bool fileContainsModuleOfSameName = false;
-              std::filesystem::path dir_entry = fileSystem->toPath(libFileId);
-              std::ifstream ifs(dir_entry.string());
-              if (ifs.good()) {
-                std::stringstream buffer;
-                buffer << ifs.rdbuf();
-                std::string moduleName = dir_entry.stem().string();
-                const std::regex regexpMod{"(module)[ ]+(" + moduleName + ")"};
-                if (std::regex_search(buffer.str(), regexpMod)) {
-                  fileContainsModuleOfSameName = true;
-                }
-                const std::regex regexpPrim{"(primitive)[ ]+(" + moduleName +
-                                            ")"};
-                if (std::regex_search(buffer.str(), regexpPrim)) {
-                  fileContainsModuleOfSameName = true;
-                }
-                const std::regex regexpPack{"(package)[ ]"};
-                if (std::regex_search(buffer.str(), regexpPack)) {
-                  // Files containing packages cannot be imported with -y
-                  fileContainsModuleOfSameName = false;
-                }
-              }
-              ifs.close();
-              return fileContainsModuleOfSameName;
-            } else {
-              return false;
-            }
-          });
+      std::copy_if(fileIds.begin(), fileIds.end(),
+                   std::inserter(libFileIdSet, libFileIdSet.end()),
+                   [&](const PathId& libFileId) {
+                     if (sourceFiles.find(libFileId) == sourceFiles.end()) {
+                       bool fileContainsModuleOfSameName = false;
+                       std::filesystem::path dir_entry =
+                           fileSystem->toPath(libFileId);
+                       std::ifstream ifs(dir_entry.string());
+                       if (ifs.good()) {
+                         std::stringstream buffer;
+                         buffer << ifs.rdbuf();
+                         std::string moduleName = dir_entry.stem().string();
+                         const std::regex regexpMod{"(module)[ \t]+(" +
+                                                    moduleName + ")"};
+                         if (std::regex_search(buffer.str(), regexpMod)) {
+                           fileContainsModuleOfSameName = true;
+                         }
+                         const std::regex regexpPrim{"(primitive)[ \t]+(" +
+                                                     moduleName + ")"};
+                         if (std::regex_search(buffer.str(), regexpPrim)) {
+                           fileContainsModuleOfSameName = true;
+                         }
+                         const std::regex regexpPack{"(package)[ \t]"};
+                         if (std::regex_search(buffer.str(), regexpPack)) {
+                           // Files containing packages cannot be imported with
+                           // -y
+                           fileContainsModuleOfSameName = false;
+                         }
+                       }
+                       ifs.close();
+                       return fileContainsModuleOfSameName;
+                     } else {
+                       return false;
+                     }
+                   });
     }
   }
   for (const auto& libFileId : libFileIdSet) {