feature: annotation in the dependencies

Author: lsylvestre

src/grader/grading.ml

@@ -156,15 +156,33 @@ let get_grade
           match Filename.extension path with
           | ".mli" -> load_dependencies ((modname,content) :: signatures) fs
           | ".ml" -> 
+            let included,content = 
+              (* the first line of an .ml file can contain an annotation     *)
+              (* @included which denotes that this file has to be included   *)
+              (* directly in the toplevel environment, and not in an module. *)
+              match String.index_opt content '\n' with
+              | None -> (false,content)
+              | Some i -> 
+                (match String.trim (String.sub content 0 i) with 
+                 | "@included" -> 
+                    let content' = String.sub content i @@ 
+                                   (String.length content - i)
+                    in (true,content')
+                 | _ -> (false,content))
+            in
             (handle_error (internal_error [%i"while loading user dependencies"]) @@
-             let use_mod = 
-               Toploop_ext.use_mod_string ~print_outcome ~ppf_answer ~modname in
-             match List.assoc_opt modname signatures with 
-             | Some sig_code -> use_mod ~sig_code content
-             | None -> use_mod content); 
-             load_dependencies signatures fs
+             match included with
+             | true -> Toploop_ext.use_string ~print_outcome ~ppf_answer 
+                                  ~filename:(Filename.basename path) content 
+             | false ->
+               let use_mod = 
+                 Toploop_ext.use_mod_string ~print_outcome ~ppf_answer ~modname in
+               match List.assoc_opt modname signatures with 
+               | Some sig_code -> use_mod ~sig_code content
+               | None -> use_mod content); 
+               load_dependencies signatures fs
           | _ -> failwith ("uninterpreted dependency \"" ^ path ^
-                           "\".file extension expected : .ml or .mli") in 
+                           "\", file extension expected : .ml or .mli") in 
           load_dependencies [] files
       in
 

src/repo/learnocaml_exercise.ml

@@ -210,10 +210,8 @@ module File = struct
           | None -> line
           | Some index -> String.sub line 0 index in
     let lines = String.split_on_char '\n' txt in
-    List.filter (function "" -> false | _ -> true) @@
-    List.map (fun line -> String.trim @@
-                          remove_comment ~start:'#' @@ 
-                          remove_comment ~start:';' line) lines
+    List.filter ((<>) "") @@
+    List.map (fun line -> String.trim (remove_comment ~start:'#' line)) lines
 
   let dependencies = function
     | None -> []