From 66301b9042530a5265c18c97a0dab9022a0efc50 Mon Sep 17 00:00:00 2001
From: ducky
Date: Wed, 1 Jun 2016 12:17:25 -0700
Subject: Move chisel/... to chisel/core/..., make chisel/compatibility
 package/folder, move more things into utils

---
 .../src/main/scala/chisel/core/When.scala          | 59 ++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 chiselFrontend/src/main/scala/chisel/core/When.scala

(limited to 'chiselFrontend/src/main/scala/chisel/core/When.scala')

diff --git a/chiselFrontend/src/main/scala/chisel/core/When.scala b/chiselFrontend/src/main/scala/chisel/core/When.scala
new file mode 100644
index 00000000..37c59f24
--- /dev/null
+++ b/chiselFrontend/src/main/scala/chisel/core/When.scala
@@ -0,0 +1,59 @@
+// See LICENSE for license details.
+
+package chisel
+
+import scala.language.experimental.macros
+
+import internal._
+import internal.Builder.pushCommand
+import internal.firrtl._
+import internal.sourceinfo.{SourceInfo}
+
+object when {  // scalastyle:ignore object.name
+  /** Create a `when` condition block, where whether a block of logic is
+    * executed or not depends on the conditional.
+    *
+    * @param cond condition to execute upon
+    * @param block logic that runs only if `cond` is true
+    *
+    * @example
+    * {{{
+    * when ( myData === UInt(3) ) {
+    *   // Some logic to run when myData equals 3.
+    * } .elsewhen ( myData === UInt(1) ) {
+    *   // Some logic to run when myData equals 1.
+    * } .otherwise {
+    *   // Some logic to run when myData is neither 3 nor 1.
+    * }
+    * }}}
+    */
+  def apply(cond: Bool)(block: => Unit)(implicit sourceInfo: SourceInfo): WhenContext = {
+    new WhenContext(sourceInfo, cond, !cond, block)
+  }
+}
+
+/** Internal mechanism for generating a when. Because of the way FIRRTL
+  * commands are emitted, generating a FIRRTL elsewhen or nested whens inside
+  * elses would be difficult. Instead, this keeps track of the negative of the
+  * previous conditions, so when an elsewhen or otherwise is used, it checks
+  * that both the condition is true and all the previous conditions have been
+  * false.
+  */
+final class WhenContext(sourceInfo: SourceInfo, cond: Bool, prevCond: => Bool, block: => Unit) {
+  /** This block of logic gets executed if above conditions have been false
+    * and this condition is true.
+    */
+  def elsewhen (elseCond: Bool)(block: => Unit)(implicit sourceInfo: SourceInfo): WhenContext = {
+    new WhenContext(sourceInfo, prevCond && elseCond, prevCond && !elseCond, block)
+  }
+
+  /** This block of logic gets executed only if the above conditions were all
+    * false. No additional logic blocks may be appended past the `otherwise`.
+    */
+  def otherwise(block: => Unit)(implicit sourceInfo: SourceInfo): Unit =
+    new WhenContext(sourceInfo, prevCond, null, block)
+
+  pushCommand(WhenBegin(sourceInfo, cond.ref))
+  block
+  pushCommand(WhenEnd(sourceInfo))
+}
-- 
cgit v1.2.3


From 69c984607e87cb62c82c99056b2664f11b968267 Mon Sep 17 00:00:00 2001
From: ducky
Date: Wed, 1 Jun 2016 12:46:05 -0700
Subject: Package split chisel core

---
 chiselFrontend/src/main/scala/chisel/core/When.scala | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'chiselFrontend/src/main/scala/chisel/core/When.scala')

diff --git a/chiselFrontend/src/main/scala/chisel/core/When.scala b/chiselFrontend/src/main/scala/chisel/core/When.scala
index 37c59f24..5d484313 100644
--- a/chiselFrontend/src/main/scala/chisel/core/When.scala
+++ b/chiselFrontend/src/main/scala/chisel/core/When.scala
@@ -1,13 +1,13 @@
 // See LICENSE for license details.
 
-package chisel
+package chisel.core
 
 import scala.language.experimental.macros
 
-import internal._
-import internal.Builder.pushCommand
-import internal.firrtl._
-import internal.sourceinfo.{SourceInfo}
+import chisel.internal._
+import chisel.internal.Builder.pushCommand
+import chisel.internal.firrtl._
+import chisel.internal.sourceinfo.{SourceInfo}
 
 object when {  // scalastyle:ignore object.name
   /** Create a `when` condition block, where whether a block of logic is
-- 
cgit v1.2.3