[Truffle] Add Struct#dig and TypeError to Array/Hash#dig

jruby · Jun 28, 2016 · 4a96aca · 4a96aca
1 parent 33d7d4d
commit 4a96aca
Showing 6 changed files with 16 additions and 8 deletions.
diff --git a/spec/truffle/tags/core/array/dig_tags.txt b/spec/truffle/tags/core/array/dig_tags.txt
diff --git a/spec/truffle/tags/core/hash/dig_tags.txt b/spec/truffle/tags/core/hash/dig_tags.txt
diff --git a/spec/truffle/tags/core/struct/dig_tags.txt b/spec/truffle/tags/core/struct/dig_tags.txt
diff --git a/truffle/src/main/ruby/core/array.rb b/truffle/src/main/ruby/core/array.rb
@@ -320,6 +320,7 @@ def dig(idx, *more)
      if result.nil? || more.empty?
        result
      else
+       raise TypeError, "#{result.class} does not have #dig method" unless result.respond_to?(:dig)
        result.dig(*more)
      end
   end

diff --git a/truffle/src/main/ruby/core/hash.rb b/truffle/src/main/ruby/core/hash.rb
@@ -154,6 +154,7 @@ def dig(key, *more)
     if result.nil? || more.empty?
       result
     else
+      raise TypeError, "#{result.class} does not have #dig method" unless result.respond_to?(:dig)
       result.dig(*more)
     end
   end

diff --git a/truffle/src/main/ruby/core/struct.rb b/truffle/src/main/ruby/core/struct.rb
@@ -207,6 +207,20 @@ def []=(var, obj)
     return instance_variable_set(:"@#{var}", obj)
   end
 
+  def dig(key, *more)
+    result = nil
+    begin
+      result = self[key]
+    rescue IndexError, NameError
+    end
+    if result.nil? || more.empty?
+      result
+    else
+      raise TypeError, "#{result.class} does not have #dig method" unless result.respond_to?(:dig)
+      result.dig(*more)
+    end
+  end
+
   def eql?(other)
     return true if equal? other
     return false if self.class != other.class