ruby-changes:6116
From: shyouhei <ko1@a...>
Date: Sat, 28 Jun 2008 19:26:31 +0900 (JST)
Subject: [ruby-changes:6116] Ruby:r17628 (ruby_1_8_6): merge revision(s) 16536:
shyouhei 2008-06-28 19:26:12 +0900 (Sat, 28 Jun 2008)
New Revision: 17628
Modified files:
branches/ruby_1_8_6/ChangeLog
branches/ruby_1_8_6/eval.c
branches/ruby_1_8_6/node.h
branches/ruby_1_8_6/version.h
Log:
merge revision(s) 16536:
* eval.c (rb_copy_node_scope), node.h: Rename from copy_node_scope
and export.
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=17628&r2=17627&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=17628&r2=17627&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/node.h?r1=17628&r2=17627&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/eval.c?r1=17628&r2=17627&diff_format=u
Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog (revision 17627)
+++ ruby_1_8_6/ChangeLog (revision 17628)
@@ -1,3 +1,8 @@
+Sat Jun 28 19:25:56 2008 Akinori MUSHA <knu@i...>
+
+ * 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@i...>
* ext/zlib/zlib.c (rb_deflate_initialize, Init_zlib): Fix up
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h (revision 17627)
+++ ruby_1_8_6/version.h (revision 17628)
@@ -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[];
Index: ruby_1_8_6/eval.c
===================================================================
--- ruby_1_8_6/eval.c (revision 17627)
+++ ruby_1_8_6/eval.c (revision 17628)
@@ -2239,8 +2239,8 @@
return mod;
}
-static NODE*
-copy_node_scope(node, rval)
+NODE *
+rb_copy_node_scope(node, rval)
NODE *node;
NODE *rval;
{
@@ -3948,7 +3948,7 @@
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_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;
Index: ruby_1_8_6/node.h
===================================================================
--- ruby_1_8_6/node.h (revision 17627)
+++ ruby_1_8_6/node.h (revision 17628)
@@ -371,6 +371,7 @@
#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));
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/