From c36f4b164bdf47046804103a403bec800aceac88 Mon Sep 17 00:00:00 2001
From: knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 25 Mar 2010 18:59:19 +0000
Subject: [PATCH] * variable.c, intern.h: Add rb_const_remove().

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@27051 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog  |  4 ++++
 intern.h   |  1 +
 variable.c | 13 +++++++++++--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9534125b31..7a31c7dad6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Mar 26 03:58:37 2010  Akinori MUSHA  <knu@iDaemons.org>
+
+	* variable.c, intern.h: Add rb_const_remove().
+
 Fri Mar 26 03:09:30 2010  Akinori MUSHA  <knu@iDaemons.org>
 
 	* object.c (rb_obj_singleton_class): new method
diff --git a/intern.h b/intern.h
index 22d58fe125..d2268c0123 100644
--- a/intern.h
+++ b/intern.h
@@ -521,6 +521,7 @@ VALUE rb_const_get _((VALUE, ID));
 VALUE rb_const_get_at _((VALUE, ID));
 VALUE rb_const_get_from _((VALUE, ID));
 void rb_const_set _((VALUE, ID, VALUE));
+VALUE rb_const_remove _((VALUE, ID));
 VALUE rb_mod_constants _((VALUE));
 VALUE rb_mod_const_missing _((VALUE,VALUE));
 VALUE rb_cvar_defined _((VALUE, ID));
diff --git a/variable.c b/variable.c
index d39335e7e1..eb245377ae 100644
--- a/variable.c
+++ b/variable.c
@@ -1479,12 +1479,21 @@ rb_mod_remove_const(mod, name)
     VALUE mod, name;
 {
     const ID id = rb_to_id(name);
-    VALUE val;
-    st_data_t v, n = id;
 
     if (!rb_is_const_id(id)) {
 	rb_name_error(id, "`%s' is not allowed as a constant name", rb_id2name(id));
     }
+    return rb_const_remove(mod, id);
+}
+
+VALUE
+rb_const_remove(mod, id)
+    VALUE mod;
+    ID id;
+{
+    VALUE val;
+    st_data_t v, n = id;
+
     if (!OBJ_TAINTED(mod) && rb_safe_level() >= 4)
 	rb_raise(rb_eSecurityError, "Insecure: can't remove constant");
     if (OBJ_FROZEN(mod)) rb_error_frozen("class/module");