diff options
| author | Chick Markley | 2019-12-11 14:17:24 -0800 |
|---|---|---|
| committer | GitHub | 2019-12-11 14:17:24 -0800 |
| commit | 954cc41e1349d0df6d2250d6270590340cd36e82 (patch) | |
| tree | fb7eb67a0344db258530d1359ef470781093ea92 /chiselFrontend/src | |
| parent | 69ae14b485c67834ad3c9c518ef080cf75ce9b1d (diff) | |
| parent | 7c7b6f28adfdc2eeb223aaa8cbb904ae90bf36fe (diff) | |
Merge pull request #1274 from freechipsproject/interval-fix-1
Bug fixes to support code for Interval
Diffstat (limited to 'chiselFrontend/src')
| -rw-r--r-- | chiselFrontend/src/main/scala/chisel3/internal/firrtl/IR.scala | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chiselFrontend/src/main/scala/chisel3/internal/firrtl/IR.scala b/chiselFrontend/src/main/scala/chisel3/internal/firrtl/IR.scala index bc662ddb..e76a8d60 100644 --- a/chiselFrontend/src/main/scala/chisel3/internal/firrtl/IR.scala +++ b/chiselFrontend/src/main/scala/chisel3/internal/firrtl/IR.scala @@ -9,6 +9,7 @@ import chisel3.experimental._ import _root_.firrtl.{ir => firrtlir} import _root_.firrtl.PrimOps +import scala.collection.immutable.NumericRange import scala.math.BigDecimal.RoundingMode // scalastyle:off number.of.types @@ -432,7 +433,7 @@ sealed class IntervalRange( val getHighestPossibleValue: Option[BigDecimal] = { increment match { case Some(inc) => - lower match { + upper match { case firrtlir.Closed(n) => Some(n) case firrtlir.Open(n) => Some(n - inc) case _ => None @@ -446,7 +447,7 @@ sealed class IntervalRange( * Mostly to be used for testing * @return */ - def getPossibleValues: Seq[BigDecimal] = { + def getPossibleValues: NumericRange[BigDecimal] = { (getLowestPossibleValue, getHighestPossibleValue, increment) match { case (Some(low), Some(high), Some(inc)) => (low to high by inc) case (_, _, None) => |