Merge pull request #425 from hferee/master

Make find_binding match annotated declarations

src/grader/test_lib.ml

@@ -803,6 +803,8 @@ module Make
           | { pstr_desc = Pstr_value (_, bds); _ } :: rest ->
              let rec findvar = function
                | [] -> findlet rest
+               | { pvb_pat = { ppat_desc = Ppat_constraint ({
+                  ppat_desc = Ppat_var { Location.txt; _ }; _} , _) ; _ } ; pvb_expr; _ } :: _
                | { pvb_pat = { ppat_desc = Ppat_var { Location.txt; _ }; _ } ; pvb_expr; _ } :: _ when txt = name ->
                   Message ([ Text "Found a toplevel definition for " ; Code name ; Text "."], Informative)
                   :: cb pvb_expr

tests/test_find_binding/find_binding/annot_all.ml

@@ -0,0 +1 @@
+let foo (x : int) : int = x + 1

tests/test_find_binding/find_binding/annot_all.ml.json

@@ -0,0 +1,38 @@
+[
+  {
+    "section": [
+      {
+        "text": "Function:"
+      },
+      {
+        "text": "foo",
+        "display": "code"
+      }
+    ],
+    "contents": [
+      {
+        "message": [
+          {
+            "text": "Found a toplevel definition for "
+          },
+          {
+            "text": "foo",
+            "display": "code"
+          },
+          {
+            "text": "."
+          }
+        ],
+        "result": "informative"
+      },
+      {
+        "message": [
+          {
+            "text": "Found"
+          }
+        ],
+        "result": 1
+      }
+    ]
+  }
+]

tests/test_find_binding/find_binding/annot_arg.ml

@@ -0,0 +1 @@
+let foo (x : int) = x + 1

tests/test_find_binding/find_binding/annot_arg.ml.json

@@ -0,0 +1,38 @@
+[
+  {
+    "section": [
+      {
+        "text": "Function:"
+      },
+      {
+        "text": "foo",
+        "display": "code"
+      }
+    ],
+    "contents": [
+      {
+        "message": [
+          {
+            "text": "Found a toplevel definition for "
+          },
+          {
+            "text": "foo",
+            "display": "code"
+          },
+          {
+            "text": "."
+          }
+        ],
+        "result": "informative"
+      },
+      {
+        "message": [
+          {
+            "text": "Found"
+          }
+        ],
+        "result": 1
+      }
+    ]
+  }
+]

tests/test_find_binding/find_binding/annot_ret.ml

@@ -0,0 +1 @@
+let foo x : int = x + 1

tests/test_find_binding/find_binding/annot_ret.ml.json

@@ -0,0 +1,38 @@
+[
+  {
+    "section": [
+      {
+        "text": "Function:"
+      },
+      {
+        "text": "foo",
+        "display": "code"
+      }
+    ],
+    "contents": [
+      {
+        "message": [
+          {
+            "text": "Found a toplevel definition for "
+          },
+          {
+            "text": "foo",
+            "display": "code"
+          },
+          {
+            "text": "."
+          }
+        ],
+        "result": "informative"
+      },
+      {
+        "message": [
+          {
+            "text": "Found"
+          }
+        ],
+        "result": 1
+      }
+    ]
+  }
+]

tests/test_find_binding/find_binding/function.ml

@@ -0,0 +1 @@
+let foo = function | x -> x + 1

tests/test_find_binding/find_binding/function.ml.json

@@ -0,0 +1,38 @@
+[
+  {
+    "section": [
+      {
+        "text": "Function:"
+      },
+      {
+        "text": "foo",
+        "display": "code"
+      }
+    ],
+    "contents": [
+      {
+        "message": [
+          {
+            "text": "Found a toplevel definition for "
+          },
+          {
+            "text": "foo",
+            "display": "code"
+          },
+          {
+            "text": "."
+          }
+        ],
+        "result": "informative"
+      },
+      {
+        "message": [
+          {
+            "text": "Found"
+          }
+        ],
+        "result": 1
+      }
+    ]
+  }
+]

tests/test_find_binding/find_binding/simple.ml

@@ -0,0 +1 @@
+let foo x =  x + 1

tests/test_find_binding/find_binding/simple.ml.json

@@ -0,0 +1,38 @@
+[
+  {
+    "section": [
+      {
+        "text": "Function:"
+      },
+      {
+        "text": "foo",
+        "display": "code"
+      }
+    ],
+    "contents": [
+      {
+        "message": [
+          {
+            "text": "Found a toplevel definition for "
+          },
+          {
+            "text": "foo",
+            "display": "code"
+          },
+          {
+            "text": "."
+          }
+        ],
+        "result": "informative"
+      },
+      {
+        "message": [
+          {
+            "text": "Found"
+          }
+        ],
+        "result": 1
+      }
+    ]
+  }
+]

tests/test_find_binding/find_binding/simple2.ml

@@ -0,0 +1 @@
+let foo = fun x -> x + 1

tests/test_find_binding/find_binding/simple2.ml.json

@@ -0,0 +1,38 @@
+[
+  {
+    "section": [
+      {
+        "text": "Function:"
+      },
+      {
+        "text": "foo",
+        "display": "code"
+      }
+    ],
+    "contents": [
+      {
+        "message": [
+          {
+            "text": "Found a toplevel definition for "
+          },
+          {
+            "text": "foo",
+            "display": "code"
+          },
+          {
+            "text": "."
+          }
+        ],
+        "result": "informative"
+      },
+      {
+        "message": [
+          {
+            "text": "Found"
+          }
+        ],
+        "result": 1
+      }
+    ]
+  }
+]

tests/test_find_binding/repo/exercises/find_binding/descr.html

@@ -0,0 +1,3 @@
+<p>
+  This exercise is just a test for the <code>find_binding</code> function.
+</p>

tests/test_find_binding/repo/exercises/find_binding/meta.json

@@ -0,0 +1,2 @@
+{"learnocaml_version":"1","kind":"exercise","stars":0,
+ "title":"Demo of the exercise environment"}

tests/test_find_binding/repo/exercises/find_binding/prelude.ml

@@ -0,0 +1 @@
+

tests/test_find_binding/repo/exercises/find_binding/solution.ml

@@ -0,0 +1 @@
+let foo x = x + 1

tests/test_find_binding/repo/exercises/find_binding/template.ml

@@ -0,0 +1 @@
+let foo x =  x + 1

tests/test_find_binding/repo/exercises/find_binding/test.ml

@@ -0,0 +1,10 @@
+open Test_lib
+open Report
+
+let () =
+  set_result @@
+  ast_sanity_check code_ast @@ fun () ->
+  [ Section
+      ([ Text "Function:" ; Code "foo" ], 
+        find_binding code_ast "foo" (fun _ -> [Message ([Text "Found"], Success 1)]));
+   ]

tests/test_find_binding/repo/exercises/index.json

@@ -0,0 +1,5 @@
+{ "learnocaml_version": "1",
+  "groups":
+  { "demo":
+    { "title": "Test find_binding",
+      "exercises": [ "find_binding" ] } } }