diff --git a/src/main/scala/com/htmlism/mos6502/dsl/BitField.scala b/src/main/scala/com/htmlism/mos6502/dsl/BitField.scala index 7433938..6303346 100644 --- a/src/main/scala/com/htmlism/mos6502/dsl/BitField.scala +++ b/src/main/scala/com/htmlism/mos6502/dsl/BitField.scala @@ -3,7 +3,7 @@ package com.htmlism.mos6502.dsl import cats.data.NonEmptyList trait BitField[A] { - def comment: String + def definitionGroupComment: String /** * An ordered list of every status in this bit field diff --git a/src/main/scala/com/htmlism/mos6502/dsl/Mapping.scala b/src/main/scala/com/htmlism/mos6502/dsl/Mapping.scala index 535aaaf..3765844 100644 --- a/src/main/scala/com/htmlism/mos6502/dsl/Mapping.scala +++ b/src/main/scala/com/htmlism/mos6502/dsl/Mapping.scala @@ -6,7 +6,7 @@ import cats.data.NonEmptyList * Like an enum, but values are specified */ trait Mapping[A] { - def comment: String + def definitionGroupComment: String /** * An ordered list of every value in this enumeration 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 f8f774c..cb7b69e 100644 --- a/src/main/scala/com/htmlism/mos6502/dsl/syntax/AsmDocSyntax.scala +++ b/src/main/scala/com/htmlism/mos6502/dsl/syntax/AsmDocSyntax.scala @@ -58,7 +58,7 @@ trait AsmDocSyntax { val grp = DefinitionGroup( - ev.comment, + ev.definitionGroupComment, xs .map { case (s, n) => @@ -78,7 +78,7 @@ trait AsmDocSyntax { val grp = DefinitionGroup( - ev.comment, + ev.definitionGroupComment, xs .map { case (s, n) => diff --git a/src/test/scala/com/htmlism/mos6502/dsl/DslSpec.scala b/src/test/scala/com/htmlism/mos6502/dsl/DslSpec.scala index f25095d..b3b521e 100644 --- a/src/test/scala/com/htmlism/mos6502/dsl/DslSpec.scala +++ b/src/test/scala/com/htmlism/mos6502/dsl/DslSpec.scala @@ -180,7 +180,7 @@ case object Right extends TestDirection object TestDirection { implicit val bitFieldDirection: BitField[TestDirection] = new BitField[TestDirection] { - def comment: String = + def definitionGroupComment: String = "foo as bit field" def all: NonEmptyList[TestDirection] = @@ -195,7 +195,7 @@ object TestDirection { implicit val mappingDirection: Mapping[TestDirection] = new Mapping[TestDirection] { - def comment: String = + def definitionGroupComment: String = "foo as a mapping" def all: NonEmptyList[TestDirection] = diff --git a/src/test/scala/com/htmlism/mos6502/dsl/snake/AsciiValue.scala b/src/test/scala/com/htmlism/mos6502/dsl/snake/AsciiValue.scala index fd58e0f..c4dcfc4 100644 --- a/src/test/scala/com/htmlism/mos6502/dsl/snake/AsciiValue.scala +++ b/src/test/scala/com/htmlism/mos6502/dsl/snake/AsciiValue.scala @@ -6,8 +6,8 @@ import cats.data.NonEmptyList object AsciiValue { implicit val asciiValueMapping: Mapping[AsciiValue] = new Mapping[AsciiValue] { - def comment: String = - "foo as a mapping" + def definitionGroupComment: String = + "ASCII values of keys controlling the snake" def all: NonEmptyList[AsciiValue] = NonEmptyList.of(AsciiW, AsciiA, AsciiS, AsciiD) diff --git a/src/test/scala/com/htmlism/mos6502/dsl/snake/Direction.scala b/src/test/scala/com/htmlism/mos6502/dsl/snake/Direction.scala index 330763b..dfb9ca8 100644 --- a/src/test/scala/com/htmlism/mos6502/dsl/snake/Direction.scala +++ b/src/test/scala/com/htmlism/mos6502/dsl/snake/Direction.scala @@ -6,8 +6,8 @@ import cats.data.NonEmptyList object Direction { implicit val directionBitField: BitField[Direction] = new BitField[Direction] { - def comment: String = - "foo as bit field" + def definitionGroupComment: String = + "Directions" def all: NonEmptyList[Direction] = NonEmptyList.of(Up, Down, Left, Right) diff --git a/src/test/scala/com/htmlism/mos6502/dsl/snake/Easy6502Spec.scala b/src/test/scala/com/htmlism/mos6502/dsl/snake/Easy6502Spec.scala index 3d3a522..2d2a7cb 100644 --- a/src/test/scala/com/htmlism/mos6502/dsl/snake/Easy6502Spec.scala +++ b/src/test/scala/com/htmlism/mos6502/dsl/snake/Easy6502Spec.scala @@ -77,6 +77,8 @@ class Easy6502Spec extends AnyFlatSpec with should.Matchers { val initSnake = sub("initSnake") { implicit a => snakeDirection.write(Right) + + snakeLength.read } val generateApplePosition =