Handle line numbers in constant searching

Author: kddnewton

lib/syntax_tree/index.rb

@@ -178,6 +178,7 @@ def location_for(iseq)
       end
 
       def find_constant_path(insns, index)
+        index -= 1 while insns[index].is_a?(Integer)
         insn = insns[index]
 
         if insn.is_a?(Array) && insn[0] == :opt_getconstant_path
@@ -191,8 +192,12 @@ def find_constant_path(insns, index)
           names = []
 
           index -= 1
-          until insns[index][0] == :opt_getinlinecache
-            names.unshift(insns[index][1]) if insns[index][0] == :getconstant
+          until insns[index].is_a?(Array) &&
+                  insns[index][0] == :opt_getinlinecache
+            if insns[index].is_a?(Array) && insns[index][0] == :getconstant
+              names.unshift(insns[index][1])
+            end
+
             index -= 1
           end
 
@@ -207,9 +212,20 @@ def index_iseq(iseq, file_comments)
         queue = [[iseq, []]]
 
         while (current_iseq, current_nesting = queue.shift)
+          line = current_iseq[8]
           insns = current_iseq[13]
+
           insns.each_with_index do |insn, index|
-            next unless insn.is_a?(Array)
+            case insn
+            when Integer
+              line = insn
+              next
+            when Array
+              # continue on
+            else
+              # skip everything else
+              next
+            end
 
             case insn[0]
             when :defineclass
@@ -226,10 +242,12 @@ def index_iseq(iseq, file_comments)
               # If there is a superclass, then we're going to find it here and
               # then update the constant_index as necessary.
               if flags & VM_DEFINECLASS_FLAG_HAS_SUPERCLASS > 0
-                constant_index, superclass = find_constant_path(insns, index - 1)
+                constant_index, superclass =
+                  find_constant_path(insns, index - 1)
 
                 if superclass.empty?
-                  raise NotImplementedError, "superclass with non constant path"
+                  raise NotImplementedError,
+                        "superclass with non constant path on line #{line}"
                 end
               end
 

test/index_test.rb

@@ -35,14 +35,14 @@ def test_class
     def test_class_paths_2
       index_each("class Foo::Bar; end") do |entry|
         assert_equal :Bar, entry.name
-        assert_equal [[:Foo, :Bar]], entry.nesting
+        assert_equal [%i[Foo Bar]], entry.nesting
       end
     end
 
     def test_class_paths_3
       index_each("class Foo::Bar::Baz; end") do |entry|
         assert_equal :Baz, entry.name
-        assert_equal [[:Foo, :Bar, :Baz]], entry.nesting
+        assert_equal [%i[Foo Bar Baz]], entry.nesting
       end
     end
 
@@ -56,7 +56,7 @@ def test_class_nested
     def test_class_paths_nested
       index_each("class Foo; class Bar::Baz::Qux; end; end") do |entry|
         assert_equal :Qux, entry.name
-        assert_equal [[:Foo], [:Bar, :Baz, :Qux]], entry.nesting
+        assert_equal [[:Foo], %i[Bar Baz Qux]], entry.nesting
       end
     end
 
@@ -71,8 +71,8 @@ def test_class_superclass
     def test_class_path_superclass
       index_each("class Foo::Bar < Baz::Qux; end") do |entry|
         assert_equal :Bar, entry.name
-        assert_equal [[:Foo, :Bar]], entry.nesting
-        assert_equal [:Baz, :Qux], entry.superclass
+        assert_equal [%i[Foo Bar]], entry.nesting
+        assert_equal %i[Baz Qux], entry.superclass
       end
     end