diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | eval.c | 42 | ||||
-rw-r--r-- | gc.c | 17 | ||||
-rw-r--r-- | io.c | 2 | ||||
-rw-r--r-- | parse.y | 7 | ||||
-rw-r--r-- | signal.c | 11 | ||||
-rw-r--r-- | version.h | 8 |
7 files changed, 55 insertions, 39 deletions
@@ -1,3 +1,10 @@ +Sun Jun 29 16:49:11 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * eval.c (search_method, remove_method, error_print, rb_alias) + (rb_eval, rb_rescue2, search_required, Init_eval, rb_thread_create), + gc.c (rb_source_filename, Init_stack), io.c (rb_io_getline), + parse.y (rb_id2name, rb_parser_free): suppress warnings. + Sat Jun 28 19:26:43 2008 URABE Shyouhei <shyouhei@ruby-lang.org> * class.c (clone_method): use rb_copy_node_scope. @@ -470,16 +470,16 @@ search_method(klass, id, origin) VALUE klass, *origin; ID id; { - NODE *body; + st_data_t body; if (!klass) return 0; - while (!st_lookup(RCLASS(klass)->m_tbl, id, (st_data_t *)&body)) { + while (!st_lookup(RCLASS(klass)->m_tbl, id, &body)) { klass = RCLASS(klass)->super; if (!klass) return 0; } if (origin) *origin = klass; - return body; + return (NODE *)body; } static NODE* @@ -558,7 +558,8 @@ remove_method(klass, mid) VALUE klass; ID mid; { - NODE *body; + st_data_t data; + NODE *body = 0; if (klass == rb_cObject) { rb_secure(4); @@ -570,10 +571,11 @@ remove_method(klass, mid) if (mid == __id__ || mid == __send__ || mid == init) { rb_warn("removing `%s' may cause serious problem", rb_id2name(mid)); } - if (st_lookup(RCLASS(klass)->m_tbl, mid, (st_data_t *)&body)) { + if (st_lookup(RCLASS(klass)->m_tbl, mid, &data)) { + body = (NODE *)data; if (!body || !body->nd_body) body = 0; else { - st_delete(RCLASS(klass)->m_tbl, &mid, (st_data_t *)&body); + st_delete(RCLASS(klass)->m_tbl, &mid, &data); } } if (!body) { @@ -1288,7 +1290,7 @@ error_print() long len = elen; if (RSTRING(epath)->ptr[0] == '#') epath = 0; - if (tail = memchr(einfo, '\n', elen)) { + if ((tail = memchr(einfo, '\n', elen)) != 0) { len = tail - einfo; tail++; /* skip newline */ } @@ -2163,6 +2165,7 @@ rb_alias(klass, name, def) VALUE origin; NODE *orig, *body, *node; VALUE singleton = 0; + st_data_t data; rb_frozen_class_p(klass); if (name == def) return; @@ -2190,7 +2193,8 @@ rb_alias(klass, name, def) } rb_clear_cache_by_id(name); - if (RTEST(ruby_verbose) && st_lookup(RCLASS(klass)->m_tbl, name, (st_data_t *)&node)) { + if (RTEST(ruby_verbose) && st_lookup(RCLASS(klass)->m_tbl, name, &data)) { + node = (NODE *)data; if (node->nd_cnt == 0 && node->nd_body) { rb_warning("discarding old %s", rb_id2name(name)); } @@ -2941,6 +2945,7 @@ rb_eval(self, n) NODE * volatile node = n; int state; volatile VALUE result = Qnil; + st_data_t data; #define RETURN(v) do { \ result = (v); \ @@ -3976,7 +3981,8 @@ rb_eval(self, n) if (OBJ_FROZEN(recv)) rb_error_frozen("object"); klass = rb_singleton_class(recv); - if (st_lookup(RCLASS(klass)->m_tbl, node->nd_mid, (st_data_t *)&body)) { + if (st_lookup(RCLASS(klass)->m_tbl, node->nd_mid, &data)) { + body = (NODE *)data; if (ruby_safe_level >= 4) { rb_raise(rb_eSecurityError, "redefining method prohibited"); } @@ -5423,7 +5429,7 @@ rb_rescue2(b_proc, data1, r_proc, data2, va_alist) if (handle) break; handle = Qfalse; va_init_list(args, data2); - while (eclass = va_arg(args, VALUE)) { + while ((eclass = va_arg(args, VALUE)) != 0) { if (rb_obj_is_kind_of(ruby_errinfo, eclass)) { handle = Qtrue; break; @@ -7182,7 +7188,7 @@ search_required(fname, featurep, path) #else rb_str_cat2(tmp, DLEXT); OBJ_FREEZE(tmp); - if (*path = rb_find_file(tmp)) { + if ((*path = rb_find_file(tmp)) != 0) { return 's'; } #endif @@ -8003,11 +8009,11 @@ Init_eval() __id__ = rb_intern("__id__"); __send__ = rb_intern("__send__"); - rb_global_variable((VALUE*)&top_scope); - rb_global_variable((VALUE*)&ruby_eval_tree_begin); + rb_global_variable((void *)&top_scope); + rb_global_variable((void *)&ruby_eval_tree_begin); - rb_global_variable((VALUE*)&ruby_eval_tree); - rb_global_variable((VALUE*)&ruby_dyna_vars); + rb_global_variable((void *)&ruby_eval_tree); + rb_global_variable((void *)&ruby_dyna_vars); rb_define_virtual_variable("$@", errat_getter, errat_setter); rb_define_hooked_variable("$!", &ruby_errinfo, 0, errinfo_setter); @@ -8020,7 +8026,7 @@ Init_eval() rb_define_method(rb_mKernel, "respond_to?", obj_respond_to, -1); respond_to = rb_intern("respond_to?"); - rb_global_variable((VALUE*)&basic_respond_to); + rb_global_variable((void *)&basic_respond_to); basic_respond_to = rb_method_node(rb_cObject, respond_to); rb_define_global_function("raise", rb_f_raise, -1); @@ -11795,7 +11801,7 @@ rb_thread_alloc(klass) return th; } -static int thread_init = 0; +static int thread_init; #if defined(_THREAD_SAFE) static void @@ -12052,7 +12058,7 @@ rb_thread_create(fn, arg) VALUE (*fn)(); void *arg; { - Init_stack((VALUE*)&arg); + Init_stack((void *)&arg); return rb_thread_start_0(fn, arg, rb_thread_alloc(rb_cThread)); } @@ -525,17 +525,18 @@ char * rb_source_filename(f) const char *f; { - char *name; + st_data_t name; - if (!st_lookup(source_filenames, (st_data_t)f, (st_data_t *)&name)) { + if (!st_lookup(source_filenames, (st_data_t)f, &name)) { long len = strlen(f) + 1; - char *ptr = name = ALLOC_N(char, len + 1); + char *ptr = ALLOC_N(char, len + 1); + name = (st_data_t)ptr; *ptr++ = 0; MEMCPY(ptr, f, char, len); - st_add_direct(source_filenames, (st_data_t)ptr, (st_data_t)name); + st_add_direct(source_filenames, (st_data_t)ptr, name); return ptr; } - return name + 1; + return (char *)name + 1; } static void @@ -1255,7 +1256,7 @@ obj_free(obj) if (RANY(obj)->as.scope.local_vars && RANY(obj)->as.scope.flags != SCOPE_ALLOCA) { VALUE *vars = RANY(obj)->as.scope.local_vars-1; - if (!(RANY(obj)->as.scope.flags & SCOPE_CLONE) && vars[0] == 0) + if (!(RANY(obj)->as.scope.flags & SCOPE_CLONE) && vars[0] == 0) RUBY_CRITICAL(free(RANY(obj)->as.scope.local_tbl)); if (RANY(obj)->as.scope.flags & SCOPE_MALLOC) RUBY_CRITICAL(free(vars)); @@ -1490,7 +1491,7 @@ Init_stack(addr) rb_gc_stack_start = STACK_END_ADDRESS; } #else - if (!addr) addr = (VALUE *)&addr; + if (!addr) addr = (void *)&addr; STACK_UPPER(&addr, addr, ++addr); if (rb_gc_stack_start) { if (STACK_UPPER(&addr, @@ -1613,7 +1614,7 @@ os_obj_of(of) p = heaps[i].slot; pend = p + heaps[i].limit; for (;p < pend; p++) { if (p->as.basic.flags) { - switch (TYPE(p)) { + switch (BUILTIN_TYPE(p)) { case T_NONE: case T_ICLASS: case T_VARMAP: @@ -1723,7 +1723,7 @@ rb_io_getline(rs, io) while ((c = appendline(fptr, newline, &str)) != EOF && (c != newline || RSTRING(str)->len < rslen || - (rspara || rscheck(rsptr,rslen,rs), 0) || + ((rspara || rscheck(rsptr,rslen,rs)) && 0) || memcmp(RSTRING(str)->ptr+RSTRING(str)->len-rslen,rsptr,rslen))); if (rspara) { @@ -6130,6 +6130,7 @@ rb_id2name(id) ID id; { char *name; + st_data_t data; if (id < tLAST_TOKEN) { int i; @@ -6140,8 +6141,8 @@ rb_id2name(id) } } - if (st_lookup(sym_rev_tbl, id, (st_data_t *)&name)) - return name; + if (st_lookup(sym_rev_tbl, id, &data)) + return (char *)data; if (is_attrset_id(id)) { ID id2 = (id & ~ID_SCOPE_MASK) | ID_LOCAL; @@ -6354,7 +6355,7 @@ rb_parser_free(ptr) { NODE **prev = &parser_heap, *n; - while (n = *prev) { + while ((n = *prev) != 0) { if (n->u1.node == ptr) { *prev = n->u2.node; rb_gc_force_recycle((VALUE)n); @@ -569,16 +569,17 @@ sighandler(sig) #if defined(HAVE_NATIVETHREAD) && defined(HAVE_NATIVETHREAD_KILL) if (!is_ruby_native_thread() && !rb_trap_accept_nativethreads[sig]) { - sigsend_to_ruby_thread(sig); - return; + sigsend_to_ruby_thread(sig); + return; } #endif #if !defined(BSD_SIGNAL) && !defined(POSIX_SIGNAL) if (rb_trap_accept_nativethreads[sig]) { - ruby_nativethread_signal(sig, sighandler); - } else { - ruby_signal(sig, sighandler); + ruby_nativethread_signal(sig, sighandler); + } + else { + ruby_signal(sig, sighandler); } #endif @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2008-06-28" +#define RUBY_RELEASE_DATE "2008-06-29" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20080628 -#define RUBY_PATCHLEVEL 238 +#define RUBY_RELEASE_CODE 20080629 +#define RUBY_PATCHLEVEL 239 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 28 +#define RUBY_RELEASE_DAY 29 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |