From 3f23cb5bca4ea8be889b714008a85141fe5e213c Mon Sep 17 00:00:00 2001 From: Jon Pretty Date: Wed, 8 Nov 2017 11:17:53 +0000 Subject: Added better scaladocs and provide default values --- examples/src/main/scala/default.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'examples/src/main/scala/default.scala') diff --git a/examples/src/main/scala/default.scala b/examples/src/main/scala/default.scala index 1f602f9..55b0753 100644 --- a/examples/src/main/scala/default.scala +++ b/examples/src/main/scala/default.scala @@ -10,15 +10,15 @@ trait Default[T] { def default: T } object Default { type Typeclass[T] = Default[T] - def join[T](ctx: JoinContext[Default, T]): Default[T] = new Default[T] { - def default = ctx.construct { param => param.typeclass.default } + def combine[T](ctx: CaseClass[Default, T]): Default[T] = new Default[T] { + def default = ctx.construct { param => param.default.getOrElse(param.typeclass.default) } } - def dispatch[T](ctx: DispatchContext[Default, T])(): Default[T] = new Default[T] { + def dispatch[T](ctx: SealedTrait[Default, T])(): Default[T] = new Default[T] { def default: T = ctx.subtypes.head.typeclass.default } implicit val string: Default[String] = new Default[String] { def default = "" } implicit val int: Default[Int] = new Default[Int] { def default = 0 } - implicit def generic[T]: Default[T] = macro Magnolia.generic[T] + implicit def gen[T]: Default[T] = macro Magnolia.gen[T] } -- cgit v1.2.3