diff --git a/scratchpad/src/main/scala/com/htmlism/scratchpad/Register.scala b/scratchpad/src/main/scala/com/htmlism/scratchpad/Register.scala index a12e9af..0001497 100644 --- a/scratchpad/src/main/scala/com/htmlism/scratchpad/Register.scala +++ b/scratchpad/src/main/scala/com/htmlism/scratchpad/Register.scala @@ -1,17 +1,17 @@ package com.htmlism.scratchpad sealed trait Register[A]: - def self: String + def name: String object Register: given registerA: Register[A] with - def self: String = "A" + def name: String = "A" given registerX: Register[X] with - def self: String = "X" + def name: String = "X" given registerY: Register[Y] with - def self: String = "Y" + def name: String = "Y" object A: given loadA: Load[A] with diff --git a/scratchpad/src/main/scala/com/htmlism/scratchpad/syntax/package.scala b/scratchpad/src/main/scala/com/htmlism/scratchpad/syntax/package.scala index 54b2ae9..e22c06c 100644 --- a/scratchpad/src/main/scala/com/htmlism/scratchpad/syntax/package.scala +++ b/scratchpad/src/main/scala/com/htmlism/scratchpad/syntax/package.scala @@ -14,7 +14,7 @@ package object syntax: summon[Loadable[Addr]].show(x) val register = - summon[Register[R]].self + summon[Register[R]].name val loadInstruction = Load[R].instruction // TODO load action needs to interact with encoder diff --git a/scratchpad/src/test/scala/com/htmlism/scratchpad/RegisterSuite.scala b/scratchpad/src/test/scala/com/htmlism/scratchpad/RegisterSuite.scala index 0d9b2ac..d208aaf 100644 --- a/scratchpad/src/test/scala/com/htmlism/scratchpad/RegisterSuite.scala +++ b/scratchpad/src/test/scala/com/htmlism/scratchpad/RegisterSuite.scala @@ -7,13 +7,13 @@ object RegisterSuite extends FunSuite: ev test("the accumulator is a register") { - expect.eql("A", reg[A].self) + expect.eql("A", reg[A].name) } test("X is a register") { - expect.eql("X", reg[X].self) + expect.eql("X", reg[X].name) } test("Y is a register") { - expect.eql("Y", reg[Y].self) + expect.eql("Y", reg[Y].name) }