kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* regerror.c, string.c, io.c, lib/getoptlong.rb, lib/net/imap.rb,

Browse source 
compile.c, sprintf.c, parse.y, ext/win32ole/win32ole.c,
  ext/tk/sample/demos-en/entry3.rb, ext/tk/lib/tcltk.rb,
  ext/openssl/ossl_bn.c, numeric.c, vm.c,
  benchmark/bm_so_meteor_contest.rb, bignum.c, ruby.c: don't "illegal"
  for non law violation context.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14377 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2007-12-21 02:31:11 +00:00
parent 817a4e3c83
commit 4cf437519f
18 changed files with 35 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Fri Dec 21 11:28:00 2007 Tanaka Akira <akr@fsij.org>
* regerror.c, string.c, io.c, lib/getoptlong.rb, lib/net/imap.rb,
compile.c, sprintf.c, parse.y, ext/win32ole/win32ole.c,
ext/tk/sample/demos-en/entry3.rb, ext/tk/lib/tcltk.rb,
ext/openssl/ossl_bn.c, numeric.c, vm.c,
benchmark/bm_so_meteor_contest.rb, bignum.c, ruby.c: don't "illegal"
for non law violation context.
Fri Dec 21 11:23:24 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Dec 21 11:23:24 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (enc.mk): depends on $(RBCONFIG) instead of rbconfig.rb. * common.mk (enc.mk): depends on $(RBCONFIG) instead of rbconfig.rb.

2
benchmark/bm_so_meteor_contest.rb
View file

@ -15,7 +15,7 @@ end
# class to represent all information about a particular rotation of a particular piece # class to represent all information about a particular rotation of a particular piece
class Rotation class Rotation
# an array (by location) containing a bit mask for how the piece maps at the given location. # an array (by location) containing a bit mask for how the piece maps at the given location.
# if the rotation is illegal at that location the mask will contain false # if the rotation is invalid at that location the mask will contain false
attr_reader :start_masks attr_reader :start_masks
# maps a direction to a relative location. these differ depending on whether it is an even or # maps a direction to a relative location. these differ depending on whether it is an even or

6
bignum.c
View file

@ -460,7 +460,7 @@ rb_cstr_to_inum(const char *str, int base, int badcheck)
break; break;
default: default:
if (base < 2 || 36 < base) { if (base < 2 || 36 < base) {
rb_raise(rb_eArgError, "illegal radix %d", base); rb_raise(rb_eArgError, "invalid radix %d", base);
} }
if (base <= 32) { if (base <= 32) {
len = 5; len = 5;
@ -802,7 +802,7 @@ big2str_find_n1(VALUE x, int base)
long bits; long bits;
if (base < 2 || 36 < base) if (base < 2 || 36 < base)
rb_bug("illegal radix %d", base); rb_bug("invalid radix %d", base);
if (FIXNUM_P(x)) { if (FIXNUM_P(x)) {
bits = (SIZEOF_LONG*CHAR_BIT - 1)/2 + 1; bits = (SIZEOF_LONG*CHAR_BIT - 1)/2 + 1;
@ -909,7 +909,7 @@ rb_big2str0(VALUE x, int base, int trim)
} }
if (base < 2 || 36 < base) if (base < 2 || 36 < base)
rb_raise(rb_eArgError, "illegal radix %d", base); rb_raise(rb_eArgError, "invalid radix %d", base);
n2 = big2str_find_n1(x, base); n2 = big2str_find_n1(x, base);
n1 = (n2 + 1) / 2; n1 = (n2 + 1) / 2;

2
compile.c
View file

@ -3597,7 +3597,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
} }
} }
else { else {
rb_bug("illegal goto/label format"); rb_bug("invalid goto/label format");
} }

4
ext/openssl/ossl_bn.c
View file

@ -151,7 +151,7 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
} }
break; break;
default: default:
ossl_raise(rb_eArgError, "illegal radix %d", base); ossl_raise(rb_eArgError, "invalid radix %d", base);
} }
return self; return self;
} }
@ -203,7 +203,7 @@ ossl_bn_to_s(int argc, VALUE *argv, VALUE self)
str = ossl_buf2str(buf, strlen(buf)); str = ossl_buf2str(buf, strlen(buf));
break; break;
default: default:
ossl_raise(rb_eArgError, "illegal radix %d", base); ossl_raise(rb_eArgError, "invalid radix %d", base);
} }
return str; return str;

2
ext/tk/lib/tcltk.rb
View file

@ -265,7 +265,7 @@ class TclTkWidget < TclTkCommand
# (used in TclTkInterpreter#initialize()) # (used in TclTkInterpreter#initialize())
# need two arguments # need two arguments
fail("illegal # of parameter") if args.size != 2 fail("invalid # of parameter") if args.size != 2
# ip: interpreter(TclTkIp) # ip: interpreter(TclTkIp)
# exp: tcl/tk representation # exp: tcl/tk representation

2
ext/tk/sample/demos-en/entry3.rb
View file

@ -28,7 +28,7 @@ problem. The second only accepts strings with fewer than ten \
characters and sounds the bell when an attempt to go over the limit \ characters and sounds the bell when an attempt to go over the limit \
is made. The third accepts US phone numbers, mapping letters to \ is made. The third accepts US phone numbers, mapping letters to \
their digit equivalent and sounding the bell on encountering an \ their digit equivalent and sounding the bell on encountering an \
illegal character or if trying to type over a character that is not \ invalid character or if trying to type over a character that is not \
a digit. The fourth is a password field that accepts up to eight \ a digit. The fourth is a password field that accepts up to eight \
characters (silently ignoring further ones), and displaying them as \ characters (silently ignoring further ones), and displaying them as \
asterisk characters. asterisk characters.

2
ext/win32ole/win32ole.c
View file

@ -4057,7 +4057,7 @@ fole_query_interface(VALUE self, VALUE str_iid)
SysFreeString(pBuf); SysFreeString(pBuf);
if(FAILED(hr)) { if(FAILED(hr)) {
ole_raise(hr, eWIN32OLERuntimeError, ole_raise(hr, eWIN32OLERuntimeError,
"illegal iid: `%s'", "invalid iid: `%s'",
StringValuePtr(str_iid)); StringValuePtr(str_iid));
} }

8
io.c
View file

@ -2906,7 +2906,7 @@ rb_io_flags_mode(int flags)
} }
return MODE_BINMODE("r+", "rb+"); return MODE_BINMODE("r+", "rb+");
} }
rb_raise(rb_eArgError, "illegal access modenum %o", flags); rb_raise(rb_eArgError, "invalid access modenum %o", flags);
return NULL; /* not reached */ return NULL; /* not reached */
} }
@ -2928,7 +2928,7 @@ rb_io_mode_flags(const char *mode)
break; break;
default: default:
error: error:
rb_raise(rb_eArgError, "illegal access mode %s", mode); rb_raise(rb_eArgError, "invalid access mode %s", mode);
} }
while (*m) { while (*m) {
@ -2999,7 +2999,7 @@ rb_io_mode_modenum(const char *mode)
break; break;
default: default:
error: error:
rb_raise(rb_eArgError, "illegal access mode %s", mode); rb_raise(rb_eArgError, "invalid access mode %s", mode);
} }
while (*m) { while (*m) {
@ -3046,7 +3046,7 @@ rb_io_modenum_mode(int flags)
case O_RDWR: case O_RDWR:
return MODE_BINARY("r+", "rb+"); return MODE_BINARY("r+", "rb+");
} }
rb_raise(rb_eArgError, "illegal access modenum %o", flags); rb_raise(rb_eArgError, "invalid access modenum %o", flags);
return NULL; /* not reached */ return NULL; /* not reached */
} }

2
lib/getoptlong.rb
View file

@ -570,7 +570,7 @@ class GetoptLong
# 1003.2 specifies the format of this message. # 1003.2 specifies the format of this message.
# #
if ENV.include?('POSIXLY_CORRECT') if ENV.include?('POSIXLY_CORRECT')
set_error(InvalidOption, "illegal option -- #{ch}") set_error(InvalidOption, "invalid option -- #{ch}")
else else
set_error(InvalidOption, "invalid option -- #{ch}") set_error(InvalidOption, "invalid option -- #{ch}")
end end

2
lib/net/imap.rb
View file

@ -3045,7 +3045,7 @@ module Net
parse_error("unknown token - %s", $&.dump) parse_error("unknown token - %s", $&.dump)
end end
else else
parse_error("illegal @lex_state - %s", @lex_state.inspect) parse_error("invalid @lex_state - %s", @lex_state.inspect)
end end
end end

2
numeric.c
View file

@ -1965,7 +1965,7 @@ rb_fix2str(VALUE x, int base)
int neg = 0; int neg = 0;
if (base < 2 || 36 < base) { if (base < 2 || 36 < base) {
rb_raise(rb_eArgError, "illegal radix %d", base); rb_raise(rb_eArgError, "invalid radix %d", base);
} }
if (val == 0) { if (val == 0) {
return rb_str_new2("0"); return rb_str_new2("0");

4
parse.y
View file

@ -4999,7 +4999,7 @@ parser_tokadd_utf8(struct parser_params *parser, rb_encoding **encp,
return 0; return 0;
} }
if (codepoint > 0x10ffff) { if (codepoint > 0x10ffff) {
yyerror("illegal Unicode codepoint (too large)"); yyerror("invalid Unicode codepoint (too large)");
return 0; return 0;
} }
lex_p += numlen; lex_p += numlen;
@ -5287,7 +5287,7 @@ parser_tokadd_mbchar(struct parser_params *parser, int c)
{ {
int len = parser_precise_mbclen(); int len = parser_precise_mbclen();
if (!MBCLEN_CHARFOUND(len)) { if (!MBCLEN_CHARFOUND(len)) {
compile_error(PARSER_ARG "illegal multibyte char"); compile_error(PARSER_ARG "invalid multibyte char");
return -1; return -1;
} }
tokadd(c); tokadd(c);

4
regerror.c
View file

@ -85,9 +85,9 @@ onig_error_code_to_format(int code)
case ONIGERR_END_PATTERN_AT_CONTROL: case ONIGERR_END_PATTERN_AT_CONTROL:
p = "end pattern at control"; break; p = "end pattern at control"; break;
case ONIGERR_META_CODE_SYNTAX: case ONIGERR_META_CODE_SYNTAX:
p = "illegal meta-code syntax"; break; p = "invalid meta-code syntax"; break;
case ONIGERR_CONTROL_CODE_SYNTAX: case ONIGERR_CONTROL_CODE_SYNTAX:
p = "illegal control-code syntax"; break; p = "invalid control-code syntax"; break;
case ONIGERR_CHAR_CLASS_VALUE_AT_END_OF_RANGE: case ONIGERR_CHAR_CLASS_VALUE_AT_END_OF_RANGE:
p = "char-class value at end of range"; break; p = "char-class value at end of range"; break;
case ONIGERR_CHAR_CLASS_VALUE_AT_START_OF_RANGE: case ONIGERR_CHAR_CLASS_VALUE_AT_START_OF_RANGE:

2
ruby.c
View file

@ -935,7 +935,7 @@ process_options(VALUE arg)
break; break;
if (!strchr("IdvwWrK", *s)) if (!strchr("IdvwWrK", *s))
rb_raise(rb_eRuntimeError, rb_raise(rb_eRuntimeError,
"illegal switch in RUBYOPT: -%c", *s); "invalid switch in RUBYOPT: -%c", *s);
s = moreswitches(s, opt); s = moreswitches(s, opt);
} }
} }

2
sprintf.c
View file

@ -406,7 +406,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
p--; p--;
case '%': case '%':
if (flags != FNONE) { if (flags != FNONE) {
rb_raise(rb_eArgError, "illegal format character - %%"); rb_raise(rb_eArgError, "invalid format character - %%");
} }
PUSH("%", 1); PUSH("%", 1);
break; break;

2
string.c
View file

@ -2904,7 +2904,7 @@ rb_str_to_i(int argc, VALUE *argv, VALUE str)
else base = NUM2INT(b); else base = NUM2INT(b);
if (base < 0) { if (base < 0) {
rb_raise(rb_eArgError, "illegal radix %d", base); rb_raise(rb_eArgError, "invalid radix %d", base);
} }
return rb_str_to_inum(str, base, Qfalse); return rb_str_to_inum(str, base, Qfalse);
} }

4
vm.c
View file

@ -266,7 +266,7 @@ vm_make_env_each(rb_thread_t *th, rb_control_frame_t *cfp,
if (VMDEBUG && if (VMDEBUG &&
(!(cfp->lfp[-1] == Qnil || (!(cfp->lfp[-1] == Qnil ||
BUILTIN_TYPE(cfp->lfp[-1]) == T_VALUES))) { BUILTIN_TYPE(cfp->lfp[-1]) == T_VALUES))) {
rb_bug("illegal svar"); rb_bug("invalid svar");
} }
if (!RUBY_VM_NORMAL_ISEQ_P(cfp->iseq)) { if (!RUBY_VM_NORMAL_ISEQ_P(cfp->iseq)) {
@ -788,7 +788,7 @@ check_svar(void)
if (cfp->lfp && cfp->lfp[-1] != Qnil && if (cfp->lfp && cfp->lfp[-1] != Qnil &&
TYPE(cfp->lfp[-1]) != T_VALUES) { TYPE(cfp->lfp[-1]) != T_VALUES) {
/* dp(cfp->lfp[-1]); */ /* dp(cfp->lfp[-1]); */
rb_bug("!!!illegal svar!!!"); rb_bug("!!!invalid svar!!!");
} }
cfp++; cfp++;
} }