toplevel: clean

Author: hhugo

toplevel/toplevel.ml

@@ -21,7 +21,6 @@
 open Lwt
 open Compiler
 module Html = Dom_html
-module type Dummy = module type of Html5_types
 
 module H = struct
   type 'a t = {
@@ -96,34 +95,16 @@ module H = struct
 
 end
 
-(* load (binary) file from server using a synchronous XMLHttpRequest *)
-let load_from_server (_,suffix) =
-  try
-    let xml = XmlHttpRequest.create () in
-    xml##_open(Js.string "GET", Js.string ("filesys/" ^ suffix), Js._false);
-    xml##send(Js.null);
-    if xml##status = 200 then
-      let resp = xml##responseText in
-      let len = resp##length in
-      let str = String.create len in
-      for i=0 to len-1 do
-        str.[i] <- Char.chr (int_of_float resp##charCodeAt(i) land 0xff)
-      done;
-      Some(str)
-    else
-      None
-  with _ ->
-    None
 #let_default metaocaml = false
 #if metaocaml
 let compiler_name = "MetaOCaml"
 #else
 let compiler_name = "OCaml"
 #endif
 
-let load_resource scheme (_,suffix) =
+(* load file using a synchronous XMLHttpRequest *)
+let load_resource_aux url =
   try
-    let url = Printf.sprintf "%s://%s" scheme suffix in
     let xml = XmlHttpRequest.create () in
     xml##_open(Js.string "GET", Js.string url, Js._false);
     xml##send(Js.null);
@@ -140,9 +121,13 @@ let load_resource scheme (_,suffix) =
   with _ ->
     None
 
+let load_resource scheme (_,suffix) =
+  let url = Printf.sprintf "%s://%s" scheme suffix in
+  load_resource_aux url
+
 let initialize () =
   Sys_js.register_autoload "/dev/" (fun s -> Some "");
-  Sys_js.register_autoload "/" (fun s -> load_from_server s);
+  Sys_js.register_autoload "/" (fun (_,s) -> load_resource_aux ("filesys/" ^ s));
   Sys_js.register_autoload "/http/" (fun s -> load_resource "http" s);
   Sys_js.register_autoload "/https/" (fun s -> load_resource "https" s);
   Sys_js.register_autoload "/ftp/" (fun s -> load_resource "ftp" s);