[Truffle] Rename primitive encoding_get_object_encoding_by_index to e…

…ncoding_get_encoding_by_index
jruby · Sep 19, 2016 · a8367e1 · a8367e1
1 parent 66e1761
commit a8367e1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/core/encoding/EncodingNodes.java b/truffle/src/main/java/org/jruby/truffle/core/encoding/EncodingNodes.java
@@ -581,7 +581,7 @@ public DynamicObject encodingReplicate(VirtualFrame frame, DynamicObject self, D
 
     }
 
-    @Primitive(name = "encoding_get_object_encoding_by_index", needsSelf = false)
+    @Primitive(name = "encoding_get_encoding_by_index", needsSelf = false)
     public static abstract class EncodingGetObjectEncodingByIndexNode extends PrimitiveArrayArgumentsNode {
 
         @Specialization

diff --git a/truffle/src/main/ruby/core/encoding.rb b/truffle/src/main/ruby/core/encoding.rb
@@ -548,7 +548,7 @@ def self.aliases
       next unless index
 
       aname = r.first
-      aliases[aname] = Truffle.invoke_primitive(:encoding_get_object_encoding_by_index, index).name if aname
+      aliases[aname] = Truffle.invoke_primitive(:encoding_get_encoding_by_index, index).name if aname
     end
 
     aliases
@@ -612,7 +612,7 @@ def self.find(name)
   def self.name_list
     EncodingMap.map do |n, r|
       index = r.last
-      r.first or (index and Truffle.invoke_primitive(:encoding_get_object_encoding_by_index, index).name)
+      r.first or (index and Truffle.invoke_primitive(:encoding_get_encoding_by_index, index).name)
     end
   end
 

diff --git a/truffle/src/main/ruby/core/type.rb b/truffle/src/main/ruby/core/type.rb
@@ -462,7 +462,7 @@ def self.try_convert_to_encoding(obj)
       pair = Encoding::EncodingMap[key]
       if pair
         index = pair.last
-        return index && Truffle.invoke_primitive(:encoding_get_object_encoding_by_index, index)
+        return index && Truffle.invoke_primitive(:encoding_get_encoding_by_index, index)
       end
 
       return undefined