summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-06-21 22:33:46 +0300
committerAndrei Karas <akaras@inbox.ru>2015-06-21 22:33:46 +0300
commit7d2f80978fe22b80b5349f6363d918dd02308448 (patch)
tree45391b0f669412c2427c96c3f0a03328d3127064
parentea01f27cb708bec294b979eec5c9c5a2c81a6cd3 (diff)
downloadparanucker-7d2f80978fe22b80b5349f6363d918dd02308448.tar.gz
paranucker-7d2f80978fe22b80b5349f6363d918dd02308448.tar.bz2
paranucker-7d2f80978fe22b80b5349f6363d918dd02308448.tar.xz
paranucker-7d2f80978fe22b80b5349f6363d918dd02308448.zip
Fix nested COND_EXPR nodes analysis.
-rw-r--r--src/analysis/expression.cpp4
-rw-r--r--src/logger.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/analysis/expression.cpp b/src/analysis/expression.cpp
index 18d3bdd..be45955 100644
--- a/src/analysis/expression.cpp
+++ b/src/analysis/expression.cpp
@@ -262,7 +262,7 @@ void analyseCondExpr(CondExprNode *node, const WalkItem &wi, WalkItem &wo)
// need check for cleanExpr?
intersectNonNullChecked(wo, wo2, wo3);
- wo.removeNullVars.clear();
+ //wo.removeNullVars.clear();
if (wo2.isReturned)
{
@@ -333,7 +333,7 @@ void analyseCompoundExpr(CompoundExprNode *node, const WalkItem &wi, WalkItem &w
mergeNonNullChecked(wo, wo2);
}
- wo.removeNullVars.clear();
+ //wo.removeNullVars.clear();
wo.cleanExpr = true;
wo.stopWalking = true;
diff --git a/src/logger.cpp b/src/logger.cpp
index 763fa24..b8bb00b 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -196,7 +196,7 @@ void dumpWI(Node *const node,
const std::string &name,
WalkItem &wi)
{
- //return;
+ return;
Log::log("%s%s %s",
name.c_str(),
node->nodeTypeName.c_str(),