diff options
| author | Jim Lawson | 2017-01-20 09:23:00 -0800 |
|---|---|---|
| committer | GitHub | 2017-01-20 09:23:00 -0800 |
| commit | fb104879321a32bdf52a9ea938fec9538eb3d36e (patch) | |
| tree | 29c6c3e1d1ad26f06f72b45cfe4f2ead7f83aee9 /src | |
| parent | 51fde13c21825f87ee7fc854eb41215e02076bb5 (diff) | |
| parent | 58c1840c7db278417fcceaf035e9df7601233406 (diff) | |
Merge pull request #408 from ucb-bar/scaladocroot
Fix ScalaDoc complaints; add sbt-site, sbt-ghpages boilerplate.
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/scala/firrtl/Compiler.scala | 4 | ||||
| -rw-r--r-- | src/main/scala/firrtl/Utils.scala | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/scala/firrtl/Compiler.scala b/src/main/scala/firrtl/Compiler.scala index 09e1df60..808fa435 100644 --- a/src/main/scala/firrtl/Compiler.scala +++ b/src/main/scala/firrtl/Compiler.scala @@ -28,8 +28,8 @@ case class AnnotationMap(annotations: Seq[Annotation]) { * @constructor Creates a CircuitState object * @param circuit The current state of the Firrtl AST * @param form The current form of the circuit - * @param annotations The current collection of [[Annotation]] - * @param renames A map of [[Named]] things that have been renamed. + * @param annotations The current collection of [[firrtl.annotations.Annotation Annotation]] + * @param renames A map of [[firrtl.annotations.Named Named]] things that have been renamed. * Generally only a return value from [[Transform]]s */ case class CircuitState( diff --git a/src/main/scala/firrtl/Utils.scala b/src/main/scala/firrtl/Utils.scala index 458e479d..bce8e1be 100644 --- a/src/main/scala/firrtl/Utils.scala +++ b/src/main/scala/firrtl/Utils.scala @@ -28,7 +28,7 @@ object Utils extends LazyLogging { result } - /** Removes all [[firrtl.ir.Empty]] statements and condenses + /** Removes all [[firrtl.ir.EmptyStmt]] statements and condenses * [[firrtl.ir.Block]] statements. */ def squashEmpty(s: Statement): Statement = s map squashEmpty match { |