summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-27 07:43:31 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-27 07:43:31 +0000
commit394d7c7e52adb1f80dfc3d5e7b8321aa0d1d72e0 (patch)
treec6ff006acff1d08d96f3b2d7ce67eab58bafe86a
parent776db95cd1765e4892f791e56629b55fa1dee618 (diff)
downloadruby-394d7c7e52adb1f80dfc3d5e7b8321aa0d1d72e0.tar.gz
ruby-394d7c7e52adb1f80dfc3d5e7b8321aa0d1d72e0.tar.xz
ruby-394d7c7e52adb1f80dfc3d5e7b8321aa0d1d72e0.zip
* ruby-trunk.
* lib/irb/ruby-lex.rb (RubyLex#buf_input): use chars.to_a. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/nkf/nkf.c1
-rw-r--r--lib/irb/ruby-lex.rb2
3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fea0e94f0..92e78cd45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 3db6003bb..f2647f3d9 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 888484414..b66465c4d 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