parse_helper.rb in parser-2.0.0.beta1

- old
+ new

@@ -32,11 +32,11 @@
     end
 
     parser
   end
 
-  def with_versions(code, versions)
+  def with_versions(versions)
     (versions & ALL_VERSIONS).each do |version|
       @diagnostics.clear
 
       parser = parser_for_ruby_version(version)
       yield version, parser
@@ -65,11 +65,11 @@
   #     },
   #     %w(1.8 1.9) # optional
   # )
   # ~~~
   def assert_parses(ast, code, source_maps='', versions=ALL_VERSIONS)
-    with_versions(code, versions) do |version, parser|
+    with_versions(versions) do |version, parser|
       source_file = Parser::Source::Buffer.new('(assert_parses)')
       source_file.source = code
 
       begin
         parsed_ast = parser.parse(source_file)
@@ -90,14 +90,14 @@
         if astlet.nil?
           # This is a testsuite bug.
           raise "No entity with AST path #{ast_path} in #{parsed_ast.inspect}"
         end
 
-        assert astlet.source_map.respond_to?(map_field),
-               "(#{version}) #{astlet.source_map.inspect}.respond_to?(#{map_field.inspect}) for:\n#{parsed_ast.inspect}"
+        assert astlet.location.respond_to?(map_field),
+               "(#{version}) #{astlet.location.inspect}.respond_to?(#{map_field.inspect}) for:\n#{parsed_ast.inspect}"
 
-        range = astlet.source_map.send(map_field)
+        range = astlet.location.send(map_field)
 
         assert_source_range(begin_pos, end_pos, range, version, line.inspect)
       end
     end
   end
@@ -109,10 +109,10 @@
   #   %q{foo *bar},
   #   %q{    ^ location
   #     |     ~~~ highlights (0)})
   # ~~~
   def assert_diagnoses(diagnostic, code, source_maps='', versions=ALL_VERSIONS)
-    with_versions(code, versions) do |version, parser|
+    with_versions(versions) do |version, parser|
       source_file = Parser::Source::Buffer.new('(assert_diagnoses)')
       source_file.source = code
 
       begin
         parser = parser.parse(source_file)