diff options
43 files changed, 1802 insertions, 455 deletions
diff --git a/benchmarks/2.11/src/adt.scala b/benchmarks/2.11/src/adt.scala index 902d2d8..69dbae0 100644 --- a/benchmarks/2.11/src/adt.scala +++ b/benchmarks/2.11/src/adt.scala @@ -16,16 +16,48 @@ case class Address(line1: String, occupant: Human) sealed trait Alphabet -case class Greek(άλφα: Letter, βήτα: Letter, γάμα: Letter, δέλτα: Letter, έψιλον: Letter, ζήτα: Letter, ήτα: Letter, θήτα: Letter) extends Alphabet -case class Cyrillic(б: Letter, в: Letter, г: Letter, д: Letter, ж: Letter, з: Letter) extends Alphabet -case class Latin(a: Letter, b: Letter, c: Letter, d: Letter, e: Letter, f: Letter, g: Letter, h: Letter, i: Letter, j: Letter, k: Letter, l: Letter, m: Letter, n: Letter, o: Letter, p: Letter, q: Letter, r: Letter, s: Letter, t: Letter, u: Letter, v: Letter) extends Alphabet +case class Greek(άλφα: Letter, + βήτα: Letter, + γάμα: Letter, + δέλτα: Letter, + έψιλον: Letter, + ζήτα: Letter, + ήτα: Letter, + θήτα: Letter) + extends Alphabet + +case class Cyrillic(б: Letter, в: Letter, г: Letter, д: Letter, ж: Letter, з: Letter) + extends Alphabet + +case class Latin(a: Letter, + b: Letter, + c: Letter, + d: Letter, + e: Letter, + f: Letter, + g: Letter, + h: Letter, + i: Letter, + j: Letter, + k: Letter, + l: Letter, + m: Letter, + n: Letter, + o: Letter, + p: Letter, + q: Letter, + r: Letter, + s: Letter, + t: Letter, + u: Letter, + v: Letter) + extends Alphabet case class Letter(name: String, phonetic: String) case class Country(name: String, language: Language, leader: Person, existence: DateRange) case class Language(name: String, code: String, alphabet: Alphabet) case class Person(name: String, dateOfBirth: Date) case class Date(year: Int, month: Month, day: Int) - case class DateRange(from: Date, toDate: Date) sealed trait Month diff --git a/benchmarks/2.11/src/magnolia/gadt_100.scala b/benchmarks/2.11/src/magnolia/gadt_100.scala index e392642..0956584 100644 --- a/benchmarks/2.11/src/magnolia/gadt_100.scala +++ b/benchmarks/2.11/src/magnolia/gadt_100.scala @@ -55,7 +55,7 @@ object Gen { Eq.generic[adt.GTree[String]] Eq.generic[adt.GTree[String]] Eq.generic[adt.GTree[String]] - + Eq.generic[adt.GTree[String]] Eq.generic[adt.GTree[String]] Eq.generic[adt.GTree[String]] diff --git a/benchmarks/2.11/src/magnolia/small_100.scala b/benchmarks/2.11/src/magnolia/small_100.scala index b9eb9ed..ca29739 100644 --- a/benchmarks/2.11/src/magnolia/small_100.scala +++ b/benchmarks/2.11/src/magnolia/small_100.scala @@ -55,7 +55,7 @@ object Gen { Show.generic[adt.Letter] Show.generic[adt.Letter] Show.generic[adt.Letter] - + Show.generic[adt.Letter] Show.generic[adt.Letter] Show.generic[adt.Letter] diff --git a/benchmarks/2.12-tl/src/adt.scala b/benchmarks/2.12-tl/src/adt.scala new file mode 100644 index 0000000..69dbae0 --- /dev/null +++ b/benchmarks/2.12-tl/src/adt.scala @@ -0,0 +1,75 @@ +package adt + +sealed trait Tree +case class Leaf(value: String) extends Tree +case class Branch(left: Tree, right: Tree) extends Tree + +sealed trait GTree[+T] +case class GLeaf[+T](value: String) extends GTree[T] +case class GBranch[+T](left: GTree[T], right: GTree[T]) extends GTree[T] + +sealed trait Entity + +case class Company(name: String) extends Entity +case class Human(name: String, age: Int) extends Entity +case class Address(line1: String, occupant: Human) + +sealed trait Alphabet + +case class Greek(άλφα: Letter, + βήτα: Letter, + γάμα: Letter, + δέλτα: Letter, + έψιλον: Letter, + ζήτα: Letter, + ήτα: Letter, + θήτα: Letter) + extends Alphabet + +case class Cyrillic(б: Letter, в: Letter, г: Letter, д: Letter, ж: Letter, з: Letter) + extends Alphabet + +case class Latin(a: Letter, + b: Letter, + c: Letter, + d: Letter, + e: Letter, + f: Letter, + g: Letter, + h: Letter, + i: Letter, + j: Letter, + k: Letter, + l: Letter, + m: Letter, + n: Letter, + o: Letter, + p: Letter, + q: Letter, + r: Letter, + s: Letter, + t: Letter, + u: Letter, + v: Letter) + extends Alphabet + +case class Letter(name: String, phonetic: String) +case class Country(name: String, language: Language, leader: Person, existence: DateRange) +case class Language(name: String, code: String, alphabet: Alphabet) +case class Person(name: String, dateOfBirth: Date) +case class Date(year: Int, month: Month, day: Int) +case class DateRange(from: Date, toDate: Date) + +sealed trait Month +case object Jan extends Month +case object Feb extends Month +case object Mar extends Month +case object Apr extends Month +case object May extends Month +case object Jun extends Month +case object Jul extends Month +case object Aug extends Month +case object Sep extends Month +case object Oct extends Month +case object Nov extends Month +case object Dec extends Month diff --git a/benchmarks/2.12-tl/src/kittens/complex.scala b/benchmarks/2.12-tl/src/kittens/complex.scala new file mode 100644 index 0000000..70d0d95 --- /dev/null +++ b/benchmarks/2.12-tl/src/kittens/complex.scala @@ -0,0 +1,28 @@ +import adt._ +import cats._ +import derived._ +import cats.Show +import cats.instances.all._ + +object Gen { + derive.eq[Country] + derive.eq[Country] + derive.eq[Country] + derive.eq[Country] + derive.eq[Country] + derive.eq[Country] + derive.eq[Country] + derive.eq[Country] + derive.eq[Country] + derive.eq[Country] + derive.eq[Country] + derive.eq[Country] + derive.eq[Country] + derive.eq[Country] + derive.eq[Country] + derive.eq[Country] + derive.eq[Country] + derive.eq[Country] + derive.eq[Country] + derive.eq[Country] +} diff --git a/benchmarks/2.12-tl/src/kittens/eq_10.scala b/benchmarks/2.12-tl/src/kittens/eq_10.scala new file mode 100644 index 0000000..bed5915 --- /dev/null +++ b/benchmarks/2.12-tl/src/kittens/eq_10.scala @@ -0,0 +1,18 @@ +import adt._ +import cats._ +import derived._ +import cats.Eq +import cats.instances.all._ + +object Gen { + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] +} diff --git a/benchmarks/2.12-tl/src/kittens/eq_50.scala b/benchmarks/2.12-tl/src/kittens/eq_50.scala new file mode 100644 index 0000000..cac774d --- /dev/null +++ b/benchmarks/2.12-tl/src/kittens/eq_50.scala @@ -0,0 +1,63 @@ +import adt._ +import cats._ +import derived._ +import cats.Eq +import cats.instances.all._ + +object Gen { + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + derive.eq[Alphabet] + +} diff --git a/benchmarks/2.12-tl/src/kittens/gadt_100.scala b/benchmarks/2.12-tl/src/kittens/gadt_100.scala new file mode 100644 index 0000000..aa6710d --- /dev/null +++ b/benchmarks/2.12-tl/src/kittens/gadt_100.scala @@ -0,0 +1,118 @@ +import adt._ +import cats._ +import derived._ +import cats.eq +import cats.instances.all._ + +object Gen { + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + derive.eq[GTree[String]] + +} diff --git a/benchmarks/2.12-tl/src/kittens/obj.scala b/benchmarks/2.12-tl/src/kittens/obj.scala new file mode 100644 index 0000000..c01199e --- /dev/null +++ b/benchmarks/2.12-tl/src/kittens/obj.scala @@ -0,0 +1,118 @@ +import adt._ +import cats._ +import derived._ +import cats.Show +import cats.instances.all._ + +object Gen { + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + derive.show[Jan.type] + +} diff --git a/benchmarks/2.12-tl/src/kittens/show_10.scala b/benchmarks/2.12-tl/src/kittens/show_10.scala new file mode 100644 index 0000000..5c2a28c --- /dev/null +++ b/benchmarks/2.12-tl/src/kittens/show_10.scala @@ -0,0 +1,18 @@ +import adt._ +import cats._ +import derived._ +import cats.Show +import cats.instances.all._ + +object Gen { + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] +} diff --git a/benchmarks/2.12-tl/src/kittens/show_50.scala b/benchmarks/2.12-tl/src/kittens/show_50.scala new file mode 100644 index 0000000..afd085b --- /dev/null +++ b/benchmarks/2.12-tl/src/kittens/show_50.scala @@ -0,0 +1,63 @@ +import adt._ +import cats._ +import derived._ +import cats.Show +import cats.instances.all._ + +object Gen { + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + derive.show[Alphabet] + +} diff --git a/benchmarks/2.12-tl/src/kittens/show_tree_50.scala b/benchmarks/2.12-tl/src/kittens/show_tree_50.scala new file mode 100644 index 0000000..18ac6d9 --- /dev/null +++ b/benchmarks/2.12-tl/src/kittens/show_tree_50.scala @@ -0,0 +1,63 @@ +import adt._ +import cats._ +import derived._ +import cats.Show +import cats.instances.all._ + +object Gen { + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + derive.show[Tree] + +} diff --git a/benchmarks/2.12-tl/src/kittens/small_100.scala b/benchmarks/2.12-tl/src/kittens/small_100.scala new file mode 100644 index 0000000..51d922d --- /dev/null +++ b/benchmarks/2.12-tl/src/kittens/small_100.scala @@ -0,0 +1,118 @@ +import adt._ +import cats._ +import derived._ +import cats.Show +import cats.instances.all._ + +object Gen { + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + derive.show[Letter] + +} diff --git a/benchmarks/2.12-tl/src/magnolia/complex.scala b/benchmarks/2.12-tl/src/magnolia/complex.scala new file mode 100644 index 0000000..f843c29 --- /dev/null +++ b/benchmarks/2.12-tl/src/magnolia/complex.scala @@ -0,0 +1,24 @@ +import magnolia._, examples._ + +object Gen { + Eq.generic[adt.Country] + Eq.generic[adt.Country] + Eq.generic[adt.Country] + Eq.generic[adt.Country] + Eq.generic[adt.Country] + Eq.generic[adt.Country] + Eq.generic[adt.Country] + Eq.generic[adt.Country] + Eq.generic[adt.Country] + Eq.generic[adt.Country] + Eq.generic[adt.Country] + Eq.generic[adt.Country] + Eq.generic[adt.Country] + Eq.generic[adt.Country] + Eq.generic[adt.Country] + Eq.generic[adt.Country] + Eq.generic[adt.Country] + Eq.generic[adt.Country] + Eq.generic[adt.Country] + Eq.generic[adt.Country] +} diff --git a/benchmarks/2.12-tl/src/magnolia/eq_10.scala b/benchmarks/2.12-tl/src/magnolia/eq_10.scala new file mode 100644 index 0000000..b6adf78 --- /dev/null +++ b/benchmarks/2.12-tl/src/magnolia/eq_10.scala @@ -0,0 +1,14 @@ +import magnolia._, examples._ + +object Gen { + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] +} diff --git a/benchmarks/2.12-tl/src/magnolia/eq_50.scala b/benchmarks/2.12-tl/src/magnolia/eq_50.scala new file mode 100644 index 0000000..b1dd036 --- /dev/null +++ b/benchmarks/2.12-tl/src/magnolia/eq_50.scala @@ -0,0 +1,59 @@ +import magnolia._, examples._ + +object Gen { + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + Eq.generic[adt.Alphabet] + +} diff --git a/benchmarks/2.12-tl/src/magnolia/gadt_100.scala b/benchmarks/2.12-tl/src/magnolia/gadt_100.scala new file mode 100644 index 0000000..0956584 --- /dev/null +++ b/benchmarks/2.12-tl/src/magnolia/gadt_100.scala @@ -0,0 +1,113 @@ +import magnolia._, examples._ + +object Gen { + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] + Eq.generic[adt.GTree[String]] +} diff --git a/benchmarks/2.12-tl/src/magnolia/obj.scala b/benchmarks/2.12-tl/src/magnolia/obj.scala new file mode 100644 index 0000000..0dd82cf --- /dev/null +++ b/benchmarks/2.12-tl/src/magnolia/obj.scala @@ -0,0 +1,114 @@ +import magnolia._, examples._ + +object Gen { + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + Show.generic[adt.Jan.type] + +} diff --git a/benchmarks/2.12-tl/src/magnolia/show_10.scala b/benchmarks/2.12-tl/src/magnolia/show_10.scala new file mode 100644 index 0000000..c6f4a1c --- /dev/null +++ b/benchmarks/2.12-tl/src/magnolia/show_10.scala @@ -0,0 +1,14 @@ +import magnolia._, examples._ + +object Gen { + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] +} diff --git a/benchmarks/2.12-tl/src/magnolia/show_50.scala b/benchmarks/2.12-tl/src/magnolia/show_50.scala new file mode 100644 index 0000000..27cfbae --- /dev/null +++ b/benchmarks/2.12-tl/src/magnolia/show_50.scala @@ -0,0 +1,58 @@ +import magnolia._, examples._ + +object Gen { + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] + Show.generic[adt.Alphabet] +} diff --git a/benchmarks/2.12-tl/src/magnolia/show_tree_50.scala b/benchmarks/2.12-tl/src/magnolia/show_tree_50.scala new file mode 100644 index 0000000..a06513a --- /dev/null +++ b/benchmarks/2.12-tl/src/magnolia/show_tree_50.scala @@ -0,0 +1,58 @@ +import magnolia._, examples._ + +object Gen { + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] + Show.generic[adt.Tree] +} diff --git a/benchmarks/2.12-tl/src/magnolia/small_100.scala b/benchmarks/2.12-tl/src/magnolia/small_100.scala new file mode 100644 index 0000000..ca29739 --- /dev/null +++ b/benchmarks/2.12-tl/src/magnolia/small_100.scala @@ -0,0 +1,113 @@ +import magnolia._, examples._ + +object Gen { + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] + Show.generic[adt.Letter] +} diff --git a/benchmarks/2.12/src/adt.scala b/benchmarks/2.12/src/adt.scala index 902d2d8..69dbae0 100644 --- a/benchmarks/2.12/src/adt.scala +++ b/benchmarks/2.12/src/adt.scala @@ -16,16 +16,48 @@ case class Address(line1: String, occupant: Human) sealed trait Alphabet -case class Greek(άλφα: Letter, βήτα: Letter, γάμα: Letter, δέλτα: Letter, έψιλον: Letter, ζήτα: Letter, ήτα: Letter, θήτα: Letter) extends Alphabet -case class Cyrillic(б: Letter, в: Letter, г: Letter, д: Letter, ж: Letter, з: Letter) extends Alphabet -case class Latin(a: Letter, b: Letter, c: Letter, d: Letter, e: Letter, f: Letter, g: Letter, h: Letter, i: Letter, j: Letter, k: Letter, l: Letter, m: Letter, n: Letter, o: Letter, p: Letter, q: Letter, r: Letter, s: Letter, t: Letter, u: Letter, v: Letter) extends Alphabet +case class Greek(άλφα: Letter, + βήτα: Letter, + γάμα: Letter, + δέλτα: Letter, + έψιλον: Letter, + ζήτα: Letter, + ήτα: Letter, + θήτα: Letter) + extends Alphabet + +case class Cyrillic(б: Letter, в: Letter, г: Letter, д: Letter, ж: Letter, з: Letter) + extends Alphabet + +case class Latin(a: Letter, + b: Letter, + c: Letter, + d: Letter, + e: Letter, + f: Letter, + g: Letter, + h: Letter, + i: Letter, + j: Letter, + k: Letter, + l: Letter, + m: Letter, + n: Letter, + o: Letter, + p: Letter, + q: Letter, + r: Letter, + s: Letter, + t: Letter, + u: Letter, + v: Letter) + extends Alphabet case class Letter(name: String, phonetic: String) case class Country(name: String, language: Language, leader: Person, existence: DateRange) case class Language(name: String, code: String, alphabet: Alphabet) case class Person(name: String, dateOfBirth: Date) case class Date(year: Int, month: Month, day: Int) - case class DateRange(from: Date, toDate: Date) sealed trait Month diff --git a/benchmarks/2.12/src/magnolia/gadt_100.scala b/benchmarks/2.12/src/magnolia/gadt_100.scala index e392642..0956584 100644 --- a/benchmarks/2.12/src/magnolia/gadt_100.scala +++ b/benchmarks/2.12/src/magnolia/gadt_100.scala @@ -55,7 +55,7 @@ object Gen { Eq.generic[adt.GTree[String]] Eq.generic[adt.GTree[String]] Eq.generic[adt.GTree[String]] - + Eq.generic[adt.GTree[String]] Eq.generic[adt.GTree[String]] Eq.generic[adt.GTree[String]] diff --git a/benchmarks/2.12/src/magnolia/small_100.scala b/benchmarks/2.12/src/magnolia/small_100.scala index b9eb9ed..ca29739 100644 --- a/benchmarks/2.12/src/magnolia/small_100.scala +++ b/benchmarks/2.12/src/magnolia/small_100.scala @@ -55,7 +55,7 @@ object Gen { Show.generic[adt.Letter] Show.generic[adt.Letter] Show.generic[adt.Letter] - + Show.generic[adt.Letter] Show.generic[adt.Letter] Show.generic[adt.Letter] @@ -1,86 +1,67 @@ import com.typesafe.sbt.pgp.PgpKeys.publishSigned -import ReleaseTransformations._ -import sbtcrossproject.{crossProject, CrossType} - -lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform) - .crossType(CrossType.Pure) +lazy val core = project .in(file("core")) .settings(buildSettings: _*) .settings(publishSettings: _*) .settings(scalaMacroDependencies: _*) - .settings(examplesDependencies) .settings(moduleName := "magnolia") - .nativeSettings(nativeSettings) - -lazy val coreJVM = core.jvm -lazy val coreJS = core.js -lazy val coreNative = core.native -lazy val examples = crossProject(JSPlatform, JVMPlatform, NativePlatform) - .crossType(CrossType.Pure) +lazy val examples = project .in(file("examples")) .settings(buildSettings: _*) .settings(publishSettings: _*) .settings(moduleName := "magnolia-examples") - .settings(quasiQuotesDependencies) - .settings(examplesDependencies) - .nativeSettings(nativeSettings) .dependsOn(core) -lazy val examplesJVM = examples.jvm -lazy val examplesJS = examples.js -lazy val examplesNative = examples.native - -lazy val tests = crossProject(JSPlatform, JVMPlatform, NativePlatform) - .crossType(CrossType.Pure) +lazy val tests = project .in(file("tests")) .settings(buildSettings: _*) .settings(noPublishSettings: _*) + .settings(unmanagedSettings) .settings(moduleName := "magnolia-tests") - .settings(quasiQuotesDependencies) - .nativeSettings(nativeSettings) .dependsOn(examples) -lazy val testsJVM = tests.jvm -lazy val testsJS = tests.js -lazy val testsNative = tests.native - -lazy val benchmarks = crossProject(JSPlatform, JVMPlatform, NativePlatform) - .crossType(CrossType.Pure) +lazy val benchmarks = project .in(file("benchmarks")) .settings(buildSettings: _*) .settings(noPublishSettings: _*) .settings(moduleName := "magnolia-benchmarks") - .settings(quasiQuotesDependencies) - .nativeSettings(nativeSettings) .dependsOn(examples) -lazy val benchmarksJVM = benchmarks.jvm -lazy val benchmarksJS = benchmarks.js -lazy val benchmarksNative = benchmarks.native - lazy val buildSettings = Seq( organization := "com.propensive", scalaVersion := "2.12.4", name := "magnolia", - version := "0.4.0", - scalacOptions ++= Seq("-deprecation", "-feature", "-Ywarn-value-discard", "-Ywarn-dead-code", "-Ywarn-nullary-unit", "-Ywarn-numeric-widen", "-Ywarn-inaccessible", "-Ywarn-adapted-args"), - crossScalaVersions := Seq("2.10.6", "2.11.11", "2.12.2"), - scmInfo := Some(ScmInfo(url("https://github.com/propensive/magnolia"), - "scm:git:git@github.com:propensive/magnolia.git")) + version := "0.5.0", + scalacOptions ++= Seq( + "-deprecation", + "-feature", + "-Ywarn-value-discard", + "-Ywarn-dead-code", + "-Ywarn-nullary-unit", + "-Ywarn-numeric-widen", + "-Ywarn-inaccessible", + "-Ywarn-adapted-args" + ), + scmInfo := Some( + ScmInfo(url("https://github.com/propensive/magnolia"), + "scm:git:git@github.com:propensive/magnolia.git") + ) ) lazy val publishSettings = Seq( - homepage := Some(url("http://magnolia.propensive.com/")), + homepage := Some(url("http://magnolia.work/")), licenses := Seq("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt")), autoAPIMappings := true, publishMavenStyle := true, publishArtifact in Test := false, - pomIncludeRepository := { _ => false }, + pomIncludeRepository := { _ => + false + }, publishTo := { val nexus = "https://oss.sonatype.org/" - if(isSnapshot.value) + if (isSnapshot.value) Some("snapshots" at nexus + "content/repositories/snapshots") else Some("releases" at nexus + "service/local/staging/deploy/maven2") @@ -93,68 +74,33 @@ lazy val publishSettings = Seq( <url>https://github.com/propensive/magnolia/</url> </developer> </developers> - ), - releaseProcess := Seq[ReleaseStep]( - checkSnapshotDependencies, - inquireVersions, - runTest, - setReleaseVersion, - commitReleaseVersion, - tagRelease, - publishArtifacts, - setNextVersion, - commitNextVersion, - ReleaseStep(action = Command.process("sonatypeReleaseAll", _)), - pushChanges - ), - releaseCrossBuild := true, - releasePublishArtifactsAction := PgpKeys.publishSigned.value + ) ) lazy val noPublishSettings = Seq( - publish := (), - publishLocal := (), + publish := (()), + publishLocal := (()), publishArtifact := false ) import java.io.File -def crossVersionSharedSources() = Seq( - (unmanagedSourceDirectories in Compile) ++= { (unmanagedSourceDirectories in Compile ).value.map { - dir:File => new File(dir.getPath + "_" + scalaBinaryVersion.value)}} -) - -lazy val nativeSettings: Seq[Setting[_]] = Seq( - // Scala Native not yet available for 2.12.x, so override the versions - scalaVersion := "2.11.11", - crossScalaVersions := Seq("2.10.6", "2.11.11") -) - -lazy val quasiQuotesDependencies: Seq[Setting[_]] = - libraryDependencies ++= { - CrossVersion.partialVersion(scalaVersion.value) match { - case Some((2, scalaMajor)) if scalaMajor >= 11 => Seq() - case Some((2, 10)) => Seq( - compilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full), - "org.scalamacros" %% "quasiquotes" % "2.1.0" cross CrossVersion.binary - ) - } - } +lazy val unmanagedSettings = unmanagedBase := (scalaVersion.value.split("\\.").map(_.toInt).to[List] match { + case List(2, 12, _) => baseDirectory.value / "lib" / "2.12" + case List(2, 11, _) => baseDirectory.value / "lib" / "2.11" +}) lazy val scalaMacroDependencies: Seq[Setting[_]] = Seq( libraryDependencies += "org.typelevel" %% "macro-compat" % "1.1.1", libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value, libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value, - libraryDependencies += compilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full) -) - -lazy val examplesDependencies: Seq[Setting[_]] = Seq( - libraryDependencies += "org.typelevel" %% "cats-core" % "0.9.0", - libraryDependencies += "com.propensive" %% "estrapade" % "1.0.3", - libraryDependencies += "com.propensive" %% "contextual-data" % "1.0.3" + libraryDependencies += compilerPlugin( + "org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full + ) ) credentials ++= (for { username <- Option(System.getenv().get("SONATYPE_USERNAME")) password <- Option(System.getenv().get("SONATYPE_PASSWORD")) -} yield Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", username, password)).toSeq +} yield + Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", username, password)).toSeq diff --git a/core/src/main/scala/interface.scala b/core/src/main/scala/interface.scala index ecc4379..30b473a 100644 --- a/core/src/main/scala/interface.scala +++ b/core/src/main/scala/interface.scala @@ -3,23 +3,23 @@ package magnolia import language.higherKinds /** represents a subtype of a sealed trait - * - * @tparam Typeclass type constructor for the typeclass being derived - * @tparam Type generic type of this parameter */ + * + * @tparam Typeclass type constructor for the typeclass being derived + * @tparam Type generic type of this parameter */ trait Subtype[Typeclass[_], Type] { - + /** the type of subtype */ type SType <: Type /** the name of the subtype - * - * This is the fully-qualified name of the type of subclass. */ + * + * This is the fully-qualified name of the type of subclass. */ def label: String - + /** the typeclass instance associated with this subtype - * - * This is the instance of the type `Typeclass[SType]` which will have been discovered by - * implicit search, or derived by Magnolia. */ + * + * This is the instance of the type `Typeclass[SType]` which will have been discovered by + * implicit search, or derived by Magnolia. */ def typeclass: Typeclass[SType] /** partial function defined the subset of values of `Type` which have the type of this subtype */ @@ -27,107 +27,108 @@ trait Subtype[Typeclass[_], Type] { } /** represents a parameter of a case class - * - * @tparam Typeclass type constructor for the typeclass being derived - * @tparam Type generic type of this parameter */ + * + * @tparam Typeclass type constructor for the typeclass being derived + * @tparam Type generic type of this parameter */ trait Param[Typeclass[_], Type] { - + /** the type of the parameter being represented - * - * For exmaple, for a case class, - * <pre> - * case class Person(name: String, age: Int) - * </pre> - * the [[Param]] instance corresponding to the `age` parameter would have a [[PType]] equal to - * the type [[scala.Int]]. However, in practice, this type will never be universally quantified. - */ + * + * For exmaple, for a case class, + * <pre> + * case class Person(name: String, age: Int) + * </pre> + * the [[Param]] instance corresponding to the `age` parameter would have a [[PType]] equal to + * the type [[scala.Int]]. However, in practice, this type will never be universally quantified. + */ type PType - + /** the name of the parameter */ def label: String /** the typeclass instance associated with this parameter - * - * This is the instance of the type `Typeclass[PType]` which will have been discovered by - * implicit search, or derived by Magnolia. - * - * Its type is existentially quantified on this [[Param]] instance, and depending on the - * nature of the particular typeclass, it may either accept or produce types which are also - * existentially quantified on this same [[Param]] instance. */ + * + * This is the instance of the type `Typeclass[PType]` which will have been discovered by + * implicit search, or derived by Magnolia. + * + * Its type is existentially quantified on this [[Param]] instance, and depending on the + * nature of the particular typeclass, it may either accept or produce types which are also + * existentially quantified on this same [[Param]] instance. */ def typeclass: Typeclass[PType] /** provides the default value for this parameter, as defined in the case class constructor */ def default: Option[PType] /** dereferences a value of the case class type, `Type`, to access the value of the parameter - * being represented - * - * When programming generically, against an unknown case class, with unknown parameter names - * and types, it is not possible to directly access the parameter values without reflection, - * which is undesirable. This method, whose implementation is provided by the Magnolia macro, - * will dereference a case class instance to access the parameter corresponding to this - * [[Param]]. - * - * Whilst the type of the resultant parameter value cannot be universally known at the use, its - * type will be existentially quantified on this [[Param]] instance, and the return type of the - * corresponding `typeclass` method will be existentially quantified on the same value. This is - * sufficient for the compiler to determine that the two values are compatible, and the value may - * be applied to the typeclass (in whatever way that particular typeclass provides). - * - * @param param the instance of the case class to be dereferenced - * @return the parameter value */ + * being represented + * + * When programming generically, against an unknown case class, with unknown parameter names + * and types, it is not possible to directly access the parameter values without reflection, + * which is undesirable. This method, whose implementation is provided by the Magnolia macro, + * will dereference a case class instance to access the parameter corresponding to this + * [[Param]]. + * + * Whilst the type of the resultant parameter value cannot be universally known at the use, its + * type will be existentially quantified on this [[Param]] instance, and the return type of the + * corresponding `typeclass` method will be existentially quantified on the same value. This is + * sufficient for the compiler to determine that the two values are compatible, and the value may + * be applied to the typeclass (in whatever way that particular typeclass provides). + * + * @param param the instance of the case class to be dereferenced + * @return the parameter value */ def dereference(param: Type): PType } /** represents a case class or case object and the context required to construct a new typeclass - * instance corresponding to it - * - * Instances of [[CaseClass]] provide access to all of the parameters of the case class, the full - * name of the case class type, and a boolean to determine whether the type is a case class or case - * object. - * - * @param typeName the name of the case class - * @param isObject true only if this represents a case object rather than a case class - * @param parametersArray an array of [[Param]] values for this case class - * @tparam Typeclass type constructor for the typeclass being derived - * @tparam Type generic type of this parameter */ -abstract class CaseClass[Typeclass[_], Type] private[magnolia]( + * instance corresponding to it + * + * Instances of [[CaseClass]] provide access to all of the parameters of the case class, the full + * name of the case class type, and a boolean to determine whether the type is a case class or case + * object. + * + * @param typeName the name of the case class + * @param isObject true only if this represents a case object rather than a case class + * @param parametersArray an array of [[Param]] values for this case class + * @tparam Typeclass type constructor for the typeclass being derived + * @tparam Type generic type of this parameter */ +abstract class CaseClass[Typeclass[_], Type] private[magnolia] ( val typeName: String, val isObject: Boolean, - parametersArray: Array[Param[Typeclass, Type]]) { + parametersArray: Array[Param[Typeclass, Type]] +) { /** constructs a new instance of the case class type - * - * This method will be implemented by the Magnolia macro to make it possible to construct - * instances of case classes generically in user code, that is, without knowing their type - * concretely. - * - * To construct a new case class instance, the method takes a lambda which defines how each - * parameter in the new case class should be constructed. See the [[Param]] class for more - * information on constructing parameter values from a [[Param]] instance. - * - * @param makeParam lambda for converting a generic [[Param]] into the value to be used for - * this parameter in the construction of a new instance of the case class - * @return a new instance of the case class */ + * + * This method will be implemented by the Magnolia macro to make it possible to construct + * instances of case classes generically in user code, that is, without knowing their type + * concretely. + * + * To construct a new case class instance, the method takes a lambda which defines how each + * parameter in the new case class should be constructed. See the [[Param]] class for more + * information on constructing parameter values from a [[Param]] instance. + * + * @param makeParam lambda for converting a generic [[Param]] into the value to be used for + * this parameter in the construction of a new instance of the case class + * @return a new instance of the case class */ def construct[Return](makeParam: Param[Typeclass, Type] => Return): Type - + /** a sequence of [[Param]] objects representing all of the parameters in the case class - * - * For efficiency, this sequence is implemented by an `Array`, but upcast to a - * [[scala.collection.Seq]] to hide the mutable collection API. */ + * + * For efficiency, this sequence is implemented by an `Array`, but upcast to a + * [[scala.collection.Seq]] to hide the mutable collection API. */ def parameters: Seq[Param[Typeclass, Type]] = parametersArray } /** represents a sealed trait and the context required to construct a new typeclass instance - * corresponding to it - * - * Instances of `SealedTrait` provide access to all of the component subtypes of the sealed trait - * which form a coproduct, and to the fully-qualified name of the sealed trait. - * - * @param typeName the name of the sealed trait - * @param subtypesArray an array of [[Subtype]] instances for each subtype in the sealed trait - * @tparam Typeclass type constructor for the typeclass being derived - * @tparam Type generic type of this parameter */ + * corresponding to it + * + * Instances of `SealedTrait` provide access to all of the component subtypes of the sealed trait + * which form a coproduct, and to the fully-qualified name of the sealed trait. + * + * @param typeName the name of the sealed trait + * @param subtypesArray an array of [[Subtype]] instances for each subtype in the sealed trait + * @tparam Typeclass type constructor for the typeclass being derived + * @tparam Type generic type of this parameter */ final class SealedTrait[Typeclass[_], Type](val typeName: String, subtypesArray: Array[Subtype[Typeclass, Type]]) { @@ -135,16 +136,21 @@ final class SealedTrait[Typeclass[_], Type](val typeName: String, def subtypes: Seq[Subtype[Typeclass, Type]] = subtypesArray /** convenience method for delegating typeclass application to the typeclass corresponding to the - * subtype of the sealed trait which matches the type of the `value` - * - * @tparam Return the return type of the lambda, which should be inferred - * @param value the instance of the generic type whose value should be used to match on a - * particular subtype of the sealed trait - * @param handle lambda for applying the value to the typeclass for the particular subtype which - * matches - * @return the result of applying the `handle` lambda to subtype of the sealed trait which - * matches the parameter `value` */ + * subtype of the sealed trait which matches the type of the `value` + * + * @tparam Return the return type of the lambda, which should be inferred + * @param value the instance of the generic type whose value should be used to match on a + * particular subtype of the sealed trait + * @param handle lambda for applying the value to the typeclass for the particular subtype which + * matches + * @return the result of applying the `handle` lambda to subtype of the sealed trait which + * matches the parameter `value` */ def dispatch[Return](value: Type)(handle: Subtype[Typeclass, Type] => Return): Return = - subtypes.map { sub => sub.cast.andThen { v => handle(sub) } }.reduce(_ orElse _)(value) + subtypes + .map { sub => + sub.cast.andThen { v => + handle(sub) + } + } + .reduce(_ orElse _)(value) } - diff --git a/core/src/main/scala/magnolia.scala b/core/src/main/scala/magnolia.scala index a2c164e..293d0f1 100644 --- a/core/src/main/scala/magnolia.scala +++ b/core/src/main/scala/magnolia.scala @@ -10,62 +10,67 @@ object Magnolia { import CompileTimeState._ /** derives a generic typeclass instance for the type `T` - * - * This is a macro definition method which should be bound to a method defined inside a Magnolia - * generic derivation object, that is, one which defines the methods `combine`, `dispatch` and - * the type constructor, `Typeclass[_]`. This will typically look like, - * <pre> - * object Derivation { - * // other definitions - * implicit def gen[T]: Typeclass[T] = Magnolia.gen[T] - * } - * </pre> - * which would support automatic derivation of typeclass instances by calling `Derivation.gen[T]` - * or with `implicitly[Typeclass[T]]`, if the implicit method is imported into the current scope. - * - * The definition expects a type constructor called `Typeclass`, taking one *-kinded type - * parameter to be defined on the same object as a means of determining how the typeclass should - * be genericized. While this may be obvious for typeclasses like `Show[T]` which take only a - * single type parameter, Magnolia can also derive typeclass instances for types such as - * `Decoder[Format, Type]` which would typically fix the `Format` parameter while varying the - * `Type` parameter. - * - * While there is no "interface" for a derivation, in the object-oriented sense, the Magnolia - * macro expects to be able to call certain methods on the object within which it is bound to a - * method. - * - * Specifically, for deriving case classes (product types), the macro will attempt to call the - * `combine` method with an instance of [[CaseClass]], like so, - * <pre> - * <derivation>.combine(<caseClass>): Typeclass[T] - * </pre> - * That is to say, the macro expects there to exist a method called `combine` on the derivation - * object, which may be called with the code above, and for it to return a type which conforms to - * the type `Typeclass[T]`. The implementation of `combine` will therefore typically look like - * this, - * <pre> - * def combine[T](caseClass: CaseClass[Typeclass, T]): Typeclass[T] = ... - * </pre> - * however, there is the flexibility to provide additional type parameters or additional implicit - * parameters to the definition, provided these do not affect its ability to be invoked as - * described above. - * - * Likewise, for deriving sealed traits (coproduct or sum types), the macro will attempt to call - * the `dispatch` method with an instance of [[SealedTrait]], like so, - * <pre> - * <derivation>.dispatch(<sealedTrait>): Typeclass[T] - * </pre> - * so a definition such as, - * <pre> - * def dispatch[T](sealedTrait: SealedTrait[Typeclass, T]): Typeclass[T] = ... - * </pre> - * will suffice, however the qualifications regarding additional type parameters and implicit - * parameters apply equally to `dispatch` as to `combine`. - * */ + * + * This is a macro definition method which should be bound to a method defined inside a Magnolia + * generic derivation object, that is, one which defines the methods `combine`, `dispatch` and + * the type constructor, `Typeclass[_]`. This will typically look like, + * <pre> + * object Derivation { + * // other definitions + * implicit def gen[T]: Typeclass[T] = Magnolia.gen[T] + * } + * </pre> + * which would support automatic derivation of typeclass instances by calling + * `Derivation.gen[T]` or with `implicitly[Typeclass[T]]`, if the implicit method is imported + * into the current scope. + * + * The definition expects a type constructor called `Typeclass`, taking one *-kinded type + * parameter to be defined on the same object as a means of determining how the typeclass should + * be genericized. While this may be obvious for typeclasses like `Show[T]` which take only a + * single type parameter, Magnolia can also derive typeclass instances for types such as + * `Decoder[Format, Type]` which would typically fix the `Format` parameter while varying the + * `Type` parameter. + * + * While there is no "interface" for a derivation, in the object-oriented sense, the Magnolia + * macro expects to be able to call certain methods on the object within which it is bound to a + * method. + * + * Specifically, for deriving case classes (product types), the macro will attempt to call the + * `combine` method with an instance of [[CaseClass]], like so, + * <pre> + * <derivation>.combine(<caseClass>): Typeclass[T] + * </pre> + * That is to say, the macro expects there to exist a method called `combine` on the derivation + * object, which may be called with the code above, and for it to return a type which conforms + * to the type `Typeclass[T]`. The implementation of `combine` will therefore typically look + * like this, + * <pre> + * def combine[T](caseClass: CaseClass[Typeclass, T]): Typeclass[T] = ... + * </pre> + * however, there is the flexibility to provide additional type parameters or additional + * implicit parameters to the definition, provided these do not affect its ability to be invoked + * as described above. + * + * Likewise, for deriving sealed traits (coproduct or sum types), the macro will attempt to call + * the `dispatch` method with an instance of [[SealedTrait]], like so, + * <pre> + * <derivation>.dispatch(<sealedTrait>): Typeclass[T] + * </pre> + * so a definition such as, + * <pre> + * def dispatch[T](sealedTrait: SealedTrait[Typeclass, T]): Typeclass[T] = ... + * </pre> + * will suffice, however the qualifications regarding additional type parameters and implicit + * parameters apply equally to `dispatch` as to `combine`. + * */ def gen[T: c.WeakTypeTag](c: whitebox.Context): c.Tree = { import c.universe._ import scala.util.{Try, Success, Failure} + val magnoliaPkg = q"_root_.magnolia" + val magnoliaObj = q"$magnoliaPkg.Magnolia" + val arrayCls = tq"_root_.scala.Array" + val typeConstructor: c.Type = c.prefix.tree.tpe.member(TypeName("Typeclass")).asType.toType.typeConstructor @@ -74,70 +79,88 @@ object Magnolia { case class Typeclass(typ: c.Type, tree: c.Tree) - def recurse[T](path: TypePath, key: Type, value: TermName)(fn: => T): - Option[T] = { + def recurse[T](path: TypePath, key: Type, value: TermName)(fn: => T): Option[T] = { + val oldRecursionStack = recursionStack.get(c.enclosingPosition) recursionStack = recursionStack.updated( c.enclosingPosition, - recursionStack.get(c.enclosingPosition).map(_.push(path, key, value)).getOrElse( - Stack(Map(), List(Frame(path, key, value)), Nil)) + oldRecursionStack.map(_.push(path, key, value)).getOrElse { + Stack(Map(), List(Frame(path, key, value)), Nil) + } ) - try Some(fn) catch { case e: Exception => None } finally { + try Some(fn) + catch { case e: Exception => None } finally { val currentStack = recursionStack(c.enclosingPosition) - recursionStack = recursionStack.updated(c.enclosingPosition, - currentStack.pop()) + recursionStack = recursionStack.updated(c.enclosingPosition, currentStack.pop()) } } val removeDeferred: Transformer = new Transformer { override def transform(tree: Tree): Tree = tree match { - case q"_root_.magnolia.Deferred.apply[$returnType](${Literal(Constant(method: String))})" => + case q"$magnoliaPkg.Deferred.apply[$returnType](${Literal(Constant(method: String))})" => q"${TermName(method)}" case _ => super.transform(tree) } } - def typeclassTree(paramName: Option[String], genericType: Type, typeConstructor: Type, + def typeclassTree(paramName: Option[String], + genericType: Type, + typeConstructor: Type, assignedName: TermName): Tree = { - + val searchType = appliedType(typeConstructor, genericType) - - findType(genericType).map { methodName => + + val deferredRef = findType(genericType).map { methodName => val methodAsString = methodName.encodedName.toString - q"_root_.magnolia.Deferred.apply[$searchType]($methodAsString)" - }.orElse { - val (inferredImplicit, newStack) = recursionStack(c.enclosingPosition).lookup(c)(searchType) { - scala.util.Try { - val genericTypeName: String = genericType.typeSymbol.name.encodedName.toString.toLowerCase - val assignedName: TermName = TermName(c.freshName(s"${genericTypeName}Typeclass")) - recurse(ChainedImplicit(genericType.toString), genericType, assignedName) { - c.inferImplicitValue(searchType, false, false) - }.get - }.toOption.orElse(directInferImplicit(genericType, typeConstructor).map(_.tree)) - } + q"$magnoliaPkg.Deferred.apply[$searchType]($methodAsString)" + } + + val foundImplicit = deferredRef.orElse { + val (inferredImplicit, newStack) = + recursionStack(c.enclosingPosition).lookup(c)(searchType) { + val implicitSearchTry = scala.util.Try { + val genericTypeName: String = + genericType.typeSymbol.name.encodedName.toString.toLowerCase + + val assignedName: TermName = TermName(c.freshName(s"${genericTypeName}Typeclass")) + + recurse(ChainedImplicit(genericType.toString), genericType, assignedName) { + c.inferImplicitValue(searchType, false, false) + }.get + } + + implicitSearchTry.toOption.orElse( + directInferImplicit(genericType, typeConstructor).map(_.tree) + ) + } recursionStack = recursionStack.updated(c.enclosingPosition, newStack) inferredImplicit - }.getOrElse { + } + + foundImplicit.getOrElse { val currentStack: Stack = recursionStack(c.enclosingPosition) val error = ImplicitNotFound(genericType.toString, - recursionStack(c.enclosingPosition).frames.map(_.path)) + recursionStack(c.enclosingPosition).frames.map(_.path)) val updatedStack = currentStack.copy(errors = error :: currentStack.errors) recursionStack = recursionStack.updated(c.enclosingPosition, updatedStack) - val stack = recursionStack(c.enclosingPosition).frames.map(_.path).mkString(" in ", "\n in ", "\n") - c.abort(c.enclosingPosition, s"magnolia: could not find typeclass for type $genericType\n$stack") + + val stackPaths = recursionStack(c.enclosingPosition).frames.map(_.path) + val stack = stackPaths.mkString(" in ", "\n in ", "\n") + + c.abort(c.enclosingPosition, + s"magnolia: could not find typeclass for type $genericType\n$stack") } } - def directInferImplicit(genericType: c.Type, - typeConstructor: Type): Option[Typeclass] = { + def directInferImplicit(genericType: c.Type, typeConstructor: Type): Option[Typeclass] = { val genericTypeName: String = genericType.typeSymbol.name.encodedName.toString.toLowerCase val assignedName: TermName = TermName(c.freshName(s"${genericTypeName}Typeclass")) val typeSymbol = genericType.typeSymbol - val classType = if(typeSymbol.isClass) Some(typeSymbol.asClass) else None + val classType = if (typeSymbol.isClass) Some(typeSymbol.asClass) else None val isCaseClass = classType.map(_.isCaseClass).getOrElse(false) val isCaseObject = classType.map(_.isModuleClass).getOrElse(false) val isSealedTrait = classType.map(_.isSealed).getOrElse(false) @@ -146,78 +169,103 @@ object Magnolia { val resultType = appliedType(typeConstructor, genericType) // FIXME: Handle AnyVals - val result = if(isCaseObject) { + val result = if (isCaseObject) { // FIXME: look for an alternative which isn't deprecated on Scala 2.12+ val obj = genericType.typeSymbol.companionSymbol.asTerm val className = obj.fullName val impl = q""" - ${c.prefix}.combine(_root_.magnolia.Magnolia.caseClass[$typeConstructor, $genericType]( - $className, true, new _root_.scala.Array(0), _ => $obj) + ${c.prefix}.combine($magnoliaObj.caseClass[$typeConstructor, $genericType]( + $className, true, new $arrayCls(0), _ => $obj) ) """ Some(Typeclass(genericType, impl)) - } else if(isCaseClass) { + } else if (isCaseClass) { val caseClassParameters = genericType.decls.collect { case m: MethodSymbol if m.isCaseAccessor => m.asMethod } val className = genericType.typeSymbol.fullName - case class CaseParam(sym: c.universe.MethodSymbol, typeclass: c.Tree, paramType: c.Type, ref: c.TermName) - - val caseParams: List[CaseParam] = caseClassParameters.foldLeft(List[CaseParam]()) { case (acc, param) => - val paramName = param.name.encodedName.toString - val paramType = param.returnType.substituteTypes(genericType.etaExpand.typeParams, genericType.typeArgs) + case class CaseParam(sym: c.universe.MethodSymbol, + typeclass: c.Tree, + paramType: c.Type, + ref: c.TermName) + + val caseParamsReversed: List[CaseParam] = caseClassParameters.foldLeft(List[CaseParam]()) { + case (acc, param) => + val paramName = param.name.encodedName.toString + val paramType = param.returnType.substituteTypes(genericType.etaExpand.typeParams, + genericType.typeArgs) + + val predefinedRef = acc.find(_.paramType == paramType) + + val caseParamOpt = predefinedRef.map { backRef => + CaseParam(param, q"()", paramType, backRef.ref) :: acc + } + + caseParamOpt.getOrElse { + val derivedImplicit = + recurse(ProductType(paramName, genericType.toString), genericType, assignedName) { + typeclassTree(Some(paramName), paramType, typeConstructor, assignedName) + }.getOrElse( + c.abort(c.enclosingPosition, s"failed to get implicit for type $genericType") + ) + + val ref = TermName(c.freshName("paramTypeclass")) + val assigned = q"""val $ref = $derivedImplicit""" + CaseParam(param, assigned, paramType, ref) :: acc + } + } - acc.find(_.paramType == paramType).map { backRef => - CaseParam(param, q"()", paramType, backRef.ref) :: acc - }.getOrElse { - val derivedImplicit = recurse(ProductType(paramName, genericType.toString), genericType, - assignedName) { - typeclassTree(Some(paramName), paramType, typeConstructor, assignedName) - }.getOrElse(c.abort(c.enclosingPosition, s"failed to get implicit for type $genericType")) - - val ref = TermName(c.freshName("paramTypeclass")) - val assigned = q"""val $ref = $derivedImplicit""" - CaseParam(param, assigned, paramType, ref) :: acc - } - }.to[List].reverse + val caseParams = caseParamsReversed.reverse val paramsVal: TermName = TermName(c.freshName("parameters")) val fnVal: TermName = TermName(c.freshName("fn")) - + val preAssignments = caseParams.map(_.typeclass) - + val caseClassCompanion = genericType.companion - val defaults = caseClassCompanion.decl(TermName("apply")).asMethod.paramLists.head.map(_.asTerm).zipWithIndex.map { case (p, idx) => - if(p.isParamWithDefault) q"_root_.scala.Some(${genericType.typeSymbol.companionSymbol.asTerm}.${TermName("apply$default$"+(idx + 1))})" - else q"_root_.scala.None" + val constructorMethod = caseClassCompanion.decl(TermName("apply")).asMethod + val indexedConstructorParams = constructorMethod.paramLists.head.map(_.asTerm).zipWithIndex + + val defaults = indexedConstructorParams.map { + case (p, idx) => + if (p.isParamWithDefault) { + val method = TermName("apply$default$" + (idx + 1)) + q"_root_.scala.Some(${genericType.typeSymbol.companionSymbol.asTerm}.$method)" + } else q"_root_.scala.None" } - val assignments = caseParams.zip(defaults).zipWithIndex.map { case ((CaseParam(param, typeclass, paramType, ref), defaultVal), idx) => - q"""$paramsVal($idx) = _root_.magnolia.Magnolia.param[$typeConstructor, $genericType, $paramType]( + val assignments = caseParams.zip(defaults).zipWithIndex.map { + case ((CaseParam(param, typeclass, paramType, ref), defaultVal), idx) => + q"""$paramsVal($idx) = $magnoliaObj.param[$typeConstructor, $genericType, + $paramType]( ${param.name.toString}, $ref, $defaultVal, _.${TermName(param.name.toString)} )""" } - Some(Typeclass(genericType, - q"""{ + Some( + Typeclass( + genericType, + q"""{ ..$preAssignments - val $paramsVal: _root_.scala.Array[Param[$typeConstructor, $genericType]] = - new _root_.scala.Array(${assignments.length}) + val $paramsVal: $arrayCls[Param[$typeConstructor, $genericType]] = + new $arrayCls(${assignments.length}) ..$assignments - ${c.prefix}.combine(_root_.magnolia.Magnolia.caseClass[$typeConstructor, $genericType]( + ${c.prefix}.combine($magnoliaObj.caseClass[$typeConstructor, $genericType]( $className, false, $paramsVal, ($fnVal: Param[$typeConstructor, $genericType] => Any) => - new $genericType(..${caseParams.zipWithIndex.map { case (typeclass, idx) => - q"$fnVal($paramsVal($idx)).asInstanceOf[${typeclass.paramType}]" + new $genericType(..${caseParams.zipWithIndex.map { + case (typeclass, idx) => + q"$fnVal($paramsVal($idx)).asInstanceOf[${typeclass.paramType}]" } }) )) }""" - )) - } else if(isSealedTrait) { + ) + ) + } else if (isSealedTrait) { val genericSubtypes = classType.get.knownDirectSubclasses.to[List] val subtypes = genericSubtypes.map { sub => val typeArgs = sub.asType.typeSignature.baseType(genericType.typeSymbol).typeArgs @@ -226,47 +274,55 @@ object Magnolia { appliedType(sub.asType.toType.typeConstructor, newTypeParams) } - if(subtypes.isEmpty) { + if (subtypes.isEmpty) { c.info(c.enclosingPosition, - s"magnolia: could not find any direct subtypes of $typeSymbol", true) - + s"magnolia: could not find any direct subtypes of $typeSymbol", + true) + c.abort(c.enclosingPosition, "") } - + val subtypesVal: TermName = TermName(c.freshName("subtypes")) - - val assignments = subtypes.map { searchType => + + val typeclasses = subtypes.map { searchType => recurse(CoproductType(genericType.toString), genericType, assignedName) { (searchType, typeclassTree(None, searchType, typeConstructor, assignedName)) }.getOrElse { c.abort(c.enclosingPosition, s"failed to get implicit for type $searchType") } - }.zipWithIndex.map { case ((typ, typeclass), idx) => - q"""$subtypesVal($idx) = _root_.magnolia.Magnolia.subtype[$typeConstructor, $genericType, $typ]( + } + + val assignments = typeclasses.zipWithIndex.map { + case ((typ, typeclass), idx) => + q"""$subtypesVal($idx) = $magnoliaObj.subtype[$typeConstructor, $genericType, $typ]( ${typ.typeSymbol.fullName}, $typeclass, (t: $genericType) => t.isInstanceOf[$typ], (t: $genericType) => t.asInstanceOf[$typ] )""" } - + Some { - Typeclass(genericType, q"""{ - val $subtypesVal: _root_.scala.Array[_root_.magnolia.Subtype[$typeConstructor, $genericType]] = - new _root_.scala.Array(${assignments.size}) + Typeclass( + genericType, + q"""{ + val $subtypesVal: $arrayCls[_root_.magnolia.Subtype[$typeConstructor, $genericType]] = + new $arrayCls(${assignments.size}) ..$assignments ${c.prefix}.dispatch(new _root_.magnolia.SealedTrait( $genericTypeName, - $subtypesVal: _root_.scala.Array[_root_.magnolia.Subtype[$typeConstructor, $genericType]]) + $subtypesVal: $arrayCls[_root_.magnolia.Subtype[$typeConstructor, $genericType]]) ): $resultType - }""") + }""" + ) } } else None - result.map { case Typeclass(t, r) => - Typeclass(t, q"""{ + result.map { + case Typeclass(t, r) => + Typeclass(t, q"""{ def $assignedName: $resultType = $r $assignedName }""") @@ -274,27 +330,27 @@ object Magnolia { } val genericType: Type = weakTypeOf[T] - + val currentStack: Stack = recursionStack.get(c.enclosingPosition).getOrElse(Stack(Map(), List(), List())) - + val directlyReentrant = Some(genericType) == currentStack.frames.headOption.map(_.genericType) - - if(directlyReentrant) throw DirectlyReentrantException() - + + if (directlyReentrant) throw DirectlyReentrantException() + currentStack.errors.foreach { error => - if(!emittedErrors.contains(error)) { + if (!emittedErrors.contains(error)) { emittedErrors += error val trace = error.path.mkString("\n in ", "\n in ", "\n \n") - - val msg = s"magnolia: could not derive ${typeConstructor} instance for type "+ - s"${error.genericType}" - - c.info(c.enclosingPosition, msg+trace, true) + + val msg = s"magnolia: could not derive ${typeConstructor} instance for type " + + s"${error.genericType}" + + c.info(c.enclosingPosition, msg + trace, true) } } - val result: Option[Tree] = if(!currentStack.frames.isEmpty) { + val result: Option[Tree] = if (!currentStack.frames.isEmpty) { findType(genericType) match { case None => directInferImplicit(genericType, typeConstructor).map(_.tree) @@ -304,90 +360,100 @@ object Magnolia { Some(q"_root_.magnolia.Deferred[$searchType]($methodAsString)") } } else directInferImplicit(genericType, typeConstructor).map(_.tree) - - if(currentStack.frames.isEmpty) recursionStack = ListMap() - result.map { tree => - if(currentStack.frames.isEmpty) c.untypecheck(removeDeferred.transform(tree)) else tree - }.getOrElse { + if (currentStack.frames.isEmpty) recursionStack = ListMap() + + val dereferencedResult = result.map { tree => + if (currentStack.frames.isEmpty) c.untypecheck(removeDeferred.transform(tree)) else tree + } + + dereferencedResult.getOrElse { c.abort(c.enclosingPosition, s"magnolia: could not infer typeclass for type $genericType") } } /** constructs a new [[Subtype]] instance - * - * 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) = new Subtype[Tc, T] { - type SType = S - def label: String = name - def typeclass: Tc[SType] = tc - def cast: PartialFunction[T, SType] = new PartialFunction[T, S] { - def isDefinedAt(t: T) = isType(t) - def apply(t: T): SType = asType(t) + * + * 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) = + new Subtype[Tc, T] { + type SType = S + def label: String = name + def typeclass: Tc[SType] = tc + def cast: PartialFunction[T, SType] = new PartialFunction[T, S] { + def isDefinedAt(t: T) = isType(t) + def apply(t: T): SType = asType(t) + } } - } /** constructs a new [[Param]] instance - * - * 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 param[Tc[_], T, P](name: String, typeclassParam: Tc[P], defaultVal: => Option[P], deref: T => P) = new Param[Tc, T] { + * + * 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 param[Tc[_], T, P](name: String, + typeclassParam: Tc[P], + defaultVal: => Option[P], + deref: T => P) = new Param[Tc, T] { type PType = P def label: String = name def default: Option[PType] = defaultVal def typeclass: Tc[PType] = typeclassParam def dereference(t: T): PType = deref(t) } - + /** constructs a new [[CaseClass]] instance - * - * 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 caseClass[Tc[_], T](name: String, obj: Boolean, params: Array[Param[Tc, T]], constructor: (Param[Tc, T] => Any) => T) = + * + * 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 caseClass[Tc[_], T](name: String, + obj: Boolean, + params: Array[Param[Tc, T]], + constructor: (Param[Tc, T] => Any) => T) = new CaseClass[Tc, T](name, obj, params) { def construct[R](param: Param[Tc, T] => R): T = constructor(param) } } -private[magnolia] case class DirectlyReentrantException() extends - Exception("attempt to recurse directly") +private[magnolia] case class DirectlyReentrantException() + extends Exception("attempt to recurse directly") private[magnolia] object Deferred { def apply[T](method: String): T = ??? } private[magnolia] object CompileTimeState { sealed class TypePath(path: String) { override def toString = path } - case class CoproductType(typeName: String) extends - TypePath(s"coproduct type $typeName") - - case class ProductType(paramName: String, typeName: String) extends - TypePath(s"parameter '$paramName' of product type $typeName") - - case class ChainedImplicit(typeName: String) extends - TypePath(s"chained implicit of type $typeName") + case class CoproductType(typeName: String) extends TypePath(s"coproduct type $typeName") + + case class ProductType(paramName: String, typeName: String) + extends TypePath(s"parameter '$paramName' of product type $typeName") + + case class ChainedImplicit(typeName: String) + extends TypePath(s"chained implicit of type $typeName") case class ImplicitNotFound(genericType: String, path: List[TypePath]) - case class Stack(cache: Map[whitebox.Context#Type, Option[whitebox.Context#Tree]], frames: List[Frame], errors: List[ImplicitNotFound]) { - + case class Stack(cache: Map[whitebox.Context#Type, Option[whitebox.Context#Tree]], + frames: List[Frame], + errors: List[ImplicitNotFound]) { + def lookup(c: whitebox.Context)(t: c.Type)(orElse: => Option[c.Tree]): (Option[c.Tree], Stack) = - if(cache.contains(t)) { + if (cache.contains(t)) { (cache(t).asInstanceOf[Option[c.Tree]], this) } else { val value = orElse (value, copy(cache.updated(t, value))) } - def push(path: TypePath, key: whitebox.Context#Type, - value: whitebox.Context#TermName): Stack = + def push(path: TypePath, key: whitebox.Context#Type, value: whitebox.Context#TermName): Stack = Stack(cache, Frame(path, key, value) :: frames, errors) - + def pop(): Stack = Stack(cache, frames.tail, errors) } - case class Frame(path: TypePath, genericType: whitebox.Context#Type, - term: whitebox.Context#TermName) { + case class Frame(path: TypePath, + genericType: whitebox.Context#Type, + term: whitebox.Context#TermName) { def termName(c: whitebox.Context): c.TermName = term.asInstanceOf[c.TermName] } diff --git a/examples/src/main/scala/decode.scala b/examples/src/main/scala/decode.scala index 8603b9e..0332427 100644 --- a/examples/src/main/scala/decode.scala +++ b/examples/src/main/scala/decode.scala @@ -11,9 +11,11 @@ trait Decoder[T] { def decode(str: String): T } /** derivation object (and companion object) for [[Decoder]] instances */ object Decoder { - + /** decodes strings */ - implicit val string: Decoder[String] = new Decoder[String] { def decode(str: String): String = str } + implicit val string: Decoder[String] = new Decoder[String] { + def decode(str: String): String = str + } /** decodes ints */ implicit val int: Decoder[Int] = new Decoder[Int] { def decode(str: String): Int = str.toInt } @@ -23,12 +25,14 @@ object Decoder { /** type constructor for new instances of the typeclass */ type Typeclass[T] = Decoder[T] - + /** defines how new [[Decoder]]s for case classes should be constructed */ def combine[T](ctx: CaseClass[Decoder, T]): Decoder[T] = new Decoder[T] { def decode(value: String) = { val (name, values) = parse(value) - ctx.construct { param => param.typeclass.decode(values(param.label)) } + ctx.construct { param => + param.typeclass.decode(values(param.label)) + } } } @@ -45,25 +49,29 @@ object Decoder { private def parse(value: String): (String, Map[String, String]) = { val end = value.indexOf('(') val name = value.substring(0, end) - - def parts(value: String, idx: Int = 0, depth: Int = 0, collected: List[String] = List("")): List[String] = { - def plus(char: Char): List[String] = collected.head+char :: collected.tail - - if(idx == value.length) collected - else value(idx) match { - case '(' => - parts(value, idx + 1, depth + 1, plus('(')) - case ')' => - if(depth == 1) plus(')') - else parts(value, idx + 1, depth - 1, plus(')')) - case ',' => - if(depth == 0) parts(value, idx + 1, depth, "" :: collected) - else parts(value, idx + 1, depth, plus(',')) - case char => - parts(value, idx + 1, depth, plus(char)) - } + + def parts(value: String, + idx: Int = 0, + depth: Int = 0, + collected: List[String] = List("")): List[String] = { + def plus(char: Char): List[String] = collected.head + char :: collected.tail + + if (idx == value.length) collected + else + value(idx) match { + case '(' => + parts(value, idx + 1, depth + 1, plus('(')) + case ')' => + if (depth == 1) plus(')') + else parts(value, idx + 1, depth - 1, plus(')')) + case ',' => + if (depth == 0) parts(value, idx + 1, depth, "" :: collected) + else parts(value, idx + 1, depth, plus(',')) + case char => + parts(value, idx + 1, depth, plus(char)) + } } - + def keyValue(str: String): (String, String) = { val List(label, value) = str.split("=", 2).to[List] (label, value) @@ -72,4 +80,3 @@ object Decoder { (name, parts(value.substring(end + 1, value.length - 1)).map(keyValue).toMap) } } - diff --git a/examples/src/main/scala/default.scala b/examples/src/main/scala/default.scala index ea881df..b96ba1d 100644 --- a/examples/src/main/scala/default.scala +++ b/examples/src/main/scala/default.scala @@ -13,11 +13,13 @@ trait Default[T] { def default: T } object Default { type Typeclass[T] = Default[T] - + /** constructs a default for each parameter, using the constructor default (if provided), - * otherwise using a typeclass-provided default */ + * otherwise using a typeclass-provided 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 default = ctx.construct { param => + param.default.getOrElse(param.typeclass.default) + } } /** chooses which subtype to delegate to */ diff --git a/examples/src/main/scala/eq.scala b/examples/src/main/scala/eq.scala index cd257f6..d4ccec6 100644 --- a/examples/src/main/scala/eq.scala +++ b/examples/src/main/scala/eq.scala @@ -22,21 +22,22 @@ object Eq { } /** choose which equality subtype to defer to - * - * Note that in addition to dispatching based on the type of the first parameter to the `equal` - * method, we check that the second parameter is the same type. */ + * + * Note that in addition to dispatching based on the type of the first parameter to the `equal` + * method, we check that the second parameter is the same type. */ def dispatch[T](ctx: SealedTrait[Eq, T]): Eq[T] = new Eq[T] { - def equal(value1: T, value2: T): Boolean = ctx.dispatch(value1) { case sub => - sub.cast.isDefinedAt(value2) && sub.typeclass.equal(sub.cast(value1), sub.cast(value2)) + def equal(value1: T, value2: T): Boolean = ctx.dispatch(value1) { + case sub => + sub.cast.isDefinedAt(value2) && sub.typeclass.equal(sub.cast(value1), sub.cast(value2)) } } /** equality typeclass instance for strings */ implicit val string: Eq[String] = new Eq[String] { def equal(v1: String, v2: String) = v1 == v2 } - + /** equality typeclass instance for integers */ implicit val int: Eq[Int] = new Eq[Int] { def equal(v1: Int, v2: Int) = v1 == v2 } - + /** binds the Magnolia macro to the `gen` method */ implicit def gen[T]: Eq[T] = macro Magnolia.gen[T] } diff --git a/examples/src/main/scala/show.scala b/examples/src/main/scala/show.scala index 860871e..6ed0ff2 100644 --- a/examples/src/main/scala/show.scala +++ b/examples/src/main/scala/show.scala @@ -7,38 +7,48 @@ import magnolia._ import scala.language.experimental.macros /** shows one type as another, often as a string - * - * Note that this is a more general form of `Show` than is usual, as it permits the return type to - * be something other than a string. */ + * + * Note that this is a more general form of `Show` than is usual, as it permits the return type to + * be something other than a string. */ trait Show[Out, T] { def show(value: T): Out } /** companion object to [[Show]] */ object Show { /** the type constructor for new [[Show]] instances - * - * The first parameter is fixed as `String`, and the second parameter varies generically. */ + * + * The first parameter is fixed as `String`, and the second parameter varies generically. */ type Typeclass[T] = Show[String, T] /** creates a new [[Show]] instance by labelling and joining (with `mkString`) the result of - * showing each parameter, and prefixing it with the class name */ + * showing each parameter, and prefixing it with the class name */ def combine[T](ctx: CaseClass[Typeclass, T]): Show[String, T] = new Show[String, T] { - def show(value: T) = ctx.parameters.map { param => - s"${param.label}=${param.typeclass.show(param.dereference(value))}" - }.mkString(s"${ctx.typeName.split("\\.").last}(", ",", ")") + def show(value: T) = { + val paramStrings = ctx.parameters.map { param => + s"${param.label}=${param.typeclass.show(param.dereference(value))}" + } + + paramStrings.mkString(s"${ctx.typeName.split("\\.").last}(", ",", ")") + } } /** choose which typeclass to use based on the subtype of the sealed trait */ def dispatch[T](ctx: SealedTrait[Typeclass, T]): Show[String, T] = new Show[String, T] { - def show(value: T): String = ctx.dispatch(value) { sub => sub.typeclass.show(sub.cast(value)) } + def show(value: T): String = ctx.dispatch(value) { sub => + sub.typeclass.show(sub.cast(value)) + } } /** show typeclass for strings */ - implicit val string: Show[String, String] = new Show[String, String] { def show(s: String): String = s } - + implicit val string: Show[String, String] = new Show[String, String] { + def show(s: String): String = s + } + /** show typeclass for integers */ - implicit val int: Show[String, Int] = new Show[String, Int] { def show(s: Int): String = s.toString } - + implicit val int: Show[String, Int] = new Show[String, Int] { + def show(s: Int): String = s.toString + } + /** bind the Magnolia macro to this derivation object */ implicit def gen[T]: Show[String, T] = macro Magnolia.gen[T] } diff --git a/project/build.properties b/project/build.properties index 64317fd..9abea12 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.15 +sbt.version=1.0.3 diff --git a/project/plugins.sbt b/project/plugins.sbt index dbd5625..4a92b89 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,11 +1,5 @@ -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0") -addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.0") -//addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.4") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.5.1") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0-RC2") -addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "0.4.7") +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0-M1") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.16") -addSbtPlugin("org.scala-native" % "sbt-crossproject" % "0.1.0") -addSbtPlugin("org.scala-native" % "sbt-scalajs-crossproject" % "0.1.0") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.2.1") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.21") diff --git a/tests/lib/2.11/contextual-data_2.11-1.1.0.jar b/tests/lib/2.11/contextual-data_2.11-1.1.0.jar Binary files differnew file mode 100644 index 0000000..0324473 --- /dev/null +++ b/tests/lib/2.11/contextual-data_2.11-1.1.0.jar diff --git a/tests/lib/2.11/contextual_2.11-1.1.0.jar b/tests/lib/2.11/contextual_2.11-1.1.0.jar Binary files differnew file mode 100644 index 0000000..0f10ba6 --- /dev/null +++ b/tests/lib/2.11/contextual_2.11-1.1.0.jar diff --git a/tests/lib/2.11/estrapade-macros_2.11-1.0.3.jar b/tests/lib/2.11/estrapade-macros_2.11-1.0.3.jar Binary files differnew file mode 100644 index 0000000..3906f72 --- /dev/null +++ b/tests/lib/2.11/estrapade-macros_2.11-1.0.3.jar diff --git a/tests/lib/2.11/estrapade_2.11-1.0.3.jar b/tests/lib/2.11/estrapade_2.11-1.0.3.jar Binary files differnew file mode 100644 index 0000000..d0a3c0b --- /dev/null +++ b/tests/lib/2.11/estrapade_2.11-1.0.3.jar diff --git a/tests/lib/2.12/contextual-data_2.12-1.1.0.jar b/tests/lib/2.12/contextual-data_2.12-1.1.0.jar Binary files differnew file mode 100644 index 0000000..9513196 --- /dev/null +++ b/tests/lib/2.12/contextual-data_2.12-1.1.0.jar diff --git a/tests/lib/2.12/contextual_2.12-1.1.0.jar b/tests/lib/2.12/contextual_2.12-1.1.0.jar Binary files differnew file mode 100644 index 0000000..c0aee69 --- /dev/null +++ b/tests/lib/2.12/contextual_2.12-1.1.0.jar diff --git a/tests/lib/2.12/estrapade-macros_2.12-1.0.3.jar b/tests/lib/2.12/estrapade-macros_2.12-1.0.3.jar Binary files differnew file mode 100644 index 0000000..061da8d --- /dev/null +++ b/tests/lib/2.12/estrapade-macros_2.12-1.0.3.jar diff --git a/tests/lib/2.12/estrapade_2.12-1.0.3.jar b/tests/lib/2.12/estrapade_2.12-1.0.3.jar Binary files differnew file mode 100644 index 0000000..e6a365b --- /dev/null +++ b/tests/lib/2.12/estrapade_2.12-1.0.3.jar diff --git a/tests/src/main/scala/tests.scala b/tests/src/main/scala/tests.scala index 14345af..f79a51b 100644 --- a/tests/src/main/scala/tests.scala +++ b/tests/src/main/scala/tests.scala @@ -27,7 +27,7 @@ case object Blue extends Color object Tests extends TestApp { - def tests() = for(i <- 1 to 1000) { + def tests() = for (i <- 1 to 1000) { import examples._ test("construct a Show product instance") { @@ -39,7 +39,7 @@ object Tests extends TestApp { import examples._ Show.gen[Person].show(Person("John Smith", 34)) }.assert(_ == "Person(name=John Smith,age=34)") - + test("serialize a Branch") { import magnolia.examples._ implicitly[Show[String, Branch[String]]].show(Branch(Leaf("LHS"), Leaf("RHS"))) @@ -70,22 +70,22 @@ object Tests extends TestApp { implicitly[Show[String, Leaf[java.lang.String]]] """ }.assert(_ == Returns(fqt"magnolia.examples.Show[String,magnolia.tests.Leaf[String]]")) - + test("construction of Show instance for Tree") { scalac""" import magnolia.examples._ implicitly[Show[String, Tree[String]]] """ }.assert(_ == Returns(fqt"magnolia.examples.Show[String,magnolia.tests.Tree[String]]")) - + test("serialize a Leaf") { implicitly[Show[String, Leaf[String]]].show(Leaf("testing")) }.assert(_ == "Leaf(value=testing)") - + test("serialize a Branch as a Tree") { implicitly[Show[String, Tree[String]]].show(Branch(Leaf("LHS"), Leaf("RHS"))) }.assert(_ == "Branch(left=Leaf(value=LHS),right=Leaf(value=RHS))") - + test("serialize case object") { implicitly[Show[String, Red.type]].show(Red) }.assert(_ == "Red()") @@ -107,7 +107,9 @@ object Tests extends TestApp { }.assert(_ == Person("John Smith", 32)) test("decode a nested product") { - implicitly[Decoder[Address]].decode("""Address(line1=53 High Street,occupant=Person(name=Richard Jones,age=44))""") + implicitly[Decoder[Address]].decode( + """Address(line1=53 High Street,occupant=Person(name=Richard Jones,age=44))""" + ) }.assert(_ == Address("53 High Street", Person("Richard Jones", 44))) test("show error stack") { @@ -121,6 +123,6 @@ object Tests extends TestApp { | in parameter 'integer' of product type Alpha | in parameter 'alpha' of product type Beta |""")) - + } } |