From 28152fc10a3ccfff03d621883d94f9a2668f9f59 Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim.demaille@gmail.com>
Date: Sun, 12 Sep 2021 12:35:21 +0200
Subject: [PATCH] glr2.cc: style: clarify control flow

* data/skeletons/glr2.cc (yypreference): Be more functional-style.
---
 data/skeletons/glr2.cc | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/data/skeletons/glr2.cc b/data/skeletons/glr2.cc
index b7d33a14..93549639 100644
--- a/data/skeletons/glr2.cc
+++ b/data/skeletons/glr2.cc
@@ -3202,8 +3202,8 @@ namespace ]b4_namespace_ref[
     static int
     yypreference (const semantic_option& y0, const semantic_option& y1)
     {
-      rule_num r0 = y0.yyrule, r1 = y1.yyrule;
-      int p0 = yydprec[r0], p1 = yydprec[r1];
+      const rule_num r0 = y0.yyrule, r1 = y1.yyrule;
+      const int p0 = yydprec[r0], p1 = yydprec[r1];
 
       if (p0 == p1)
         {
@@ -3212,13 +3212,14 @@ namespace ]b4_namespace_ref[
           else
             return 1;
         }
-      if (p0 == 0 || p1 == 0)
+      else if (p0 == 0 || p1 == 0)
         return 0;
-      if (p0 < p1)
+      else if (p0 < p1)
         return 3;
-      if (p1 < p0)
+      else if (p1 < p0)
         return 2;
-      return 0;
+      else
+        return 0;
     }
 
     ]b4_parse_param_vars[