Remove Rope from names

Author: andrykonchin

src/main/java/org/truffleruby/core/encoding/EncodingNodes.java

@@ -129,7 +129,7 @@ protected RubyEncoding negotiateStandardEncodingAndCr7Bit(
                         "getCodeRange(first, firstEncoding) == firstCodeRange",
                         "getCodeRange(second, secondEncoding) == secondCodeRange" },
                 limit = "getCacheLimit()")
-        protected RubyEncoding negotiateRopeRopeCached(
+        protected RubyEncoding negotiateEncodingCached(
                 AbstractTruffleString first,
                 RubyEncoding firstEncoding,
                 AbstractTruffleString second,
@@ -140,19 +140,19 @@ protected RubyEncoding negotiateRopeRopeCached(
                 @Cached("getCodeRange(second, secondEncoding)") TruffleString.CodeRange secondCodeRange,
                 @Cached("firstEncoding") RubyEncoding cachedFirstEncoding,
                 @Cached("secondEncoding") RubyEncoding cachedSecondEncoding,
-                @Cached("compatibleEncodingForRopes(first, firstEncoding, second, secondEncoding)") RubyEncoding negotiatedEncoding) {
+                @Cached("compatibleEncodingForStrings(first, firstEncoding, second, secondEncoding)") RubyEncoding negotiatedEncoding) {
             assert first.isCompatibleTo(firstEncoding.tencoding) && second.isCompatibleTo(secondEncoding.tencoding);
             return negotiatedEncoding;
         }
 
-        @Specialization(guards = "firstEncoding != secondEncoding", replaces = "negotiateRopeRopeCached")
-        protected RubyEncoding negotiateRopeRopeUncached(
+        @Specialization(guards = "firstEncoding != secondEncoding", replaces = "negotiateEncodingCached")
+        protected RubyEncoding negotiateEncodingUncached(
                 AbstractTruffleString first,
                 RubyEncoding firstEncoding,
                 AbstractTruffleString second,
                 RubyEncoding secondEncoding) {
             assert first.isCompatibleTo(firstEncoding.tencoding) && second.isCompatibleTo(secondEncoding.tencoding);
-            return compatibleEncodingForRopes(first, firstEncoding, second, secondEncoding);
+            return compatibleEncodingForStrings(first, firstEncoding, second, secondEncoding);
         }
 
         /** This method returns non-null if either:
@@ -162,17 +162,17 @@ protected RubyEncoding negotiateRopeRopeUncached(
          * </ul>
          */
         @TruffleBoundary
-        protected RubyEncoding compatibleEncodingForRopes(AbstractTruffleString firstRope, RubyEncoding firstEncoding,
-                AbstractTruffleString secondRope, RubyEncoding secondEncoding) {
+        protected RubyEncoding compatibleEncodingForStrings(AbstractTruffleString first, RubyEncoding firstEncoding,
+                AbstractTruffleString second, RubyEncoding secondEncoding) {
             // MRI: enc_compatible_latter
             assert firstEncoding != secondEncoding : "this method assumes the encodings are different";
 
-            if (secondRope.isEmpty()) {
+            if (second.isEmpty()) {
                 return firstEncoding;
             }
-            if (firstRope.isEmpty()) {
+            if (first.isEmpty()) {
                 return (firstEncoding.isAsciiCompatible &&
-                        StringGuards.is7Bit(secondRope, secondEncoding, getCodeRangeNode()))
+                        StringGuards.is7Bit(second, secondEncoding, getCodeRangeNode()))
                                 ? firstEncoding
                                 : secondEncoding;
             }
@@ -181,10 +181,10 @@ protected RubyEncoding compatibleEncodingForRopes(AbstractTruffleString firstRop
                 return null;
             }
 
-            if (StringGuards.is7Bit(secondRope, secondEncoding, getCodeRangeNode())) {
+            if (StringGuards.is7Bit(second, secondEncoding, getCodeRangeNode())) {
                 return firstEncoding;
             }
-            if (StringGuards.is7Bit(firstRope, firstEncoding, getCodeRangeNode())) {
+            if (StringGuards.is7Bit(first, firstEncoding, getCodeRangeNode())) {
                 return secondEncoding;
             }
 
@@ -255,10 +255,10 @@ protected RubyEncoding negotiateSameEncodingUncached(Object first, Object second
         protected RubyEncoding negotiateStringStringEncoding(Object first, Object second,
                 @Cached RubyStringLibrary libFirst,
                 @Cached RubyStringLibrary libSecond,
-                @Cached NegotiateCompatibleStringEncodingNode ropeNode) {
+                @Cached NegotiateCompatibleStringEncodingNode negotiateNode) {
             final RubyEncoding firstEncoding = libFirst.getEncoding(first);
             final RubyEncoding secondEncoding = libSecond.getEncoding(second);
-            return ropeNode.execute(
+            return negotiateNode.execute(
                     libFirst.getTString(first),
                     firstEncoding,
                     libSecond.getTString(second),

src/main/java/org/truffleruby/core/time/TimeNodes.java

@@ -458,7 +458,7 @@ protected boolean formatCanBeFast(Token[] pattern) {
         }
 
         protected boolean yearIsFast(RubyTime time) {
-            // See formatToRopeBuilderCanBeFast
+            // See formatCanBeFast
             final int year = time.dateTime.getYear();
             return year >= 1000 && year <= 9999;
         }

src/main/java/org/truffleruby/parser/BodyTranslator.java

@@ -499,8 +499,8 @@ public RubyNode visitCallNode(CallParseNode node) {
         if (receiver instanceof StrParseNode &&
                 (methodName.equals("freeze") || methodName.equals("-@"))) {
             final StrParseNode strNode = (StrParseNode) receiver;
-            final TruffleString nodeRope = strNode.getValue();
-            final ImmutableRubyString frozenString = language.getFrozenStringLiteral(nodeRope, strNode.encoding);
+            final TruffleString tstring = strNode.getValue();
+            final ImmutableRubyString frozenString = language.getFrozenStringLiteral(tstring, strNode.encoding);
             return addNewlineIfNeeded(node, withSourceSection(
                     sourceSection,
                     new FrozenStringLiteralNode(frozenString, FrozenStrings.METHOD)));