Merge pull request milessabin#534 from dwijnand/fix-Nat.toInt

milessabin · milessabin · commit d29912835293 · 2016-01-17T16:59:12.000Z
Fix Nat.toInt
diff --git a/core/src/main/scala/shapeless/syntax/nat.scala b/core/src/main/scala/shapeless/syntax/nat.scala
@@ -22,7 +22,7 @@ package syntax
  *
  * @author Dale Wijnand
  */
-final class NatOps[N <: Nat](val n : Nat) extends AnyVal with Serializable {
+final class NatOps[N <: Nat](val n: N) extends AnyVal with Serializable {
   import ops.nat._
 
   /**
diff --git a/core/src/test/scala/shapeless/nat.scala b/core/src/test/scala/shapeless/nat.scala
@@ -237,5 +237,30 @@ class NatTests {
     assertEquals(20, toInt(_20))
     assertEquals(21, toInt(_21))
     assertEquals(22, toInt(_22))
+
+    // Value level, using syntax
+    assertEquals(0, _0.toInt)
+    assertEquals(1, _1.toInt)
+    assertEquals(2, _2.toInt)
+    assertEquals(3, _3.toInt)
+    assertEquals(4, _4.toInt)
+    assertEquals(5, _5.toInt)
+    assertEquals(6, _6.toInt)
+    assertEquals(7, _7.toInt)
+    assertEquals(8, _8.toInt)
+    assertEquals(9, _9.toInt)
+    assertEquals(10, _10.toInt)
+    assertEquals(11, _11.toInt)
+    assertEquals(12, _12.toInt)
+    assertEquals(13, _13.toInt)
+    assertEquals(14, _14.toInt)
+    assertEquals(15, _15.toInt)
+    assertEquals(16, _16.toInt)
+    assertEquals(17, _17.toInt)
+    assertEquals(18, _18.toInt)
+    assertEquals(19, _19.toInt)
+    assertEquals(20, _20.toInt)
+    assertEquals(21, _21.toInt)
+    assertEquals(22, _22.toInt)
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ package syntax`
`22`	`22`	`*`
`23`	`23`	`* @author Dale Wijnand`
`24`	`24`	`*/`
`25`		`-final class NatOps[N <: Nat](val n : Nat) extends AnyVal with Serializable {`
	`25`	`+final class NatOps[N <: Nat](val n: N) extends AnyVal with Serializable {`
`26`	`26`	`import ops.nat._`
`27`	`27`
`28`	`28`	`/**`