* variable.c (rb_const_get_0): Object should have been the lowest

  in const lookup precedence.  [ruby-dev:28343]


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

1 files changed, 10 insertions, 10 deletions

diff --git a/variable.c b/variable.c
index a559a5e23d..7bd55eb0db 100644
--- a/variable.c
+++ b/variable.c
@@ -1302,16 +1302,16 @@ rb_const_get_0(VALUE klass, ID id, int exclude, int recurse, NODE *fallback)
 	}
     }
     if (recurse) {
-	if (!n_retry) {
-	    n_retry = 1;
-	    tmp = rb_cObject;
-	    goto retry;
-	}
 	if (fallback) {
 	    tmp = fallback->nd_clss;
 	    fallback = fallback->nd_next;
 	    goto retry;
 	}
+	if (!n_retry) {
+	    n_retry = 1;
+	    tmp = rb_cObject;
+	    goto retry;
+	}
     }
     return const_missing(klass, id);
 }
@@ -1469,16 +1469,16 @@ rb_const_defined_0(VALUE klass, ID id, int exclude, int recurse, NODE* fallback)
 	tmp = RCLASS(tmp)->super;
     }
     if (recurse) {
-	if (!n_retry) {
-	    n_retry = 1;
-	    tmp = rb_cObject;
-	    goto retry;
-	}
 	if (fallback) {
 	    tmp = fallback->nd_clss;
 	    fallback = fallback->nd_next;
 	    goto retry;
 	}
+	if (!n_retry) {
+	    n_retry = 1;
+	    tmp = rb_cObject;
+	    goto retry;
+	}
     }
     return Qfalse;
 }