diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-14 08:31:51 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-14 08:31:51 +0000 |
| commit | b314d3e999b3ac3c99403c57a66a4c5bad32e654 (patch) | |
| tree | 0a81fe0566d83813c5710bb8b2c834fde0a071ee /encoding.c | |
| parent | 9d326d261ef24dc4ba0b66be29f12fcacb9be52d (diff) | |
* encoding.c (rb_obj_encoding): rdoc update. a patch from David
Flanagan <david AT davidflanagan.com>. [ruby-core:12664]
* encoding.c (enc_dump, enc_load): marshaling feature. a patch from
David Flanagan. [ruby-core:12665]
* encoding.c (Init_Encoding): undefine allocator of Encoding.
[ruby-core:12665], [ruby-core:12666]
* test/ruby/test_encoding.rb: tests for Encoding from David Flanagan
[ruby-core:12665]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13697 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/encoding.c b/encoding.c index eecb808083..ab8a020a01 100644 --- a/encoding.c +++ b/encoding.c @@ -2,8 +2,8 @@ encoding.c - - $Author: matz $ - $Date: 2007-05-24 17:22:33 +0900 (Thu, 24 May 2007) $ + $Author$ + $Date$ created at: Thu May 24 17:23:27 JST 2007 Copyright (C) 2007 Yukihiro Matsumoto @@ -372,9 +372,9 @@ rb_enc_copy(VALUE obj1, VALUE obj2) /* * call-seq: - * obj.encoding => str + * obj.encoding => encoding * - * Retruns the encoding name. + * Returns the Encoding object that represents the encoding of obj. */ VALUE @@ -498,12 +498,31 @@ enc_find(VALUE klass, VALUE enc) return enc_from_encoding(rb_enc_from_index(idx)); } +/* :nodoc: */ +static VALUE +enc_dump(int argc, VALUE *argv, VALUE self) +{ + rb_scan_args(argc, argv, "01", 0); + return enc_name(self); +} + +/* :nodoc: */ +static VALUE +enc_load(VALUE klass, VALUE str) +{ + return enc_find(klass, str); +} + void Init_Encoding(void) { rb_cEncoding = rb_define_class("Encoding", rb_cObject); + rb_undef_alloc_func(rb_cEncoding); rb_define_method(rb_cEncoding, "inspect", enc_inspect, 0); rb_define_method(rb_cEncoding, "name", enc_name, 0); rb_define_singleton_method(rb_cEncoding, "list", enc_list, 0); rb_define_singleton_method(rb_cEncoding, "find", enc_find, 1); + + rb_define_method(rb_cEncoding, "_dump", enc_dump, -1); + rb_define_singleton_method(rb_cEncoding, "_load", enc_load, 1); } |