* eval.c (error_line): remove void control path. [ruby-dev:28335]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9940 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
7d863d5c97
commit
a95a1eff20
@ -1,3 +1,7 @@
|
|||||||
|
Wed Feb 15 15:20:23 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
|
|
||||||
|
* eval.c (error_line): remove void control path. [ruby-dev:28335]
|
||||||
|
|
||||||
Wed Feb 15 10:09:51 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
|
Wed Feb 15 10:09:51 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
|
|
||||||
* eval.c (yield_under_i): should not pass self as an argument to
|
* eval.c (yield_under_i): should not pass self as an argument to
|
||||||
|
9
eval.c
9
eval.c
@ -1127,10 +1127,8 @@ error_line(struct FRAME *frame, NODE *node)
|
|||||||
else if (!node && ruby_sourceline == 0) {
|
else if (!node && ruby_sourceline == 0) {
|
||||||
return rb_str_new2(ruby_sourcefile);
|
return rb_str_new2(ruby_sourcefile);
|
||||||
}
|
}
|
||||||
else {
|
}
|
||||||
return rb_sprintf("%s:%d", file, line);
|
return rb_sprintf("%s:%d", file, line);
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#define warn_print(x) rb_write_error(x)
|
#define warn_print(x) rb_write_error(x)
|
||||||
@ -6463,7 +6461,8 @@ static VALUE
|
|||||||
yield_under_i(VALUE arg)
|
yield_under_i(VALUE arg)
|
||||||
{
|
{
|
||||||
VALUE *args = (VALUE *)arg;
|
VALUE *args = (VALUE *)arg;
|
||||||
VALUE avalue = Qtrue;
|
int avalue = Qtrue;
|
||||||
|
|
||||||
if (args[0] == Qundef) {
|
if (args[0] == Qundef) {
|
||||||
avalue = Qfalse;
|
avalue = Qfalse;
|
||||||
}
|
}
|
||||||
@ -6577,7 +6576,7 @@ rb_obj_instance_exec(int argc, VALUE *argv, VALUE self)
|
|||||||
{
|
{
|
||||||
VALUE klass;
|
VALUE klass;
|
||||||
|
|
||||||
if (FIXNUM_P(self) || SYMBOL_P(self)) {
|
if (SPECIAL_CONST_P(self)) {
|
||||||
klass = Qnil;
|
klass = Qnil;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user