diff options
| author | Jack Koenig | 2018-03-27 21:54:30 -0700 |
|---|---|---|
| committer | GitHub | 2018-03-27 21:54:30 -0700 |
| commit | cf0d971beda33a1802c384bd8d5eebb150d9d578 (patch) | |
| tree | 95d47d79d784289904fc0cb0c88b349617dc3a67 /src/main/scala/firrtl/transforms | |
| parent | 65454f5ff1a370d66202a073e18cdcd40180f051 (diff) | |
Change throwInternalError to use a String instead of Option[String] (#777)
Diffstat (limited to 'src/main/scala/firrtl/transforms')
| -rw-r--r-- | src/main/scala/firrtl/transforms/CheckCombLoops.scala | 4 | ||||
| -rw-r--r-- | src/main/scala/firrtl/transforms/FlattenRegUpdate.scala | 2 | ||||
| -rw-r--r-- | src/main/scala/firrtl/transforms/GroupComponents.scala | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/main/scala/firrtl/transforms/CheckCombLoops.scala b/src/main/scala/firrtl/transforms/CheckCombLoops.scala index 6bd62cfa..a4dad11b 100644 --- a/src/main/scala/firrtl/transforms/CheckCombLoops.scala +++ b/src/main/scala/firrtl/transforms/CheckCombLoops.scala @@ -63,9 +63,9 @@ class CheckCombLoops extends Transform { memport.expr match { case memref: WRef => LogicNode(s.name,Some(memref.name),Some(memport.name)) - case _ => throwInternalError(Some(s"toLogicNode: unrecognized subsubfield expression - $memport")) + case _ => throwInternalError(s"toLogicNode: unrecognized subsubfield expression - $memport") } - case _ => throwInternalError(Some(s"toLogicNode: unrecognized subfield expression - $s")) + case _ => throwInternalError(s"toLogicNode: unrecognized subfield expression - $s") } } diff --git a/src/main/scala/firrtl/transforms/FlattenRegUpdate.scala b/src/main/scala/firrtl/transforms/FlattenRegUpdate.scala index 07cb9cb5..f21e6b18 100644 --- a/src/main/scala/firrtl/transforms/FlattenRegUpdate.scala +++ b/src/main/scala/firrtl/transforms/FlattenRegUpdate.scala @@ -29,7 +29,7 @@ object FlattenRegUpdate { netlist(lhs) = rhs case DefNode(_, nname, rhs) => netlist(WRef(nname)) = rhs - case _: IsInvalid => throwInternalError(Some("Unexpected IsInvalid, should have been removed by now")) + case _: IsInvalid => throwInternalError("Unexpected IsInvalid, should have been removed by now") case _ => // Do nothing } stmt diff --git a/src/main/scala/firrtl/transforms/GroupComponents.scala b/src/main/scala/firrtl/transforms/GroupComponents.scala index 43053e3d..439a1642 100644 --- a/src/main/scala/firrtl/transforms/GroupComponents.scala +++ b/src/main/scala/firrtl/transforms/GroupComponents.scala @@ -5,7 +5,7 @@ import firrtl.Mappers._ import firrtl.ir._ import firrtl.annotations.{Annotation, ComponentName} import firrtl.passes.{InferTypes, LowerTypes, MemPortUtils} -import firrtl.Utils.{kind, throwInternalError} +import firrtl.Utils.kind import firrtl.graph.{DiGraph, MutableDiGraph} import scala.collection.mutable |