summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--array.c7
-rw-r--r--compile.c6
-rw-r--r--cont.c6
-rw-r--r--dir.c3
-rw-r--r--iseq.c3
-rw-r--r--mjit_worker.c3
-rw-r--r--range.c6
-rw-r--r--vm_method.c3
8 files changed, 21 insertions, 16 deletions
diff --git a/array.c b/array.c
index 7b92bfe5b1..a4f3d984d1 100644
--- a/array.c
+++ b/array.c
@@ -188,7 +188,8 @@ ary_verify_(VALUE ary, const char *file, int line)
}
void
-rb_ary_verify(VALUE ary){
+rb_ary_verify(VALUE ary)
+{
ary_verify(ary);
}
#else
@@ -4531,7 +4532,7 @@ rb_ary_difference_multi(int argc, VALUE *argv, VALUE ary)
for (i = 0; i < RARRAY_LEN(ary); i++) {
int j;
VALUE elt = rb_ary_elt(ary, i);
- for (j = 0; j < argc; j++){
+ for (j = 0; j < argc; j++) {
if (is_hash[j]) {
if (rb_hash_stlike_lookup(argv[j], RARRAY_AREF(ary, i), NULL))
break;
@@ -4691,7 +4692,7 @@ rb_ary_union_multi(int argc, VALUE *argv, VALUE ary)
VALUE hash, ary_union;
sum = RARRAY_LEN(ary);
- for (i = 0; i < argc; i++){
+ for (i = 0; i < argc; i++) {
argv[i] = to_ary(argv[i]);
sum += RARRAY_LEN(argv[i]);
}
diff --git a/compile.c b/compile.c
index 060bd765d2..cab401b895 100644
--- a/compile.c
+++ b/compile.c
@@ -3895,11 +3895,7 @@ static_literal_node_p(const NODE *node, const rb_iseq_t *iseq)
case NODE_FALSE:
return TRUE;
case NODE_STR:
- if (ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal) {
- return TRUE;
- } else {
- return FALSE;
- }
+ return ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal;
default:
return FALSE;
}
diff --git a/cont.c b/cont.c
index ac4749230b..e05d9ee47b 100644
--- a/cont.c
+++ b/cont.c
@@ -875,11 +875,13 @@ fiber_machine_stack_alloc(size_t size)
machine_stack_cache_index--;
machine_stack_cache[machine_stack_cache_index].ptr = NULL;
machine_stack_cache[machine_stack_cache_index].size = 0;
- } else {
+ }
+ else {
/* TODO handle multiple machine stack size */
rb_bug("machine_stack_cache size is not canonicalized");
}
- } else {
+ }
+ else {
#ifdef _WIN32
ptr = VirtualAlloc(0, size, MEM_COMMIT, PAGE_READWRITE);
diff --git a/dir.c b/dir.c
index 2f38e35976..2196344fc3 100644
--- a/dir.c
+++ b/dir.c
@@ -2061,7 +2061,8 @@ join_path_from_pattern(struct glob_pattern **beg)
path = GLOB_ALLOC_N(char, path_len + 1);
memcpy(path, str, path_len);
path[path_len] = '\0';
- } else {
+ }
+ else {
size_t len = strlen(str);
char *tmp;
tmp = GLOB_REALLOC(path, path_len + len + 2);
diff --git a/iseq.c b/iseq.c
index e327cd9976..864e92645c 100644
--- a/iseq.c
+++ b/iseq.c
@@ -191,7 +191,8 @@ rb_iseq_each_value(const rb_iseq_t *iseq, iseq_value_itr_t * func, void *data)
#if OPT_DIRECT_THREADED_CODE || OPT_CALL_THREADED_CODE
if (FL_TEST(iseq, ISEQ_TRANSLATED)) {
translator = rb_vm_insn_addr2insn2;
- } else {
+ }
+ else {
translator = rb_vm_insn_null_translator;
}
#else
diff --git a/mjit_worker.c b/mjit_worker.c
index a2797098d4..eab4654f9c 100644
--- a/mjit_worker.c
+++ b/mjit_worker.c
@@ -619,7 +619,8 @@ exec_process(const char *path, char *const argv[])
if (WIFEXITED(stat)) {
exit_code = WEXITSTATUS(stat);
break;
- } else if (WIFSIGNALED(stat)) {
+ }
+ else if (WIFSIGNALED(stat)) {
exit_code = -1;
break;
}
diff --git a/range.c b/range.c
index 4b8d14e2c9..3f87e7e268 100644
--- a/range.c
+++ b/range.c
@@ -1472,9 +1472,11 @@ r_cover_range_p(VALUE range, VALUE beg, VALUE end, VALUE val)
if (EXCL(range) == EXCL(val)) {
return cmp_end >= 0;
- } else if (EXCL(range)) {
+ }
+ else if (EXCL(range)) {
return cmp_end > 0;
- } else if (cmp_end >= 0) {
+ }
+ else if (cmp_end >= 0) {
return TRUE;
}
diff --git a/vm_method.c b/vm_method.c
index ba219e2d99..3333ea16b4 100644
--- a/vm_method.c
+++ b/vm_method.c
@@ -1296,7 +1296,8 @@ check_definition_visibility(VALUE mod, int argc, VALUE *argv)
if (argc == 1) {
inc_super = 1;
- } else {
+ }
+ else {
inc_super = RTEST(include_super);
if (!inc_super) {
lookup_mod = RCLASS_ORIGIN(mod);