From 69ae14b485c67834ad3c9c518ef080cf75ce9b1d Mon Sep 17 00:00:00 2001 From: Jack Koenig Date: Fri, 6 Dec 2019 12:11:28 -0800 Subject: Revert "Compat compile options macro (#1253)" (#1268) This reverts commit 85fe90d5b7ed4e1101b0b3959a1d362eb93915ac.--- src/main/scala/chisel3/compatibility.scala | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) (limited to 'src/main') diff --git a/src/main/scala/chisel3/compatibility.scala b/src/main/scala/chisel3/compatibility.scala index 432446cb..02dfa329 100644 --- a/src/main/scala/chisel3/compatibility.scala +++ b/src/main/scala/chisel3/compatibility.scala @@ -9,17 +9,11 @@ package object Chisel { // scalastyle:ignore package.object.name number.of.t import chisel3.internal.firrtl.Width import scala.language.experimental.macros - import scala.reflect.macros.blackbox.Context - import scala.annotation.{StaticAnnotation, compileTimeOnly} + import scala.annotation.StaticAnnotation + import scala.annotation.compileTimeOnly import scala.language.implicitConversions - - /** Default NotStrict CompileOptions for compatibility code - * - * No longer implicit, materialization macro below provides a low-priority default - */ - @deprecated("Use chisel3.ExplicitCompileOptions.NotStrict", "3.3") - val defaultCompileOptions = chisel3.ExplicitCompileOptions.NotStrict + implicit val defaultCompileOptions = chisel3.ExplicitCompileOptions.NotStrict abstract class Direction case object INPUT extends Direction @@ -590,16 +584,6 @@ package object Chisel { // scalastyle:ignore package.object.name number.of.t val Pipe = chisel3.util.Pipe type Pipe[T <: Data] = chisel3.util.Pipe[T] - /** Provides a low priority NotStrict default. Can be overridden by providing a custom implicit - * val in lexical scope (ie. imported) - * Implemented as a macro to provide a low-priority default - */ - implicit def materializeCompileOptions: CompileOptions = macro materializeCompileOptions_impl - - def materializeCompileOptions_impl(c: Context): c.Tree = { - import c.universe._ - q"_root_.chisel3.ExplicitCompileOptions.NotStrict" - } /** Package for experimental features, which may have their API changed, be removed, etc. * -- cgit v1.2.3