diff options
| author | Jack Koenig | 2020-07-30 11:22:54 -0700 |
|---|---|---|
| committer | GitHub | 2020-07-30 11:22:54 -0700 |
| commit | 564312c3a813498b3ba5b88c6984b9cbeb94dd12 (patch) | |
| tree | 1b17cd99034a3b8e94fb90ae7c904ea7d0bb1783 /src/test/scala/firrtlTests/interval/IntervalMathSpec.scala | |
| parent | c02c9b7f33d67d8a65040c028395e881668294f6 (diff) | |
| parent | da3a87ed6a8a11da4eedd3cc35af81c18c24957d (diff) | |
Merge pull request #1796 from ekiwi-sifive/scala-2.13-support
Scala 2.13 support
Diffstat (limited to 'src/test/scala/firrtlTests/interval/IntervalMathSpec.scala')
| -rw-r--r-- | src/test/scala/firrtlTests/interval/IntervalMathSpec.scala | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/test/scala/firrtlTests/interval/IntervalMathSpec.scala b/src/test/scala/firrtlTests/interval/IntervalMathSpec.scala index eeb70286..656e1f8c 100644 --- a/src/test/scala/firrtlTests/interval/IntervalMathSpec.scala +++ b/src/test/scala/firrtlTests/interval/IntervalMathSpec.scala @@ -19,24 +19,24 @@ class IntervalMathSpec extends FirrtlFlatSpec { val DShiftLeftPattern = """.*output dshl.*<(\d+)>.*""".r val DShiftRightPattern = """.*output dshr.*<(\d+)>.*""".r val ArithAssignPattern = """\s*(\w+) <= asSInt\(bits\((\w+)\((.*)\).*\)\)\s*""".r - def getBound(bound: String, value: Double): IsKnown = bound match { - case "[" => Closed(BigDecimal(value)) - case "]" => Closed(BigDecimal(value)) - case "(" => Open(BigDecimal(value)) - case ")" => Open(BigDecimal(value)) + def getBound(bound: String, value: BigDecimal): IsKnown = bound match { + case "[" => Closed(value) + case "]" => Closed(value) + case "(" => Open(value) + case ")" => Open(value) } val prec = 0.5 for { lb1 <- Seq("[", "(") - lv1 <- Range.Double(-1.0, 1.0, prec) - uv1 <- if(lb1 == "[") Range.Double(lv1, 1.0, prec) else Range.Double(lv1 + prec, 1.0, prec) + lv1 <- Range.BigDecimal(-1.0, 1.0, prec) + uv1 <- if(lb1 == "[") Range.BigDecimal(lv1, 1.0, prec) else Range.BigDecimal(lv1 + prec, 1.0, prec) ub1 <- if (lv1 == uv1) Seq("]") else Seq("]", ")") bp1 <- 0 to 1 lb2 <- Seq("[", "(") - lv2 <- Range.Double(-1.0, 1.0, prec) - uv2 <- if(lb2 == "[") Range.Double(lv2, 1.0, prec) else Range.Double(lv2 + prec, 1.0, prec) + lv2 <- Range.BigDecimal(-1.0, 1.0, prec) + uv2 <- if(lb2 == "[") Range.BigDecimal(lv2, 1.0, prec) else Range.BigDecimal(lv2 + prec, 1.0, prec) ub2 <- if (lv2 == uv2) Seq("]") else Seq("]", ")") bp2 <- 0 to 1 } { |
