diff options
Diffstat (limited to 'src/main/scala/tutorial')
| -rw-r--r-- | src/main/scala/tutorial/lesson1-circuit-traversal/AnalyzeCircuit.scala | 8 | ||||
| -rw-r--r-- | src/main/scala/tutorial/lesson2-working-ir/AnalyzeCircuit.scala | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/main/scala/tutorial/lesson1-circuit-traversal/AnalyzeCircuit.scala b/src/main/scala/tutorial/lesson1-circuit-traversal/AnalyzeCircuit.scala index 394e6ad8..3f1dfa46 100644 --- a/src/main/scala/tutorial/lesson1-circuit-traversal/AnalyzeCircuit.scala +++ b/src/main/scala/tutorial/lesson1-circuit-traversal/AnalyzeCircuit.scala @@ -1,3 +1,5 @@ +// See LICENSE for license details. + package tutorial package lesson1 @@ -24,8 +26,8 @@ class Ledger { private var moduleName: Option[String] = None private val modules = mutable.Set[String]() private val moduleMuxMap = mutable.Map[String, Int]() - def foundMux: Unit = moduleName match { - case None => error("Module name not defined in Ledger!") + def foundMux(): Unit = moduleName match { + case None => sys.error("Module name not defined in Ledger!") case Some(name) => moduleMuxMap(name) = moduleMuxMap.getOrElse(name, 0) + 1 } def getModuleName: String = moduleName match { @@ -134,7 +136,7 @@ class AnalyzeCircuit extends Transform { ledger.foundMux e // If e is not a [[Mux]], return e. - case e => e + case notmux => notmux } } } diff --git a/src/main/scala/tutorial/lesson2-working-ir/AnalyzeCircuit.scala b/src/main/scala/tutorial/lesson2-working-ir/AnalyzeCircuit.scala index ba955b7c..0c187c2d 100644 --- a/src/main/scala/tutorial/lesson2-working-ir/AnalyzeCircuit.scala +++ b/src/main/scala/tutorial/lesson2-working-ir/AnalyzeCircuit.scala @@ -1,3 +1,5 @@ +// See LICENSE for license details. + package tutorial package lesson2 @@ -28,14 +30,14 @@ class Ledger { private val moduleMuxMap = mutable.Map[String, Int]() private val moduleInstanceMap = mutable.Map[String, Seq[String]]() def getModuleName: String = moduleName match { - case None => error("Module name not defined in Ledger!") + case None => sys.error("Module name not defined in Ledger!") case Some(name) => name } def setModuleName(myName: String): Unit = { modules += myName moduleName = Some(myName) } - def foundMux: Unit = { + def foundMux(): Unit = { val myName = getModuleName moduleMuxMap(myName) = moduleMuxMap.getOrElse(myName, 0) + 1 } |
