diff options
| author | Jack Koenig | 2020-07-30 11:22:54 -0700 |
|---|---|---|
| committer | GitHub | 2020-07-30 11:22:54 -0700 |
| commit | 564312c3a813498b3ba5b88c6984b9cbeb94dd12 (patch) | |
| tree | 1b17cd99034a3b8e94fb90ae7c904ea7d0bb1783 /src/main/scala/firrtl/ExecutionOptionsManager.scala | |
| parent | c02c9b7f33d67d8a65040c028395e881668294f6 (diff) | |
| parent | da3a87ed6a8a11da4eedd3cc35af81c18c24957d (diff) | |
Merge pull request #1796 from ekiwi-sifive/scala-2.13-support
Scala 2.13 support
Diffstat (limited to 'src/main/scala/firrtl/ExecutionOptionsManager.scala')
| -rw-r--r-- | src/main/scala/firrtl/ExecutionOptionsManager.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/scala/firrtl/ExecutionOptionsManager.scala b/src/main/scala/firrtl/ExecutionOptionsManager.scala index 2e3cd096..d21ccade 100644 --- a/src/main/scala/firrtl/ExecutionOptionsManager.scala +++ b/src/main/scala/firrtl/ExecutionOptionsManager.scala @@ -77,7 +77,7 @@ case class CommonOptions( } } - def toAnnotations: AnnotationSeq = (if (topName.nonEmpty) Seq(TopNameAnnotation(topName)) else Seq()) ++ + def toAnnotations: AnnotationSeq = List() ++ (if (topName.nonEmpty) Seq(TopNameAnnotation(topName)) else Seq()) ++ (if (targetDirName != ".") Some(TargetDirAnnotation(targetDirName)) else None) ++ Some(LogLevelAnnotation(globalLogLevel)) ++ (if (logToFile) { Some(LogFileAnnotation(None)) } else { None }) ++ @@ -312,7 +312,7 @@ extends ComposableOptions { StageUtils.dramaticWarning("User set FirrtlExecutionOptions.inferRW, but inferRW has no effect!") } - (if (inputFileNameOverride.nonEmpty) Seq(FirrtlFileAnnotation(inputFileNameOverride)) else Seq()) ++ + List() ++ (if (inputFileNameOverride.nonEmpty) Seq(FirrtlFileAnnotation(inputFileNameOverride)) else Seq()) ++ (if (outputFileNameOverride.nonEmpty) { Some(OutputFileAnnotation(outputFileNameOverride)) } else { None }) ++ Some(CompilerAnnotation(compilerName)) ++ Some(InfoModeAnnotation(infoModeName)) ++ |