Compiler: sourcemap improvements

Author: vouillon

compiler/.depend

@@ -37,11 +37,11 @@ flow.cmx : util.cmx subst.cmx primitive.cmx option.cmx dgraph.cmx code.cmx \
 freevars.cmo : util.cmi option.cmi code.cmi freevars.cmi
 freevars.cmx : util.cmx option.cmx code.cmx freevars.cmi
 generate.cmo : util.cmi subst.cmi primitive.cmi parse_js.cmi parse_info.cmi \
-    option.cmi js_tailcall.cmi js_simpl.cmi javascript.cmi freevars.cmi \
-    code.cmi generate.cmi
+    parse_bytecode.cmi option.cmi js_tailcall.cmi js_simpl.cmi javascript.cmi \
+    freevars.cmi code.cmi generate.cmi
 generate.cmx : util.cmx subst.cmx primitive.cmx parse_js.cmx parse_info.cmx \
-    option.cmx js_tailcall.cmx js_simpl.cmx javascript.cmx freevars.cmx \
-    code.cmx generate.cmi
+    parse_bytecode.cmx option.cmx js_tailcall.cmx js_simpl.cmx javascript.cmx \
+    freevars.cmx code.cmx generate.cmi
 inline.cmo : code.cmi inline.cmi
 inline.cmx : code.cmx inline.cmi
 instr.cmo : util.cmi instr.cmi
@@ -56,10 +56,10 @@ js_assign.cmx : util.cmx option.cmx js_traverse.cmx javascript.cmx code.cmx \
     js_assign.cmi
 js_lexer.cmo : parse_info.cmi js_token.cmi js_lexer.cmi
 js_lexer.cmx : parse_info.cmx js_token.cmx js_lexer.cmi
-js_output.cmo : source_map.cmi pretty_print.cmi parse_info.cmi \
-    parse_bytecode.cmi option.cmi javascript.cmi js_output.cmi
-js_output.cmx : source_map.cmx pretty_print.cmx parse_info.cmx \
-    parse_bytecode.cmx option.cmx javascript.cmx js_output.cmi
+js_output.cmo : source_map.cmi pretty_print.cmi parse_info.cmi option.cmi \
+    javascript.cmi js_output.cmi
+js_output.cmx : source_map.cmx pretty_print.cmx parse_info.cmx option.cmx \
+    javascript.cmx js_output.cmi
 js_parser.cmo : parse_info.cmi js_token.cmi javascript.cmi js_parser.cmi
 js_parser.cmx : parse_info.cmx js_token.cmx javascript.cmx js_parser.cmi
 js_simpl.cmo : javascript.cmi code.cmi js_simpl.cmi
@@ -135,22 +135,21 @@ driver.cmi : source_map.cmi pretty_print.cmi parse_bytecode.cmi code.cmi
 eval.cmi : flow.cmi code.cmi
 flow.cmi : code.cmi
 freevars.cmi : util.cmi code.cmi
-generate.cmi : javascript.cmi code.cmi
+generate.cmi : parse_bytecode.cmi javascript.cmi code.cmi
 inline.cmi : code.cmi
 instr.cmi :
 javascript.cmi : parse_info.cmi code.cmi
 js_assign.cmi : javascript.cmi
 js_lexer.cmi : parse_info.cmi js_token.cmi
-js_output.cmi : source_map.cmi pretty_print.cmi parse_bytecode.cmi \
-    javascript.cmi
+js_output.cmi : source_map.cmi pretty_print.cmi javascript.cmi
 js_parser.cmi : js_token.cmi javascript.cmi
 js_simpl.cmi : javascript.cmi code.cmi
 js_tailcall.cmi : js_traverse.cmi javascript.cmi code.cmi
 js_token.cmi : parse_info.cmi
 js_traverse.cmi : util.cmi javascript.cmi code.cmi
 linker.cmi : util.cmi primitive.cmi parse_info.cmi javascript.cmi
 option.cmi :
-parse_bytecode.cmi : util.cmi parse_info.cmi javascript.cmi code.cmi
+parse_bytecode.cmi : util.cmi parse_info.cmi code.cmi
 parse_info.cmi :
 parse_js.cmi : parse_info.cmi js_token.cmi javascript.cmi
 phisimpl.cmi : code.cmi

compiler/Makefile

@@ -16,7 +16,7 @@ OBJS=compiler_version.cmx \
      flow.cmx specialize.cmx specialize_js.cmx eval.cmx inline.cmx \
      tailcall.cmx freevars.cmx phisimpl.cmx \
      js_traverse.cmx js_assign.cmx js_tailcall.cmx \
-     linker.cmx generate.cmx parse_bytecode.cmx driver.cmx \
+     linker.cmx parse_bytecode.cmx generate.cmx driver.cmx \
      pseudoFs.cmx
 
 COMPOBJS=$(OBJS) compile.cmx

compiler/driver.ml

@@ -156,10 +156,10 @@ let o3 =
 
 let profile = ref o1
 
-let generate (p,live_vars) =
+let generate d (p,live_vars) =
   if times ()
   then Format.eprintf "Start Generation...@.";
-  Generate.f p live_vars
+  Generate.f p live_vars d
 
 
 let header formatter ~standalone js =
@@ -220,7 +220,8 @@ let gen_missing js missing =
                      Statement(
                        Expression_statement (
                          ECall(EVar (S {name="caml_failwith";var=None}),
-                               [EBin(Plus,EStr(prim,`Utf8),EStr(" not implemented",`Utf8))]),
+                               [EBin(Plus,EStr(prim,`Utf8),
+                                     EStr(" not implemented",`Utf8))], N),
                          N))],N)
                 ),
            N
@@ -337,11 +338,11 @@ let coloring js =
   if times () then Format.eprintf "  coloring: %a@." Util.Timer.print t;
   js
 
-let output formatter ?source_map d js =
+let output formatter ?source_map js =
   let t = Util.Timer.make () in
   if times ()
   then Format.eprintf "Start Writing file...@.";
-  Js_output.program formatter ?source_map d js;
+  Js_output.program formatter ?source_map js;
   if times () then Format.eprintf "  write: %a@." Util.Timer.print t
 
 let pack ~standalone ?(toplevel=false)?(linkall=false) js =
@@ -380,14 +381,14 @@ let pack ~standalone ?(toplevel=false)?(linkall=false) js =
             J.Return_statement(
               Some (J.EVar (J.S {J.name="this";var=None})),
               J.N))
-        ], J.N), []) in
+        ], J.N), [], J.N) in
 
   let js = if standalone then
       let f =
         J.EFun (None, [J.S {J.name = global_object; var=None }], use_strict js,J.N) in
       [J.Statement (
         J.Expression_statement
-          ((J.ECall (f, [global])), J.N))]
+          ((J.ECall (f, [global], J.N)), J.N))]
     else
       let f = J.EFun (None, [J.V (Code.Var.fresh ())], js, J.N) in
       [J.Statement (J.Expression_statement (f, J.N))] in
@@ -427,7 +428,7 @@ let f ?(standalone=true) ?toplevel ?linkall ?source_map formatter d =
   configure formatter >>
   !profile >>
   deadcode' >>
-  generate >>
+  generate d >>
 
   link formatter ~standalone ?linkall >>
 
@@ -437,7 +438,7 @@ let f ?(standalone=true) ?toplevel ?linkall ?source_map formatter d =
 
   check_js ~standalone >>
   header formatter ~standalone >>
-  output formatter ?source_map d
+  output formatter ?source_map
 
 let from_string prims s formatter =
   let (p,d) = Parse_bytecode.from_string prims s in

compiler/driver.mli

@@ -23,7 +23,7 @@ val f :
   ?toplevel:bool ->
   ?linkall:bool ->
   ?source_map:(string * Source_map.t) ->
-  Pretty_print.t -> Parse_bytecode.debug_loc -> Code.program -> unit
+  Pretty_print.t -> Parse_bytecode.Debug.data -> Code.program -> unit
 
 val from_string : string array -> string -> Pretty_print.t -> unit