Mark Annotation and FixedPoint as experimental (#444)

* Mark Annotation and FixedPoint as experimental
Fix tests and other references to these constructs

* Made experimental imports more specific where possible

1 files changed, 7 insertions, 5 deletions

diff --git a/src/main/scala/chisel3/package.scala b/src/main/scala/chisel3/package.scala
index f20bb453..29095243 100644
--- a/src/main/scala/chisel3/package.scala
+++ b/src/main/scala/chisel3/package.scala
@@ -32,9 +32,6 @@ package object chisel3 {    // scalastyle:ignore package.object.name
   type Element = chisel3.core.Element
   type Bits = chisel3.core.Bits
 
-  type ChiselAnnotation = chisel3.core.ChiselAnnotation
-  val ChiselAnnotation = chisel3.core.ChiselAnnotation
-
   // Some possible regex replacements for the literal specifier deprecation:
   // (note: these are not guaranteed to handle all edge cases! check all replacements!)
   // Bool\((true|false)\)
@@ -133,8 +130,6 @@ package object chisel3 {    // scalastyle:ignore package.object.name
   object UInt extends UIntFactory
   type SInt = chisel3.core.SInt
   object SInt extends SIntFactory
-  type FixedPoint = chisel3.core.FixedPoint
-  val FixedPoint = chisel3.core.FixedPoint
   type Bool = chisel3.core.Bool
   object Bool extends BoolFactory
   val Mux = chisel3.core.Mux
@@ -268,6 +263,13 @@ package object chisel3 {    // scalastyle:ignore package.object.name
     implicit def fromDoubleToDoubleParam(x: Double): DoubleParam = DoubleParam(x)
     implicit def fromStringToStringParam(x: String): StringParam = StringParam(x)
 
+    // Fixed Point is experimental for now
+    type FixedPoint = chisel3.core.FixedPoint
+    val FixedPoint = chisel3.core.FixedPoint
+
+    type ChiselAnnotation = chisel3.core.ChiselAnnotation
+    val ChiselAnnotation = chisel3.core.ChiselAnnotation
+
     implicit class ChiselRange(val sc: StringContext) extends AnyVal {
       import scala.language.experimental.macros
       import internal.firrtl.NumericBound