MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

lazily calculate control flow in ScopeImpl

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-12-15 18:35:48 +01:00
parent 1224088a46
commit 0d7a641aa9
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/dataflow/scope/impl/ScopeImpl.java
+11 -4
View File
@@ -23,8 +23,8 @@ import java.util.*;
* @author oleg
*/
public class ScopeImpl implements Scope {
private final Instruction[] myFlow;
private List<DFAMap<ScopeVariable>> myCachedScopeVariables;
private volatile Instruction[] myFlow;
private volatile List<DFAMap<ScopeVariable>> myCachedScopeVariables;
private Set<String> myGlobals;
private Set<String> myNonlocals;
private final ScopeOwner myFlowOwner;
@@ -33,7 +33,12 @@ public class ScopeImpl implements Scope {
public ScopeImpl(final ScopeOwner flowOwner) {
myFlowOwner = flowOwner;
myFlow = ControlFlowCache.getControlFlow(flowOwner).getInstructions();
}
private synchronized void computeFlow() {
if (myFlow == null) {
myFlow = ControlFlowCache.getControlFlow(myFlowOwner).getInstructions();
}
}
@NotNull
@@ -62,7 +67,8 @@ public class ScopeImpl implements Scope {
return null;
}
public List<DFAMap<ScopeVariable>> computeScopeVariables() throws DFALimitExceededException {
private synchronized List<DFAMap<ScopeVariable>> computeScopeVariables() throws DFALimitExceededException {
computeFlow();
if (myCachedScopeVariables == null) {
final PyReachingDefsDfaInstance dfaInstance = new PyReachingDefsDfaInstance();
final PyReachingDefsSemilattice semilattice = new PyReachingDefsSemilattice();
@@ -104,6 +110,7 @@ public class ScopeImpl implements Scope {
}
private Set<String> computeAllNames() {
computeFlow();
final Set<String> names = new HashSet<String>();
for (Instruction instruction : myFlow) {
if (instruction instanceof ReadWriteInstruction && ((ReadWriteInstruction)instruction).getAccess().isWriteAccess()){