fix(grader): Display negative numbers with mandatory parens; Fix #440

* Thanks @letouzey for reporting this issue and suggesting a fix * Update some learn-ocaml-client tests accordingly
ocaml-sf · Oct 15, 2021 · 35941b5 · 35941b5
1 parent 07033c9
commit 35941b5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/grader/introspection.ml b/src/grader/introspection.ml
@@ -183,7 +183,7 @@ let print_value ppf v ty =
                  state := `Undecided ;
                  for i = ofs to ofs + len - 1 do
                    match String.get s i with
-                   | ' ' | '\n' | '\r' | '\t' ->
+                   | '-' | ' ' | '\n' | '\r' | '\t' ->
                        state := `Decided true ;
                        raise Exit
                    | _ ->  ()

diff --git a/tests/test1/demo/bad_plus.ml.json b/tests/test1/demo/bad_plus.ml.json
@@ -79,7 +79,7 @@
             "text": "Computing"
           },
           {
-            "text": "plus 10 -10",
+            "text": "plus 10 (-10)",
             "display": "code"
           }
         ],
@@ -91,7 +91,7 @@
             "text": "Wrong value"
           },
           {
-            "text": "-100",
+            "text": "(-100)",
             "display": "code"
           }
         ],

diff --git a/tests/test1/demo/demo.ml.json b/tests/test1/demo/demo.ml.json
@@ -79,7 +79,7 @@
             "text": "Computing"
           },
           {
-            "text": "plus 10 -10",
+            "text": "plus 10 (-10)",
             "display": "code"
           }
         ],

diff --git a/tests/test1/demo/demo2.ml.json b/tests/test1/demo/demo2.ml.json
@@ -79,7 +79,7 @@
             "text": "Computing"
           },
           {
-            "text": "plus 10 -10",
+            "text": "plus 10 (-10)",
             "display": "code"
           }
         ],
@@ -155,7 +155,7 @@
             "text": "Computing"
           },
           {
-            "text": "minus 4 -2",
+            "text": "minus 4 (-2)",
             "display": "code"
           }
         ],
@@ -191,7 +191,7 @@
             "text": "Correct value"
           },
           {
-            "text": "-10",
+            "text": "(-10)",
             "display": "code"
           }
         ],

diff --git a/tests/test_negative_int/int_exo/correct.ml.json b/tests/test_negative_int/int_exo/correct.ml.json
@@ -75,4 +75,4 @@
       }
     ]
   }
-]
+]