From 876bc32feca6bd0a2aaec7019fd3d29675ce0255 Mon Sep 17 00:00:00 2001
From: ducky
Date: Wed, 16 Nov 2016 15:23:36 -0800
Subject: Fix open-open range specifier, remove dead code, restyle tests

---
 .../src/main/scala/chisel3/internal/firrtl/IR.scala       | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'chiselFrontend')

diff --git a/chiselFrontend/src/main/scala/chisel3/internal/firrtl/IR.scala b/chiselFrontend/src/main/scala/chisel3/internal/firrtl/IR.scala
index d463d78e..262b939f 100644
--- a/chiselFrontend/src/main/scala/chisel3/internal/firrtl/IR.scala
+++ b/chiselFrontend/src/main/scala/chisel3/internal/firrtl/IR.scala
@@ -109,16 +109,6 @@ case class Index(imm: Arg, value: Arg) extends Arg {
   override def fullName(ctx: Component): String = s"${imm.fullName(ctx)}[${value.fullName(ctx)}]"
 }
 
-object Range {
-  def log2Up(value: BigInt): Int = {
-    require(value >= 0)
-    1 max (value-1).bitLength
-  }
-}
-
-/*sealed abstract class Range {
-
-}*/
 sealed trait Bound
 sealed trait NumericBound[T] extends Bound {
   val value: T
@@ -137,8 +127,9 @@ sealed trait KnownIntRange extends Range {
   val max: NumericBound[Int]
 
   require( (min, max) match {
-    case (low, Open(high_val)) => low.value < high_val
-    case (Open(low_val), high) => low_val < high.value
+    case (Open(low_val), Open(high_val)) => low_val < high_val - 1
+    case (Closed(low_val), Open(high_val)) => low_val < high_val
+    case (Open(low_val), Closed(high_val)) => low_val < high_val
     case (Closed(low_val), Closed(high_val)) => low_val <= high_val
   })
 }
-- 
cgit v1.2.3