* object.c (rb_mod_const_get): Fix constant missing exception class

  and message to maintain backwards compatibility. Constant search
  should start at Object when constant starts with '::'

* test/ruby/test_module.rb: test for fixes

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

1 files changed, 17 insertions, 1 deletions

diff --git a/object.c b/object.c
index 1b020beaa3..89706dd9e7 100644
--- a/object.c
+++ b/object.c
@@ -1935,12 +1935,28 @@ rb_mod_const_get(int argc, VALUE *argv, VALUE mod)
     }
 
     pbeg = p = path;
+
+    if (!*p) {
+	rb_raise(rb_eNameError, "wrong constant name %s", path);
+    }
+
+    if (p[0] == ':' && p[1] == ':') {
+	mod = rb_cObject;
+	p += 2;
+	pbeg = p;
+    }
+
     while (*p) {
 	while (*p && *p != ':') p++;
+
+	if (pbeg == p) {
+	    rb_raise(rb_eNameError, "wrong constant name %s", path);
+	}
+
 	id = rb_intern3(pbeg, p-pbeg, enc);
 	if (p[0] == ':') {
 	    if (p[1] != ':') {
-              rb_raise(rb_eArgError, "undefined class/module %.*s", (int)(p-path), path);
+		rb_raise(rb_eNameError, "wrong constant name %s", path);
             }
 	    p += 2;
 	    pbeg = p;