diff options
Diffstat (limited to 'core/shared')
-rw-r--r-- | core/shared/src/main/scala/interface.scala | 10 | ||||
-rw-r--r-- | core/shared/src/main/scala/magnolia.scala | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/core/shared/src/main/scala/interface.scala b/core/shared/src/main/scala/interface.scala index f0f104c..05803f0 100644 --- a/core/shared/src/main/scala/interface.scala +++ b/core/shared/src/main/scala/interface.scala @@ -12,10 +12,10 @@ trait Subtype[Typeclass[_], Type] { /** the type of subtype */ type SType <: Type - /** the name of the subtype + /** the [[TypeName]] of the subtype * - * This is the fully-qualified name of the type of subclass. */ - def label: String + * This is the full name information for the type of subclass. */ + def typeName: TypeName /** the typeclass instance associated with this subtype * @@ -186,6 +186,6 @@ final class SealedTrait[Typeclass[_], Type](val typeName: TypeName, /** * Provides the different parts of a type's class name. */ -final case class TypeName(ownerName: String, short: String) { - def full: String = s"$ownerName.$short" +final case class TypeName(owner: String, short: String) { + def full: String = s"$owner.$short" }
\ No newline at end of file diff --git a/core/shared/src/main/scala/magnolia.scala b/core/shared/src/main/scala/magnolia.scala index c2fe742..b61d1c0 100644 --- a/core/shared/src/main/scala/magnolia.scala +++ b/core/shared/src/main/scala/magnolia.scala @@ -376,7 +376,7 @@ object Magnolia { val assignments = typeclasses.zipWithIndex.map { case ((typ, typeclass), idx) => q"""$subtypesVal($idx) = $magnoliaPkg.Magnolia.subtype[$typeConstructor, $genericType, $typ]( - ${s"${typ.typeSymbol.owner.fullName}.${typ.typeSymbol.name.decodedName}"}, + $magnoliaPkg.TypeName(${typ.typeSymbol.owner.fullName}, ${typ.typeSymbol.name.decodedName.toString}), $typeclass, (t: $genericType) => t.isInstanceOf[$typ], (t: $genericType) => t.asInstanceOf[$typ] @@ -459,10 +459,10 @@ object Magnolia { * * This method is intended to be called only from code generated by the Magnolia macro, and * should not be called directly from users' code. */ - def subtype[Tc[_], T, S <: T](name: String, tc: => Tc[S], isType: T => Boolean, asType: T => S): Subtype[Tc, T] = + def subtype[Tc[_], T, S <: T](name: TypeName, tc: => Tc[S], isType: T => Boolean, asType: T => S): Subtype[Tc, T] = new Subtype[Tc, T] with PartialFunction[T, S] { type SType = S - def label: String = name + def typeName: TypeName = name def typeclass: Tc[SType] = tc def cast: PartialFunction[T, SType] = this def isDefinedAt(t: T) = isType(t) |