diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-28 10:26:12 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-28 10:26:12 +0000 |
commit | fbf221938785ada708e9a6c981571f3a2b4a9197 (patch) | |
tree | 980632426e42b16adf3d929d8cf732ed2d960c9c | |
parent | dcf3bc392ec73143cb2d8c27703746fda466db89 (diff) |
merge revision(s) 16536:
* eval.c (rb_copy_node_scope), node.h: Rename from copy_node_scope
and export.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17628 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | eval.c | 8 | ||||
-rw-r--r-- | node.h | 1 | ||||
-rw-r--r-- | version.h | 8 |
4 files changed, 14 insertions, 8 deletions
@@ -1,3 +1,8 @@ +Sat Jun 28 19:25:56 2008 Akinori MUSHA <knu@iDaemons.org> + + * eval.c (rb_copy_node_scope), node.h: Rename from copy_node_scope + and export. + Fri Jun 27 17:38:21 2008 Akinori MUSHA <knu@iDaemons.org> * ext/zlib/zlib.c (rb_deflate_initialize, Init_zlib): Fix up @@ -2239,8 +2239,8 @@ rb_mod_alias_method(mod, newname, oldname) return mod; } -static NODE* -copy_node_scope(node, rval) +NODE * +rb_copy_node_scope(node, rval) NODE *node; NODE *rval; { @@ -3948,7 +3948,7 @@ rb_eval(self, n) noex |= NOEX_NOSUPER; } - defn = copy_node_scope(node->nd_defn, ruby_cref); + defn = rb_copy_node_scope(node->nd_defn, ruby_cref); rb_add_method(ruby_class, node->nd_mid, defn, noex); if (scope_vmode == SCOPE_MODFUNC) { rb_add_method(rb_singleton_class(ruby_class), @@ -3984,7 +3984,7 @@ rb_eval(self, n) rb_warning("redefine %s", rb_id2name(node->nd_mid)); } } - defn = copy_node_scope(node->nd_defn, ruby_cref); + defn = rb_copy_node_scope(node->nd_defn, ruby_cref); rb_add_method(klass, node->nd_mid, defn, NOEX_PUBLIC|(body?body->nd_noex&NOEX_UNDEF:0)); result = Qnil; @@ -371,6 +371,7 @@ typedef unsigned int rb_event_t; #define RUBY_EVENT_ALL 0xff typedef void (*rb_event_hook_func_t) _((rb_event_t,NODE*,VALUE,ID,VALUE)); +NODE *rb_copy_node_scope _((NODE *, NODE *)); void rb_add_event_hook _((rb_event_hook_func_t,rb_event_t)); int rb_remove_event_hook _((rb_event_hook_func_t)); @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2008-06-27" +#define RUBY_RELEASE_DATE "2008-06-28" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20080627 -#define RUBY_PATCHLEVEL 236 +#define RUBY_RELEASE_CODE 20080628 +#define RUBY_PATCHLEVEL 237 #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 27 +#define RUBY_RELEASE_DAY 28 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |