Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Turn off strong enum annotations #916

Merged
merged 2 commits into from
Oct 29, 2018
Merged

Turn off strong enum annotations #916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
972545c
Turned off strong enum annotations because they weren't working with Vec
hngenc Oct 29, 2018
d0243b5
Ignore annotation tests using ScalaTest's 'ignore', rather than by co…
hngenc Oct 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion chiselFrontend/src/main/scala/chisel3/core/StrongEnum.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ object EnumAnnotations {
import EnumAnnotations._


abstract class EnumType(private val factory: EnumFactory, selfAnnotating: Boolean = true) extends Element {
abstract class EnumType(private val factory: EnumFactory, selfAnnotating: Boolean = false) extends Element {
override def cloneType: this.type = factory().asInstanceOf[this.type]

private[core] def compop(sourceInfo: SourceInfo, op: PrimOp, other: EnumType): Bool = {
Expand Down
4 changes: 2 additions & 2 deletions src/test/scala/chiselTests/StrongEnum.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,11 +372,11 @@ class StrongEnumSpec extends ChiselFlatSpec {
}
}

class StrongEnumAnnotationSpec extends FreeSpec with Matchers {
class StrongEnumAnnotationSpec extends ChiselFlatSpec {
import chisel3.experimental.EnumAnnotations._
import firrtl.annotations.ComponentName

"Test that strong enums annotate themselves appropriately" in {
ignore should "Test that strong enums annotate themselves appropriately" in {

def test() = {
Driver.execute(Array("--target-dir", "test_run_dir"), () => new StrongEnumFSM) match {
Expand Down