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

PY-1177 Fixed: Control flow analysis doesn't detect while/break

Browse Source 
Handle control flow for statically true condition in while statement
This commit is contained in:
fitermay
2016-10-03 15:21:37 +03:00
committed by Semyon Proshev
parent a78ffde80b
commit 027fe9bb55
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/controlflow/PyControlFlowBuilder.java
+11 -11
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -404,26 +404,26 @@ public class PyControlFlowBuilder extends PyRecursiveElementVisitor {
final Instruction instruction = myBuilder.startNode(node);
final PyWhilePart whilePart = node.getWhilePart();
final PyExpression condition = whilePart.getCondition();
boolean isStaticallyTrue = false;
if (condition != null) {
condition.accept(this);
isStaticallyTrue = (PyConstantExpressionEvaluator.evaluate(condition) == Boolean.TRUE);
}
final Instruction head = myBuilder.prevInstruction;
final PyElsePart elsePart = node.getElsePart();
if (elsePart == null) {
if (elsePart == null && !isStaticallyTrue) {
myBuilder.addPendingEdge(node, myBuilder.prevInstruction);
}
final PyStatementList list = whilePart.getStatementList();
if (list != null) {
myBuilder.startConditionalNode(list, condition, true);
list.accept(this);
// Loop edges
if (myBuilder.prevInstruction != null) {
myBuilder.addEdge(myBuilder.prevInstruction, instruction);
}
myBuilder.checkPending(instruction);
myBuilder.startConditionalNode(list, condition, true);
list.accept(this);
// Loop edges
if (myBuilder.prevInstruction != null) {
myBuilder.addEdge(myBuilder.prevInstruction, instruction);
}
myBuilder.checkPending(instruction);
myBuilder.prevInstruction = head;
if (elsePart != null) {
if (elsePart != null && !isStaticallyTrue) {
elsePart.accept(this);
myBuilder.addPendingEdge(node, myBuilder.prevInstruction);
}
python/testData/inspections/PyUnboundLocalVariableInspection/WhileTrueBreak.py
+4
View File
@@ -0,0 +1,4 @@
while True:
a = 1
break
print(a) # pass
python/testSrc/com/jetbrains/python/inspections/PyUnboundLocalVariableInspectionTest.java
+6 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2013 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -183,6 +183,11 @@ public class PyUnboundLocalVariableInspectionTest extends PyTestCase {
doTest();
}
// PY-1177
public void testWhileTrueBreak() {
doTest();
}
private void doTest() {
myFixture.configureByFile(TEST_DIRECTORY + getTestName(false) + ".py");
myFixture.enableInspections(PyUnboundLocalVariableInspection.class);