Skip to content

Commit 761366b

Browse files
Emin017Emin017
authored
adapt Scala3 syntax in ChiselEnum.scala and InstanceSpec.scala (#4598)
* rename enum to enumVal in ChiselEnum.scala In Scala 3, 'enum' is a reserved keyword and cannot be used as a variable name * add parentheses around anonymous function parameters in InstanceSpec.scala In Scala 3, the syntax for anonymous function parameters has changed to require parentheses around the parameter list, even for single parameters. This commit updates the code in InstanceSpec.scala to use the new Scala 3 syntax by adding the required parentheses around the anonymous function parameters.
1 parent 3380196 commit 761366b

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

‎src/test/scala/chiselTests/ChiselEnum.scala‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ class SafeCastFromNonLit extends Module {
8080
val valid = Output(Bool())
8181
})
8282

83-
val (enum, valid) = EnumExample.safe(io.in)
84-
io.out := enum
83+
val (enumVal, valid) = EnumExample.safe(io.in)
84+
io.out := enumVal
8585
io.valid := valid
8686
}
8787

@@ -184,28 +184,28 @@ class LoadStoreExample extends Module {
184184
}
185185

186186
class CastToUIntTester extends BasicTester {
187-
for ((enum, lit) <- EnumExample.all.zip(EnumExample.litValues)) {
187+
for ((enumVal, lit) <- EnumExample.all.zip(EnumExample.litValues)) {
188188
val mod = Module(new CastToUInt)
189-
mod.io.in := enum
189+
mod.io.in := enumVal
190190
assert(mod.io.out === lit)
191191
}
192192
stop()
193193
}
194194

195195
class CastFromLitTester extends BasicTester {
196-
for ((enum, lit) <- EnumExample.all.zip(EnumExample.litValues)) {
196+
for ((enumVal, lit) <- EnumExample.all.zip(EnumExample.litValues)) {
197197
val mod = Module(new CastFromLit(lit))
198-
assert(mod.io.out === enum)
198+
assert(mod.io.out === enumVal)
199199
assert(mod.io.valid === true.B)
200200
}
201201
stop()
202202
}
203203

204204
class CastFromNonLitTester extends BasicTester {
205-
for ((enum, lit) <- EnumExample.all.zip(EnumExample.litValues)) {
205+
for ((enumVal, lit) <- EnumExample.all.zip(EnumExample.litValues)) {
206206
val mod = Module(new CastFromNonLit)
207207
mod.io.in := lit
208-
assert(mod.io.out === enum)
208+
assert(mod.io.out === enumVal)
209209
assert(mod.io.valid === true.B)
210210
}
211211

@@ -223,10 +223,10 @@ class CastFromNonLitTester extends BasicTester {
223223
}
224224

225225
class SafeCastFromNonLitTester extends BasicTester {
226-
for ((enum, lit) <- EnumExample.all.zip(EnumExample.litValues)) {
226+
for ((enumVal, lit) <- EnumExample.all.zip(EnumExample.litValues)) {
227227
val mod = Module(new SafeCastFromNonLit)
228228
mod.io.in := lit
229-
assert(mod.io.out === enum)
229+
assert(mod.io.out === enumVal)
230230
assert(mod.io.valid === true.B)
231231
}
232232

‎src/test/scala/chiselTests/experimental/hierarchy/InstanceSpec.scala‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,7 +1067,7 @@ class InstanceSpec extends ChiselFunSpec with Utils {
10671067
val m = ChiselGeneratorAnnotation(() => {
10681068
new AddTwoMixedModules
10691069
}).elaborate(1).asInstanceOf[DesignAnnotation[AddTwoMixedModules]].design
1070-
aop.Select.instancesOf[AddOne](m.toDefinition).map { i: Instance[AddOne] => i.toTarget } should be(
1070+
aop.Select.instancesOf[AddOne](m.toDefinition).map { (i: Instance[AddOne]) => i.toTarget } should be(
10711071
Seq(
10721072
"~AddTwoMixedModules|AddTwoMixedModules/i0:AddOne".it,
10731073
"~AddTwoMixedModules|AddTwoMixedModules/i1:AddOne_1".it
@@ -1079,8 +1079,8 @@ class InstanceSpec extends ChiselFunSpec with Utils {
10791079
new AddTwoMixedModules
10801080
}).elaborate(1).asInstanceOf[DesignAnnotation[AddTwoMixedModules]].design
10811081
val insts = aop.Select.instancesIn(m.toDefinition)
1082-
val abs = insts.map { i: Instance[BaseModule] => i.toAbsoluteTarget }
1083-
val rel = insts.map { i: Instance[BaseModule] => i.toTarget }
1082+
val abs = insts.map { (i: Instance[BaseModule]) => i.toAbsoluteTarget }
1083+
val rel = insts.map { (i: Instance[BaseModule]) => i.toTarget }
10841084
abs should be(
10851085
Seq(
10861086
"~AddTwoMixedModules|AddTwoMixedModules/i0:AddOne".it,
@@ -1099,8 +1099,8 @@ class InstanceSpec extends ChiselFunSpec with Utils {
10991099
new AddFour
11001100
}).elaborate(1).asInstanceOf[DesignAnnotation[AddFour]].design
11011101
val insts = aop.Select.allInstancesOf[AddOne](m.toDefinition)
1102-
val abs = insts.map { i: Instance[AddOne] => i.in.toAbsoluteTarget }
1103-
val rel = insts.map { i: Instance[AddOne] => i.in.toTarget }
1102+
val abs = insts.map { (i: Instance[AddOne]) => i.in.toAbsoluteTarget }
1103+
val rel = insts.map { (i: Instance[AddOne]) => i.in.toTarget }
11041104
rel should be(
11051105
Seq(
11061106
"~AddFour|AddFour/i0:AddTwoMixedModules/i0:AddOne>in".rt,
@@ -1122,7 +1122,7 @@ class InstanceSpec extends ChiselFunSpec with Utils {
11221122
val m = ChiselGeneratorAnnotation(() => {
11231123
new AddTwoMixedModules
11241124
}).elaborate(1).asInstanceOf[DesignAnnotation[AddTwoMixedModules]].design
1125-
val targets = aop.Select.definitionsOf[AddOne](m.toDefinition).map { i: Definition[AddOne] => i.in.toTarget }
1125+
val targets = aop.Select.definitionsOf[AddOne](m.toDefinition).map { (i: Definition[AddOne]) => i.in.toTarget }
11261126
targets should be(
11271127
Seq(
11281128
"~AddTwoMixedModules|AddOne>in".rt,
@@ -1134,7 +1134,7 @@ class InstanceSpec extends ChiselFunSpec with Utils {
11341134
val m = ChiselGeneratorAnnotation(() => {
11351135
new AddTwoMixedModules
11361136
}).elaborate(1).asInstanceOf[DesignAnnotation[AddTwoMixedModules]].design
1137-
val targets = aop.Select.definitionsIn(m.toDefinition).map { i: Definition[BaseModule] => i.toTarget }
1137+
val targets = aop.Select.definitionsIn(m.toDefinition).map { (i: Definition[BaseModule]) => i.toTarget }
11381138
targets should be(
11391139
Seq(
11401140
"~AddTwoMixedModules|AddOne".mt,
@@ -1146,7 +1146,7 @@ class InstanceSpec extends ChiselFunSpec with Utils {
11461146
val m = ChiselGeneratorAnnotation(() => {
11471147
new AddFour
11481148
}).elaborate(1).asInstanceOf[DesignAnnotation[AddFour]].design
1149-
val targets = aop.Select.allDefinitionsOf[AddOne](m.toDefinition).map { i: Definition[AddOne] => i.in.toTarget }
1149+
val targets = aop.Select.allDefinitionsOf[AddOne](m.toDefinition).map { (i: Definition[AddOne]) => i.in.toTarget }
11501150
targets should be(
11511151
Seq(
11521152
"~AddFour|AddOne>in".rt,
@@ -1164,7 +1164,7 @@ class InstanceSpec extends ChiselFunSpec with Utils {
11641164
val m = ChiselGeneratorAnnotation(() => {
11651165
new AddFour
11661166
}).elaborate(1).asInstanceOf[DesignAnnotation[AddFour]].design
1167-
intercept[Exception] { aop.Select.getDeep(m) { m: BaseModule => Nil } }
1167+
intercept[Exception] { aop.Select.getDeep(m) { (m: BaseModule) => Nil } }
11681168
}
11691169
it("(10.i): Select.instances should fail when combined with hierarchy package") {
11701170
val m = ChiselGeneratorAnnotation(() => {
@@ -1176,10 +1176,10 @@ class InstanceSpec extends ChiselFunSpec with Utils {
11761176
val m = ChiselGeneratorAnnotation(() => {
11771177
new AddFour
11781178
}).elaborate(1).asInstanceOf[DesignAnnotation[AddFour]].design
1179-
val abs = aop.Select.allInstancesOf[AddOne](m.toDefinition).flatMap { i: Instance[AddOne] =>
1179+
val abs = aop.Select.allInstancesOf[AddOne](m.toDefinition).flatMap { (i: Instance[AddOne]) =>
11801180
aop.Select.ios(i).map(_.toAbsoluteTarget)
11811181
}
1182-
val rel = aop.Select.allInstancesOf[AddOne](m.toDefinition).flatMap { i: Instance[AddOne] =>
1182+
val rel = aop.Select.allInstancesOf[AddOne](m.toDefinition).flatMap { (i: Instance[AddOne]) =>
11831183
aop.Select.ios(i).map(_.toTarget)
11841184
}
11851185
abs should be(
@@ -1227,10 +1227,10 @@ class InstanceSpec extends ChiselFunSpec with Utils {
12271227
val m = ChiselGeneratorAnnotation(() => {
12281228
new AddFour
12291229
}).elaborate(1).asInstanceOf[DesignAnnotation[AddFour]].design
1230-
val abs = aop.Select.allDefinitionsOf[AddOne](m.toDefinition).flatMap { i: Definition[AddOne] =>
1230+
val abs = aop.Select.allDefinitionsOf[AddOne](m.toDefinition).flatMap { (i: Definition[AddOne]) =>
12311231
aop.Select.ios(i).map(_.toAbsoluteTarget)
12321232
}
1233-
val rel = aop.Select.allDefinitionsOf[AddOne](m.toDefinition).flatMap { i: Definition[AddOne] =>
1233+
val rel = aop.Select.allDefinitionsOf[AddOne](m.toDefinition).flatMap { (i: Definition[AddOne]) =>
12341234
aop.Select.ios(i).map(_.toTarget)
12351235
}
12361236
abs should be(
@@ -1262,7 +1262,7 @@ class InstanceSpec extends ChiselFunSpec with Utils {
12621262
val m = ChiselGeneratorAnnotation(() => {
12631263
new HasMultipleTypeParamsInside
12641264
}).elaborate(1).asInstanceOf[DesignAnnotation[HasMultipleTypeParamsInside]].design
1265-
val targets = aop.Select.instancesIn(m.toDefinition).map { i: Instance[BaseModule] => i.toTarget }
1265+
val targets = aop.Select.instancesIn(m.toDefinition).map { (i: Instance[BaseModule]) => i.toTarget }
12661266
targets should be(
12671267
Seq(
12681268
"~HasMultipleTypeParamsInside|HasMultipleTypeParamsInside/i00:HasTypeParams".it,
@@ -1278,7 +1278,7 @@ class InstanceSpec extends ChiselFunSpec with Utils {
12781278
new HasMultipleTypeParamsInside
12791279
}).elaborate(1).asInstanceOf[DesignAnnotation[HasMultipleTypeParamsInside]].design
12801280
val targets =
1281-
aop.Select.instancesOf[HasTypeParams[_]](m.toDefinition).map { i: Instance[HasTypeParams[_]] => i.toTarget }
1281+
aop.Select.instancesOf[HasTypeParams[_]](m.toDefinition).map { (i: Instance[HasTypeParams[_]]) => i.toTarget }
12821282
targets should be(
12831283
Seq(
12841284
"~HasMultipleTypeParamsInside|HasMultipleTypeParamsInside/i00:HasTypeParams".it,
@@ -1294,7 +1294,7 @@ class InstanceSpec extends ChiselFunSpec with Utils {
12941294
val m = ChiselGeneratorAnnotation(() => {
12951295
new HasMultipleTypeParamsInside
12961296
}).elaborate(1).asInstanceOf[DesignAnnotation[HasMultipleTypeParamsInside]].design
1297-
val targets = aop.Select.instancesOf[HasTypeParams[SInt]](m.toDefinition).map { i: Instance[HasTypeParams[_]] =>
1297+
val targets = aop.Select.instancesOf[HasTypeParams[SInt]](m.toDefinition).map { (i: Instance[HasTypeParams[_]]) =>
12981298
i.toTarget
12991299
}
13001300
targets should be(

0 commit comments

Comments
 (0)