diff options
| -rw-r--r-- | coreMacros/src/main/scala/chisel3/internal/RangeTransform.scala | 6 | ||||
| -rw-r--r-- | src/test/scala/chiselTests/RangeSpec.scala | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/coreMacros/src/main/scala/chisel3/internal/RangeTransform.scala b/coreMacros/src/main/scala/chisel3/internal/RangeTransform.scala index d90492cd..f431341d 100644 --- a/coreMacros/src/main/scala/chisel3/internal/RangeTransform.scala +++ b/coreMacros/src/main/scala/chisel3/internal/RangeTransform.scala @@ -29,7 +29,7 @@ class RangeTransform(val c: Context) { */ def getNextValue(): c.Tree = { currString = currString.dropWhile(_ == ' ') // allow whitespace - if (currString.isEmpty()) { + if (currString.isEmpty) { if (nextArgIndex >= args.length) { c.abort(c.enclosingPosition, s"Incomplete range specifier") } @@ -46,7 +46,7 @@ class RangeTransform(val c: Context) { } else { val nextStringVal = currString.takeWhile(!Set('[', '(', ' ', ',', ')', ']').contains(_)) currString = currString.substring(nextStringVal.length) - if (currString.isEmpty()) { + if (currString.isEmpty) { c.abort(c.enclosingPosition, s"Incomplete range specifier") } c.parse(nextStringVal) @@ -96,7 +96,7 @@ class RangeTransform(val c: Context) { } else { q"_root_.chisel3.internal.firrtl.Open($maxArg)" } - + q"($startBound, $endBound)" } } diff --git a/src/test/scala/chiselTests/RangeSpec.scala b/src/test/scala/chiselTests/RangeSpec.scala index 565d304d..60ececbe 100644 --- a/src/test/scala/chiselTests/RangeSpec.scala +++ b/src/test/scala/chiselTests/RangeSpec.scala @@ -42,6 +42,9 @@ class RangeSpec extends FreeSpec with Matchers { range"[$b, $a)" should be( (Closed(b), Open(a)) ) range"[${a + b}, $a)" should be( (Closed(a + b), Open(a)) ) range"[${-3 - 7}, ${-3 + a})" should be( (Closed(-10), Open(-3 + a)) ) + + def number(n: Int): Int = n + range"[${number(1)}, ${number(3)})" should be( (Closed(1), Open(3)) ) } "UInt should get the correct width from a range" in { |