parse_helper.rb in parser-2.4.0.1

- old
+ new

@@ -8,11 +8,11 @@
   else
     require 'parser/all'
     require 'parser/macruby'
     require 'parser/rubymotion'
 
-    ALL_VERSIONS = %w(1.8 1.9 2.0 2.1 2.2 2.3 2.4 mac ios)
+    ALL_VERSIONS = %w(1.8 1.9 2.0 2.1 2.2 2.3 2.4 2.5 mac ios)
   end
 
   def setup
     @diagnostics = []
 
@@ -26,10 +26,11 @@
     when '2.0' then parser = Parser::Ruby20.new
     when '2.1' then parser = Parser::Ruby21.new
     when '2.2' then parser = Parser::Ruby22.new
     when '2.3' then parser = Parser::Ruby23.new
     when '2.4' then parser = Parser::Ruby24.new
+    when '2.5' then parser = Parser::Ruby25.new
     when 'mac' then parser = Parser::MacRuby.new
     when 'ios' then parser = Parser::RubyMotion.new
     else raise "Unrecognized Ruby version #{version}"
     end
 
@@ -94,9 +95,14 @@
       backtrace = exc.backtrace
       Exception.instance_method(:initialize).bind(exc).
         call("(#{version}) #{exc.message}")
       exc.set_backtrace(backtrace)
       raise
+    end
+
+    if ast.nil?
+      assert_nil parsed_ast, "(#{version}) AST equality"
+      return
     end
 
     assert_equal ast, parsed_ast,
                  "(#{version}) AST equality"
 