1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adjust else style to be consistent in each files [ci skip]

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2023-02-26 13:20:43 +09:00
parent 672b81b090
commit ef00c6da88
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
6 changed files with 50 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cont.c
View File

@ -2094,7 +2094,8 @@ rb_fiber_storage_get(VALUE self)
if (storage == Qnil) { if (storage == Qnil) {
return Qnil; return Qnil;
} else { }
else {
return rb_obj_dup(storage); return rb_obj_dup(storage);
} }
} }
@ -2204,7 +2205,8 @@ rb_fiber_storage_aset(VALUE class, VALUE key, VALUE value)
if (value == Qnil) { if (value == Qnil) {
return rb_hash_delete(storage, key); return rb_hash_delete(storage, key);
} else { }
else {
return rb_hash_aset(storage, key, value); return rb_hash_aset(storage, key, value);
} }
} }
@ -2810,7 +2812,8 @@ rb_fiber_blocking(VALUE class)
// If we are already blocking, this is essentially a no-op: // If we are already blocking, this is essentially a no-op:
if (fiber->blocking) { if (fiber->blocking) {
return rb_yield(fiber_value); return rb_yield(fiber_value);
} else { }
else {
return rb_ensure(fiber_blocking_yield, fiber_value, fiber_blocking_ensure, fiber_value); return rb_ensure(fiber_blocking_yield, fiber_value, fiber_blocking_ensure, fiber_value);
} }
} }

12
io.c
View File

@ -1151,7 +1151,8 @@ io_internal_wait(VALUE thread, rb_io_t *fptr, int error, int events, struct time
if (ready > 0) { if (ready > 0) {
return ready; return ready;
} else if (ready == 0) { }
else if (ready == 0) {
errno = ETIMEDOUT; errno = ETIMEDOUT;
return -1; return -1;
} }
@ -1179,7 +1180,8 @@ internal_read_func(void *ptr)
if (io_again_p(errno)) { if (io_again_p(errno)) {
if (io_internal_wait(iis->th, iis->fptr, errno, RB_WAITFD_IN, iis->timeout) == -1) { if (io_internal_wait(iis->th, iis->fptr, errno, RB_WAITFD_IN, iis->timeout) == -1) {
return -1; return -1;
} else { }
else {
goto retry; goto retry;
} }
} }
@ -1214,7 +1216,8 @@ internal_write_func(void *ptr)
if (io_again_p(e)) { if (io_again_p(e)) {
if (io_internal_wait(iis->th, iis->fptr, errno, RB_WAITFD_OUT, iis->timeout) == -1) { if (io_internal_wait(iis->th, iis->fptr, errno, RB_WAITFD_OUT, iis->timeout) == -1) {
return -1; return -1;
} else { }
else {
goto retry; goto retry;
} }
} }
@ -1243,7 +1246,8 @@ internal_writev_func(void *ptr)
if (io_again_p(errno)) { if (io_again_p(errno)) {
if (io_internal_wait(iis->th, iis->fptr, errno, RB_WAITFD_OUT, iis->timeout) == -1) { if (io_internal_wait(iis->th, iis->fptr, errno, RB_WAITFD_OUT, iis->timeout) == -1) {
return -1; return -1;
} else { }
else {
goto retry; goto retry;
} }
} }

33
io_buffer.c
View File

@ -59,7 +59,8 @@ io_buffer_map_memory(size_t size, int flags)
int mmap_flags = MAP_ANONYMOUS; int mmap_flags = MAP_ANONYMOUS;
if (flags & RB_IO_BUFFER_SHARED) { if (flags & RB_IO_BUFFER_SHARED) {
mmap_flags |= MAP_SHARED; mmap_flags |= MAP_SHARED;
} else { }
else {
mmap_flags |= MAP_PRIVATE; mmap_flags |= MAP_PRIVATE;
} }
@ -1233,7 +1234,8 @@ io_buffer_slice(int argc, VALUE *argv, VALUE self)
} }
length = NUM2SIZET(argv[1]); length = NUM2SIZET(argv[1]);
} else { }
else {
length = data->size - offset; length = data->size - offset;
} }
@ -1643,7 +1645,8 @@ io_buffer_size_of(VALUE klass, VALUE data_type)
total += io_buffer_data_type_size(RB_SYM2ID(RARRAY_AREF(data_type, i))); total += io_buffer_data_type_size(RB_SYM2ID(RARRAY_AREF(data_type, i)));
} }
return SIZET2NUM(total); return SIZET2NUM(total);
} else { }
else {
return SIZET2NUM(io_buffer_data_type_size(RB_SYM2ID(data_type))); return SIZET2NUM(io_buffer_data_type_size(RB_SYM2ID(data_type)));
} }
} }
@ -1794,21 +1797,24 @@ io_buffer_each(int argc, VALUE *argv, VALUE self)
ID data_type; ID data_type;
if (argc >= 1) { if (argc >= 1) {
data_type = RB_SYM2ID(argv[0]); data_type = RB_SYM2ID(argv[0]);
} else { }
else {
data_type = RB_IO_BUFFER_DATA_TYPE_U8; data_type = RB_IO_BUFFER_DATA_TYPE_U8;
} }
size_t offset; size_t offset;
if (argc >= 2) { if (argc >= 2) {
offset = NUM2SIZET(argv[1]); offset = NUM2SIZET(argv[1]);
} else { }
else {
offset = 0; offset = 0;
} }
size_t count; size_t count;
if (argc >= 3) { if (argc >= 3) {
count = NUM2SIZET(argv[2]); count = NUM2SIZET(argv[2]);
} else { }
else {
count = (size - offset) / io_buffer_data_type_size(data_type); count = (size - offset) / io_buffer_data_type_size(data_type);
} }
@ -1844,21 +1850,24 @@ io_buffer_values(int argc, VALUE *argv, VALUE self)
ID data_type; ID data_type;
if (argc >= 1) { if (argc >= 1) {
data_type = RB_SYM2ID(argv[0]); data_type = RB_SYM2ID(argv[0]);
} else { }
else {
data_type = RB_IO_BUFFER_DATA_TYPE_U8; data_type = RB_IO_BUFFER_DATA_TYPE_U8;
} }
size_t offset; size_t offset;
if (argc >= 2) { if (argc >= 2) {
offset = NUM2SIZET(argv[1]); offset = NUM2SIZET(argv[1]);
} else { }
else {
offset = 0; offset = 0;
} }
size_t count; size_t count;
if (argc >= 3) { if (argc >= 3) {
count = NUM2SIZET(argv[2]); count = NUM2SIZET(argv[2]);
} else { }
else {
count = (size - offset) / io_buffer_data_type_size(data_type); count = (size - offset) / io_buffer_data_type_size(data_type);
} }
@ -1902,14 +1911,16 @@ io_buffer_each_byte(int argc, VALUE *argv, VALUE self)
size_t offset; size_t offset;
if (argc >= 2) { if (argc >= 2) {
offset = NUM2SIZET(argv[1]); offset = NUM2SIZET(argv[1]);
} else { }
else {
offset = 0; offset = 0;
} }
size_t count; size_t count;
if (argc >= 3) { if (argc >= 3) {
count = NUM2SIZET(argv[2]); count = NUM2SIZET(argv[2]);
} else { }
else {
count = (size - offset); count = (size - offset);
} }

12
re.c
View File

@ -2979,7 +2979,8 @@ escape_asis:
rb_str_buf_cat(buf, (char *)&c, 1); rb_str_buf_cat(buf, (char *)&c, 1);
} }
break; break;
} else { }
else {
/* potential change of extended option */ /* potential change of extended option */
int invert = 0; int invert = 0;
int local_extend = 0; int local_extend = 0;
@ -3011,7 +3012,8 @@ escape_asis:
int local_options = options; int local_options = options;
if (local_extend == 1) { if (local_extend == 1) {
local_options |= ONIG_OPTION_EXTEND; local_options |= ONIG_OPTION_EXTEND;
} else { }
else {
local_options &= ~ONIG_OPTION_EXTEND; local_options &= ~ONIG_OPTION_EXTEND;
} }
@ -3021,7 +3023,8 @@ escape_asis:
local_options, 1); local_options, 1);
if (ret < 0) return ret; if (ret < 0) return ret;
goto begin_scan; goto begin_scan;
} else { }
else {
/* change extended flag for rest of expression */ /* change extended flag for rest of expression */
extended_mode = local_extend == 1; extended_mode = local_extend == 1;
goto fallthrough; goto fallthrough;
@ -3039,7 +3042,8 @@ escape_asis:
} }
} }
} }
} else if (!in_char_class && recurse) { }
else if (!in_char_class && recurse) {
parens++; parens++;
} }
/* FALLTHROUGH */ /* FALLTHROUGH */

6
win32/win32.c
View File

@ -5894,11 +5894,13 @@ winnt_stat(const WCHAR *path, struct stati128 *st, BOOL lstat)
if (e && attr_info.ReparseTag == IO_REPARSE_TAG_AF_UNIX) { if (e && attr_info.ReparseTag == IO_REPARSE_TAG_AF_UNIX) {
st->st_size = 0; st->st_size = 0;
mode |= S_IFSOCK; mode |= S_IFSOCK;
} else if (rb_w32_reparse_symlink_p(path)) { }
else if (rb_w32_reparse_symlink_p(path)) {
/* TODO: size in which encoding? */ /* TODO: size in which encoding? */
st->st_size = 0; st->st_size = 0;
mode |= S_IFLNK | S_IEXEC; mode |= S_IFLNK | S_IEXEC;
} else { }
else {
mode |= S_IFDIR | S_IEXEC; mode |= S_IFDIR | S_IEXEC;
} }
} }

3
yjit.c
View File

@ -527,7 +527,8 @@ rb_get_cme_def_type(const rb_callable_method_entry_t *cme)
{ {
if (UNDEFINED_METHOD_ENTRY_P(cme)) { if (UNDEFINED_METHOD_ENTRY_P(cme)) {
return VM_METHOD_TYPE_UNDEF; return VM_METHOD_TYPE_UNDEF;
} else { }
else {
return cme->def->type; return cme->def->type;
} }
} }