From 50466209d5ba5d11951a64f1b19b6220ef01e3fc Mon Sep 17 00:00:00 2001 From: Yorick Peterse Date: Mon, 30 Jun 2014 09:21:49 +0200 Subject: [PATCH] Renamed variables used for checking syntax. This should hopefully prevent future cases of the Mondays. --- kernel/loader.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/kernel/loader.rb b/kernel/loader.rb index 51b6cc7ced..683f41f394 100644 --- a/kernel/loader.rb +++ b/kernel/loader.rb @@ -651,28 +651,28 @@ def script #Check Ruby syntax of source def check_syntax - parser = Rubinius::ToolSets::Runtime::Melbourne + parser_class = Rubinius::ToolSets::Runtime::Melbourne if @script if File.exists?(@script) - mel = parser.new @script, 1, [] - mel.parse_file + parser = parser_class.new @script, 1, [] + parser.parse_file else puts "rbx: Unable to find file -- #{@script} (LoadError)" exit 1 end elsif not @evals.empty? - mel = parser.new('-e', 1, []) - mel.parse_string @evals.join("\n") + parser = parser_class.new('-e', 1, []) + parser.parse_string(@evals.join("\n")) else - mel = parser.new('-', 1, []) - mel.parse_string STDIN.read + parser = parser_class.new('-', 1, []) + parser.parse_string(STDIN.read) end puts "Syntax OK" exit 0 rescue SyntaxError => e - show_syntax_errors(mel.syntax_errors) + show_syntax_errors(parser.syntax_errors) exit 1 end