[COMMITTED] pkl: trans: merge common parts under a single if stmt

[Mohammad-Reza Nabipoor]

2022-07-14  Mohammad-Reza Nabipoor  <mnabipoor@gnu.org>

        * libpoke/pkl-trans.c (pkl_trans1_pr_comp_stmt): Merge common parts
        under a single if statement.
        (pkl_trans1_ps_comp_stmt): Likewise.
---
 ChangeLog           |  6 ++++++
 libpoke/pkl-trans.c | 33 +++++++++++++++++++--------------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5a220446..3059daa0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-07-14  Mohammad-Reza Nabipoor  <mnabipoor@gnu.org>
+
+       * libpoke/pkl-trans.c (pkl_trans1_pr_comp_stmt): Merge common parts
+       under a single if statement.
+       (pkl_trans1_ps_comp_stmt): Likewise.
+
 2022-07-13  Jose E. Marchesi  <jemarch@gnu.org>
 
        * libpoke/pkl-trans.h (struct pkl_trans_function_ctx): Define.
diff --git a/libpoke/pkl-trans.c b/libpoke/pkl-trans.c
index 4d27cbe3..5aeb9dfd 100644
--- a/libpoke/pkl-trans.c
+++ b/libpoke/pkl-trans.c
@@ -1086,14 +1086,16 @@ PKL_PHASE_END_HANDLER
 PKL_PHASE_BEGIN_HANDLER (pkl_trans1_pr_comp_stmt)
 {
   if (PKL_TRANS_FUNCTION)
-    PKL_TRANS_FUNCTION->back++;
-
-  if (PKL_PASS_PARENT && PKL_AST_CODE (PKL_PASS_PARENT) == PKL_AST_EXP
-      && PKL_AST_EXP_CODE (PKL_PASS_PARENT) == PKL_AST_OP_EXCOND
-      && PKL_TRANS_FUNCTION)
     {
-      PKL_TRANS_FUNCTION->ndrops++;
-      PKL_TRANS_FUNCTION->npopes++;
+      PKL_TRANS_FUNCTION->back++;
+
+      if (PKL_PASS_PARENT
+          && PKL_AST_CODE (PKL_PASS_PARENT) == PKL_AST_EXP
+          && PKL_AST_EXP_CODE (PKL_PASS_PARENT) == PKL_AST_OP_EXCOND)
+        {
+          PKL_TRANS_FUNCTION->ndrops++;
+          PKL_TRANS_FUNCTION->npopes++;
+        }
     }
 }
 PKL_PHASE_END_HANDLER
@@ -1159,15 +1161,18 @@ PKL_PHASE_BEGIN_HANDLER (pkl_trans1_ps_comp_stmt)
     }
 
   PKL_AST_COMP_STMT_NUMVARS (comp_stmt) = numvars;
-  if (PKL_TRANS_FUNCTION)
-    PKL_TRANS_FUNCTION->back--;
 
-  if (PKL_PASS_PARENT && PKL_AST_CODE (PKL_PASS_PARENT) == PKL_AST_EXP
-      && PKL_AST_EXP_CODE (PKL_PASS_PARENT) == PKL_AST_OP_EXCOND
-      && PKL_TRANS_FUNCTION)
+  if (PKL_TRANS_FUNCTION)
     {
-      PKL_TRANS_FUNCTION->ndrops--;
-      PKL_TRANS_FUNCTION->npopes--;
+      PKL_TRANS_FUNCTION->back--;
+
+      if (PKL_PASS_PARENT
+          && PKL_AST_CODE (PKL_PASS_PARENT) == PKL_AST_EXP
+          && PKL_AST_EXP_CODE (PKL_PASS_PARENT) == PKL_AST_OP_EXCOND)
+        {
+          PKL_TRANS_FUNCTION->ndrops--;
+          PKL_TRANS_FUNCTION->npopes--;
+        }
     }
 }
 PKL_PHASE_END_HANDLER
-- 
2.36.1