From c32f7915fb567c73b78db10ebc13c38a617a75aa Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
Date: Fri, 19 May 2023 23:58:12 +0900
Subject: [PATCH] reformat `else` clause indentation style

---
 mrbgems/mruby-compiler/core/parse.y   |  6 ++-
 mrbgems/mruby-compiler/core/y.tab.c   |  6 ++-
 mrbgems/mruby-complex/src/complex.c   |  9 ++--
 mrbgems/mruby-dir/src/Win/dirent.c    | 19 +++----
 mrbgems/mruby-errno/src/errno.c       |  3 +-
 mrbgems/mruby-io/src/file.c           | 12 +++--
 mrbgems/mruby-io/src/file_test.c      |  3 +-
 mrbgems/mruby-io/src/io.c             | 27 ++++++----
 mrbgems/mruby-io/test/mruby_io_test.c |  3 +-
 mrbgems/mruby-method/src/method.c     |  3 +-
 mrbgems/mruby-pack/src/pack.c         | 78 ++++++++++++++++++---------
 mrbgems/mruby-sleep/src/sleep.c       |  6 ++-
 mrbgems/mruby-socket/src/socket.c     | 46 ++++++++++------
 mrbgems/mruby-sprintf/src/sprintf.c   |  6 ++-
 mrbgems/mruby-time/src/time.c         |  3 +-
 src/class.c                           |  3 +-
 src/numeric.c                         |  7 +--
 17 files changed, 153 insertions(+), 87 deletions(-)

diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y
index 62fe0a38c..a2d1f1dce 100644
--- a/mrbgems/mruby-compiler/core/parse.y
+++ b/mrbgems/mruby-compiler/core/parse.y
@@ -4828,7 +4828,8 @@ heredoc_remove_indent(parser_state *p, parser_heredoc_info *hinfo)
         newstr[newlen] = '\0';
       pair->car = (node*)newstr;
       pair->cdr = (node*)newlen;
-    } else {
+    }
+    else {
       spaces = (size_t)nspaces->car;
       heredoc_count_indent(hinfo, str, len, spaces, &offset);
       pair->car = (node*)(str + offset);
@@ -4903,7 +4904,8 @@ parse_string(parser_state *p)
 
         if (sizeof(s1)+sizeof(s2)+strlen(hinfo->term)+1 >= sizeof(buf)) {
           yyerror(p, "can't find heredoc delimiter anywhere before EOF");
-        } else {
+        }
+        else {
           strcpy(buf, s1);
           strcat(buf, hinfo->term);
           strcat(buf, s2);
diff --git a/mrbgems/mruby-compiler/core/y.tab.c b/mrbgems/mruby-compiler/core/y.tab.c
index 56217ed16..4093d7c0d 100644
--- a/mrbgems/mruby-compiler/core/y.tab.c
+++ b/mrbgems/mruby-compiler/core/y.tab.c
@@ -11404,7 +11404,8 @@ heredoc_remove_indent(parser_state *p, parser_heredoc_info *hinfo)
         newstr[newlen] = '\0';
       pair->car = (node*)newstr;
       pair->cdr = (node*)newlen;
-    } else {
+    }
+    else {
       spaces = (size_t)nspaces->car;
       heredoc_count_indent(hinfo, str, len, spaces, &offset);
       pair->car = (node*)(str + offset);
@@ -11479,7 +11480,8 @@ parse_string(parser_state *p)
 
         if (sizeof(s1)+sizeof(s2)+strlen(hinfo->term)+1 >= sizeof(buf)) {
           yyerror(p, "can't find heredoc delimiter anywhere before EOF");
-        } else {
+        }
+        else {
           strcpy(buf, s1);
           strcat(buf, hinfo->term);
           strcat(buf, s2);
diff --git a/mrbgems/mruby-complex/src/complex.c b/mrbgems/mruby-complex/src/complex.c
index c4e6c0b7a..f0e5829d1 100644
--- a/mrbgems/mruby-complex/src/complex.c
+++ b/mrbgems/mruby-complex/src/complex.c
@@ -284,12 +284,15 @@ add_pair(struct float_pair *s, struct float_pair const *a,
 {
   if (b->s == 0.0F) {
     *s = *a;
-  } else if (a->s == 0.0F) {
+  }
+  else if (a->s == 0.0F) {
     *s = *b;
-  } else if (a->x >= b->x) {
+  }
+  else if (a->x >= b->x) {
     s->s = a->s + F(ldexp)(b->s, b->x - a->x);
     s->x = a->x;
-  } else {
+  }
+  else {
     s->s = F(ldexp)(a->s, a->x - b->x) + b->s;
     s->x = b->x;
   }
diff --git a/mrbgems/mruby-dir/src/Win/dirent.c b/mrbgems/mruby-dir/src/Win/dirent.c
index 1b43a9924..e413e6065 100644
--- a/mrbgems/mruby-dir/src/Win/dirent.c
+++ b/mrbgems/mruby-dir/src/Win/dirent.c
@@ -50,27 +50,22 @@ DIR *opendir(const char *name)
         {
             strcat(strcpy(dir->name, name), all);
 
-            if((dir->handle =
-                (handle_type) _findfirst(dir->name, &dir->info)) != -1)
-            {
+            if((dir->handle = (handle_type) _findfirst(dir->name, &dir->info)) != -1) {
                 dir->result.d_name = 0;
             }
-            else /* rollback */
-            {
+            else {              /* rollback */
                 free(dir->name);
                 free(dir);
                 dir = 0;
             }
         }
-        else /* rollback */
-        {
+        else {                  /* rollback */
             free(dir);
             dir   = 0;
             errno = ENOMEM;
         }
     }
-    else
-    {
+    else {
         errno = EINVAL;
     }
 
@@ -112,8 +107,7 @@ struct dirent *readdir(DIR *dir)
             result->d_name = dir->info.name;
         }
     }
-    else
-    {
+    else {
         errno = EBADF;
     }
 
@@ -128,8 +122,7 @@ void rewinddir(DIR *dir)
         dir->handle = (handle_type) _findfirst(dir->name, &dir->info);
         dir->result.d_name = 0;
     }
-    else
-    {
+    else {
         errno = EBADF;
     }
 }
diff --git a/mrbgems/mruby-errno/src/errno.c b/mrbgems/mruby-errno/src/errno.c
index 5e9950472..b2059f465 100644
--- a/mrbgems/mruby-errno/src/errno.c
+++ b/mrbgems/mruby-errno/src/errno.c
@@ -265,7 +265,8 @@ mrb_sce_errno(mrb_state *mrb, mrb_value self)
   sym = MRB_SYM(Errno);
   if (mrb_const_defined_at(mrb, mrb_obj_value(c), sym)) {
     return mrb_const_get(mrb, mrb_obj_value(c), sym);
-  } else {
+  }
+  else {
     sym = MRB_SYM(errno);
     return mrb_attr_get(mrb, self, sym);
   }
diff --git a/mrbgems/mruby-io/src/file.c b/mrbgems/mruby-io/src/file.c
index c23b1a9e7..44aefdf45 100644
--- a/mrbgems/mruby-io/src/file.c
+++ b/mrbgems/mruby-io/src/file.c
@@ -105,7 +105,8 @@ mrb_file_s_umask(mrb_state *mrb, mrb_value klass)
   if (mrb_get_args(mrb, "|i", &mask) == 0) {
     omask = umask(0);
     umask(omask);
-  } else {
+  }
+  else {
     omask = umask(mask);
   }
   return mrb_fixnum_value(omask);
@@ -179,7 +180,8 @@ mrb_file_dirname(mrb_state *mrb, mrb_value klass)
   ridx = strlen(buffer);
   if (ridx == 0) {
     strncpy(buffer, ".", 2);  /* null terminated */
-  } else if (ridx > 1) {
+  }
+  else if (ridx > 1) {
     ridx--;
     while (ridx > 0 && (buffer[ridx] == '/' || buffer[ridx] == '\\')) {
       buffer[ridx] = '\0';  /* remove last char */
@@ -358,7 +360,8 @@ mrb_file__gethome(mrb_state *mrb, mrb_value klass)
     if (!mrb_file_is_absolute_path(home)) {
       mrb_raise(mrb, E_ARGUMENT_ERROR, "non-absolute home");
     }
-  } else {
+  }
+  else {
     const char *cuser = RSTRING_CSTR(mrb, username);
     struct passwd *pwd = getpwnam(cuser);
     if (pwd == NULL) {
@@ -383,7 +386,8 @@ mrb_file__gethome(mrb_state *mrb, mrb_value klass)
     if (!mrb_file_is_absolute_path(home)) {
       mrb_raise(mrb, E_ARGUMENT_ERROR, "non-absolute home");
     }
-  } else {
+  }
+  else {
     return mrb_nil_value();
   }
   home = mrb_locale_from_utf8(home, -1);
diff --git a/mrbgems/mruby-io/src/file_test.c b/mrbgems/mruby-io/src/file_test.c
index f3b30112a..e7d23406f 100644
--- a/mrbgems/mruby-io/src/file_test.c
+++ b/mrbgems/mruby-io/src/file_test.c
@@ -52,7 +52,8 @@ mrb_stat0(mrb_state *mrb, mrb_value obj, struct stat *st, int do_lstat)
     int ret;
     if (do_lstat) {
       ret = LSTAT(path, st);
-    } else {
+    }
+    else {
       ret = stat(path, st);
     }
     mrb_locale_free(path);
diff --git a/mrbgems/mruby-io/src/io.c b/mrbgems/mruby-io/src/io.c
index fdcf35985..3eeff1736 100644
--- a/mrbgems/mruby-io/src/io.c
+++ b/mrbgems/mruby-io/src/io.c
@@ -110,7 +110,8 @@ io_set_process_status(mrb_state *mrb, pid_t pid, int status)
   }
   if (c_status != NULL) {
     v = mrb_funcall_id(mrb, mrb_obj_value(c_status), MRB_SYM(new), 2, mrb_fixnum_value(pid), mrb_fixnum_value(status));
-  } else {
+  }
+  else {
     v = mrb_fixnum_value(WEXITSTATUS(status));
   }
   mrb_gv_set(mrb, mrb_intern_lit(mrb, "$?"), v);
@@ -559,10 +560,12 @@ io_s_popen(mrb_state *mrb, mrb_value klass)
         fd = pr[0];
         close(pw[0]);
         write_fd = pw[1];
-      } else if (OPEN_RDONLY_P(flags)) {
+      }
+      else if (OPEN_RDONLY_P(flags)) {
         close(pr[1]);
         fd = pr[0];
-      } else {
+      }
+      else {
         close(pw[0]);
         fd = pw[1];
       }
@@ -1276,7 +1279,8 @@ io_s_select(mrb_state *mrb, mrb_value klass)
 
   if (mrb_nil_p(timeout)) {
     tp = NULL;
-  } else {
+  }
+  else {
     timerec = time2timeval(mrb, timeout);
     tp = &timerec;
   }
@@ -1302,7 +1306,8 @@ io_s_select(mrb_state *mrb, mrb_value klass)
       timerec.tv_sec = timerec.tv_usec = 0;
       tp = &timerec;
     }
-  } else {
+  }
+  else {
     rp = NULL;
   }
 
@@ -1322,7 +1327,8 @@ io_s_select(mrb_state *mrb, mrb_value klass)
           max = fptr->fd2;
       }
     }
-  } else {
+  }
+  else {
     wp = NULL;
   }
 
@@ -1342,7 +1348,8 @@ io_s_select(mrb_state *mrb, mrb_value klass)
           max = fptr->fd2;
       }
     }
-  } else {
+  }
+  else {
     ep = NULL;
   }
 
@@ -1390,7 +1397,8 @@ retry:
         fptr = io_get_open_fptr(mrb, RARRAY_PTR(write)[i]);
         if (FD_ISSET(fptr->fd, wp)) {
           mrb_ary_push(mrb, list, RARRAY_PTR(write)[i]);
-        } else if (fptr->fd2 >= 0 && FD_ISSET(fptr->fd2, wp)) {
+        }
+        else if (fptr->fd2 >= 0 && FD_ISSET(fptr->fd2, wp)) {
           mrb_ary_push(mrb, list, RARRAY_PTR(write)[i]);
         }
       }
@@ -1402,7 +1410,8 @@ retry:
         fptr = io_get_open_fptr(mrb, RARRAY_PTR(except)[i]);
         if (FD_ISSET(fptr->fd, ep)) {
           mrb_ary_push(mrb, list, RARRAY_PTR(except)[i]);
-        } else if (fptr->fd2 >= 0 && FD_ISSET(fptr->fd2, ep)) {
+        }
+        else if (fptr->fd2 >= 0 && FD_ISSET(fptr->fd2, ep)) {
           mrb_ary_push(mrb, list, RARRAY_PTR(except)[i]);
         }
       }
diff --git a/mrbgems/mruby-io/test/mruby_io_test.c b/mrbgems/mruby-io/test/mruby_io_test.c
index 1155b29a1..bf801323c 100644
--- a/mrbgems/mruby-io/test/mruby_io_test.c
+++ b/mrbgems/mruby-io/test/mruby_io_test.c
@@ -97,7 +97,8 @@ mrb_io_test_io_setup(mrb_state *mrb, mrb_value self)
     if (tmpdir && strlen(tmpdir) > 0) {
       mrb_str_cat_cstr(mrb, fname, tmpdir);
       if (*(RSTRING_END(fname)-1) != '/') mrb_str_cat_lit(mrb, fname, "/");
-    } else {
+    }
+    else {
       mrb_str_cat_lit(mrb, fname, "/tmp/");
     }
 #endif
diff --git a/mrbgems/mruby-method/src/method.c b/mrbgems/mruby-method/src/method.c
index eecfbdd37..98356304e 100644
--- a/mrbgems/mruby-method/src/method.c
+++ b/mrbgems/mruby-method/src/method.c
@@ -154,7 +154,8 @@ bind_check(mrb_state *mrb, mrb_value recv, mrb_value owner)
       !mrb_obj_is_kind_of(mrb, recv, mrb_class_ptr(owner))) {
     if (mrb_sclass_p(owner)) {
       mrb_raise(mrb, E_TYPE_ERROR, "singleton method called for a different object");
-    } else {
+    }
+    else {
       mrb_raisef(mrb, E_TYPE_ERROR, "bind argument must be an instance of %v", owner);
     }
   }
diff --git a/mrbgems/mruby-pack/src/pack.c b/mrbgems/mruby-pack/src/pack.c
index b0b7f29b2..cc0f3220d 100644
--- a/mrbgems/mruby-pack/src/pack.c
+++ b/mrbgems/mruby-pack/src/pack.c
@@ -139,7 +139,8 @@ pack_short(mrb_state *mrb, mrb_value o, mrb_value str, mrb_int sidx, unsigned in
   if (flags & PACK_FLAG_LITTLEENDIAN) {
     RSTRING_PTR(str)[sidx+0] = n % 256;
     RSTRING_PTR(str)[sidx+1] = n / 256;
-  } else {
+  }
+  else {
     RSTRING_PTR(str)[sidx+0] = n / 256;
     RSTRING_PTR(str)[sidx+1] = n % 256;
   }
@@ -153,7 +154,8 @@ unpack_short(mrb_state *mrb, const unsigned char *src, int srclen, mrb_value ary
 
   if (flags & PACK_FLAG_LITTLEENDIAN) {
     n = src[1] * 256 + src[0];
-  } else {
+  }
+  else {
     n = src[0] * 256 + src[1];
   }
   if ((flags & PACK_FLAG_SIGNED) && (n >= 0x8000)) {
@@ -175,7 +177,8 @@ pack_long(mrb_state *mrb, mrb_value o, mrb_value str, mrb_int sidx, unsigned int
     RSTRING_PTR(str)[sidx+1] = (char)(n >> 8);
     RSTRING_PTR(str)[sidx+2] = (char)(n >> 16);
     RSTRING_PTR(str)[sidx+3] = (char)(n >> 24);
-  } else {
+  }
+  else {
     RSTRING_PTR(str)[sidx+0] = (char)(n >> 24);
     RSTRING_PTR(str)[sidx+1] = (char)(n >> 16);
     RSTRING_PTR(str)[sidx+2] = (char)(n >> 8);
@@ -231,7 +234,8 @@ unpack_long(mrb_state *mrb, const unsigned char *src, int srclen, mrb_value ary,
     ul += (uint32_t)src[2] *256*256;
     ul += (uint32_t)src[1] *256;
     ul += (uint32_t)src[0];
-  } else {
+  }
+  else {
     ul = (uint32_t)src[0] * 256*256*256;
     ul += (uint32_t)src[1] *256*256;
     ul += (uint32_t)src[2] *256;
@@ -239,7 +243,8 @@ unpack_long(mrb_state *mrb, const unsigned char *src, int srclen, mrb_value ary,
   }
   if (flags & PACK_FLAG_SIGNED) {
     n = (int32_t)ul;
-  } else {
+  }
+  else {
 #ifndef MRB_INT64
     if (UINT_OVERFLOW_P(ul)) {
       u32tostr(msg, sizeof(msg), ul);
@@ -268,7 +273,8 @@ pack_quad(mrb_state *mrb, mrb_value o, mrb_value str, mrb_int sidx, unsigned int
     RSTRING_PTR(str)[sidx+5] = (char)(n >> 40);
     RSTRING_PTR(str)[sidx+6] = (char)(n >> 48);
     RSTRING_PTR(str)[sidx+7] = (char)(n >> 56);
-  } else {
+  }
+  else {
     RSTRING_PTR(str)[sidx+0] = (char)(n >> 56);
     RSTRING_PTR(str)[sidx+1] = (char)(n >> 48);
     RSTRING_PTR(str)[sidx+2] = (char)(n >> 40);
@@ -345,7 +351,8 @@ unpack_quad(mrb_state *mrb, const unsigned char *src, int srclen, mrb_value ary,
   if (flags & PACK_FLAG_LITTLEENDIAN) {
     pos  = 7;
     step = -1;
-  } else {
+  }
+  else {
     pos  = 0;
     step = 1;
   }
@@ -363,7 +370,8 @@ unpack_quad(mrb_state *mrb, const unsigned char *src, int srclen, mrb_value ary,
     }
 #endif
     n = (mrb_int)sll;
-  } else {
+  }
+  else {
     if (UINT_OVERFLOW_P(ull)) {
       u64tostr(msg, sizeof(msg), ull);
       mrb_raisef(mrb, E_RANGE_ERROR, "cannot unpack to Integer: %s", msg);
@@ -438,7 +446,8 @@ pack_double(mrb_state *mrb, mrb_value o, mrb_value str, mrb_int sidx, unsigned i
         RSTRING_PTR(str)[sidx + i] = buffer[8 - i - 1];
       }
     }
-  } else {
+  }
+  else {
     if (littleendian) {
       for (i = 0; i < 8; i++) {
         RSTRING_PTR(str)[sidx + i] = buffer[8 - i - 1];
@@ -468,7 +477,8 @@ unpack_double(mrb_state *mrb, const unsigned char * src, int srclen, mrb_value a
         buffer[8 - i - 1] = src[i];
       }
     }
-  } else {
+  }
+  else {
     if (littleendian) {
       for (i = 0; i < 8; i++) {
         buffer[8 - i - 1] = src[i];
@@ -501,7 +511,8 @@ pack_float(mrb_state *mrb, mrb_value o, mrb_value str, mrb_int sidx, unsigned in
         RSTRING_PTR(str)[sidx + i] = buffer[4 - i - 1];
       }
     }
-  } else {
+  }
+  else {
     if (littleendian) {
       for (i = 0; i < 4; i++) {
         RSTRING_PTR(str)[sidx + i] = buffer[4 - i - 1];
@@ -531,7 +542,8 @@ unpack_float(mrb_state *mrb, const unsigned char * src, int srclen, mrb_value ar
         buffer[4 - i - 1] = src[i];
       }
     }
-  } else {
+  }
+  else {
     if (littleendian) {
       for (i = 0; i < 4; i++) {
         buffer[4 - i - 1] = src[i];
@@ -681,13 +693,16 @@ pack_str(mrb_state *mrb, mrb_value src, mrb_value dst, mrb_int didx, int count,
 
   if (count == 0) {
     return 0;
-  } else if (count == -1) {
+  }
+  else if (count == -1) {
     copylen = slen;
     padlen = (flags & PACK_FLAG_Z) ? 1 : 0;
-  } else if (count < slen) {
+  }
+  else if (count < slen) {
     copylen = count;
     padlen = 0;
-  } else {
+  }
+  else {
     copylen = slen;
     padlen = count - slen;
   }
@@ -760,14 +775,16 @@ pack_hex(mrb_state *mrb, mrb_value src, mrb_value dst, mrb_int didx, int count,
   if (flags & PACK_FLAG_LSB) {
     ashift = 0;
     bshift = 4;
-  } else {
+  }
+  else {
     ashift = 4;
     bshift = 0;
   }
 
   if (count == -1) {
     count = slen;
-  } else if (slen > count) {
+  }
+  else if (slen > count) {
     slen = count;
   }
 
@@ -807,7 +824,8 @@ unpack_hex(mrb_state *mrb, const void *src, int slen, mrb_value ary, int count,
   if (flags & PACK_FLAG_LSB) {
     ashift = 0;
     bshift = 4;
-  } else {
+  }
+  else {
     ashift = 4;
     bshift = 0;
   }
@@ -858,7 +876,8 @@ pack_base64(mrb_state *mrb, mrb_value src, mrb_value dst, mrb_int didx, int coun
 
   if (count != 0 && count < 3) {  /* -1, 1 or 2 */
     count = 45;
-  } else if (count >= 3) {
+  }
+  else if (count >= 3) {
     count -= count % 3;
   }
 
@@ -892,7 +911,8 @@ pack_base64(mrb_state *mrb, mrb_value src, mrb_value dst, mrb_int didx, int coun
     *dstptr++ = '=';
     *dstptr++ = '=';
     column += 3;
-  } else if (srclen == 2) {
+  }
+  else if (srclen == 2) {
     l = (unsigned char)*srcptr++ << 16;
     l += (unsigned char)*srcptr++ << 8;
     *dstptr++ = base64chars[(l >> 18) & 0x3f];
@@ -950,11 +970,13 @@ unpack_base64(mrb_state *mrb, const void *src, int slen, mrb_value ary)
       *dptr++ = (l >> 16) & 0xff;
       *dptr++ = (l >> 8) & 0xff;
       *dptr++ = l & 0xff;
-    } else if (padding == 1) {
+    }
+    else if (padding == 1) {
       *dptr++ = (l >> 16) & 0xff;
       *dptr++ = (l >> 8) & 0xff;
       break;
-    } else {
+    }
+    else {
       *dptr++ = (l >> 16) & 0xff;
       break;
     }
@@ -1312,20 +1334,24 @@ alias:
       count = (int)n;
       tmpl->idx = (int)(e - tptr);
       continue;
-    } else if (ch == '*')  {
+    }
+    else if (ch == '*')  {
       if (type == PACK_TYPE_NONE)
         count = 0;
       else
         count = -1;
-    } else if (ch == '_' || ch == '!' || ch == '<' || ch == '>') {
+    }
+    else if (ch == '_' || ch == '!' || ch == '<' || ch == '>') {
       if (strchr("sSiIlLqQ", (int)t) == NULL) {
         mrb_raisef(mrb, E_ARGUMENT_ERROR, "'%c' allowed only after types sSiIlLqQ", ch);
       }
       if (ch == '_' || ch == '!') {
         flags |= PACK_FLAG_s;
-      } else if (ch == '<') {
+      }
+      else if (ch == '<') {
         flags |= PACK_FLAG_LT;
-      } else if (ch == '>') {
+      }
+      else if (ch == '>') {
         flags |= PACK_FLAG_GT;
       }
     }
diff --git a/mrbgems/mruby-sleep/src/sleep.c b/mrbgems/mruby-sleep/src/sleep.c
index 69ce5d756..4b30ceaea 100644
--- a/mrbgems/mruby-sleep/src/sleep.c
+++ b/mrbgems/mruby-sleep/src/sleep.c
@@ -60,7 +60,8 @@ f_sleep(mrb_state *mrb, mrb_value self)
     mrb_get_args(mrb, "i", &sec);
     if (sec >= 0) {
         sleep(sec);
-    } else {
+    }
+    else {
         mrb_raise(mrb, E_ARGUMENT_ERROR, "time interval must not be negative");
     }
 #endif
@@ -94,7 +95,8 @@ f_usleep(mrb_state *mrb, mrb_value self)
 
     if (usec >= 0) {
         usleep(usec);
-    } else {
+    }
+    else {
         mrb_raise(mrb, E_ARGUMENT_ERROR, "time interval must not be negative");
     }
 
diff --git a/mrbgems/mruby-socket/src/socket.c b/mrbgems/mruby-socket/src/socket.c
index c57678c94..456df94df 100644
--- a/mrbgems/mruby-socket/src/socket.c
+++ b/mrbgems/mruby-socket/src/socket.c
@@ -122,19 +122,24 @@ mrb_addrinfo_getaddrinfo(mrb_state *mrb, mrb_value klass)
 
   if (mrb_string_p(nodename)) {
     hostname = RSTRING_CSTR(mrb, nodename);
-  } else if (mrb_nil_p(nodename)) {
+  }
+  else if (mrb_nil_p(nodename)) {
     hostname = NULL;
-  } else {
+  }
+  else {
     mrb_raise(mrb, E_TYPE_ERROR, "nodename must be String or nil");
   }
 
   if (mrb_string_p(service)) {
     servname = RSTRING_CSTR(mrb, service);
-  } else if (mrb_integer_p(service)) {
+  }
+  else if (mrb_integer_p(service)) {
     servname = RSTRING_PTR(mrb_integer_to_str(mrb, service, 10));
-  } else if (mrb_nil_p(service)) {
+  }
+  else if (mrb_nil_p(service)) {
     servname = NULL;
-  } else {
+  }
+  else {
     mrb_raise(mrb, E_TYPE_ERROR, "service must be String, Integer, or nil");
   }
 
@@ -216,7 +221,8 @@ mrb_addrinfo_unix_path(mrb_state *mrb, mrb_value self)
     mrb_raise(mrb, E_SOCKET_ERROR, "need AF_UNIX address");
   if (RSTRING_LEN(sastr) < (mrb_int)offsetof(struct sockaddr_un, sun_path) + 1) {
     return mrb_str_new(mrb, "", 0);
-  } else {
+  }
+  else {
     return mrb_str_new_cstr(mrb, ((struct sockaddr_un*)RSTRING_PTR(sastr))->sun_path);
   }
 }
@@ -394,7 +400,8 @@ mrb_basicsocket_send(mrb_state *mrb, mrb_value self)
   mrb_get_args(mrb, "Si|S", &mesg, &flags, &dest);
   if (mrb_nil_p(dest)) {
     n = send(socket_fd(mrb, self), RSTRING_PTR(mesg), (fsize_t)RSTRING_LEN(mesg), (int)flags);
-  } else {
+  }
+  else {
     n = sendto(socket_fd(mrb, self), RSTRING_PTR(mesg), (fsize_t)RSTRING_LEN(mesg), (int)flags, (const struct sockaddr*)RSTRING_PTR(dest), (fsize_t)RSTRING_LEN(dest));
   }
   if (n == -1)
@@ -446,28 +453,34 @@ mrb_basicsocket_setsockopt(mrb_state *mrb, mrb_value self)
     level = mrb_integer(so);
     if (mrb_string_p(optval)) {
       /* that's good */
-    } else if (mrb_true_p(optval) || mrb_false_p(optval)) {
+    }
+    else if (mrb_true_p(optval) || mrb_false_p(optval)) {
       mrb_int i = mrb_test(optval) ? 1 : 0;
       optval = mrb_str_new(mrb, (char*)&i, sizeof(i));
-    } else if (mrb_integer_p(optval)) {
+    }
+    else if (mrb_integer_p(optval)) {
       if (optname == IP_MULTICAST_TTL || optname == IP_MULTICAST_LOOP) {
         char uc = (char)mrb_integer(optval);
         optval = mrb_str_new(mrb, &uc, sizeof(uc));
-      } else {
+      }
+      else {
         mrb_int i = mrb_integer(optval);
         optval = mrb_str_new(mrb, (char*)&i, sizeof(i));
       }
-    } else {
+    }
+    else {
       mrb_raise(mrb, E_ARGUMENT_ERROR, "optval should be true, false, an integer, or a string");
     }
-  } else if (argc == 1) {
+  }
+  else if (argc == 1) {
     if (strcmp(mrb_obj_classname(mrb, so), "Socket::Option") != 0)
       mrb_raise(mrb, E_ARGUMENT_ERROR, "not an instance of Socket::Option");
     level = mrb_as_int(mrb, mrb_funcall_id(mrb, so, MRB_SYM(level), 0));
     optname = mrb_as_int(mrb, mrb_funcall_id(mrb, so, MRB_SYM(optname), 0));
     optval = mrb_funcall_id(mrb, so, MRB_SYM(data), 0);
     mrb_ensure_string_type(mrb, optval);
-  } else {
+  }
+  else {
     mrb_argnum_error(mrb, argc, 3, 3);
   }
 
@@ -540,8 +553,10 @@ mrb_ipsocket_pton(mrb_state *mrb, mrb_value klass)
     if (inet_pton(AF_INET6, buf, (void*)&in6.s6_addr) != 1)
       goto invalid;
     return mrb_str_new(mrb, (char*)&in6.s6_addr, 16);
-  } else
+  }
+  else {
     mrb_raise(mrb, E_ARGUMENT_ERROR, "unsupported address family");
+  }
 
 invalid:
   mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid address");
@@ -797,7 +812,8 @@ mrb_win32_basicsocket_sysread(mrb_state *mrb, mrb_value self)
     case 0: /* EOF */
       if (maxlen == 0) {
         buf = mrb_str_new_cstr(mrb, "");
-      } else {
+      }
+      else {
         mrb_raise(mrb, E_EOF_ERROR, "sysread failed: End of File");
       }
       break;
diff --git a/mrbgems/mruby-sprintf/src/sprintf.c b/mrbgems/mruby-sprintf/src/sprintf.c
index 71a3e90d4..4faae4a2a 100644
--- a/mrbgems/mruby-sprintf/src/sprintf.c
+++ b/mrbgems/mruby-sprintf/src/sprintf.c
@@ -146,7 +146,8 @@ fmt_float(char *buf, size_t buf_size, char fmt, int flags, int width, int prec,
   memmove(&buf[width - len], buf, len);
   if (zero_pad) {
     memset(buf, '0', width - len);
-  } else {
+  }
+  else {
     memset(buf, ' ', width - len);
   }
   return width;
@@ -994,7 +995,8 @@ retry:
           if ((flags & (FMINUS|FPREC)) != FMINUS) {
             char c = '0';
             FILL(c, prec - len);
-          } else if (v < 0) {
+          }
+          else if (v < 0) {
             char c = sign_bits(base, p);
             FILL(c, prec - len);
           }
diff --git a/mrbgems/mruby-time/src/time.c b/mrbgems/mruby-time/src/time.c
index 3bd42919f..7bf544e6c 100644
--- a/mrbgems/mruby-time/src/time.c
+++ b/mrbgems/mruby-time/src/time.c
@@ -160,7 +160,8 @@ timegm(struct tm *tm)
   if(tm->tm_year >= epoch_year) {
     for (i = epoch_year; i < tm->tm_year; ++i)
       r += is_leapyear(i+1900) ? 366*24*60*60 : 365*24*60*60;
-  } else {
+  }
+  else {
     for (i = tm->tm_year; i < epoch_year; ++i)
       r -= is_leapyear(i+1900) ? 366*24*60*60 : 365*24*60*60;
   }
diff --git a/src/class.c b/src/class.c
index 60c244918..21f512147 100644
--- a/src/class.c
+++ b/src/class.c
@@ -1439,7 +1439,8 @@ include_module_at(mrb_state *mrb, struct RClass *c, struct RClass *ins_pos, stru
           }
           goto skip;
         }
-      } else if (p->tt == MRB_TT_CLASS) {
+      }
+      else if (p->tt == MRB_TT_CLASS) {
         if (!search_super) break;
         superclass_seen = TRUE;
       }
diff --git a/src/numeric.c b/src/numeric.c
index 77f8e6c55..36fb4b7f1 100644
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -704,9 +704,10 @@ flo_shift(mrb_state *mrb, mrb_value x, mrb_int width)
     val = trunc(val);
 #else
     if (val > 0){
-        val = floor(val);
-    } else {
-        val = ceil(val);
+      val = floor(val);
+    }
+    else {
+      val = ceil(val);
     }
 #endif
     if (val == 0 && mrb_float(x) < 0) {