definable

data/print-three-lower.asm

@@ -1,11 +1,11 @@
-  ; $0200 = #$01
+  ; $0200 = White
   lda #$01
   sta $0200
 
-  ; $0201 = #$03
+  ; $0201 = Green
-  lda #$03
+  lda #$05
   sta $0201
 
-  ; $0202 = #$05
+  ; $0202 = Orange
-  lda #$05
+  lda #$08
   sta $0202

data/print-three-upper.asm

@@ -1,11 +1,11 @@
-  ; $0200 = #$01
+  ; $0200 = White
   LDA #$01
   STA $0200
 
-  ; $0201 = #$03
+  ; $0201 = Green
-  LDA #$03
+  LDA #$05
   STA $0201
 
-  ; $0202 = #$05
+  ; $0202 = Orange
-  LDA #$05
+  LDA #$08
   STA $0202

firepower-core/src/main/scala/com/htmlism/firepower/core/AssemblerOptions.scala

@@ -7,7 +7,7 @@ case class AssemblerOptions(
 
 object AssemblerOptions:
   enum DefinitionsMode:
-    case InlineDefinitions, UseDefinitions, UseDefinitionsWithMath
+    case UseLiterals, UseDefinitions, UseDefinitionsWithMath
 
   enum InstructionCase:
     case Uppercase, Lowercase

firepower-demo/src/main/scala/com/htmlism/firepower/demo/Definable.scala

@@ -0,0 +1,6 @@
+package com.htmlism.firepower.demo
+
+trait Definable[A]:
+  extension (x: A) def toComment: String
+
+  extension (x: A) def toValue: Int

firepower-demo/src/main/scala/com/htmlism/firepower/demo/Easy6502.scala

@@ -0,0 +1,16 @@
+package com.htmlism.firepower.demo
+
+object Easy6502:
+  enum Color:
+    case Black, White, Red, Cyan, Purple, Green, Blue, Yellow, Orange, Brown, LightRed, DarkGrey, Grey, LightGreen,
+      LightBlue, LightGrey
+
+  object Color:
+    given Definable[Color] with
+      extension (x: Color)
+        def toComment: String =
+          x.toString
+
+      extension (x: Color)
+        def toValue: Int =
+          x.ordinal

firepower-demo/src/main/scala/com/htmlism/firepower/demo/PrintPrograms.scala

@@ -31,10 +31,10 @@ object PrintPrograms extends ZIOAppDefault:
         .pipe(Line.mkString),
       "annotated-snake.asm"   -> AnnotatedSnake.program,
       "print-three-upper.asm" -> PrintThree.assemble(
-        AssemblerOptions(InstructionCase.Uppercase, DefinitionsMode.InlineDefinitions)
+        AssemblerOptions(InstructionCase.Uppercase, DefinitionsMode.UseLiterals)
       ),
       "print-three-lower.asm" -> PrintThree.assemble(
-        AssemblerOptions(InstructionCase.Lowercase, DefinitionsMode.InlineDefinitions)
+        AssemblerOptions(InstructionCase.Lowercase, DefinitionsMode.UseLiterals)
       )
     )
 

firepower-demo/src/main/scala/com/htmlism/firepower/demo/PrintThree.scala

@@ -8,22 +8,25 @@ import com.htmlism.firepower.core.AsmBlock._
 import com.htmlism.firepower.core._
 
 object PrintThree:
-  case class Move(src: String, dest: String)
+  case class Move[A: Definable](src: A, dest: String)
 
-  val program: List[Move] =
+  val program: List[Move[Easy6502.Color]] =
     List(
-      Move("#$01", "$0200"),
+      Move(Easy6502.Color.White, "$0200"),
-      Move("#$03", "$0201"),
+      Move(Easy6502.Color.Green, "$0201"),
-      Move("#$05", "$0202")
+      Move(Easy6502.Color.Orange, "$0202")
     )
 
   def assemble(opt: AssemblerOptions): String =
     program
       .map { mv =>
+        val hex =
+          f"#$$${mv.src.toValue}%02X"
+
         AsmBlock.Intent(
-          s"${mv.dest} = ${mv.src}".some,
+          s"${mv.dest} = ${mv.src.toComment}".some,
           List(
-            AsmBlock.Intent.Instruction(instruction("LDA", opt.instructionCase) + " " + mv.src, None),
+            AsmBlock.Intent.Instruction(instruction("LDA", opt.instructionCase) + " " + hex, None),
             AsmBlock.Intent.Instruction(instruction("STA", opt.instructionCase) + " " + mv.dest, None)
           )
         )