fix style grading

Author: ironm00n

src/graders/style.arr

@@ -102,17 +102,17 @@ fun check-fun-names(ast :: A.Program) block:
     end
   }
   ast.visit(visitor)
-  violation.reverse()
+  violations.reverse()
 end
 
 fun check-binds(ast :: A.Program) block:
   var violations = [list:]
 
   visitor = A.default-iter-visitor.{
     method s-bind(self, l, _, name, _):
-      if not(is-valid-name(true, name)) block:
+      if not(is-valid-name(true, name.s)) block:
         line = l.start-line
-        violations := link(violation(line, other-name(name)), violations)
+        violations := link(violation(line, other-name(name.s)), violations)
         true
       else:
         true
@@ -134,7 +134,10 @@ fun check-tl-fun-spacing(ast :: A.Program):
               | s-fun(l, _, _, _, _, _, _, _, _, _) =>
                 start = l.start-line
                 _end = l.end-line
-                if (prev-end + 2) <= start:
+                if (start - prev-end) < 2:
+                  print("pre-fun: " + torepr(prev-fun) + "\n")
+                  print("prev: " + torepr(prev-end) + "\n")
+                  print("start: " + torepr(start) + "\n")
                   new-violations = link(
                     violation(start, function-spacing), violations
                   )
@@ -153,7 +156,7 @@ fun check-tl-fun-spacing(ast :: A.Program):
 end
 
 fun score-style(
-  path :: String
+  path :: String, base-filename :: String
 ):
   cases (Either) CA.parse-path(path):
     | left(err) =>
@@ -163,7 +166,7 @@ fun score-style(
                    check-fun-names(prog) +
                    check-binds(prog) +
                    check-tl-fun-spacing(prog)
-      info = style-info(path, violations)
+      info = style-info(base-filename, violations)
       num = L.length(violations)
       score = 1 - if num > 10: 0 else: 0.1 * num end
       right({score; info})
@@ -185,12 +188,12 @@ fun fmt-style(score, info :: StyleInfo) -> AG.ComboAggregate:
 end
 
 fun mk-style(
-  id :: AG.Id, deps :: List<AG.Id>, path :: String,
+  id :: AG.Id, deps :: List<AG.Id>, path :: String, base-filename :: String,
   max-score :: Number
 ):
   name = "Automated Style Grading"
   scorer = lam():
-    score-style(path)
+    score-style(path, base-filename)
   end
   fmter = fmt-style
   part = none

src/input.arr

@@ -166,7 +166,7 @@ fun convert-grader(
       mk-program-inspector(id, deps, entry)
     | typ == "style" then:
       points = grader.get("points").and-then(expect-num).or-else(0)
-      mk-style(id, deps, entry, points)
+      mk-style(id, deps, entry, entry-opt.value, points)
     | typ == "image-artifact" then:
       out = grader.get-value("out") ^ expect-str
       config = grader.get-value("config") ^ expect-obj

src/output.arr

@@ -196,7 +196,7 @@ data PawtograderAnnotations:
       rubric-check-id :: Option<Number>,
       released :: Boolean) with:
   method to-json(self) block:
-    sd = self.common-sd(self)
+    sd = self.common-sd()
     J.j-obj(sd.freeze())
   end
   | feedback-line-comment(
@@ -208,7 +208,7 @@ data PawtograderAnnotations:
       line :: Number,
       file-name :: String) with:
   method to-json(self) block:
-    sd = self.common-sd(self)
+    sd = self.common-sd()
     add(sd, "line", self.line, J.to-json)
     add(sd, "file_name", self.file-name, J.to-json)
     J.j-obj(sd.freeze())
@@ -221,14 +221,14 @@ data PawtograderAnnotations:
       released :: Boolean,
       artifact-name :: String) with:
   method to-json(self) block:
-    sd = self.common-sd(self)
+    sd = self.common-sd()
     add(sd, "artifact_name", self.artifact-name, J.to-json)
     J.j-obj(sd.freeze())
   end
 sharing:
   method common-sd(self) block:
     sd = [SD.mutable-string-dict:]
-    add(sd, "author", self.author, _.to-json)
+    add(sd, "author", self.author, _.to-json())
     add(sd, "message", self.message, J.to-json)
     add(sd, "points", self.points, num-to-json)
     add(sd, "rubric_check_id", self.rubric-check-id, num-to-json)

tests/scripts/from-yaml.js

@@ -30,7 +30,7 @@ program
   .option("-s, --solution <dir>", "Directory containing pawtograder.yml", ".")
   .action(async (submission, { solution }) => {
     const rawConfig = await readFile(join(solution, "pawtograder.yml"), "utf8");
-    const config = yaml.parse(rawConfig);
+    const config = yaml.parse(rawConfig, { merge: true });
     const spec = Spec.parse({
       solution_dir: solution,
       submission_dir: submission,