diff options
-rw-r--r-- | eval.c | 3 | ||||
-rw-r--r-- | load.c | 5 | ||||
-rw-r--r-- | numeric.c | 8 | ||||
-rw-r--r-- | object.c | 4 | ||||
-rw-r--r-- | thread.c | 24 |
5 files changed, 20 insertions, 24 deletions
@@ -521,8 +521,7 @@ obj_respond_to(int argc, VALUE *argv, VALUE obj) */ static VALUE -rb_mod_method_defined(mod, mid) - VALUE mod, mid; +rb_mod_method_defined(VALUE mod, VALUE mid) { return rb_method_boundp(mod, rb_to_id(mid), 1); } @@ -310,11 +310,8 @@ rb_load_protect(VALUE fname, int wrap, int *state) * file be propagated to the loading environment. */ - static VALUE -rb_f_load(argc, argv) - int argc; - VALUE *argv; +rb_f_load(int argc, VALUE *argv) { VALUE fname, wrap; @@ -2081,6 +2081,10 @@ fix_minus(VALUE x, VALUE y) } } +#define SQRT_LONG_MAX ((SIGNED_VALUE)1<<((SIZEOF_LONG*CHAR_BIT-1)/2)) +/*tests if N*N would overflow*/ +#define FIT_SQRT_LONG(n) (((n)<SQRT_LONG_MAX)&&((n)>=-SQRT_LONG_MAX)) + /* * call-seq: * fix * numeric => numeric_result @@ -2090,10 +2094,6 @@ fix_minus(VALUE x, VALUE y) * result. */ -#define SQRT_LONG_MAX ((SIGNED_VALUE)1<<((SIZEOF_LONG*CHAR_BIT-1)/2)) -/*tests if N*N would overflow*/ -#define FIT_SQRT_LONG(n) (((n)<SQRT_LONG_MAX)&&((n)>=-SQRT_LONG_MAX)) - static VALUE fix_mul(VALUE x, VALUE y) { @@ -1312,11 +1312,11 @@ rb_class_s_alloc(VALUE klass) * a.meth2 #=> "bye" */ -extern VALUE rb_mod_module_exec(int argc, VALUE *argv, VALUE mod); - static VALUE rb_mod_initialize(VALUE module) { + extern VALUE rb_mod_module_exec(int argc, VALUE *argv, VALUE mod); + if (rb_block_given_p()) { rb_mod_module_exec(1, &module, module); } @@ -393,16 +393,6 @@ thread_create_core(VALUE thval, VALUE args, VALUE (*fn)(ANYARGS)) return thval; } -/* - * call-seq: - * Thread.start([args]*) {|args| block } => thread - * Thread.fork([args]*) {|args| block } => thread - * - * Basically the same as <code>Thread::new</code>. However, if class - * <code>Thread</code> is subclassed, then calling <code>start</code> in that - * subclass will not invoke the subclass's <code>initialize</code> method. - */ - static VALUE thread_s_new(int argc, VALUE *argv, VALUE klass) { @@ -417,6 +407,16 @@ thread_s_new(int argc, VALUE *argv, VALUE klass) return thread; } +/* + * call-seq: + * Thread.start([args]*) {|args| block } => thread + * Thread.fork([args]*) {|args| block } => thread + * + * Basically the same as <code>Thread::new</code>. However, if class + * <code>Thread</code> is subclassed, then calling <code>start</code> in that + * subclass will not invoke the subclass's <code>initialize</code> method. + */ + static VALUE thread_start(VALUE klass, VALUE args) { @@ -2799,6 +2799,8 @@ rb_clear_trace_func(void) rb_remove_event_hook(0); } +static void call_trace_func(rb_event_flag_t, VALUE data, VALUE self, ID id, VALUE klass); + /* * call-seq: * set_trace_func(proc) => proc @@ -2842,8 +2844,6 @@ rb_clear_trace_func(void) * return prog.rb:4 test Test */ -static void call_trace_func(rb_event_flag_t, VALUE data, VALUE self, ID id, VALUE klass); - static VALUE set_trace_func(VALUE obj, VALUE trace) { |