Revert r34538.

* backport 33935,33936,33987 (fix private constant)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34549 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 4 insertions, 52 deletions

diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb
index cffc32221a..3258259cf7 100644
--- a/test/ruby/test_module.rb
+++ b/test/ruby/test_module.rb
@@ -1019,19 +1019,6 @@ class TestModule < Test::Unit::TestCase
     assert_raise(NameError) { c::FOO }
   end
 
-  def test_private_constant2
-    c = Class.new
-    c.const_set(:FOO, "foo")
-    c.const_set(:BAR, "bar")
-    assert_equal("foo", c::FOO)
-    assert_equal("bar", c::BAR)
-    c.private_constant(:FOO, :BAR)
-    assert_raise(NameError) { c::FOO }
-    assert_raise(NameError) { c::BAR }
-    assert_equal("foo", c.class_eval("FOO"))
-    assert_equal("bar", c.class_eval("BAR"))
-  end
-
   class PrivateClass
   end
   private_constant :PrivateClass
@@ -1079,27 +1066,6 @@ class TestModule < Test::Unit::TestCase
     assert_in_out_err([], src, %w(Object :ok), [])
   end
 
-  def test_private_constants_clear_inlinecache
-    bug5702 = '[ruby-dev:44929]'
-    src = <<-INPUT
-    class A
-      C = :Const
-      def self.get_C
-        A::C
-      end
-      # fill cache
-      A.get_C
-      private_constant :C, :D rescue nil
-      begin
-        A.get_C
-      rescue NameError
-        puts "A.get_C"
-      end
-    end
-    INPUT
-    assert_in_out_err([], src, %w(A.get_C), [], bug5702)
-  end
-
   def test_constant_lookup_in_method_defined_by_class_eval
     src = <<-INPUT
       class A
diff --git a/variable.c b/variable.c
index 03bc6b95d6..ed6f3debd9 100644
--- a/variable.c
+++ b/variable.c
@@ -1952,22 +1952,13 @@ set_const_visibility(VALUE mod, int argc, VALUE *argv, rb_const_flag_t flag)
 		 "Insecure: can't change constant visibility");
     }
 
-    if (argc == 0) {
-	rb_warning("%s with no argument is just ignored", rb_id2name(rb_frame_callee()));
-    }
-
     for (i = 0; i < argc; i++) {
-	VALUE val = argv[i];
-	id = rb_to_id(&val);
-	if (RCLASS_CONST_TBL(mod) &&
-	    st_lookup(RCLASS_CONST_TBL(mod), (st_data_t)id, &v)) {
+	id = rb_to_id(argv[i]);
+	if (RCLASS_CONST_TBL(mod) && st_lookup(RCLASS_CONST_TBL(mod), (st_data_t)id, &v)) {
 	    ((rb_const_entry_t*)v)->flag = flag;
+	    return;
 	}
-	else {
-	    if ( i > 0 )
-		rb_clear_cache_by_class(mod);
-	    rb_name_error(id, "constant %s::%s not defined", rb_class2name(mod), rb_id2name(id));
-	}
+	rb_name_error(id, "constant %s::%s not defined", rb_class2name(mod), rb_id2name(id));
     }
     rb_clear_cache_by_class(mod);
 }
diff --git a/vm_method.c b/vm_method.c
index 086046aa0b..239b3887cb 100644
--- a/vm_method.c
+++ b/vm_method.c
@@ -961,11 +961,6 @@ set_method_visibility(VALUE self, int argc, VALUE *argv, rb_method_flag_t ex)
 {
     int i;
     secure_visibility(self);
-
-    if (argc == 0) {
-	rb_warning("%s with no argument is just ignored", rb_id2name(rb_frame_callee()));
-    }
-
     for (i = 0; i < argc; i++) {
 	rb_export_method(self, rb_to_id(argv[i]), ex);
     }