updated challenges

2 files changed, 27 insertions, 13 deletions

diff --git a/lambda-calcul/haskell/challenges.json b/lambda-calcul/haskell/challenges.json
index 1261721..4c247af 100644
--- a/lambda-calcul/haskell/challenges.json
+++ b/lambda-calcul/haskell/challenges.json
@@ -6,14 +6,15 @@
   {"level":4, "expr": "(x y)"},
   {"level":5, "expr": "((lam (x) x) y)"},
   {"level":6, "expr": "((lam (x y) x) z)"},
-  {"level":7, "expr": "((lam (x y) x) z t)"},
-  {"level":8, "expr": "((lam (x y) x) z t foo)"},
-  {"level":9, "expr": "(let ((id (lam (x) x))) (id z))"},
+  {"level":7, "expr": "(((lam (z) x) z) y)"},
+  {"level":8, "expr": "((lam (x y) x) z t)"},
+  {"level":9, "expr": "((lam (x y) x) z t foo)"},
   {"level":10, "expr": "(let ((id (lam (x) x))) (id z))"},
-  {"level":11, "expr": "(let ((False (lam (f t) f))\n  (True (lam (f t) t))\n      (Not (lam (b) (b True False))))\n (Not True))"},
-  {"level":12, "expr": "(let ((False (lam (f t) f))\n  (True (lam (f t) t))\n      (Not (lam (b) (b True False))))\n (Not (Not True)))"},
-  {"level":13, "expr": "(def False (lam (f t) f))\n  (def True (lam (f t) t))\n  (def Not (lam (b) (b True False)))\n (Not (Not True)))"},
-  {"level":14, "expr": "(def False (lam (f t) f))\n  (def True (lam (f t) t))\n  (def Not (lam (b) (b True False)))"},
-  {"level":15, "expr": "(def Or (lam (a b) (a b True)))"},
-  {"level":16, "expr": "(Or (Not True) False)"}
+  {"level":11, "expr": "(let ((id (lam (x) x))) (id z))"},
+  {"level":12, "expr": "(let ((False (lam (f t) f))\n  (True (lam (f t) t))\n      (Not (lam (b) (b True False))))\n (Not True))"},
+  {"level":13, "expr": "(let ((False (lam (f t) f))\n  (True (lam (f t) t))\n      (Not (lam (b) (b True False))))\n (Not (Not True)))"},
+  {"level":14, "expr": "(def False (lam (f t) f))\n  (def True (lam (f t) t))\n  (def Not (lam (b) (b True False)))\n (Not (Not True)))"},
+  {"level":15, "expr": "(def False (lam (f t) f))\n  (def True (lam (f t) t))\n  (def Not (lam (b) (b True False)))"},
+  {"level":16, "expr": "(def Or (lam (a b) (a b True)))"},
+  {"level":17, "expr": "(Or (Not True) False)"}
 ]
diff --git a/lambda-calcul/haskell/test.sh b/lambda-calcul/haskell/test.sh
index 1b78960..6bb9dc4 100755
--- a/lambda-calcul/haskell/test.sh
+++ b/lambda-calcul/haskell/test.sh
@@ -4,23 +4,36 @@ set -euo pipefail
 
 HOST=${1:-https://lambda.pankzsoft.net}
 
-ALICE=$(curl -s -X POST -H 'content-type: application/json' $HOST/api/register -d '"alice"' | jq -r)
+post () {
+    url=$1
+    data=$2
+
+    curl -s -X POST -H 'content-type: application/json' "$url" -d "$data"
+}
+
+get () {
+    url=$1
+
+    curl -s -X GET -H 'content-type: application/json' "$url"
+}
+
+ALICE=$(post $HOST/api/register '"alice"' | jq -r)
 echo "registered alice with token '$ALICE'"
 sleep 2
 
 for i in $(seq 1 14); do
-    GRADE=$(curl -s -X GET  -H 'content-type: application/json' "$HOST/api/score?token=$ALICE" | jq -r .grade)
+    GRADE=$(get "$HOST/api/score?token=$ALICE" | jq -r .grade)
     echo "alice's grade is $GRADE"
     sleep 1
 
-    CHAL=$(curl -s -X GET -H 'content-type: application/json' "$HOST/api/challenge?token=$ALICE" | jq -r .expr)
+    CHAL=$(get "$HOST/api/challenge?token=$ALICE" | jq -r .expr)
     echo "alice's challenge is '$CHAL'"
     sleep 1
 
     ANSWER=$(echo "$CHAL" | cabal run)
     echo "alice's answer is '$ANSWER'"
 
-    RESULT=$(curl -s -X POST -H 'content-type: application/json' "$HOST/api/challenge?token=$ALICE" -d "\"$ANSWER\"")
+    RESULT=$(post "$HOST/api/challenge?token=$ALICE" "\"$ANSWER\"")
 
     if [ "$RESULT" != "[]" ]; then
         echo "Failed challenge: $RESULT"