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

* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#do_includes): replace

Browse source 
also locally defined modules.

* ext/iconv/iconv.c: backport Iconv::InvalidEncoding from CVS HEAD.

* ext/strscan/strscan.c: moved misplaced rdoc.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8070 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2005-03-04 10:39:46 +00:00
parent d43b7e03ef
commit f132f2705d
4 changed files with 46 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ext/iconv/iconv.c
View file

@ -83,6 +83,7 @@ struct iconv_env_t
VALUE (*append)_((VALUE, VALUE));
};
static VALUE rb_eIconvInvalidEncoding;
static VALUE rb_eIconvFailure;
static VALUE rb_eIconvIllegalSeq;
static VALUE rb_eIconvInvalidChar;
@ -161,10 +162,15 @@ iconv_create
cd = iconv_open(tocode, fromcode);
}
if (cd == (iconv_t)-1) {
volatile VALUE msg = rb_str_new2("iconv(\"");
int inval = errno == EINVAL;
volatile VALUE msg = rb_str_new2("iconv(\"" + (inval ? 5 : 0));
char *s;
rb_str_buf_cat2(rb_str_buf_append(msg, to), "\", \"");
rb_str_buf_cat2(rb_str_buf_append(msg, from), "\")");
rb_sys_fail(StringValuePtr(msg));
s = StringValuePtr(msg);
if (!inval) rb_sys_fail(s);
rb_raise(rb_eIconvInvalidEncoding, "invalid encoding %s", s);
}
}
@ -625,6 +631,8 @@ iconv_s_iconv
* Document-method: Iconv::conv
* call-seq: Iconv.iconv(to, from, *strs)
*
* Shorthand for
* Iconv.iconv(to, from, str).join
* See Iconv.iconv ???
*/
static VALUE
@ -732,7 +740,7 @@ iconv_iconv
return iconv_convert(VALUE2ICONV(cd), str,
NIL_P(n1) ? 0 : NUM2INT(n1),
NIL_P(n2) ? -1 : NUM2INT(n2),
NIL_P(n2) ? -1 : NUM2INT(n2),
NULL);
}
@ -868,6 +876,7 @@ Init_iconv _((void))
rb_define_method(rb_eIconvFailure, "failed", iconv_failure_failed, 0);
rb_define_method(rb_eIconvFailure, "inspect", iconv_failure_inspect, 0);
rb_eIconvInvalidEncoding = rb_define_class_under(rb_cIconv, "InvalidEncoding", rb_eArgError);
rb_eIconvIllegalSeq = rb_define_class_under(rb_cIconv, "IllegalSequence", rb_eArgError);
rb_eIconvInvalidChar = rb_define_class_under(rb_cIconv, "InvalidCharacter", rb_eArgError);
rb_eIconvOutOfRange = rb_define_class_under(rb_cIconv, "OutOfRange", rb_eRuntimeError);