fix(well-formed): properly fmt not-wf

closes #27

Author: ironm00n

src/graders/well-formed.arr

@@ -42,7 +42,7 @@ data WFBlock:
   | path-doesnt-exist(path :: String)
   | path-isnt-file(path :: String)
   | cannot-parse(inner :: CA.InternalParseError, content :: String)
-  | not-wf(x :: Any)
+  | not-wf(problems :: List<CS.CompileError>)
 end
 
 fun check-well-formed(filepath :: String) -> Option<WFBlock>:
@@ -94,7 +94,7 @@ fun fmt-well-formed(reason :: WFBlock) -> GB.ComboAggregate:
       "sure you submit a file, not a directory."
     | cannot-parse(inner, content) =>
       src-available = lam(x):
-        false # would be nice to embed with src-available
+        false # TODO: would be nice to embed with src-available
       end
       exn = inner.exn
       msg = inner.message
@@ -104,7 +104,14 @@ fun fmt-well-formed(reason :: WFBlock) -> GB.ComboAggregate:
       RED.display-to-string(exn.render-fancy-reason(src-available), to-repr, empty) # TODO: escape
       + "\n\n" + msg + "\n```"
 
-    | not-wf(_) => "TODO: not wf"
+    | not-wf(problems) =>
+      suf = if problems.length() == 1: "" else: "s" end
+      "The submitted file has problems. Please make sure that your file can run. " +
+      "Pyret reported the following problem" + suf + " about your submitted file." +
+      "\n```" +
+      for map(problem from problems):
+        RED.display-to-string(problem.render-fancy-reason(), to-repr, empty)
+      end.join-str("\n\n--------------------\n")
   end ^ G.output-markdown
   staff = none
   {student; staff}

tests/files/dir/.gitkeep

@@ -25,29 +25,39 @@ import file("../meta/path-utils.arr") as P
 import filesystem as FS
 
 check-well-formed = _check-well-formed
+fmt-well-formed = _fmt-well-formed
 
 # TODO: test for file not existing
 
-check "well-formed: unparsable":
-  path = P.file("unparsable.arr")
-
-  # FIXME: how to make this relative to current file
-  check-well-formed(path)
-    is
-    some(cannot-parse(
-      {
-        exn: ERR.parse-error-eof(
-            S.srcloc(path, 3, 1, 13, 3, 1, 13)),
-        message: "There were 0 potential parses.\n" +
-          "Parse failed, next token is <end of file> at " + path + ", 3:1-3:1"
-      },
-      FS.read-file-string(path)
-    ))
+check "well-formed: path-doesnt-exist":
+  path = P.file("this/file-doesnt/exist/i/hope.arr")
+  check-well-formed(path) is some(path-doesnt-exist(path))
+end
+
+check "well-formed: path-isnt-file":
+  check-well-formed(P.file("dir")) is some(path-isnt-file(P.file("dir")))
+end
+
+expected-unparsable = 
+  let path = P.file("unparsable.arr"):
+  cannot-parse(
+    {
+      exn: ERR.parse-error-eof(
+          S.srcloc(path, 3, 1, 13, 3, 1, 13)),
+      message: "There were 0 potential parses.\n" +
+        "Parse failed, next token is <end of file> at " + path + ", 3:1-3:1"
+    },
+    FS.read-file-string(path)
+  )
+  end
+
+check "well-formed: cannot-parse":
+  check-well-formed(P.file("unparsable.arr")) is some(expected-unparsable)
 end
 
 check "well-formed: wf":
-  check-well-formed(P.file("not-wf.arr"))
-    satisfies
+  res = check-well-formed(P.file("not-wf.arr"))
+  res satisfies
     {(x): cases(Option) x:
       | some(shadow x) =>
         cases(WFBlock) x:
@@ -56,4 +66,14 @@ check "well-formed: wf":
         | else => false
         end
       | else => false end}
+  print(to-repr(fmt-well-formed(res.value)) + "\n")
+end
+
+check "fmt-well-formed: smoke":
+  fmt-well-formed(path-doesnt-exist(
+    P.file("this/file-doesnt/exist/i/hope.arr"))) does-not-raise
+  fmt-well-formed(path-doesnt-exist(
+    P.file("this-file-doesnt-exist-i-hope.arr"))) does-not-raise
+  fmt-well-formed(path-isnt-file(P.file("dir"))) does-not-raise
+  fmt-well-formed(expected-unparsable) does-not-raise
 end