merges r24569 from trunk into ruby_1_9_1.

--
* parse.y (lex_get_str, lex_io_gets, rb_parser_compile_string):
  must be ascii compatible.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25535 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 7 insertions, 0 deletions

diff --git a/test/ruby/test_eval.rb b/test/ruby/test_eval.rb
index 2f4b0bfbbd..f58e8a21d6 100644
--- a/test/ruby/test_eval.rb
+++ b/test/ruby/test_eval.rb
@@ -408,4 +408,11 @@ class TestEval < Test::Unit::TestCase
       assert_equal("0", f.read.chomp)
     end
   end
+
+  def test_eval_ascii_incompatible
+    assert_raise(ArgumentError) {eval("__ENCODING__".encode("utf-16be"))}
+    assert_raise(ArgumentError) {eval("__ENCODING__".encode("utf-16le"))}
+    assert_raise(ArgumentError) {eval("__ENCODING__".encode("utf-32be"))}
+    assert_raise(ArgumentError) {eval("__ENCODING__".encode("utf-32le"))}
+  end
 end