diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | array.c | 15 | ||||
-rw-r--r-- | numeric.c | 3 |
3 files changed, 25 insertions, 0 deletions
@@ -1,3 +1,10 @@ +Tue Mar 4 17:54:30 2003 Yukihiro Matsumoto <matz@ruby-lang.org> + + * array.c (rb_ary_aref): give warning if index is a symbol. + [ruby-list:37217] + + * array.c (rb_ary_aset): raise TypeError if index is a symbol. + Tue Nov 13 14:39:11 2001 WATANABE Tetsuya <tetsu@jpn.hp.com> * missing/strftime.c: HP-UX support. @@ -500,6 +500,9 @@ rb_ary_aref(argc, argv, ary) long beg, len; if (argc == 2) { + if (SYMBOL_P(argv[0])) { + rb_raise(rb_eTypeError, "Symbol as array index"); + } beg = NUM2LONG(argv[0]); len = NUM2LONG(argv[1]); if (beg < 0) { @@ -515,6 +518,9 @@ rb_ary_aref(argc, argv, ary) if (FIXNUM_P(arg)) { return rb_ary_entry(ary, FIX2LONG(arg)); } + if (SYMBOL_P(arg)) { + rb_raise(rb_eTypeError, "Symbol as array index"); + } /* check if idx is Range */ switch (rb_range_beg_len(arg, &beg, &len, RARRAY(ary)->len, 0)) { case Qfalse: @@ -714,6 +720,12 @@ rb_ary_aset(argc, argv, ary) long offset, beg, len; if (argc == 3) { + if (SYMBOL_P(argv[0])) { + rb_raise(rb_eTypeError, "Symbol as array index"); + } + if (SYMBOL_P(argv[1])) { + rb_raise(rb_eTypeError, "Symbol as subarray length"); + } rb_ary_update(ary, NUM2LONG(argv[0]), NUM2LONG(argv[1]), argv[2]); return argv[2]; } @@ -724,6 +736,9 @@ rb_ary_aset(argc, argv, ary) offset = FIX2LONG(argv[0]); goto fixnum; } + if (SYMBOL_P(argv[0])) { + rb_raise(rb_eTypeError, "Symbol as array index"); + } if (rb_range_beg_len(argv[0], &beg, &len, RARRAY(ary)->len, 1)) { /* check if idx is Range */ rb_ary_update(ary, beg, len, argv[1]); @@ -943,6 +943,9 @@ rb_num2long(val) case T_BIGNUM: return rb_big2long(val); + case T_SYMBOL: + rb_warning("treating Symbol as an integer"); + /* fall through */ default: val = rb_to_int(val); return NUM2LONG(val); |