Refactor barstools for new versions of things.

- No handlebars (not being published for Scala 2.12)
- Update for new annotations APIs

Bump sbt-dependency-graph to 0.9.2 for this scala version
This commit is contained in:
Paul Rigge
2018-12-19 22:54:46 +00:00
committed by John Wright
parent 4727d475c7
commit f310d45381
9 changed files with 122 additions and 130 deletions

View File

@@ -752,7 +752,7 @@ object MacroCompiler extends App {
// Note: the last macro in the input list is (seemingly arbitrarily)
// determined as the firrtl "top-level module".
val circuit = Circuit(NoInfo, macros, macros.last.name)
val annotations = AnnotationMap(
val annotations = AnnotationSeq(
Seq(MacroCompilerAnnotation(
circuit.main,
MacroCompilerAnnotation.Params(
@@ -764,7 +764,7 @@ object MacroCompiler extends App {
)
))
)
val state = CircuitState(circuit, HighForm, Some(annotations))
val state = CircuitState(circuit, HighForm, annotations)
// Run the compiler.
val result = new MacroCompiler().compileAndEmit(state)