aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-06 22:50:30 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-06 22:50:30 +0000
commit7f00f853d4b1c09c4b37eeb6c12e8386c622fa3f (patch)
tree6d9dd7fb1f01508e9fba29b703b6770fb60f3275
parent6678422feea0bc7e3c8e3097c47ac6ef396557db (diff)
downloadruby-7f00f853d4b1c09c4b37eeb6c12e8386c622fa3f.tar.gz
adjust style
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37530 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--enumerator.c9
-rw-r--r--numeric.c15
-rw-r--r--vm_eval.c3
-rw-r--r--vm_insnhelper.c3
4 files changed, 20 insertions, 10 deletions
diff --git a/enumerator.c b/enumerator.c
index 9223979445..081f93babc 100644
--- a/enumerator.c
+++ b/enumerator.c
@@ -1625,7 +1625,8 @@ lazy_take_func(VALUE val, VALUE args, int argc, VALUE *argv)
}
static VALUE
-lazy_take_size(VALUE lazy) {
+lazy_take_size(VALUE lazy)
+{
long len = NUM2LONG(RARRAY_PTR(rb_ivar_get(lazy, id_arguments))[0]);
VALUE receiver = lazy_receiver_size(lazy);
if (NIL_P(receiver) || (FIXNUM_P(receiver) && FIX2LONG(receiver) < len))
@@ -1674,7 +1675,8 @@ lazy_take_while(VALUE obj)
}
static VALUE
-lazy_drop_size(VALUE lazy) {
+lazy_drop_size(VALUE lazy)
+{
long len = NUM2LONG(RARRAY_PTR(rb_ivar_get(lazy, id_arguments))[0]);
VALUE receiver = lazy_receiver_size(lazy);
if (NIL_P(receiver))
@@ -1741,7 +1743,8 @@ lazy_drop_while(VALUE obj)
}
static VALUE
-lazy_cycle_size(VALUE lazy) {
+lazy_cycle_size(VALUE lazy)
+{
return enum_cycle_size(rb_ivar_get(lazy, id_receiver), rb_ivar_get(lazy, id_arguments));
}
diff --git a/numeric.c b/numeric.c
index b36908a8aa..bbe86a1708 100644
--- a/numeric.c
+++ b/numeric.c
@@ -1721,7 +1721,8 @@ num_truncate(VALUE num)
}
static double
-ruby_float_step_size(double beg, double end, double unit, int excl) {
+ruby_float_step_size(double beg, double end, double unit, int excl)
+{
const double epsilon = DBL_EPSILON;
double n = (end - beg)/unit;
double err = (fabs(beg) + fabs(end) + fabs(end-beg)) / fabs(unit) * epsilon;
@@ -1765,7 +1766,8 @@ ruby_float_step(VALUE from, VALUE to, VALUE step, int excl)
}
VALUE
-num_interval_step_size(VALUE from, VALUE to, VALUE step, int excl) {
+num_interval_step_size(VALUE from, VALUE to, VALUE step, int excl)
+{
if (FIXNUM_P(from) && FIXNUM_P(to) && FIXNUM_P(step)) {
long delta, diff, result;
@@ -1796,7 +1798,8 @@ num_interval_step_size(VALUE from, VALUE to, VALUE step, int excl) {
}
static VALUE
-num_step_size(VALUE from, VALUE args) {
+num_step_size(VALUE from, VALUE args)
+{
VALUE to = RARRAY_PTR(args)[0];
VALUE step = (RARRAY_LEN(args) > 1) ? RARRAY_PTR(args)[1] : INT2FIX(1);
return num_interval_step_size(from, to, step, FALSE);
@@ -3381,7 +3384,8 @@ fix_size(VALUE fix)
}
static VALUE
-int_upto_size(VALUE from, VALUE args) {
+int_upto_size(VALUE from, VALUE args)
+{
return num_interval_step_size(from, RARRAY_PTR(args)[0], INT2FIX(1), FALSE);
}
@@ -3427,7 +3431,8 @@ int_upto(VALUE from, VALUE to)
}
static VALUE
-int_downto_size(VALUE from, VALUE args) {
+int_downto_size(VALUE from, VALUE args)
+{
return num_interval_step_size(from, RARRAY_PTR(args)[0], INT2FIX(-1), FALSE);
}
diff --git a/vm_eval.c b/vm_eval.c
index 8536282ebf..775539a97d 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -921,7 +921,8 @@ loop_i(void)
}
static VALUE
-rb_f_loop_size(VALUE self, VALUE args) {
+rb_f_loop_size(VALUE self, VALUE args)
+{
return DBL2NUM(INFINITY);
}
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index b32234cbf4..554aad47b1 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -1409,7 +1409,8 @@ call_cfunc_15(VALUE (*func)(ANYARGS), const rb_call_info_t *ci, const VALUE *arg
static int vm_profile_counter[4];
#define VM_PROFILE_UP(x) (vm_profile_counter[x]++)
#define VM_PROFILE_ATEXIT() atexit(vm_profile_show_result)
-static void vm_profile_show_result(void) {
+static void vm_profile_show_result(void)
+{
fprintf(stderr, "VM Profile results: \n");
fprintf(stderr, "r->c call: %d\n", vm_profile_counter[0]);
fprintf(stderr, "r->c popf: %d\n", vm_profile_counter[1]);