Move TRUTH_ANDIF_EXPR analysis into shared function.

1 files changed, 12 insertions, 7 deletions

diff --git a/src/analysis/expression.cpp b/src/analysis/expression.cpp
index 8ebb783..a9fb275 100644
--- a/src/analysis/expression.cpp
+++ b/src/analysis/expression.cpp
@@ -185,23 +185,19 @@ void analyseTruthOrIfExpr(TruthOrIfExprNode *node, const WalkItem &wi, WalkItem
     Log::dumpWI(node, "wo out ", wo);
 }
 
-void analyseTruthAndIfExpr(TruthAndIfExprNode *node, const WalkItem &wi, WalkItem &wo)
+void analyseAndCondition(Node *node, Node *node1, Node *node2, const WalkItem &wi, WalkItem &wo)
 {
-    // need two args for check
-    if (node->args.size() < 2 || command == FindArgs)
-        return;
-
     Log::dumpWI(node, "wo in ", wo);
     WalkItem wo1 = wo;
     WalkItem wo2 = wo;
-    walkTree(node->args[0], wi, wo1);
+    walkTree(node1, wi, wo1);
     Log::dumpWI(node, "wo1 ", wo1);
     WalkItem wi2 = wi;
     removeCheckNullVarsSet(wi2, wo1.checkedNonNullVars);
     wi2.checkNullVars.insert(wo1.checkedNullVars.begin(),
         wo1.checkedNullVars.end());
     Log::dumpWI(node, "wi2 ", wi2);
-    walkTree(node->args[1], wi2, wo2);
+    walkTree(node2, wi2, wo2);
     Log::dumpWI(node, "wo2 ", wo2);
 
     wo.stopWalking = true;
@@ -223,6 +219,15 @@ void analyseTruthAndIfExpr(TruthAndIfExprNode *node, const WalkItem &wi, WalkIte
     Log::dumpWI(node, "wo out ", wo);
 }
 
+void analyseTruthAndIfExpr(TruthAndIfExprNode *node, const WalkItem &wi, WalkItem &wo)
+{
+    // need two args for check
+    if (node->args.size() < 2 || command == FindArgs)
+        return;
+
+    analyseAndCondition(node, node->args[0], node->args[1], wi, wo);
+}
+
 // args[0]  condition
 // args[1]  true expr
 // args[2]  false expr