diff options
author | Stewart Stewart <stewinsalot@gmail.com> | 2016-12-01 15:53:45 -0800 |
---|---|---|
committer | Stewart Stewart <stewinsalot@gmail.com> | 2016-12-01 15:53:45 -0800 |
commit | 41e2e7c0e032490ccfae1e48e849b2dce7e18d12 (patch) | |
tree | dc4ae13765cbfecd4af8842eefaa16b51121c390 /src/main/scala/xyz/driver/core/core.scala | |
parent | 03376ce4b563394c544ff2228a9a8146d0893b0c (diff) | |
parent | 116b4a75361d68f1eb035cf748fe5bc3c5f6a3d6 (diff) | |
download | driver-core-41e2e7c0e032490ccfae1e48e849b2dce7e18d12.tar.gz driver-core-41e2e7c0e032490ccfae1e48e849b2dce7e18d12.tar.bz2 driver-core-41e2e7c0e032490ccfae1e48e849b2dce7e18d12.zip |
Merge branch 'master' into decouple-codegen
Diffstat (limited to 'src/main/scala/xyz/driver/core/core.scala')
-rw-r--r-- | src/main/scala/xyz/driver/core/core.scala | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/src/main/scala/xyz/driver/core/core.scala b/src/main/scala/xyz/driver/core/core.scala index b7fbeb6..8ae9122 100644 --- a/src/main/scala/xyz/driver/core/core.scala +++ b/src/main/scala/xyz/driver/core/core.scala @@ -3,10 +3,13 @@ package xyz.driver import scalaz.Equal package object core { + import scala.language.reflectiveCalls def make[T](v: => T)(f: T => Unit): T = { - val value = v; f(value); value + val value = v + f(value) + value } def using[R <: { def close() }, P](r: => R)(f: R => P): P = { @@ -17,26 +20,29 @@ package object core { resource.close() } } +} + +package core { - object tagging { - private[core] trait Tagged[+V, +Tag] + final case class Id[+Tag](value: String) extends AnyVal { + @inline def length: Int = value.length + override def toString: String = value } - type @@[+V, +Tag] = V with tagging.Tagged[V, Tag] - type Id[+Tag] = Long @@ Tag object Id { - def apply[Tag](value: Long) = value.asInstanceOf[Id[Tag]] + implicit def idEqual[T]: Equal[Id[T]] = Equal.equal[Id[T]](_ == _) + implicit def idOrdering[T]: Ordering[Id[T]] = Ordering.by[Id[T], String](_.value) } - implicit def idEqual[T]: Equal[Id[T]] = Equal.equal[Id[T]](_ == _) - implicit def idOrdering[T]: Ordering[Id[T]] = Ordering.by(i => i: Long) - type Name[+Tag] = String @@ Tag - object Name { - def apply[Tag](value: String) = value.asInstanceOf[Name[Tag]] + final case class Name[+Tag](value: String) extends AnyVal { + @inline def length: Int = value.length + override def toString: String = value } - implicit def nameEqual[T]: Equal[Name[T]] = Equal.equal[Name[T]](_ == _) - implicit def nameOrdering[T]: Ordering[Name[T]] = Ordering.by(n => n: String) + object Name { + implicit def nameEqual[T]: Equal[Name[T]] = Equal.equal[Name[T]](_ == _) + implicit def nameOrdering[T]: Ordering[Name[T]] = Ordering.by(_.value) + } object revision { final case class Revision[T](id: String) |