mirror of
https://github.com/ruby/ruby.git
synced 2026-10-29 00:46:26 +08:00
Ernie Miller
9aca729140
In certain cases, things like Array#sort can result in a confusing error
message. For instance where a and b are characters in a string,
`"string"`:
```ruby
array.sort { |a, b| string.index(a) <=> string.index(b) }
```
If one of the index calls returns nil, we will get "comparison of String
with String failed", which is somewhat unhelpful, since it's easy to be
confused, given that what is really being compared is a Fixnum or
NilClass (the cause of the error). Yes, as far as Array#sort is
concerned, the two characters are the things being sorted, but it's
useful to call attention to the return value of the comparison in this
case.
This patch adds a "reason" argument to rb_cmperr, which will provide an
error message of "comparison of String with String failed: comparator
returned nil" in the case above, or, in the case of:
```ruby
1.upto('10').to_a
```
it will provide the message: "comparison of Fixnum with String failed:
coercion was not possible"
31 lines
1.3 KiB
C
31 lines
1.3 KiB
C
#ifndef INTERNAL_COMPAR_H /*-*-C-*-vi:se ft=c:*/
|
|
#define INTERNAL_COMPAR_H
|
|
/**
|
|
* @author Ruby developers <ruby-core@ruby-lang.org>
|
|
* @copyright This file is a part of the programming language Ruby.
|
|
* Permission is hereby granted, to either redistribute and/or
|
|
* modify this file, provided that the conditions mentioned in the
|
|
* file COPYING are met. Consult the file for details.
|
|
* @brief Internal header for Comparable.
|
|
*/
|
|
#include "internal/basic_operators.h"
|
|
|
|
#define STRING_P(s) (RB_TYPE_P((s), T_STRING) && CLASS_OF(s) == rb_cString)
|
|
|
|
#define CMP_OPTIMIZABLE(type) BASIC_OP_UNREDEFINED_P(BOP_CMP, type##_REDEFINED_OP_FLAG)
|
|
|
|
#define OPTIMIZED_CMP(a, b) \
|
|
((FIXNUM_P(a) && FIXNUM_P(b) && CMP_OPTIMIZABLE(INTEGER)) ? \
|
|
(((long)a > (long)b) ? 1 : ((long)a < (long)b) ? -1 : 0) : \
|
|
(STRING_P(a) && STRING_P(b) && CMP_OPTIMIZABLE(STRING)) ? \
|
|
rb_str_cmp(a, b) : \
|
|
(RB_FLOAT_TYPE_P(a) && RB_FLOAT_TYPE_P(b) && CMP_OPTIMIZABLE(FLOAT)) ? \
|
|
rb_float_cmp(a, b) : \
|
|
rb_cmpint(rb_funcallv(a, id_cmp, 1, &b), a, b))
|
|
|
|
/* compar.c */
|
|
VALUE rb_invcmp(VALUE, VALUE);
|
|
NORETURN(void rb_cmperr_reason(VALUE, VALUE, const char*));
|
|
|
|
#endif /* INTERNAL_COMPAR_H */
|