From 1b27d0db607601ebbc5b5ec05a872398e19b3d3c Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 9 Aug 2012 16:23:09 +0400 Subject: [PATCH] Added toString() method to all ranges. --- runtime/src/jet/ByteRange.java | 13 +++++++++++++ runtime/src/jet/CharRange.java | 13 +++++++++++++ runtime/src/jet/DoubleRange.java | 13 +++++++++++++ runtime/src/jet/FloatRange.java | 13 +++++++++++++ runtime/src/jet/LongRange.java | 14 ++++++++++++++ runtime/src/jet/ShortRange.java | 13 +++++++++++++ 6 files changed, 79 insertions(+) diff --git a/runtime/src/jet/ByteRange.java b/runtime/src/jet/ByteRange.java index 7a51037fd00..f24f74050c5 100644 --- a/runtime/src/jet/ByteRange.java +++ b/runtime/src/jet/ByteRange.java @@ -30,6 +30,19 @@ public final class ByteRange implements Range, ByteIterable { this.count = count; } + @Override + public String toString() { + if (count == 0) { + return ""; + } + else if (count > 0) { + return getStart() + ".rangeTo(" + getEnd() + ")"; + } + else { + return getStart() + ".downTo(" + getEnd() + ")"; + } + } + @Override public boolean contains(Byte item) { if (item == null) return false; diff --git a/runtime/src/jet/CharRange.java b/runtime/src/jet/CharRange.java index 2059ceb7ade..82900825914 100644 --- a/runtime/src/jet/CharRange.java +++ b/runtime/src/jet/CharRange.java @@ -30,6 +30,19 @@ public final class CharRange implements Range, CharIterable { this.count = count; } + @Override + public String toString() { + if (count == 0) { + return ""; + } + else if (count > 0) { + return getStart() + ".rangeTo(" + getEnd() + ")"; + } + else { + return getStart() + ".downTo(" + getEnd() + ")"; + } + } + @Override public boolean contains(Character item) { if (item == null) return false; diff --git a/runtime/src/jet/DoubleRange.java b/runtime/src/jet/DoubleRange.java index d38d841faf4..bdfa0e21a0b 100644 --- a/runtime/src/jet/DoubleRange.java +++ b/runtime/src/jet/DoubleRange.java @@ -30,6 +30,19 @@ public final class DoubleRange implements Range { this.size = size; } + @Override + public String toString() { + if (size == 0.0) { + return ""; + } + else if (size > 0) { + return getStart() + ".rangeTo(" + getEnd() + ")"; + } + else { + return getStart() + ".downTo(" + getEnd() + ")"; + } + } + @Override public boolean contains(Double item) { if (item == null) return false; diff --git a/runtime/src/jet/FloatRange.java b/runtime/src/jet/FloatRange.java index fb3af3a68b1..28b729db38f 100644 --- a/runtime/src/jet/FloatRange.java +++ b/runtime/src/jet/FloatRange.java @@ -30,6 +30,19 @@ public final class FloatRange implements Range { this.size = size; } + @Override + public String toString() { + if (size == 0.0) { + return ""; + } + else if (size > 0) { + return getStart() + ".rangeTo(" + getEnd() + ")"; + } + else { + return getStart() + ".downTo(" + getEnd() + ")"; + } + } + @Override public boolean contains(Float item) { if (item == null) return false; diff --git a/runtime/src/jet/LongRange.java b/runtime/src/jet/LongRange.java index 3e03d9f95d8..6f400419ca2 100644 --- a/runtime/src/jet/LongRange.java +++ b/runtime/src/jet/LongRange.java @@ -30,6 +30,20 @@ public final class LongRange implements Range, LongIterable { this.count = count; } + @Override + public String toString() { + if (count == 0) { + return ""; + } + else if (count > 0) { + return getStart() + ".rangeTo(" + getEnd() + ")"; + } + else { + return getStart() + ".downTo(" + getEnd() + ")"; + } + } + + public LongIterator step(long step) { if (step < 0) return new MyIterator(getEnd(), -count, -step); diff --git a/runtime/src/jet/ShortRange.java b/runtime/src/jet/ShortRange.java index 0cc3d603065..a82f7eb0451 100644 --- a/runtime/src/jet/ShortRange.java +++ b/runtime/src/jet/ShortRange.java @@ -30,6 +30,19 @@ public final class ShortRange implements Range, ShortIterable { this.count = count; } + @Override + public String toString() { + if (count == 0) { + return ""; + } + else if (count > 0) { + return getStart() + ".rangeTo(" + getEnd() + ")"; + } + else { + return getStart() + ".downTo(" + getEnd() + ")"; + } + } + public ShortIterator step(int step) { if (step < 0) return new MyIterator(getEnd(), -count, -step);