Update for JDK6/7

gpampara · gpampara · commit 4f295ae913c0 · 2012-09-11T07:13:30.000+02:00
This update allows the code to compile on JDK6 / JDK7.

Signed-off-by: Gary Pamparà &lt;gpampara@gmail.com&gt;
diff --git a/core/src/main/java/fj/data/hlist/HPre.java b/core/src/main/java/fj/data/hlist/HPre.java
@@ -265,7 +265,7 @@ public static <N extends HNat<N>> HEq<HSucc<N>, HZero, HFalse> eq(final HSucc<N>
      */
     public static <N extends HNat<N>, NN extends HNat<NN>, B extends HBool, E extends HEq<N, NN, B>>
     HEq<HSucc<N>, HSucc<NN>, B> eq(final HSucc<N> a, final HSucc<NN> b, final E e) {
-      return new HEq<HSucc<N>, HSucc<NN>, B>(e.v);
+      return new HEq<HSucc<N>, HSucc<NN>, B>(e.v());
     }
 
   }
@@ -280,6 +280,10 @@ private HAdd(final C sum) {
       this.sum = sum;
     }
 
+    public C sum() {
+      return this.sum;
+    }
+
     /**
      * The sum of zero and any other number is that number.
      */
@@ -299,7 +303,7 @@ public static <N extends HNat<N>> HAdd<HSucc<N>, HZero, HSucc<N>> add(final HSuc
      */
     public static <N extends HNat<N>, M extends HNat<M>, R extends HNat<R>, H extends HAdd<N, HSucc<M>, R>>
     HAdd<HSucc<N>, HSucc<M>, HSucc<R>> add(final HSucc<N> a, final HSucc<M> b, final H h) {
-      return new HAdd<HSucc<N>, HSucc<M>, HSucc<R>>(HNat.hSucc(h.sum));
+      return new HAdd<HSucc<N>, HSucc<M>, HSucc<R>>(HNat.hSucc(h.sum()));
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ public static <N extends HNat<N>> HEq<HSucc<N>, HZero, HFalse> eq(final HSucc<N>`
`265`	`265`	`*/`
`266`	`266`	`public static <N extends HNat<N>, NN extends HNat<NN>, B extends HBool, E extends HEq<N, NN, B>>`
`267`	`267`	`HEq<HSucc<N>, HSucc<NN>, B> eq(final HSucc<N> a, final HSucc<NN> b, final E e) {`
`268`		`- return new HEq<HSucc<N>, HSucc<NN>, B>(e.v);`
	`268`	`+ return new HEq<HSucc<N>, HSucc<NN>, B>(e.v());`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`}`
`@@ -280,6 +280,10 @@ private HAdd(final C sum) {`
`280`	`280`	`this.sum = sum;`
`281`	`281`	`}`
`282`	`282`
	`283`	`+ public C sum() {`
	`284`	`+ return this.sum;`
	`285`	`+ }`
	`286`	`+`
`283`	`287`	`/**`
`284`	`288`	`* The sum of zero and any other number is that number.`
`285`	`289`	`*/`
`@@ -299,7 +303,7 @@ public static <N extends HNat<N>> HAdd<HSucc<N>, HZero, HSucc<N>> add(final HSuc`
`299`	`303`	`*/`
`300`	`304`	`public static <N extends HNat<N>, M extends HNat<M>, R extends HNat<R>, H extends HAdd<N, HSucc<M>, R>>`
`301`	`305`	`HAdd<HSucc<N>, HSucc<M>, HSucc<R>> add(final HSucc<N> a, final HSucc<M> b, final H h) {`
`302`		`- return new HAdd<HSucc<N>, HSucc<M>, HSucc<R>>(HNat.hSucc(h.sum));`
	`306`	`+ return new HAdd<HSucc<N>, HSucc<M>, HSucc<R>>(HNat.hSucc(h.sum()));`
`303`	`307`	`}`
`304`	`308`	`}`
`305`	`309`