Favour switch over if/else if to improve readability

Perl · Jun 7, 2021 · fb2ac98 · fb2ac98
1 parent a3f8787
commit fb2ac98
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/op.c b/op.c
@@ -9191,17 +9191,18 @@ Perl_newASSIGNOP(pTHX_ I32 flags, OP *left, I32 optype, OP *right)
     OP *o;
     I32 assign_type;
 
-    if (optype) {
-        if (optype == OP_ANDASSIGN || optype == OP_ORASSIGN || optype == OP_DORASSIGN) {
+    switch (optype) {
+        case 0: break;
+        case OP_ANDASSIGN:
+        case OP_ORASSIGN:
+        case OP_DORASSIGN:
             right = scalar(right);
             return newLOGOP(optype, 0,
                 op_lvalue(scalar(left), optype),
                 newBINOP(OP_SASSIGN, OPpASSIGN_BACKWARDS<<8, right, right));
-        }
-        else {
+        default:
             return newBINOP(optype, OPf_STACKED,
                 op_lvalue(scalar(left), optype), scalar(right));
-        }
     }
 
     if ((assign_type = assignment_type(left)) == ASSIGN_LIST) {

diff --git a/toke.c b/toke.c
@@ -535,12 +535,13 @@ S_ao(pTHX_ int toketype)
 {
     if (*PL_bufptr == '=') {
         PL_bufptr++;
-        if (toketype == ANDAND)
-            pl_yylval.ival = OP_ANDASSIGN;
-        else if (toketype == OROR)
-            pl_yylval.ival = OP_ORASSIGN;
-        else if (toketype == DORDOR)
-            pl_yylval.ival = OP_DORASSIGN;
+
+        switch (toketype) {
+            case ANDAND: pl_yylval.ival = OP_ANDASSIGN; break;
+            case OROR:   pl_yylval.ival = OP_ORASSIGN;  break;
+            case DORDOR: pl_yylval.ival = OP_DORASSIGN; break;
+        }
+
         toketype = ASSIGNOP;
     }
     return REPORT(toketype);