...

checker/comprog

@@ -23,7 +23,7 @@ case _"$LANG" in
         ;;
 
     _Cpp)
-        g++ -std=c++11 -g -o prog $@
+        g++ -std=c++17 -Wall -Wno-sign-compare -g -o prog $@
         ;;
 
     _Scala)
@@ -53,6 +53,7 @@ case _"$LANG" in
        ;;
 
     _)  
-       echo Unknown language $LANG 
+       echo Unknown language $LANG
+       exit 1
        ;;          
 esac

checker/src/com/horstmann/codecheck/Comparison.java

@@ -12,7 +12,9 @@ public class Comparison {
     private static final int MANY_MORE_LINES = 10;
         // If actual lines > expected + MANY_MORE_LINES, truncate actual output
 
-    public boolean execute(String actual, String expected, Report report, String filename) throws IOException {
+    public boolean execute(String input, String actual, String expected, Report report, String filename) throws IOException {
+        // TODO: This is where the newlines went to die
+
         List<String> lines1 = getLines(actual.replace("〉\n", "〉")); 
         List<String> lines2 = getLines(expected.replace("〉\n", "〉"));
 
@@ -36,6 +38,8 @@ public boolean execute(String actual, String expected, Report report, String fil
             }
         }
         else {
+            // Print inputs which are getting replaced
+            report.input(input);
             while (i < lines2.size()) {
                 Report.Match m = new Report.Match();
                 m.actual = "";
@@ -62,7 +66,6 @@ public boolean execute(String actual, String expected, Report report, String fil
                 m.explanation = null;
                 matches.add(m);
             }
-            // TODO: Report needs to deal with 〈...〉 (replace with <b>...</b>\n)
             report.compareTokens(filename, matches);
         }
         return outcome;

checker/src/com/horstmann/codecheck/CppLanguage.java

@@ -79,7 +79,7 @@ public List<Path> writeTester(Path solutionDir, Path workDir, Path file,
             lines.add(i++, extern); // extern function from solution
         }
         lines.add(i++, "}");
-        lines.add(i++, "main(int argc, char *argv[]) {");
+        lines.add(i++, "int main(int argc, char *argv[]) {");
         // We declare the student functions locally in main so that they don't conflict with
         // solution functions
         for (String extern : externs) {        
@@ -94,6 +94,7 @@ public List<Path> writeTester(Path solutionDir, Path workDir, Path file,
                 // compare expected and actual
             lines.add(i++, "}");
         }
+        lines.add(i++, "   return 0;");
         lines.add(i++, "}");
         lines.add(i++, "namespace solution {");
         lines.add("}");

checker/src/com/horstmann/codecheck/HTMLReport.java

@@ -486,8 +486,8 @@ public HTMLReport pass(boolean b) {
     @Override
     public HTMLReport compareTokens(String filename, List<Match> matchData) {
         caption(filename);
-        tableStart("output").rowStart().headerCell("Actual output")
-                .headerCell("Expected output").rowEnd().rowStart();
+        tableStart("output").rowStart().headerCell("Actual")
+                .headerCell("Expected").rowEnd().rowStart();
         builder.append("<td>");
         builder.append("<pre>");
         for (Match m : matchData) {

checker/src/com/horstmann/codecheck/JavaScriptLanguage.java

@@ -4,9 +4,7 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;

checker/src/com/horstmann/codecheck/Main.java

@@ -285,7 +285,7 @@ private void testInput(Path mainFile,
                     // Report output but don't grade it
                     report.output(outerr);
                 } else {
-                    boolean outcome = comp.execute(outerr, expectedOuterr, report, null);
+                    boolean outcome = comp.execute(input, outerr, expectedOuterr, report, null);
                     score.pass(outcome, report);
                 }
             }        
@@ -304,7 +304,7 @@ private void testInput(Path mainFile,
                     score.pass(outcome, report);                   
                 } else {
                     String expectedContents = Util.read(p);                
-                    boolean outcome = comp.execute(contents.remove(0),
+                    boolean outcome = comp.execute(input, contents.remove(0),
                             expectedContents, report, f);
                     score.pass(outcome, report);
                 }

checker/src/com/horstmann/codecheck/PythonLanguage.java

@@ -10,8 +10,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.horstmann.codecheck.Language.Interleave;
-
 public class PythonLanguage implements Language {
 
     public PythonLanguage() {

checker/src/com/horstmann/codecheck/SMLLanguage.java

@@ -5,7 +5,6 @@
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Scanner;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 

checker/src/com/horstmann/codecheck/codecheck.h

@@ -24,7 +24,7 @@ namespace codecheck {
    template<typename T> void print(std::vector<T> xs) { 
       std::cout << "{"; 
       for (int i = 0; i < xs.size(); i++) {
-         if (i > 0) std::cout << ","; std::cout << " ";
+         if (i > 0) { std::cout << ","; } std::cout << " ";
          print(xs[i]);
       }
       std::cout << " }";
@@ -43,4 +43,4 @@ namespace codecheck {
       print(y); std::cout << std::endl;
       std::cout << std::boolalpha << eq(x, y) << std::endl;
    }
-}
+}