mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
ffe1cf575e
creating brand new exception object of the receiver. * eval.c (rb_eval_string_wrap): extend new ruby_top_self, not original self. * eval.c (rb_eval_cmd): respect ruby_wrapper if set. * eval.c (eval): do not update ruby_class unless scope is not provided. * eval.c (eval): preserve wrapper information. * eval.c (proc_invoke): ditto. * eval.c (block_pass): ditto. * parse.y (void_expr): too much warnings for void context (e.g. foo[1] that can be mere Proc call). * error.c (rb_name_error): new function to raise NameError with name attribute set. * eval.c (rb_f_missing): set name and args in the exception object. [new] * error.c (name_name): NameError#name - new method. * error.c (nometh_args): NoMethodError#args - new method. * lex.c (rb_reserved_word): lex_state after tRESCUE should be EXPR_MID. * gc.c (add_heap): allocation size of the heap unit is doubled for each allocation. * dir.c (isdelim): space, tab, and newline are no longer delimiters for glob patterns. * eval.c (svalue_to_avalue): new conversion scheme between single value and array values. * eval.c (avalue_to_svalue): ditto. * eval.c (rb_eval): REXPAND now uses avalue_to_svalue(), return and yield too. * eval.c (rb_yield_0): use avalue_to_svalue(). * eval.c (proc_invoke): Proc#call gives avaules, whereas Proc#yield gives mvalues. * eval.c (bmcall): convert given value (svalue) to avalue. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1555 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
118 lines
2 KiB
C
118 lines
2 KiB
C
/**********************************************************************
|
|
|
|
compar.c -
|
|
|
|
$Author$
|
|
$Date$
|
|
created at: Thu Aug 26 14:39:48 JST 1993
|
|
|
|
Copyright (C) 1993-2001 Yukihiro Matsumoto
|
|
|
|
**********************************************************************/
|
|
|
|
#include "ruby.h"
|
|
|
|
VALUE rb_mComparable;
|
|
|
|
static ID cmp;
|
|
|
|
static VALUE
|
|
cmp_eq(a)
|
|
VALUE *a;
|
|
{
|
|
VALUE c = rb_funcall(a[0], cmp, 1, a[1]);
|
|
int t = NUM2INT(c);
|
|
|
|
if (t == 0) return Qtrue;
|
|
return Qfalse;
|
|
}
|
|
|
|
static VALUE
|
|
cmp_failed()
|
|
{
|
|
return Qfalse;
|
|
}
|
|
|
|
static VALUE
|
|
cmp_equal(x, y)
|
|
VALUE x, y;
|
|
{
|
|
VALUE a[2];
|
|
|
|
if (x == y) return Qtrue;
|
|
|
|
a[0] = x; a[1] = y;
|
|
return rb_rescue(cmp_eq, (VALUE)a, cmp_failed, 0);
|
|
}
|
|
|
|
static VALUE
|
|
cmp_gt(x, y)
|
|
VALUE x, y;
|
|
{
|
|
VALUE c = rb_funcall(x, cmp, 1, y);
|
|
int t = NUM2INT(c);
|
|
|
|
if (t > 0) return Qtrue;
|
|
return Qfalse;
|
|
}
|
|
|
|
static VALUE
|
|
cmp_ge(x, y)
|
|
VALUE x, y;
|
|
{
|
|
VALUE c = rb_funcall(x, cmp, 1, y);
|
|
int t = NUM2INT(c);
|
|
|
|
if (t >= 0) return Qtrue;
|
|
return Qfalse;
|
|
}
|
|
|
|
static VALUE
|
|
cmp_lt(x, y)
|
|
VALUE x, y;
|
|
{
|
|
VALUE c = rb_funcall(x, cmp, 1, y);
|
|
int t = NUM2INT(c);
|
|
|
|
if (t < 0) return Qtrue;
|
|
return Qfalse;
|
|
}
|
|
|
|
static VALUE
|
|
cmp_le(x, y)
|
|
VALUE x, y;
|
|
{
|
|
VALUE c = rb_funcall(x, cmp, 1, y);
|
|
int t = NUM2INT(c);
|
|
|
|
if (t <= 0) return Qtrue;
|
|
return Qfalse;
|
|
}
|
|
|
|
static VALUE
|
|
cmp_between(x, min, max)
|
|
VALUE x, min, max;
|
|
{
|
|
VALUE c = rb_funcall(x, cmp, 1, min);
|
|
long t = NUM2LONG(c);
|
|
if (t < 0) return Qfalse;
|
|
|
|
c = rb_funcall(x, cmp, 1, max);
|
|
t = NUM2LONG(c);
|
|
if (t > 0) return Qfalse;
|
|
return Qtrue;
|
|
}
|
|
|
|
void
|
|
Init_Comparable()
|
|
{
|
|
rb_mComparable = rb_define_module("Comparable");
|
|
rb_define_method(rb_mComparable, "==", cmp_equal, 1);
|
|
rb_define_method(rb_mComparable, ">", cmp_gt, 1);
|
|
rb_define_method(rb_mComparable, ">=", cmp_ge, 1);
|
|
rb_define_method(rb_mComparable, "<", cmp_lt, 1);
|
|
rb_define_method(rb_mComparable, "<=", cmp_le, 1);
|
|
rb_define_method(rb_mComparable, "between?", cmp_between, 2);
|
|
|
|
cmp = rb_intern("<=>");
|
|
}
|