[前][次][番号順一覧][スレッド一覧]

ruby-changes:7152

From: akr <ko1@a...>
Date: Sun, 17 Aug 2008 13:41:13 +0900 (JST)
Subject: [ruby-changes:7152] Ruby:r18671 (trunk): * transcode.c (econv_primitive_putback): new method.

akr	2008-08-17 13:40:59 +0900 (Sun, 17 Aug 2008)

  New Revision: 18671

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18671

  Log:
    * transcode.c (econv_primitive_putback): new method.

  Modified files:
    trunk/ChangeLog
    trunk/test/ruby/test_econv.rb
    trunk/transcode.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18670)
+++ ChangeLog	(revision 18671)
@@ -1,3 +1,7 @@
+Sun Aug 17 13:40:04 2008  Tanaka Akira  <akr@f...>
+
+	* transcode.c (econv_primitive_putback): new method.
+
 Sun Aug 17 13:23:53 2008  Tanaka Akira  <akr@f...>
 
 	* include/ruby/encoding.h (rb_econv_putbackable): declared.
Index: test/ruby/test_econv.rb
===================================================================
--- test/ruby/test_econv.rb	(revision 18670)
+++ test/ruby/test_econv.rb	(revision 18671)
@@ -415,4 +415,16 @@
     assert_equal("\u{3042}", err.error_char)
   end
 
+  def test_putback
+    ec = Encoding::Converter.new("EUC-JP", "ISO-8859-1")
+    ret = ec.primitive_convert(src="abc\xa1def", dst="", nil, 10)
+    assert_equal(:invalid_byte_sequence, ret)
+    assert_equal(["abc", "ef"], [dst, src])
+    src = ec.primitive_putback(nil) + src
+    assert_equal(["abc", "def"], [dst, src])
+    ret = ec.primitive_convert(src, dst, nil, 10)
+    assert_equal(:finished, ret)
+    assert_equal(["abcdef", ""], [dst, src])
+  end
+
 end
Index: transcode.c
===================================================================
--- transcode.c	(revision 18670)
+++ transcode.c	(revision 18671)
@@ -2096,6 +2096,29 @@
     return Qtrue;
 }
 
+static VALUE
+econv_primitive_putback(VALUE self, VALUE max)
+{
+    rb_econv_t *ec = check_econv(self);
+    int n;
+    int putbackable;
+    VALUE str;
+
+    if (NIL_P(max))
+        n = rb_econv_putbackable(ec);
+    else {
+        n = NUM2INT(max);
+        putbackable = rb_econv_putbackable(ec);
+        if (putbackable < n)
+            n = putbackable;
+    }
+
+    str = rb_str_new(NULL, n);
+    rb_econv_putback(ec, (unsigned char *)RSTRING_PTR(str), n);
+
+    return str;
+}
+
 void
 rb_econv_check_error(rb_econv_t *ec)
 {
@@ -2156,6 +2179,7 @@
     rb_define_method(rb_cEncodingConverter, "primitive_convert", econv_primitive_convert, -1);
     rb_define_method(rb_cEncodingConverter, "primitive_errinfo", econv_primitive_errinfo, 0);
     rb_define_method(rb_cEncodingConverter, "primitive_insert_output", econv_primitive_insert_output, 1);
+    rb_define_method(rb_cEncodingConverter, "primitive_putback", econv_primitive_putback, 1);
     rb_define_const(rb_cEncodingConverter, "PARTIAL_INPUT", INT2FIX(ECONV_PARTIAL_INPUT));
     rb_define_const(rb_cEncodingConverter, "OUTPUT_FOLLOWED_BY_INPUT", INT2FIX(ECONV_OUTPUT_FOLLOWED_BY_INPUT));
     rb_define_const(rb_cEncodingConverter, "UNIVERSAL_NEWLINE_DECODER", INT2FIX(ECONV_UNIVERSAL_NEWLINE_DECODER));

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]