diff --git a/build.sbt b/build.sbt index ee9d74b..c5d0a2a 100644 --- a/build.sbt +++ b/build.sbt @@ -27,5 +27,4 @@ lazy val demo = .withResolver("rufio") lazy val playground = - module("playground") - .withCats + module("playground").withCats diff --git a/src/main/scala/com/htmlism/mos6502/dsl/syntax/AsmDocSyntax.scala b/src/main/scala/com/htmlism/mos6502/dsl/syntax/AsmDocSyntax.scala index f576085..8c9ebc1 100644 --- a/src/main/scala/com/htmlism/mos6502/dsl/syntax/AsmDocSyntax.scala +++ b/src/main/scala/com/htmlism/mos6502/dsl/syntax/AsmDocSyntax.scala @@ -14,7 +14,7 @@ trait AsmDocSyntax: ctx .push(asmCtx.toFragment) - def group[A](s: String)(f: DefinitionGroupContext => A)(using ctx: AsmDocumentContext): Unit = + def group(s: String)(f: DefinitionGroupContext => Unit)(using ctx: AsmDocumentContext): Unit = val g: DefinitionGroupContext = new DefinitionGroupContext diff --git a/src/main/scala/com/htmlism/mos6502/dsl/syntax/DefinitionGroupSyntax.scala b/src/main/scala/com/htmlism/mos6502/dsl/syntax/DefinitionGroupSyntax.scala index c3ab3ba..ef0b1cf 100644 --- a/src/main/scala/com/htmlism/mos6502/dsl/syntax/DefinitionGroupSyntax.scala +++ b/src/main/scala/com/htmlism/mos6502/dsl/syntax/DefinitionGroupSyntax.scala @@ -11,11 +11,6 @@ trait DefinitionGroupSyntax: definition - def constant(name: String, x: Int)(using ctx: DefinitionGroupContext): Definition[Int] = - val definition = - Definition(name, x) - + def constant(name: String, x: Int)(using ctx: DefinitionGroupContext): Unit = ctx .push(Definition(name, x)) - - definition diff --git a/src/test/scala/com/htmlism/mos6502/dsl/DslSpec.scala b/src/test/scala/com/htmlism/mos6502/dsl/DslSpec.scala index bce4db3..736cc9c 100644 --- a/src/test/scala/com/htmlism/mos6502/dsl/DslSpec.scala +++ b/src/test/scala/com/htmlism/mos6502/dsl/DslSpec.scala @@ -10,7 +10,8 @@ class DslSpec extends AnyFlatSpec with should.Matchers: val doc = asmDoc { implicit ctx => group("constants test") { implicit g => - (constant("margin", 16), constant("secret", 42)) + constant("margin", 16) + constant("secret", 42) } }