From 555e7150f748c3f77be1b65404c166cff2765c71 Mon Sep 17 00:00:00 2001 From: yugui Date: Fri, 12 Dec 2008 10:35:39 +0000 Subject: * encoding.c (rb_enc_set_default_external): default_internal can be nil, but default_external cannot. * encoding.c (rb_set_default_internal): adds rdoc. * encoding.c (enc_find): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@20665 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- encoding.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'encoding.c') diff --git a/encoding.c b/encoding.c index 910768d56..f802850f3 100644 --- a/encoding.c +++ b/encoding.c @@ -905,6 +905,9 @@ enc_list(VALUE klass) * Encoding.find("US-ASCII") => # * Encoding.find(:Shift_JIS) => # * + * An ArgumentError is raised when no encoding with name. + * Only +Encoding.find("internal")+ however returns nil when no encoding named "internal", + * in other words, when Ruby has no default internal encoding. */ static VALUE enc_find(VALUE klass, VALUE enc) @@ -1102,6 +1105,9 @@ get_default_external(VALUE klass) void rb_enc_set_default_external(VALUE encoding) { + if (NIL_P(encoding)) { + rb_raise(rb_eArgError, "default external can not be nil"); + } enc_set_default_encoding(&default_external, encoding, "external", ENCINDEX_US_ASCII); } @@ -1161,9 +1167,10 @@ rb_enc_set_default_internal(VALUE encoding) /* * call-seq: - * Encoding.default_internal = enc + * Encoding.default_internal = enc or nil * * Sets default internal encoding. + * Or removes default internal encoding when passed nil. */ static VALUE set_default_internal(VALUE klass, VALUE encoding) -- cgit