mirror of
				https://github.com/ruby/ruby.git
				synced 2022-11-09 12:17:21 -05:00 
			
		
		
		
	* variable.c (rb_const_get_0): should check constants defined in
included modules, if klass is Object. [ruby-talk:79302] * numeric.c (check_uint): check should be done using UINT_MAX, not INT_MAX. this fix is submitted by <lyle@knology.net> in [ruby-core:01486] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4454 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
		
							parent
							
								
									b89299260e
								
							
						
					
					
						commit
						11f521b98e
					
				
					 3 changed files with 24 additions and 22 deletions
				
			
		| 
						 | 
				
			
			@ -1,3 +1,12 @@
 | 
			
		|||
Thu Aug 28 17:30:24 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 | 
			
		||||
 | 
			
		||||
	* variable.c (rb_const_get_0): should check constants defined in
 | 
			
		||||
	  included modules, if klass is Object. [ruby-talk:79302]
 | 
			
		||||
 | 
			
		||||
	* numeric.c (check_uint): check should be done using UINT_MAX, not
 | 
			
		||||
	  INT_MAX. this fix is submitted by <lyle@knology.net> in
 | 
			
		||||
	  [ruby-core:01486]
 | 
			
		||||
 | 
			
		||||
Thu Aug 28 05:02:52 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 | 
			
		||||
 | 
			
		||||
	* parse.y (singleton): typo fixed (ruby-bugs-ja PR#562)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1024,8 +1024,8 @@ static void
 | 
			
		|||
check_uint(num)
 | 
			
		||||
    unsigned long num;
 | 
			
		||||
{
 | 
			
		||||
    if (num > INT_MAX) {
 | 
			
		||||
	rb_raise(rb_eRangeError, "integer %lu too big to convert to `int'", num);
 | 
			
		||||
    if (num > UINT_MAX) {
 | 
			
		||||
	rb_raise(rb_eRangeError, "integer %lu too big to convert to `unsigned int'", num);
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										33
									
								
								variable.c
									
										
									
									
									
								
							
							
						
						
									
										33
									
								
								variable.c
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -1264,28 +1264,12 @@ rb_autoload_p(mod, id)
 | 
			
		|||
    return autoload_file(mod, id);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
VALUE
 | 
			
		||||
rb_const_get_at(klass, id)
 | 
			
		||||
    VALUE klass;
 | 
			
		||||
    ID id;
 | 
			
		||||
{
 | 
			
		||||
    VALUE value;
 | 
			
		||||
 | 
			
		||||
    while (RCLASS(klass)->iv_tbl && st_lookup(RCLASS(klass)->iv_tbl, id, &value)) {
 | 
			
		||||
	if (value == Qundef) {
 | 
			
		||||
	    rb_autoload_load(klass, id);
 | 
			
		||||
	    continue;
 | 
			
		||||
	}
 | 
			
		||||
	return value;
 | 
			
		||||
    }
 | 
			
		||||
    return const_missing(klass, id);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static VALUE
 | 
			
		||||
rb_const_get_0(klass, id, exclude)
 | 
			
		||||
rb_const_get_0(klass, id, exclude, recurse)
 | 
			
		||||
    VALUE klass;
 | 
			
		||||
    ID id;
 | 
			
		||||
    int exclude;
 | 
			
		||||
    int recurse;
 | 
			
		||||
{
 | 
			
		||||
    VALUE value, tmp;
 | 
			
		||||
    int mod_retry = 0;
 | 
			
		||||
| 
						 | 
				
			
			@ -1304,6 +1288,7 @@ rb_const_get_0(klass, id, exclude)
 | 
			
		|||
	    }
 | 
			
		||||
	    return value;
 | 
			
		||||
	}
 | 
			
		||||
	if (!recurse && klass != rb_cObject) break;
 | 
			
		||||
	tmp = RCLASS(tmp)->super;
 | 
			
		||||
    }
 | 
			
		||||
    if (!mod_retry && BUILTIN_TYPE(klass) == T_MODULE) {
 | 
			
		||||
| 
						 | 
				
			
			@ -1320,7 +1305,7 @@ rb_const_get_from(klass, id)
 | 
			
		|||
    VALUE klass;
 | 
			
		||||
    ID id;
 | 
			
		||||
{
 | 
			
		||||
    return rb_const_get_0(klass, id, Qtrue);
 | 
			
		||||
    return rb_const_get_0(klass, id, Qtrue, Qtrue);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
VALUE
 | 
			
		||||
| 
						 | 
				
			
			@ -1328,7 +1313,15 @@ rb_const_get(klass, id)
 | 
			
		|||
    VALUE klass;
 | 
			
		||||
    ID id;
 | 
			
		||||
{
 | 
			
		||||
    return rb_const_get_0(klass, id, Qfalse);
 | 
			
		||||
    return rb_const_get_0(klass, id, Qfalse, Qtrue);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
VALUE
 | 
			
		||||
rb_const_get_at(klass, id)
 | 
			
		||||
    VALUE klass;
 | 
			
		||||
    ID id;
 | 
			
		||||
{
 | 
			
		||||
    return rb_const_get_0(klass, id, Qfalse, Qfalse);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
VALUE
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue