From d500de8f540182ad3f908210f8d49084c549034f Mon Sep 17 00:00:00 2001 From: Etienne Kneuss <ekneuss@gmail.com> Date: Fri, 19 Oct 2012 17:05:09 +0200 Subject: [PATCH] Trim down to tuple5 --- library/Utils.scala | 2 -- testcases/Choose.scala | 8 ++++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/library/Utils.scala b/library/Utils.scala index 12c81d7a0..a6d1ea771 100644 --- a/library/Utils.scala +++ b/library/Utils.scala @@ -27,6 +27,4 @@ object Utils { def choose[A, B, C](predicate: (A, B, C) => Boolean): (A, B, C) = noChoose def choose[A, B, C, D](predicate: (A, B, C, D) => Boolean): (A, B, C, D) = noChoose def choose[A, B, C, D, E](predicate: (A, B, C, D, E) => Boolean): (A, B, C, D, E) = noChoose - def choose[A, B, C, D, E, F](predicate: (A, B, C, D, E, F) => Boolean): (A, B, C, D, E, F) = noChoose - def choose[A, B, C, D, E, F, G](predicate: (A, B, C, D, E, F, G) => Boolean): (A, B, C, D, E, F, G) = noChoose } diff --git a/testcases/Choose.scala b/testcases/Choose.scala index 22dbc18f4..2591bc123 100644 --- a/testcases/Choose.scala +++ b/testcases/Choose.scala @@ -1,7 +1,11 @@ import leon.Utils._ -object Abs { +object ChooseTest { - def abs(x: Int): Int = choose{ x: Int => x > 0 } + def c1(x: Int): Int = choose{ (a1: Int) => a1 > x } + def c2(x: Int): (Int, Int) = choose{ (a1: Int, a2: Int) => a1 > x && a2 > x } + def c3(x: Int): (Int, Int, Int) = choose{ (a1: Int, a2: Int, a3: Int) => a1 > x && a2 > x } + def c4(x: Int): (Int, Int, Int, Int) = choose{ (a1: Int, a2: Int, a3: Int, a4: Int) => a1 > x && a2 > x } + def c5(x: Int): (Int, Int, Int, Int, Int) = choose{ (a1: Int, a2: Int, a3: Int, a4: Int, a5: Int) => a1 > x && a2 > x } } -- GitLab