diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-27 07:43:31 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-27 07:43:31 +0000 |
| commit | 4a9d407e35d9ccfe31d1fa1913fb71fe22c5f0b7 (patch) | |
| tree | c6ff006acff1d08d96f3b2d7ce67eab58bafe86a | |
| parent | 086e5b1a63d77bf5a4ebe10396a430d544fbe505 (diff) | |
* ruby-trunk.
* lib/irb/ruby-lex.rb (RubyLex#buf_input): use chars.to_a.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/nkf/nkf.c | 1 | ||||
| -rw-r--r-- | lib/irb/ruby-lex.rb | 2 |
3 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Sun Jan 27 16:03:42 2008 NARUSE, Yui <naruse@ruby-lang.org> + + * lib/irb/ruby-lex.rb (RubyLex#buf_input): use chars.to_a. + Sun Jan 27 16:27:22 2008 NARUSE, Yui <naruse@ruby-lang.org> * ext/nkf/nkt-utf8: update nkf. diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c index 3db6003bbf..f2647f3d9d 100644 --- a/ext/nkf/nkf.c +++ b/ext/nkf/nkf.c @@ -145,6 +145,7 @@ rb_nkf_convert(VALUE obj, VALUE opt, VALUE src) reinit(); StringValue(opt); nkf_split_options(RSTRING_PTR(opt)); + if (!output_encoding) rb_raise(rb_eArgError, "no output encoding given"); incsize = INCSIZE; diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb index 888484414f..b66465c4de 100644 --- a/lib/irb/ruby-lex.rb +++ b/lib/irb/ruby-lex.rb @@ -188,7 +188,7 @@ class RubyLex prompt line = @input.call return nil unless line - @rests.concat line.split(//) + @rests.concat line.chars.to_a true end private :buf_input |