trackler 2.2.1.62 → 2.2.1.63

data/tracks/fsharp/exercises/beer-song/Example.fs

@@ -1,15 +1,21 @@
 module BeerSong
 
-let verse n = 
+let private verse n = 
     match n with
-    | 0 -> "No more bottles of beer on the wall, no more bottles of beer.\nGo to the store and buy some more, 99 bottles of beer on the wall.\n"
-    | 1 -> "1 bottle of beer on the wall, 1 bottle of beer.\nTake it down and pass it around, no more bottles of beer on the wall.\n"
-    | 2 -> "2 bottles of beer on the wall, 2 bottles of beer.\nTake one down and pass it around, 1 bottle of beer on the wall.\n"
-    | _ -> sprintf "%d bottles of beer on the wall, %d bottles of beer.\nTake one down and pass it around, %d bottles of beer on the wall.\n" n n (n-1)
+    | 0 -> 
+        [ "No more bottles of beer on the wall, no more bottles of beer.";
+          "Go to the store and buy some more, 99 bottles of beer on the wall." ]
+    | 1 -> 
+        [ "1 bottle of beer on the wall, 1 bottle of beer.";
+          "Take it down and pass it around, no more bottles of beer on the wall." ]
+    | 2 -> 
+        [ "2 bottles of beer on the wall, 2 bottles of beer.";
+          "Take one down and pass it around, 1 bottle of beer on the wall." ]
+    | _ -> 
+        [ sprintf "%d bottles of beer on the wall, %d bottles of beer." n n;
+          sprintf "Take one down and pass it around, %d bottles of beer on the wall."  (n-1) ]
 
-let verses stop start = 
-    [stop .. -1 .. start] 
+let recite startBottles takeDown = 
+    [startBottles .. -1 .. (startBottles - takeDown + 1)] 
     |> List.map verse
-    |> String.concat "\n"
-
-let sing = verses 99 0
+    |> List.reduce (fun x y -> x @ "" :: y)

data/tracks/fsharp/exercises/food-chain/Example.fs

@@ -38,7 +38,7 @@ let verseEnd number =
 
 let verse number = verseBegin number @ verseEnd number
 
-let verses start stop =
+let recite start stop =
     [start .. stop]
     |> List.map verse
     |> List.reduce (fun x y -> x @ "" :: y)

data/tracks/fsharp/exercises/food-chain/FoodChain.fs

@@ -1,5 +1,3 @@
 module FoodChain
 
-let verse number: string list = failwith "You need to implement this function."
-
-let verses start stop: string list = failwith "You need to implement this function."
+let recite start stop: string list = failwith "You need to implement this function."

data/tracks/fsharp/exercises/food-chain/FoodChainTest.fs

@@ -1,4 +1,4 @@
-// This file was auto-generated based on version 1.0.0 of the canonical data.
+// This file was auto-generated based on version 2.0.0 of the canonical data.
 
 module FoodChainTest
 
@@ -12,7 +12,7 @@ let ``Fly`` () =
     let expected = 
         [ "I know an old lady who swallowed a fly.";
           "I don't know why she swallowed the fly. Perhaps she'll die." ]
-    verse 1 |> should equal expected
+    recite 1 1 |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Spider`` () =
@@ -21,7 +21,7 @@ let ``Spider`` () =
           "It wriggled and jiggled and tickled inside her.";
           "She swallowed the spider to catch the fly.";
           "I don't know why she swallowed the fly. Perhaps she'll die." ]
-    verse 2 |> should equal expected
+    recite 2 2 |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Bird`` () =
@@ -31,7 +31,7 @@ let ``Bird`` () =
           "She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.";
           "She swallowed the spider to catch the fly.";
           "I don't know why she swallowed the fly. Perhaps she'll die." ]
-    verse 3 |> should equal expected
+    recite 3 3 |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Cat`` () =
@@ -42,7 +42,7 @@ let ``Cat`` () =
           "She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.";
           "She swallowed the spider to catch the fly.";
           "I don't know why she swallowed the fly. Perhaps she'll die." ]
-    verse 4 |> should equal expected
+    recite 4 4 |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Dog`` () =
@@ -54,7 +54,7 @@ let ``Dog`` () =
           "She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.";
           "She swallowed the spider to catch the fly.";
           "I don't know why she swallowed the fly. Perhaps she'll die." ]
-    verse 5 |> should equal expected
+    recite 5 5 |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Goat`` () =
@@ -67,7 +67,7 @@ let ``Goat`` () =
           "She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.";
           "She swallowed the spider to catch the fly.";
           "I don't know why she swallowed the fly. Perhaps she'll die." ]
-    verse 6 |> should equal expected
+    recite 6 6 |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Cow`` () =
@@ -81,14 +81,14 @@ let ``Cow`` () =
           "She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.";
           "She swallowed the spider to catch the fly.";
           "I don't know why she swallowed the fly. Perhaps she'll die." ]
-    verse 7 |> should equal expected
+    recite 7 7 |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Horse`` () =
     let expected = 
         [ "I know an old lady who swallowed a horse.";
           "She's dead, of course!" ]
-    verse 8 |> should equal expected
+    recite 8 8 |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Multiple verses`` () =
@@ -106,7 +106,7 @@ let ``Multiple verses`` () =
           "She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.";
           "She swallowed the spider to catch the fly.";
           "I don't know why she swallowed the fly. Perhaps she'll die." ]
-    verses 1 3 |> should equal expected
+    recite 1 3 |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Full song`` () =
@@ -161,5 +161,5 @@ let ``Full song`` () =
           "";
           "I know an old lady who swallowed a horse.";
           "She's dead, of course!" ]
-    verses 1 8 |> should equal expected
+    recite 1 8 |> should equal expected
 

data/tracks/fsharp/exercises/house/Example.fs

@@ -28,7 +28,7 @@ let verse number =
     [number .. -1 .. 1]
     |> List.map lineForBlock
 
-let verses startVerse endVerse = 
+let recite startVerse endVerse = 
     [startVerse..endVerse]
     |> List.map verse
     |> List.reduce (fun x y -> x @ "" :: y)

data/tracks/fsharp/exercises/house/House.fs

@@ -1,5 +1,3 @@
 module House
 
-let verse number: string list = failwith "You need to implement this function."
-
-let verses startVerse endVerse: string list = failwith "You need to implement this function."
+let recite startVerse endVerse: string list = failwith "You need to implement this function."

data/tracks/fsharp/exercises/house/HouseTest.fs

@@ -1,4 +1,4 @@
-// This file was auto-generated based on version 1.0.0 of the canonical data.
+// This file was auto-generated based on version 2.0.0 of the canonical data.
 
 module HouseTest
 
@@ -10,270 +10,270 @@ open House
 [<Fact>]
 let ``Verse one - the house that jack built`` () =
     let expected = ["This is the house that Jack built."]
-    verse 1 |> should equal expected
+    recite 1 1 |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Verse two - the malt that lay`` () =
     let expected = 
-        [ "This is the malt"
+        [ "This is the malt";
           "that lay in the house that Jack built." ]
-    verse 2 |> should equal expected
+    recite 2 2 |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Verse three - the rat that ate`` () =
     let expected = 
-        [ "This is the rat"
-          "that ate the malt"
+        [ "This is the rat";
+          "that ate the malt";
           "that lay in the house that Jack built." ]
-    verse 3 |> should equal expected
+    recite 3 3 |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Verse four - the cat that killed`` () =
     let expected = 
-        [ "This is the cat"
-          "that killed the rat"
-          "that ate the malt"
+        [ "This is the cat";
+          "that killed the rat";
+          "that ate the malt";
           "that lay in the house that Jack built." ]
-    verse 4 |> should equal expected
+    recite 4 4 |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Verse five - the dog that worried`` () =
     let expected = 
-        [ "This is the dog"
-          "that worried the cat"
-          "that killed the rat"
-          "that ate the malt"
+        [ "This is the dog";
+          "that worried the cat";
+          "that killed the rat";
+          "that ate the malt";
           "that lay in the house that Jack built." ]
-    verse 5 |> should equal expected
+    recite 5 5 |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Verse six - the cow with the crumpled horn`` () =
     let expected = 
-        [ "This is the cow with the crumpled horn"
-          "that tossed the dog"
-          "that worried the cat"
-          "that killed the rat"
-          "that ate the malt"
+        [ "This is the cow with the crumpled horn";
+          "that tossed the dog";
+          "that worried the cat";
+          "that killed the rat";
+          "that ate the malt";
           "that lay in the house that Jack built." ]
-    verse 6 |> should equal expected
+    recite 6 6 |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Verse seven - the maiden all forlorn`` () =
     let expected = 
-        [ "This is the maiden all forlorn"
-          "that milked the cow with the crumpled horn"
-          "that tossed the dog"
-          "that worried the cat"
-          "that killed the rat"
-          "that ate the malt"
+        [ "This is the maiden all forlorn";
+          "that milked the cow with the crumpled horn";
+          "that tossed the dog";
+          "that worried the cat";
+          "that killed the rat";
+          "that ate the malt";
           "that lay in the house that Jack built." ]
-    verse 7 |> should equal expected
+    recite 7 7 |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Verse eight - the man all tattered and torn`` () =
     let expected = 
-        [ "This is the man all tattered and torn"
-          "that kissed the maiden all forlorn"
-          "that milked the cow with the crumpled horn"
-          "that tossed the dog"
-          "that worried the cat"
-          "that killed the rat"
-          "that ate the malt"
+        [ "This is the man all tattered and torn";
+          "that kissed the maiden all forlorn";
+          "that milked the cow with the crumpled horn";
+          "that tossed the dog";
+          "that worried the cat";
+          "that killed the rat";
+          "that ate the malt";
           "that lay in the house that Jack built." ]
-    verse 8 |> should equal expected
+    recite 8 8 |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Verse nine - the priest all shaven and shorn`` () =
     let expected = 
-        [ "This is the priest all shaven and shorn"
-          "that married the man all tattered and torn"
-          "that kissed the maiden all forlorn"
-          "that milked the cow with the crumpled horn"
-          "that tossed the dog"
-          "that worried the cat"
-          "that killed the rat"
-          "that ate the malt"
+        [ "This is the priest all shaven and shorn";
+          "that married the man all tattered and torn";
+          "that kissed the maiden all forlorn";
+          "that milked the cow with the crumpled horn";
+          "that tossed the dog";
+          "that worried the cat";
+          "that killed the rat";
+          "that ate the malt";
           "that lay in the house that Jack built." ]
-    verse 9 |> should equal expected
+    recite 9 9 |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Verse 10 - the rooster that crowed in the morn`` () =
     let expected = 
-        [ "This is the rooster that crowed in the morn"
-          "that woke the priest all shaven and shorn"
-          "that married the man all tattered and torn"
-          "that kissed the maiden all forlorn"
-          "that milked the cow with the crumpled horn"
-          "that tossed the dog"
-          "that worried the cat"
-          "that killed the rat"
-          "that ate the malt"
+        [ "This is the rooster that crowed in the morn";
+          "that woke the priest all shaven and shorn";
+          "that married the man all tattered and torn";
+          "that kissed the maiden all forlorn";
+          "that milked the cow with the crumpled horn";
+          "that tossed the dog";
+          "that worried the cat";
+          "that killed the rat";
+          "that ate the malt";
           "that lay in the house that Jack built." ]
-    verse 10 |> should equal expected
+    recite 10 10 |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Verse 11 - the farmer sowing his corn`` () =
     let expected = 
-        [ "This is the farmer sowing his corn"
-          "that kept the rooster that crowed in the morn"
-          "that woke the priest all shaven and shorn"
-          "that married the man all tattered and torn"
-          "that kissed the maiden all forlorn"
-          "that milked the cow with the crumpled horn"
-          "that tossed the dog"
-          "that worried the cat"
-          "that killed the rat"
-          "that ate the malt"
+        [ "This is the farmer sowing his corn";
+          "that kept the rooster that crowed in the morn";
+          "that woke the priest all shaven and shorn";
+          "that married the man all tattered and torn";
+          "that kissed the maiden all forlorn";
+          "that milked the cow with the crumpled horn";
+          "that tossed the dog";
+          "that worried the cat";
+          "that killed the rat";
+          "that ate the malt";
           "that lay in the house that Jack built." ]
-    verse 11 |> should equal expected
+    recite 11 11 |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Verse 12 - the horse and the hound and the horn`` () =
     let expected = 
-        [ "This is the horse and the hound and the horn"
-          "that belonged to the farmer sowing his corn"
-          "that kept the rooster that crowed in the morn"
-          "that woke the priest all shaven and shorn"
-          "that married the man all tattered and torn"
-          "that kissed the maiden all forlorn"
-          "that milked the cow with the crumpled horn"
-          "that tossed the dog"
-          "that worried the cat"
-          "that killed the rat"
-          "that ate the malt"
+        [ "This is the horse and the hound and the horn";
+          "that belonged to the farmer sowing his corn";
+          "that kept the rooster that crowed in the morn";
+          "that woke the priest all shaven and shorn";
+          "that married the man all tattered and torn";
+          "that kissed the maiden all forlorn";
+          "that milked the cow with the crumpled horn";
+          "that tossed the dog";
+          "that worried the cat";
+          "that killed the rat";
+          "that ate the malt";
           "that lay in the house that Jack built." ]
-    verse 12 |> should equal expected
+    recite 12 12 |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Multiple verses`` () =
     let expected = 
-        [ "This is the cat"
-          "that killed the rat"
-          "that ate the malt"
-          "that lay in the house that Jack built."
-          ""
-          "This is the dog"
-          "that worried the cat"
-          "that killed the rat"
-          "that ate the malt"
-          "that lay in the house that Jack built."
-          ""
-          "This is the cow with the crumpled horn"
-          "that tossed the dog"
-          "that worried the cat"
-          "that killed the rat"
-          "that ate the malt"
-          "that lay in the house that Jack built."
-          ""
-          "This is the maiden all forlorn"
-          "that milked the cow with the crumpled horn"
-          "that tossed the dog"
-          "that worried the cat"
-          "that killed the rat"
-          "that ate the malt"
-          "that lay in the house that Jack built."
-          ""
-          "This is the man all tattered and torn"
-          "that kissed the maiden all forlorn"
-          "that milked the cow with the crumpled horn"
-          "that tossed the dog"
-          "that worried the cat"
-          "that killed the rat"
-          "that ate the malt"
+        [ "This is the cat";
+          "that killed the rat";
+          "that ate the malt";
+          "that lay in the house that Jack built.";
+          "";
+          "This is the dog";
+          "that worried the cat";
+          "that killed the rat";
+          "that ate the malt";
+          "that lay in the house that Jack built.";
+          "";
+          "This is the cow with the crumpled horn";
+          "that tossed the dog";
+          "that worried the cat";
+          "that killed the rat";
+          "that ate the malt";
+          "that lay in the house that Jack built.";
+          "";
+          "This is the maiden all forlorn";
+          "that milked the cow with the crumpled horn";
+          "that tossed the dog";
+          "that worried the cat";
+          "that killed the rat";
+          "that ate the malt";
+          "that lay in the house that Jack built.";
+          "";
+          "This is the man all tattered and torn";
+          "that kissed the maiden all forlorn";
+          "that milked the cow with the crumpled horn";
+          "that tossed the dog";
+          "that worried the cat";
+          "that killed the rat";
+          "that ate the malt";
           "that lay in the house that Jack built." ]
-    verses 4 8 |> should equal expected
+    recite 4 8 |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Full rhyme`` () =
     let expected = 
-        [ "This is the house that Jack built."
-          ""
-          "This is the malt"
-          "that lay in the house that Jack built."
-          ""
-          "This is the rat"
-          "that ate the malt"
-          "that lay in the house that Jack built."
-          ""
-          "This is the cat"
-          "that killed the rat"
-          "that ate the malt"
-          "that lay in the house that Jack built."
-          ""
-          "This is the dog"
-          "that worried the cat"
-          "that killed the rat"
-          "that ate the malt"
-          "that lay in the house that Jack built."
-          ""
-          "This is the cow with the crumpled horn"
-          "that tossed the dog"
-          "that worried the cat"
-          "that killed the rat"
-          "that ate the malt"
-          "that lay in the house that Jack built."
-          ""
-          "This is the maiden all forlorn"
-          "that milked the cow with the crumpled horn"
-          "that tossed the dog"
-          "that worried the cat"
-          "that killed the rat"
-          "that ate the malt"
-          "that lay in the house that Jack built."
-          ""
-          "This is the man all tattered and torn"
-          "that kissed the maiden all forlorn"
-          "that milked the cow with the crumpled horn"
-          "that tossed the dog"
-          "that worried the cat"
-          "that killed the rat"
-          "that ate the malt"
-          "that lay in the house that Jack built."
-          ""
-          "This is the priest all shaven and shorn"
-          "that married the man all tattered and torn"
-          "that kissed the maiden all forlorn"
-          "that milked the cow with the crumpled horn"
-          "that tossed the dog"
-          "that worried the cat"
-          "that killed the rat"
-          "that ate the malt"
-          "that lay in the house that Jack built."
-          ""
-          "This is the rooster that crowed in the morn"
-          "that woke the priest all shaven and shorn"
-          "that married the man all tattered and torn"
-          "that kissed the maiden all forlorn"
-          "that milked the cow with the crumpled horn"
-          "that tossed the dog"
-          "that worried the cat"
-          "that killed the rat"
-          "that ate the malt"
-          "that lay in the house that Jack built."
-          ""
-          "This is the farmer sowing his corn"
-          "that kept the rooster that crowed in the morn"
-          "that woke the priest all shaven and shorn"
-          "that married the man all tattered and torn"
-          "that kissed the maiden all forlorn"
-          "that milked the cow with the crumpled horn"
-          "that tossed the dog"
-          "that worried the cat"
-          "that killed the rat"
-          "that ate the malt"
-          "that lay in the house that Jack built."
-          ""
-          "This is the horse and the hound and the horn"
-          "that belonged to the farmer sowing his corn"
-          "that kept the rooster that crowed in the morn"
-          "that woke the priest all shaven and shorn"
-          "that married the man all tattered and torn"
-          "that kissed the maiden all forlorn"
-          "that milked the cow with the crumpled horn"
-          "that tossed the dog"
-          "that worried the cat"
-          "that killed the rat"
-          "that ate the malt"
+        [ "This is the house that Jack built.";
+          "";
+          "This is the malt";
+          "that lay in the house that Jack built.";
+          "";
+          "This is the rat";
+          "that ate the malt";
+          "that lay in the house that Jack built.";
+          "";
+          "This is the cat";
+          "that killed the rat";
+          "that ate the malt";
+          "that lay in the house that Jack built.";
+          "";
+          "This is the dog";
+          "that worried the cat";
+          "that killed the rat";
+          "that ate the malt";
+          "that lay in the house that Jack built.";
+          "";
+          "This is the cow with the crumpled horn";
+          "that tossed the dog";
+          "that worried the cat";
+          "that killed the rat";
+          "that ate the malt";
+          "that lay in the house that Jack built.";
+          "";
+          "This is the maiden all forlorn";
+          "that milked the cow with the crumpled horn";
+          "that tossed the dog";
+          "that worried the cat";
+          "that killed the rat";
+          "that ate the malt";
+          "that lay in the house that Jack built.";
+          "";
+          "This is the man all tattered and torn";
+          "that kissed the maiden all forlorn";
+          "that milked the cow with the crumpled horn";
+          "that tossed the dog";
+          "that worried the cat";
+          "that killed the rat";
+          "that ate the malt";
+          "that lay in the house that Jack built.";
+          "";
+          "This is the priest all shaven and shorn";
+          "that married the man all tattered and torn";
+          "that kissed the maiden all forlorn";
+          "that milked the cow with the crumpled horn";
+          "that tossed the dog";
+          "that worried the cat";
+          "that killed the rat";
+          "that ate the malt";
+          "that lay in the house that Jack built.";
+          "";
+          "This is the rooster that crowed in the morn";
+          "that woke the priest all shaven and shorn";
+          "that married the man all tattered and torn";
+          "that kissed the maiden all forlorn";
+          "that milked the cow with the crumpled horn";
+          "that tossed the dog";
+          "that worried the cat";
+          "that killed the rat";
+          "that ate the malt";
+          "that lay in the house that Jack built.";
+          "";
+          "This is the farmer sowing his corn";
+          "that kept the rooster that crowed in the morn";
+          "that woke the priest all shaven and shorn";
+          "that married the man all tattered and torn";
+          "that kissed the maiden all forlorn";
+          "that milked the cow with the crumpled horn";
+          "that tossed the dog";
+          "that worried the cat";
+          "that killed the rat";
+          "that ate the malt";
+          "that lay in the house that Jack built.";
+          "";
+          "This is the horse and the hound and the horn";
+          "that belonged to the farmer sowing his corn";
+          "that kept the rooster that crowed in the morn";
+          "that woke the priest all shaven and shorn";
+          "that married the man all tattered and torn";
+          "that kissed the maiden all forlorn";
+          "that milked the cow with the crumpled horn";
+          "that tossed the dog";
+          "that worried the cat";
+          "that killed the rat";
+          "that ate the malt";
           "that lay in the house that Jack built." ]
-    verses 1 12 |> should equal expected
+    recite 1 12 |> should equal expected