зеркало из https://github.com/github/ruby.git
load.c: fix load/require context
* load.c (rb_load_internal0): load/require is not the main script. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56362 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
ef617d50cd
Коммит
24b37eb0a6
|
@ -1,3 +1,8 @@
|
|||
Thu Oct 6 15:53:20 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* load.c (rb_load_internal0): load/require is not the main
|
||||
script.
|
||||
|
||||
Thu Oct 6 13:35:15 2016 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
|
||||
|
||||
* enum.c: [DOC] Improve doc [ci-skip]
|
||||
|
|
2
load.c
2
load.c
|
@ -610,7 +610,7 @@ rb_load_internal0(rb_thread_t *th, VALUE fname, int wrap)
|
|||
}
|
||||
else {
|
||||
VALUE parser = rb_parser_new();
|
||||
rb_parser_set_context(parser, NULL, TRUE);
|
||||
rb_parser_set_context(parser, NULL, FALSE);
|
||||
node = (NODE *)rb_parser_load_file(parser, fname);
|
||||
iseq = rb_iseq_new_top(node, rb_str_new2("<top (required)>"), fname, rb_realpath_internal(Qnil, fname, 1), NULL);
|
||||
}
|
||||
|
|
|
@ -182,6 +182,26 @@ class TestRequire < Test::Unit::TestCase
|
|||
end
|
||||
end
|
||||
|
||||
def test_require_syntax_error
|
||||
Dir.mktmpdir do |tmp|
|
||||
req = File.join(tmp, "test.rb")
|
||||
File.write(req, "'\n")
|
||||
assert_raise_with_message(SyntaxError, /unterminated/) {
|
||||
require req
|
||||
}
|
||||
end
|
||||
end
|
||||
|
||||
def test_load_syntax_error
|
||||
Dir.mktmpdir do |tmp|
|
||||
req = File.join(tmp, "test.rb")
|
||||
File.write(req, "'\n")
|
||||
assert_raise_with_message(SyntaxError, /unterminated/) {
|
||||
load req
|
||||
}
|
||||
end
|
||||
end
|
||||
|
||||
def test_define_class
|
||||
begin
|
||||
require "socket"
|
||||
|
|
Загрузка…
Ссылка в новой задаче