From 271f6d68d64588b15f5c056736509595d5b15d6b Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 24 Feb 2016 08:21:04 +0000
Subject: parse without $.

* io.c (rb_io_gets_internal): read one line from an IO without
  setting ARGF.lineno.

* parse.y (lex_io_gets): use rb_io_gets_internal not to affect
  $. global variable.

* ruby.c (load_file): no longer reset $.

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

(limited to 'ruby.c')

diff --git a/ruby.c b/ruby.c
index 13b9dd58fa..9bc2aa78fa 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1675,7 +1675,6 @@ struct load_file_arg {
     int xflag;
     struct cmdline_options *opt;
     VALUE f;
-    VALUE lineno;
 };
 
 static VALUE
@@ -1878,7 +1877,6 @@ restore_load_file(VALUE arg)
 {
     struct load_file_arg *argp = (struct load_file_arg *)arg;
     VALUE f = argp->f;
-    VALUE lineno = argp->lineno;
 
     if (argp->script) {
 	/*
@@ -1898,7 +1896,7 @@ restore_load_file(VALUE arg)
     else if (f != rb_stdin) {
 	rb_io_close(f);
     }
-    return rb_gv_set("$.", lineno);
+    return Qnil;
 }
 
 static NODE *
@@ -1910,7 +1908,6 @@ load_file(VALUE parser, VALUE fname, int script, struct cmdline_options *opt)
     arg.script = script;
     arg.opt = opt;
     arg.xflag = 0;
-    arg.lineno = rb_gv_get("$.");
     arg.f = open_load_file(rb_str_encode_ospath(fname), &arg.xflag);
     return (NODE *)rb_ensure(load_file_internal, (VALUE)&arg,
 			     restore_load_file, (VALUE)&arg);
-- 
cgit v1.2.3