Moved IntRange.count to Ranges class.
This commit is contained in:
@@ -41,7 +41,7 @@ public class ArrayIndices implements IntrinsicMethod {
|
|||||||
) {
|
) {
|
||||||
receiver.put(receiver.type, v);
|
receiver.put(receiver.type, v);
|
||||||
v.arraylength();
|
v.arraylength();
|
||||||
v.invokestatic(AsmTypeConstants.JET_INT_RANGE_TYPE.getInternalName(), "count", "(I)Ljet/IntRange;");
|
v.invokestatic("jet/runtime/Ranges", "arrayIndices", "(I)Ljet/IntRange;");
|
||||||
return StackValue.onStack(AsmTypeConstants.JET_INT_RANGE_TYPE);
|
return StackValue.onStack(AsmTypeConstants.JET_INT_RANGE_TYPE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -97,6 +97,11 @@ public class GenerateRanges {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
out.println(" public static IntRange arrayIndices(int length) {");
|
||||||
|
out.println(" return new IntRange(0, length);");
|
||||||
|
out.println(" }");
|
||||||
|
out.println();
|
||||||
|
|
||||||
out.println(" private Ranges() {}");
|
out.println(" private Ranges() {}");
|
||||||
out.println("}");
|
out.println("}");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -111,10 +111,6 @@ public final class IntRange implements Range<Integer>, IntIterable {
|
|||||||
return new IntIteratorImpl(start, count, 1);
|
return new IntIteratorImpl(start, count, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static IntRange count(int length) {
|
|
||||||
return new IntRange(0, length);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static class IntIteratorImpl extends IntIterator {
|
private static class IntIteratorImpl extends IntIterator {
|
||||||
private int cur;
|
private int cur;
|
||||||
private int step;
|
private int step;
|
||||||
|
|||||||
@@ -342,5 +342,9 @@ public class Ranges {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static IntRange arrayIndices(int length) {
|
||||||
|
return new IntRange(0, length);
|
||||||
|
}
|
||||||
|
|
||||||
private Ranges() {}
|
private Ranges() {}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user