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

more demonstrative constructor for ReadWriteVariableInstruction

Browse Source
This commit is contained in:
Maxim.Medvedev
2012-03-20 16:48:48 +04:00
parent 186cd45d86
commit bdee83fec8
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/ReadWriteVariableInstruction.java
+5 -2
View File
@@ -23,13 +23,16 @@ import org.jetbrains.plugins.groovy.lang.psi.controlFlow.impl.InstructionImpl;
* @author ven
*/
public class ReadWriteVariableInstruction extends InstructionImpl {
public static final int WRITE = -1;
public static final int READ = 1;
private final boolean myIsWrite;
private final String myName;
public ReadWriteVariableInstruction(@NotNull String varName, PsiElement element, int num, boolean isWrite) {
public ReadWriteVariableInstruction(@NotNull String varName, PsiElement element, int num, int accessType) {
super(element, num);
myName = varName;
myIsWrite = isWrite;
myIsWrite = accessType == WRITE;
}
@NotNull public String getVariableName() {
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/ControlFlowBuilder.java
+14 -10
View File
@@ -51,6 +51,9 @@ import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil;
import java.util.*;
import static org.jetbrains.plugins.groovy.lang.psi.controlFlow.ReadWriteVariableInstruction.READ;
import static org.jetbrains.plugins.groovy.lang.psi.controlFlow.ReadWriteVariableInstruction.WRITE;
/**
* @author ven
*/
@@ -107,7 +110,7 @@ public class ControlFlowBuilder extends GroovyRecursiveElementVisitor {
final PsiElement lbrace = block.getLBrace();
if (lbrace != null && parent instanceof GrMethod) {
for (GrParameter parameter : ((GrMethod)parent).getParameters()) {
addNode(new ReadWriteVariableInstruction(parameter.getName(), parameter, myInstructionNumber++, true));
addNode(new ReadWriteVariableInstruction(parameter.getName(), parameter, myInstructionNumber++, WRITE));
}
}
super.visitOpenBlock(block);
@@ -185,7 +188,7 @@ public class ControlFlowBuilder extends GroovyRecursiveElementVisitor {
private void buildFlowForClosure(final GrClosableBlock closure) {
for (GrParameter parameter : closure.getAllParameters()) {
addNode(new ReadWriteVariableInstruction(parameter.getName(), parameter, myInstructionNumber++, true));
addNode(new ReadWriteVariableInstruction(parameter.getName(), parameter, myInstructionNumber++, WRITE));
}
final Set<String> names = new LinkedHashSet<String>();
@@ -207,7 +210,7 @@ public class ControlFlowBuilder extends GroovyRecursiveElementVisitor {
names.add("owner");
for (String name : names) {
addNode(new ReadWriteVariableInstruction(name, closure.getLBrace(), myInstructionNumber++, true));
addNode(new ReadWriteVariableInstruction(name, closure.getLBrace(), myInstructionNumber++, WRITE));
}
PsiElement child = closure.getFirstChild();
@@ -364,7 +367,7 @@ public class ControlFlowBuilder extends GroovyRecursiveElementVisitor {
if (lValue instanceof GrReferenceExpression) {
String referenceName = ((GrReferenceExpression)lValue).getReferenceName();
if (referenceName != null) {
ReadWriteVariableInstruction instruction = new ReadWriteVariableInstruction(referenceName, lValue, myInstructionNumber++, false);
ReadWriteVariableInstruction instruction = new ReadWriteVariableInstruction(referenceName, lValue, myInstructionNumber++, READ);
addNode(instruction);
checkPending(instruction);
}
@@ -413,13 +416,14 @@ public class ControlFlowBuilder extends GroovyRecursiveElementVisitor {
if (name == null) return;
if (ControlFlowUtils.isIncOrDecOperand(refExpr) && !myAssertionsOnly) {
final InstructionImpl i = new ReadWriteVariableInstruction(name, refExpr, myInstructionNumber++, false);
final InstructionImpl i = new ReadWriteVariableInstruction(name, refExpr, myInstructionNumber++, READ);
addNode(i);
addNode(new ReadWriteVariableInstruction(name, refExpr, myInstructionNumber++, true));
addNode(new ReadWriteVariableInstruction(name, refExpr, myInstructionNumber++, WRITE));
checkPending(i);
}
else {
final InstructionImpl i = new ReadWriteVariableInstruction(name, refExpr, myInstructionNumber++, !myAssertionsOnly && PsiUtil.isLValue(refExpr));
boolean isWrite = !myAssertionsOnly && PsiUtil.isLValue(refExpr);
final InstructionImpl i = new ReadWriteVariableInstruction(name, refExpr, myInstructionNumber++, isWrite ? WRITE : READ);
addNode(i);
checkPending(i);
}
@@ -560,7 +564,7 @@ public class ControlFlowBuilder extends GroovyRecursiveElementVisitor {
GrVariable variable = clause.getDeclaredVariable();
if (variable != null) {
ReadWriteVariableInstruction writeInst =
new ReadWriteVariableInstruction(variable.getName(), variable, myInstructionNumber++, true);
new ReadWriteVariableInstruction(variable.getName(), variable, myInstructionNumber++, WRITE);
checkPending(writeInst);
addNode(writeInst);
}
@@ -769,7 +773,7 @@ public class ControlFlowBuilder extends GroovyRecursiveElementVisitor {
final GrParameter parameter = catchClauses[i].getParameter();
if (parameter != null) {
addNode(new ReadWriteVariableInstruction(parameter.getName(), parameter, myInstructionNumber++, true));
addNode(new ReadWriteVariableInstruction(parameter.getName(), parameter, myInstructionNumber++, WRITE));
}
catchClauses[i].accept(this);
catches[i] = myHead;
@@ -874,7 +878,7 @@ public class ControlFlowBuilder extends GroovyRecursiveElementVisitor {
super.visitVariable(variable);
if (variable.getInitializerGroovy() != null ||
variable.getParent() instanceof GrTupleDeclaration && ((GrTupleDeclaration)variable.getParent()).getInitializerGroovy() != null) {
ReadWriteVariableInstruction writeInst = new ReadWriteVariableInstruction(variable.getName(), variable, myInstructionNumber++, true);
ReadWriteVariableInstruction writeInst = new ReadWriteVariableInstruction(variable.getName(), variable, myInstructionNumber++, WRITE);
checkPending(writeInst);
addNode(writeInst);
}