fix build error

jscomp/core/js_dump_import_export.ml

@@ -95,10 +95,9 @@ let requires require_lit cxt f (modules : (Ident.t * string) list ) =
   (* the context used to print the following program *)  
   let outer_cxt, reversed_list  =
     List.fold_left
-      (fun (cxt, acc, len) (id,s) ->
+      (fun (cxt, acc) (id,s) ->
          let str, cxt = Ext_pp_scope.str_of_ident cxt id  in
          cxt, ((str,s) :: acc))
-      )
       (cxt, []) modules in
   P.force_newline f ;    
   Ext_list.rev_iter (fun (s,file) ->
@@ -122,10 +121,9 @@ let imports  cxt f (modules : (Ident.t * string) list ) =
   (* the context used to print the following program *)  
   let outer_cxt, reversed_list =
     List.fold_left
-      (fun (cxt, acc, len) (id,s) ->
+      (fun (cxt, acc) (id,s) ->
          let str, cxt = Ext_pp_scope.str_of_ident cxt id  in
          cxt, ((str,s) :: acc))
-      )
       (cxt, []) modules in
   P.force_newline f ;    
   Ext_list.rev_iter (fun (s,file) ->

jscomp/test/a_filename_test.js

@@ -1,8 +1,8 @@
 'use strict';
 
-var Mt                = require("./mt.js");
-var $$Array           = require("../../lib/js/array.js");
-var Block             = require("../../lib/js/block.js");
+var Mt = require("./mt.js");
+var $$Array = require("../../lib/js/array.js");
+var Block = require("../../lib/js/block.js");
 var Ext_filename_test = require("./ext_filename_test.js");
 
 var suites = [/* [] */0];
@@ -128,8 +128,8 @@ eq("File \"a_filename_test.ml\", line 73, characters 5-12", $$Array.map(Ext_file
 
 Mt.from_pair_suites("a_filename_test.ml", suites[0]);
 
-exports.suites  = suites;
+exports.suites = suites;
 exports.test_id = test_id;
-exports.eq      = eq;
-exports.test    = test;
+exports.eq = eq;
+exports.test = test;
 /*  Not a pure module */

jscomp/test/a_list_test.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var Mt            = require("./mt.js");
-var Block         = require("../../lib/js/block.js");
+var Mt = require("./mt.js");
+var Block = require("../../lib/js/block.js");
 var Ext_list_test = require("./ext_list_test.js");
 
 var suites_000 = /* tuple */[

jscomp/test/a_recursive_type.js

@@ -12,6 +12,6 @@ var x = /* A */[g];
 
 var non_terminate = g(x);
 
-exports.loop          = loop;
+exports.loop = loop;
 exports.non_terminate = non_terminate;
 /* loop Not a pure module */

jscomp/test/a_scope_bug.js

@@ -16,6 +16,6 @@ function odd(_z) {
 
 var even = odd;
 
-exports.odd  = odd;
+exports.odd = odd;
 exports.even = even;
 /* No side effect */

jscomp/test/a_string_test.js

@@ -1,8 +1,8 @@
 'use strict';
 
-var Mt              = require("./mt.js");
-var List            = require("../../lib/js/list.js");
-var Block           = require("../../lib/js/block.js");
+var Mt = require("./mt.js");
+var List = require("../../lib/js/list.js");
+var Block = require("../../lib/js/block.js");
 var Ext_string_test = require("./ext_string_test.js");
 
 var suites_000 = /* tuple */[
@@ -116,7 +116,7 @@ var split = Ext_string_test.split;
 
 var split_by = Ext_string_test.split_by;
 
-exports.split    = split;
+exports.split = split;
 exports.split_by = split_by;
-exports.suites   = suites;
+exports.suites = suites;
 /*  Not a pure module */

jscomp/test/adt_optimize_test.js

@@ -169,16 +169,16 @@ function f11(x) {
   }
 }
 
-exports.f   = f;
+exports.f = f;
 exports.f_0 = f_0;
-exports.f2  = f2;
-exports.f3  = f3;
-exports.f4  = f4;
-exports.f5  = f5;
-exports.f6  = f6;
-exports.f7  = f7;
-exports.f8  = f8;
-exports.f9  = f9;
+exports.f2 = f2;
+exports.f3 = f3;
+exports.f4 = f4;
+exports.f5 = f5;
+exports.f6 = f6;
+exports.f7 = f7;
+exports.f8 = f8;
+exports.f9 = f9;
 exports.f10 = f10;
 exports.f11 = f11;
 /* No side effect */

jscomp/test/alias_test.js

@@ -20,7 +20,7 @@ var b15 = 111;
 exports.a15 = a15;
 exports.b15 = b15;
 exports.a21 = a21;
-exports.v   = v;
+exports.v = v;
 exports.a23 = a23;
-exports.ff  = ff;
+exports.ff = ff;
 /* a23 Not a pure module */

jscomp/test/and_or_tailcall_test.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Mt    = require("./mt.js");
+var Mt = require("./mt.js");
 var Block = require("../../lib/js/block.js");
 
 function f(b, _, _n) {
@@ -63,7 +63,7 @@ var suites = /* :: */[
 
 Mt.from_pair_suites("and_or_tailcall_test.ml", suites);
 
-exports.f      = f;
-exports.or_f   = or_f;
+exports.f = f;
+exports.or_f = or_f;
 exports.suites = suites;
 /*  Not a pure module */

jscomp/test/app_root_finder.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var Fs                      = require("fs");
-var Path                    = require("path");
+var Fs = require("fs");
+var Path = require("path");
 var Caml_builtin_exceptions = require("../../lib/js/caml_builtin_exceptions.js");
 
 var package_json = "package.json";
@@ -30,6 +30,6 @@ if (match !== undefined) {
   console.log(find_package_json(match));
 }
 
-exports.package_json      = package_json;
+exports.package_json = package_json;
 exports.find_package_json = find_package_json;
 /* match Not a pure module */

jscomp/test/argv_test.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Arg   = require("../../lib/js/arg.js");
+var Arg = require("../../lib/js/arg.js");
 var Block = require("../../lib/js/block.js");
 
 function anno_fun() {
@@ -35,9 +35,9 @@ var arg_spec = /* :: */[
 
 Arg.parse(arg_spec, anno_fun, usage_msg);
 
-exports.anno_fun  = anno_fun;
+exports.anno_fun = anno_fun;
 exports.usage_msg = usage_msg;
-exports.compile   = compile;
-exports.test      = test;
-exports.arg_spec  = arg_spec;
+exports.compile = compile;
+exports.test = test;
+exports.arg_spec = arg_spec;
 /*  Not a pure module */

jscomp/test/ari_regress_test.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Mt    = require("./mt.js");
+var Mt = require("./mt.js");
 var Block = require("../../lib/js/block.js");
 var Curry = require("../../lib/js/curry.js");
 

jscomp/test/arith_lexer.js

@@ -1,9 +1,9 @@
 'use strict';
 
-var Block       = require("../../lib/js/block.js");
-var Curry       = require("../../lib/js/curry.js");
-var Lexing      = require("../../lib/js/lexing.js");
-var Pervasives  = require("../../lib/js/pervasives.js");
+var Block = require("../../lib/js/block.js");
+var Curry = require("../../lib/js/curry.js");
+var Lexing = require("../../lib/js/lexing.js");
+var Pervasives = require("../../lib/js/pervasives.js");
 var Caml_format = require("../../lib/js/caml_format.js");
 
 var __ocaml_lex_tables = /* record */[
@@ -82,8 +82,8 @@ function str(e) {
   }
 }
 
-exports.__ocaml_lex_tables     = __ocaml_lex_tables;
-exports.lexeme                 = lexeme;
+exports.__ocaml_lex_tables = __ocaml_lex_tables;
+exports.lexeme = lexeme;
 exports.__ocaml_lex_lexeme_rec = __ocaml_lex_lexeme_rec;
-exports.str                    = str;
+exports.str = str;
 /* No side effect */

jscomp/test/arith_parser.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var Block                   = require("../../lib/js/block.js");
-var Parsing                 = require("../../lib/js/parsing.js");
+var Block = require("../../lib/js/block.js");
+var Parsing = require("../../lib/js/parsing.js");
 var Caml_builtin_exceptions = require("../../lib/js/caml_builtin_exceptions.js");
 
 var yytransl_const = /* array */[
@@ -136,19 +136,19 @@ var yytablesize = 272;
 
 exports.yytransl_const = yytransl_const;
 exports.yytransl_block = yytransl_block;
-exports.yylhs          = yylhs;
-exports.yylen          = yylen;
-exports.yydefred       = yydefred;
-exports.yydgoto        = yydgoto;
-exports.yysindex       = yysindex;
-exports.yyrindex       = yyrindex;
-exports.yygindex       = yygindex;
-exports.yytablesize    = yytablesize;
-exports.yytable        = yytable;
-exports.yycheck        = yycheck;
-exports.yynames_const  = yynames_const;
-exports.yynames_block  = yynames_block;
-exports.yyact          = yyact;
-exports.yytables       = yytables;
-exports.toplevel       = toplevel;
+exports.yylhs = yylhs;
+exports.yylen = yylen;
+exports.yydefred = yydefred;
+exports.yydgoto = yydgoto;
+exports.yysindex = yysindex;
+exports.yyrindex = yyrindex;
+exports.yygindex = yygindex;
+exports.yytablesize = yytablesize;
+exports.yytable = yytable;
+exports.yycheck = yycheck;
+exports.yynames_const = yynames_const;
+exports.yynames_block = yynames_block;
+exports.yyact = yyact;
+exports.yytables = yytables;
+exports.toplevel = toplevel;
 /* No side effect */

jscomp/test/arity_deopt.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Mt    = require("./mt.js");
+var Mt = require("./mt.js");
 var Block = require("../../lib/js/block.js");
 var Curry = require("../../lib/js/curry.js");
 
@@ -61,11 +61,11 @@ eq("File \"arity_deopt.ml\", line 48, characters 15-22", 6, (function (y, z) {
 
 Mt.from_pair_suites("arity_deopt.ml", suites[0]);
 
-exports.suites  = suites;
+exports.suites = suites;
 exports.test_id = test_id;
-exports.eq      = eq;
-exports.f0      = f0;
-exports.f1      = f1;
-exports.f2      = f2;
-exports.f3      = f3;
+exports.eq = eq;
+exports.f0 = f0;
+exports.f1 = f1;
+exports.f2 = f2;
+exports.f3 = f3;
 /*  Not a pure module */

jscomp/test/array_data_util.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var $$Array  = require("../../lib/js/array.js");
+var $$Array = require("../../lib/js/array.js");
 var Bs_Array = require("../../lib/js/bs_Array.js");
 
 function range(i, j) {
@@ -17,6 +17,6 @@ function randomRange(i, j) {
   return v;
 }
 
-exports.range       = range;
+exports.range = range;
 exports.randomRange = randomRange;
 /* No side effect */

jscomp/test/array_subtle_test.js

@@ -1,8 +1,8 @@
 'use strict';
 
-var Mt           = require("./mt.js");
-var Block        = require("../../lib/js/block.js");
-var Caml_array   = require("../../lib/js/caml_array.js");
+var Mt = require("./mt.js");
+var Block = require("../../lib/js/block.js");
+var Caml_array = require("../../lib/js/caml_array.js");
 var Js_primitive = require("../../lib/js/js_primitive.js");
 
 var suites = [/* [] */0];
@@ -78,8 +78,8 @@ eq("File \"array_subtle_test.ml\", line 29, characters 5-12", /* tuple */[
 
 Mt.from_pair_suites("array_subtle_test.ml", suites[0]);
 
-exports.suites  = suites;
+exports.suites = suites;
 exports.test_id = test_id;
-exports.eq      = eq;
-exports.v       = v;
+exports.eq = eq;
+exports.v = v;
 /*  Not a pure module */

jscomp/test/array_test.js

@@ -1,11 +1,11 @@
 'use strict';
 
-var Mt             = require("./mt.js");
-var List           = require("../../lib/js/list.js");
-var $$Array        = require("../../lib/js/array.js");
-var Block          = require("../../lib/js/block.js");
-var Caml_obj       = require("../../lib/js/caml_obj.js");
-var Caml_array     = require("../../lib/js/caml_array.js");
+var Mt = require("./mt.js");
+var List = require("../../lib/js/list.js");
+var $$Array = require("../../lib/js/array.js");
+var Block = require("../../lib/js/block.js");
+var Caml_obj = require("../../lib/js/caml_obj.js");
+var Caml_array = require("../../lib/js/caml_array.js");
 var Caml_primitive = require("../../lib/js/caml_primitive.js");
 
 function is_sorted(x) {