naruse	2008-01-27 16:43:31 +0900 (Sun, 27 Jan 2008)

  New Revision: 15267

  Modified directories:
    trunk/
  Modified files:
    trunk/ChangeLog
    trunk/ext/nkf/nkf.c
    trunk/lib/irb/ruby-lex.rb

  Log:
    * ruby-trunk.
    * lib/irb/ruby-lex.rb (RubyLex#buf_input): use chars.to_a.

  Modified: trunk/

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/irb/ruby-lex.rb?r1=15267&r2=15266&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk?r1=15267&r2=15266&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15267&r2=15266&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/nkf/nkf.c?r1=15267&r2=15266&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15266)
+++ ChangeLog	(revision 15267)
@@ -1,3 +1,7 @@
+Sun Jan 27 16:03:42 2008  NARUSE, Yui  <naruse@r...>
+
+	* lib/irb/ruby-lex.rb (RubyLex#buf_input): use chars.to_a.
+
 Sun Jan 27 16:27:22 2008  NARUSE, Yui  <naruse@r...>
 
 	* ext/nkf/nkt-utf8: update nkf.
Index: lib/irb/ruby-lex.rb
===================================================================
--- lib/irb/ruby-lex.rb	(revision 15266)
+++ lib/irb/ruby-lex.rb	(revision 15267)
@@ -188,7 +188,7 @@
     prompt
     line = @input.call
     return nil unless line
-    @rests.concat line.split(//)
+    @rests.concat line.chars.to_a
     true
   end
   private :buf_input
Index: ext/nkf/nkf.c
===================================================================
--- ext/nkf/nkf.c	(revision 15266)
+++ ext/nkf/nkf.c	(revision 15267)
@@ -145,6 +145,7 @@
     reinit();
     StringValue(opt);
     nkf_split_options(RSTRING_PTR(opt));
+    if (!output_encoding) rb_raise(rb_eArgError, "no output encoding given");
 
     incsize = INCSIZE;
 

Property changes on: .
___________________________________________________________________
Name: svk:merge
   - 3a3bbbf4-582e-0410-a78b-8bf2211dae1f:/local/ruby-lang/trunk:1689
   + 3a3bbbf4-582e-0410-a78b-8bf2211dae1f:/local/ruby-lang/trunk:1689
e2e9cb71-40c7-dc11-9785-001a4d9d6c48:/ruby-trunk:15290


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