p47035891
/
depends-public
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "cache included file set of cpp" 

This reverts commit ac667382e1.
This commit is contained in:
Gang ZHANG 2020-01-02 10:49:13 +08:00
parent 2d90871f91
commit 86c9b59cce
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/depends/extractor/cpp/CppImportLookupStrategy.java
View File

@ -26,7 +26,6 @@ package depends.extractor.cpp;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@ -42,8 +41,6 @@ import depends.relations.ImportLookupStrategy;
import depends.relations.Inferer;
public class CppImportLookupStrategy implements ImportLookupStrategy {
HashMap<Integer, HashSet<String>> includedFiles = new HashMap<>();
@Override
public Entity lookupImportedType(String name, FileEntity fileEntity, EntityRepo repo, Inferer inferer) {
String importedString = fileEntity.importedSuffixMatch(name);
@ -52,8 +49,8 @@ public class CppImportLookupStrategy implements ImportLookupStrategy {
if (r!=null) return r;
}
HashSet<String> fileSet = findIncludedFiles(fileEntity, repo);
HashSet<String> fileSet = new HashSet<>();
foundIncludedFiles(fileSet, fileEntity.getImportedFiles(),repo);
for (String file:fileSet) {
Entity importedItem = repo.getEntity(file);
@ -73,15 +70,6 @@ public class CppImportLookupStrategy implements ImportLookupStrategy {
return null;
}
private HashSet<String> findIncludedFiles(FileEntity fileEntity, EntityRepo repo) {
HashSet<String> fileSet = this.includedFiles.get(fileEntity.getId());
if (fileSet!=null) return fileSet;
fileSet = new HashSet<>();
foundIncludedFiles(fileSet, fileEntity.getImportedFiles(),repo);
includedFiles.put(fileEntity.getId(),fileSet);
return fileSet;
}
private void foundIncludedFiles(HashSet<String> fileSet, Collection<Entity> importedFiles, EntityRepo repo) {
for (Entity file:importedFiles) {
if (file==null ) continue;