aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/firrtl/options
diff options
context:
space:
mode:
authorJack Koenig2021-01-26 11:14:33 -0800
committerGitHub2021-01-26 11:14:33 -0800
commitaec9e9e61f9b6775bf313601ec5a44a34f608609 (patch)
tree8ea5b20ce5caeaa0d5d16b9d9859a5b717c7c99c /src/main/scala/firrtl/options
parente32309412f7da6e0e50f4aae23baa79e61857f9b (diff)
Fix post-merge publishing (#2055)
* Check Unidoc on all versions of Scala It is required for publishing and we publish every version * Fix conflicting cross-version suffixes issue When running `sbt ++2.13.4 unidoc`, SBT would set the Scala version for the fuzzer and benchmark projects even though they aren't really relevant to the command. This may be a misconfiguration or a bug in the unidoc plugin. Whatever the case, simply making it possible for them to use the same version of Scala as the firrtl project (on which they depend) fixes the issue. * Match versions of Scala in build.sbt and CI * Fix unidoc issues in 2.13.4 There is some bug in ScalaDoc not finding some links in firrtl.options so those links were made absolute as a workaround.
Diffstat (limited to 'src/main/scala/firrtl/options')
-rw-r--r--src/main/scala/firrtl/options/DependencyManager.scala16
-rw-r--r--src/main/scala/firrtl/options/Stage.scala4
2 files changed, 10 insertions, 10 deletions
diff --git a/src/main/scala/firrtl/options/DependencyManager.scala b/src/main/scala/firrtl/options/DependencyManager.scala
index 39998ed7..5e911940 100644
--- a/src/main/scala/firrtl/options/DependencyManager.scala
+++ b/src/main/scala/firrtl/options/DependencyManager.scala
@@ -91,7 +91,7 @@ trait DependencyManager[A, B <: TransformLike[A] with DependencyAPI[B]] extends
}
while (queue.nonEmpty) {
- val u: Dependency[B] = queue.dequeue
+ val u: Dependency[B] = queue.dequeue()
for (v <- extractor(dependencyToObject(u))) {
if (!blacklist.contains(v) && !edges.contains(v)) {
queue.enqueue(v)
@@ -193,13 +193,13 @@ trait DependencyManager[A, B <: TransformLike[A] with DependencyAPI[B]] extends
)
}
- /** An ordering of [[firrtl.options.TransformLike TransformLike]]s that causes the requested [[DependencyManager.targets
- * targets]] to be executed starting from the [[DependencyManager.currentState currentState]]. This ordering respects
+ /** An ordering of [[firrtl.options.TransformLike TransformLike]]s that causes the requested [[firrtl.options.DependencyManager.targets
+ * targets]] to be executed starting from the [[firrtl.options.DependencyManager.currentState currentState]]. This ordering respects
* prerequisites, optionalPrerequisites, optionalPrerequisiteOf, and invalidates of all constituent
* [[firrtl.options.TransformLike TransformLike]]s. This uses an algorithm that attempts to reduce the number of
- * re-lowerings due to invalidations. Re-lowerings are implemented as new [[DependencyManager]]s.
- * @throws DependencyManagerException if a cycle exists in either the [[DependencyManager.dependencyGraph
- * dependencyGraph]] or the [[DependencyManager.invalidateGraph invalidateGraph]].
+ * re-lowerings due to invalidations. Re-lowerings are implemented as new [[firrtl.options.DependencyManager]]s.
+ * @throws firrtl.options.DependencyManagerException if a cycle exists in either the [[firrtl.options.DependencyManager.dependencyGraph
+ * dependencyGraph]] or the [[firrtl.options.DependencyManager.invalidateGraph invalidateGraph]].
*/
lazy val transformOrder: Seq[B] = {
@@ -244,8 +244,8 @@ trait DependencyManager[A, B <: TransformLike[A] with DependencyAPI[B]] extends
l ++ postprocessing
}
- /** A version of the [[DependencyManager.transformOrder transformOrder]] that flattens the transforms of any internal
- * [[DependencyManager]]s.
+ /** A version of the [[firrtl.options.DependencyManager.transformOrder transformOrder]] that flattens the transforms of any internal
+ * [[firrtl.options.DependencyManager DependencyManager]]s.
*/
lazy val flattenedTransformOrder: Seq[B] = transformOrder.flatMap {
case p: DependencyManager[A, B] => p.flattenedTransformOrder
diff --git a/src/main/scala/firrtl/options/Stage.scala b/src/main/scala/firrtl/options/Stage.scala
index 0783bfb5..cefdd957 100644
--- a/src/main/scala/firrtl/options/Stage.scala
+++ b/src/main/scala/firrtl/options/Stage.scala
@@ -28,7 +28,7 @@ abstract class Stage extends Phase {
/** Execute this stage on some input annotations. Annotations will be read from any input annotation files.
* @param annotations input annotations
* @return output annotations
- * @throws OptionsException if command line or annotation validation fails
+ * @throws firrtl.options.OptionsException if command line or annotation validation fails
*/
final def transform(annotations: AnnotationSeq): AnnotationSeq = {
val annotationsx =
@@ -52,7 +52,7 @@ abstract class Stage extends Phase {
* @param args command line arguments
* @param initialAnnotations annotation
* @return output annotations
- * @throws OptionsException if command line or annotation validation fails
+ * @throws firrtl.options.OptionsException if command line or annotation validation fails
*/
final def execute(args: Array[String], annotations: AnnotationSeq): AnnotationSeq =
transform(shell.parse(args, annotations))