Note: question export disabled for the time being; otherwise descrs_from_string raises a Stack_overflow on strings of size 14000.
" + | "prepare.ml" -> Some exercise.prepare + | "solution.ml" -> Some exercise.solution + | "test.ml" -> Some exercise.test + | "max_score.txt" -> Some (string_of_int exercise.max_score) + | "depend.txt" -> None (* TODO: Add support *) + | _ -> None + in + Learnocaml_exercise.read + ~read_field + ~id:proper_id + ~decipher:false + () + +(* TODO look for the record type of res to make the message more understandable *) +let typecheck_dialog_box div_id res = + let result,ok = + match res with + | Toploop_results.Ok _ -> [%i"Your question does typecheck. "],true + | Toploop_results.Error (err,_) -> + [%i"Your question does not typecheck. "] + ^ err.Toploop_results.msg ,false in + if ok then + begin + let messages = Tyxml_js.Html5.ul [] in + let _checked, check_message = + let t, _u = Lwt.task () in + let btn_ok = Tyxml_js.Html5.(button [ pcdata [%i"OK"] ]) in + Manip.Ev.onclick btn_ok ( fun _ -> + hide_loading ~id:div_id () ; true) ; + let div = + Tyxml_js.Html5.(div ~a: [ a_class [ "dialog" ] ] + [ pcdata result ; + btn_ok ; + ]) in + Manip.SetCss.opacity div (Some "0") ; + t, div in + Manip.replaceChildren messages + Tyxml_js.Html5.[ li [ pcdata "" ] ] ; + show_load div_id [ check_message ] ; + Manip.SetCss.opacity check_message (Some "1"); + Lwt.return (); + end + else + begin + hide_loading ~id:div_id (); + Dom_html.window##alert (Js.string result); + Lwt.return (); + end + + +let put_exercise_id id (old_state:editor_state) = + { + exercise = {old_state.exercise with id} ; + metadata = {old_state.metadata with id =Some id} + } + ;; + +module Editor_io = struct + + let download_file name contents = + let url = + Js.Unsafe.meth_call (Js.Unsafe.global##._URL) "createObjectURL" [| Js.Unsafe.inject contents |] in + let link = Dom_html.createA Dom_html.document in + link##.href := url ; + Js.Unsafe.set link (Js.string "download") (Js.string name) ; + ignore (Dom_html.document##.body##(appendChild ((link :> Dom.node Js.t)))) ; + ignore (Js.Unsafe.meth_call link "click" [||]) ; + ignore (Dom_html.document##.body##(removeChild ((link :> Dom.node Js.t)))) + + let download id = + let name = id ^ ".zip" in + let json = (get_editor_state id) + |> Json_repr_browser.Json_encoding.construct + Editor.editor_state_enc + in + let contents = Js._JSON##(stringify json) in + let editor_download = Js.Unsafe.eval_string "editor_download" in + let callback = download_file name in + let _ = + Js.Unsafe.fun_call editor_download + [|Js.Unsafe.inject contents; + Js.Unsafe.inject (Js.wrap_callback callback) |] in () + + let download_all () = + let name = "exercises.zip" in + let editor_index= Learnocaml_local_storage.(retrieve editor_index) in + let json = Json_repr_browser.Json_encoding.construct + (SMap.enc editor_state_enc) + editor_index + in + let exercises = Js._JSON##(stringify json) in + let index = SMap.fold + (fun k editor_state acc -> + (k, Some editor_state.metadata ) :: acc) editor_index [] + in + let index = Learnocaml_data.Exercise.Index.Exercises index + |> Json_repr_browser.Json_encoding.construct + Exercise.Index.enc + in + let index = Js._JSON##(stringify index) in + let editor_download = Js.Unsafe.eval_string "editor_download_all" in + let callback = download_file name in + let _ = + Js.Unsafe.fun_call editor_download + [|Js.Unsafe.inject exercises; + Js.Unsafe.inject index; + Js.Unsafe.inject (Js.wrap_callback callback) |] in () + + let upload_file () = + let input_files_load = + Dom_html.createInput ~_type: (Js.string "file") Dom_html.document in + let result_t, result_wakener = Lwt.wait () in + let fail () = + Lwt.wakeup_exn result_wakener + (Failure "file loading not implemented for this browser") ; + Js._true + in + input_files_load##.onchange := + Dom.handler + (fun ev -> + Js.Opt.case (ev##.target) fail @@ + fun target -> + Js.Opt.case (Dom_html.CoerceTo.input target) fail @@ + fun input -> + Js.Optdef.case (input##.files) fail @@ + fun files -> + Js.Opt.case (files##(item (0))) fail @@ + fun file -> + Lwt.wakeup result_wakener file; Js._true); + ignore (Js.Unsafe.meth_call input_files_load "click" [||]) ; + result_t + + + let upload () = + run_async_with_log + (fun () -> + upload_file () >>= + fun file -> + let (f:Js.js_string Js.t ->(Js.js_string Js.t -> unit)->unit) = Js.Unsafe.eval_string "editor_import" in + let override_all = Js_utils.confirm "Do you want to override all?" in + let callback = + (fun text -> + SMap.iter + (fun id editor_state -> + let editor_state = put_exercise_id id editor_state in (* update metadata.id *) + if (not (idUnique id && titleUnique id)) && not override_all then + let override = Js_utils.confirm + ([%i"Identifier and/or title not unique\n"] ^ + "id:" ^ id ^ [%i" title:"] ^ editor_state.metadata.title ^ + "\n Do you want to override?") + in + if override then + update_index editor_state; + else + update_index editor_state + ) + (Json_repr_browser.Json_encoding.destruct + (SMap.enc editor_state_enc) + (Js._JSON##(parse text))); + Dom_html.window##.location##reload) + in + let _ = + Js.Unsafe.fun_call f + [| Js.Unsafe.inject file ; + Js.Unsafe.inject callback|] + in Lwt.return_unit) +end + +module Templates = struct + + let give_templates () = + Learnocaml_local_storage.(retrieve editor_templates) + + (*gives the first 3 templates to show *) + let give_first_templates () = + let templates = + give_templates () + in + match templates with + | [] -> [] + | hd :: [] -> [hd] + | hd :: snd :: [] -> [hd; snd] + | hd :: snd :: thrd :: _ -> [ hd; snd; thrd] + + (* WARNING very important that |} is without indenitng and in a new line + if not there will be a bug for the first edition of the templates in the editor: + add templates after the last template is not possible if you don't know the trick. + The trick is to remove the new line of the last template and then manually type return in the keyboard *) + let against_solution_template = + { name = "Against solution"; + template = {| + let q_plus = + let prot = arg_ty [%ty:int] (last_ty [%ty: int] [%ty: int ]) in (* type: int-> int -> int *) + test_function_against_solution ~gen:(10) prot (*10 random tests *) + "plus" (* function name = plus *) + [1 @:!! 4 ; 3 @:!! 3 ];; (* compare (plus 1 4) and + (plus 3 3) against professor\'s solution *) +|} + } + + let test_suite_template = + { name = "Test Suite"; + template = {| + let q_plus2 = + let prot = arg_ty [%ty:int] (last_ty [%ty: int] [%ty: int ]) in (*type : int -> int ->int *) + test_function prot + (lookup_student (ty_of_prot prot) "plus") (*function name :"plus" *) + [5 @:!! 4 ==> 9; (* plus 5 4 = 9 *) + 5 @:!! 5 ==> 10; + 1 @:!! 1 ==> 2; + 0 @:!! 0 ==> 0];; +|} + } + + let save templates = + Learnocaml_local_storage.(store editor_templates templates) + + (* adding default templates if empty *) + let init () = let templates = give_templates () in + if templates = [] then + [against_solution_template; + test_suite_template] + |> save + + let to_string templates = + let rec aux acc = function + | [] -> acc + | Editor.{name; template} :: l -> + let new_acc = acc ^ "#" + ^ name ^ "\n" ^ template + in + aux new_acc l + in + aux "" templates + + let from_string string = + let extract = + Regexp.(split (regexp_with_flag "^#+\\s*(.*)\n" "m")) string + in + + let rec aux acc = function + | name :: template :: l -> aux ({name;template}:: acc) l + | _ -> acc + in + match extract with + | [] -> [] + | _ ::l -> List.rev (aux [] l) + + let template_to_a_elt ace_t Editor.{name; template = templ} = + H.(a ~a:[ a_onclick (fun _ -> + let position = Ace.get_cursor_position ace_t in + Ace.insert ace_t position templ; true); + a_class ["editor-template"]] + [pcdata name]) +end + +module Editor_components = struct + let dropup ~icon ~theme name items = + let dropup_content = + H.(div ~a:[a_class ["dropup-content"]] items) + in + let drop_button = + H.(button ~a:[a_class ["dropbtn"]] [ + img ~alt:"" ~src:(api_server ^ "/icons/icon_" ^ icon ^ "_" ^ theme ^ ".svg") () ; + pcdata " " ; + span ~a:[ a_class [ "label" ] ] [ pcdata name ] + ]) + in + Manip.Ev.onclick drop_button + (fun _ -> Manip.toggleClass dropup_content "show"); + (* TODO translate it to js_of_ocaml *) + let _ = + Js.Unsafe.js_expr " //Close the dropdown menu if the user clicks outside of it\nwindow.onclick = function(event) {\n if (!event.target.matches(\'.dropbtn\')) {\n var dropdowns = document.getElementsByClassName(\"dropup-content\");\n var i;\n for (i = 0; i < dropdowns.length; i++) {\n var openDropdown = dropdowns[i];\n if (openDropdown.classList.contains(\'show\')) {\n openDropdown.classList.remove(\'show\');\n }\n }\n }\n} " in (); + H.(div ~a:[a_class ["dropup"]] [drop_button; dropup_content]) + + let editor_overlay () = + H.(div ~a:[a_class ["learnocaml-dialog-overlay"; "config-editor-overlay"] ] + []) + + + let editor_container ~size ~contents ~buttons ~box_title ~box_header = + let container = + H.(div + [ + h3 [pcdata box_title]; + div [box_header]; + contents; + div ~a:[a_class ["buttons"] ] buttons + ] + ) + in + let (width, height) = size in + Manip.SetCss.width container width; + Manip.SetCss.height container height; + container + + + let ace_editor_container ~save ~size ~editor ~box_title ~box_header = + let overlay = editor_overlay () in + let close_btn = + H.(button ~a:[ a_onclick (fun _ -> + Manip.removeChild Manip.Elt.body overlay;false + )] [pcdata "Cancel"]) + in + let save_btn = + H.(button ~a:[ a_onclick (fun _ -> + save(); + reload(); false + )] [pcdata "Save"]) + in + let container = editor_container + ~size + ~contents: editor + ~buttons: [close_btn;save_btn] + ~box_title + ~box_header: (H.pcdata box_header) + in + Manip.replaceChildren overlay [container]; + overlay + + let all_templates_container ~size ~elements ~box_title ~box_header = + let overlay = editor_overlay () in + let close () = Manip.removeChild Manip.Elt.body overlay in + let ok_btn = + H.(button ~a:[ a_onclick (fun _ -> + close ();false + )] [pcdata "Ok"]) + in + + List.iter + (fun elt -> + let dom_elt = Tyxml_js.To_dom.of_a elt in + Dom_html.addEventListener dom_elt Dom_html.Event.click + (Dom_html.handler ( fun _ -> close ();Js._true )) + Js._true + |> ignore) + elements; + let contents = H.(div ~a: [a_style "overflow:auto"; + a_class["templates-to-change"]] elements) + in + let container = editor_container + ~size + ~contents + ~buttons: [ok_btn] + ~box_title + ~box_header + in + Manip.replaceChildren overlay [container]; + overlay +end diff --git a/src/editor/editor_lib.mli b/src/editor/editor_lib.mli new file mode 100644 index 000000000..cd744b7a0 --- /dev/null +++ b/src/editor/editor_lib.mli @@ -0,0 +1,163 @@ +(* This file is part of Learn-OCaml. + * + * Copyright (C) 2019 OCaml Software Foundation. + * Copyright (C) 2016-2018 OCamlPro. + * + * The main authors of the editor part is the pfitaxel team see + * https://github.com/pfitaxel/learn-ocaml-editor for more information + * + * Learn-OCaml is distributed under the terms of the MIT license. See the + * included LICENSE file for details. *) + +open Learnocaml_data +open Editor +module H = Tyxml_js.Html + +val update_index : Editor.editor_state -> unit + +(** Getters of an editor exercise + * @param the id *) +val get_editor_state : string -> Editor.editor_state +val get_titre : string -> string +val get_description : string -> string +val get_diff : string -> float +val get_solution : string -> string +val get_question : string -> string +val get_template : string -> string +val get_testml : string -> string +val get_prelude : string -> string +val get_prepare : string -> string + +val with_test_lib_prepare :string->string + +(** Remove an exercise from the local storage *) +val remove_exo : Map.Make(String).key -> unit + +(** @return a bool depending on whether the id is already used or not *) +val idUnique : string -> bool +(** @return a bool depending on whether the title is already used or not *) +val titleUnique : string -> bool + +val new_state : Exercise.Meta.t -> editor_state +(** arguments Dom element , string *) +val setInnerHtml : < innerHTML : < set : Js.js_string Js.t -> unit; .. > + Js_of_ocaml.Js.gen_prop; .. > Js_of_ocaml.Js.t -> string -> unit + +(** Fragment of a test.ml code + * @see definition *) +val init : string + +(** Create the code of a section + * @param name_of_the_function associated_report *) +val section : string -> string -> string + +(* TODO: Remove commented code +(** @param content_of_the_toplevel [[]] + * @return a list + * The first value is the type of the first val, etc. *) +val get_all_val : char list -> char list list -> char list list + +(** Remove atomic values from a list of types + * @return a list of type of function (var function_name : type ="]; + "txt_title", [%i"Title (unique too):
"]; + "txt_descr", [%i"Description of the exercise:
"]; + "txt_diff", [%i"Difficulty level:
"]; + "cancel", [%i"Cancel"]; + "save", [%i"Save"]; + ] in + Translate.set_string_translations translations + *) + + +let getString element= Js.to_string element##.value +let getStringOpt = function + | None -> None + | Some input -> Some (Js.to_string input##.value) + +let getFloat element= float_of_string (Js.to_string element##.value) + +let get = function + None -> failwith "Element not found" + | Some s -> s + +let string_with_spaces list= + let s = + List.fold_left + (fun acc elt ->acc^" "^elt) + "" + list + in + if s="" then + "" + else + String.sub s 1 (String.length s - 1 ) + +let resultOptionToBool = function + | None -> false + | Some _ -> true + + +let isIdCorrect s = + resultOptionToBool (Regexp.string_match (Regexp.regexp "^[a-z0-9_-]+$") s 0) + +let isTitleCorrect s = + (resultOptionToBool (Regexp.string_match (Regexp.regexp "^[^ \t]") s 0)) && + (resultOptionToBool (Regexp.string_match (Regexp.regexp ".*[^ \t]$") s 0)) + + +module H = Tyxml_js.Html +open Lwt.Infix + +(*getting html elements*) +let previous_id = match (arg "id") with + | exception Not_found -> "" + | s -> s +let save_element = getElementById "save" +let identifier_input = + get (getElementById_coerce "identifier" CoerceTo.input) +let title_input = + get (getElementById_coerce "title" CoerceTo.input) +let authors_input = + get (getElementById_coerce "authors" CoerceTo.input) +let required_input = + get (getElementById_coerce "required" CoerceTo.input) +let trained_input = + get (getElementById_coerce "focus" CoerceTo.input) +let description_textarea = + get (getElementById_coerce "description" CoerceTo.textarea) +let difficulty_select = + get (getElementById_coerce "difficulty" CoerceTo.select) + +let backward_input =get (getElementById_coerce "backward" CoerceTo.input) +let forward_input = get (getElementById_coerce "forward" CoerceTo.input) +let previous_state = + match get_editor_state previous_id with + | exception Not_found -> None + | state->Some state + +(*filling the form eventualy *) +let _ = match previous_state with + | None -> () + | Some state -> identifier_input##.value := Js.string previous_id; + title_input##.value := Js.string state.metadata.title; + let s = List.fold_left + (fun acc (a, b) -> acc ^ a ^ " <" ^ b ^ ">, ") + "" + state.metadata.author in + authors_input##.value := + if s="" then Js.string "" + else + Js.string (String.sub s 0 (String.length s - 2)); + + required_input##.value := Js.string + (string_with_spaces + state.metadata.requirements); + trained_input##.value := Js.string + (string_with_spaces + state.metadata.focus); + setInnerHtml + description_textarea + (match state.metadata.short_description with + None -> "" + |Some s -> s); + + difficulty_select##.value := Js.string (string_of_float state.metadata.stars); + + backward_input##.value := Js.string + (string_with_spaces + state.metadata.backward); + + forward_input##.value := Js.string + (string_with_spaces + state.metadata.forward) + + +(* handling the save of metadata *) +let store metadata = + let state = + match get_editor_state previous_id with + | exception Not_found -> new_state metadata + | e -> + {exercise=e.exercise ;metadata} + in + update_index state + +let id_error = getElementById "id_error" +let title_error = getElementById "title_error" + +let _ = + save_element##.onclick := handler (fun _ -> + let id = getString identifier_input + and title = getString title_input + and short_description = Some (getString description_textarea) + and stars = getFloat difficulty_select + and string_parser string = Regexp.split + (Regexp.regexp " ") + string + in + let requirements = string_parser (Js.to_string required_input##.value) + and focus = string_parser (Js.to_string trained_input##.value) + and backward = string_parser (Js.to_string backward_input##.value) + and forward = string_parser (Js.to_string forward_input##.value) + and authors = + if String.trim (Js.to_string authors_input##.value) = "" then [] + else + Regexp.split (Regexp.regexp ", ?") (Js.to_string authors_input##.value) + |> List.map @@ fun s -> + match Regexp.string_match + (Regexp.regexp "^([^<>]+) <([^<>]*)>$") s 0 with + (* TODO Keep up-to-date with static/editor/new-exercise.html *) + | Some res -> let odflt = (function Some s -> s | None -> "") in + String.trim @@ odflt @@ Regexp.matched_group res 1, + String.trim @@ odflt @@ Regexp.matched_group res 2 + | None -> + Dom_html.window##alert (Js.string "Incorrect value for the authors field"); + failwith "bad syntax" + in + let metadata={requirements;focus;backward;forward; + kind= Exercise;title; id=Some id; + author=authors;short_description;stars} + and id_correct = isIdCorrect id + and id_unique = idUnique id || (previous_id = id) + and title_correct = isTitleCorrect title + and previous_title = match previous_state with + None -> None + | Some state -> + Some state.metadata.title + in + let title_unique = titleUnique title || previous_title = (Some title) in + (if not id_correct then + setInnerHtml id_error [%i"Incorrect identifier: an identifier \ + can't be empty, \ + and only lower case letters, numerals, dashes \ + and underscores are allowed"] + else if not id_unique then + setInnerHtml id_error [%i"This identifier is already used, \ + please choose another one"] + else + setInnerHtml id_error ""); + (if not title_correct then + setInnerHtml title_error [%i"Incorrect title: a title can't be empty, \ + or begin or end with a space or a tab"] + else if not title_unique then + setInnerHtml title_error + [%i"This title is already used, please choose another one"] + else + setInnerHtml title_error ""); + if id_correct && title_correct && id_unique && title_unique then + begin + store metadata; + Dom_html.window##.location##assign + (Js.string (api_server ^ "/editor.html#id=" ^ id)); + end; + Js._true); diff --git a/src/editor/test_spec.ml b/src/editor/test_spec.ml new file mode 100644 index 000000000..f89a5f6ee --- /dev/null +++ b/src/editor/test_spec.ml @@ -0,0 +1,309 @@ +(* This file is part of Learn-OCaml. + * + * Copyright (C) 2019 OCaml Software Foundation. + * Copyright (C) 2016-2018 OCamlPro. + * + * The main authors of the editor part is the pfitaxel team see + * https://github.com/pfitaxel/learn-ocaml-editor for more information + * + * Learn-OCaml is distributed under the terms of the MIT license. See the + * included LICENSE file for details. *) + +open Editor_lib + +let string_of_char ch = String.make 1 ch + +let rec to_string_aux char_list =match char_list with + | []-> "" + | c::l -> (string_of_char c) ^ ( to_string_aux l) + +let to_funty str = "[%funty: " ^ str ^ "]" + +(* The tester arg could take into account exceptions/sorted lists/etc. *) +let question_typed ?num question = + let open Learnocaml_data.Editor in + let opt_string param = function + | "" -> "" + | v -> Format.sprintf " ~%s:(%s)" param v + and sampler_args = function + | "" -> "" + | f -> Format.sprintf "fun () -> last ((%s) ())" f + in + let prefix = match num with None -> "" | Some n -> string_of_int n in + match question with + | TestAgainstSpec a -> + (* FIXME *) + "(* Question #" ^ " about " ^ a.name ^ " was not translated\n" + ^ "(TestAgainstSpec not currently supported by the learn-ocaml runtime) *)" + | TestSuite a -> + let name, prot, tester, suite = + a.name, to_funty a.ty, opt_string "test" a.tester, a.suite in + (* Naming convention: [q_name], [q1_name; q2_name] (occurrence 1/3) *) + Format.sprintf "let q%s_%s =@. \ + let prot = %s in@. \ + test_function%s prot@. \ + (lookup_student (ty_of_prot prot) %s)@. \ + %s;;@." + prefix name prot tester name suite + | TestAgainstSol a -> + let name = a.name + and prot = to_funty a.ty + and gen = a.gen + and sampler = opt_string "sampler" (sampler_args a.sampler) + and tester = opt_string "test" a.tester + and suite = a.suite + in + (* Naming convention: [q_name], [q1_name; q2_name] (occurrence 2/3) *) + Format.sprintf "let q%s_%s =@. \ + let prot = %s in@. \ + test_function_against_solution ~gen:(%d)%s%s prot@. \ + \"%s\"@. \ + %s;;@." + prefix name prot gen sampler tester name suite + +(*****************) +(* compile stuff *) +(*****************) + +let test_prel = "open Test_lib\nopen Learnocaml_report;;\n" + +let quality_function = {| +let avoid_thentrue = let already = ref false in fun _ -> + if !already then [] else begin + already := true ; + Learnocaml_report.[ Message ([ Text "* Do not write the following code patterns:"; + Code "[if ... then true else ...; + if ... then false else ...; + if ... then ... else true; + if ... then ... else false]"; Text " +Preferably use Boolean operators (&&), (||), not."], Success ~-4) ] + end + +let check_thentrue e = + Parsetree.( + match e with + | {pexp_desc = Pexp_ifthenelse (_, e1, (Some e2))} -> + begin + match e1 with + | {pexp_desc = Pexp_construct ({Asttypes.txt = (Longident.Lident "false")}, None)} + | {pexp_desc = Pexp_construct ({Asttypes.txt = (Longident.Lident "true")}, None)} -> + avoid_thentrue e1 + | _ -> [] + end @ begin + match e2 with + | {pexp_desc = Pexp_construct ({Asttypes.txt = (Longident.Lident "false")}, None)} + | {pexp_desc = Pexp_construct ({Asttypes.txt = (Longident.Lident "true")}, None)} -> + avoid_thentrue e2 + | _ -> [] + end + | _ -> []) + +let avoid_list1app = let already = ref false in fun _ -> + if !already then [] else begin + already := true ; + Learnocaml_report.[ Message ([ Text "* Do not write:"; + Code "[x] @ l"; + Text ". Preferably write:"; + Code "x :: l"; + Text "."], Success ~-4) ] + end + +let check_list1app e = + Parsetree.( + match e.pexp_desc with + | Pexp_apply (app0, [(_, lst1); _]) -> + (match app0.pexp_desc, lst1.pexp_desc with + | Pexp_ident {Asttypes.txt = app0'}, + Pexp_construct ({Asttypes.txt = (Longident.Lident "::")}, Some lst1') + when List.mem (Longident.flatten app0') [["List"; "append"]; ["@"]] -> + (match lst1'.pexp_desc with + | Pexp_tuple [_; nil0] -> + (match nil0.pexp_desc with + | Pexp_construct ({Asttypes.txt = (Longident.Lident "[]")}, None) -> + avoid_list1app e + | _ -> []) + | _ -> []) + | _ -> []) + | _ -> []) + +let avoid_eqphy = let already = ref false in fun _ -> + if !already then [] else begin + already := true ; + Learnocaml_report.[ Message ([ Text "* Do not use physical equality"; + Code "(==)"; + Text ". Preferably use structural equality"; + Code "(=)"; + Text "."], Success ~-1) ] + end + +let avoid_neqphy = let already = ref false in fun _ -> + if !already then [] else begin + already := true ; + Learnocaml_report.[ Message ([ Text "* Do not use physical inequality"; + Code "(!=)"; + Text ". Preferably use structural inequality"; + Code "(<>)"; + Text "."], Success ~-1) ] + end + +let check_eqphy e = + Parsetree.( + match e.pexp_desc with + | Pexp_ident {Asttypes.txt = Longident.Lident "=="} -> avoid_eqphy e + | _ -> []) + +let check_neqphy e = + Parsetree.( + match e.pexp_desc with + | Pexp_ident {Asttypes.txt = Longident.Lident "!="} -> avoid_neqphy e + | _ -> []) +|} + +let imperative_function = {|let ast_imperative_check ast = + let chk_expr e = + Parsetree.( + match e with + | {pexp_desc = Pexp_sequence _} -> forbid_syntax ";" e + | {pexp_desc = Pexp_while _} -> forbid_syntax "while" e + | {pexp_desc = Pexp_for _} -> forbid_syntax "for" e + | {pexp_desc = Pexp_array _} -> forbid_syntax "array" e + | _ -> [] ) in + let imperative_report = + ast_check_structure + ~on_expression:chk_expr + ast |> List.sort_uniq compare in + if snd (Learnocaml_report.result imperative_report) then + imperative_report + else + []|} + + +let ast_fonction quality imperative = + let fonction = if quality then + quality_function + else + "" in + let fonction = if imperative then + fonction ^ imperative_function + else + fonction ^ "" in + let fonction = fonction ^ "\n\nlet ast_quality ast =" in + let fonction = + if imperative then + fonction ^ {| + let imperative_report = + let tempReport = ast_imperative_check ast in + if tempReport = [] then [] + else (Message ([ Text "Imperative features have been detected:" ], + Success ~-4)) :: tempReport + |} + else + fonction ^ {| + let imperative_report = [] + |} in + let fonction = + if quality then + fonction ^ {| + and report = + let tempReport = ast_check_structure + ~on_expression:(check_thentrue @@@ check_list1app @@@ + check_eqphy @@@ check_neqphy) + ast |> List.sort_uniq compare in + if tempReport = [] then [] + else (Message ([Text "Unwanted code patterns have been detected:"], + Failure)) :: tempReport + |} + else fonction ^ " and report = []" in + let fonction = fonction ^ {| + in if imperative_report = [] && report = [] + then [ Message ([ Text "OK (no prohibited construction detected)"], Important) ] + else imperative_report @ report;; + + |} in + fonction + +let ast_code quality imperative = +let fonction = + if quality || imperative then + {|Section ([ Text "Code quality:" ], ast_quality code_ast); + |} + else + "" in + fonction + +(* Naming convention: [q_name], [q1_name; q2_name] (occurrence 3/3) *) +(* [cat_question "foo" [42] = "q_foo"] + [cat_question "foo" [42; 42; 42] = "q1_foo @ q2_foo @ q3_foo"] *) +let cat_question name list_qst = + match list_qst with + | [] -> invalid_arg "cat_question" + | [_] -> "q_" ^ name + | _q :: ((_ :: _) as l) -> + List.fold_left (fun (i, acc) _e -> + (i + 1, acc ^ " @ q" ^ string_of_int i ^ "_" ^ name)) + (2, "q1_" ^ name) l + |> snd + +let compile indexed_list = + let tests = test_prel ^ (ast_fonction true true) in + let tests = List.fold_left (fun acc (name, list_qst) -> + acc ^ + Format.sprintf {|let () = set_progress "Q. %s"@.@.|} name ^ + if List.length list_qst > 1 then + List.fold_left (fun (i, acc) qst -> + (i + 1, acc ^ question_typed ~num:i qst ^" \n")) + (1, "") list_qst + |> snd + else List.fold_left (fun acc qst -> + acc ^ question_typed qst ^" \n") + "" list_qst) + tests indexed_list in + let tests = tests ^ init ^ "[\n" ^ ast_code true true in + let tests = + List.fold_left (fun acc (name, list_qst) -> + acc ^ section name (cat_question name list_qst)) + tests indexed_list in + tests ^ " ]" + +(* +module Generate_1 = struct + open Tyxml_js.Html5 + open Learnocaml_common + open Learnocaml_data + open Lwt.Infix + + let ask_name top = + ask_string ~title:"Name" [ pcdata "Enter the function name"] >>= + (fun name -> + let questions = extract_functions (get_answer top) in + match List.assoc_opt name questions with + | None -> Learnocaml_common.alert "No question with this name found"; Lwt.return None + | Some s -> Lwt.return (Some (name,s)) + ) + + let generate_against_solution tuple_opt = + match tuple_opt with + | None -> "" + | Some (name, ty) -> let question = + Editor.TestAgainstSol + {name = name; ty; + gen=10; suite= "[1 @:!! 4 ; 3 @:!! 3 ]"; + tester = ""; sampler = ""} + in + question_typed question + + let generate_test_suite tuple_opt = + match tuple_opt with + | None -> "" + | Some (name, ty) -> let question = + Editor.TestSuite + {name = name; ty; + gen=10; suite= "[1 @:!! 4 ; 3 @:!! 3 ]"; + tester = ""; sampler = ""} + in + question_typed question + + +end + + *) diff --git a/src/editor/test_spec.mli b/src/editor/test_spec.mli new file mode 100644 index 000000000..b35c1c90a --- /dev/null +++ b/src/editor/test_spec.mli @@ -0,0 +1,18 @@ +(* This file is part of Learn-OCaml. + * + * Copyright (C) 2019 OCaml Software Foundation. + * Copyright (C) 2016-2018 OCamlPro. + * + * The main authors of the editor part is the pfitaxel team see + * https://github.com/pfitaxel/learn-ocaml-editor for more information + * + * Learn-OCaml is distributed under the terms of the MIT license. See the + * included LICENSE file for details. *) + +(** [question_typed] is used by [compile] + @return the compiled string of a single question *) +val question_typed : ?num:int -> Learnocaml_data.Editor.test_qst_untyped -> string + +(** [compile] is used by the "Generate" feature of the test.ml tab + @return the compiled string of all given questions *) +val compile : (string * Learnocaml_data.Editor.test_qst_untyped list) list -> string diff --git a/src/main/learnocaml_main.ml b/src/main/learnocaml_main.ml index 859cfaad6..82c481e9b 100644 --- a/src/main/learnocaml_main.ml +++ b/src/main/learnocaml_main.ml @@ -155,6 +155,14 @@ module Args = struct value & opt dir default & info ["contents-dir"] ~docv:"DIR" ~doc: "directory containing the base learn-ocaml app contents" + let editor_dir = + let default = + readlink (Filename.dirname (Filename.dirname (Sys.executable_name)) + /"share"/"learn-ocaml"/"editor") + in + value & opt dir default & info ["editor-dir"] ~docv:"DIR" ~doc: + "directory containing the learn-ocaml-editor app contents" + let enable opt doc = value & vflag None [ Some true, info ["enable-"^opt] ~doc:("Enable "^doc); @@ -173,6 +181,10 @@ module Args = struct "the 'Lessons' tab (enabled by default if the repository contains a \ $(i,lessons) directory)" + let editor = enable "editor" + "the 'Editor' tab (enabled by default), for users connected with a \ + teacher token, or all users if static deployment is used." + let exercises = enable "exercises" "the 'Exercises' tab (enabled by default if the repository contains an \ $(i,exercises) directory)" @@ -191,8 +203,10 @@ module Args = struct type t = { contents_dir: string; + editor_dir: string; try_ocaml: bool option; lessons: bool option; + editor: bool option; exercises: bool option; playground: bool option; toplevel: bool option; @@ -201,10 +215,10 @@ module Args = struct let builder_conf = let apply - contents_dir try_ocaml lessons exercises playground toplevel base_url - = { contents_dir; try_ocaml; lessons; exercises; playground; toplevel; base_url } + contents_dir editor_dir try_ocaml lessons editor exercises playground toplevel base_url + = { contents_dir; editor_dir; try_ocaml; lessons; editor; exercises; playground; toplevel; base_url } in - Term.(const apply $contents_dir $try_ocaml $lessons $exercises $playground $toplevel $base_url) + Term.(const apply $contents_dir $editor_dir $try_ocaml $lessons $editor $exercises $playground $toplevel $base_url) let repo_conf = let apply repo_dir exercises_filtered jobs = @@ -304,17 +318,22 @@ let main o = else Lwt.return_none in let generate () = + let copy title src_dir = + Printf.printf "Updating %s at %s\n%!" title o.app_dir; + Lwt.catch + (fun () -> Lwt_utils.copy_tree src_dir o.app_dir) + (function + | Failure _ -> + Lwt.fail_with @@ + Printf.sprintf "Failed to copy %s app contents from %s" + title (readlink src_dir) + | e -> Lwt.fail e) + in if List.mem Build o.commands then - (Printf.printf "Updating app at %s\n%!" o.app_dir; - Lwt.catch - (fun () -> Lwt_utils.copy_tree o.builder.Builder.contents_dir o.app_dir) - (function - | Failure _ -> - Lwt.fail_with @@ Printf.sprintf - "Failed to copy base app contents from %s" - (readlink o.builder.Builder.contents_dir) - | e -> Lwt.fail e) - >>= fun () -> + (copy "learn-ocaml" o.builder.Builder.contents_dir >>= fun () -> + (if o.builder.Builder.editor <> Some false then + copy "learn-ocaml-editor" o.builder.Builder.editor_dir + else Lwt.return_unit) >>= fun () -> let server_config = o.repo_dir/"server_config.json" and www_server_config = o.app_dir/"server_config.json" in let module ServerData = Learnocaml_data.Server in @@ -372,6 +391,7 @@ let main o = \ enablePlayground: %b,\n\ \ enableLessons: %b,\n\ \ enableExercises: %b,\n\ + \ enableEditor: %b,\n\ \ enableToplevel: %b,\n\ \ baseUrl: \"%s\"\n\ }\n" @@ -379,9 +399,11 @@ let main o = (playground_ret <> None) (lessons_ret <> None) (exercises_ret <> None) + (o.builder.Builder.editor <> Some false) (o.builder.Builder.toplevel <> Some false) o.builder.Builder.base_url >>= fun () -> Lwt.return (tutorials_ret <> Some false && exercises_ret <> Some false))) + (* TODO: double-check if a condition is not missing in previous line *) else Lwt.return true in diff --git a/src/repo/learnocaml_exercise.ml b/src/repo/learnocaml_exercise.ml index 74f329e2a..0ce4baded 100644 --- a/src/repo/learnocaml_exercise.ml +++ b/src/repo/learnocaml_exercise.ml @@ -21,6 +21,8 @@ type t = dependencies : string list; } +(* XXX: a change to this type may require another change in editor_lib.ml *) + let encoding = let open Json_encoding in conv @@ -192,7 +194,7 @@ module File = struct let depend = { key = "depend.txt" ; ciphered = false ; - decode = (fun v -> Some v) ; + decode = (fun v -> Some v) ; (* XXX should this produce None sometimes? *) encode = (function | None -> "" (* no `depend` ~ empty `depend` *) | Some txt -> txt) ; @@ -289,7 +291,7 @@ module File = struct * return () * with _ -> return () * in *) - let descrs = ref [] in + let descrs : (string option * string) list ref = ref [] in let rec read_descr lang = function | [] -> (* If there are no extensions to try, we just give up. *) @@ -314,7 +316,7 @@ module File = struct | Some raw -> (* If it does, we apply the function, add the description to [!descrs] and return. *) - descrs := (lang, f raw) :: !descrs; + descrs := (lang, f raw) :: !descrs ; return () in let override_url = function @@ -339,15 +341,24 @@ module File = struct in let read_descrs () = let langs = [] in + (* XXX: Really [] ? *) let exts = [ (Filename.extension descr.key, fun h -> h) ; (".md", markdown_to_html) ] in join (read_descr None exts :: List.map (fun l -> read_descr (Some l) exts) langs) >>= fun () -> - ex := set descr - (List.map (function (None, v) -> "", v | (Some l, v) -> l, v) !descrs) - !ex; + let res = (List.map (function (None, v) -> "", v | (Some l, v) -> l, v) !descrs) in + (* let res' = descr.encode res in + let stack_overflow = descr.decode res' in () *) + + (* Also reproducible with: + let html = (* markdown_to_html md (* length = 13711 *) *) + String.init 14000 (fun n -> if n mod 2 = 0 then 'A' else ' ') in + let res' = descrs_to_string [("", html)] (* length = 13857 *) in + let stack_overflow = descrs_from_string res' in () *) + + ex := set descr res !ex; return () in join diff --git a/src/state/learnocaml_api.ml b/src/state/learnocaml_api.ml index 63043e4c3..2cff8e6d5 100644 --- a/src/state/learnocaml_api.ml +++ b/src/state/learnocaml_api.ml @@ -396,10 +396,12 @@ module Server (Json: JSON_CODEC) (Rh: REQUEST_HANDLER) = struct | `GET, ( ["index.html"] - | ["exercise.html"] + | ["exercise.html"] | ["playground.html"] | ["student-view.html"] | ["description.html"] + | ["new-exercise.html"] + | ["editor.html"] | ["partition-view.html"] | ("js"|"fonts"|"icons"|"css"|"static") :: _ as path), _ -> diff --git a/src/state/learnocaml_data.ml b/src/state/learnocaml_data.ml index 39ce6f6d0..0ee371083 100644 --- a/src/state/learnocaml_data.ml +++ b/src/state/learnocaml_data.ml @@ -1294,3 +1294,108 @@ module Playground = struct end end + +module Editor = struct + + + type type_question= Suite | Solution | Spec ;; + + + type test_qst_untyped = + | TestAgainstSol of + { name: string + ; ty: string + ; gen: int + ; suite: string + ; tester: string + ; sampler : string } + | TestAgainstSpec of + { name: string + ; ty: string + ; gen: int + ; suite: string + ; spec : string + ; tester: string + ; sampler: string } + | TestSuite of + { name: string; + ty: string; + suite: string; + tester :string };; + + + +type exercise = + { id : string ; + prelude : string ; + template : string ; + descr : string ; + prepare : string ; + test : string ; + solution : string ; + max_score : int ; + } + + + let exercise_encoding = + let open Json_encoding in + conv + (fun { id; prelude; template; descr; prepare; test; solution; max_score } -> + id, prelude, template, descr, prepare, test, solution, max_score) + (fun (id, prelude, template, descr, prepare, test, solution, max_score) -> + { id ; prelude ; template ; descr ; prepare ; test ; solution ; max_score }) + (obj8 + (req "id" string) + (req "prelude" string) + (req "template" string) + (req "descr" string) + (req "prepare" string) + (req "test" string) + (req "solution" string) + (req "max_score" int)) + + + + type editor_state = + { exercise : exercise; + metadata : Exercise.Meta.t;} + + let editor_state_enc = + J.conv + (fun {exercise; metadata } -> + (exercise, metadata)) + (fun (exercise, metadata) -> + {exercise; metadata }) + (J.obj2 + (J.req "exercise" exercise_encoding) + (J.req "metadata" Exercise.Meta.enc)) + + type editor_template = + { name : string; + template : string} + + let editor_template_enc = + J.conv + (fun {name; template } -> + (name, template)) + (fun (name, template) -> + {name; template}) + (J.obj2 + (J.req "name" J.string) + (J.req "template" J.string)) + + + module IMap = struct + + include Map.Make(struct type t = int let compare (x:t) y = compare x y end) + + (** Useful for serialization *) + let string_of_int_map iv = + + fold (fun i v sv -> SMap.add (string_of_int i) v sv) iv SMap.empty + + let int_of_string_map iv = + SMap.fold (fun s v iv -> add (int_of_string s) v iv) iv empty + end + +end diff --git a/src/state/learnocaml_data.mli b/src/state/learnocaml_data.mli index 2408c5eec..6b9694720 100644 --- a/src/state/learnocaml_data.mli +++ b/src/state/learnocaml_data.mli @@ -438,3 +438,54 @@ module Playground : sig end end + +module Editor : sig + + type type_question = Suite | Solution | Spec + + type test_qst_untyped = + | TestAgainstSol of + { name: string + ; ty: string + ; gen: int + ; suite: string + ; tester: string + ; sampler: string } + | TestAgainstSpec of + { name: string + ; ty: string + ; gen: int + ; suite: string + ; spec : string + ; tester: string + ; sampler: string } + | TestSuite of + { name: string + ; ty: string + ; suite: string + ; tester: string } ;; + + type exercise = + { id : string ; + prelude : string ; + template : string ; + descr : string ; + prepare : string ; + test : string ; + solution : string ; + max_score : int ; + } + + type editor_state = + { exercise : exercise; + metadata : Exercise.Meta.t; } + + val editor_state_enc : editor_state Json_encoding.encoding + + type editor_template = + { name : string; + template : string} + + val editor_template_enc : editor_template Json_encoding.encoding + +end diff --git a/src/toplevel/dune b/src/toplevel/dune index 67b1005a6..3c27b5556 100644 --- a/src/toplevel/dune +++ b/src/toplevel/dune @@ -20,6 +20,8 @@ toploop_results ocplib-ocamlres.runtime embedded_cmis + grading + learnocaml_ppx_metaquot_lib learnocaml_toplevel_worker_messages) (modules Learnocaml_toplevel_worker_main) (preprocess (pps js_of_ocaml.ppx)) diff --git a/src/toplevel/learnocaml_toplevel.ml b/src/toplevel/learnocaml_toplevel.ml index 20fdfa239..1e28819ce 100644 --- a/src/toplevel/learnocaml_toplevel.ml +++ b/src/toplevel/learnocaml_toplevel.ml @@ -200,15 +200,18 @@ let execute_phrase top ?timeout content = let execute top = Learnocaml_toplevel_input.execute top.input +let execute_test top = + Learnocaml_toplevel_output.get_blocks top.output + let go_backward top = Learnocaml_toplevel_input.go_backward top.input let go_forward top = Learnocaml_toplevel_input.go_forward top.input -let check top code = +let check ?grading top code = protect_execution top @@ fun () -> - Learnocaml_toplevel_worker_caller.check top.worker code + Learnocaml_toplevel_worker_caller.check ?grading top.worker code let set_checking_environment top = protect_execution top @@ fun () -> diff --git a/src/toplevel/learnocaml_toplevel.mli b/src/toplevel/learnocaml_toplevel.mli index f2cb5a8f2..592dfd0ed 100644 --- a/src/toplevel/learnocaml_toplevel.mli +++ b/src/toplevel/learnocaml_toplevel.mli @@ -125,8 +125,11 @@ val load: ?message: string -> string -> bool Lwt.t -(** Parse and typecheck a given source code. *) -val check: t -> string -> unit Toploop_results.toplevel_result Lwt.t +(** Parse and typecheck a given source code. + + @param grading + Load [Embedded_grading_cmis] and ppx-metaquot in the checker toploop. *) +val check: ?grading:bool -> t -> string -> unit Toploop_results.toplevel_result Lwt.t (** Freezes the environment for future calls to {!check}. *) val set_checking_environment: t -> unit Lwt.t @@ -158,7 +161,9 @@ val scroll: t -> unit (** Execute the content of the input [textarea]. This is equivalent to pressing [Enter] when the toplevel is focused. *) val execute: t -> unit - + +val execute_test: t -> string + (** Go backward in the input's history. This is equivalent to pressing [Up] when the toplevel is focused. *) val go_backward: t -> unit diff --git a/src/toplevel/learnocaml_toplevel_output.ml b/src/toplevel/learnocaml_toplevel_output.ml index 642300e43..7088f3fad 100644 --- a/src/toplevel/learnocaml_toplevel_output.ml +++ b/src/toplevel/learnocaml_toplevel_output.ml @@ -364,3 +364,11 @@ let oldify output = let format_ocaml_code code = pretty_html (fst (prettify_ocaml code)) + +let get_blocks output = + let rec process = function + | [] -> "" + | (Answer (s,_,_,_)) :: suite -> process suite ^ s + | (Phrase (_,l)) :: suite -> process suite ^ (process (!l)) (* OK? *) + | b :: suite->(process suite) in + process output.blocks diff --git a/src/toplevel/learnocaml_toplevel_output.mli b/src/toplevel/learnocaml_toplevel_output.mli index e30d7bff7..29bcd136e 100644 --- a/src/toplevel/learnocaml_toplevel_output.mli +++ b/src/toplevel/learnocaml_toplevel_output.mli @@ -101,3 +101,5 @@ val output_warning : ?phrase: phrase -> output -> Toploop_results.warning -> uni (** Format OCaml code in the style of {!output_code}. *) val format_ocaml_code : string -> [> `Span | `PCDATA ] Tyxml_js.Html5.elt list + +val get_blocks : output -> string diff --git a/src/toplevel/learnocaml_toplevel_worker_caller.ml b/src/toplevel/learnocaml_toplevel_worker_caller.ml index a39e7d82a..44c2f455e 100644 --- a/src/toplevel/learnocaml_toplevel_worker_caller.ml +++ b/src/toplevel/learnocaml_toplevel_worker_caller.ml @@ -238,8 +238,8 @@ let reset worker ?(timeout = fun () -> never_ending) () = (* Not canceling the Reset thread, but manually resetting. *) worker.reset_worker worker -let check worker code = - post worker @@ Check code +let check ?(grading = false) worker code = + post worker @@ Check (code, grading) let set_checking_environment worker = post worker @@ Set_checking_environment diff --git a/src/toplevel/learnocaml_toplevel_worker_caller.mli b/src/toplevel/learnocaml_toplevel_worker_caller.mli index 6a4f24692..cfe760056 100644 --- a/src/toplevel/learnocaml_toplevel_worker_caller.mli +++ b/src/toplevel/learnocaml_toplevel_worker_caller.mli @@ -41,14 +41,13 @@ val create: unit -> t Lwt.t -(** Parse and typecheck a given source code +(** Parse and typecheck a given source code. + @param grading + Load [Embedded_grading_cmis] and ppx-metaquot in the checker toploop. @return [Success ()] in case of success and [Error err] - where [err] contains the error message otherwise. - -*) -val check: t -> string -> unit toplevel_result Lwt.t - + where [err] contains the error message otherwise. *) + val check: ?grading:bool -> t -> string -> unit toplevel_result Lwt.t (** Execute a given source code. The evaluation stops after the first toplevel phrase (as terminated by ";;") that fails to compile or diff --git a/src/toplevel/learnocaml_toplevel_worker_main.ml b/src/toplevel/learnocaml_toplevel_worker_main.ml index 03d0eeacc..dfaf93360 100644 --- a/src/toplevel/learnocaml_toplevel_worker_main.ml +++ b/src/toplevel/learnocaml_toplevel_worker_main.ml @@ -10,6 +10,7 @@ open Js_of_ocaml open Learnocaml_toplevel_worker_messages let debug = ref false +let grading = ref false let (>>=) = Lwt.bind @@ -138,6 +139,8 @@ let iter_option f o = match o with | None -> () | Some o -> f o let checking_environment = ref !Toploop.toplevel_env +let setup_ppx = lazy (Ast_mapper.register "ppx_metaquot" Ppx_metaquot.expander) + let handler : type a. a host_msg -> a return Lwt.t = function | Set_checking_environment -> checking_environment := !Toploop.toplevel_env ; @@ -207,13 +210,14 @@ let handler : type a. a host_msg -> a return Lwt.t = function !Toploop.toplevel_env ; Toploop.setvalue name (Obj.repr callback) ; return_unit_success - | Check code -> - let saved = !Toploop.toplevel_env in - Toploop.toplevel_env := !checking_environment ; - let result = Toploop_ext.check code in - Toploop.toplevel_env := saved ; - unwrap_result result - + | Check (code, grading_cmi_and_ppx_meta) -> + let saved = !Toploop.toplevel_env in + Toploop.toplevel_env := !checking_environment ; + if grading_cmi_and_ppx_meta then (grading := true; Lazy.force setup_ppx) ; + let result = Toploop_ext.check code in + Toploop.toplevel_env := saved ; + unwrap_result result + let ty_of_host_msg : type t. t host_msg -> t msg_ty = function | Init -> Unit | Reset -> Unit @@ -240,13 +244,25 @@ let () = Lwt.return_unit in let path = "/worker_cmis" in + (* we don't use + [OCamlRes.Res.merge Embedded_cmis.root Embedded_grading_cmis.root] + because we don't want to unconditionally load [Embedded_grading_cmis] *) + let root1 = Embedded_cmis.root in + let root2 = Embedded_grading_cmis.root in Sys_js.mount ~path (fun ~prefix:_ ~path -> - match OCamlRes.Res.find (OCamlRes.Path.of_string path) Embedded_cmis.root with + match OCamlRes.Res.find (OCamlRes.Path.of_string path) root1 with | cmi -> Js.Unsafe.set cmi (Js.string "t") 9 ; (* XXX hack *) Some cmi - | exception Not_found -> None) ; + | exception Not_found -> + if !grading then + match OCamlRes.Res.find (OCamlRes.Path.of_string path) root2 with + | cmi -> + Js.Unsafe.set cmi (Js.string "t") 9 ; (* XXX hack *) + Some cmi + | exception Not_found -> None + else None) ; Config.load_path := [ path ] ; Toploop_jsoo.initialize (); Hashtbl.add Toploop.directive_table diff --git a/src/toplevel/learnocaml_toplevel_worker_messages.mli b/src/toplevel/learnocaml_toplevel_worker_messages.mli index 1906d2520..6f7c33a21 100644 --- a/src/toplevel/learnocaml_toplevel_worker_messages.mli +++ b/src/toplevel/learnocaml_toplevel_worker_messages.mli @@ -19,8 +19,8 @@ type _ host_msg = | Set_debug : bool -> unit host_msg | Register_callback : string * int -> unit host_msg | Set_checking_environment : unit host_msg - | Check : string -> unit host_msg - + | Check : string * bool -> unit host_msg + type _ msg_ty = | Unit : unit msg_ty | Bool : bool msg_ty diff --git a/static/Makefile b/static/Makefile index 823a18a52..40d0ebcb3 100644 --- a/static/Makefile +++ b/static/Makefile @@ -5,6 +5,7 @@ all: icons dune FILES = $(wildcard \ js/*.js\ js/ace/*.js\ + js/jszip/*.js\ *.html\ icons/*.svg\ icons/*.gif\ @@ -13,9 +14,13 @@ FILES = $(wildcard \ css/*.css\ ) $(shell find js/mathjax ! -type d) +EDITOR_FILES = $(wildcard \ + editor/*.html\ +) + ALWAYS: file-list: icons ALWAYS - @echo ${FILES} >$@ + @echo ${FILES} ${EDITOR_FILES} >$@ icons: @${MAKE} -C icons @@ -26,6 +31,7 @@ dune: file-list @echo ' (package learn-ocaml)' >>$@ @echo ' (files' >>$@ @$(foreach f,$(FILES),echo ' ($f as ${addprefix www/,$f})' >>$@;) + @$(foreach f,$(EDITOR_FILES),echo ' ($f as $f)' >>$@;) @echo ' )' >>$@ @echo ')' >>$@ diff --git a/static/css/learnocaml_editor.css b/static/css/learnocaml_editor.css new file mode 100644 index 000000000..3d7b173c4 --- /dev/null +++ b/static/css/learnocaml_editor.css @@ -0,0 +1,1502 @@ +*{ +box-sizing: border-box; +} + +body { + margin: 0; + padding: 0; + background: #666; +overflow: hidden; +} + +#learnocaml-main-loading { + position: absolute; + top: 0px; + left: 0px; + right: 0px; + bottom: 0px; +} +#learnocaml-main-exercise-list > .patterns{ + display :flex; + flex-direction: row; + position: relative; + z-index: 999; + background: linear-gradient(to top, #aaa 0px, #eee 10px, #ddd 100%); + color: black; + text-decoration: none; + height: 90px; +} +#learnocaml-main-exercise-list > .patterns > h1{ + margin: 0 0 10px 0; + padding: 0; + font-size: 18px; + font-weight: bold; + left:10px; top:10px; + position:absolute; +} + +#learnocaml-main-exercise-list > .patterns > .quality{ + left:10px; + position: absolute; + width : 100%; +} +#learnocaml-main-exercise-list > .patterns > .quality > p{ + left :40px; + top: 20px; + position: absolute; +} +#quality_box{ + top: 34px; + position:absolute; +} +#learnocaml-main-exercise-list > .patterns > .imperative{ + left:10px; + position: absolute; + width: 100%; + top: 20px; +} +#learnocaml-main-exercise-list > .patterns > .imperative > p{ + left :40px; + top: 20px; + position: absolute; +} +#imperative_box{ + top:34px; + position:absolute; +} + +/* -------------------- toolbar ----------------------------------- */ +#learnocaml-exo-toolbar { + position: absolute; + left: 0; top: 0; + color: #fff; + z-index: 1004; + border-bottom: 1px #eee solid; + display: flex; + background: #222; +} +#learnocaml-exo-toolbar a { + text-decoration: none; + color: #fff; +} +#learnocaml-exo-toolbar > button { + border-left: 1px #eee solid !important; + padding: 0 10px 0 10px; + margin: 0; + background: none; + border: none; + flex: 0; + position: relative; + display: block; +} +#learnocaml-exo-toolbar > button > * { + padding: 5px; + color: #eee; + text-align: center; +} +#learnocaml-exo-toolbar > .special_grade{ + background:#aaa; +} +#learnocaml-exo-toolbar::before { + z-index: 1004; + position: absolute; + left: 0px; height: 5px; width: 100%; + background: linear-gradient(to bottom, rgba(0,0,0,0.4) 0px, rgba(0,0,0,0) 5px); + content:""; +} +@media (max-width: 549px) { + #learnocaml-exo-toolbar { + height: 40px; + } + #learnocaml-exo-toolbar::before { + top: 41px; + } + #learnocaml-exo-toolbar > button > .label { + display: none; + } +} +@media (min-width: 550px) { + #learnocaml-exo-toolbar { + height: 60px; + } + #learnocaml-exo-toolbar::before { + top: 61px; + } +} +/* -------------------- tabs and tab buttons ---------------------- */ +#learnocaml-exo-tab-buttons { + position: absolute; + z-index: 999; + display: flex; + height: 40px; +} +#learnocaml-exo-tab-buttons > button { + flex: 1; + padding: 0; + border: none; + color: #333; + background: #eee; + position: relative; + z-index: 1000; +} +#learnocaml-exo-tab-buttons > button:not(:first-child) { + border-left: 1px #333 solid; +} +#learnocaml-exo-tab-buttons > button { + border-bottom: 1px #333 solid; +} +#learnocaml-exo-tab-buttons > button[disabled]::before { + display: none; +} +#learnocaml-exo-tab-buttons > button:not([disabled])::after { + position: absolute; + left:0; right:0; bottom:0; top:0; + content:""; + z-index: 1009; + background: linear-gradient(to top, rgba(0,0,0,0.4) 0, transparent 5px); +} +#learnocaml-exo-tab-buttons > button[disabled]::after { + position: absolute; + left:0; right:0; bottom:0; top:0; + content:""; + z-index: 1009; + background: rgba(0,0,0,0.4); +} +#learnocaml-exo-tabs > * { + position: absolute; + z-index: 997; + background: #eee; + padding: 0; + opacity: 0; +} +#learnocaml-exo-tabs > *.front-tab { + z-index: 998; + opacity: 1; +} +/* -------------------- two columns mode -------------------------- */ +@media (min-width: 1200px) { + #learnocaml-exo-toolbar { + width: 800px; + } + #learnocaml-exo-tab-editor::after { + position: absolute; + left: 800px; top: -61px; bottom: 0; width: 10px; + background: linear-gradient(to right, #fff 0px, #fff 1px, rgba(0,0,0,0.6) 1px, rgba(0,0,0,0) 10px); + content:""; + } + #learnocaml-exo-button-editor { + display: none; + } + #learnocaml-exo-tab-buttons { + left: 800px; right: 0px; top: 0px; + } + #learnocaml-exo-button-editor.front-tab ~ #learnocaml-exo-button-toplevel { + border-bottom: none; + background: #bbb; + } + #learnocaml-exo-button-editor.front-tab ~ #learnocaml-exo-button-toplevel::after { + display: none; + } + #learnocaml-exo-tab-editor.front-tab ~ #learnocaml-exo-tab-toplevel { + z-index: 998; + opacity: 1; + } + + #learnocaml-exo-button-editor.front-tab ~ #learnocaml-exo-button-template { + border-bottom: none; + background: #bbb; + } + #learnocaml-exo-button-editor.front-tab ~ #learnocaml-exo-button-template::after { + display: none; + } + #learnocaml-exo-tab-editor.front-tab ~ #learnocaml-exo-tab-template { + z-index: 998; + opacity: 1; + } + + #learnocaml-exo-button-editor.front-tab ~ #learnocaml-exo-button-test { + border-bottom: none; + background: #bbb; + } + #learnocaml-exo-button-editor.front-tab ~ #learnocaml-exo-button-test::after { + display: none; + } + #learnocaml-exo-tab-editor.front-tab ~ #learnocaml-exo-tab-test { + z-index: 998; + opacity: 1; + } + + #learnocaml-exo-button-editor.front-tab ~ #learnocaml-exo-button-testhaut { + border-bottom: none; + background: #bbb; + } + #learnocaml-exo-button-editor.front-tab ~ #learnocaml-exo-button-testhaut::after { + display: none; + } + #learnocaml-exo-tab-editor.front-tab ~ #learnocaml-exo-tab-testhaut { + z-index: 998; + opacity: 1; + } + + #learnocaml-exo-tabs > * { + left: 800px; top: 40px; right: 0px; bottom: 0px; + } + #learnocaml-exo-tabs > #learnocaml-exo-tab-editor { + width: 800px; left: 0; bottom: 0; top: 61px; + z-index: 1000; + opacity: 1; + } +} +/* -------------------- one column mode --------------------------- */ +@media (max-width: 1199px) { + #learnocaml-exo-toolbar { + right: 0px; + } + #learnocaml-exo-tab-buttons { + left: 0; right: 0px; + } + #learnocaml-exo-tabs > * { + position: absolute; + left: 0; right: 0px; bottom: 0px; + } + #learnocaml-exo-tab-editor > .pane { + margin-top: 5px; + } + #learnocaml-exo-tab-editor::after { + position: absolute; + z-index: 1005; + left: 0; top: 0; height: 10px; width: 100%; + content: ""; + background: linear-gradient(to bottom, #444 0, #444 5px, + rgba(0,0,0,0.5) 5px, transparent 10px) ; + } +} +@media (min-width: 550px) and (max-width: 1199px) { + #learnocaml-exo-tab-buttons { + top: 60px; + } + #learnocaml-exo-tabs > * { + top: 100px; + } +} +@media (max-width: 549px) { + #learnocaml-exo-tab-buttons { + top: 40px; + } + #learnocaml-exo-tabs > * { + top: 80px; + } +} +/* -------------------- editor tab -------------------------------- */ +#learnocaml-exo-tab-buttons > #learnocaml-exo-button-editor { + background: #eee; + color: black; +} +#learnocaml-exo-tab-editor > .pane { + position: absolute; + left: 0; top: 0; bottom: 40px; width: 100%; + background: #666; + color: #fff; + z-index: 1002; +} +#learnocaml-exo-tab-editor > .buttons { + position: absolute; + left: 0; bottom: 0px; width: 100%; height: 40px; + background: linear-gradient(to bottom, #666 0px, #444 10px, #222 60px); + color: #fff; + line-height: 40px; + display: flex; + flex-direction: row; + z-index: 1003; +} +#learnocaml-exo-tab-editor > .buttons::after { + position: absolute; + bottom: 40px; left: 0px; height: 5px; width: 100%; + background: linear-gradient(to top, rgba(0,0,0,0.4) 0px, rgba(0,0,0,0) 5px); + content:""; +} +#learnocaml-exo-tab-editor > .buttons > button { + flex: 1; + background: none; + border: none; + color: #eee; + text-shadow: 2px 2px 5px rgba(0,0,0,0.4); + border-top: 1px #eee solid; + position: relative; + padding: 0; +} +#learnocaml-exo-tab-editor > .buttons > button:not(:first-child) { + border-left: 1px #eee solid; +} +@media (max-width: 550px) { + #learnocaml-exo-tab-editor > .buttons > button > .label { + display: none; + } +} +/*--------------------- template ---------------------------------- */ +#learnocaml-exo-tab-buttons > #learnocaml-exo-button-template { + background: #eee; + color: black; +} +#learnocaml-exo-tab-template > .template-pane { + position: absolute; + left: 0; top: 0; bottom: 40px; width: 100%; + background: #666; + color: #fff; + z-index: 1002; +} +#learnocaml-exo-tab-template > .buttons { + position: absolute; + left: 0; bottom: 0px; width: 100%; height: 40px; + background: linear-gradient(to bottom, #666 0px, #444 10px, #222 60px); + color: #fff; + line-height: 40px; + display: flex; + flex-direction: row; + z-index: 1003; +} +#learnocaml-exo-tab-template > .buttons::after { + position: absolute; + bottom: 40px; left: 0px; height: 5px; width: 100%; + background: linear-gradient(to top, rgba(0,0,0,0.4) 0px, rgba(0,0,0,0) 5px); + content:""; +} +#learnocaml-exo-tab-template > .buttons > button { + flex: 1; + background: none; + border: none; + color: #eee; + text-shadow: 2px 2px 5px rgba(0,0,0,0.4); + border-top: 1px #eee solid; + position: relative; + padding: 0; +} +#learnocaml-exo-tab-template > .buttons > button:not(:first-child) { + border-left: 1px #eee solid; +} +@media (max-width: 550px) { + #learnocaml-exo-tab-template > .buttons > button > .label { + display: none; + } +} + +/*--------------------- prepare ---------------------------------- */ +#learnocaml-exo-tab-buttons > #learnocaml-exo-button-prepare { + background: #eee; + color: black; +} +#learnocaml-exo-tab-prepare > .prepare-pane { + position: absolute; + left: 0; top: 0; bottom: 40px; width: 100%; + background: #666; + color: #fff; + z-index: 1002; +} +#learnocaml-exo-tab-prepare > .buttons { + position: absolute; + left: 0; bottom: 0px; width: 100%; height: 40px; + background: linear-gradient(to bottom, #666 0px, #444 10px, #222 60px); + color: #fff; + line-height: 40px; + display: flex; + flex-direction: row; + z-index: 1003; +} +#learnocaml-exo-tab-prepare > .buttons::after { + position: absolute; + bottom: 40px; left: 0px; height: 5px; width: 100%; + background: linear-gradient(to top, rgba(0,0,0,0.4) 0px, rgba(0,0,0,0) 5px); + content:""; +} +#learnocaml-exo-tab-prepare > .buttons > button { + flex: 1; + background: none; + border: none; + color: #eee; + text-shadow: 2px 2px 5px rgba(0,0,0,0.4); + border-top: 1px #eee solid; + position: relative; + padding: 0; +} +#learnocaml-exo-tab-prepare > .buttons > button:not(:first-child) { + border-left: 1px #eee solid; +} +@media (max-width: 550px) { + #learnocaml-exo-tab-prepare > .buttons > button > .label { + display: none; + } +} + +/*--------------------- prelude ---------------------------------- */ +#learnocaml-exo-tab-buttons > #learnocaml-exo-button-prelude { + background: #eee; + color: black; +} +#learnocaml-exo-tab-prelude > .prelude-pane { + position: absolute; + left: 0; top: 0; bottom: 40px; width: 100%; + background: #666; + color: #fff; + z-index: 1002; +} +#learnocaml-exo-tab-prelude > .buttons { + position: absolute; + left: 0; bottom: 0px; width: 100%; height: 40px; + background: linear-gradient(to bottom, #666 0px, #444 10px, #222 60px); + color: #fff; + line-height: 40px; + display: flex; + flex-direction: row; + z-index: 1003; +} +#learnocaml-exo-tab-prelude > .buttons::after { + position: absolute; + bottom: 40px; left: 0px; height: 5px; width: 100%; + background: linear-gradient(to top, rgba(0,0,0,0.4) 0px, rgba(0,0,0,0) 5px); + content:""; +} +#learnocaml-exo-tab-prelude > .buttons > button { + flex: 1; + background: none; + border: none; + color: #eee; + text-shadow: 2px 2px 5px rgba(0,0,0,0.4); + border-top: 1px #eee solid; + position: relative; + padding: 0; +} +#learnocaml-exo-tab-prelude > .buttons > button:not(:first-child) { + border-left: 1px #eee solid; +} +@media (max-width: 550px) { + #learnocaml-exo-tab-prelude > .buttons > button > .label { + display: none; + } +} + + +/* -------------------- toplevel tab ------------------------------ */ +#learnocaml-exo-tab-toplevel > .toplevel-pane { + position: absolute; + left: 0; top: 0; bottom: 40px; width: 100%; + z-index: 1002; + margin: 5px 0 0 0; +} +#learnocaml-exo-tab-buttons > #learnocaml-exo-button-toplevel { + background: #eee; +} +#learnocaml-exo-tab-toplevel { + background: #bbb; +} +#learnocaml-exo-tab-toplevel > .buttons { + position: absolute; + left: 0; bottom: 0px; width: 100%; height: 40px; + background: linear-gradient(to bottom, #fff 0px, #ddd 10px, #aaa 60px); + color: #fff; + line-height: 40px; + display: flex; + flex-direction: row; + z-index: 1003; +} +#learnocaml-exo-tab-toplevel > .buttons > button { + flex: 1; + background: none; + border: none; + color: #222; + text-shadow: 2px 2px 5px rgba(0,0,0,0.2); + border-top: 1px #666 solid; + position: relative; + padding: 0; +} +#learnocaml-exo-tab-toplevel > .buttons > button:not(:first-child) { + border-left: 1px #666 solid; +} +@media (max-width: 550px) { + #learnocaml-exo-tab-toplevel > .buttons > button > .label { + display: none; + } +} +#learnocaml-exo-toplevel-pane { + position: absolute; + left: 0; top: 0; bottom: 40px; width: 100%; + z-index: 1002; + display: flex; + flex-direction: column; + margin: 5px 0 0 0; +} +#learnocaml-exo-tab-toplevel::after { + position: absolute; + z-index: 1005; + left: 0; top: 5px; height: 10px; width: 100%; + content: ""; + background: linear-gradient(to bottom, rgba(0,0,0,0.5) 0, transparent 5px) ; +} + +/* -------------- test tab -----------------------------*/ + +#learnocaml-exo-tab-buttons > #learnocaml-exo-button-test { + background: #eee; + color: black; +} +#learnocaml-exo-tab-test > .test-pane { + position: absolute; + left: 0; top: 0; bottom: 40px; width: 100%; + background: #666; + color: #fff; + z-index: 1002; +} + + +#learnocaml-exo-tab-test > .buttons { + position: absolute; + left: 0; bottom: 0px; width: 100%; height: 40px; + background: linear-gradient(to bottom, #666 0px, #444 10px, #222 60px); + color: #fff; + line-height: 40px; + display: flex; + flex-direction: row; + z-index: 1003; +} +#learnocaml-exo-tab-test > .buttons::after { + position: absolute; + bottom: 40px; left: 0px; height: 5px; width: 100%; + background: linear-gradient(to top, rgba(0,0,0,0.4) 0px, rgba(0,0,0,0) 5px); + content:""; +} +#learnocaml-exo-tab-test > .buttons > button { + flex: 1; + background: none; + border: none; + color: #eee; + text-shadow: 2px 2px 5px rgba(0,0,0,0.4); + border-top: 1px #eee solid; + position: relative; + padding: 0; +} +#learnocaml-exo-tab-test > .buttons > button:not(:first-child) { + border-left: 1px #eee solid; +} +@media (max-width: 550px) { + #learnocaml-exo-tab-test > .buttons > button > .label { + display: none; + } +} + +/* templaates of Test tab */ + + /* Dropup Button */ + .dropbtn { + background: none; + border: none; + color: inherit; + width: 100%; + height: 100%; +} + + +/* Dropup content (Hidden by Default) */ +.dropup-content { + display: none; + position: absolute; + bottom: 41px; + background-color: #333 ; + width: 100%; + box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); + z-index: 1; +} + +/* Links inside the dropup */ +.dropup-content a { + color: #eee; + padding: 12px 16px; + text-decoration: none; + display: block; + text-shadow: 2px 2px 5px rgba(0,0,0,0.4); +} + +/* Change color of dropup links on hover */ +.dropup-content a:hover {background-color: cadetblue ; } + + +.show {display:block;} + +#learnocaml-exo-tab-test > .buttons > div { + flex: 1; + background: none; + border: none; + color: #eee; + text-shadow: 2px 2px 5px rgba(0,0,0,0.4); + border-top: 1px #eee solid; + position: relative; + padding: 0; +} + +.dropup { + position: relative; + display: inline-block; +} + +#learnocaml-exo-tab-test > .buttons > div:not(:first-child) { + border-left: 1px #eee solid; +} +/* end templates 1*/ + +/*template editor */ + +.config-editor { + font-size: 18px; + font-family: 'Inconsolata', monospace; + position: relative !important; + flex-grow: 12; + background: #666; + color: #fff; + z-index: 1002; + width: 80%; + margin: 0 10%; +} + +div.config-editor-overlay > div { + display:flex; + flex-direction:column; + max-width: 100% !important; + +} + +div.config-editor-overlay > div::before, div.config-editor-overlay > div::after { + content: ""; + flex: 0 !important; +} + +/* end template editor */ + +/*all templates */ + +.editor-template{ + color: #eee; + padding: 12px 16px; + text-decoration: none; + display: block; + text-shadow: 2px 2px 5px rgba(0,0,0,0.4); + background-color: #333 ; + +} + +.editor-template:hover{ + background-color: cadetblue; +} + +/* all templates */ + + +/* question tab */ + + +#learnocaml-exo-question-html > div { + border: none; + overflow: auto; + flex: 1 3 auto ; +font-family: 'Fontin', 'Linux Biolinum', sans-serif; +} + +#learnocaml-exo-question-html > div > pre { + background: #ddd; +line-height: 25px; +overflow: auto; +padding: 0 10px; +border-radius : 8px; +} + + +#learnocaml-exo-question-html > div > h2 { + background: #ddd; +line-height: 40px; +} + +#learnocaml-exo-tab-question > .questions-mark { + position: absolute; + left: 0; top: 0; bottom: 50%; width: 100%; + background: #666; + color: #fff; + z-index: 1002; +} + +#learnocaml-exo-tab-question > .questions-html { + position: absolute; + left: 0; top: 50%; bottom: 0px; width: 100%; + background: white; + z-index: 1002; +} + +#learnocaml-exo-tab-question > .questions-html > * { + position: absolute; + padding-left: 20px; + left: 0; top: 0; bottom: 0px; width: 100%; height: 100%; +} + + +#learnocaml-exo-tab-question > .buttons { + position: absolute; + left: 0; bottom: 0px; width: 100%; height: 40px; + background: linear-gradient(to bottom, #666 0px, #444 10px, #222 60px); + color: #fff; + line-height: 40px; + display: flex; + flex-direction: row; + z-index: 1003; +} +#learnocaml-exo-tab-question > .buttons::after { + position: absolute; + bottom: 40px; left: 0px; height: 5px; width: 100%; + background: linear-gradient(to top, rgba(0,0,0,0.4) 0px, rgba(0,0,0,0) 5px); + content:""; +} +#learnocaml-exo-tab-question > .buttons > button { + flex: 1; + background: none; + border: none; + color: #eee; + text-shadow: 2px 2px 5px rgba(0,0,0,0.4); + border-top: 1px #eee solid; + position: relative; + padding: 0; +} +#learnocaml-exo-tab-question > .buttons > button:not(:first-child) { + border-left: 1px #eee solid; +} +@media (max-width: 550px) { + #learnocaml-exo-tab-question > .buttons > button > .label { + display: none; + } +} + +/* -------------------- report tab -------------------------------- */ +#learnocaml-exo-tab-report { + border: none; + overflow: hidden; +} +#learnocaml-exo-button-report > .score { + padding: 0 5px; + float: right; +} +#learnocaml-exo-tab-report > iframe { + border: none; + overflow: auto; + width: 100%; + height: 100%; +} +@media (max-width: 550px) { + #learnocaml-exo-button-report > .score { + position: absolute; + right: 0; left: 0; top: 0; bottom: 0; + display: block; + line-height: 40px; + background: inherit; + } +} +#learnocaml-exo-tab-buttons > #learnocaml-exo-button-report.success { + background: #0a0; + color: white; +} +#learnocaml-exo-tab-buttons > #learnocaml-exo-button-report.failure { + background: #b00; + color: white; +} +#learnocaml-exo-tab-buttons > #learnocaml-exo-button-report.partial { + background: #e80; + color: white; +} +/* -------------------- text tab ---------------------------------- */ +#learnocaml-exo-tab-text { + display: flex; + flex-direction: column; + overflow: hidden; +} +#learnocaml-exo-tab-text > h1 { + flex: 0 0 auto; + background: #222; + color: #eee; + font-size: 20px; + line-height: 22px; + margin: 0; + padding: 10px; + display: block; + font-weight: normal; + position: relative; +} +#learnocaml-exo-tab-text > h1:first-child { + margin-top: 5px; +} +#learnocaml-exo-tab-text > h1 > button { + float: right; + border: none; + border-left: 1px #eee solid; + color: #eee; + background: none; + margin: -10px; + padding: 10px; + font-size: 20px; + line-height: 22px; +} +#learnocaml-exo-tab-text > iframe { + border: none; + overflow: auto; + flex: 1 3 auto ; +} +#learnocaml-exo-tab-text > pre.toplevel-code { + flex: 0 1 auto; + max-height: 45%; + background: #666; + margin: 0; + padding: 5px 10px 5px 5px; + overflow: auto; +} +#learnocaml-exo-tab-text > h1::after { + position: absolute; + left: 0px; bottom: -5px; width: 100%; + content:""; + height:5px; background: pink; + background: linear-gradient(to bottom, rgba(0,0,0,0.3) 0, transparent 100%) +} + +/* -------------------- loading splash screen --------------------- */ +#learnocaml-exo-loading { + position: absolute; + top: 0; left: 0; right: 0; bottom: 0; +} +#learnocaml-exo-loading.loading, +#learnocaml-exo-loading.loaded { + background: rgba(200,200,200,0.9); +} +#learnocaml-exo-loading > iframe { + border: none; + overflow: auto; + flex: 1 3 auto; +} + +#learnocaml-loading { + position: absolute; + top: 0; left: 0; right: 0; bottom: 0; +} +#learnocaml-loading.loading, +#learnocaml-loading.loaded { + background: rgba(200,200,200,0.9); +} +#learnocaml-loading > iframe { + border: none; + overflow: auto; + flex: 1 3 auto; +} +/* -------------------- ACE overriding ---------------------------- */ +#learnocaml-exo-editor-pane { + font-size: 18px; + font-family: 'Inconsolata', monospace; +} +#learnocaml-exo-editor-pane .ace_gutter { + background: linear-gradient(to left, transparent 0, #444 8px, #ccc 8px, #ccc 9px, #444 9px) ; + color: #ccc; +} +#learnocaml-exo-editor-pane .ace_gutter-active-line { + background: linear-gradient(to left, #777 0, #456 8px, #ccc 8px, #ccc 9px, #678 9px) ; + color: #888; +} +#learnocaml-exo-editor-pane .ace_gutter-cell { + padding: 0 14px 0 0; +} +#learnocaml-exo-editor-pane .ace_gutter-cell.ace_warning { + background: linear-gradient(to right, #980 0, #980 4px, transparent 80%) ; +} +#learnocaml-exo-editor-pane .ace_gutter-cell.ace_error { + background: linear-gradient(to right, #900 0, #900 4px, transparent 80%) ; +} +#learnocaml-exo-editor-pane .ace_comment { color: #aaa; font-style: italic; } +#learnocaml-exo-editor-pane .ace_keyword { color: #e80; font-weight:bold; } +#learnocaml-exo-editor-pane .ace_constant { color: #acf; } +#learnocaml-exo-editor-pane .ace_string { color: #acf; } +#learnocaml-exo-editor-pane .ace_function { color: #fff; } +#learnocaml-exo-editor-pane .ace_type { color: #fff; } +#learnocaml-exo-editor-pane .ace_operator { color: #fff; } +#learnocaml-exo-editor-pane .ace_meta { color: #fff; } +#learnocaml-exo-editor-pane .ace_variable { color: #fff; } +#learnocaml-exo-editor-pane .ace_text { color: #fff; } +#learnocaml-exo-editor-pane .error { + border-bottom: 2px #b00 solid; + position: absolute; +} + +#learnocaml-exo-editor-pane .warning { + border-bottom: 2px #ca0 solid; + position: absolute; +} + +#learnocaml-exo-editor-pane .ace_selection { background: #e80; opacity: 0.4; } +#learnocaml-exo-editor-pane .ace_active-line { background: #acf; opacity: 0.2; } +#learnocaml-exo-editor-pane .ace_selected-word { background: #e80; opacity: 0.2; } + +#learnocaml-exo-editor-pane.ocaml-check-success::after, +#learnocaml-exo-editor-pane.ocaml-check-warn::after, +#learnocaml-exo-editor-pane.ocaml-check-error::after { + animation: 1s check_status_animation; + animation-fill-mode: forwards; + position: absolute; + margin: -100px 0 0 0; + top: 50%; + text-align: center; + font-size: 200px; + line-height: 200px; + width: 100%; +} + +#learnocaml-exo-editor-pane.ocaml-check-success::after { + content: "✌"; + color: #0a0; + text-shadow: 0px 0px 40px #6F6; +} + +#learnocaml-exo-editor-pane.ocaml-check-warn::after { + content: "✋"; + color: #ec0; + text-shadow: 0px 0px 40px #Fe6; +} + +#learnocaml-exo-editor-pane.ocaml-check-error::after { + content: "☠"; + color: #b00; + text-shadow: 0px 0px 40px #F66; +} + +#learnocaml-exo-test-pane { + font-size: 18px; + font-family: 'Inconsolata', monospace; +} +#learnocaml-exo-test-pane .ace_gutter { + background: linear-gradient(to left, transparent 0, #444 8px, #ccc 8px, #ccc 9px, #444 9px) ; + color: #ccc; +} +#learnocaml-exo-test-pane .ace_gutter-active-line { + background: linear-gradient(to left, #777 0, #456 8px, #ccc 8px, #ccc 9px, #678 9px) ; + color: #888; +} +#learnocaml-exo-test-pane .ace_gutter-cell { + padding: 0 14px 0 0; +} +#learnocaml-exo-test-pane .ace_gutter-cell.ace_warning { + background: linear-gradient(to right, #980 0, #980 4px, transparent 80%) ; +} +#learnocaml-exo-test-pane .ace_gutter-cell.ace_error { + background: linear-gradient(to right, #900 0, #900 4px, transparent 80%) ; +} +#learnocaml-exo-test-pane .ace_comment { color: #aaa; font-style: italic; } +#learnocaml-exo-test-pane .ace_keyword { color: #e80; font-weight:bold; } +#learnocaml-exo-test-pane .ace_constant { color: #acf; } +#learnocaml-exo-test-pane .ace_string { color: #acf; } +#learnocaml-exo-test-pane .ace_function { color: #fff; } +#learnocaml-exo-test-pane .ace_type { color: #fff; } +#learnocaml-exo-test-pane .ace_operator { color: #fff; } +#learnocaml-exo-test-pane .ace_meta { color: #fff; } +#learnocaml-exo-test-pane .ace_variable { color: #fff; } +#learnocaml-exo-test-pane .ace_text { color: #fff; } +#learnocaml-exo-test-pane .error { + border-bottom: 2px #b00 solid; + position: absolute; +} + +#learnocaml-exo-test-pane .warning { + border-bottom: 2px #ca0 solid; + position: absolute; +} + +#learnocaml-exo-test-pane .ace_selection { background: #e80; opacity: 0.4; } +#learnocaml-exo-test-pane .ace_active-line { background: #acf; opacity: 0.2; } +#learnocaml-exo-test-pane .ace_selected-word { background: #e80; opacity: 0.2; } + +#learnocaml-exo-test-pane.ocaml-check-success::after, +#learnocaml-exo-test-pane.ocaml-check-warn::after, +#learnocaml-exo-test-pane.ocaml-check-error::after { + animation: 1s check_status_animation; + animation-fill-mode: forwards; + position: absolute; + margin: -100px 0 0 0; + top: 50%; + text-align: center; + font-size: 200px; + line-height: 200px; + width: 100%; +} + +#learnocaml-exo-test-pane.ocaml-check-success::after { + content: "✌"; + color: #0a0; + text-shadow: 0px 0px 40px #6F6; +} + +#learnocaml-exo-test-pane.ocaml-check-warn::after { + content: "✋"; + color: #ec0; + text-shadow: 0px 0px 40px #Fe6; +} + +#learnocaml-exo-test-pane.ocaml-check-error::after { + content: "☠"; + color: #b00; + text-shadow: 0px 0px 40px #F66; +} + +/* testhaut */ + +#learnocaml-exo-testhaut-edit { + font-size: 18px; + font-family: 'Inconsolata', monospace; +} +#toolbar{ + height: 30px; +} +#button_delete{ + position: absolute; +} +#up{ + position: absolute; + left: 45px; +} +#down{ + position: absolute; + left: 90px; +} +#duplicate{ + position: absolute; + left: 135px; +} +#learnocaml-exo-tab-testhaut > .testhaut-edit { + position: absolute; + left: 0; top: 0; bottom: 64%; width: 100%; + background: #666; + color: #fff; + z-index: 1002; +} + +#learnocaml-exo-tab-testhaut > .testhaut-pane { + position: absolute; + left: 0; top: 33%; bottom: 40px; width: 100%; + background: #eee; + color: #fff; + z-index: 1002; + overflow-y: auto +} +#learnocaml-exo-testhaut-edit .ace_gutter { + background: linear-gradient(to left, transparent 0, #444 8px, #ccc 8px, #ccc 9px, #444 9px) ; + color: #ccc; +} +#learnocaml-exo-testhaut-edit .ace_gutter-active-line { + background: linear-gradient(to left, #777 0, #456 8px, #ccc 8px, #ccc 9px, #678 9px) ; + color: #888; +} +#learnocaml-exo-testhaut-edit .ace_gutter-cell { + padding: 0 14px 0 0; +} +#learnocaml-exo-testhaut-edit .ace_gutter-cell.ace_warning { + background: linear-gradient(to right, #980 0, #980 4px, transparent 80%) ; +} +#learnocaml-exo-testhaut-edit .ace_gutter-cell.ace_error { + background: linear-gradient(to right, #900 0, #900 4px, transparent 80%) ; +} +#learnocaml-exo-testhaut-edit .ace_comment { color: #aaa; font-style: italic; } +#learnocaml-exo-testhaut-edit .ace_keyword { color: #e80; font-weight:bold; } +#learnocaml-exo-testhaut-edit .ace_constant { color: #acf; } +#learnocaml-exo-testhaut-edit .ace_string { color: #acf; } +#learnocaml-exo-testhaut-edit .ace_function { color: #fff; } +#learnocaml-exo-testhaut-edit .ace_type { color: #fff; } +#learnocaml-exo-testhaut-edit .ace_operator { color: #fff; } +#learnocaml-exo-testhaut-edit .ace_meta { color: #fff; } +#learnocaml-exo-testhaut-edit .ace_variable { color: #fff; } +#learnocaml-exo-testhaut-edit .ace_text { color: #fff; } +#learnocaml-exo-testhaut-edit .error { + border-bottom: 2px #b00 solid; + position: absolute; +} + +#learnocaml-exo-testhaut-edit .warning { + border-bottom: 2px #ca0 solid; + position: absolute; +} + +#learnocaml-exo-testhaut-edit .ace_selection { background: #e80; opacity: 0.4; } +#learnocaml-exo-testhaut-edit .ace_active-line { background: #acf; opacity: 0.2; } +#learnocaml-exo-testhaut-edit .ace_selected-word { background: #e80; opacity: 0.2; } + +#learnocaml-exo-testhaut-edit.ocaml-check-success::after, +#learnocaml-exo-testhaut-edit.ocaml-check-warn::after, +#learnocaml-exo-testhaut-edit.ocaml-check-error::after { + animation: 1s check_status_animation; + animation-fill-mode: forwards; + position: absolute; + margin: -100px 0 0 0; + top: 50%; + text-align: center; + font-size: 200px; + line-height: 200px; + width: 100%; +} + +#learnocaml-exo-testhaut-edit.ocaml-check-success::after { + content: "✌"; + color: #0a0; + text-shadow: 0px 0px 40px #6F6; +} + +#learnocaml-exo-testhaut-edit.ocaml-check-warn::after { + content: "✋"; + color: #ec0; + text-shadow: 0px 0px 40px #Fe6; +} + +#learnocaml-exo-testhaut-edit.ocaml-check-error::after { + content: "☠"; + color: #b00; + text-shadow: 0px 0px 40px #F66; +} +/* end testhaut */ + + +/* question mark */ + +#learnocaml-exo-question-mark { + font-size: 18px; + font-family: 'Inconsolata', monospace; +} +#learnocaml-exo-question-mark .ace_gutter { + background: linear-gradient(to left, transparent 0, #444 8px, #ccc 8px, #ccc 9px, #444 9px) ; + color: #ccc; +} +#learnocaml-exo-question-mark .ace_gutter-active-line { + background: linear-gradient(to left, #777 0, #456 8px, #ccc 8px, #ccc 9px, #678 9px) ; + color: #888; +} +#learnocaml-exo-question-mark .ace_gutter-cell { + padding: 0 14px 0 0; +} +#learnocaml-exo-question-mark .ace_gutter-cell.ace_warning { + background: linear-gradient(to right, #980 0, #980 4px, transparent 80%) ; +} +#learnocaml-exo-question-mark .ace_gutter-cell.ace_error { + background: linear-gradient(to right, #900 0, #900 4px, transparent 80%) ; +} +#learnocaml-exo-question-mark .ace_comment { color: #aaa; font-style: italic; } +#learnocaml-exo-question-mark .ace_keyword { color: #e80; font-weight:bold; } +#learnocaml-exo-question-mark .ace_constant { color: #acf; } +#learnocaml-exo-question-mark .ace_string { color: #acf; } +#learnocaml-exo-question-mark .ace_function { color: #fff; } +#learnocaml-exo-question-mark .ace_type { color: #fff; } +#learnocaml-exo-question-mark .ace_operator { color: #fff; } +#learnocaml-exo-question-mark .ace_meta { color: #fff; } +#learnocaml-exo-question-mark .ace_variable { color: #fff; } +#learnocaml-exo-question-mark .ace_text { color: #fff; } +#learnocaml-exo-question-mark .error { + border-bottom: 2px #b00 solid; + position: absolute; +} + +#learnocaml-exo-question-mark .warning { + border-bottom: 2px #ca0 solid; + position: absolute; +} + +#learnocaml-exo-question-mark .ace_selection { background: #e80; opacity: 0.4; } +#learnocaml-exo-question-mark .ace_active-line { background: #acf; opacity: 0.2; } +#learnocaml-exo-question-mark .ace_selected-word { background: #e80; opacity: 0.2; } + +/* question html */ + +#learnocaml-exo-question-html { + font-size: 18px; + font-family: 'Inconsolata', monospace; +} +#learnocaml-exo-question-html .ace_gutter { + background: linear-gradient(to left, transparent 0, #444 8px, #ccc 8px, #ccc 9px, #444 9px) ; + color: #ccc; +} +#learnocaml-exo-question-html .ace_gutter-active-line { + background: linear-gradient(to left, #777 0, #456 8px, #ccc 8px, #ccc 9px, #678 9px) ; + color: #888; +} +#learnocaml-exo-question-html .ace_gutter-cell { + padding: 0 14px 0 0; +} +#learnocaml-exo-question-html .ace_gutter-cell.ace_warning { + background: linear-gradient(to right, #980 0, #980 4px, transparent 80%) ; +} +#learnocaml-exo-question-html .ace_gutter-cell.ace_error { + background: linear-gradient(to right, #900 0, #900 4px, transparent 80%) ; +} +#learnocaml-exo-question-html .ace_comment { color: #aaa; font-style: italic; } +#learnocaml-exo-question-html .ace_keyword { color: #e80; font-weight:bold; } +#learnocaml-exo-question-html .ace_constant { color: #acf; } +#learnocaml-exo-question-html .ace_string { color: #acf; } +#learnocaml-exo-question-html .ace_function { color: #fff; } +#learnocaml-exo-question-html .ace_type { color: #fff; } +#learnocaml-exo-question-html .ace_operator { color: #fff; } +#learnocaml-exo-question-html .ace_meta { color: #fff; } +#learnocaml-exo-question-html .ace_variable { color: #fff; } +#learnocaml-exo-question-html .ace_text { color: #fff; } +#learnocaml-exo-question-html .error { + border-bottom: 2px #b00 solid; + position: absolute; +} + +#learnocaml-exo-question-html .warning { + border-bottom: 2px #ca0 solid; + position: absolute; +} + +#learnocaml-exo-question-html .ace_selection { background: #e80; opacity: 0.4; } +#learnocaml-exo-question-html .ace_active-line { background: #acf; opacity: 0.2; } +#learnocaml-exo-question-html .ace_selected-word { background: #e80; opacity: 0.2; } + + +/* template */ +#learnocaml-exo-template-pane { + font-size: 18px; + font-family: 'Inconsolata', monospace; +} +#learnocaml-exo-template-pane .ace_gutter { + background: linear-gradient(to left, transparent 0, #444 8px, #ccc 8px, #ccc 9px, #444 9px) ; + color: #ccc; +} +#learnocaml-exo-template-pane .ace_gutter-active-line { + background: linear-gradient(to left, #777 0, #456 8px, #ccc 8px, #ccc 9px, #678 9px) ; + color: #888; +} +#learnocaml-exo-template-pane .ace_gutter-cell { + padding: 0 14px 0 0; +} +#learnocaml-exo-template-pane .ace_gutter-cell.ace_warning { + background: linear-gradient(to right, #980 0, #980 4px, transparent 80%) ; +} +#learnocaml-exo-template-pane .ace_gutter-cell.ace_error { + background: linear-gradient(to right, #900 0, #900 4px, transparent 80%) ; +} +#learnocaml-exo-template-pane .ace_comment { color: #aaa; font-style: italic; } +#learnocaml-exo-template-pane .ace_keyword { color: #e80; font-weight:bold; } +#learnocaml-exo-template-pane .ace_constant { color: #acf; } +#learnocaml-exo-template-pane .ace_string { color: #acf; } +#learnocaml-exo-template-pane .ace_function { color: #fff; } +#learnocaml-exo-template-pane .ace_type { color: #fff; } +#learnocaml-exo-template-pane .ace_operator { color: #fff; } +#learnocaml-exo-template-pane .ace_meta { color: #fff; } +#learnocaml-exo-template-pane .ace_variable { color: #fff; } +#learnocaml-exo-template-pane .ace_text { color: #fff; } +#learnocaml-exo-template-pane .error { + border-bottom: 2px #b00 solid; + position: absolute; +} + +#learnocaml-exo-template-pane .warning { + border-bottom: 2px #ca0 solid; + position: absolute; +} + +#learnocaml-exo-template-pane .ace_selection { background: #e80; opacity: 0.4; } +#learnocaml-exo-template-pane .ace_active-line { background: #acf; opacity: 0.2; } +#learnocaml-exo-template-pane .ace_selected-word { background: #e80; opacity: 0.2; } + +#learnocaml-exo-template-pane.ocaml-check-success::after, +#learnocaml-exo-template-pane.ocaml-check-warn::after, +#learnocaml-exo-template-pane.ocaml-check-error::after { + animation: 1s check_status_animation; + animation-fill-mode: forwards; + position: absolute; + margin: -100px 0 0 0; + top: 50%; + text-align: center; + font-size: 200px; + line-height: 200px; + width: 100%; +} + +#learnocaml-exo-template-pane.ocaml-check-success::after { + content: "✌"; + color: #0a0; + text-shadow: 0px 0px 40px #6F6; +} + +#learnocaml-exo-template-pane.ocaml-check-warn::after { + content: "✋"; + color: #ec0; + text-shadow: 0px 0px 40px #Fe6; +} + +#learnocaml-exo-template-pane.ocaml-check-error::after { + content: "☠"; + color: #b00; + text-shadow: 0px 0px 40px #F66; +} + +/* prepare */ + +#learnocaml-exo-prepare-pane { + font-size: 18px; + font-family: 'Inconsolata', monospace; +} +#learnocaml-exo-prepare-pane .ace_gutter { + background: linear-gradient(to left, transparent 0, #444 8px, #ccc 8px, #ccc 9px, #444 9px) ; + color: #ccc; +} +#learnocaml-exo-prepare-pane .ace_gutter-active-line { + background: linear-gradient(to left, #777 0, #456 8px, #ccc 8px, #ccc 9px, #678 9px) ; + color: #888; +} +#learnocaml-exo-prepare-pane .ace_gutter-cell { + padding: 0 14px 0 0; +} +#learnocaml-exo-prepare-pane .ace_gutter-cell.ace_warning { + background: linear-gradient(to right, #980 0, #980 4px, transparent 80%) ; +} +#learnocaml-exo-prepare-pane .ace_gutter-cell.ace_error { + background: linear-gradient(to right, #900 0, #900 4px, transparent 80%) ; +} +#learnocaml-exo-prepare-pane .ace_comment { color: #aaa; font-style: italic; } +#learnocaml-exo-prepare-pane .ace_keyword { color: #e80; font-weight:bold; } +#learnocaml-exo-prepare-pane .ace_constant { color: #acf; } +#learnocaml-exo-prepare-pane .ace_string { color: #acf; } +#learnocaml-exo-prepare-pane .ace_function { color: #fff; } +#learnocaml-exo-prepare-pane .ace_type { color: #fff; } +#learnocaml-exo-prepare-pane .ace_operator { color: #fff; } +#learnocaml-exo-prepare-pane .ace_meta { color: #fff; } +#learnocaml-exo-prepare-pane .ace_variable { color: #fff; } +#learnocaml-exo-prepare-pane .ace_text { color: #fff; } +#learnocaml-exo-prepare-pane .error { + border-bottom: 2px #b00 solid; + position: absolute; +} + +#learnocaml-exo-prepare-pane .warning { + border-bottom: 2px #ca0 solid; + position: absolute; +} + +#learnocaml-exo-prepare-pane .ace_selection { background: #e80; opacity: 0.4; } +#learnocaml-exo-prepare-pane .ace_active-line { background: #acf; opacity: 0.2; } +#learnocaml-exo-prepare-pane .ace_selected-word { background: #e80; opacity: 0.2; } + +#learnocaml-exo-prepare-pane.ocaml-check-success::after, +#learnocaml-exo-prepare-pane.ocaml-check-warn::after, +#learnocaml-exo-prepare-pane.ocaml-check-error::after { + animation: 1s check_status_animation; + animation-fill-mode: forwards; + position: absolute; + margin: -100px 0 0 0; + top: 50%; + text-align: center; + font-size: 200px; + line-height: 200px; + width: 100%; +} + +#learnocaml-exo-prepare-pane.ocaml-check-success::after { + content: "✌"; + color: #0a0; + text-shadow: 0px 0px 40px #6F6; +} + +#learnocaml-exo-prepare-pane.ocaml-check-warn::after { + content: "✋"; + color: #ec0; + text-shadow: 0px 0px 40px #Fe6; +} + +#learnocaml-exo-prepare-pane.ocaml-check-error::after { + content: "☠"; + color: #b00; + text-shadow: 0px 0px 40px #F66; +} + +/* prelude */ + +#learnocaml-exo-prelude-pane { + font-size: 18px; + font-family: 'Inconsolata', monospace; +} +#learnocaml-exo-prelude-pane .ace_gutter { + background: linear-gradient(to left, transparent 0, #444 8px, #ccc 8px, #ccc 9px, #444 9px) ; + color: #ccc; +} +#learnocaml-exo-prelude-pane .ace_gutter-active-line { + background: linear-gradient(to left, #777 0, #456 8px, #ccc 8px, #ccc 9px, #678 9px) ; + color: #888; +} +#learnocaml-exo-prelude-pane .ace_gutter-cell { + padding: 0 14px 0 0; +} +#learnocaml-exo-prelude-pane .ace_gutter-cell.ace_warning { + background: linear-gradient(to right, #980 0, #980 4px, transparent 80%) ; +} +#learnocaml-exo-prelude-pane .ace_gutter-cell.ace_error { + background: linear-gradient(to right, #900 0, #900 4px, transparent 80%) ; +} +#learnocaml-exo-prelude-pane .ace_comment { color: #aaa; font-style: italic; } +#learnocaml-exo-prelude-pane .ace_keyword { color: #e80; font-weight:bold; } +#learnocaml-exo-prelude-pane .ace_constant { color: #acf; } +#learnocaml-exo-prelude-pane .ace_string { color: #acf; } +#learnocaml-exo-prelude-pane .ace_function { color: #fff; } +#learnocaml-exo-prelude-pane .ace_type { color: #fff; } +#learnocaml-exo-prelude-pane .ace_operator { color: #fff; } +#learnocaml-exo-prelude-pane .ace_meta { color: #fff; } +#learnocaml-exo-prelude-pane .ace_variable { color: #fff; } +#learnocaml-exo-prelude-pane .ace_text { color: #fff; } +#learnocaml-exo-prelude-pane .error { + border-bottom: 2px #b00 solid; + position: absolute; +} + +#learnocaml-exo-prelude-pane .warning { + border-bottom: 2px #ca0 solid; + position: absolute; +} + +#learnocaml-exo-prelude-pane .ace_selection { background: #e80; opacity: 0.4; } +#learnocaml-exo-prelude-pane .ace_active-line { background: #acf; opacity: 0.2; } +#learnocaml-exo-prelude-pane .ace_selected-word { background: #e80; opacity: 0.2; } + +#learnocaml-exo-prelude-pane.ocaml-check-success::after, +#learnocaml-exo-prelude-pane.ocaml-check-warn::after, +#learnocaml-exo-prelude-pane.ocaml-check-error::after { + animation: 1s check_status_animation; + animation-fill-mode: forwards; + position: absolute; + margin: -100px 0 0 0; + top: 50%; + text-align: center; + font-size: 200px; + line-height: 200px; + width: 100%; +} + +#learnocaml-exo-prelude-pane.ocaml-check-success::after { + content: "✌"; + color: #0a0; + text-shadow: 0px 0px 40px #6F6; +} + +#learnocaml-exo-prelude-pane.ocaml-check-warn::after { + content: "✋"; + color: #ec0; + text-shadow: 0px 0px 40px #Fe6; +} + +#learnocaml-exo-prelude-pane.ocaml-check-error::after { + content: "☠"; + color: #b00; + text-shadow: 0px 0px 40px #F66; +} + +@keyframes check_status_animation { + 0% { opacity: 0; z-index: 9999; } + 49% { opacity: 1; transform: scale(2); z-index: 9999; } + 99% { opacity: 0; transform: scale(2); z-index: 9999; } + 100% { opacity: 0; z-index: -9999; } +} + +@-webkit-keyframes check_status_animation { + 0% { opacity: 0; z-index: 9999; } + 49% { opacity: 1; transform: scale(2); z-index: 9999; } + 99% { opacity: 0; transform: scale(2); z-index: 9999; } + 100% { opacity: 0; z-index: -9999; } +} diff --git a/static/css/learnocaml_new_exercise.css b/static/css/learnocaml_new_exercise.css new file mode 100644 index 000000000..62aec1371 --- /dev/null +++ b/static/css/learnocaml_new_exercise.css @@ -0,0 +1,98 @@ +body{ + background: #eee; +} +#page_title{ + text-align: center; + font-size: 25px; + line-height: 50px; +} +#learnocaml-main-toolbar { + position: fixed; + left: 0; top: 0; + color: #fff; + z-index: 1004; + border-bottom: 1px #eee solid; + display: flex; + background: #222; +} +#learnocaml-main-toolbar a { + text-decoration: none; + color: #fff; +} +#learnocaml-main-toolbar > button { + border-left: 1px #eee solid !important; + padding: 0 10px 0 10px; + margin: 0; + background: none; + border: none; + flex: 0; + position: relative; + display: block; +} +#learnocaml-main-toolbar > button > * { + padding: 5px; + color: #eee; + text-align: center; +} +#learnocaml-main-toolbar::before { + z-index: 1004; + position: fixed; + left: 0px; height: 5px; width: 100%; + background: linear-gradient(to bottom, rgba(0,0,0,0.4) 0px, rgba(0,0,0,0) 5px); + content:""; +} +@media (max-width: 549px) { + #learnocaml-main-toolbar { + height: 40px; + width: 100% + } + .button { + height: 40px; + min-width: 40px; + } + #learnocaml-main-toolbar::before { + top: 41px; + } + #learnocaml-main-toolbar > button > .label { + display: none; + } +} +@media (min-width: 550px) { + #learnocaml-main-toolbar { + height: 60px; + width: 100%; + } + .button { + height: 60px; + min-width: 60px; + } + #learnocaml-main-toolbar::before { + top: 61px; + } +} + +#learnocaml-tabs > * { + position: absolute; + z-index: 997; + background: #eee; + padding: 0; + opacity: 0; +} +#learnocaml-tabs > *.front-tab { + z-index: 998; + opacity: 1; +} +#learnocaml-tabs > * { + left: 0px; top: 15px; right: 0px; bottom: 0px; +} + + +.splitted { + display: flex; + justify-content: start + +} + +.splitted:first-child{ + margin-right: 50px; +} \ No newline at end of file diff --git a/static/editor/editor.html b/static/editor/editor.html new file mode 100644 index 000000000..00bbcc0bf --- /dev/null +++ b/static/editor/editor.html @@ -0,0 +1,191 @@ + + + + + + +
+ 
+ 
+ 
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+ 
+ Learn OCaml
+ 
+
+
+
+
+ Learn OCaml
+
+
+
+
+
+
+
diff --git a/static/editor/new-exercise.html b/static/editor/new-exercise.html
new file mode 100644
index 000000000..653eee00b
--- /dev/null
+++ b/static/editor/new-exercise.html
@@ -0,0 +1,125 @@
+
+
+
+
+
+
+
+
+ Editor
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Learn OCaml
+
+
+
+ Learn OCaml
+
+
+
+
+
+
+
+
+
+
+ New Exercise
+
+
+
+
+
+
diff --git a/static/index.html b/static/index.html
index b574371b6..ba22db650 100644
--- a/static/index.html
+++ b/static/index.html
@@ -8,6 +8,8 @@
+
+
diff --git a/static/js/ace/mode-ocaml.js b/static/js/ace/mode-ocaml.js
new file mode 100644
index 000000000..3b1a3e7be
--- /dev/null
+++ b/static/js/ace/mode-ocaml.js
@@ -0,0 +1,421 @@
+ace.define("ace/mode/ocaml_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var OcamlHighlightRules = function() {
+
+ var keywords = (
+ "and|as|assert|begin|class|constraint|do|done|downto|else|end|" +
+ "exception|external|for|fun|function|functor|if|in|include|" +
+ "inherit|initializer|lazy|let|match|method|module|mutable|new|" +
+ "object|of|open|or|private|rec|sig|struct|then|to|try|type|val|" +
+ "virtual|when|while|with"
+ );
+
+ var builtinConstants = ("true|false");
+
+ var builtinFunctions = (
+ "abs|abs_big_int|abs_float|abs_num|abstract_tag|accept|access|acos|add|" +
+ "add_available_units|add_big_int|add_buffer|add_channel|add_char|" +
+ "add_initializer|add_int_big_int|add_interfaces|add_num|add_string|" +
+ "add_substitute|add_substring|alarm|allocated_bytes|allow_only|" +
+ "allow_unsafe_modules|always|append|appname_get|appname_set|" +
+ "approx_num_exp|approx_num_fix|arg|argv|arith_status|array|" +
+ "array1_of_genarray|array2_of_genarray|array3_of_genarray|asin|asr|" +
+ "assoc|assq|at_exit|atan|atan2|auto_synchronize|background|basename|" +
+ "beginning_of_input|big_int_of_int|big_int_of_num|big_int_of_string|bind|" +
+ "bind_class|bind_tag|bits|bits_of_float|black|blit|blit_image|blue|bool|" +
+ "bool_of_string|bounded_full_split|bounded_split|bounded_split_delim|" +
+ "bprintf|break|broadcast|bscanf|button_down|c_layout|capitalize|cardinal|" +
+ "cardinal|catch|catch_break|ceil|ceiling_num|channel|char|char_of_int|" +
+ "chdir|check|check_suffix|chmod|choose|chop_extension|chop_suffix|chown|" +
+ "chown|chr|chroot|classify_float|clear|clear_available_units|" +
+ "clear_close_on_exec|clear_graph|clear_nonblock|clear_parser|" +
+ "close|close|closeTk|close_box|close_graph|close_in|close_in_noerr|" +
+ "close_out|close_out_noerr|close_process|close_process|" +
+ "close_process_full|close_process_in|close_process_out|close_subwindow|" +
+ "close_tag|close_tbox|closedir|closedir|closure_tag|code|combine|" +
+ "combine|combine|command|compact|compare|compare_big_int|compare_num|" +
+ "complex32|complex64|concat|conj|connect|contains|contains_from|contents|" +
+ "copy|cos|cosh|count|count|counters|create|create_alarm|create_image|" +
+ "create_matrix|create_matrix|create_matrix|create_object|" +
+ "create_object_and_run_initializers|create_object_opt|create_process|" +
+ "create_process|create_process_env|create_process_env|create_table|" +
+ "current|current_dir_name|current_point|current_x|current_y|curveto|" +
+ "custom_tag|cyan|data_size|decr|decr_num|default_available_units|delay|" +
+ "delete_alarm|descr_of_in_channel|descr_of_out_channel|destroy|diff|dim|" +
+ "dim1|dim2|dim3|dims|dirname|display_mode|div|div_big_int|div_num|" +
+ "double_array_tag|double_tag|draw_arc|draw_char|draw_circle|draw_ellipse|" +
+ "draw_image|draw_poly|draw_poly_line|draw_rect|draw_segments|draw_string|" +
+ "dummy_pos|dummy_table|dump_image|dup|dup2|elements|empty|end_of_input|" +
+ "environment|eprintf|epsilon_float|eq_big_int|eq_num|equal|err_formatter|" +
+ "error_message|escaped|establish_server|executable_name|execv|execve|execvp|" +
+ "execvpe|exists|exists2|exit|exp|failwith|fast_sort|fchmod|fchown|field|" +
+ "file|file_exists|fill|fill_arc|fill_circle|fill_ellipse|fill_poly|fill_rect|" +
+ "filter|final_tag|finalise|find|find_all|first_chars|firstkey|flatten|" +
+ "float|float32|float64|float_of_big_int|float_of_bits|float_of_int|" +
+ "float_of_num|float_of_string|floor|floor_num|flush|flush_all|flush_input|" +
+ "flush_str_formatter|fold|fold_left|fold_left2|fold_right|fold_right2|" +
+ "for_all|for_all2|force|force_newline|force_val|foreground|fork|" +
+ "format_of_string|formatter_of_buffer|formatter_of_out_channel|" +
+ "fortran_layout|forward_tag|fprintf|frexp|from|from_channel|from_file|" +
+ "from_file_bin|from_function|from_string|fscanf|fst|fstat|ftruncate|" +
+ "full_init|full_major|full_split|gcd_big_int|ge_big_int|ge_num|" +
+ "genarray_of_array1|genarray_of_array2|genarray_of_array3|get|" +
+ "get_all_formatter_output_functions|get_approx_printing|get_copy|" +
+ "get_ellipsis_text|get_error_when_null_denominator|get_floating_precision|" +
+ "get_formatter_output_functions|get_formatter_tag_functions|get_image|" +
+ "get_margin|get_mark_tags|get_max_boxes|get_max_indent|get_method|" +
+ "get_method_label|get_normalize_ratio|get_normalize_ratio_when_printing|" +
+ "get_print_tags|get_state|get_variable|getcwd|getegid|getegid|getenv|" +
+ "getenv|getenv|geteuid|geteuid|getgid|getgid|getgrgid|getgrgid|getgrnam|" +
+ "getgrnam|getgroups|gethostbyaddr|gethostbyname|gethostname|getitimer|" +
+ "getlogin|getpeername|getpid|getppid|getprotobyname|getprotobynumber|" +
+ "getpwnam|getpwuid|getservbyname|getservbyport|getsockname|getsockopt|" +
+ "getsockopt_float|getsockopt_int|getsockopt_optint|gettimeofday|getuid|" +
+ "global_replace|global_substitute|gmtime|green|grid|group_beginning|" +
+ "group_end|gt_big_int|gt_num|guard|handle_unix_error|hash|hash_param|" +
+ "hd|header_size|i|id|ignore|in_channel_length|in_channel_of_descr|incr|" +
+ "incr_num|index|index_from|inet_addr_any|inet_addr_of_string|infinity|" +
+ "infix_tag|init|init_class|input|input_binary_int|input_byte|input_char|" +
+ "input_line|input_value|int|int16_signed|int16_unsigned|int32|int64|" +
+ "int8_signed|int8_unsigned|int_of_big_int|int_of_char|int_of_float|" +
+ "int_of_num|int_of_string|integer_num|inter|interactive|inv|invalid_arg|" +
+ "is_block|is_empty|is_implicit|is_int|is_int_big_int|is_integer_num|" +
+ "is_relative|iter|iter2|iteri|join|junk|key_pressed|kill|kind|kprintf|" +
+ "kscanf|land|last_chars|layout|lazy_from_fun|lazy_from_val|lazy_is_val|" +
+ "lazy_tag|ldexp|le_big_int|le_num|length|lexeme|lexeme_char|lexeme_end|" +
+ "lexeme_end_p|lexeme_start|lexeme_start_p|lineto|link|list|listen|lnot|" +
+ "loadfile|loadfile_private|localtime|lock|lockf|log|log10|logand|lognot|" +
+ "logor|logxor|lor|lower_window|lowercase|lseek|lsl|lsr|lstat|lt_big_int|" +
+ "lt_num|lxor|magenta|magic|mainLoop|major|major_slice|make|make_formatter|" +
+ "make_image|make_lexer|make_matrix|make_self_init|map|map2|map_file|mapi|" +
+ "marshal|match_beginning|match_end|matched_group|matched_string|max|" +
+ "max_array_length|max_big_int|max_elt|max_float|max_int|max_num|" +
+ "max_string_length|mem|mem_assoc|mem_assq|memq|merge|min|min_big_int|" +
+ "min_elt|min_float|min_int|min_num|minor|minus_big_int|minus_num|" +
+ "minus_one|mkdir|mkfifo|mktime|mod|mod_big_int|mod_float|mod_num|modf|" +
+ "mouse_pos|moveto|mul|mult_big_int|mult_int_big_int|mult_num|nan|narrow|" +
+ "nat_of_num|nativeint|neg|neg_infinity|new_block|new_channel|new_method|" +
+ "new_variable|next|nextkey|nice|nice|no_scan_tag|norm|norm2|not|npeek|" +
+ "nth|nth_dim|num_digits_big_int|num_dims|num_of_big_int|num_of_int|" +
+ "num_of_nat|num_of_ratio|num_of_string|O|obj|object_tag|ocaml_version|" +
+ "of_array|of_channel|of_float|of_int|of_int32|of_list|of_nativeint|" +
+ "of_string|one|openTk|open_box|open_connection|open_graph|open_hbox|" +
+ "open_hovbox|open_hvbox|open_in|open_in_bin|open_in_gen|open_out|" +
+ "open_out_bin|open_out_gen|open_process|open_process_full|open_process_in|" +
+ "open_process_out|open_subwindow|open_tag|open_tbox|open_temp_file|" +
+ "open_vbox|opendbm|opendir|openfile|or|os_type|out_channel_length|" +
+ "out_channel_of_descr|output|output_binary_int|output_buffer|output_byte|" +
+ "output_char|output_string|output_value|over_max_boxes|pack|params|" +
+ "parent_dir_name|parse|parse_argv|partition|pause|peek|pipe|pixels|" +
+ "place|plot|plots|point_color|polar|poll|pop|pos_in|pos_out|pow|" +
+ "power_big_int_positive_big_int|power_big_int_positive_int|" +
+ "power_int_positive_big_int|power_int_positive_int|power_num|" +
+ "pp_close_box|pp_close_tag|pp_close_tbox|pp_force_newline|" +
+ "pp_get_all_formatter_output_functions|pp_get_ellipsis_text|" +
+ "pp_get_formatter_output_functions|pp_get_formatter_tag_functions|" +
+ "pp_get_margin|pp_get_mark_tags|pp_get_max_boxes|pp_get_max_indent|" +
+ "pp_get_print_tags|pp_open_box|pp_open_hbox|pp_open_hovbox|pp_open_hvbox|" +
+ "pp_open_tag|pp_open_tbox|pp_open_vbox|pp_over_max_boxes|pp_print_as|" +
+ "pp_print_bool|pp_print_break|pp_print_char|pp_print_cut|pp_print_float|" +
+ "pp_print_flush|pp_print_if_newline|pp_print_int|pp_print_newline|" +
+ "pp_print_space|pp_print_string|pp_print_tab|pp_print_tbreak|" +
+ "pp_set_all_formatter_output_functions|pp_set_ellipsis_text|" +
+ "pp_set_formatter_out_channel|pp_set_formatter_output_functions|" +
+ "pp_set_formatter_tag_functions|pp_set_margin|pp_set_mark_tags|" +
+ "pp_set_max_boxes|pp_set_max_indent|pp_set_print_tags|pp_set_tab|" +
+ "pp_set_tags|pred|pred_big_int|pred_num|prerr_char|prerr_endline|" +
+ "prerr_float|prerr_int|prerr_newline|prerr_string|print|print_as|" +
+ "print_bool|print_break|print_char|print_cut|print_endline|print_float|" +
+ "print_flush|print_if_newline|print_int|print_newline|print_space|" +
+ "print_stat|print_string|print_tab|print_tbreak|printf|prohibit|" +
+ "public_method_label|push|putenv|quo_num|quomod_big_int|quote|raise|" +
+ "raise_window|ratio_of_num|rcontains_from|read|read_float|read_int|" +
+ "read_key|read_line|readdir|readdir|readlink|really_input|receive|recv|" +
+ "recvfrom|red|ref|regexp|regexp_case_fold|regexp_string|" +
+ "regexp_string_case_fold|register|register_exception|rem|remember_mode|" +
+ "remove|remove_assoc|remove_assq|rename|replace|replace_first|" +
+ "replace_matched|repr|reset|reshape|reshape_1|reshape_2|reshape_3|rev|" +
+ "rev_append|rev_map|rev_map2|rewinddir|rgb|rhs_end|rhs_end_pos|rhs_start|" +
+ "rhs_start_pos|rindex|rindex_from|rlineto|rmdir|rmoveto|round_num|" +
+ "run_initializers|run_initializers_opt|scanf|search_backward|" +
+ "search_forward|seek_in|seek_out|select|self|self_init|send|sendto|set|" +
+ "set_all_formatter_output_functions|set_approx_printing|" +
+ "set_binary_mode_in|set_binary_mode_out|set_close_on_exec|" +
+ "set_close_on_exec|set_color|set_ellipsis_text|" +
+ "set_error_when_null_denominator|set_field|set_floating_precision|" +
+ "set_font|set_formatter_out_channel|set_formatter_output_functions|" +
+ "set_formatter_tag_functions|set_line_width|set_margin|set_mark_tags|" +
+ "set_max_boxes|set_max_indent|set_method|set_nonblock|set_nonblock|" +
+ "set_normalize_ratio|set_normalize_ratio_when_printing|set_print_tags|" +
+ "set_signal|set_state|set_tab|set_tag|set_tags|set_text_size|" +
+ "set_window_title|setgid|setgid|setitimer|setitimer|setsid|setsid|" +
+ "setsockopt|setsockopt|setsockopt_float|setsockopt_float|setsockopt_int|" +
+ "setsockopt_int|setsockopt_optint|setsockopt_optint|setuid|setuid|" +
+ "shift_left|shift_left|shift_left|shift_right|shift_right|shift_right|" +
+ "shift_right_logical|shift_right_logical|shift_right_logical|show_buckets|" +
+ "shutdown|shutdown|shutdown_connection|shutdown_connection|sigabrt|" +
+ "sigalrm|sigchld|sigcont|sigfpe|sighup|sigill|sigint|sigkill|sign_big_int|" +
+ "sign_num|signal|signal|sigpending|sigpending|sigpipe|sigprocmask|" +
+ "sigprocmask|sigprof|sigquit|sigsegv|sigstop|sigsuspend|sigsuspend|" +
+ "sigterm|sigtstp|sigttin|sigttou|sigusr1|sigusr2|sigvtalrm|sin|singleton|" +
+ "sinh|size|size|size_x|size_y|sleep|sleep|sleep|slice_left|slice_left|" +
+ "slice_left_1|slice_left_2|slice_right|slice_right|slice_right_1|" +
+ "slice_right_2|snd|socket|socket|socket|socketpair|socketpair|sort|sound|" +
+ "split|split_delim|sprintf|sprintf|sqrt|sqrt|sqrt_big_int|square_big_int|" +
+ "square_num|sscanf|stable_sort|stable_sort|stable_sort|stable_sort|stable_sort|" +
+ "stable_sort|stat|stat|stat|stat|stat|stats|stats|std_formatter|stdbuf|" +
+ "stderr|stderr|stderr|stdib|stdin|stdin|stdin|stdout|stdout|stdout|" +
+ "str_formatter|string|string_after|string_before|string_match|" +
+ "string_of_big_int|string_of_bool|string_of_float|string_of_format|" +
+ "string_of_inet_addr|string_of_inet_addr|string_of_int|string_of_num|" +
+ "string_partial_match|string_tag|sub|sub|sub_big_int|sub_left|sub_num|" +
+ "sub_right|subset|subset|substitute_first|substring|succ|succ|" +
+ "succ|succ|succ_big_int|succ_num|symbol_end|symbol_end_pos|symbol_start|" +
+ "symbol_start_pos|symlink|symlink|sync|synchronize|system|system|system|" +
+ "tag|take|tan|tanh|tcdrain|tcdrain|tcflow|tcflow|tcflush|tcflush|" +
+ "tcgetattr|tcgetattr|tcsendbreak|tcsendbreak|tcsetattr|tcsetattr|" +
+ "temp_file|text_size|time|time|time|timed_read|timed_write|times|times|" +
+ "tl|tl|tl|to_buffer|to_channel|to_float|to_hex|to_int|to_int32|to_list|" +
+ "to_list|to_list|to_nativeint|to_string|to_string|to_string|to_string|" +
+ "to_string|top|top|total_size|transfer|transp|truncate|truncate|truncate|" +
+ "truncate|truncate|truncate|try_lock|umask|umask|uncapitalize|uncapitalize|" +
+ "uncapitalize|union|union|unit_big_int|unlink|unlink|unlock|unmarshal|" +
+ "unsafe_blit|unsafe_fill|unsafe_get|unsafe_get|unsafe_set|unsafe_set|" +
+ "update|uppercase|uppercase|uppercase|uppercase|usage|utimes|utimes|wait|" +
+ "wait|wait|wait|wait_next_event|wait_pid|wait_read|wait_signal|" +
+ "wait_timed_read|wait_timed_write|wait_write|waitpid|white|" +
+ "widen|window_id|word_size|wrap|wrap_abort|write|yellow|yield|zero|zero_big_int|" +
+
+ "Arg|Arith_status|Array|Array1|Array2|Array3|ArrayLabels|Big_int|Bigarray|" +
+ "Buffer|Callback|CamlinternalOO|Char|Complex|Condition|Dbm|Digest|Dynlink|" +
+ "Event|Filename|Format|Gc|Genarray|Genlex|Graphics|GraphicsX11|Hashtbl|" +
+ "Int32|Int64|LargeFile|Lazy|Lexing|List|ListLabels|Make|Map|Marshal|" +
+ "MoreLabels|Mutex|Nativeint|Num|Obj|Oo|Parsing|Pervasives|Printexc|" +
+ "Printf|Queue|Random|Scanf|Scanning|Set|Sort|Stack|State|StdLabels|Str|" +
+ "Stream|String|StringLabels|Sys|Thread|ThreadUnix|Tk|Unix|UnixLabels|Weak"
+ );
+
+ var keywordMapper = this.createKeywordMapper({
+ "variable.language": "this",
+ "keyword": keywords,
+ "constant.language": builtinConstants,
+ "support.function": builtinFunctions
+ }, "identifier");
+
+ var decimalInteger = "(?:(?:[1-9]\\d*)|(?:0))";
+ var octInteger = "(?:0[oO]?[0-7]+)";
+ var hexInteger = "(?:0[xX][\\dA-Fa-f]+)";
+ var binInteger = "(?:0[bB][01]+)";
+ var integer = "(?:" + decimalInteger + "|" + octInteger + "|" + hexInteger + "|" + binInteger + ")";
+
+ var exponent = "(?:[eE][+-]?\\d+)";
+ var fraction = "(?:\\.\\d+)";
+ var intPart = "(?:\\d+)";
+ var pointFloat = "(?:(?:" + intPart + "?" + fraction + ")|(?:" + intPart + "\\.))";
+ var exponentFloat = "(?:(?:" + pointFloat + "|" + intPart + ")" + exponent + ")";
+ var floatNumber = "(?:" + exponentFloat + "|" + pointFloat + ")";
+
+ this.$rules = {
+ "start" : [
+ {
+ token : "comment",
+ regex : '\\(\\*.*?\\*\\)\\s*?$'
+ },
+ {
+ token : "comment",
+ regex : '\\(\\*.*',
+ next : "comment"
+ },
+ {
+ token : "string", // single line
+ regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+ },
+ {
+ token : "string", // single char
+ regex : "'.'"
+ },
+ {
+ token : "string", // " string
+ regex : '"',
+ next : "qstring"
+ },
+ {
+ token : "constant.numeric", // imaginary
+ regex : "(?:" + floatNumber + "|\\d+)[jJ]\\b"
+ },
+ {
+ token : "constant.numeric", // float
+ regex : floatNumber
+ },
+ {
+ token : "constant.numeric", // integer
+ regex : integer + "\\b"
+ },
+ {
+ token : keywordMapper,
+ regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+ },
+ {
+ token : "keyword.operator",
+ regex : "\\+\\.|\\-\\.|\\*\\.|\\/\\.|#|;;|\\+|\\-|\\*|\\*\\*\\/|\\/\\/|%|<<|>>|&|\\||\\^|~|<|>|<=|=>|==|!=|<>|<-|="
+ },
+ {
+ token : "paren.lparen",
+ regex : "[[({]"
+ },
+ {
+ token : "paren.rparen",
+ regex : "[\\])}]"
+ },
+ {
+ token : "text",
+ regex : "\\s+"
+ }
+ ],
+ "comment" : [
+ {
+ token : "comment", // closing comment
+ regex : "\\*\\)",
+ next : "start"
+ },
+ {
+ defaultToken : "comment"
+ }
+ ],
+
+ "qstring" : [
+ {
+ token : "string",
+ regex : '"',
+ next : "start"
+ }, {
+ token : "string",
+ regex : '.+'
+ }
+ ]
+ };
+};
+
+oop.inherits(OcamlHighlightRules, TextHighlightRules);
+
+exports.OcamlHighlightRules = OcamlHighlightRules;
+});
+
+ace.define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+var MatchingBraceOutdent = function() {};
+
+(function() {
+
+ this.checkOutdent = function(line, input) {
+ if (! /^\s+$/.test(line))
+ return false;
+
+ return /^\s*\}/.test(input);
+ };
+
+ this.autoOutdent = function(doc, row) {
+ var line = doc.getLine(row);
+ var match = line.match(/^(\s*\})/);
+
+ if (!match) return 0;
+
+ var column = match[1].length;
+ var openBracePos = doc.findMatchingBracket({row: row, column: column});
+
+ if (!openBracePos || openBracePos.row == row) return 0;
+
+ var indent = this.$getIndent(doc.getLine(openBracePos.row));
+ doc.replace(new Range(row, 0, row, column-1), indent);
+ };
+
+ this.$getIndent = function(line) {
+ return line.match(/^\s*/)[0];
+ };
+
+}).call(MatchingBraceOutdent.prototype);
+
+exports.MatchingBraceOutdent = MatchingBraceOutdent;
+});
+
+ace.define("ace/mode/ocaml",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/ocaml_highlight_rules","ace/mode/matching_brace_outdent","ace/range"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var OcamlHighlightRules = require("./ocaml_highlight_rules").OcamlHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var Range = require("../range").Range;
+
+var Mode = function() {
+ this.HighlightRules = OcamlHighlightRules;
+ this.$behaviour = this.$defaultBehaviour;
+
+ this.$outdent = new MatchingBraceOutdent();
+};
+oop.inherits(Mode, TextMode);
+
+var indenter = /(?:[({[=:]|[-=]>|\b(?:else|try|with))\s*$/;
+
+(function() {
+
+ this.toggleCommentLines = function(state, doc, startRow, endRow) {
+ var i, line;
+ var outdent = true;
+ var re = /^\s*\(\*(.*)\*\)/;
+
+ for (i=startRow; i<= endRow; i++) {
+ if (!re.test(doc.getLine(i))) {
+ outdent = false;
+ break;
+ }
+ }
+
+ var range = new Range(0, 0, 0, 0);
+ for (i=startRow; i<= endRow; i++) {
+ line = doc.getLine(i);
+ range.start.row = i;
+ range.end.row = i;
+ range.end.column = line.length;
+
+ doc.replace(range, outdent ? line.match(re)[1] : "(*" + line + "*)");
+ }
+ };
+
+ this.getNextLineIndent = function(state, line, tab) {
+ var indent = this.$getIndent(line);
+ var tokens = this.getTokenizer().getLineTokens(line, state).tokens;
+
+ if (!(tokens.length && tokens[tokens.length - 1].type === 'comment') &&
+ state === 'start' && indenter.test(line))
+ indent += tab;
+ return indent;
+ };
+
+ this.checkOutdent = function(state, line, input) {
+ return this.$outdent.checkOutdent(line, input);
+ };
+
+ this.autoOutdent = function(state, doc, row) {
+ this.$outdent.autoOutdent(doc, row);
+ };
+
+ this.$id = "ace/mode/ocaml";
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+}); (function() {
+ ace.require(["ace/mode/ocaml"], function(m) {
+ if (typeof module == "object" && typeof exports == "object" && module) {
+ module.exports = m;
+ }
+ });
+ })();
+
\ No newline at end of file
diff --git a/static/js/jszip/jszip.min.js b/static/js/jszip/jszip.min.js
new file mode 100644
index 000000000..520db0742
--- /dev/null
+++ b/static/js/jszip/jszip.min.js
@@ -0,0 +1,13 @@
+/*!
+
+JSZip v3.2.1 - A JavaScript class for generating and reading zip files
++ + + +
++ + + +
+
+
+
+
+ Each author follows the syntax:
+ Firstname Lastname <address@email.com>
+ But their email can be omitted:
+ Firstname Lastname <>
+
+
+
+
+
+
+
+
+
+
+
+
+ + + +
++ + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+