mirror of
https://github.com/mruby/mruby
synced 2026-06-08 16:11:16 +00:00
Merge pull request #1063 from matsumoto-r/adjust_spase_tab
Adjusted indent, space and tab
This commit is contained in:
@@ -236,8 +236,8 @@ mrb_time_at(mrb_state *mrb, mrb_value self)
|
||||
|
||||
static struct mrb_time*
|
||||
time_mktime(mrb_state *mrb, mrb_int ayear, mrb_int amonth, mrb_int aday,
|
||||
mrb_int ahour, mrb_int amin, mrb_int asec, mrb_int ausec,
|
||||
enum mrb_timezone timezone)
|
||||
mrb_int ahour, mrb_int amin, mrb_int asec, mrb_int ausec,
|
||||
enum mrb_timezone timezone)
|
||||
{
|
||||
time_t nowsecs;
|
||||
struct tm nowtime = { 0 };
|
||||
@@ -272,7 +272,7 @@ mrb_time_gm(mrb_state *mrb, mrb_value self)
|
||||
mrb_get_args(mrb, "i|iiiiii",
|
||||
&ayear, &amonth, &aday, &ahour, &amin, &asec, &ausec);
|
||||
return mrb_time_wrap(mrb, mrb_class_ptr(self),
|
||||
time_mktime(mrb, ayear, amonth, aday, ahour, amin, asec, ausec, MRB_TIMEZONE_UTC));
|
||||
time_mktime(mrb, ayear, amonth, aday, ahour, amin, asec, ausec, MRB_TIMEZONE_UTC));
|
||||
}
|
||||
|
||||
|
||||
@@ -286,7 +286,7 @@ mrb_time_local(mrb_state *mrb, mrb_value self)
|
||||
mrb_get_args(mrb, "i|iiiiii",
|
||||
&ayear, &amonth, &aday, &ahour, &amin, &asec, &ausec);
|
||||
return mrb_time_wrap(mrb, mrb_class_ptr(self),
|
||||
time_mktime(mrb, ayear, amonth, aday, ahour, amin, asec, ausec, MRB_TIMEZONE_LOCAL));
|
||||
time_mktime(mrb, ayear, amonth, aday, ahour, amin, asec, ausec, MRB_TIMEZONE_LOCAL));
|
||||
}
|
||||
|
||||
|
||||
@@ -430,10 +430,10 @@ mrb_time_asctime(mrb_state *mrb, mrb_value self)
|
||||
if (!tm) return mrb_nil_value();
|
||||
d = &tm->datetime;
|
||||
len = snprintf(buf, sizeof(buf), "%s %s %02d %02d:%02d:%02d %s%d",
|
||||
wday_names[d->tm_wday], mon_names[d->tm_mon], d->tm_mday,
|
||||
d->tm_hour, d->tm_min, d->tm_sec,
|
||||
tm->timezone == MRB_TIMEZONE_UTC ? "UTC " : "",
|
||||
d->tm_year + 1900);
|
||||
wday_names[d->tm_wday], mon_names[d->tm_mon], d->tm_mday,
|
||||
d->tm_hour, d->tm_min, d->tm_sec,
|
||||
tm->timezone == MRB_TIMEZONE_UTC ? "UTC " : "",
|
||||
d->tm_year + 1900);
|
||||
return mrb_str_new(mrb, buf, len);
|
||||
}
|
||||
|
||||
@@ -525,7 +525,7 @@ mrb_time_initialize(mrb_state *mrb, mrb_value self)
|
||||
DATA_PTR(self) = NULL;
|
||||
|
||||
n = mrb_get_args(mrb, "|iiiiiii",
|
||||
&ayear, &amonth, &aday, &ahour, &amin, &asec, &ausec);
|
||||
&ayear, &amonth, &aday, &ahour, &amin, &asec, &ausec);
|
||||
if (n == 0) {
|
||||
tm = current_mrb_time(mrb);
|
||||
}
|
||||
|
||||
+2
-2
@@ -1125,8 +1125,8 @@ mrb_ary_eql(mrb_state *mrb, mrb_value ary1)
|
||||
eql_p = 1;
|
||||
for (i=0; i<RARRAY_LEN(ary1); i++) {
|
||||
if (!mrb_eql(mrb, ary_elt(ary1, i), ary_elt(ary2, i))) {
|
||||
eql_p = 0;
|
||||
break;
|
||||
eql_p = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+3
-3
@@ -1166,16 +1166,16 @@ mrb_obj_respond_to(struct RClass* c, mrb_sym mid)
|
||||
k = kh_get(mt, h, mid);
|
||||
if (k != kh_end(h)) {
|
||||
if (kh_value(h, k)) {
|
||||
return TRUE; /* method exists */
|
||||
return TRUE; /* method exists */
|
||||
}
|
||||
else {
|
||||
return FALSE; /* undefined method */
|
||||
return FALSE; /* undefined method */
|
||||
}
|
||||
}
|
||||
}
|
||||
c = c->super;
|
||||
}
|
||||
return FALSE; /* no method */
|
||||
return FALSE; /* no method */
|
||||
}
|
||||
|
||||
int
|
||||
|
||||
+3
-3
@@ -895,7 +895,7 @@ fix_divmod(mrb_state *mrb, mrb_value x)
|
||||
|
||||
if (mrb_fixnum(y) == 0) {
|
||||
return mrb_assoc_new(mrb, mrb_float_value(str_to_mrb_float("inf")),
|
||||
mrb_float_value(str_to_mrb_float("nan")));
|
||||
mrb_float_value(str_to_mrb_float("nan")));
|
||||
}
|
||||
fixdivmod(mrb, mrb_fixnum(x), mrb_fixnum(y), &div, &mod);
|
||||
return mrb_assoc_new(mrb, mrb_fixnum_value(div), mrb_fixnum_value(mod));
|
||||
@@ -1033,14 +1033,14 @@ fix_xor(mrb_state *mrb, mrb_value x)
|
||||
return mrb_fixnum_value(val);
|
||||
}
|
||||
|
||||
#define NUMERIC_SHIFT_WIDTH_MAX (sizeof(mrb_int)*CHAR_BIT-1)
|
||||
#define NUMERIC_SHIFT_WIDTH_MAX (sizeof(mrb_int)*CHAR_BIT-1)
|
||||
|
||||
static mrb_value
|
||||
lshift(mrb_state *mrb, mrb_int val, int width)
|
||||
{
|
||||
if (width > NUMERIC_SHIFT_WIDTH_MAX) {
|
||||
mrb_raisef(mrb, E_RANGE_ERROR, "width(%d) > (%d:sizeof(mrb_int)*CHAR_BIT-1)", width,
|
||||
NUMERIC_SHIFT_WIDTH_MAX);
|
||||
NUMERIC_SHIFT_WIDTH_MAX);
|
||||
}
|
||||
val = val << width;
|
||||
return mrb_fixnum_value(val);
|
||||
|
||||
+2
-2
@@ -342,7 +342,7 @@ mrb_convert_type(mrb_state *mrb, mrb_value val, mrb_int type, const char *tname,
|
||||
v = convert_type(mrb, val, tname, method, 1/*Qtrue*/);
|
||||
if (mrb_type(v) != type) {
|
||||
mrb_raisef(mrb, E_TYPE_ERROR, "%s cannot be converted to %s by #%s",
|
||||
mrb_obj_classname(mrb, val), tname, method);
|
||||
mrb_obj_classname(mrb, val), tname, method);
|
||||
}
|
||||
return v;
|
||||
}
|
||||
@@ -417,7 +417,7 @@ mrb_check_type(mrb_state *mrb, mrb_value x, enum mrb_vtype t)
|
||||
etype = mrb_obj_classname(mrb, x);
|
||||
}
|
||||
mrb_raisef(mrb, E_TYPE_ERROR, "wrong argument type %s (expected %s)",
|
||||
etype, type->name);
|
||||
etype, type->name);
|
||||
}
|
||||
type++;
|
||||
}
|
||||
|
||||
+22
-22
@@ -83,7 +83,7 @@ mrb_str_resize(mrb_state *mrb, mrb_value str, int len)
|
||||
}
|
||||
s->aux.capa = len;
|
||||
s->len = len;
|
||||
s->ptr[len] = '\0'; /* sentinel */
|
||||
s->ptr[len] = '\0'; /* sentinel */
|
||||
}
|
||||
return str;
|
||||
}
|
||||
@@ -192,7 +192,7 @@ str_buf_cat(mrb_state *mrb, struct RString *s, const char *ptr, size_t len)
|
||||
}
|
||||
memcpy(s->ptr + s->len, ptr, len);
|
||||
s->len = total;
|
||||
s->ptr[total] = '\0'; /* sentinel */
|
||||
s->ptr[total] = '\0'; /* sentinel */
|
||||
}
|
||||
|
||||
mrb_value
|
||||
@@ -1929,24 +1929,24 @@ mrb_str_split_m(mrb_state *mrb, mrb_value str)
|
||||
int ai = mrb_gc_arena_save(mrb);
|
||||
c = (unsigned char)*ptr++;
|
||||
if (skip) {
|
||||
if (ascii_isspace(c)) {
|
||||
beg = ptr - bptr;
|
||||
}
|
||||
else {
|
||||
end = ptr - bptr;
|
||||
skip = 0;
|
||||
if (lim_p && lim <= i) break;
|
||||
}
|
||||
if (ascii_isspace(c)) {
|
||||
beg = ptr - bptr;
|
||||
}
|
||||
else {
|
||||
end = ptr - bptr;
|
||||
skip = 0;
|
||||
if (lim_p && lim <= i) break;
|
||||
}
|
||||
}
|
||||
else if (ascii_isspace(c)) {
|
||||
mrb_ary_push(mrb, result, mrb_str_subseq(mrb, str, beg, end-beg));
|
||||
mrb_ary_push(mrb, result, mrb_str_subseq(mrb, str, beg, end-beg));
|
||||
mrb_gc_arena_restore(mrb, ai);
|
||||
skip = 1;
|
||||
beg = ptr - bptr;
|
||||
if (lim_p) ++i;
|
||||
skip = 1;
|
||||
beg = ptr - bptr;
|
||||
if (lim_p) ++i;
|
||||
}
|
||||
else {
|
||||
end = ptr - bptr;
|
||||
end = ptr - bptr;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1959,10 +1959,10 @@ mrb_str_split_m(mrb_state *mrb, mrb_value str)
|
||||
if (slen == 0) {
|
||||
int ai = mrb_gc_arena_save(mrb);
|
||||
while (ptr < eptr) {
|
||||
mrb_ary_push(mrb, result, mrb_str_subseq(mrb, str, ptr-temp, 1));
|
||||
mrb_ary_push(mrb, result, mrb_str_subseq(mrb, str, ptr-temp, 1));
|
||||
mrb_gc_arena_restore(mrb, ai);
|
||||
ptr++;
|
||||
if (lim_p && lim <= ++i) break;
|
||||
ptr++;
|
||||
if (lim_p && lim <= ++i) break;
|
||||
}
|
||||
}
|
||||
else {
|
||||
@@ -1970,11 +1970,11 @@ mrb_str_split_m(mrb_state *mrb, mrb_value str)
|
||||
int ai = mrb_gc_arena_save(mrb);
|
||||
|
||||
while (ptr < eptr &&
|
||||
(end = mrb_memsearch(sptr, slen, ptr, eptr - ptr)) >= 0) {
|
||||
mrb_ary_push(mrb, result, mrb_str_subseq(mrb, str, ptr - temp, end));
|
||||
(end = mrb_memsearch(sptr, slen, ptr, eptr - ptr)) >= 0) {
|
||||
mrb_ary_push(mrb, result, mrb_str_subseq(mrb, str, ptr - temp, end));
|
||||
mrb_gc_arena_restore(mrb, ai);
|
||||
ptr += end + slen;
|
||||
if (lim_p && lim <= ++i) break;
|
||||
ptr += end + slen;
|
||||
if (lim_p && lim <= ++i) break;
|
||||
}
|
||||
}
|
||||
beg = ptr - temp;
|
||||
|
||||
+1
-1
@@ -91,7 +91,7 @@ mrb_sym2name_len(mrb_state *mrb, mrb_sym sym, size_t *lenp)
|
||||
}
|
||||
}
|
||||
*lenp = 0;
|
||||
return NULL; /* missing */
|
||||
return NULL; /* missing */
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
+1
-1
@@ -1043,7 +1043,7 @@ csym_i(mrb_state *mrb, mrb_sym sym, mrb_value v, void *p)
|
||||
|
||||
if (mrb_type(v) == c->tt && mrb_class_ptr(v) == c) {
|
||||
a->sym = sym;
|
||||
return 1; /* stop iteration */
|
||||
return 1; /* stop iteration */
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -202,7 +202,7 @@ cipush(mrb_state *mrb)
|
||||
mrb->ciend = mrb->cibase + size * 2;
|
||||
}
|
||||
mrb->ci++;
|
||||
mrb->ci->nregs = 2; /* protect method_missing arg and block */
|
||||
mrb->ci->nregs = 2; /* protect method_missing arg and block */
|
||||
mrb->ci->eidx = eidx;
|
||||
mrb->ci->ridx = ridx;
|
||||
mrb->ci->env = 0;
|
||||
@@ -296,7 +296,7 @@ mrb_funcall_with_block(mrb_state *mrb, mrb_value self, mrb_sym mid, int argc, mr
|
||||
jmp_buf c_jmp;
|
||||
mrb_callinfo *old_ci = mrb->ci;
|
||||
|
||||
if (setjmp(c_jmp) != 0) { /* error */
|
||||
if (setjmp(c_jmp) != 0) { /* error */
|
||||
while (old_ci != mrb->ci) {
|
||||
mrb->stack = mrb->stbase + mrb->ci->stackidx;
|
||||
cipop(mrb);
|
||||
|
||||
Reference in New Issue
Block a user