Remove SourceIndexLength class and its usage

Author: andrykonchin

src/main/java/org/truffleruby/language/RubyNode.java

@@ -57,6 +57,7 @@ public abstract class RubyNode extends RubyBaseNodeWithExecute implements Instru
     private static final byte FLAG_ROOT = 3;          // 1<<3 = 8
 
     protected static final int NO_SOURCE = -1;
+    private static final int UNAVAILABLE_SOURCE_SECTION_LENGTH = -1;
 
     // Used when the return value of a node is ignored syntactically.
     // Returns Nil instead of void to force RubyNodeWrapper to call `delegateNode.executeVoid(frame)`, otherwise
@@ -85,21 +86,13 @@ public boolean hasSource() {
         return isAdoptable() && getSourceCharIndex() != NO_SOURCE;
     }
 
-    public void unsafeSetSourceSection(SourceIndexLength sourceIndexLength) {
-        assert !hasSource();
-
-        if (sourceIndexLength != null) {
-            unsafeSetSourceSection(sourceIndexLength.getCharIndex(), sourceIndexLength.getLength());
-        }
-    }
-
     public void unsafeSetSourceSection(SourceSection sourceSection) {
         assert !hasSource();
 
         if (sourceSection.isAvailable()) {
             unsafeSetSourceSection(sourceSection.getCharIndex(), sourceSection.getCharLength());
         } else {
-            unsafeSetSourceSection(0, SourceIndexLength.UNAVAILABLE);
+            unsafeSetSourceSection(0, UNAVAILABLE_SOURCE_SECTION_LENGTH);
         }
     }
 
@@ -121,14 +114,6 @@ public RubyNode copySourceSection(RubyNode from) {
         return this;
     }
 
-    public SourceIndexLength getSourceIndexLength() {
-        if (!hasSource()) {
-            return null;
-        } else {
-            return new SourceIndexLength(getSourceCharIndex(), getSourceLength());
-        }
-    }
-
     @Override
     @TruffleBoundary
     public SourceSection getSourceSection() {
@@ -141,7 +126,7 @@ public SourceSection getSourceSection() {
             }
 
             int sourceLength = getSourceLength();
-            if (sourceLength == SourceIndexLength.UNAVAILABLE) {
+            if (sourceLength == UNAVAILABLE_SOURCE_SECTION_LENGTH) {
                 return source.createUnavailableSection();
             } else {
                 return source.createSection(getSourceCharIndex(), sourceLength);
@@ -166,23 +151,6 @@ private Source getSource() {
         return sourceSection.getSource();
     }
 
-    public SourceIndexLength getEncapsulatingSourceIndexLength() {
-        Node node = this;
-        while (node != null) {
-            if (node instanceof RubyNode && ((RubyNode) node).hasSource()) {
-                return ((RubyNode) node).getSourceIndexLength();
-            }
-
-            if (node instanceof RootNode) {
-                return SourceIndexLength.fromSourceSection(node.getSourceSection());
-            }
-
-            node = node.getParent();
-        }
-
-        return null;
-    }
-
     @Override
     public String toString() {
         return super.toString() + " at " + RubyLanguage.fileLineRange(getSourceSection());

src/main/java/org/truffleruby/language/SourceIndexLength.java

@@ -163,11 +163,6 @@
 import static org.truffleruby.parser.TranslatorEnvironment.FORWARDED_KEYWORD_REST_NAME;
 import static org.truffleruby.parser.TranslatorEnvironment.FORWARDED_REST_NAME;
 
-// NOTE: we should avoid SourceIndexLength in YARPTranslator, instead pass a Nodes.Node as location, because
-// * it does not copy the newline flag properly,
-// * it is inefficient,
-// * there is typically no need for such an object since YARP location info is correct.
-
 /** Translate (or convert) AST provided by a parser (YARP parser) to Truffle AST.
  *
  * The main translator that delegates handling of some nodes (e.g. method or block definition) to helper translators.

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

@@ -67,7 +67,6 @@
 import org.truffleruby.language.RubyRootNode;
 import org.truffleruby.language.RubyTopLevelRootNode;
 import org.truffleruby.language.SetTopLevelBindingNode;
-import org.truffleruby.language.SourceIndexLength;
 import org.truffleruby.language.arguments.MissingArgumentBehavior;
 import org.truffleruby.language.arguments.ReadPreArgumentNode;
 import org.truffleruby.language.arguments.RubyArguments;
@@ -171,7 +170,6 @@ public RootCallTarget parse(RubySource rubySource, ParserContext parserContext,
         final SourceSection sourceSection = rubySource.getBytes().length == 0
                 ? source.createUnavailableSection()
                 : source.createSection(0, rubySource.getBytes().length);
-        final SourceIndexLength sourceIndexLength = SourceIndexLength.fromSourceSection(sourceSection);
 
         final String modulePath = staticLexicalScope == null || staticLexicalScope == context.getRootLexicalScope()
                 ? null
@@ -311,7 +309,7 @@ public RootCallTarget parse(RubySource rubySource, ParserContext parserContext,
         if (parserContext.isTopLevel()) {
             rootNode = new RubyTopLevelRootNode(
                     language,
-                    sourceIndexLength.toSourceSection(source),
+                    sourceSection,
                     frameDescriptor,
                     sharedMethodInfo,
                     truffleNode,
@@ -321,7 +319,7 @@ public RootCallTarget parse(RubySource rubySource, ParserContext parserContext,
         } else {
             rootNode = new RubyEvalRootNode(
                     language,
-                    sourceIndexLength.toSourceSection(source),
+                    sourceSection,
                     frameDescriptor,
                     sharedMethodInfo,
                     truffleNode,