azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-925 step methods for integral ranges

Browse Source
This commit is contained in:
Alex Tkachman
2012-01-06 13:11:44 +02:00
parent 4627738ca4
commit 1d2e237312
13 changed files with 467 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+8 -5
View File
@@ -1046,11 +1046,10 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> {
isInterface = CodegenUtil.isInterface(containingDeclaration);
}
else {
if(containingDeclaration instanceof ClassDescriptor && ((ClassDescriptor) containingDeclaration).getKind() == ClassKind.OBJECT)
isInterface = false;
if(containingDeclaration instanceof ClassDescriptor && ((ClassDescriptor) containingDeclaration).getKind() == ClassKind.TRAIT)
isInterface = true;
else {
JetClass jetClass = (JetClass) bindingContext.get(BindingContext.DESCRIPTOR_TO_DECLARATION, containingDeclaration);
isInterface = jetClass == null || jetClass.isTrait();
isInterface = false;
}
}
}
@@ -2768,7 +2767,11 @@ If finally block is present, its last expression is the value of try expression.
JetType jetType = bindingContext.get(BindingContext.EXPRESSION_TYPE, rangeExpression);
assert jetType != null;
final DeclarationDescriptor descriptor = jetType.getConstructor().getDeclarationDescriptor();
if (isClass(descriptor, "IntRange")) {
if (isClass(descriptor, "IntRange") ||
isClass(descriptor, "CharRange") ||
isClass(descriptor, "ByteRange") ||
isClass(descriptor, "LongRange") ||
isClass(descriptor, "ShortRange")) {
return true;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java
+1
View File
@@ -92,6 +92,7 @@ public class IntrinsicMethods {
declareOverload(myStdLib.getLibraryScope().getFunctions("Array"), 1, new NewArray());
declareOverload(myStdLib.getLibraryScope().getFunctions("sure"), 0, new Sure());
declareOverload(myStdLib.getLibraryScope().getFunctions("synchronized"), 1, new StupidSync());
declareOverload(myStdLib.getLibraryScope().getFunctions("iterator"), 0, new IteratorIterator());
declareIntrinsicFunction("ByteIterator", "next", 0, ITERATOR_NEXT);
declareIntrinsicFunction("ShortIterator", "next", 0, ITERATOR_NEXT);
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IteratorIterator.java
+21
View File
@@ -0,0 +1,21 @@
package org.jetbrains.jet.codegen.intrinsics;
import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.lang.psi.JetExpression;
import org.objectweb.asm.Type;
import org.objectweb.asm.commons.InstructionAdapter;
import java.util.List;
/**
* @author alex.tkachman
*/
public class IteratorIterator implements IntrinsicMethod {
@Override
public StackValue generate(ExpressionCodegen codegen, InstructionAdapter v, Type expectedType, @Nullable PsiElement element, @Nullable List<JetExpression> arguments, StackValue receiver) {
return receiver;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/RangeTo.java
+10 -7
View File
@@ -19,19 +19,22 @@ public class RangeTo implements IntrinsicMethod {
@Override
public StackValue generate(ExpressionCodegen codegen, InstructionAdapter v, Type expectedType, PsiElement element, List<JetExpression> arguments, StackValue receiver) {
if(arguments.size()==1) {
final Type leftType = receiver.type;
final Type rightType = codegen.expressionType(arguments.get(0));
receiver.put(Type.INT_TYPE, v);
codegen.gen(arguments.get(0), Type.INT_TYPE);
v.invokestatic("jet/IntRange", "rangeTo", "(II)Ljet/IntRange;");
return StackValue.onStack(JetTypeMapper.TYPE_INT_RANGE);
codegen.gen(arguments.get(0), rightType);
v.invokestatic("jet/runtime/Ranges", "rangeTo", "(" + receiver.type.getDescriptor() + leftType.getDescriptor() + ")" + expectedType.getDescriptor());
return StackValue.onStack(expectedType);
}
else {
JetBinaryExpression expression = (JetBinaryExpression) element;
final Type leftType = codegen.expressionType(expression.getLeft());
final Type rightType = codegen.expressionType(expression.getRight());
if (JetTypeMapper.isIntPrimitive(leftType)) {
codegen.gen(expression.getLeft(), Type.INT_TYPE);
codegen.gen(expression.getRight(), Type.INT_TYPE);
v.invokestatic(expectedType.getInternalName(), "rangeTo", "(" + leftType.getDescriptor() + leftType.getDescriptor() + ")" + expectedType.getDescriptor());
return StackValue.onStack(JetTypeMapper.TYPE_INT_RANGE);
codegen.gen(expression.getLeft(), leftType);
codegen.gen(expression.getRight(), rightType);
v.invokestatic("jet/runtime/Ranges", "rangeTo", "(" + leftType.getDescriptor() + rightType.getDescriptor() + ")" + expectedType.getDescriptor());
return StackValue.onStack(expectedType);
}
else {
throw new UnsupportedOperationException("ranges are only supported for int objects");
compiler/frontend/src/jet/Library.jet
+25 -7
View File
@@ -22,53 +22,71 @@ fun <T : Any> T?.sure() : T
fun String?.plus(other: Any?) : String
fun <T> Iterator<T>.iterator() : Iterator<T>
trait Iterator<out T> {
fun next() : T
val hasNext : Boolean
}
fun ByteIterator.iterator() : ByteIterator
abstract open class ByteIterator() : Iterator<Byte> {
abstract open fun nextByte() : Byte
override fun next() : Byte
}
fun ShortIterator.iterator() : ShortIterator
abstract open class ShortIterator() : Iterator<Short> {
abstract open fun nextShort() : Short
override fun next() : Short
}
fun CharIterator.iterator() : CharIterator
abstract open class CharIterator() : Iterator<Char> {
abstract open fun nextChar() : Char
override fun next() : Char
}
fun IntIterator.iterator() : IntIterator
abstract open class IntIterator() : Iterator<Int> {
abstract open fun nextInt() : Int
override fun next() : Int
}
fun LongIterator.iterator() : LongIterator
abstract open class LongIterator() : Iterator<Long> {
abstract open fun nextLong() : Long
override fun next() : Long
}
fun FloatIterator.iterator() : FloatIterator
abstract open class FloatIterator() : Iterator<Float> {
abstract open fun nextFloat() : Float
override fun next() : Float
}
fun DoubleIterator.iterator() : DoubleIterator
abstract open class DoubleIterator() : Iterator<Double> {
abstract open fun nextDouble() : Double
override fun next() : Double
}
fun BooleanIterator.iterator() : BooleanIterator
abstract open class BooleanIterator() : Iterator<Boolean> {
abstract open fun nextBoolean() : Boolean
@@ -247,7 +265,7 @@ class IntRange(val start : Int, val size : Int, val isReversed : Boolean = false
fun minus() : IntRange
fun step(step: Int) : IntIterable
fun step(step: Int) : IntIterator
}
class LongRange(val start : Long, val size : Long, val isReversed : Boolean = false) : Range<Long>, LongIterable {
@@ -259,7 +277,7 @@ class LongRange(val start : Long, val size : Long, val isReversed : Boolean = fa
fun minus() : LongRange
fun step(step: Long) : LongIterable
fun step(step: Long) : LongIterator
}
class ByteRange(val start : Byte, val size : Int, val isReversed : Boolean = false) : Range<Byte>, ByteIterable {
@@ -271,7 +289,7 @@ class ByteRange(val start : Byte, val size : Int, val isReversed : Boolean = fal
fun minus() : ByteRange
fun step(step: Int) : ByteIterable
fun step(step: Int) : ByteIterator
}
class ShortRange(val start : Short, val size : Int, val isReversed : Boolean = false) : Range<Short>, ShortIterable {
@@ -283,7 +301,7 @@ class ShortRange(val start : Short, val size : Int, val isReversed : Boolean = f
fun minus() : ShortRange
fun step(step: Int) : ShortIterable
fun step(step: Int) : ShortIterator
}
class CharRange(val start : Char, val size : Int, val isReversed : Boolean = false) : Range<Char>, CharIterable {
@@ -295,7 +313,7 @@ class CharRange(val start : Char, val size : Int, val isReversed : Boolean = fal
fun minus() : CharRange
fun step(step: Int) : CharIterable
fun step(step: Int) : CharIterator
}
abstract class Number : Hashable {
@@ -635,8 +653,8 @@ class Char : Number, Comparable<Char> {
fun rangeTo(other : Float) : Range<Float>
fun rangeTo(other : Long) : LongRange
fun rangeTo(other : Int) : IntRange
fun rangeTo(other : Short) : IntRange
fun rangeTo(other : Byte) : IntRange
fun rangeTo(other : Short) : ShortRange
fun rangeTo(other : Byte) : CharRange
fun rangeTo(other : Char) : CharRange
fun inc() : Char
compiler/testData/codegen/regressions/kt925.kt
+54
View File
@@ -0,0 +1,54 @@
fun test1() : Boolean {
val r1 = 1..10
var s1 = 0
for(e in r1 step 2) {
s1 += e
}
return s1 == 25
}
fun test2() : Boolean {
val r1 = 1.byt..10.byt
var s1 = 0
for(e in r1 step 2) {
s1 += e
}
return s1 == 25
}
fun test3() : Boolean {
val r1 = 1.byt..10.lng
var s1 = 0.lng
for(e in r1 step 2) {
s1 += e
}
return s1 == 25.lng
}
fun test4() : Boolean {
val r1 = 1.byt..10.sht
var s1 = 0.sht
for(e in r1 step 2) {
s1 += e
}
return s1 == 25.sht
}
fun test5() : Boolean {
val r1 = 'a'..'h'
var s1 = 0
for(e in r1 step 2) {
s1 ++
}
return s1 == 4
}
fun box() : String {
if(test1().not()) return "test1 failed"
if(test2().not()) return "test2 failed"
if(test3().not()) return "test3 failed"
if(test4().not()) return "test4 failed"
if(test5().not()) return "test4 failed"
return "OK"
}
compiler/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java
+4
View File
@@ -367,4 +367,8 @@ public class PrimitiveTypesTest extends CodegenTestCase {
public void testKt821 () {
blackBoxFile("regressions/kt821.kt");
}
public void testKt925 () {
blackBoxFile("regressions/kt925.kt");
}
}
stdlib/src/jet/ByteRange.java
+13 -5
View File
@@ -44,13 +44,17 @@ public final class ByteRange implements Range<Byte>, ByteIterable, JetObject {
return count < 0 ? -count : count;
}
public ByteIterator step(int step) {
return new MyIterator(start, count, step);
}
public ByteRange minus() {
return new ByteRange(getEnd(), -count);
}
@Override
public ByteIterator iterator() {
return new MyIterator(start, count);
return new MyIterator(start, count, 1);
}
@Override
@@ -80,12 +84,14 @@ public final class ByteRange implements Range<Byte>, ByteIterable, JetObject {
private final static TypeInfo typeInfo = TypeInfo.getTypeInfo(MyIterator.class, false);
private byte cur;
private int step;
private int count;
private final boolean reversed;
public MyIterator(byte startValue, int count) {
public MyIterator(byte startValue, int count, int step) {
cur = startValue;
this.step = step;
reversed = count < 0;
this.count = reversed ? -count : count;
}
@@ -97,12 +103,14 @@ public final class ByteRange implements Range<Byte>, ByteIterable, JetObject {
@Override
public byte nextByte() {
count--;
count -= step;
if(reversed) {
return cur--;
cur -= step;
return (byte) (cur + step);
}
else {
return cur++;
cur += step;
return (byte) (cur - step);
}
}
stdlib/src/jet/CharRange.java
+13 -5
View File
@@ -48,9 +48,13 @@ public final class CharRange implements Range<Character>, CharIterable, JetObjec
return new CharRange(getEnd(), -count);
}
public CharIterator step(int step) {
return new MyIterator(start, count, step);
}
@Override
public CharIterator iterator() {
return new MyIterator(start, count);
return new MyIterator(start, count, 1);
}
@Override
@@ -80,12 +84,14 @@ public final class CharRange implements Range<Character>, CharIterable, JetObjec
private final static TypeInfo typeInfo = TypeInfo.getTypeInfo(MyIterator.class, false);
private char cur;
private int step;
private int count;
private final boolean reversed;
public MyIterator(char startValue, int count) {
public MyIterator(char startValue, int count, int step) {
cur = startValue;
this.step = step;
reversed = count < 0;
this.count = reversed ? -count : count;
}
@@ -97,12 +103,14 @@ public final class CharRange implements Range<Character>, CharIterable, JetObjec
@Override
public char nextChar() {
count--;
count -= step;
if(reversed) {
return cur--;
cur -= step;
return (char) (cur + step);
}
else {
return cur++;
cur += step;
return (char) (cur - step);
}
}
stdlib/src/jet/IntRange.java
+13 -5
View File
@@ -28,6 +28,10 @@ public final class IntRange implements Range<Integer>, IntIterable, JetObject {
return item <= start && item > start + count;
}
public IntIterator step(int step) {
return new MyIterator(start, count, step);
}
public boolean getIsReversed() {
return count < 0;
}
@@ -50,7 +54,7 @@ public final class IntRange implements Range<Integer>, IntIterable, JetObject {
@Override
public IntIterator iterator() {
return new MyIterator(start, count);
return new MyIterator(start, count, 1);
}
@Override
@@ -80,12 +84,14 @@ public final class IntRange implements Range<Integer>, IntIterable, JetObject {
private final static TypeInfo typeInfo = TypeInfo.getTypeInfo(MyIterator.class, false);
private int cur;
private int step;
private int count;
private final boolean reversed;
public MyIterator(int startValue, int count) {
public MyIterator(int startValue, int count, int step) {
cur = startValue;
this.step = step;
reversed = count < 0;
this.count = reversed ? -count : count;
}
@@ -97,12 +103,14 @@ public final class IntRange implements Range<Integer>, IntIterable, JetObject {
@Override
public int nextInt() {
count--;
count -= step;
if(reversed) {
return cur--;
cur -= step;
return cur + step;
}
else {
return cur++;
cur += step;
return cur - step;
}
}
stdlib/src/jet/LongRange.java
+15 -16
View File
@@ -19,6 +19,10 @@ public final class LongRange implements Range<Long>, LongIterable, JetObject {
this(startValue, reversed ? -count : count, (defaultMask & 4) == 0);
}
public LongIterator step(long step) {
return new MyIterator(start, count, step);
}
@Override
public boolean contains(Long item) {
if (item == null) return false;
@@ -50,7 +54,7 @@ public final class LongRange implements Range<Long>, LongIterable, JetObject {
@Override
public LongIterator iterator() {
return new MyIterator(start, count);
return new MyIterator(start, count, 1);
}
@Override
@@ -63,29 +67,22 @@ public final class LongRange implements Range<Long>, LongIterable, JetObject {
return null;
}
public static IntRange count(int length) {
return new IntRange(0, length);
}
public static IntRange rangeTo(int from, int to) {
if(from > to) {
return new IntRange(to, from-to+1, true);
}
else {
return new IntRange(from, to-from+1);
}
public static LongRange count(int length) {
return new LongRange(0, length);
}
private static class MyIterator extends LongIterator {
private final static TypeInfo typeInfo = TypeInfo.getTypeInfo(MyIterator.class, false);
private long cur;
private long step;
private long count;
private final boolean reversed;
public MyIterator(long startValue, long count) {
public MyIterator(long startValue, long count, long step) {
cur = startValue;
this.step = step;
reversed = count < 0;
this.count = reversed ? -count : count;
}
@@ -97,12 +94,14 @@ public final class LongRange implements Range<Long>, LongIterable, JetObject {
@Override
public long nextLong() {
count--;
count -= step;
if(reversed) {
return cur--;
cur -= step;
return (cur + step);
}
else {
return cur++;
cur += step;
return (cur - step);
}
}
stdlib/src/jet/ShortRange.java
+13 -5
View File
@@ -19,6 +19,10 @@ public final class ShortRange implements Range<Short>, ShortIterable, JetObject
this(startValue, reversed ? -count : count, (defaultMask & 4) == 0);
}
public ShortIterator step(int step) {
return new MyIterator(start, count, step);
}
@Override
public boolean contains(Short item) {
if (item == null) return false;
@@ -50,7 +54,7 @@ public final class ShortRange implements Range<Short>, ShortIterable, JetObject
@Override
public ShortIterator iterator() {
return new MyIterator(start, count);
return new MyIterator(start, count, 1);
}
@Override
@@ -80,12 +84,14 @@ public final class ShortRange implements Range<Short>, ShortIterable, JetObject
private final static TypeInfo typeInfo = TypeInfo.getTypeInfo(MyIterator.class, false);
private short cur;
private int step;
private int count;
private final boolean reversed;
public MyIterator(short startValue, int count) {
public MyIterator(short startValue, int count, int step) {
cur = startValue;
this.step = step;
reversed = count < 0;
this.count = reversed ? -count : count;
}
@@ -97,12 +103,14 @@ public final class ShortRange implements Range<Short>, ShortIterable, JetObject
@Override
public short nextShort() {
count--;
count -= step;
if(reversed) {
return cur--;
cur -= step;
return (short) (cur + step);
}
else {
return cur++;
cur += step;
return (short) (cur - step);
}
}
stdlib/src/jet/runtime/Ranges.java
+277
View File
@@ -0,0 +1,277 @@
package jet.runtime;
import jet.*;
import java.util.Arrays;
import java.util.List;
/**
* @author alex.tkachman
*/
public class Ranges {
private Ranges() {
}
public static ByteRange rangeTo(byte from, byte to) {
if(from > to) {
return new ByteRange(to, from-to+1, true);
}
else {
return new ByteRange(from, to-from+1);
}
}
public static ShortRange rangeTo(byte from, short to) {
if(from > to) {
return new ShortRange(to, from-to+1, true);
}
else {
return new ShortRange(from, to-from+1);
}
}
public static IntRange rangeTo(byte from, int to) {
if(from > to) {
return new IntRange(to, from-to+1, true);
}
else {
return new IntRange(from, to-from+1);
}
}
public static LongRange rangeTo(byte from, long to) {
if(from > to) {
return new LongRange(to, from-to+1, true);
}
else {
return new LongRange(from, to-from+1);
}
}
public static CharRange rangeTo(byte from, char to) {
if(from > to) {
return new CharRange(to, from-to+1, true);
}
else {
return new CharRange((char) from, to-from+1);
}
}
public static ShortRange rangeTo(short from, byte to) {
if(from > to) {
return new ShortRange(to, from-to+1, true);
}
else {
return new ShortRange(from, to-from+1);
}
}
public static ShortRange rangeTo(short from, short to) {
if(from > to) {
return new ShortRange(to, from-to+1, true);
}
else {
return new ShortRange(from, to-from+1);
}
}
public static IntRange rangeTo(short from, int to) {
if(from > to) {
return new IntRange(to, from-to+1, true);
}
else {
return new IntRange(from, to-from+1);
}
}
public static LongRange rangeTo(short from, long to) {
if(from > to) {
return new LongRange(to, from-to+1, true);
}
else {
return new LongRange(from, to-from+1);
}
}
public static ShortRange rangeTo(short from, char to) {
if(from > to) {
return new ShortRange((short) to, from-to+1, true);
}
else {
return new ShortRange(from, to-from+1);
}
}
public static IntRange rangeTo(int from, byte to) {
if(from > to) {
return new IntRange(to, from-to+1, true);
}
else {
return new IntRange(from, to-from+1);
}
}
public static IntRange rangeTo(int from, short to) {
if(from > to) {
return new IntRange(to, from-to+1, true);
}
else {
return new IntRange(from, to-from+1);
}
}
public static IntRange rangeTo(int from, int to) {
if(from > to) {
return new IntRange(to, from-to+1, true);
}
else {
return new IntRange(from, to-from+1);
}
}
public static LongRange rangeTo(int from, long to) {
if(from > to) {
return new LongRange(to, from-to+1, true);
}
else {
return new LongRange(from, to-from+1);
}
}
public static IntRange rangeTo(int from, char to) {
if(from > to) {
return new IntRange(to, from-to+1, true);
}
else {
return new IntRange(from, to-from+1);
}
}
public static LongRange rangeTo(long from, byte to) {
if(from > to) {
return new LongRange(to, from-to+1, true);
}
else {
return new LongRange(from, to-from+1);
}
}
public static LongRange rangeTo(long from, short to) {
if(from > to) {
return new LongRange(to, from-to+1, true);
}
else {
return new LongRange(from, to-from+1);
}
}
public static LongRange rangeTo(long from, int to) {
if(from > to) {
return new LongRange(to, from-to+1, true);
}
else {
return new LongRange(from, to-from+1);
}
}
public static LongRange rangeTo(long from, long to) {
if(from > to) {
return new LongRange(to, from-to+1, true);
}
else {
return new LongRange(from, to-from+1);
}
}
public static LongRange rangeTo(long from, char to) {
if(from > to) {
return new LongRange(to, from-to+1, true);
}
else {
return new LongRange(from, to-from+1);
}
}
public static CharRange rangeTo(char from, byte to) {
if(from > to) {
return new CharRange((char) to, from-to+1, true);
}
else {
return new CharRange(from, to-from+1);
}
}
public static ShortRange rangeTo(char from, short to) {
if(from > to) {
return new ShortRange(to, from-to+1, true);
}
else {
return new ShortRange((short) from, to-from+1);
}
}
public static IntRange rangeTo(char from, int to) {
if(from > to) {
return new IntRange(to, from-to+1, true);
}
else {
return new IntRange(from, to-from+1);
}
}
public static LongRange rangeTo(char from, long to) {
if(from > to) {
return new LongRange(to, from-to+1, true);
}
else {
return new LongRange(from, to-from+1);
}
}
public static CharRange rangeTo(char from, char to) {
if(from > to) {
return new CharRange(to, from-to+1, true);
}
else {
return new CharRange(from, to-from+1);
}
}
public static void main(String[] args) {
List<String> strings = Arrays.asList("byte", "short", "int", "long", /*"float", "double",*/ "char");
for(String t1 : strings)
for(String t2 : strings) {
String resType;
if(t1.equals("double") || t2.equals("double")) {
resType = "DoubleRange";
}
else if(t1.equals("float") || t2.equals("float")) {
resType = "FloatRange";
}
else if(t1.equals("long") || t2.equals("long")) {
resType = "LongRange";
}
else if(t1.equals("int") || t2.equals("int")) {
resType = "IntRange";
}
else if(t1.equals("short") || t2.equals("short")) {
resType = "ShortRange";
}
else if(t1.equals("char") || t2.equals("char")) {
resType = "CharRange";
}
else {
resType = "ByteRange";
}
System.out.println("\npublic static " + resType + " rangeTo(" + t1 + " from, " + t2 + " to) {" +
"\n if(from > to) {\n" +
" return new " + resType + "(to, from-to+1, true);\n" +
" }\n" +
" else {\n" +
" return new " + resType + "(from, to-from+1);\n" +
" }\n" +
"}");
}
}
}