Merge pull request #48 from jbdoderlein/dev

New toplevel access

Author: jbdoderlein

src/js/editor_change.js

@@ -12,27 +12,17 @@ const buttons =document.getElementById("menu-button");
 var MOBILE = false;
 
 
-function parse(str, editor) {
-    let textarea = document.getElementById('userinput');
+function parse(str) {
     let cmd = str.split(';;\n');
-    const ke = new KeyboardEvent("keydown", {bubbles: true, cancelable: true, keyCode: 13});
     for (let i = 0; i < cmd.length; i++) {
         if (!cmd[i].endsWith(';;')) cmd[i] += ';;';
-        textarea.value = cmd[i];
-        textarea.dispatchEvent(ke);
-    }
-    if (editor != null) {
-        setTimeout(function () {
-            editor.focus();
-        }, 5);
+        executecallback.execute("toplevel", cmd[i]);
     }
 }
 
 function reset_ocaml() {
-    document.getElementById('output').innerHTML = ''
-    let textarea = document.getElementById('userinput');
-    const ke = new KeyboardEvent("keydown", {bubbles: true, cancelable: true, ctrlKey: true, keyCode: 75});
-    textarea.dispatchEvent(ke);
+    document.getElementById('output').innerHTML = '';
+    toplevelcallback.setup();
 }
 
 function changefontsize(id, a) {

toplevel_build/compile.sh

@@ -49,38 +49,38 @@
 
 Build_Toplevel () {
     BUILD_VERSION=$1
-    
+
     cd js_of_ocaml/toplevel/examples/lwt_toplevel
-    
+
     # Check if OCaml version $BUILD_VERSION is installed
     if [[ -d ~/.opam/$BUILD_VERSION ]]; then
         VERSION_ALREADY_INSTALLED=true
     else
         VERSION_ALREADY_INSTALLED=false
     fi
-    
+
     # Switch to OCaml version $BUILD_VERSION
     if [[ $VERSION_ALREADY_INSTALLED = true ]]; then
         opam switch $BUILD_VERSION
     else
         echo "Installing OCaml version $BUILD_VERSION ..."
         opam switch create $BUILD_VERSION
     fi
-    
+
     # Install dependencies
     echo "Installing dependencies ..."
     eval $(opam env)
     opam install --yes tyxml ocp-indent higlo cohttp lwt tyxml reactiveData yojson graphics menhirLib cmdliner ppxlib react menhir dune
     eval $(opam env)
-    
+
     # Build
     echo "Building toplevel-$BUILD_VERSION.js ..."
     dune clean
     dune build
-    
+
     # Remove OCaml version $BUILD_VERSION if it wasn't previously installed
     [[ $VERSION_ALREADY_INSTALLED = false && $KEEP = false ]] && opam switch remove --yes $BUILD_VERSION
-    
+
     # Save build
     cd ../../../..
     [[ ! -d "$OUTPUT_DIR" ]] && mkdir -p "$OUTPUT_DIR"

toplevel_build/dune

@@ -80,6 +80,7 @@
          --file %{dep:test_dynlink.js}
          --export %{dep:export.txt}
          --toplevel
+         --opt 3
          --disable shortvar
          --disable genprim
          +base/runtime.js

toplevel_build/toplevel.ml

@@ -163,6 +163,9 @@ let highlight_location loc =
 let append colorize output cl s =
   Dom.appendChild output (Tyxml_js.To_dom.of_element (colorize ~a_class:cl s))
 
+let append_to_console s =
+  Firebug.console##log (Js.string s)
+
 module History = struct
   let data = ref [| "" |]
 
@@ -221,6 +224,12 @@ let run _ =
   let sharp_ppf = Format.formatter_of_out_channel sharp_chan in
   let caml_chan = open_out "/dev/null1" in
   let caml_ppf = Format.formatter_of_out_channel caml_chan in
+  let binsharp_chan = open_out "/dev/null2" in
+  let binsharp_ppf = Format.formatter_of_out_channel binsharp_chan in
+  let bincaml_chan = open_out "/dev/null3" in
+  let bincaml_ppf = Format.formatter_of_out_channel bincaml_chan in
+  let consolecaml_chan = open_out "/dev/null3" in
+  let consolecaml_ppf = Format.formatter_of_out_channel consolecaml_chan in
   let execute () =
     let content = Js.to_string textbox##.value##trim in
     let content' =
@@ -240,9 +249,28 @@ let run _ =
     resize ~container ~textbox ()
     >>= fun () ->
     container##.scrollTop := container##.scrollHeight;
-    textbox##focus;
     Lwt.return_unit
   in
+  let execute_callback mode content =
+      let content' =
+        let len = String.length content in
+        if try content <> "" && content.[len - 1] <> ';' && content.[len - 2] <> ';'
+           with _ -> true
+        then content ^ ";;"
+        else if try content <> "" && content.[len - 1] = ';' && content.[len - 2] <> ';'
+           with _ -> true
+        then content ^ ";"
+        else content
+      in match mode with
+      |"internal" -> JsooTop.execute true ~pp_code:binsharp_ppf ~highlight_location bincaml_ppf content'
+      |"console" -> JsooTop.execute true ~pp_code:binsharp_ppf ~highlight_location consolecaml_ppf content'
+      |"toplevel" -> (
+          current_position := output##.childNodes##.length;
+          History.push content;
+          JsooTop.execute true ~pp_code:sharp_ppf ~highlight_location caml_ppf content';
+      )
+      |_ -> ()
+  in
   let history_down _e =
     let txt = Js.to_string textbox##.value in
     let pos = textbox##.selectionStart in
@@ -317,6 +345,7 @@ let run _ =
   Sys_js.set_channel_flusher sharp_chan (append Colorize.ocaml output "sharp");
   Sys_js.set_channel_flusher stdout (append Colorize.text output "stdout");
   Sys_js.set_channel_flusher stderr (append Colorize.text output "stderr");
+  Sys_js.set_channel_flusher consolecaml_chan append_to_console;
   let readline () =
     Js.Opt.case
       (Dom_html.window##prompt (Js.string "The toplevel expects inputs:") (Js.string ""))
@@ -329,6 +358,11 @@ let run _ =
   setup_printers ();
   History.setup ();
   textbox##.value := Js.string "";
+  (* Add callback*)
+  Js.Unsafe.global##.executecallback := (object%js
+        val execute = Js.wrap_meth_callback
+            (fun _ mode content -> execute_callback (Js.to_string mode) (Js.to_string content))
+      end);
   (* Run initial code if any *)
   try
     let code = List.assoc "code" (parse_hash ()) in
@@ -342,8 +376,16 @@ let run _ =
         (Js.string (Printexc.to_string exc))
         exc
 
+
+
 let _ =
   Dom_html.window##.onload :=
     Dom_html.handler (fun _ ->
         run ();
-        Js._false)
+        Js._false);
+  Js.Unsafe.global##.toplevelcallback := (object%js
+      val setup_toplevel = Js.wrap_meth_callback
+          (fun () -> setup_toplevel ())
+      val reset_toplevel = Js.wrap_meth_callback
+          (fun () -> run ())
+    end)