summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--addr2line.c6
-rw-r--r--numeric.c4
-rw-r--r--regparse.c3
-rw-r--r--vm_insnhelper.c6
-rw-r--r--vm_method.c3
6 files changed, 16 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index b2ea693..8ce14b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ Thu Mar 15 07:03:52 2012 Eric Hodel <drbrain@segment7.net>
* vm_eval.c (check_funcall): Raise ArgumentError if respond_to?
requires more than three arguments. [Bug #6000]
+
* test/ruby/test_object.rb (class TestObject): Test for respond_to?
requiring more than three arguments.
@@ -153,8 +154,6 @@ Tue Mar 13 12:37:53 2012 NARUSE, Yui <naruse@ruby-lang.org>
Tue Mar 13 12:37:03 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
- Bug #5350
-
* gc.c: add ObjectSpace::WeakMap. [ruby-dev:44565][Bug #5350]
* lib/weakref.rb: use WeakMap instead of _id2ref.
diff --git a/addr2line.c b/addr2line.c
index 961fca8..9c7f9a1 100644
--- a/addr2line.c
+++ b/addr2line.c
@@ -87,7 +87,8 @@ typedef struct {
static char binary_filename[PATH_MAX];
static unsigned long
-uleb128(char **p) {
+uleb128(char **p)
+{
unsigned long r = 0;
int s = 0;
for (;;) {
@@ -103,7 +104,8 @@ uleb128(char **p) {
}
static long
-sleb128(char **p) {
+sleb128(char **p)
+{
long r = 0;
int s = 0;
for (;;) {
diff --git a/numeric.c b/numeric.c
index b118d84..7371236 100644
--- a/numeric.c
+++ b/numeric.c
@@ -843,7 +843,9 @@ flodivmod(double x, double y, double *divp, double *modp)
* An error will be raised if y == 0.
*/
-double ruby_float_mod(double x, double y) {
+double
+ruby_float_mod(double x, double y)
+{
double mod;
flodivmod(x, y, 0, &mod);
return mod;
diff --git a/regparse.c b/regparse.c
index f1e8e4f..f82db81 100644
--- a/regparse.c
+++ b/regparse.c
@@ -5670,7 +5670,8 @@ node_extended_grapheme_cluster(Node** np, ScanEnv* env)
}
static int
-countbits(unsigned int bits) {
+countbits(unsigned int bits)
+{
bits = (bits & 0x55555555) + ((bits >> 1) & 0x55555555);
bits = (bits & 0x33333333) + ((bits >> 2) & 0x33333333);
bits = (bits & 0x0f0f0f0f) + ((bits >> 4) & 0x0f0f0f0f);
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index bcdf0d7..4f24f0f 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -106,7 +106,8 @@ vm_pop_frame(rb_thread_t *th)
/* method dispatch */
static inline VALUE
-rb_arg_error_new(int argc, int min, int max) {
+rb_arg_error_new(int argc, int min, int max)
+{
VALUE err_mess = 0;
if (min == max) {
err_mess = rb_sprintf("wrong number of arguments (%d for %d)", argc, min);
@@ -164,7 +165,8 @@ unknown_keyword_error(const rb_iseq_t *iseq, VALUE hash)
}
void
-rb_error_arity(int argc, int min, int max) {
+rb_error_arity(int argc, int min, int max)
+{
rb_exc_raise(rb_arg_error_new(argc, min, max));
}
diff --git a/vm_method.c b/vm_method.c
index d3e1672..9c49007 100644
--- a/vm_method.c
+++ b/vm_method.c
@@ -941,7 +941,8 @@ rb_hash_method_definition(st_index_t hash, const rb_method_definition_t *def)
}
st_index_t
-rb_hash_method_entry(st_index_t hash, const rb_method_entry_t *me) {
+rb_hash_method_entry(st_index_t hash, const rb_method_entry_t *me)
+{
return rb_hash_method_definition(hash, me->def);
}