Open Modules Recursively Correctly

Thomas' commit was nearly there, and his intuition spot on. It seems that trying to update module_code inline with the new module code added to the front resulted in the other created modules being dropped from the list.

OPening a module multiple times may still be an issue (I haven't found a check against mod_gen)

generator/js_of_ast.ml

@@ -334,7 +334,8 @@ and js_of_structure_item ?(mod_gen=[]) old_env s =
     let name = (fun od -> if od.open_override = Fresh then js_of_longident od.open_txt else "") od in
     if name <> "" then
       module_list := name :: !module_list;
-      module_code := (((fun modules -> parse_modules ~mod_gen modules) @@ find_module_path @@ !module_list) @ (!module_code));
+      let new_mod = parse_modules ~mod_gen @@ find_module_path @@ !module_list in
+      module_code := new_mod @ (!module_code);
     "" 
   | Tstr_primitive  _  -> out_of_scope "primitive functions"
   | Tstr_typext     _  -> out_of_scope "type extensions"
@@ -484,9 +485,9 @@ and js_of_pattern ?(mod_gen=[]) pat obj =
 
 let to_javascript typedtree =
   let pre_res = js_of_structure Env.empty typedtree in
-  let mod_code = String.concat "" (List.map L.strip_log_info !module_code) in
-  let logged, unlogged, pre = L.logged_output (mod_code ^ "\n(*logged sep*)\n" ^ pre_res),
-                              L.unlogged_output (mod_code ^ "\n(*unlogged sep*)\n" ^ pre_res),
-                              (mod_code ^ "\n(*pre sep*)" ^ pre_res) in
+  let mod_code = String.concat "\n\n" (List.map L.strip_log_info !module_code) in
+  let logged, unlogged, pre = L.logged_output (mod_code ^ "\n" ^ pre_res),
+                              L.unlogged_output (mod_code ^ "\n" ^ pre_res),
+                              (mod_code ^ "\n" ^ pre_res) in
   (logged, unlogged, pre)
 

generator/main.ml

@@ -41,7 +41,7 @@ let _ =
    let log_output, unlog_output, pre_output =
      match !outputfile with
      | None -> Filename.concat dirname (basename ^ ".log.js"),
-               Filename.concat dirname (basename ^ "unlog.js"),
+               Filename.concat dirname (basename ^ ".unlog.js"),
                Filename.concat dirname (basename ^ ".js.pre")
      | Some f -> f ^ ".log.js", f ^ ".unlog.js", f ^ ".js.pre"
    in