implement ENCODING_SET() CRuby API

alloy · May 1, 2011 · 3fce966 · 3fce966
1 parent bd12795
commit 3fce966
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/encoding.c b/encoding.c
@@ -525,10 +525,10 @@ rb_enc_to_index(VALUE enc)
 void
 rb_enc_set_index(VALUE obj, int encindex)
 {
-    if (encindex < ENCODINGS_COUNT) {
-	return ;
+    assert(encindex >= 0 && encindex < ENCODINGS_COUNT);
+    if (TYPE(obj) == T_STRING) {
+	rb_str_force_encoding(obj, rb_encodings[encindex]);
     }
-    rb_str_force_encoding(obj, rb_encodings[encindex]);
 }
 
 int

diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h
@@ -17,6 +17,7 @@ extern "C" {
 typedef struct rb_encoding rb_encoding;
 
 #define ENCODING_GET(obj) (rb_enc_get_index((VALUE)obj))
+#define ENCODING_SET(obj, idx) (rb_enc_set_index((VALUE)obj, idx))
 
 int rb_enc_get_index(VALUE obj);
 void rb_enc_set_index(VALUE obj, int encindex);