trackler 2.1.0.27 → 2.1.0.28

data/tracks/dlang/exercises/hamming/{hamming.d → source/hamming.d}

@@ -19,8 +19,3 @@ static if (allTestsEnabled)
 }
 
 }
-
-void main ()
-{
-}
-

data/tracks/dlang/exercises/hello-world/dub.sdl

@@ -0,0 +1,2 @@
+name "hello-world"
+buildRequirements "disallowDeprecations"

data/tracks/dlang/exercises/hello-world/{hello_world_example.d → example/hello_world.d}

@@ -12,5 +12,3 @@ unittest {
     assert(hello("Bob") == "Hello, Bob!");
     assert(hello("") == "Hello, !");
 }
-
-void main () {}

data/tracks/dlang/exercises/leap/dub.sdl

@@ -0,0 +1,2 @@
+name "leap"
+buildRequirements "disallowDeprecations"

data/tracks/dlang/exercises/leap/{leap_example.d → example/leap.d}

@@ -11,5 +11,3 @@ unittest {
   assert(!is_leap(2100));
   assert(is_leap(2000));
 }
-
-void main() {}

data/tracks/dlang/exercises/leap/{leap.d → source/leap.d}

@@ -4,5 +4,3 @@ unittest {
   assert(!is_leap(2100));
   assert(is_leap(2000));
 }
-
-void main() {}

data/tracks/dlang/exercises/nucleotide-count/dub.sdl

@@ -0,0 +1,2 @@
+name "nucleotide-count"
+buildRequirements "disallowDeprecations"

data/tracks/dlang/exercises/nucleotide-count/{nucleotide_count_example.d → example/nucleotide_count.d}

@@ -145,7 +145,3 @@ bool aaEqual (const ulong[char] lhs, const ulong[char] rhs)
 }
 
 }
-
-void main ()
-{
-}

data/tracks/dlang/exercises/nucleotide-count/{nucleotide_count.d → source/nucleotide_count.d}

@@ -94,7 +94,3 @@ static if (allTestsEnabled)
 }
 
 }
-
-void main ()
-{
-}

data/tracks/dlang/exercises/pangram/dub.sdl

@@ -0,0 +1,2 @@
+name "pangram"
+buildRequirements "disallowDeprecations"

data/tracks/dlang/exercises/pangram/{pangram_example.d → example/pangram.d}

@@ -34,5 +34,3 @@ unittest
     // pangram with non-ascii characters
     assert(isPangram("Victor jagt zwölf Boxkämpfer quer über den großen Sylter Deich"));
 }
-
-void main() {}

data/tracks/dlang/exercises/pangram/{pangram.d → source/pangram.d}

@@ -23,5 +23,3 @@ unittest
     assert(isPangram("Victor jagt zwölf Boxkämpfer quer über den großen Sylter Deich"));
     }
 }
-
-void main () {}

data/tracks/dlang/exercises/raindrops/dub.sdl

@@ -0,0 +1,2 @@
+name "raindrops"
+buildRequirements "disallowDeprecations"

data/tracks/dlang/exercises/raindrops/{raindrops_example.d → example/raindrops.d}

@@ -51,5 +51,3 @@ unittest {
     assert(convert(52) == "52");
     assert(convert(105) == "PlingPlangPlong");
 }
-
-void main () {}

data/tracks/dlang/exercises/raindrops/{raindrops.d → source/raindrops.d}

@@ -20,5 +20,3 @@ static if (allTestsEnabled) {
 }
 
 }
-
-void main() {}

data/tracks/dlang/exercises/react/dub.sdl

@@ -0,0 +1,2 @@
+name "react"
+buildRequirements "disallowDeprecations"

data/tracks/dlang/exercises/react/{react_example.d → example/react.d}

@@ -287,5 +287,3 @@ unittest {
     }
   }
 }
-
-void main() {}

data/tracks/dlang/exercises/react/{react.d → source/react.d}

@@ -207,5 +207,3 @@ static if (allTestsEnabled) {
 }
 
 }
-
-void main() {}

data/tracks/dlang/exercises/rna-transcription/dub.sdl

@@ -0,0 +1,2 @@
+name "rna-transcription"
+buildRequirements "disallowDeprecations"

data/tracks/dlang/exercises/rna-transcription/{rna_transcription_example.d → example/rna_transcription.d}

@@ -33,5 +33,3 @@ unittest {
     assertThrown(dnaComplement("XXX"));
     assertThrown(dnaComplement("ACGTXXXCTTAA"));
 }
-
-void main () {}

data/tracks/dlang/exercises/rna-transcription/{rna_transcription.d → source/rna_transcription.d}

@@ -19,5 +19,3 @@ static if (allTestsEnabled) {
 }
 
 }
-
-void main() {}

data/tracks/dlang/exercises/robot-name/dub.sdl

@@ -0,0 +1,2 @@
+name "robot-name"
+buildRequirements "disallowDeprecations"

data/tracks/dlang/exercises/robot-name/{robot_name_example.d → example/robot_name.d}

@@ -147,8 +147,3 @@ unittest
 }
 
 }
-
-void main ()
-{
-}
-

data/tracks/dlang/exercises/robot-name/{robot_name.d → source/robot_name.d}

@@ -74,7 +74,3 @@ static if (allTestsEnabled)
 }
 
 }
-
-void main ()
-{
-}

data/tracks/dlang/exercises/roman-numerals/dub.sdl

@@ -0,0 +1,2 @@
+name "roman-numerals"
+buildRequirements "disallowDeprecations"

data/tracks/dlang/exercises/roman-numerals/{roman_numerals_example.d → example/roman_numerals.d}

@@ -174,7 +174,3 @@ unittest
 }
 
 }
-
-void main ()
-{
-}

data/tracks/dlang/exercises/roman-numerals/{roman_numerals.d → source/roman_numerals.d}

@@ -121,7 +121,3 @@ static if (allTestsEnabled)
 }
 
 }
-
-void main ()
-{
-}

data/tracks/dlang/exercises/series/dub.sdl

@@ -0,0 +1,2 @@
+name "series"
+buildRequirements "disallowDeprecations"

data/tracks/dlang/exercises/series/{series_example.d → example/series.d}

@@ -176,8 +176,3 @@ unittest
 }
 
 }
-
-void main ()
-{
-}
-

data/tracks/dlang/exercises/series/{series.d → source/series.d}

@@ -109,8 +109,3 @@ static if (allTestsEnabled)
 }
 
 }
-
-void main ()
-{
-}
-

data/tracks/dlang/exercises/triangle/dub.sdl

@@ -0,0 +1,2 @@
+name "triangle"
+buildRequirements "disallowDeprecations"

data/tracks/dlang/exercises/triangle/{triangle_example.d → example/triangle.d}

@@ -95,8 +95,3 @@ unittest
 }
 
 }
-
-void main ()
-{
-}
-

data/tracks/dlang/exercises/triangle/{triangle.d → source/triangle.d}

@@ -84,8 +84,3 @@ static if (allTestsEnabled)
 }
 
 }
-
-void main ()
-{
-}
-

data/tracks/elisp/exercises/grains/grains-test.el

@@ -7,32 +7,32 @@
 (load-file "grains.el")
 
 (ert-deftest square-1 ()
-  (should (equal 1 (square 1))))
+  (should (= 1 (square 1))))
 
 (ert-deftest square-2 ()
-  (should (equal 2 (square 2))))
+  (should (= 2 (square 2))))
 
 (ert-deftest square-3 ()
-  (should (equal 4 (square 3))))
+  (should (= 4 (square 3))))
 
 (ert-deftest square-4 ()
-  (should (equal 8 (square 4))))
+  (should (= 8 (square 4))))
 
 (ert-deftest square-16 ()
-  (should (equal 32768
-                 (square 16))))
+  (should (= 32768
+             (square 16))))
 
 (ert-deftest square-32 ()
-  (should (equal 2147483648
-                 (square 32))))
+  (should (= 2147483648
+             (square 32))))
 
 (ert-deftest square-64 ()
-  (should (equal 9223372036854775808
-                 (square 64))))
+  (should (= 9223372036854775808
+             (square 64))))
 
 (ert-deftest total-grains ()
-  (should (equal 18446744073709551615
-                 (total))))
+  (should (= 18446744073709551615
+             (total))))
 
 (provide 'grains-test.el)
 ;;; grains-test.el ends here.

data/tracks/elisp/exercises/robot-name/robot-name-test.el

@@ -6,33 +6,22 @@
 
 ;;; Code:
 
-(require 'cl)
+(require 'rx)
 
 (load-file "robot-name.el")
 
-(defun is-upper-alpha-p (c)
-  "Test if char C is an uppercase alpha char."
-  (let ((c (string-to-char c))
-        (A (string-to-char "A"))
-        (Z (string-to-char "Z")))
-    (<= A c Z)))
-
-(defun is-digit-p (d)
-  "Test if D is an integer from 0-9."
-  (when (string-match "[[:digit:]]" d)
-      (let ((d (string-to-char d)))
-     (<= ?0 d ?9))))
-
 (defvar *robbie* (build-robot))
 (defvar *clutz*  (build-robot))
 
+(defvar robot-name-re
+  (rx string-start
+      (= 2 upper-case)
+      (= 3 digit)
+      string-end))
+
 (ert-deftest name-matches-expected-pattern ()
   (let ((name (robot-name *robbie*)))
-    (should (= (length name) 5))
-    (should (every 'is-upper-alpha-p
-                   (split-string-and-unquote (substring name 0 2) "")))
-    (should (every 'is-digit-p
-                   (split-string-and-unquote (substring name 2 5) "")))))
+    (should (string-match-p robot-name-re name))))
 
 (ert-deftest name-is-persistent ()
   "Test that robot name is persistent."

data/tracks/elisp/exercises/word-count/word-count-test.el

@@ -13,51 +13,51 @@
 
 
 (ert-deftest no-words-test ()
-  (should (equal (word-count "")
-                 nil)))
+  (should (equal-assoc (word-count "")
+                       nil)))
 
 
 (ert-deftest count-one-word-test ()
-  (should (equal (word-count "word")
-                 '(("word" . 1)))))
+  (should (equal-assoc (word-count "word")
+                       '(("word" . 1)))))
 
 
 (ert-deftest count-one-of-each-word-test ()
-  (should (equal (word-count "one of each")
-                 '(("each" . 1) 
-                   ("of" . 1)
-                   ("one" . 1)))))
+  (should (equal-assoc (word-count "one of each")
+                       '(("each" . 1)
+                         ("of" . 1)
+                         ("one" . 1)))))
 
 
 (ert-deftest multiple-occurrences-of-a-word-test ()
-  (should (equal (word-count "one fish two fish red fish blue fish")
-                 '(("blue" . 1) 
-                   ("red" . 1) 
-                   ("two" . 1) 
-                   ("fish" . 4)
-                   ("one" . 1)))))
+  (should (equal-assoc (word-count "one fish two fish red fish blue fish")
+                       '(("blue" . 1)
+                         ("red" . 1)
+                         ("two" . 1)
+                         ("fish" . 4)
+                         ("one" . 1)))))
 
 
 (ert-deftest ignore-punctuation-test ()
-  (should (equal (word-count "car : carpet as java : javascript!!&@$%^&")
-                 '(("javascript" . 1)
-                   ("java" . 1)
-                   ("as" . 1)
-                   ("carpet" . 1)
-                   ("car" . 1)))))
+  (should (equal-assoc (word-count "car : carpet as java : javascript!!&@$%^&")
+                       '(("javascript" . 1)
+                         ("java" . 1)
+                         ("as" . 1)
+                         ("carpet" . 1)
+                         ("car" . 1)))))
 
 
 (ert-deftest include-numbers-test ()
-  (should (equal (word-count "testing, 1, 2 testing")
-                 '(("2" . 1)
-                   ("1" . 1)
-                   ("testing" . 2)))))
+  (should (equal-assoc (word-count "testing, 1, 2 testing")
+                       '(("2" . 1)
+                         ("1" . 1)
+                         ("testing" . 2)))))
 
 
 (ert-deftest normalize-case-test ()
-  (should (equal (word-count "go Go GO Stop stop")
-                 '(("stop" . 2)
-                   ("go" . 3)))))
+  (should (equal-assoc (word-count "go Go GO Stop stop")
+                       '(("stop" . 2)
+                         ("go" . 3)))))
 
 
 (provide 'word-count)

data/tracks/fortran/Makefile

@@ -11,7 +11,8 @@ OUTDIR := $(shell mktemp -d "$(TMPDIR)/$(ASSIGNMENT).XXXXXXXXXX")
 FILEEXT := "f90"
 TESTEXT := "fun"
 EXAMPLE := "example.$(FILEEXT)"
-TSTFILE := "$(ASSIGNMENT).$(TESTEXT)"
+TESTNAME := $(shell echo $(ASSIGNMENT) | sed -e "s/-/_/g")
+TSTFILE := "$(TESTNAME).$(TESTEXT)"
 
 # compiler flags
 export FSFLAG := "-I"
@@ -31,7 +32,7 @@ install-test: ## install test dependency: funit
 test-assignment: ## run single test using ASSIGNMENTS: test-assignment ASSIGNMENT=wordy
 	@echo "running tests for: $(ASSIGNMENT)"
 	@cat ./exercises/$(ASSIGNMENT)/$(TSTFILE) | sed 's/Xtest/test/' > $(OUTDIR)/$(TSTFILE)
-	@cp ./exercises/$(ASSIGNMENT)/$(EXAMPLE) $(OUTDIR)/$(ASSIGNMENT).$(FILEEXT)
+	@cp ./exercises/$(ASSIGNMENT)/$(EXAMPLE) $(OUTDIR)/$(TESTNAME).$(FILEEXT)
 	@cd $(OUTDIR) && funit
 
 test: ## run all tests

data/tracks/fortran/config.json

@@ -3,10 +3,11 @@
   "language": "Fortran",
   "repository": "https://github.com/exercism/xfortran",
   "active": false,
-  "test_pattern": "TODO",
+  "test_pattern": ".*\\.fun",
+  "solution_pattern": "example.f90",
   "exercises": [
   {
-      "slug": "hello_world",
+      "slug": "hello-world",
       "difficulty": 1,
       "topics": [
       ]
@@ -22,6 +23,24 @@
       "difficulty": 1,
       "topics": [
       ]
+  },
+  {
+      "slug": "rna-transcription",
+      "difficulty": 1,
+      "topics": [
+      ]
+  },
+  {
+      "slug": "raindrops",
+      "difficulty": 1,
+      "topics": [
+      ]
+  },
+  {
+      "slug": "difference-of-squares",
+      "difficulty": 1,
+      "topics": [
+      ]
   }
   ],
   "deprecated": [