diff options
| author | ducky | 2015-10-30 16:36:23 -0700 |
|---|---|---|
| committer | Palmer Dabbelt | 2015-11-02 14:16:16 -0800 |
| commit | 3fe81229b38c98ae14529a5d41998b010174b67b (patch) | |
| tree | 11179d14bf6f6e3c744546d7a3e8d4d27af76a0a /src/main/scala/Chisel/util | |
| parent | 016d1c22877ca20f1b31c45270a9d51cad492a04 (diff) | |
Add Scalastyle rule to check lines ending with a ;, fix some instances
Diffstat (limited to 'src/main/scala/Chisel/util')
| -rw-r--r-- | src/main/scala/Chisel/util/Mux.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/scala/Chisel/util/Mux.scala b/src/main/scala/Chisel/util/Mux.scala index 18b5dd53..c2833103 100644 --- a/src/main/scala/Chisel/util/Mux.scala +++ b/src/main/scala/Chisel/util/Mux.scala @@ -52,9 +52,9 @@ object MuxLookup { * @return the value found or the default if not */ def apply[S <: UInt, T <: Bits] (key: S, default: T, mapping: Seq[(S, T)]): T = { - var res = default; + var res = default for ((k, v) <- mapping.reverse) - res = Mux(k === key, v, res); + res = Mux(k === key, v, res) res } @@ -66,9 +66,9 @@ object MuxCase { * @param mapping a set of data values with associated enables * @return the first value in mapping that is enabled */ def apply[T <: Bits] (default: T, mapping: Seq[(Bool, T)]): T = { - var res = default; + var res = default for ((t, v) <- mapping.reverse){ - res = Mux(t, v, res); + res = Mux(t, v, res) } res } |
