admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

small cosmetic changes.

Browse Source 
I prefer `i++` style unless absolutely necessary.
This commit is an addition to 41e4148.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2022-11-18 23:08:12 +09:00
parent 7ab7608094
commit 9c5dc42e59
24 changed files with 99 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/array.c
+3 -3
View File
@@ -602,7 +602,7 @@ mrb_ary_shift(mrb_state *mrb, mrb_value self)
val = *ptr;
while (--size) {
*ptr = *(ptr+1);
++ptr;
ptr++;
}
ARY_SET_LEN(a, len-1);
}
@@ -646,7 +646,7 @@ mrb_ary_shift_m(mrb_state *mrb, mrb_value self)
while (size--) {
*ptr = *(ptr+n);
++ptr;
ptr++;
}
ARY_SET_LEN(a, len-n);
}
@@ -1074,7 +1074,7 @@ mrb_ary_delete_at(mrb_state *mrb, mrb_value self)
len = alen - index;
while (--len) {
*ptr = *(ptr+1);
++ptr;
ptr++;
}
ARY_SET_LEN(a, alen-1);
src/cdump.c
+1 -1
View File
@@ -172,7 +172,7 @@ sym_operator_name(const char *sym_name, mrb_int len)
}
if (0 < cmp) {
start = ++idx;
--table_size;
table_size--;
}
}
return NULL;
src/fmt_fp.c
+1 -1
View File
@@ -275,7 +275,7 @@ mrb_format_float(mrb_float f, char *buf, size_t buf_size, char fmt, int prec, ch
}
// Print the digits of the mantissa
for (int i = 0; i < num_digits; ++i, --dec) {
for (int i = 0; i < num_digits; i++,dec--) {
int8_t d = (int8_t)((int)f)%10;
*s++ = '0' + d;
if (dec == 0 && (prec > 0 || alt_form)) {
src/hash.c
+5 -5
View File
@@ -170,7 +170,7 @@ DEFINE_SWITCHER(ht, HT)
#define ea_each_used(ea, n_used, entry_var, code) do { \
hash_entry *entry_var = ea, *ea_end__ = entry_var + (n_used); \
for (; entry_var < ea_end__; ++entry_var) { \
for (; entry_var < ea_end__; entry_var++) { \
code; \
} \
} while (0)
@@ -178,7 +178,7 @@ DEFINE_SWITCHER(ht, HT)
#define ea_each(ea, size, entry_var, code) do { \
hash_entry *entry_var = ea; \
uint32_t size__ = size; \
for (; 0 < size__; ++entry_var) { \
for (; 0 < size__; entry_var++) { \
if (entry_deleted_p(entry_var)) continue; \
--size__; \
code; \
@@ -310,7 +310,7 @@ next_power2(uint32_t v)
v |= v >> 4;
v |= v >> 8;
v |= v >> 16;
++v;
v++;
return v;
#endif
}
@@ -426,7 +426,7 @@ ea_compress(hash_entry *ea, uint32_t n_used)
ea_each_used(ea, n_used, r_entry, {
if (entry_deleted_p(r_entry)) continue;
if (r_entry != w_entry) *w_entry = *r_entry;
++w_entry;
w_entry++;
});
}
@@ -592,7 +592,7 @@ ar_rehash(mrb_state *mrb, struct RHash *h)
ea_set(ea, w_size, r_entry->key, r_entry->val);
entry_delete(r_entry);
}
++w_size;
w_size++;
}
});
mrb_assert(size == w_size);
src/load.c
+7 -7
View File
@@ -326,7 +326,7 @@ read_debug_record(mrb_state *mrb, const uint8_t *start, const uint8_t *end, mrb_
if (bin > end) return MRB_DUMP_GENERAL_FAILURE;
debug->files = (mrb_irep_debug_info_file**)mrb_calloc(mrb, irep->debug_info->flen, sizeof(mrb_irep_debug_info*));
for (f_idx = 0; f_idx < debug->flen; ++f_idx) {
for (f_idx = 0; f_idx < debug->flen; f_idx++) {
mrb_irep_debug_info_file *file;
uint16_t filename_idx;
@@ -353,7 +353,7 @@ read_debug_record(mrb_state *mrb, const uint8_t *start, const uint8_t *end, mrb_
if (bin + l > end) return MRB_DUMP_GENERAL_FAILURE;
uint16_t *ary = (uint16_t *)mrb_malloc(mrb, l);
for (l = 0; l < file->line_entry_count; ++l) {
for (l = 0; l < file->line_entry_count; l++) {
ary[l] = bin_to_uint16(bin);
bin += sizeof(uint16_t);
}
@@ -366,7 +366,7 @@ read_debug_record(mrb_state *mrb, const uint8_t *start, const uint8_t *end, mrb_
if (bin + c*n > end) return MRB_DUMP_GENERAL_FAILURE;
mrb_irep_debug_info_line *flat_map = (mrb_irep_debug_info_line*)mrb_calloc(mrb, c, n);
for (size_t l = 0; l < file->line_entry_count; ++l) {
for (size_t l = 0; l < file->line_entry_count; l++) {
flat_map[l].start_pos = bin_to_uint32(bin);
bin += sizeof(uint32_t);
flat_map[l].line = bin_to_uint16(bin);
@@ -435,7 +435,7 @@ read_section_debug(mrb_state *mrb, const uint8_t *start, size_t size, mrb_irep *
if (bin > end) return MRB_DUMP_GENERAL_FAILURE;
filenames_obj = mrb_str_new(mrb, NULL, sizeof(mrb_sym) * (size_t)filenames_len);
filenames = (mrb_sym*)RSTRING_PTR(filenames_obj);
for (i = 0; i < filenames_len; ++i) {
for (i = 0; i < filenames_len; i++) {
uint16_t f_len = bin_to_uint16(bin);
bin += sizeof(uint16_t);
if (bin + f_len > end) {
@@ -477,7 +477,7 @@ read_lv_record(mrb_state *mrb, const uint8_t *start, mrb_irep *irep, size_t *rec
if (irep->nlocals == 0) return MRB_DUMP_GENERAL_FAILURE;
irep->lv = lv = (mrb_sym*)mrb_malloc(mrb, sizeof(mrb_sym) * (irep->nlocals - 1));
for (i = 0; i + 1 < irep->nlocals; ++i) {
for (i = 0; i + 1 < irep->nlocals; i++) {
uint16_t const sym_idx = bin_to_uint16(bin);
bin += sizeof(uint16_t);
if (sym_idx == RITE_LV_NULL_MARK) {
@@ -491,7 +491,7 @@ read_lv_record(mrb_state *mrb, const uint8_t *start, mrb_irep *irep, size_t *rec
}
}
for (i = 0; i < irep->rlen; ++i) {
for (i = 0; i < irep->rlen; i++) {
size_t len;
int ret;
@@ -532,7 +532,7 @@ read_section_lv(mrb_state *mrb, const uint8_t *start, size_t size, mrb_irep *ire
if (bin > end) return MRB_DUMP_READ_FAULT;
syms_obj = mrb_str_new(mrb, NULL, sizeof(mrb_sym) * (size_t)syms_len);
syms = (mrb_sym*)RSTRING_PTR(syms_obj);
for (i = 0; i < syms_len; ++i) {
for (i = 0; i < syms_len; i++) {
uint16_t const str_len = bin_to_uint16(bin);
bin += sizeof(uint16_t);
if (bin > end) return MRB_DUMP_READ_FAULT;
src/proc.c
+3 -3
View File
@@ -154,12 +154,12 @@ mrb_proc_new_cfunc_with_env(mrb_state *mrb, mrb_func_t func, mrb_int argc, const
MRB_ENV_SET_LEN(e, argc);
if (argv) {
for (i = 0; i < argc; ++i) {
for (i = 0; i < argc; i++) {
e->stack[i] = argv[i];
}
}
else {
for (i = 0; i < argc; ++i) {
for (i = 0; i < argc; i++) {
SET_NIL_VALUE(e->stack[i]);
}
}
@@ -334,7 +334,7 @@ mrb_proc_local_variables(mrb_state *mrb, const struct RProc *proc)
if (MRB_PROC_CFUNC_P(proc)) break;
irep = proc->body.irep;
if (irep->lv) {
for (i = 0; i + 1 < irep->nlocals; ++i) {
for (i = 0; i + 1 < irep->nlocals; i++) {
if (irep->lv[i]) {
mrb_sym sym = irep->lv[i];
const char *name = mrb_sym_name(mrb, sym);
src/range.c
+3 -3
View File
@@ -407,17 +407,17 @@ mrb_get_values_at(mrb_state *mrb, mrb_value obj, mrb_int olen, mrb_int argc, con
mrb_value result;
result = mrb_ary_new(mrb);
for (i = 0; i < argc; ++i) {
for (i = 0; i < argc; i++) {
if (mrb_integer_p(argv[i])) {
mrb_ary_push(mrb, result, func(mrb, obj, mrb_integer(argv[i])));
}
else if (mrb_range_beg_len(mrb, argv[i], &beg, &len, olen, FALSE) == MRB_RANGE_OK) {
mrb_int const end = olen < beg + len ? olen : beg + len;
for (j = beg; j < end; ++j) {
for (j = beg; j < end; j++) {
mrb_ary_push(mrb, result, func(mrb, obj, j));
}
for (; j < beg + len; ++j) {
for (; j < beg + len; j++) {
mrb_ary_push(mrb, result, mrb_nil_value());
}
}
src/string.c
+7 -7
View File
@@ -343,7 +343,7 @@ bytes2chars(char *p, mrb_int len, mrb_int bi)
const char *pivot = p + bi;
mrb_int i;
for (i = 0; p < pivot; i ++) {
for (i = 0; p < pivot; i++) {
p += mrb_utf8len(p, e);
}
if (p != pivot) return -1;
@@ -383,10 +383,10 @@ str_index_str_by_char_search(mrb_state *mrb, const char *p, const char *pend, co
{
mrb_int i;
for (i = 0; i < 1 << CHAR_BIT; i ++) {
for (i = 0; i < 1 << CHAR_BIT; i++) {
qstable[i] = slen;
}
for (i = 0; i < slen; i ++) {
for (i = 0; i < slen; i++) {
qstable[(unsigned char)s[i]] = slen - (i + 1);
}
}
@@ -404,7 +404,7 @@ str_index_str_by_char_search(mrb_state *mrb, const char *p, const char *pend, co
do {
p += mrb_utf8len(p, pend);
off ++;
off++;
} while (p < pivot);
}
@@ -469,9 +469,9 @@ mrb_memsearch_qs(const unsigned char *xs, mrb_int m, const unsigned char *ys, mr
ptrdiff_t qstable[256];
/* Preprocessing */
for (i = 0; i < 256; ++i)
for (i = 0; i < 256; i++)
qstable[i] = m + 1;
for (; x < xe; ++x)
for (; x < xe; x++)
qstable[*x] = xe - x;
/* Searching */
for (; y + m <= ys + n; y += *(qstable + y[m])) {
@@ -2190,7 +2190,7 @@ mrb_str_split_m(mrb_state *mrb, mrb_value str)
mrb_gc_arena_restore(mrb, ai);
skip = TRUE;
beg = idx;
if (lim_p) ++i;
if (lim_p) i++;
}
else {
end = idx;