diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-13 10:38:36 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-13 10:38:36 +0000 |
| commit | 06db731be2f2e0d8783ee689fd7cb043dfd16455 (patch) | |
| tree | 05168a69e002e7d35595ce9057e5f07d4c57163a | |
| parent | 03f8867476a71544a4e70905f7706bb1656d5f95 (diff) | |
| download | ruby-06db731be2f2e0d8783ee689fd7cb043dfd16455.tar.gz ruby-06db731be2f2e0d8783ee689fd7cb043dfd16455.tar.xz ruby-06db731be2f2e0d8783ee689fd7cb043dfd16455.zip | |
* ruby.c (load_file_internal): no need to define DATA when error.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24897 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ruby.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Sun Sep 13 19:38:34 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ruby.c (load_file_internal): no need to define DATA when error. + Sun Sep 13 18:48:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in (XLDFLAGS): link startup code with ObjC support. @@ -1584,7 +1584,7 @@ load_file_internal(VALUE arg) rb_funcall(f, set_encoding, 2, rb_enc_from_encoding(enc), rb_str_new_cstr("-")); tree = rb_parser_compile_file(parser, fname, f, line_start); rb_funcall(f, set_encoding, 1, rb_parser_encoding(parser)); - if (script && rb_parser_end_seen_p(parser)) { + if (script && tree && rb_parser_end_seen_p(parser)) { rb_define_global_const("DATA", f); } else if (f != rb_stdin) { |