From a38b2f84f468638bb910455fe618cae4c431d893 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 27 Sep 2016 08:35:31 +0000
Subject: iseq.c: syntax error in compile_file

* iseq.c (iseqw_s_compile_file): deal with syntax error as well as
  compile, and should not abort when rescued.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56268 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 iseq.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'iseq.c')

diff --git a/iseq.c b/iseq.c
index 4f8fc29154..07d8828e9b 100644
--- a/iseq.c
+++ b/iseq.c
@@ -823,8 +823,7 @@ static VALUE
 iseqw_s_compile_file(int argc, VALUE *argv, VALUE self)
 {
     VALUE file, line = INT2FIX(1), opt = Qnil;
-    VALUE parser;
-    VALUE f;
+    VALUE parser, f, exc = Qnil;
     NODE *node;
     rb_compile_option_t option;
     int i;
@@ -841,9 +840,12 @@ iseqw_s_compile_file(int argc, VALUE *argv, VALUE self)
     f = rb_file_open_str(file, "r");
 
     parser = rb_parser_new();
+    rb_parser_set_context(parser, NULL, FALSE);
     node = rb_parser_compile_file_path(parser, file, f, NUM2INT(line));
+    if (!node) exc = GET_THREAD()->errinfo;
 
     rb_io_close(f);
+    if (!node) rb_exc_raise(exc);
 
     make_compile_option(&option, opt);
 
-- 
cgit v1.2.3