From adfdebc920530199a3a4473b7a1230088fec3f5e Mon Sep 17 00:00:00 2001
From: Edward Wang
Date: Mon, 30 Jul 2018 23:39:26 -0400
Subject: Make MixedVec wire init consistent with VecInit

---
 src/main/scala/chisel3/util/MixedVec.scala    | 2 +-
 src/test/scala/chiselTests/MixedVecSpec.scala | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/main/scala/chisel3/util/MixedVec.scala b/src/main/scala/chisel3/util/MixedVec.scala
index 30e5bde8..a687c4cd 100644
--- a/src/main/scala/chisel3/util/MixedVec.scala
+++ b/src/main/scala/chisel3/util/MixedVec.scala
@@ -8,7 +8,7 @@ import chisel3.internal.naming.chiselName
 
 import scala.collection.immutable.ListMap
 
-object MixedVecWireInit {
+object MixedVecInit {
   /**
     * Construct a new wire with the given bound values.
     * This is analogous to [[chisel3.core.VecInit]].
diff --git a/src/test/scala/chiselTests/MixedVecSpec.scala b/src/test/scala/chiselTests/MixedVecSpec.scala
index 64754d2f..271467aa 100644
--- a/src/test/scala/chiselTests/MixedVecSpec.scala
+++ b/src/test/scala/chiselTests/MixedVecSpec.scala
@@ -9,7 +9,7 @@ import chisel3.util._
 import org.scalacheck.Shrink
 
 class MixedVecAssignTester(w: Int, values: List[Int]) extends BasicTester {
-  val v = MixedVecWireInit(values.map(v => v.U(w.W)))
+  val v = MixedVecInit(values.map(v => v.U(w.W)))
   for ((a, b) <- v.zip(values)) {
     assert(a === b.asUInt)
   }
@@ -17,7 +17,7 @@ class MixedVecAssignTester(w: Int, values: List[Int]) extends BasicTester {
 }
 
 class MixedVecRegTester(w: Int, values: List[Int]) extends BasicTester {
-  val valuesInit = MixedVecWireInit(values.map(v => v.U(w.W)))
+  val valuesInit = MixedVecInit(values.map(v => v.U(w.W)))
   val reg = Reg(MixedVec(chiselTypeOf(valuesInit)))
 
   val doneReg = RegInit(false.B)
@@ -44,7 +44,7 @@ class MixedVecIOPassthroughModule[T <: Data](hvec: MixedVec[T]) extends Module {
 }
 
 class MixedVecIOTester(boundVals: Seq[Data]) extends BasicTester {
-  val v = MixedVecWireInit(boundVals)
+  val v = MixedVecInit(boundVals)
   val dut = Module(new MixedVecIOPassthroughModule(MixedVec(chiselTypeOf(v))))
   dut.io.in := v
   for ((a, b) <- dut.io.out.zip(boundVals)) {
@@ -102,7 +102,7 @@ class MixedVecSmallTestBundle extends Bundle {
 
 class MixedVecFromVecTester extends BasicTester {
   val wire = Wire(MixedVec(Vec(3, UInt(8.W))))
-  wire := MixedVecWireInit(Seq(20.U, 40.U, 80.U))
+  wire := MixedVecInit(Seq(20.U, 40.U, 80.U))
 
   assert(wire(0) === 20.U)
   assert(wire(1) === 40.U)
-- 
cgit v1.2.3