From 69286c8a8690cdbf633e91b0fd1c78495154cd54 Mon Sep 17 00:00:00 2001
From: Mark Canlas <github@htmlism.com>
Date: Sat, 15 Aug 2020 00:41:18 -0400
Subject: [PATCH] isolate model classes

---
 src/main/scala/com/htmlism/MatchOpcodes.scala                  | 3 ++-
 src/main/scala/com/htmlism/mos6502/dsl/DslDemo.scala           | 2 +-
 .../com/htmlism/mos6502/dsl/IndexedAddressCollection.scala     | 2 +-
 src/main/scala/com/htmlism/mos6502/dsl/Statement.scala         | 2 +-
 .../scala/com/htmlism/{ => mos6502/model}/AddressingMode.scala | 2 +-
 .../scala/com/htmlism/{ => mos6502/model}/Instruction.scala    | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)
 rename src/main/scala/com/htmlism/{ => mos6502/model}/AddressingMode.scala (95%)
 rename src/main/scala/com/htmlism/{ => mos6502/model}/Instruction.scala (99%)

diff --git a/src/main/scala/com/htmlism/MatchOpcodes.scala b/src/main/scala/com/htmlism/MatchOpcodes.scala
index 9de2e73..b1fa12a 100644
--- a/src/main/scala/com/htmlism/MatchOpcodes.scala
+++ b/src/main/scala/com/htmlism/MatchOpcodes.scala
@@ -1,9 +1,10 @@
 package com.htmlism
 
 import cats.implicits._
-
 import java.io.PrintWriter
 
+import com.htmlism.mos6502.model._
+
 object MatchOpcodes {
   def paddedBinary(n: Int, width: Int) =
     String.format(s"%${width}s", Integer.toBinaryString(n)).replace(" ", "0")
diff --git a/src/main/scala/com/htmlism/mos6502/dsl/DslDemo.scala b/src/main/scala/com/htmlism/mos6502/dsl/DslDemo.scala
index eaec723..efec30c 100644
--- a/src/main/scala/com/htmlism/mos6502/dsl/DslDemo.scala
+++ b/src/main/scala/com/htmlism/mos6502/dsl/DslDemo.scala
@@ -2,7 +2,7 @@ package com.htmlism.mos6502.dsl
 
 import scala.collection.mutable.ListBuffer
 import cats.implicits._
-import com.htmlism._
+import com.htmlism.mos6502.model._
 
 object DslDemo extends App {
   val cpu =
diff --git a/src/main/scala/com/htmlism/mos6502/dsl/IndexedAddressCollection.scala b/src/main/scala/com/htmlism/mos6502/dsl/IndexedAddressCollection.scala
index 5e3f361..6210cd1 100644
--- a/src/main/scala/com/htmlism/mos6502/dsl/IndexedAddressCollection.scala
+++ b/src/main/scala/com/htmlism/mos6502/dsl/IndexedAddressCollection.scala
@@ -1,6 +1,6 @@
 package com.htmlism.mos6502.dsl
 
-import com.htmlism._
+import com.htmlism.mos6502.model._
 
 /**
   * A typed collection, like memory mapped to screen pixels. Access by index instead of by address.
diff --git a/src/main/scala/com/htmlism/mos6502/dsl/Statement.scala b/src/main/scala/com/htmlism/mos6502/dsl/Statement.scala
index be14475..638e216 100644
--- a/src/main/scala/com/htmlism/mos6502/dsl/Statement.scala
+++ b/src/main/scala/com/htmlism/mos6502/dsl/Statement.scala
@@ -1,6 +1,6 @@
 package com.htmlism.mos6502.dsl
 
-import com.htmlism._
+import com.htmlism.mos6502.model.Instruction
 
 sealed trait Statement {
   def toAsm: String
diff --git a/src/main/scala/com/htmlism/AddressingMode.scala b/src/main/scala/com/htmlism/mos6502/model/AddressingMode.scala
similarity index 95%
rename from src/main/scala/com/htmlism/AddressingMode.scala
rename to src/main/scala/com/htmlism/mos6502/model/AddressingMode.scala
index f74b34e..e051518 100644
--- a/src/main/scala/com/htmlism/AddressingMode.scala
+++ b/src/main/scala/com/htmlism/mos6502/model/AddressingMode.scala
@@ -1,4 +1,4 @@
-package com.htmlism
+package com.htmlism.mos6502.model
 
 sealed trait AddressingMode
 
diff --git a/src/main/scala/com/htmlism/Instruction.scala b/src/main/scala/com/htmlism/mos6502/model/Instruction.scala
similarity index 99%
rename from src/main/scala/com/htmlism/Instruction.scala
rename to src/main/scala/com/htmlism/mos6502/model/Instruction.scala
index dc12d60..08a7076 100644
--- a/src/main/scala/com/htmlism/Instruction.scala
+++ b/src/main/scala/com/htmlism/mos6502/model/Instruction.scala
@@ -1,4 +1,4 @@
-package com.htmlism
+package com.htmlism.mos6502.model
 
 sealed trait Instruction { def theme: String; def color: String }