From 2f7f79747341c5eea6efa2fd73628bf802160c1e Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Mon, 22 May 2023 12:05:35 +0900 Subject: [PATCH] remove extra spaces before `;` --- include/mruby/khash.h | 4 ++-- mrbgems/mruby-bigint/core/bigint.c | 4 ++-- mrbgems/mruby-bin-debugger/tools/mrdb/apibreak.c | 10 +++++----- mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c | 2 +- mrbgems/mruby-bin-debugger/tools/mrdb/cmdmisc.c | 8 +++++--- mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c | 15 +++++++++------ mrbgems/mruby-cmath/src/cmath.c | 4 ++-- mrbgems/mruby-compiler/core/parse.y | 6 +++--- mrbgems/mruby-compiler/core/y.tab.c | 6 +++--- mrbgems/mruby-sprintf/src/sprintf.c | 3 ++- src/readfloat.c | 2 +- src/string.c | 2 +- src/vm.c | 2 +- 13 files changed, 37 insertions(+), 31 deletions(-) diff --git a/include/mruby/khash.h b/include/mruby/khash.h index fe5898b61..c413ebbb7 100644 --- a/include/mruby/khash.h +++ b/include/mruby/khash.h @@ -171,7 +171,7 @@ kh_fill_flags(uint8_t *p, uint8_t c, size_t len) hh.n_buckets = new_n_buckets; \ kh_alloc_##name(mrb, &hh); \ /* relocate */ \ - for (i=0 ; isz == 0) return 0; - for (i = x->sz - 1; x->p[i] == 0 ; i--) + for (i = x->sz - 1; x->p[i] == 0; i--) if (i == 0) break; return i+1; } @@ -395,7 +395,7 @@ lzb(mp_limb x) int j=0; - for (mp_limb i = ((mp_limb)1 << (DIG_SIZE-1)); i && !(x&i) ; j++,i>>=1) + for (mp_limb i = ((mp_limb)1 << (DIG_SIZE-1)); i && !(x&i); j++,i>>=1) ; return j; } diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/apibreak.c b/mrbgems/mruby-bin-debugger/tools/mrdb/apibreak.c index 5109648c4..e3e0e666a 100644 --- a/mrbgems/mruby-bin-debugger/tools/mrdb/apibreak.c +++ b/mrbgems/mruby-bin-debugger/tools/mrdb/apibreak.c @@ -68,7 +68,7 @@ get_break_index(mrb_debug_context *dbg, uint32_t bpno) int32_t index; char hit = FALSE; - for (i = 0 ; i < dbg->bpnum; i++) { + for (i = 0; i < dbg->bpnum; i++) { if (dbg->bp[i].bpno == bpno) { hit = TRUE; index = i; @@ -341,7 +341,7 @@ mrb_debug_delete_break(mrb_state *mrb, mrb_debug_context *dbg, uint32_t bpno) free_breakpoint(mrb, &dbg->bp[index]); - for (i = index ; i < dbg->bpnum; i++) { + for (i = index; i < dbg->bpnum; i++) { if ((i + 1) == dbg->bpnum) { dbg->bp[i] = (mrb_debug_breakpoint){0}; } @@ -364,7 +364,7 @@ mrb_debug_delete_break_all(mrb_state *mrb, mrb_debug_context *dbg) return MRB_DEBUG_INVALID_ARGUMENT; } - for (i = 0 ; i < dbg->bpnum ; i++) { + for (i = 0; i < dbg->bpnum; i++) { free_breakpoint(mrb, &dbg->bp[i]); } @@ -401,7 +401,7 @@ mrb_debug_enable_break_all(mrb_state *mrb, mrb_debug_context *dbg) return MRB_DEBUG_INVALID_ARGUMENT; } - for (i = 0 ; i < dbg->bpnum; i++) { + for (i = 0; i < dbg->bpnum; i++) { dbg->bp[i].enable = TRUE; } @@ -436,7 +436,7 @@ mrb_debug_disable_break_all(mrb_state *mrb, mrb_debug_context *dbg) return MRB_DEBUG_INVALID_ARGUMENT; } - for (i = 0 ; i < dbg->bpnum; i++) { + for (i = 0; i < dbg->bpnum; i++) { dbg->bp[i].enable = FALSE; } diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c b/mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c index f61009ba4..621bb4527 100644 --- a/mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c +++ b/mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c @@ -199,7 +199,7 @@ info_break_all(mrb_state *mrb, mrdb_state *mrdb) return; } puts(BREAK_INFO_MSG_HEADER); - for (i = 0 ; i < bpnum ; i++) { + for (i = 0; i < bpnum; i++) { print_breakpoint(&bp_list[i]); } diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/cmdmisc.c b/mrbgems/mruby-bin-debugger/tools/mrdb/cmdmisc.c index 6298193a9..4cf635b41 100644 --- a/mrbgems/mruby-bin-debugger/tools/mrdb/cmdmisc.c +++ b/mrbgems/mruby-bin-debugger/tools/mrdb/cmdmisc.c @@ -167,7 +167,8 @@ parse_uint(char **sp, uint16_t *n) return FALSE; } - for (p = *sp; *p != '\0' && ISDIGIT(*p); p++) ; + for (p = *sp; *p != '\0' && ISDIGIT(*p); p++) + ; if (p != *sp && (i = atoi(*sp)) >= 0) { *n = (uint16_t)i; @@ -352,7 +353,7 @@ check_cmd_pattern(const char *pattern, const char *cmd) p = lbracket + 1; q = (char*)cmd + (lbracket - pattern); - for ( ; p < rbracket && *q != '\0'; p++, q++) { + for (; p < rbracket && *q != '\0'; p++, q++) { if (*p != *q) { break; } @@ -479,7 +480,8 @@ dbgcmd_quit(mrb_state *mrb, mrdb_state *mrdb) break; } c = buf; - while (buf != '\n' && (buf = getchar()) != EOF) ; + while (buf != '\n' && (buf = getchar()) != EOF) + ; if (c == 'y' || c == 'Y') { mrdb->dbg->xm = DBG_QUIT; diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c b/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c index 21fa419a7..e0e3a96f6 100644 --- a/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c +++ b/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c @@ -279,7 +279,7 @@ get_command(mrb_state *mrb, mrdb_state *mrdb) } if (i == MAX_COMMAND_LINE) { - for ( ; (c=getchar()) != EOF && c !='\n'; i++) ; + for (; (c=getchar()) != EOF && c !='\n'; i++) ; } if (i > MAX_COMMAND_LINE) { @@ -296,7 +296,8 @@ pick_out_word(mrb_state *mrb, char **pp) { char *ps; - for (ps=*pp; ISBLANK(*ps); ps++) ; + for (ps=*pp; ISBLANK(*ps); ps++) + ; if (*ps == '\0') { return NULL; } @@ -335,7 +336,8 @@ parse_command(mrb_state *mrb, mrdb_state *mrdb, char *buf) } mrdb->wcnt = 1; /* set remain parameter */ - for ( ; *p && ISBLANK(*p); p++) ; + for (; *p && ISBLANK(*p); p++) + ; if (*p) { mrdb->words[mrdb->wcnt++] = p; } @@ -355,7 +357,8 @@ parse_command(mrb_state *mrb, mrdb_state *mrdb, char *buf) mrdb->words[1] = pick_out_word(mrb, &p); if (mrdb->words[1]) { /* update remain parameter */ - for ( ; *p && ISBLANK(*p); p++) ; + for (; *p && ISBLANK(*p); p++) + ; if (*p) { mrdb->words[mrdb->wcnt++] = p; } @@ -363,7 +366,7 @@ parse_command(mrb_state *mrb, mrdb_state *mrdb, char *buf) } /* check word #1,#2 */ - for ( ; cmd->cmd1; cmd++) { + for (; cmd->cmd1; cmd++) { wlen = strlen(mrdb->words[0]); if (wlen < cmd->len1 || strncmp(mrdb->words[0], cmd->cmd1, wlen)) { @@ -385,7 +388,7 @@ parse_command(mrb_state *mrb, mrdb_state *mrdb, char *buf) /* divide remain parameters */ if (cmd->cmd1 && cmd->div) { p = mrdb->words[--mrdb->wcnt]; - for ( ; mrdb->wcntwcnt++) { + for (; mrdb->wcntwcnt++) { mrdb->words[mrdb->wcnt] = pick_out_word(mrb, &p); if (!mrdb->words[mrdb->wcnt]) { break; diff --git a/mrbgems/mruby-cmath/src/cmath.c b/mrbgems/mruby-cmath/src/cmath.c index 3433c23a6..b0b8d5f18 100644 --- a/mrbgems/mruby-cmath/src/cmath.c +++ b/mrbgems/mruby-cmath/src/cmath.c @@ -76,13 +76,13 @@ CXDIVc(mrb_complex a, mrb_complex b) if ((abi = cimag(b)) < 0) abi = - abi; if (abr <= abi) { - ratio = creal(b) / cimag(b) ; + ratio = creal(b) / cimag(b); den = cimag(a) * (1 + ratio*ratio); cr = (creal(a)*ratio + cimag(a)) / den; ci = (cimag(a)*ratio - creal(a)) / den; } else { - ratio = cimag(b) / creal(b) ; + ratio = cimag(b) / creal(b); den = creal(a) * (1 + ratio*ratio); cr = (creal(a) + cimag(a)*ratio) / den; ci = (cimag(a) - creal(a)*ratio) / den; diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y index a2d1f1dce..c63dc2d3b 100644 --- a/mrbgems/mruby-compiler/core/parse.y +++ b/mrbgems/mruby-compiler/core/parse.y @@ -139,7 +139,7 @@ cons_gen(parser_state *p, node *car, node *cdr) c->filename_index = p->current_filename_index; /* beginning of next partial file; need to point the previous file */ if (p->lineno == 0 && p->current_filename_index > 0) { - c->filename_index-- ; + c->filename_index--; } return c; } @@ -1101,8 +1101,8 @@ concat_string(parser_state *p, node *a, node *b) } else { node *c; /* last node of a */ - for (c = a; c->cdr != NULL; c = c->cdr) ; - + for (c = a; c->cdr != NULL; c = c->cdr) + ; if (string_node_p(b)) { /* a == NODE_DSTR && b == NODE_STR */ if (string_node_p(c->car)) { diff --git a/mrbgems/mruby-compiler/core/y.tab.c b/mrbgems/mruby-compiler/core/y.tab.c index 4093d7c0d..57a5e755d 100644 --- a/mrbgems/mruby-compiler/core/y.tab.c +++ b/mrbgems/mruby-compiler/core/y.tab.c @@ -203,7 +203,7 @@ cons_gen(parser_state *p, node *car, node *cdr) c->filename_index = p->current_filename_index; /* beginning of next partial file; need to point the previous file */ if (p->lineno == 0 && p->current_filename_index > 0) { - c->filename_index-- ; + c->filename_index--; } return c; } @@ -1165,8 +1165,8 @@ concat_string(parser_state *p, node *a, node *b) } else { node *c; /* last node of a */ - for (c = a; c->cdr != NULL; c = c->cdr) ; - + for (c = a; c->cdr != NULL; c = c->cdr) + ; if (string_node_p(b)) { /* a == NODE_DSTR && b == NODE_STR */ if (string_node_p(c->car)) { diff --git a/mrbgems/mruby-sprintf/src/sprintf.c b/mrbgems/mruby-sprintf/src/sprintf.c index 4faae4a2a..ad95295ed 100644 --- a/mrbgems/mruby-sprintf/src/sprintf.c +++ b/mrbgems/mruby-sprintf/src/sprintf.c @@ -605,7 +605,8 @@ mrb_str_format(mrb_state *mrb, mrb_int argc, const mrb_value *argv, mrb_value fm mrb_sym id = 0; int flags = FNONE; - for (t = p; t < end && *t != '%'; t++) ; + for (t = p; t < end && *t != '%'; t++) + ; if (t + 1 == end) t++; PUSH(p, t - p); if (t >= end) diff --git a/src/readfloat.c b/src/readfloat.c index a89fcafaa..80d438ba9 100644 --- a/src/readfloat.c +++ b/src/readfloat.c @@ -65,7 +65,7 @@ mrb_read_float(const char *str, char **endp, double *fp) if (ISDIGIT(*p)) { while (*p && ISDIGIT(*p)) { - f += base * (*p - '0') ; + f += base * (*p - '0'); base /= 10.0; p++; n++; diff --git a/src/string.c b/src/string.c index 5160b06b2..f56cf6e5f 100644 --- a/src/string.c +++ b/src/string.c @@ -2366,7 +2366,7 @@ mrb_str_len_to_integer(mrb_state *mrb, const char *str, size_t len, mrb_int base #ifdef MRB_USE_BIGINT p2 = p; #endif - for ( ;p 1000 ; return 0 ; end ; rec ; end */ +/** def rec; $deep =+ 1; if $deep > 1000; return 0; end; rec; end **/ static void stack_extend_alloc(mrb_state *mrb, mrb_int room)