From 35d5523647d2824149e7f5a401187462b5de1505 Mon Sep 17 00:00:00 2001
From: Mark Canlas <github@htmlism.com>
Date: Sat, 15 Aug 2020 14:45:08 -0400
Subject: [PATCH] defintion groups

---
 .../com/htmlism/mos6502/dsl/AsmDocumentContext.scala      | 8 ++++----
 src/main/scala/com/htmlism/mos6502/dsl/package.scala      | 8 ++++----
 src/test/scala/com/htmlism/mos6502/dsl/DslSpec.scala      | 6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/scala/com/htmlism/mos6502/dsl/AsmDocumentContext.scala b/src/main/scala/com/htmlism/mos6502/dsl/AsmDocumentContext.scala
index 2a9ab25..e6565f0 100644
--- a/src/main/scala/com/htmlism/mos6502/dsl/AsmDocumentContext.scala
+++ b/src/main/scala/com/htmlism/mos6502/dsl/AsmDocumentContext.scala
@@ -19,17 +19,17 @@ sealed trait TopLevelAsmDocumentFragment
 
 sealed trait AsmBlockFragment extends TopLevelAsmDocumentFragment
 
-case class DefineGroup(comment: String, xs: List[Definition[_]]) extends TopLevelAsmDocumentFragment
+case class DefinitionGroup(comment: String, xs: List[Definition[_]]) extends TopLevelAsmDocumentFragment
 
-class DefineGroupContext {
+class DefinitionGroupContext {
   private val xs: ListBuffer[Definition[_]] =
     ListBuffer()
 
   def push(x: Definition[_]): Unit =
     xs.append(x)
 
-  def toGroup(s: String): DefineGroup =
-    DefineGroup(s, xs.toList)
+  def toGroup(s: String): DefinitionGroup =
+    DefinitionGroup(s, xs.toList)
 }
 
 case class Definition[A : Operand](name: String, x: A)
diff --git a/src/main/scala/com/htmlism/mos6502/dsl/package.scala b/src/main/scala/com/htmlism/mos6502/dsl/package.scala
index 179012b..00818f2 100644
--- a/src/main/scala/com/htmlism/mos6502/dsl/package.scala
+++ b/src/main/scala/com/htmlism/mos6502/dsl/package.scala
@@ -11,9 +11,9 @@ package object dsl {
       .toDoc
   }
 
-  def group(s: String)(f: DefineGroupContext => Unit)(implicit ctx: AsmDocumentContext): Unit = {
-    val g: DefineGroupContext =
-      new DefineGroupContext
+  def group(s: String)(f: DefinitionGroupContext => Unit)(implicit ctx: AsmDocumentContext): Unit = {
+    val g: DefinitionGroupContext =
+      new DefinitionGroupContext
 
     f(g)
 
@@ -21,7 +21,7 @@ package object dsl {
       .push(g.toGroup(s))
   }
 
-  def define[A : Operand](name: String, x: A)(implicit ctx: DefineGroupContext): Unit =
+  def define[A : Operand](name: String, x: A)(implicit ctx: DefinitionGroupContext): Unit =
     ctx
       .push(Definition(name, x))
 
diff --git a/src/test/scala/com/htmlism/mos6502/dsl/DslSpec.scala b/src/test/scala/com/htmlism/mos6502/dsl/DslSpec.scala
index 3db6749..9c5a811 100644
--- a/src/test/scala/com/htmlism/mos6502/dsl/DslSpec.scala
+++ b/src/test/scala/com/htmlism/mos6502/dsl/DslSpec.scala
@@ -28,18 +28,18 @@ class DslSpec extends AnyFlatSpec with should.Matchers {
       }
 
     doc shouldEqual AsmDocument(List(
-      DefineGroup("snake things", List(
+      DefinitionGroup("snake things", List(
         Definition("snakeBodyStart", 0x12.z),
         Definition("snakeDirection", 0x02.z),
         Definition("snakeLength", 0x03.z)
       )),
-      DefineGroup("ASCII values of keys controlling the snake", List(
+      DefinitionGroup("ASCII values of keys controlling the snake", List(
         Definition("ASCII_w", 0x77),
         Definition("ASCII_a", 0x61),
         Definition("ASCII_s", 0x73),
         Definition("ASCII_d", 0x64)
       )),
-      DefineGroup("System variables", List(
+      DefinitionGroup("System variables", List(
         Definition("sysRandom", 0xfe),
         Definition("sysLastKey", 0xff)
       ))