diff --git a/Changes.md b/Changes.md index 7d4160bd9b..2ded335ae7 100644 --- a/Changes.md +++ b/Changes.md @@ -45,6 +45,8 @@ Unreleased - melange: remove the `--bs-jsx ` flag from `melc` now that `reactjs-jsx-ppx` is a separate package ([#525](https://github.com/melange-re/melange/pull/525)) +- melange: add `melpp` executable to preprocess `#if` conditionals with the + melange parser ([#539](https://github.com/melange-re/melange/pull/539)) 0.3.2 2022-11-19 --------------- diff --git a/flake.lock b/flake.lock index c3957503b4..2a3c07be14 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1680946745, + "narHash": "sha256-KqGlwg9UTDsFBZZB8wzXgMnc8XQm95LtSbFvBsnqkPI=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "946da791763db1c306b86a8bd3828bf5814a1247", "type": "github" }, "original": { @@ -61,11 +61,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1679532432, - "narHash": "sha256-Ijg1tlU4Zm8P2Y4iCt9VnY7ztoREa7HxJhO1jXTXE9s=", + "lastModified": 1680981190, + "narHash": "sha256-3lpKzwVskEnWyXad85oVBQWbpZnKQIodvtdoZesY3YU=", "owner": "nix-ocaml", "repo": "nix-overlays", - "rev": "6627e92a9a2f7f66210c240defe5adab76d8050b", + "rev": "14b834a3394ecef30c9687c7361a9538dbc3d1d3", "type": "github" }, "original": { @@ -76,17 +76,17 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1679457459, - "narHash": "sha256-2CbdQtEHH6G010dj9Y1C9sxDD9Rjs/Rfpg4WL4hb3TI=", + "lastModified": 1680937900, + "narHash": "sha256-dUZdImCkXZWNOxd9sK46nKRtdyFieLAqd0kYh6Iq1n0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c2111b6f27d057ab227e7a1341ea750c0cc76b7f", + "rev": "db63a705b9100696f6d27dfe2c14e7be6e184497", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "c2111b6f27d057ab227e7a1341ea750c0cc76b7f", + "rev": "db63a705b9100696f6d27dfe2c14e7be6e184497", "type": "github" } }, diff --git a/jscomp/main/dune b/jscomp/main/dune index 2dd8b59a9e..d059a77833 100644 --- a/jscomp/main/dune +++ b/jscomp/main/dune @@ -10,6 +10,14 @@ (action (run cppo %{env:CPPO_FLAGS=} %{input-file})))) +(executable + (public_name melpp) + (package melange) + (modes native) + (modules melpp) + (flags :standard -open Melange_compiler_libs) + (libraries common core cmdliner melange-compiler-libs)) + (executable (public_name mel) (package mel) diff --git a/jscomp/main/melc.ml b/jscomp/main/melc.ml index d529b7766b..ae4de53426 100644 --- a/jscomp/main/melc.ml +++ b/jscomp/main/melc.ml @@ -396,7 +396,7 @@ let file_level_flags_handler (e : Parsetree.expression option) = | Some e -> Location.raise_errorf ~loc:e.pexp_loc "string array expected" -let _ : unit = +let () = Bs_conditional_initial.setup_env (); let flags = "flags" in Ast_config.add_structure diff --git a/jscomp/main/melpp.ml b/jscomp/main/melpp.ml new file mode 100644 index 0000000000..4756ef352a --- /dev/null +++ b/jscomp/main/melpp.ml @@ -0,0 +1,112 @@ +(* Copyright (C) 2023- Authors of Melange + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * In addition to the permissions granted to you by the LGPL, you may combine + * or link a "work that uses the Library" with a publicly distributed version + * of this file to produce a combined library or application, then distribute + * that combined work under the terms of your choosing, with no requirement + * to comply with the obligations normally placed on you by section 4 of the + * LGPL version 3 (or the corresponding section of a later version of the LGPL + * should you choose to use a later version). + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *) + +let output_deps_set name set = + output_string stdout name; + output_string stdout ": "; + Depend.String.Set.iter + (fun s -> + if s <> "" && s.[0] <> '*' then ( + output_string stdout s; + output_string stdout " ")) + set; + output_string stdout "\n" + +let after_parsing_sig ast = + Ast_config.iter_on_bs_config_sigi ast; + if !Js_config.modules then + output_deps_set !Location.input_name + (Ast_extract.read_parse_and_extract Mli ast); + output_string stdout Config.ast_intf_magic_number; + output_value stdout (!Location.input_name : string); + output_value stdout ast + +let after_parsing_impl (ast : Parsetree.structure) = + Ast_config.iter_on_bs_config_stru ast; + if !Js_config.modules then + output_deps_set !Location.input_name + (Ast_extract.read_parse_and_extract Ml ast); + output_string stdout Config.ast_impl_magic_number; + output_value stdout (!Location.input_name : string); + output_value stdout ast + +let define_variable s = + let module Pp = Rescript_cpp in + match Ext_string.split ~keep_empty:true s '=' with + | [ key; v ] -> + if not (Pp.define_key_value key v) then + raise (Arg.Bad ("illegal definition: " ^ s)) + | _ -> raise (Arg.Bad ("illegal definition: " ^ s)) + +let main = + let main interface defines unsafe filename = + Ext_list.iter defines define_variable; + if unsafe then Clflags.unsafe := unsafe; + match + ( interface, + Ext_file_extensions.classify_input + (Ext_filename.get_extension_maybe filename) ) + with + | true, _ | _, Mli -> + Pparse_driver.parse_interface filename |> after_parsing_sig + | _, Ml -> Pparse_driver.parse_implementation filename |> after_parsing_impl + | _, _ -> assert false + in + fun interface defines unsafe filename -> + try `Ok (main interface defines unsafe filename) with + | Arg.Bad msg -> `Error (false, msg) + | x -> + Location.report_exception Format.err_formatter x; + exit 2 + +module Cli = struct + open Cmdliner + + let interface = + let docv = "interface" in + Arg.(value & flag & info [ "i"; "interface" ] ~docv) + + let defines = + let doc = "Define conditional variable e.g, -D DEBUG=true" in + Arg.(value & opt_all string [] & info [ "D" ] ~doc) + + let unsafe = + let doc = "Do not compile bounds checking on array and string access" in + Arg.(value & flag & info [ "unsafe" ] ~doc) + + let filename = + let docv = "filename" in + Arg.(required & pos 0 (some' string) None & info [] ~docv) + + let cmd = + let open Cmdliner in + let term = Term.(const main $ interface $ defines $ unsafe $ filename) in + let info = Cmd.info "melpp" in + Cmd.v info (Term.ret term) +end + +let () = + Bs_conditional_initial.setup_env (); + let argv = Ext_cli_args.normalize_argv Sys.argv in + exit (Cmdliner.Cmd.eval ~argv Cli.cmd) diff --git a/jscomp/test/dist-es6/jscomp/test/es6_tests/es6_module_test.mjs b/jscomp/test/dist-es6/jscomp/test/es6_tests/es6_module_test.mjs index c7295adbdf..34760b6313 100644 --- a/jscomp/test/dist-es6/jscomp/test/es6_tests/es6_module_test.mjs +++ b/jscomp/test/dist-es6/jscomp/test/es6_tests/es6_module_test.mjs @@ -1,7 +1,7 @@ // Generated by Melange import * as Mt from "../mt.mjs"; -import * as Stdlib__List from "melange/stdlib_modules/list.mjs"; +import * as Stdlib__List from "melange/./list.mjs"; function length(param) { return 3; diff --git a/jscomp/test/dist-es6/jscomp/test/mt.mjs b/jscomp/test/dist-es6/jscomp/test/mt.mjs index 816fbc8b97..b458930d37 100644 --- a/jscomp/test/dist-es6/jscomp/test/mt.mjs +++ b/jscomp/test/dist-es6/jscomp/test/mt.mjs @@ -4,8 +4,8 @@ import * as Path from "path"; import * as Curry from "melange.runtime/curry.mjs"; import * as Assert from "assert"; import * as Process from "process"; -import * as Stdlib__List from "melange/stdlib_modules/list.mjs"; -import * as Stdlib__Array from "melange/stdlib_modules/array.mjs"; +import * as Stdlib__List from "melange/./list.mjs"; +import * as Stdlib__Array from "melange/./array.mjs"; function assert_fail(msg) { Assert.fail(undefined, undefined, msg, ""); diff --git a/jscomp/test/dist/jscomp/test/a_filename_test.js b/jscomp/test/dist/jscomp/test/a_filename_test.js index 1a30290966..2ee2ec21a2 100644 --- a/jscomp/test/dist/jscomp/test/a_filename_test.js +++ b/jscomp/test/dist/jscomp/test/a_filename_test.js @@ -2,7 +2,7 @@ 'use strict'; var Mt = require("./mt.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); +var Stdlib__Array = require("melange/./array.js"); var Ext_filename_test = require("./ext_filename_test.js"); var suites = { diff --git a/jscomp/test/dist/jscomp/test/a_string_test.js b/jscomp/test/dist/jscomp/test/a_string_test.js index 8f7ffd94eb..cba574b658 100644 --- a/jscomp/test/dist/jscomp/test/a_string_test.js +++ b/jscomp/test/dist/jscomp/test/a_string_test.js @@ -2,7 +2,7 @@ 'use strict'; var Mt = require("./mt.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); var Ext_string_test = require("./ext_string_test.js"); var suites_0 = [ diff --git a/jscomp/test/dist/jscomp/test/argv_test.js b/jscomp/test/dist/jscomp/test/argv_test.js index 6e1a222cc5..9eebbb57ef 100644 --- a/jscomp/test/dist/jscomp/test/argv_test.js +++ b/jscomp/test/dist/jscomp/test/argv_test.js @@ -1,7 +1,7 @@ // Generated by Melange 'use strict'; -var Stdlib__Arg = require("melange/stdlib_modules/arg.js"); +var Stdlib__Arg = require("melange/./arg.js"); function anno_fun(arg) { diff --git a/jscomp/test/dist/jscomp/test/arith_lexer.js b/jscomp/test/dist/jscomp/test/arith_lexer.js index 73baa966ae..117d5462d0 100644 --- a/jscomp/test/dist/jscomp/test/arith_lexer.js +++ b/jscomp/test/dist/jscomp/test/arith_lexer.js @@ -4,7 +4,7 @@ var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_format = require("melange.runtime/caml_format.js"); -var Stdlib__Lexing = require("melange/stdlib_modules/lexing.js"); +var Stdlib__Lexing = require("melange/./lexing.js"); var __ocaml_lex_tables = { lex_base: "\0\0\xf6\xff\xf7\xff\xf8\xff\xf9\xff\xfa\xff\xfb\xff\xfc\xff:\0\x85\0\xff\xff", diff --git a/jscomp/test/dist/jscomp/test/arith_parser.js b/jscomp/test/dist/jscomp/test/arith_parser.js index 37e7291688..3f097f29db 100644 --- a/jscomp/test/dist/jscomp/test/arith_parser.js +++ b/jscomp/test/dist/jscomp/test/arith_parser.js @@ -1,7 +1,7 @@ // Generated by Melange 'use strict'; -var Stdlib__Parsing = require("melange/stdlib_modules/parsing.js"); +var Stdlib__Parsing = require("melange/./parsing.js"); var yytransl_const = [ 259, diff --git a/jscomp/test/dist/jscomp/test/array_test.js b/jscomp/test/dist/jscomp/test/array_test.js index e0c02b246b..97e958904c 100644 --- a/jscomp/test/dist/jscomp/test/array_test.js +++ b/jscomp/test/dist/jscomp/test/array_test.js @@ -6,8 +6,8 @@ var Caml = require("melange.runtime/caml.js"); var Curry = require("melange.runtime/curry.js"); var Caml_obj = require("melange.runtime/caml_obj.js"); var Caml_array = require("melange.runtime/caml_array.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Array = require("melange/./array.js"); var Caml_exceptions = require("melange.runtime/caml_exceptions.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); diff --git a/jscomp/test/dist/jscomp/test/ast_js_mapper_poly_test.js b/jscomp/test/dist/jscomp/test/ast_js_mapper_poly_test.js index 603ada097f..bdd6e0af43 100644 --- a/jscomp/test/dist/jscomp/test/ast_js_mapper_poly_test.js +++ b/jscomp/test/dist/jscomp/test/ast_js_mapper_poly_test.js @@ -3,7 +3,7 @@ var Mt = require("./mt.js"); var Js_mapperRt = require("melange.belt/./js_mapperRt.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); +var Stdlib__Array = require("melange/./array.js"); var suites = { contents: /* [] */0 diff --git a/jscomp/test/dist/jscomp/test/block_alias_test.js b/jscomp/test/dist/jscomp/test/block_alias_test.js index 58dbcbc565..174a1f1138 100644 --- a/jscomp/test/dist/jscomp/test/block_alias_test.js +++ b/jscomp/test/dist/jscomp/test/block_alias_test.js @@ -3,7 +3,7 @@ var Mt = require("./mt.js"); var Caml_obj = require("melange.runtime/caml_obj.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); var suites = { contents: /* [] */0 diff --git a/jscomp/test/dist/jscomp/test/bs_hashmap_test.js b/jscomp/test/dist/jscomp/test/bs_hashmap_test.js index 0a3aed2cb1..8832957e6a 100644 --- a/jscomp/test/dist/jscomp/test/bs_hashmap_test.js +++ b/jscomp/test/dist/jscomp/test/bs_hashmap_test.js @@ -8,7 +8,7 @@ var Belt_Array = require("melange.belt/./belt_Array.js"); var Belt_HashMap = require("melange.belt/./belt_HashMap.js"); var Belt_SortArray = require("melange.belt/./belt_SortArray.js"); var Array_data_util = require("./array_data_util.js"); -var Stdlib__Hashtbl = require("melange/stdlib_modules/hashtbl.js"); +var Stdlib__Hashtbl = require("melange/./hashtbl.js"); var Belt_internalBucketsType = require("melange.belt/./belt_internalBucketsType.js"); var suites = { diff --git a/jscomp/test/dist/jscomp/test/bs_hashtbl_string_test.js b/jscomp/test/dist/jscomp/test/bs_hashtbl_string_test.js index 246afd8be4..d555124769 100644 --- a/jscomp/test/dist/jscomp/test/bs_hashtbl_string_test.js +++ b/jscomp/test/dist/jscomp/test/bs_hashtbl_string_test.js @@ -7,7 +7,7 @@ var Belt_HashMap = require("melange.belt/./belt_HashMap.js"); var Belt_MapDict = require("melange.belt/./belt_MapDict.js"); var Belt_HashMapInt = require("melange.belt/./belt_HashMapInt.js"); var Belt_HashSetInt = require("melange.belt/./belt_HashSetInt.js"); -var Stdlib__Hashtbl = require("melange/stdlib_modules/hashtbl.js"); +var Stdlib__Hashtbl = require("melange/./hashtbl.js"); var Belt_HashMapString = require("melange.belt/./belt_HashMapString.js"); var Caml_hash_primitive = require("melange.runtime/caml_hash_primitive.js"); var Belt_internalBucketsType = require("melange.belt/./belt_internalBucketsType.js"); diff --git a/jscomp/test/dist/jscomp/test/bs_set_int_test.js b/jscomp/test/dist/jscomp/test/bs_set_int_test.js index 337bad427a..e4599c0b89 100644 --- a/jscomp/test/dist/jscomp/test/bs_set_int_test.js +++ b/jscomp/test/dist/jscomp/test/bs_set_int_test.js @@ -4,8 +4,8 @@ var Mt = require("./mt.js"); var Belt_Array = require("melange.belt/./belt_Array.js"); var Belt_SetInt = require("melange.belt/./belt_SetInt.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Array = require("melange/./array.js"); var Array_data_util = require("./array_data_util.js"); var suites = { diff --git a/jscomp/test/dist/jscomp/test/buffer_test.js b/jscomp/test/dist/jscomp/test/buffer_test.js index c85909f9aa..e83a1f3279 100644 --- a/jscomp/test/dist/jscomp/test/buffer_test.js +++ b/jscomp/test/dist/jscomp/test/buffer_test.js @@ -3,8 +3,8 @@ var Mt = require("./mt.js"); var Caml_bytes = require("melange.runtime/caml_bytes.js"); -var Stdlib__Bytes = require("melange/stdlib_modules/bytes.js"); -var Stdlib__Buffer = require("melange/stdlib_modules/buffer.js"); +var Stdlib__Bytes = require("melange/./bytes.js"); +var Stdlib__Buffer = require("melange/./buffer.js"); var v = "gso"; diff --git a/jscomp/test/dist/jscomp/test/bytes_split_gpr_743_test.js b/jscomp/test/dist/jscomp/test/bytes_split_gpr_743_test.js index 09074a1ead..f5d1d8a3ae 100644 --- a/jscomp/test/dist/jscomp/test/bytes_split_gpr_743_test.js +++ b/jscomp/test/dist/jscomp/test/bytes_split_gpr_743_test.js @@ -3,7 +3,7 @@ var Mt = require("./mt.js"); var Caml_bytes = require("melange.runtime/caml_bytes.js"); -var Stdlib__Bytes = require("melange/stdlib_modules/bytes.js"); +var Stdlib__Bytes = require("melange/./bytes.js"); var suites = { contents: /* [] */0 diff --git a/jscomp/test/dist/jscomp/test/caml_format_test.js b/jscomp/test/dist/jscomp/test/caml_format_test.js index 29b347cffd..64508bdfdf 100644 --- a/jscomp/test/dist/jscomp/test/caml_format_test.js +++ b/jscomp/test/dist/jscomp/test/caml_format_test.js @@ -6,11 +6,11 @@ var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_int64 = require("melange.runtime/caml_int64.js"); var Caml_format = require("melange.runtime/caml_format.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); -var Stdlib__Int64 = require("melange/stdlib_modules/int64.js"); -var Stdlib__Buffer = require("melange/stdlib_modules/buffer.js"); -var Stdlib__Format = require("melange/stdlib_modules/format.js"); -var Stdlib__Printf = require("melange/stdlib_modules/printf.js"); +var Stdlib__Array = require("melange/./array.js"); +var Stdlib__Int64 = require("melange/./int64.js"); +var Stdlib__Buffer = require("melange/./buffer.js"); +var Stdlib__Format = require("melange/./format.js"); +var Stdlib__Printf = require("melange/./printf.js"); var CamlinternalFormatBasics = require("melange/./camlinternalFormatBasics.js"); var of_string = [ diff --git a/jscomp/test/dist/jscomp/test/caml_sys_poly_fill_test.js b/jscomp/test/dist/jscomp/test/caml_sys_poly_fill_test.js index 623369faef..a369f5892e 100644 --- a/jscomp/test/dist/jscomp/test/caml_sys_poly_fill_test.js +++ b/jscomp/test/dist/jscomp/test/caml_sys_poly_fill_test.js @@ -4,7 +4,7 @@ var Mt = require("./mt.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_sys = require("melange.runtime/caml_sys.js"); -var Stdlib__Sys = require("melange/stdlib_modules/sys.js"); +var Stdlib__Sys = require("melange/./sys.js"); var Node_process = require("melange.belt/./node_process.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); diff --git a/jscomp/test/dist/jscomp/test/chn_test.js b/jscomp/test/dist/jscomp/test/chn_test.js index de764484d3..a554941813 100644 --- a/jscomp/test/dist/jscomp/test/chn_test.js +++ b/jscomp/test/dist/jscomp/test/chn_test.js @@ -3,7 +3,7 @@ var Mt = require("./mt.js"); var Caml_string = require("melange.runtime/caml_string.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); +var Stdlib__Array = require("melange/./array.js"); var suites = { contents: /* [] */0 diff --git a/jscomp/test/dist/jscomp/test/class3_test.js b/jscomp/test/dist/jscomp/test/class3_test.js index f87ec9d657..fd733ca2f6 100644 --- a/jscomp/test/dist/jscomp/test/class3_test.js +++ b/jscomp/test/dist/jscomp/test/class3_test.js @@ -5,9 +5,9 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_array = require("melange.runtime/caml_array.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); var Caml_oo_curry = require("melange.runtime/caml_oo_curry.js"); -var CamlinternalOO = require("melange/stdlib_modules/camlinternalOO.js"); +var CamlinternalOO = require("melange/./camlinternalOO.js"); var shared = [ "move", diff --git a/jscomp/test/dist/jscomp/test/class4_test.js b/jscomp/test/dist/jscomp/test/class4_test.js index be3d07691c..98a4de65c0 100644 --- a/jscomp/test/dist/jscomp/test/class4_test.js +++ b/jscomp/test/dist/jscomp/test/class4_test.js @@ -4,7 +4,7 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Caml_oo_curry = require("melange.runtime/caml_oo_curry.js"); -var CamlinternalOO = require("melange/stdlib_modules/camlinternalOO.js"); +var CamlinternalOO = require("melange/./camlinternalOO.js"); var shared = [ "bump", diff --git a/jscomp/test/dist/jscomp/test/class5_test.js b/jscomp/test/dist/jscomp/test/class5_test.js index 06ebf30dbb..d3a6993cf3 100644 --- a/jscomp/test/dist/jscomp/test/class5_test.js +++ b/jscomp/test/dist/jscomp/test/class5_test.js @@ -5,9 +5,9 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_obj = require("melange.runtime/caml_obj.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); var Caml_oo_curry = require("melange.runtime/caml_oo_curry.js"); -var CamlinternalOO = require("melange/stdlib_modules/camlinternalOO.js"); +var CamlinternalOO = require("melange/./camlinternalOO.js"); var shared = [ "move", diff --git a/jscomp/test/dist/jscomp/test/class6_test.js b/jscomp/test/dist/jscomp/test/class6_test.js index 7cff12b37f..d47c1d0ddc 100644 --- a/jscomp/test/dist/jscomp/test/class6_test.js +++ b/jscomp/test/dist/jscomp/test/class6_test.js @@ -7,7 +7,7 @@ var Stdlib = require("melange/./stdlib.js"); var Caml_oo = require("melange.runtime/caml_oo.js"); var Caml_obj = require("melange.runtime/caml_obj.js"); var Caml_oo_curry = require("melange.runtime/caml_oo_curry.js"); -var CamlinternalOO = require("melange/stdlib_modules/camlinternalOO.js"); +var CamlinternalOO = require("melange/./camlinternalOO.js"); var shared = [ "move", diff --git a/jscomp/test/dist/jscomp/test/class7_test.js b/jscomp/test/dist/jscomp/test/class7_test.js index 5adcce4c5d..fc46ad2b36 100644 --- a/jscomp/test/dist/jscomp/test/class7_test.js +++ b/jscomp/test/dist/jscomp/test/class7_test.js @@ -7,7 +7,7 @@ var Caml_oo = require("melange.runtime/caml_oo.js"); var Caml_obj = require("melange.runtime/caml_obj.js"); var Caml_option = require("melange.runtime/caml_option.js"); var Caml_oo_curry = require("melange.runtime/caml_oo_curry.js"); -var CamlinternalOO = require("melange/stdlib_modules/camlinternalOO.js"); +var CamlinternalOO = require("melange/./camlinternalOO.js"); var shared = ["copy"]; diff --git a/jscomp/test/dist/jscomp/test/class8_test.js b/jscomp/test/dist/jscomp/test/class8_test.js index c6a807b706..9a683efb9a 100644 --- a/jscomp/test/dist/jscomp/test/class8_test.js +++ b/jscomp/test/dist/jscomp/test/class8_test.js @@ -6,7 +6,7 @@ var Curry = require("melange.runtime/curry.js"); var Caml_oo = require("melange.runtime/caml_oo.js"); var Caml_obj = require("melange.runtime/caml_obj.js"); var Caml_oo_curry = require("melange.runtime/caml_oo_curry.js"); -var CamlinternalOO = require("melange/stdlib_modules/camlinternalOO.js"); +var CamlinternalOO = require("melange/./camlinternalOO.js"); var shared = ["repr"]; diff --git a/jscomp/test/dist/jscomp/test/class_fib_open_recursion_test.js b/jscomp/test/dist/jscomp/test/class_fib_open_recursion_test.js index 21becbfc53..f9bc487f6e 100644 --- a/jscomp/test/dist/jscomp/test/class_fib_open_recursion_test.js +++ b/jscomp/test/dist/jscomp/test/class_fib_open_recursion_test.js @@ -5,8 +5,8 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_oo_curry = require("melange.runtime/caml_oo_curry.js"); -var CamlinternalOO = require("melange/stdlib_modules/camlinternalOO.js"); -var Stdlib__Hashtbl = require("melange/stdlib_modules/hashtbl.js"); +var CamlinternalOO = require("melange/./camlinternalOO.js"); +var Stdlib__Hashtbl = require("melange/./hashtbl.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); var shared = ["calc"]; diff --git a/jscomp/test/dist/jscomp/test/class_repr.js b/jscomp/test/dist/jscomp/test/class_repr.js index a61a5f008f..21f3a8a2a3 100644 --- a/jscomp/test/dist/jscomp/test/class_repr.js +++ b/jscomp/test/dist/jscomp/test/class_repr.js @@ -4,9 +4,9 @@ var Curry = require("melange.runtime/curry.js"); var Caml_oo = require("melange.runtime/caml_oo.js"); var Caml_obj = require("melange.runtime/caml_obj.js"); -var Stdlib__Sys = require("melange/stdlib_modules/sys.js"); +var Stdlib__Sys = require("melange/./sys.js"); var Caml_oo_curry = require("melange.runtime/caml_oo_curry.js"); -var CamlinternalOO = require("melange/stdlib_modules/camlinternalOO.js"); +var CamlinternalOO = require("melange/./camlinternalOO.js"); var shared = ["get_x"]; diff --git a/jscomp/test/dist/jscomp/test/class_test.js b/jscomp/test/dist/jscomp/test/class_test.js index 9f7c2f7cab..4ba46d0054 100644 --- a/jscomp/test/dist/jscomp/test/class_test.js +++ b/jscomp/test/dist/jscomp/test/class_test.js @@ -4,7 +4,7 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Caml_oo_curry = require("melange.runtime/caml_oo_curry.js"); -var CamlinternalOO = require("melange/stdlib_modules/camlinternalOO.js"); +var CamlinternalOO = require("melange/./camlinternalOO.js"); var shared = [ "move", diff --git a/jscomp/test/dist/jscomp/test/coercion_module_alias_test.js b/jscomp/test/dist/jscomp/test/coercion_module_alias_test.js index ae35035628..9093d96374 100644 --- a/jscomp/test/dist/jscomp/test/coercion_module_alias_test.js +++ b/jscomp/test/dist/jscomp/test/coercion_module_alias_test.js @@ -2,8 +2,8 @@ 'use strict'; var Curry = require("melange.runtime/curry.js"); -var Stdlib__Char = require("melange/stdlib_modules/char.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__Char = require("melange/./char.js"); +var Stdlib__List = require("melange/./list.js"); function l(prim) { console.log(prim); diff --git a/jscomp/test/dist/jscomp/test/complex_if_test.js b/jscomp/test/dist/jscomp/test/complex_if_test.js index 642277f87c..67bb7cd99b 100644 --- a/jscomp/test/dist/jscomp/test/complex_if_test.js +++ b/jscomp/test/dist/jscomp/test/complex_if_test.js @@ -3,7 +3,7 @@ var Mt = require("./mt.js"); var Caml_bytes = require("melange.runtime/caml_bytes.js"); -var Stdlib__Bytes = require("melange/stdlib_modules/bytes.js"); +var Stdlib__Bytes = require("melange/./bytes.js"); function fib(n) { if (n !== 1 && n !== 23) { diff --git a/jscomp/test/dist/jscomp/test/complex_test.js b/jscomp/test/dist/jscomp/test/complex_test.js index 167e2adfd6..cfcb854277 100644 --- a/jscomp/test/dist/jscomp/test/complex_test.js +++ b/jscomp/test/dist/jscomp/test/complex_test.js @@ -2,7 +2,7 @@ 'use strict'; var Mt = require("./mt.js"); -var Stdlib__Complex = require("melange/stdlib_modules/complex.js"); +var Stdlib__Complex = require("melange/./complex.js"); var suites_0 = [ "basic_add", diff --git a/jscomp/test/dist/jscomp/test/cps_test.js b/jscomp/test/dist/jscomp/test/cps_test.js index add1a24e29..66376793fd 100644 --- a/jscomp/test/dist/jscomp/test/cps_test.js +++ b/jscomp/test/dist/jscomp/test/cps_test.js @@ -4,7 +4,7 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Caml_array = require("melange.runtime/caml_array.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); +var Stdlib__Array = require("melange/./array.js"); function test(param) { var v = { diff --git a/jscomp/test/dist/jscomp/test/digest_test.js b/jscomp/test/dist/jscomp/test/digest_test.js index e98fbef5a9..830de679ff 100644 --- a/jscomp/test/dist/jscomp/test/digest_test.js +++ b/jscomp/test/dist/jscomp/test/digest_test.js @@ -6,11 +6,11 @@ var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_array = require("melange.runtime/caml_array.js"); var Caml_bytes = require("melange.runtime/caml_bytes.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); -var Stdlib__Bytes = require("melange/stdlib_modules/bytes.js"); +var Stdlib__Array = require("melange/./array.js"); +var Stdlib__Bytes = require("melange/./bytes.js"); var Ext_array_test = require("./ext_array_test.js"); -var Stdlib__Digest = require("melange/stdlib_modules/digest.js"); -var Stdlib__Printf = require("melange/stdlib_modules/printf.js"); +var Stdlib__Digest = require("melange/./digest.js"); +var Stdlib__Printf = require("melange/./printf.js"); function f(x) { return Stdlib__Digest.to_hex(Stdlib__Digest.string(x)); diff --git a/jscomp/test/dist/jscomp/test/empty_obj.js b/jscomp/test/dist/jscomp/test/empty_obj.js index 3a98bac041..7a58662004 100644 --- a/jscomp/test/dist/jscomp/test/empty_obj.js +++ b/jscomp/test/dist/jscomp/test/empty_obj.js @@ -1,7 +1,7 @@ // Generated by Melange 'use strict'; -var CamlinternalOO = require("melange/stdlib_modules/camlinternalOO.js"); +var CamlinternalOO = require("melange/./camlinternalOO.js"); var $$class = CamlinternalOO.create_table(0); diff --git a/jscomp/test/dist/jscomp/test/equal_exception_test.js b/jscomp/test/dist/jscomp/test/equal_exception_test.js index 67fd974adf..5ef5585f8e 100644 --- a/jscomp/test/dist/jscomp/test/equal_exception_test.js +++ b/jscomp/test/dist/jscomp/test/equal_exception_test.js @@ -5,7 +5,7 @@ var Mt = require("./mt.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_obj = require("melange.runtime/caml_obj.js"); var Caml_bytes = require("melange.runtime/caml_bytes.js"); -var Stdlib__Bytes = require("melange/stdlib_modules/bytes.js"); +var Stdlib__Bytes = require("melange/./bytes.js"); var Caml_exceptions = require("melange.runtime/caml_exceptions.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); diff --git a/jscomp/test/dist/jscomp/test/event_ffi.js b/jscomp/test/dist/jscomp/test/event_ffi.js index c4260a1eea..278cb6eaba 100644 --- a/jscomp/test/dist/jscomp/test/event_ffi.js +++ b/jscomp/test/dist/jscomp/test/event_ffi.js @@ -2,7 +2,7 @@ 'use strict'; var Curry = require("melange.runtime/curry.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); function h0(x) { return x(); diff --git a/jscomp/test/dist/jscomp/test/exception_alias.js b/jscomp/test/dist/jscomp/test/exception_alias.js index 44143bc98f..fec083349e 100644 --- a/jscomp/test/dist/jscomp/test/exception_alias.js +++ b/jscomp/test/dist/jscomp/test/exception_alias.js @@ -2,7 +2,7 @@ 'use strict'; var Stdlib = require("melange/./stdlib.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); var a0 = { RE_EXN_ID: Stdlib.Not_found diff --git a/jscomp/test/dist/jscomp/test/exception_def.js b/jscomp/test/dist/jscomp/test/exception_def.js index 0d3274e1ec..63068a9dcb 100644 --- a/jscomp/test/dist/jscomp/test/exception_def.js +++ b/jscomp/test/dist/jscomp/test/exception_def.js @@ -4,7 +4,7 @@ var Mt = require("./mt.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_exceptions = require("melange.runtime/caml_exceptions.js"); -var Stdlib__Printexc = require("melange/stdlib_modules/printexc.js"); +var Stdlib__Printexc = require("melange/./printexc.js"); var suites = { contents: /* [] */0 diff --git a/jscomp/test/dist/jscomp/test/exception_raise_test.js b/jscomp/test/dist/jscomp/test/exception_raise_test.js index d63cd001bd..29df513d37 100644 --- a/jscomp/test/dist/jscomp/test/exception_raise_test.js +++ b/jscomp/test/dist/jscomp/test/exception_raise_test.js @@ -5,7 +5,7 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Js_exn = require("melange.belt/./js_exn.js"); var Stdlib = require("melange/./stdlib.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); var Caml_exceptions = require("melange.runtime/caml_exceptions.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); diff --git a/jscomp/test/dist/jscomp/test/exception_repr_test.js b/jscomp/test/dist/jscomp/test/exception_repr_test.js index 4c2edbb276..bf452f549b 100644 --- a/jscomp/test/dist/jscomp/test/exception_repr_test.js +++ b/jscomp/test/dist/jscomp/test/exception_repr_test.js @@ -4,9 +4,9 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Exception_def = require("./exception_def.js"); -var Stdlib__Format = require("melange/stdlib_modules/format.js"); +var Stdlib__Format = require("melange/./format.js"); var Caml_exceptions = require("melange.runtime/caml_exceptions.js"); -var Stdlib__Printexc = require("melange/stdlib_modules/printexc.js"); +var Stdlib__Printexc = require("melange/./printexc.js"); var suites = { contents: /* [] */0 diff --git a/jscomp/test/dist/jscomp/test/ext_array_test.js b/jscomp/test/dist/jscomp/test/ext_array_test.js index d02bcb2963..fe46b49d0b 100644 --- a/jscomp/test/dist/jscomp/test/ext_array_test.js +++ b/jscomp/test/dist/jscomp/test/ext_array_test.js @@ -4,8 +4,8 @@ var Curry = require("melange.runtime/curry.js"); var Caml_array = require("melange.runtime/caml_array.js"); var Caml_option = require("melange.runtime/caml_option.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Array = require("melange/./array.js"); function reverse_range(a, i, len) { if (len === 0) { diff --git a/jscomp/test/dist/jscomp/test/ext_bytes_test.js b/jscomp/test/dist/jscomp/test/ext_bytes_test.js index 6757c56f23..2289d63554 100644 --- a/jscomp/test/dist/jscomp/test/ext_bytes_test.js +++ b/jscomp/test/dist/jscomp/test/ext_bytes_test.js @@ -5,8 +5,8 @@ var Mt = require("./mt.js"); var Caml = require("melange.runtime/caml.js"); var Curry = require("melange.runtime/curry.js"); var Caml_bytes = require("melange.runtime/caml_bytes.js"); -var Stdlib__Char = require("melange/stdlib_modules/char.js"); -var Stdlib__Bytes = require("melange/stdlib_modules/bytes.js"); +var Stdlib__Char = require("melange/./char.js"); +var Stdlib__Bytes = require("melange/./bytes.js"); var Caml_exceptions = require("melange.runtime/caml_exceptions.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); diff --git a/jscomp/test/dist/jscomp/test/ext_filename_test.js b/jscomp/test/dist/jscomp/test/ext_filename_test.js index ede67bbf8f..5b7c606576 100644 --- a/jscomp/test/dist/jscomp/test/ext_filename_test.js +++ b/jscomp/test/dist/jscomp/test/ext_filename_test.js @@ -5,15 +5,15 @@ var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_sys = require("melange.runtime/caml_sys.js"); var Caml_bytes = require("melange.runtime/caml_bytes.js"); -var Stdlib__Sys = require("melange/stdlib_modules/sys.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Bytes = require("melange/stdlib_modules/bytes.js"); +var Stdlib__Sys = require("melange/./sys.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Bytes = require("melange/./bytes.js"); var Test_literals = require("./test_literals.js"); -var Stdlib__Format = require("melange/stdlib_modules/format.js"); -var Stdlib__String = require("melange/stdlib_modules/string.js"); +var Stdlib__Format = require("melange/./format.js"); +var Stdlib__String = require("melange/./string.js"); var Ext_string_test = require("./ext_string_test.js"); -var CamlinternalLazy = require("melange/stdlib_modules/camlinternalLazy.js"); -var Stdlib__Filename = require("melange/stdlib_modules/filename.js"); +var CamlinternalLazy = require("melange/./camlinternalLazy.js"); +var Stdlib__Filename = require("melange/./filename.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); var Ext_pervasives_test = require("./ext_pervasives_test.js"); var Caml_external_polyfill = require("melange.runtime/caml_external_polyfill.js"); diff --git a/jscomp/test/dist/jscomp/test/ext_list_test.js b/jscomp/test/dist/jscomp/test/ext_list_test.js index 233218621c..da1519dd66 100644 --- a/jscomp/test/dist/jscomp/test/ext_list_test.js +++ b/jscomp/test/dist/jscomp/test/ext_list_test.js @@ -4,8 +4,8 @@ var Curry = require("melange.runtime/curry.js"); var Caml_obj = require("melange.runtime/caml_obj.js"); var Caml_option = require("melange.runtime/caml_option.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Array = require("melange/./array.js"); var Ext_string_test = require("./ext_string_test.js"); function filter_map(f, _xs) { diff --git a/jscomp/test/dist/jscomp/test/ext_log_test.js b/jscomp/test/dist/jscomp/test/ext_log_test.js index 7de4a09f19..551a88aad3 100644 --- a/jscomp/test/dist/jscomp/test/ext_log_test.js +++ b/jscomp/test/dist/jscomp/test/ext_log_test.js @@ -2,7 +2,7 @@ 'use strict'; var Curry = require("melange.runtime/curry.js"); -var Stdlib__Format = require("melange/stdlib_modules/format.js"); +var Stdlib__Format = require("melange/./format.js"); var CamlinternalFormatBasics = require("melange/./camlinternalFormatBasics.js"); function $caret$caret(param, param$1) { diff --git a/jscomp/test/dist/jscomp/test/ext_pervasives_test.js b/jscomp/test/dist/jscomp/test/ext_pervasives_test.js index 53f42d6f67..64417fb9dc 100644 --- a/jscomp/test/dist/jscomp/test/ext_pervasives_test.js +++ b/jscomp/test/dist/jscomp/test/ext_pervasives_test.js @@ -4,8 +4,8 @@ var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_string = require("melange.runtime/caml_string.js"); -var Stdlib__Arg = require("melange/stdlib_modules/arg.js"); -var Stdlib__Format = require("melange/stdlib_modules/format.js"); +var Stdlib__Arg = require("melange/./arg.js"); +var Stdlib__Format = require("melange/./format.js"); var Caml_exceptions = require("melange.runtime/caml_exceptions.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); diff --git a/jscomp/test/dist/jscomp/test/ext_string_test.js b/jscomp/test/dist/jscomp/test/ext_string_test.js index ed096758e5..0c358b2e06 100644 --- a/jscomp/test/dist/jscomp/test/ext_string_test.js +++ b/jscomp/test/dist/jscomp/test/ext_string_test.js @@ -4,10 +4,10 @@ var Curry = require("melange.runtime/curry.js"); var Caml_bytes = require("melange.runtime/caml_bytes.js"); var Caml_string = require("melange.runtime/caml_string.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Bytes = require("melange/stdlib_modules/bytes.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Bytes = require("melange/./bytes.js"); var Ext_bytes_test = require("./ext_bytes_test.js"); -var Stdlib__String = require("melange/stdlib_modules/string.js"); +var Stdlib__String = require("melange/./string.js"); var Caml_exceptions = require("melange.runtime/caml_exceptions.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); diff --git a/jscomp/test/dist/jscomp/test/ext_sys_test.js b/jscomp/test/dist/jscomp/test/ext_sys_test.js index 191f1d50f8..9d0505a85d 100644 --- a/jscomp/test/dist/jscomp/test/ext_sys_test.js +++ b/jscomp/test/dist/jscomp/test/ext_sys_test.js @@ -1,7 +1,7 @@ // Generated by Melange 'use strict'; -var Stdlib__Sys = require("melange/stdlib_modules/sys.js"); +var Stdlib__Sys = require("melange/./sys.js"); var is_windows_or_cygwin = Stdlib__Sys.win32 || false; diff --git a/jscomp/test/dist/jscomp/test/flexible_array_test.js b/jscomp/test/dist/jscomp/test/flexible_array_test.js index 60c031a15b..279e87885a 100644 --- a/jscomp/test/dist/jscomp/test/flexible_array_test.js +++ b/jscomp/test/dist/jscomp/test/flexible_array_test.js @@ -5,8 +5,8 @@ var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_obj = require("melange.runtime/caml_obj.js"); var Caml_array = require("melange.runtime/caml_array.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); -var Stdlib__Format = require("melange/stdlib_modules/format.js"); +var Stdlib__Array = require("melange/./array.js"); +var Stdlib__Format = require("melange/./format.js"); function sub(_tr, _k) { while(true) { diff --git a/jscomp/test/dist/jscomp/test/float_of_bits_test.js b/jscomp/test/dist/jscomp/test/float_of_bits_test.js index 312275d79d..80656831b1 100644 --- a/jscomp/test/dist/jscomp/test/float_of_bits_test.js +++ b/jscomp/test/dist/jscomp/test/float_of_bits_test.js @@ -6,9 +6,9 @@ var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_float = require("melange.runtime/caml_float.js"); var Caml_int64 = require("melange.runtime/caml_int64.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); -var Stdlib__Printf = require("melange/stdlib_modules/printf.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Array = require("melange/./array.js"); +var Stdlib__Printf = require("melange/./printf.js"); var one_float = [ 1072693248, diff --git a/jscomp/test/dist/jscomp/test/float_test.js b/jscomp/test/dist/jscomp/test/float_test.js index 3623edbe4a..f9c13425aa 100644 --- a/jscomp/test/dist/jscomp/test/float_test.js +++ b/jscomp/test/dist/jscomp/test/float_test.js @@ -8,8 +8,8 @@ var Stdlib = require("melange/./stdlib.js"); var Mt_global = require("./mt_global.js"); var Caml_float = require("melange.runtime/caml_float.js"); var Caml_int64 = require("melange.runtime/caml_int64.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); -var Stdlib__Printf = require("melange/stdlib_modules/printf.js"); +var Stdlib__Array = require("melange/./array.js"); +var Stdlib__Printf = require("melange/./printf.js"); var test_id = { contents: 0 diff --git a/jscomp/test/dist/jscomp/test/flow_parser_reg_test.js b/jscomp/test/dist/jscomp/test/flow_parser_reg_test.js index 8393e545e9..9af6db3924 100644 --- a/jscomp/test/dist/jscomp/test/flow_parser_reg_test.js +++ b/jscomp/test/dist/jscomp/test/flow_parser_reg_test.js @@ -13,18 +13,18 @@ var Caml_bytes = require("melange.runtime/caml_bytes.js"); var Caml_format = require("melange.runtime/caml_format.js"); var Caml_module = require("melange.runtime/caml_module.js"); var Caml_option = require("melange.runtime/caml_option.js"); -var Stdlib__Sys = require("melange/stdlib_modules/sys.js"); -var Stdlib__Char = require("melange/stdlib_modules/char.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); -var Stdlib__Queue = require("melange/stdlib_modules/queue.js"); -var Stdlib__Buffer = require("melange/stdlib_modules/buffer.js"); -var Stdlib__Lexing = require("melange/stdlib_modules/lexing.js"); -var Stdlib__Printf = require("melange/stdlib_modules/printf.js"); -var Stdlib__String = require("melange/stdlib_modules/string.js"); +var Stdlib__Sys = require("melange/./sys.js"); +var Stdlib__Char = require("melange/./char.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Array = require("melange/./array.js"); +var Stdlib__Queue = require("melange/./queue.js"); +var Stdlib__Buffer = require("melange/./buffer.js"); +var Stdlib__Lexing = require("melange/./lexing.js"); +var Stdlib__Printf = require("melange/./printf.js"); +var Stdlib__String = require("melange/./string.js"); var Caml_exceptions = require("melange.runtime/caml_exceptions.js"); -var Stdlib__Hashtbl = require("melange/stdlib_modules/hashtbl.js"); -var Stdlib__Filename = require("melange/stdlib_modules/filename.js"); +var Stdlib__Hashtbl = require("melange/./hashtbl.js"); +var Stdlib__Filename = require("melange/./filename.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); var none = { diff --git a/jscomp/test/dist/jscomp/test/for_loop_test.js b/jscomp/test/dist/jscomp/test/for_loop_test.js index 1c2983abdb..45cd475bee 100644 --- a/jscomp/test/dist/jscomp/test/for_loop_test.js +++ b/jscomp/test/dist/jscomp/test/for_loop_test.js @@ -3,8 +3,8 @@ var Curry = require("melange.runtime/curry.js"); var Caml_array = require("melange.runtime/caml_array.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Array = require("melange/./array.js"); function for_3(x) { var v = { diff --git a/jscomp/test/dist/jscomp/test/format_test.js b/jscomp/test/dist/jscomp/test/format_test.js index 062336e779..a0de4c6fed 100644 --- a/jscomp/test/dist/jscomp/test/format_test.js +++ b/jscomp/test/dist/jscomp/test/format_test.js @@ -5,10 +5,10 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_format = require("melange.runtime/caml_format.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Scanf = require("melange/stdlib_modules/scanf.js"); -var Stdlib__Format = require("melange/stdlib_modules/format.js"); -var Stdlib__Printf = require("melange/stdlib_modules/printf.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Scanf = require("melange/./scanf.js"); +var Stdlib__Format = require("melange/./format.js"); +var Stdlib__Printf = require("melange/./printf.js"); var CamlinternalFormatBasics = require("melange/./camlinternalFormatBasics.js"); var suites = { diff --git a/jscomp/test/dist/jscomp/test/genlex_test.js b/jscomp/test/dist/jscomp/test/genlex_test.js index 07ae5e9158..ce41e86532 100644 --- a/jscomp/test/dist/jscomp/test/genlex_test.js +++ b/jscomp/test/dist/jscomp/test/genlex_test.js @@ -2,9 +2,9 @@ 'use strict'; var Mt = require("./mt.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Genlex = require("melange/stdlib_modules/genlex.js"); -var Stdlib__Stream = require("melange/stdlib_modules/stream.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Genlex = require("melange/./genlex.js"); +var Stdlib__Stream = require("melange/./stream.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); var lexer = Stdlib__Genlex.make_lexer({ diff --git a/jscomp/test/dist/jscomp/test/global_module_alias_test.js b/jscomp/test/dist/jscomp/test/global_module_alias_test.js index 89c379c84d..1ab3514e4b 100644 --- a/jscomp/test/dist/jscomp/test/global_module_alias_test.js +++ b/jscomp/test/dist/jscomp/test/global_module_alias_test.js @@ -3,7 +3,7 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); var suites = { contents: /* [] */0 diff --git a/jscomp/test/dist/jscomp/test/gpr_1154_test.js b/jscomp/test/dist/jscomp/test/gpr_1154_test.js index c4db14305c..0ad815c751 100644 --- a/jscomp/test/dist/jscomp/test/gpr_1154_test.js +++ b/jscomp/test/dist/jscomp/test/gpr_1154_test.js @@ -4,7 +4,7 @@ var Mt = require("./mt.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_int64 = require("melange.runtime/caml_int64.js"); -var Stdlib__Int64 = require("melange/stdlib_modules/int64.js"); +var Stdlib__Int64 = require("melange/./int64.js"); var suites = { contents: /* [] */0 diff --git a/jscomp/test/dist/jscomp/test/gpr_1285_test.js b/jscomp/test/dist/jscomp/test/gpr_1285_test.js index 6d8669fea4..3f35fbb1e2 100644 --- a/jscomp/test/dist/jscomp/test/gpr_1285_test.js +++ b/jscomp/test/dist/jscomp/test/gpr_1285_test.js @@ -4,7 +4,7 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Caml_oo_curry = require("melange.runtime/caml_oo_curry.js"); -var CamlinternalOO = require("melange/stdlib_modules/camlinternalOO.js"); +var CamlinternalOO = require("melange/./camlinternalOO.js"); var suites = { contents: /* [] */0 diff --git a/jscomp/test/dist/jscomp/test/gpr_1409_test.js b/jscomp/test/dist/jscomp/test/gpr_1409_test.js index f56ab09379..5d15b313f1 100644 --- a/jscomp/test/dist/jscomp/test/gpr_1409_test.js +++ b/jscomp/test/dist/jscomp/test/gpr_1409_test.js @@ -5,7 +5,7 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var String_set = require("./string_set.js"); var Caml_option = require("melange.runtime/caml_option.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); +var Stdlib__Array = require("melange/./array.js"); var suites = { contents: /* [] */0 diff --git a/jscomp/test/dist/jscomp/test/gpr_1501_test.js b/jscomp/test/dist/jscomp/test/gpr_1501_test.js index b833f92753..1e242735c3 100644 --- a/jscomp/test/dist/jscomp/test/gpr_1501_test.js +++ b/jscomp/test/dist/jscomp/test/gpr_1501_test.js @@ -4,7 +4,7 @@ var Mt = require("./mt.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_exceptions = require("melange.runtime/caml_exceptions.js"); -var Stdlib__Printexc = require("melange/stdlib_modules/printexc.js"); +var Stdlib__Printexc = require("melange/./printexc.js"); var suites = { contents: /* [] */0 diff --git a/jscomp/test/dist/jscomp/test/gpr_1503_test.js b/jscomp/test/dist/jscomp/test/gpr_1503_test.js index 1356fddc66..90015e1411 100644 --- a/jscomp/test/dist/jscomp/test/gpr_1503_test.js +++ b/jscomp/test/dist/jscomp/test/gpr_1503_test.js @@ -3,7 +3,7 @@ var Mt = require("./mt.js"); var Caml_format = require("melange.runtime/caml_format.js"); -var Stdlib__Int64 = require("melange/stdlib_modules/int64.js"); +var Stdlib__Int64 = require("melange/./int64.js"); var suites = { contents: /* [] */0 diff --git a/jscomp/test/dist/jscomp/test/gpr_1701_test.js b/jscomp/test/dist/jscomp/test/gpr_1701_test.js index dc3d81cf90..f3aa7b721b 100644 --- a/jscomp/test/dist/jscomp/test/gpr_1701_test.js +++ b/jscomp/test/dist/jscomp/test/gpr_1701_test.js @@ -2,7 +2,7 @@ 'use strict'; var Stdlib = require("melange/./stdlib.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); var Caml_exceptions = require("melange.runtime/caml_exceptions.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); diff --git a/jscomp/test/dist/jscomp/test/gpr_2250_test.js b/jscomp/test/dist/jscomp/test/gpr_2250_test.js index 2e49fc8a13..f2358e6683 100644 --- a/jscomp/test/dist/jscomp/test/gpr_2250_test.js +++ b/jscomp/test/dist/jscomp/test/gpr_2250_test.js @@ -4,7 +4,7 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Caml_oo_curry = require("melange.runtime/caml_oo_curry.js"); -var CamlinternalOO = require("melange/stdlib_modules/camlinternalOO.js"); +var CamlinternalOO = require("melange/./camlinternalOO.js"); var suites = { contents: /* [] */0 diff --git a/jscomp/test/dist/jscomp/test/gpr_2608_test.js b/jscomp/test/dist/jscomp/test/gpr_2608_test.js index cf52dd6e22..658e9304ef 100644 --- a/jscomp/test/dist/jscomp/test/gpr_2608_test.js +++ b/jscomp/test/dist/jscomp/test/gpr_2608_test.js @@ -2,7 +2,7 @@ 'use strict'; var Mt = require("./mt.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); var suites = { contents: /* [] */0 diff --git a/jscomp/test/dist/jscomp/test/gpr_2652_test.js b/jscomp/test/dist/jscomp/test/gpr_2652_test.js index 6372d60741..4c187dbaf4 100644 --- a/jscomp/test/dist/jscomp/test/gpr_2652_test.js +++ b/jscomp/test/dist/jscomp/test/gpr_2652_test.js @@ -1,7 +1,7 @@ // Generated by Melange 'use strict'; -var Stdlib__Buffer = require("melange/stdlib_modules/buffer.js"); +var Stdlib__Buffer = require("melange/./buffer.js"); var foo = Stdlib__Buffer.contents; diff --git a/jscomp/test/dist/jscomp/test/gpr_3697_test.js b/jscomp/test/dist/jscomp/test/gpr_3697_test.js index d64db37fbc..ced0f6b7fb 100644 --- a/jscomp/test/dist/jscomp/test/gpr_3697_test.js +++ b/jscomp/test/dist/jscomp/test/gpr_3697_test.js @@ -1,7 +1,7 @@ // Generated by Melange 'use strict'; -var CamlinternalLazy = require("melange/stdlib_modules/camlinternalLazy.js"); +var CamlinternalLazy = require("melange/./camlinternalLazy.js"); function fix(param) { return /* Fix */{ diff --git a/jscomp/test/dist/jscomp/test/gpr_3931_test.js b/jscomp/test/dist/jscomp/test/gpr_3931_test.js index 8749790fa7..baa7236c82 100644 --- a/jscomp/test/dist/jscomp/test/gpr_3931_test.js +++ b/jscomp/test/dist/jscomp/test/gpr_3931_test.js @@ -3,7 +3,7 @@ var Curry = require("melange.runtime/curry.js"); var Caml_module = require("melange.runtime/caml_module.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); +var Stdlib__Array = require("melange/./array.js"); var PA = Caml_module.init_mod([ "gpr_3931_test.ml", diff --git a/jscomp/test/dist/jscomp/test/gpr_405_test.js b/jscomp/test/dist/jscomp/test/gpr_405_test.js index c1327ce14f..2f467a11cc 100644 --- a/jscomp/test/dist/jscomp/test/gpr_405_test.js +++ b/jscomp/test/dist/jscomp/test/gpr_405_test.js @@ -4,7 +4,7 @@ var Caml = require("melange.runtime/caml.js"); var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); -var Stdlib__Hashtbl = require("melange/stdlib_modules/hashtbl.js"); +var Stdlib__Hashtbl = require("melange/./hashtbl.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); function Make(funarg) { diff --git a/jscomp/test/dist/jscomp/test/gpr_977_test.js b/jscomp/test/dist/jscomp/test/gpr_977_test.js index 3e5f73c123..74c9d5c507 100644 --- a/jscomp/test/dist/jscomp/test/gpr_977_test.js +++ b/jscomp/test/dist/jscomp/test/gpr_977_test.js @@ -2,7 +2,7 @@ 'use strict'; var Mt = require("./mt.js"); -var Stdlib__Int32 = require("melange/stdlib_modules/int32.js"); +var Stdlib__Int32 = require("melange/./int32.js"); var suites = { contents: /* [] */0 diff --git a/jscomp/test/dist/jscomp/test/gray_code_test.js b/jscomp/test/dist/jscomp/test/gray_code_test.js index 80e822b947..9944d97f05 100644 --- a/jscomp/test/dist/jscomp/test/gray_code_test.js +++ b/jscomp/test/dist/jscomp/test/gray_code_test.js @@ -2,7 +2,7 @@ 'use strict'; var Caml_bytes = require("melange.runtime/caml_bytes.js"); -var Stdlib__Bytes = require("melange/stdlib_modules/bytes.js"); +var Stdlib__Bytes = require("melange/./bytes.js"); function gray_encode(b) { return b ^ (b >>> 1); diff --git a/jscomp/test/dist/jscomp/test/hamming_test.js b/jscomp/test/dist/jscomp/test/hamming_test.js index 4ad35a20ce..5ae9cc3a27 100644 --- a/jscomp/test/dist/jscomp/test/hamming_test.js +++ b/jscomp/test/dist/jscomp/test/hamming_test.js @@ -6,9 +6,9 @@ var Curry = require("melange.runtime/curry.js"); var Caml_obj = require("melange.runtime/caml_obj.js"); var Caml_int64 = require("melange.runtime/caml_int64.js"); var Caml_format = require("melange.runtime/caml_format.js"); -var Stdlib__Buffer = require("melange/stdlib_modules/buffer.js"); -var Stdlib__Printf = require("melange/stdlib_modules/printf.js"); -var CamlinternalLazy = require("melange/stdlib_modules/camlinternalLazy.js"); +var Stdlib__Buffer = require("melange/./buffer.js"); +var Stdlib__Printf = require("melange/./printf.js"); +var CamlinternalLazy = require("melange/./camlinternalLazy.js"); var n0 = Caml_int64.zero; diff --git a/jscomp/test/dist/jscomp/test/hash_test.js b/jscomp/test/dist/jscomp/test/hash_test.js index a49f9b0c2c..6d397a8ccb 100644 --- a/jscomp/test/dist/jscomp/test/hash_test.js +++ b/jscomp/test/dist/jscomp/test/hash_test.js @@ -4,10 +4,10 @@ var Mt = require("./mt.js"); var Mt_global = require("./mt_global.js"); var Caml_bytes = require("melange.runtime/caml_bytes.js"); -var Stdlib__Char = require("melange/stdlib_modules/char.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); -var Stdlib__Bytes = require("melange/stdlib_modules/bytes.js"); -var Stdlib__Hashtbl = require("melange/stdlib_modules/hashtbl.js"); +var Stdlib__Char = require("melange/./char.js"); +var Stdlib__Array = require("melange/./array.js"); +var Stdlib__Bytes = require("melange/./bytes.js"); +var Stdlib__Hashtbl = require("melange/./hashtbl.js"); var suites = { contents: /* [] */0 diff --git a/jscomp/test/dist/jscomp/test/hashtbl_test.js b/jscomp/test/dist/jscomp/test/hashtbl_test.js index 47790dbd81..8ce668976b 100644 --- a/jscomp/test/dist/jscomp/test/hashtbl_test.js +++ b/jscomp/test/dist/jscomp/test/hashtbl_test.js @@ -4,10 +4,10 @@ var Mt = require("./mt.js"); var Caml = require("melange.runtime/caml.js"); var Curry = require("melange.runtime/curry.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); -var Stdlib__Hashtbl = require("melange/stdlib_modules/hashtbl.js"); -var Stdlib__MoreLabels = require("melange/stdlib_modules/moreLabels.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Array = require("melange/./array.js"); +var Stdlib__Hashtbl = require("melange/./hashtbl.js"); +var Stdlib__MoreLabels = require("melange/./moreLabels.js"); function to_list(tbl) { return Stdlib__Hashtbl.fold((function (k, v, acc) { diff --git a/jscomp/test/dist/jscomp/test/if_used_test.js b/jscomp/test/dist/jscomp/test/if_used_test.js index bee4e106d6..bf55960835 100644 --- a/jscomp/test/dist/jscomp/test/if_used_test.js +++ b/jscomp/test/dist/jscomp/test/if_used_test.js @@ -2,7 +2,7 @@ 'use strict'; var Curry = require("melange.runtime/curry.js"); -var CamlinternalOO = require("melange/stdlib_modules/camlinternalOO.js"); +var CamlinternalOO = require("melange/./camlinternalOO.js"); var shared = [ "move", diff --git a/jscomp/test/dist/jscomp/test/inline_const_test.js b/jscomp/test/dist/jscomp/test/inline_const_test.js index 9cca2852d6..b0a9e6763b 100644 --- a/jscomp/test/dist/jscomp/test/inline_const_test.js +++ b/jscomp/test/dist/jscomp/test/inline_const_test.js @@ -4,7 +4,7 @@ var Mt = require("./mt.js"); var Caml_int64 = require("melange.runtime/caml_int64.js"); var Inline_const = require("./inline_const.js"); -var Stdlib__Int64 = require("melange/stdlib_modules/int64.js"); +var Stdlib__Int64 = require("melange/./int64.js"); var suites = { contents: /* [] */0 diff --git a/jscomp/test/dist/jscomp/test/inline_map2_test.js b/jscomp/test/dist/jscomp/test/inline_map2_test.js index ee43c41290..28f6e532fe 100644 --- a/jscomp/test/dist/jscomp/test/inline_map2_test.js +++ b/jscomp/test/dist/jscomp/test/inline_map2_test.js @@ -6,7 +6,7 @@ var Caml = require("melange.runtime/caml.js"); var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_option = require("melange.runtime/caml_option.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); function Make(Ord) { var height = function (param) { diff --git a/jscomp/test/dist/jscomp/test/inline_map_test.js b/jscomp/test/dist/jscomp/test/inline_map_test.js index 35d5755dcd..9872aeae78 100644 --- a/jscomp/test/dist/jscomp/test/inline_map_test.js +++ b/jscomp/test/dist/jscomp/test/inline_map_test.js @@ -4,7 +4,7 @@ var Mt = require("./mt.js"); var Caml = require("melange.runtime/caml.js"); var Stdlib = require("melange/./stdlib.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); function height(param) { if (param) { diff --git a/jscomp/test/dist/jscomp/test/inline_record_test.js b/jscomp/test/dist/jscomp/test/inline_record_test.js index ea46690c1b..e3e600069b 100644 --- a/jscomp/test/dist/jscomp/test/inline_record_test.js +++ b/jscomp/test/dist/jscomp/test/inline_record_test.js @@ -2,7 +2,7 @@ 'use strict'; var Mt = require("./mt.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); var Caml_exceptions = require("melange.runtime/caml_exceptions.js"); var suites = { diff --git a/jscomp/test/dist/jscomp/test/inline_regression_test.js b/jscomp/test/dist/jscomp/test/inline_regression_test.js index 9bb51abaa0..7bee775e56 100644 --- a/jscomp/test/dist/jscomp/test/inline_regression_test.js +++ b/jscomp/test/dist/jscomp/test/inline_regression_test.js @@ -4,8 +4,8 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Caml_string = require("melange.runtime/caml_string.js"); -var Stdlib__String = require("melange/stdlib_modules/string.js"); -var Stdlib__Filename = require("melange/stdlib_modules/filename.js"); +var Stdlib__String = require("melange/./string.js"); +var Stdlib__Filename = require("melange/./filename.js"); function generic_basename(is_dir_sep, current_dir_name, name) { if (name === "") { diff --git a/jscomp/test/dist/jscomp/test/int32_test.js b/jscomp/test/dist/jscomp/test/int32_test.js index 2c9f3ebd1f..b363297afa 100644 --- a/jscomp/test/dist/jscomp/test/int32_test.js +++ b/jscomp/test/dist/jscomp/test/int32_test.js @@ -5,10 +5,10 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_float = require("melange.runtime/caml_float.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); -var Stdlib__Int32 = require("melange/stdlib_modules/int32.js"); +var Stdlib__Array = require("melange/./array.js"); +var Stdlib__Int32 = require("melange/./int32.js"); var Ext_array_test = require("./ext_array_test.js"); -var Stdlib__Format = require("melange/stdlib_modules/format.js"); +var Stdlib__Format = require("melange/./format.js"); function f(x) { return [ diff --git a/jscomp/test/dist/jscomp/test/int64_mul_div_test.js b/jscomp/test/dist/jscomp/test/int64_mul_div_test.js index 1ff53662c1..30967e2fc8 100644 --- a/jscomp/test/dist/jscomp/test/int64_mul_div_test.js +++ b/jscomp/test/dist/jscomp/test/int64_mul_div_test.js @@ -6,10 +6,10 @@ var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_int64 = require("melange.runtime/caml_int64.js"); var Caml_format = require("melange.runtime/caml_format.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); -var Stdlib__Int64 = require("melange/stdlib_modules/int64.js"); -var Stdlib__Printf = require("melange/stdlib_modules/printf.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Array = require("melange/./array.js"); +var Stdlib__Int64 = require("melange/./int64.js"); +var Stdlib__Printf = require("melange/./printf.js"); function commutative_mul(result, a, b) { return { diff --git a/jscomp/test/dist/jscomp/test/int64_string_bench.js b/jscomp/test/dist/jscomp/test/int64_string_bench.js index 483ab07ce2..854b05adb6 100644 --- a/jscomp/test/dist/jscomp/test/int64_string_bench.js +++ b/jscomp/test/dist/jscomp/test/int64_string_bench.js @@ -3,7 +3,7 @@ var Caml_int64 = require("melange.runtime/caml_int64.js"); var Caml_format = require("melange.runtime/caml_format.js"); -var Stdlib__Int64 = require("melange/stdlib_modules/int64.js"); +var Stdlib__Int64 = require("melange/./int64.js"); console.time("Int64.to_string"); diff --git a/jscomp/test/dist/jscomp/test/int64_string_test.js b/jscomp/test/dist/jscomp/test/int64_string_test.js index 986040b023..b2b9b5ecb0 100644 --- a/jscomp/test/dist/jscomp/test/int64_string_test.js +++ b/jscomp/test/dist/jscomp/test/int64_string_test.js @@ -5,7 +5,7 @@ var Mt = require("./mt.js"); var Belt_List = require("melange.belt/./belt_List.js"); var Caml_int64 = require("melange.runtime/caml_int64.js"); var Caml_format = require("melange.runtime/caml_format.js"); -var Stdlib__Int64 = require("melange/stdlib_modules/int64.js"); +var Stdlib__Int64 = require("melange/./int64.js"); var suites = { contents: /* [] */0 diff --git a/jscomp/test/dist/jscomp/test/int64_test.js b/jscomp/test/dist/jscomp/test/int64_test.js index 5962220e1f..7509006918 100644 --- a/jscomp/test/dist/jscomp/test/int64_test.js +++ b/jscomp/test/dist/jscomp/test/int64_test.js @@ -7,11 +7,11 @@ var Stdlib = require("melange/./stdlib.js"); var Caml_obj = require("melange.runtime/caml_obj.js"); var Caml_int64 = require("melange.runtime/caml_int64.js"); var Caml_format = require("melange.runtime/caml_format.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); -var Stdlib__Int32 = require("melange/stdlib_modules/int32.js"); -var Stdlib__Int64 = require("melange/stdlib_modules/int64.js"); +var Stdlib__Array = require("melange/./array.js"); +var Stdlib__Int32 = require("melange/./int32.js"); +var Stdlib__Int64 = require("melange/./int64.js"); var Ext_array_test = require("./ext_array_test.js"); -var Stdlib__Format = require("melange/stdlib_modules/format.js"); +var Stdlib__Format = require("melange/./format.js"); function f(u, v) { return u > v; diff --git a/jscomp/test/dist/jscomp/test/int_hashtbl_test.js b/jscomp/test/dist/jscomp/test/int_hashtbl_test.js index aebf368127..5946383d52 100644 --- a/jscomp/test/dist/jscomp/test/int_hashtbl_test.js +++ b/jscomp/test/dist/jscomp/test/int_hashtbl_test.js @@ -4,9 +4,9 @@ var Mt = require("./mt.js"); var Caml = require("melange.runtime/caml.js"); var Curry = require("melange.runtime/curry.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); -var Stdlib__Hashtbl = require("melange/stdlib_modules/hashtbl.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Array = require("melange/./array.js"); +var Stdlib__Hashtbl = require("melange/./hashtbl.js"); function f(H) { var tbl = Curry._1(H.create, 17); diff --git a/jscomp/test/dist/jscomp/test/int_map.js b/jscomp/test/dist/jscomp/test/int_map.js index 600fd449a2..3d43df8b33 100644 --- a/jscomp/test/dist/jscomp/test/int_map.js +++ b/jscomp/test/dist/jscomp/test/int_map.js @@ -5,7 +5,7 @@ var Caml = require("melange.runtime/caml.js"); var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_option = require("melange.runtime/caml_option.js"); -var Stdlib__Seq = require("melange/stdlib_modules/seq.js"); +var Stdlib__Seq = require("melange/./seq.js"); var compare = Caml.caml_int_compare; diff --git a/jscomp/test/dist/jscomp/test/int_overflow_test.js b/jscomp/test/dist/jscomp/test/int_overflow_test.js index 5d29719b5d..83b2c74f96 100644 --- a/jscomp/test/dist/jscomp/test/int_overflow_test.js +++ b/jscomp/test/dist/jscomp/test/int_overflow_test.js @@ -3,7 +3,7 @@ var Mt = require("./mt.js"); var Caml_string = require("melange.runtime/caml_string.js"); -var Stdlib__Int32 = require("melange/stdlib_modules/int32.js"); +var Stdlib__Int32 = require("melange/./int32.js"); function hash_variant(s) { var accu = 0; diff --git a/jscomp/test/dist/jscomp/test/js_json_test.js b/jscomp/test/dist/jscomp/test/js_json_test.js index e0506cdd6c..db6bf9a3c1 100644 --- a/jscomp/test/dist/jscomp/test/js_json_test.js +++ b/jscomp/test/dist/jscomp/test/js_json_test.js @@ -8,7 +8,7 @@ var Belt_List = require("melange.belt/./belt_List.js"); var Belt_Array = require("melange.belt/./belt_Array.js"); var Caml_array = require("melange.runtime/caml_array.js"); var Caml_option = require("melange.runtime/caml_option.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); +var Stdlib__Array = require("melange/./array.js"); var suites = { contents: /* [] */0 diff --git a/jscomp/test/dist/jscomp/test/js_obj_test.js b/jscomp/test/dist/jscomp/test/js_obj_test.js index 65f1019ab0..3da0b12062 100644 --- a/jscomp/test/dist/jscomp/test/js_obj_test.js +++ b/jscomp/test/dist/jscomp/test/js_obj_test.js @@ -4,7 +4,7 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Caml_oo_curry = require("melange.runtime/caml_oo_curry.js"); -var CamlinternalOO = require("melange/stdlib_modules/camlinternalOO.js"); +var CamlinternalOO = require("melange/./camlinternalOO.js"); function f(u) { return Caml_oo_curry.js2(5740587, 1, u, 32); diff --git a/jscomp/test/dist/jscomp/test/js_promise_basic_test.js b/jscomp/test/dist/jscomp/test/js_promise_basic_test.js index 486752c9aa..372d5c12f4 100644 --- a/jscomp/test/dist/jscomp/test/js_promise_basic_test.js +++ b/jscomp/test/dist/jscomp/test/js_promise_basic_test.js @@ -5,7 +5,7 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_array = require("melange.runtime/caml_array.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); var Caml_exceptions = require("melange.runtime/caml_exceptions.js"); var suites = { diff --git a/jscomp/test/dist/jscomp/test/js_typed_array_test.js b/jscomp/test/dist/jscomp/test/js_typed_array_test.js index 733fdccb5b..8605634dde 100644 --- a/jscomp/test/dist/jscomp/test/js_typed_array_test.js +++ b/jscomp/test/dist/jscomp/test/js_typed_array_test.js @@ -3,7 +3,7 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); +var Stdlib__Array = require("melange/./array.js"); function mkI8(a) { return new Int8Array(a); diff --git a/jscomp/test/dist/jscomp/test/large_obj_test.js b/jscomp/test/dist/jscomp/test/large_obj_test.js index af1218e3ed..2d5a108d6d 100644 --- a/jscomp/test/dist/jscomp/test/large_obj_test.js +++ b/jscomp/test/dist/jscomp/test/large_obj_test.js @@ -3,7 +3,7 @@ var Curry = require("melange.runtime/curry.js"); var Caml_oo_curry = require("melange.runtime/caml_oo_curry.js"); -var CamlinternalOO = require("melange/stdlib_modules/camlinternalOO.js"); +var CamlinternalOO = require("melange/./camlinternalOO.js"); var shared = [ "field0", diff --git a/jscomp/test/dist/jscomp/test/lazy_test.js b/jscomp/test/dist/jscomp/test/lazy_test.js index cfec9b556f..2b327b0834 100644 --- a/jscomp/test/dist/jscomp/test/lazy_test.js +++ b/jscomp/test/dist/jscomp/test/lazy_test.js @@ -3,8 +3,8 @@ var Mt = require("./mt.js"); var Stdlib = require("melange/./stdlib.js"); -var Stdlib__Lazy = require("melange/stdlib_modules/lazy.js"); -var CamlinternalLazy = require("melange/stdlib_modules/camlinternalLazy.js"); +var Stdlib__Lazy = require("melange/./lazy.js"); +var CamlinternalLazy = require("melange/./camlinternalLazy.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); var u = { diff --git a/jscomp/test/dist/jscomp/test/lexer_test.js b/jscomp/test/dist/jscomp/test/lexer_test.js index 76898c33d1..059dab0173 100644 --- a/jscomp/test/dist/jscomp/test/lexer_test.js +++ b/jscomp/test/dist/jscomp/test/lexer_test.js @@ -9,8 +9,8 @@ var Arith_lexer = require("./arith_lexer.js"); var Arith_parser = require("./arith_parser.js"); var Arith_syntax = require("./arith_syntax.js"); var Number_lexer = require("./number_lexer.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Lexing = require("melange/stdlib_modules/lexing.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Lexing = require("melange/./lexing.js"); function get_tokens(lex, str) { var buf = Stdlib__Lexing.from_string(undefined, str); diff --git a/jscomp/test/dist/jscomp/test/libarg_test.js b/jscomp/test/dist/jscomp/test/libarg_test.js index 8cced27e9c..7b871b574a 100644 --- a/jscomp/test/dist/jscomp/test/libarg_test.js +++ b/jscomp/test/dist/jscomp/test/libarg_test.js @@ -4,9 +4,9 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Caml_obj = require("melange.runtime/caml_obj.js"); -var Stdlib__Arg = require("melange/stdlib_modules/arg.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Printf = require("melange/stdlib_modules/printf.js"); +var Stdlib__Arg = require("melange/./arg.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Printf = require("melange/./printf.js"); var current = { contents: 0 diff --git a/jscomp/test/dist/jscomp/test/libqueue_test.js b/jscomp/test/dist/jscomp/test/libqueue_test.js index 934aa87118..b311a4fb34 100644 --- a/jscomp/test/dist/jscomp/test/libqueue_test.js +++ b/jscomp/test/dist/jscomp/test/libqueue_test.js @@ -3,8 +3,8 @@ var Curry = require("melange.runtime/curry.js"); var Caml_obj = require("melange.runtime/caml_obj.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Queue = require("melange/stdlib_modules/queue.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Queue = require("melange/./queue.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); function to_list(q) { diff --git a/jscomp/test/dist/jscomp/test/limits_test.js b/jscomp/test/dist/jscomp/test/limits_test.js index 2c14e71d94..e457a8a852 100644 --- a/jscomp/test/dist/jscomp/test/limits_test.js +++ b/jscomp/test/dist/jscomp/test/limits_test.js @@ -3,7 +3,7 @@ var Mt = require("./mt.js"); var Stdlib = require("melange/./stdlib.js"); -var Stdlib__Int32 = require("melange/stdlib_modules/int32.js"); +var Stdlib__Int32 = require("melange/./int32.js"); var suites = { contents: /* [] */0 diff --git a/jscomp/test/dist/jscomp/test/list_stack.js b/jscomp/test/dist/jscomp/test/list_stack.js index 59a5362b9b..30e8b2e3d1 100644 --- a/jscomp/test/dist/jscomp/test/list_stack.js +++ b/jscomp/test/dist/jscomp/test/list_stack.js @@ -1,7 +1,7 @@ // Generated by Melange 'use strict'; -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); Stdlib__List.find((function (x) { return x > 3; diff --git a/jscomp/test/dist/jscomp/test/list_test.js b/jscomp/test/dist/jscomp/test/list_test.js index f478df1c84..263427b525 100644 --- a/jscomp/test/dist/jscomp/test/list_test.js +++ b/jscomp/test/dist/jscomp/test/list_test.js @@ -3,8 +3,8 @@ var Mt = require("./mt.js"); var Caml = require("melange.runtime/caml.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Array = require("melange/./array.js"); var list_suites_0 = [ "length", diff --git a/jscomp/test/dist/jscomp/test/map_find_test.js b/jscomp/test/dist/jscomp/test/map_find_test.js index 28dc633bc4..e070d31fcd 100644 --- a/jscomp/test/dist/jscomp/test/map_find_test.js +++ b/jscomp/test/dist/jscomp/test/map_find_test.js @@ -5,7 +5,7 @@ var Mt = require("./mt.js"); var Caml = require("melange.runtime/caml.js"); var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); var compare = Caml.caml_int_compare; diff --git a/jscomp/test/dist/jscomp/test/map_test.js b/jscomp/test/dist/jscomp/test/map_test.js index 4922e2da44..00cc7427b8 100644 --- a/jscomp/test/dist/jscomp/test/map_test.js +++ b/jscomp/test/dist/jscomp/test/map_test.js @@ -5,8 +5,8 @@ var Mt = require("./mt.js"); var Caml = require("melange.runtime/caml.js"); var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__String = require("melange/stdlib_modules/string.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__String = require("melange/./string.js"); var compare = Caml.caml_int_compare; diff --git a/jscomp/test/dist/jscomp/test/mario_game.js b/jscomp/test/dist/jscomp/test/mario_game.js index bfe4bbcfbd..0bfab853b1 100644 --- a/jscomp/test/dist/jscomp/test/mario_game.js +++ b/jscomp/test/dist/jscomp/test/mario_game.js @@ -7,9 +7,9 @@ var Stdlib = require("melange/./stdlib.js"); var Caml_obj = require("melange.runtime/caml_obj.js"); var Caml_int32 = require("melange.runtime/caml_int32.js"); var Caml_option = require("melange.runtime/caml_option.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Printf = require("melange/stdlib_modules/printf.js"); -var Stdlib__Random = require("melange/stdlib_modules/random.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Printf = require("melange/./printf.js"); +var Stdlib__Random = require("melange/./random.js"); var Actors = {}; diff --git a/jscomp/test/dist/jscomp/test/mock_mt.js b/jscomp/test/dist/jscomp/test/mock_mt.js index c01b5f4014..1752c251bf 100644 --- a/jscomp/test/dist/jscomp/test/mock_mt.js +++ b/jscomp/test/dist/jscomp/test/mock_mt.js @@ -2,7 +2,7 @@ 'use strict'; var Curry = require("melange.runtime/curry.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); function from_pair_suites(name, suites) { console.log([ diff --git a/jscomp/test/dist/jscomp/test/module_alias_test.js b/jscomp/test/dist/jscomp/test/module_alias_test.js index 46c015e2e2..cc53e3e7f0 100644 --- a/jscomp/test/dist/jscomp/test/module_alias_test.js +++ b/jscomp/test/dist/jscomp/test/module_alias_test.js @@ -3,7 +3,7 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); var suites = { contents: /* [] */0 diff --git a/jscomp/test/dist/jscomp/test/module_equality_stdlib_test.js b/jscomp/test/dist/jscomp/test/module_equality_stdlib_test.js index 92d7bde2c1..ee3f65a616 100644 --- a/jscomp/test/dist/jscomp/test/module_equality_stdlib_test.js +++ b/jscomp/test/dist/jscomp/test/module_equality_stdlib_test.js @@ -1,7 +1,7 @@ // Generated by Melange 'use strict'; -var Stdlib__Format = require("melange/stdlib_modules/format.js"); +var Stdlib__Format = require("melange/./format.js"); function write_runtime_coverage(channel) { Stdlib__Format.formatter_of_out_channel(channel); diff --git a/jscomp/test/dist/jscomp/test/module_missing_conversion.js b/jscomp/test/dist/jscomp/test/module_missing_conversion.js index 28a77da4d5..2e92964c73 100644 --- a/jscomp/test/dist/jscomp/test/module_missing_conversion.js +++ b/jscomp/test/dist/jscomp/test/module_missing_conversion.js @@ -2,9 +2,9 @@ 'use strict'; var Curry = require("melange.runtime/curry.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); -var Stdlib__String = require("melange/stdlib_modules/string.js"); -var Stdlib__MoreLabels = require("melange/stdlib_modules/moreLabels.js"); +var Stdlib__Array = require("melange/./array.js"); +var Stdlib__String = require("melange/./string.js"); +var Stdlib__MoreLabels = require("melange/./moreLabels.js"); function f(x) { return x; diff --git a/jscomp/test/dist/jscomp/test/module_parameter_test.js b/jscomp/test/dist/jscomp/test/module_parameter_test.js index 2f1bbb8395..e714b9990a 100644 --- a/jscomp/test/dist/jscomp/test/module_parameter_test.js +++ b/jscomp/test/dist/jscomp/test/module_parameter_test.js @@ -2,7 +2,7 @@ 'use strict'; var Mt = require("./mt.js"); -var Stdlib__String = require("melange/stdlib_modules/string.js"); +var Stdlib__String = require("melange/./string.js"); function u(v) { return v; diff --git a/jscomp/test/dist/jscomp/test/mpr_6033_test.js b/jscomp/test/dist/jscomp/test/mpr_6033_test.js index abb7cd80f9..e407fa7a5b 100644 --- a/jscomp/test/dist/jscomp/test/mpr_6033_test.js +++ b/jscomp/test/dist/jscomp/test/mpr_6033_test.js @@ -2,7 +2,7 @@ 'use strict'; var Mt = require("./mt.js"); -var CamlinternalLazy = require("melange/stdlib_modules/camlinternalLazy.js"); +var CamlinternalLazy = require("melange/./camlinternalLazy.js"); var suites = { contents: /* [] */0 diff --git a/jscomp/test/dist/jscomp/test/mt.js b/jscomp/test/dist/jscomp/test/mt.js index 9fe5eff02c..d35eb019de 100644 --- a/jscomp/test/dist/jscomp/test/mt.js +++ b/jscomp/test/dist/jscomp/test/mt.js @@ -5,8 +5,8 @@ var Path = require("path"); var Curry = require("melange.runtime/curry.js"); var Assert = require("assert"); var Process = require("process"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Array = require("melange/./array.js"); function assert_fail(msg) { Assert.fail(undefined, undefined, msg, ""); diff --git a/jscomp/test/dist/jscomp/test/nested_module_alias.js b/jscomp/test/dist/jscomp/test/nested_module_alias.js index a768e16285..7d1fbcd273 100644 --- a/jscomp/test/dist/jscomp/test/nested_module_alias.js +++ b/jscomp/test/dist/jscomp/test/nested_module_alias.js @@ -1,7 +1,7 @@ // Generated by Melange 'use strict'; -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); function v(x) { return [ diff --git a/jscomp/test/dist/jscomp/test/number_lexer.js b/jscomp/test/dist/jscomp/test/number_lexer.js index caf63d3d55..775777c7d5 100644 --- a/jscomp/test/dist/jscomp/test/number_lexer.js +++ b/jscomp/test/dist/jscomp/test/number_lexer.js @@ -2,7 +2,7 @@ 'use strict'; var Curry = require("melange.runtime/curry.js"); -var Stdlib__Lexing = require("melange/stdlib_modules/lexing.js"); +var Stdlib__Lexing = require("melange/./lexing.js"); function l(prim) { console.log(prim); diff --git a/jscomp/test/dist/jscomp/test/obj_curry_test.js b/jscomp/test/dist/jscomp/test/obj_curry_test.js index a1e6c9c973..d03e56ef59 100644 --- a/jscomp/test/dist/jscomp/test/obj_curry_test.js +++ b/jscomp/test/dist/jscomp/test/obj_curry_test.js @@ -2,7 +2,7 @@ 'use strict'; var Caml_oo_curry = require("melange.runtime/caml_oo_curry.js"); -var CamlinternalOO = require("melange/stdlib_modules/camlinternalOO.js"); +var CamlinternalOO = require("melange/./camlinternalOO.js"); function f(o) { return Caml_oo_curry.js4(23297, 1, o, 1, 2, 3); diff --git a/jscomp/test/dist/jscomp/test/obj_repr_test.js b/jscomp/test/dist/jscomp/test/obj_repr_test.js index d111db9622..4510684757 100644 --- a/jscomp/test/dist/jscomp/test/obj_repr_test.js +++ b/jscomp/test/dist/jscomp/test/obj_repr_test.js @@ -1,7 +1,7 @@ // Generated by Melange 'use strict'; -var CamlinternalOO = require("melange/stdlib_modules/camlinternalOO.js"); +var CamlinternalOO = require("melange/./camlinternalOO.js"); var $$class = CamlinternalOO.create_table(0); diff --git a/jscomp/test/dist/jscomp/test/obj_test.js b/jscomp/test/dist/jscomp/test/obj_test.js index 2b23c50d31..f10f0edcf0 100644 --- a/jscomp/test/dist/jscomp/test/obj_test.js +++ b/jscomp/test/dist/jscomp/test/obj_test.js @@ -4,7 +4,7 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Caml_oo_curry = require("melange.runtime/caml_oo_curry.js"); -var CamlinternalOO = require("melange/stdlib_modules/camlinternalOO.js"); +var CamlinternalOO = require("melange/./camlinternalOO.js"); var shared = [ "hi", diff --git a/jscomp/test/dist/jscomp/test/ocaml_parsetree_test.js b/jscomp/test/dist/jscomp/test/ocaml_parsetree_test.js index da6e805d2b..ab29514e84 100644 --- a/jscomp/test/dist/jscomp/test/ocaml_parsetree_test.js +++ b/jscomp/test/dist/jscomp/test/ocaml_parsetree_test.js @@ -16,22 +16,22 @@ var Caml_int64 = require("melange.runtime/caml_int64.js"); var Caml_format = require("melange.runtime/caml_format.js"); var Caml_option = require("melange.runtime/caml_option.js"); var Caml_string = require("melange.runtime/caml_string.js"); -var Stdlib__Arg = require("melange/stdlib_modules/arg.js"); -var Stdlib__Sys = require("melange/stdlib_modules/sys.js"); -var Stdlib__Char = require("melange/stdlib_modules/char.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); -var Stdlib__Bytes = require("melange/stdlib_modules/bytes.js"); -var Stdlib__Buffer = require("melange/stdlib_modules/buffer.js"); -var Stdlib__Format = require("melange/stdlib_modules/format.js"); -var Stdlib__Lexing = require("melange/stdlib_modules/lexing.js"); -var Stdlib__Printf = require("melange/stdlib_modules/printf.js"); -var Stdlib__String = require("melange/stdlib_modules/string.js"); +var Stdlib__Arg = require("melange/./arg.js"); +var Stdlib__Sys = require("melange/./sys.js"); +var Stdlib__Char = require("melange/./char.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Array = require("melange/./array.js"); +var Stdlib__Bytes = require("melange/./bytes.js"); +var Stdlib__Buffer = require("melange/./buffer.js"); +var Stdlib__Format = require("melange/./format.js"); +var Stdlib__Lexing = require("melange/./lexing.js"); +var Stdlib__Printf = require("melange/./printf.js"); +var Stdlib__String = require("melange/./string.js"); var Caml_exceptions = require("melange.runtime/caml_exceptions.js"); -var Stdlib__Hashtbl = require("melange/stdlib_modules/hashtbl.js"); -var Stdlib__Parsing = require("melange/stdlib_modules/parsing.js"); -var CamlinternalLazy = require("melange/stdlib_modules/camlinternalLazy.js"); -var Stdlib__Filename = require("melange/stdlib_modules/filename.js"); +var Stdlib__Hashtbl = require("melange/./hashtbl.js"); +var Stdlib__Parsing = require("melange/./parsing.js"); +var CamlinternalLazy = require("melange/./camlinternalLazy.js"); +var Stdlib__Filename = require("melange/./filename.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); var Caml_external_polyfill = require("melange.runtime/caml_external_polyfill.js"); diff --git a/jscomp/test/dist/jscomp/test/ocaml_proto_test.js b/jscomp/test/dist/jscomp/test/ocaml_proto_test.js index 57be78c0ad..b65db73888 100644 --- a/jscomp/test/dist/jscomp/test/ocaml_proto_test.js +++ b/jscomp/test/dist/jscomp/test/ocaml_proto_test.js @@ -9,17 +9,17 @@ var Caml_bytes = require("melange.runtime/caml_bytes.js"); var Caml_format = require("melange.runtime/caml_format.js"); var Caml_option = require("melange.runtime/caml_option.js"); var Caml_string = require("melange.runtime/caml_string.js"); -var Stdlib__Char = require("melange/stdlib_modules/char.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Bytes = require("melange/stdlib_modules/bytes.js"); -var Stdlib__Lexing = require("melange/stdlib_modules/lexing.js"); -var Stdlib__Printf = require("melange/stdlib_modules/printf.js"); -var Stdlib__String = require("melange/stdlib_modules/string.js"); +var Stdlib__Char = require("melange/./char.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Bytes = require("melange/./bytes.js"); +var Stdlib__Lexing = require("melange/./lexing.js"); +var Stdlib__Printf = require("melange/./printf.js"); +var Stdlib__String = require("melange/./string.js"); var Caml_exceptions = require("melange.runtime/caml_exceptions.js"); -var Stdlib__Hashtbl = require("melange/stdlib_modules/hashtbl.js"); -var Stdlib__Parsing = require("melange/stdlib_modules/parsing.js"); -var Stdlib__Filename = require("melange/stdlib_modules/filename.js"); -var Stdlib__Printexc = require("melange/stdlib_modules/printexc.js"); +var Stdlib__Hashtbl = require("melange/./hashtbl.js"); +var Stdlib__Parsing = require("melange/./parsing.js"); +var Stdlib__Filename = require("melange/./filename.js"); +var Stdlib__Printexc = require("melange/./printexc.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); function field(optionsOpt, label, number, type_, name) { diff --git a/jscomp/test/dist/jscomp/test/ocaml_re_test.js b/jscomp/test/dist/jscomp/test/ocaml_re_test.js index 6b6456523f..03082b4247 100644 --- a/jscomp/test/dist/jscomp/test/ocaml_re_test.js +++ b/jscomp/test/dist/jscomp/test/ocaml_re_test.js @@ -10,14 +10,14 @@ var Caml_array = require("melange.runtime/caml_array.js"); var Caml_bytes = require("melange.runtime/caml_bytes.js"); var Caml_option = require("melange.runtime/caml_option.js"); var Caml_string = require("melange.runtime/caml_string.js"); -var Stdlib__Char = require("melange/stdlib_modules/char.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); -var Stdlib__Bytes = require("melange/stdlib_modules/bytes.js"); -var Stdlib__Format = require("melange/stdlib_modules/format.js"); -var Stdlib__String = require("melange/stdlib_modules/string.js"); +var Stdlib__Char = require("melange/./char.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Array = require("melange/./array.js"); +var Stdlib__Bytes = require("melange/./bytes.js"); +var Stdlib__Format = require("melange/./format.js"); +var Stdlib__String = require("melange/./string.js"); var Caml_exceptions = require("melange.runtime/caml_exceptions.js"); -var Stdlib__Hashtbl = require("melange/stdlib_modules/hashtbl.js"); +var Stdlib__Hashtbl = require("melange/./hashtbl.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); var suites = { diff --git a/jscomp/test/dist/jscomp/test/ocaml_typedtree_test.js b/jscomp/test/dist/jscomp/test/ocaml_typedtree_test.js index a4ffdff2b5..0f0c8ddb2c 100644 --- a/jscomp/test/dist/jscomp/test/ocaml_typedtree_test.js +++ b/jscomp/test/dist/jscomp/test/ocaml_typedtree_test.js @@ -16,28 +16,28 @@ var Caml_int64 = require("melange.runtime/caml_int64.js"); var Caml_format = require("melange.runtime/caml_format.js"); var Caml_option = require("melange.runtime/caml_option.js"); var Caml_string = require("melange.runtime/caml_string.js"); -var Stdlib__Arg = require("melange/stdlib_modules/arg.js"); -var Stdlib__Seq = require("melange/stdlib_modules/seq.js"); -var Stdlib__Sys = require("melange/stdlib_modules/sys.js"); -var Stdlib__Char = require("melange/stdlib_modules/char.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); -var Stdlib__Bytes = require("melange/stdlib_modules/bytes.js"); -var Stdlib__Int32 = require("melange/stdlib_modules/int32.js"); -var Stdlib__Int64 = require("melange/stdlib_modules/int64.js"); -var Stdlib__Buffer = require("melange/stdlib_modules/buffer.js"); -var Stdlib__Digest = require("melange/stdlib_modules/digest.js"); -var Stdlib__Format = require("melange/stdlib_modules/format.js"); -var Stdlib__Lexing = require("melange/stdlib_modules/lexing.js"); -var Stdlib__Printf = require("melange/stdlib_modules/printf.js"); -var Stdlib__String = require("melange/stdlib_modules/string.js"); +var Stdlib__Arg = require("melange/./arg.js"); +var Stdlib__Seq = require("melange/./seq.js"); +var Stdlib__Sys = require("melange/./sys.js"); +var Stdlib__Char = require("melange/./char.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Array = require("melange/./array.js"); +var Stdlib__Bytes = require("melange/./bytes.js"); +var Stdlib__Int32 = require("melange/./int32.js"); +var Stdlib__Int64 = require("melange/./int64.js"); +var Stdlib__Buffer = require("melange/./buffer.js"); +var Stdlib__Digest = require("melange/./digest.js"); +var Stdlib__Format = require("melange/./format.js"); +var Stdlib__Lexing = require("melange/./lexing.js"); +var Stdlib__Printf = require("melange/./printf.js"); +var Stdlib__String = require("melange/./string.js"); var Caml_exceptions = require("melange.runtime/caml_exceptions.js"); -var Stdlib__Hashtbl = require("melange/stdlib_modules/hashtbl.js"); -var Stdlib__Marshal = require("melange/stdlib_modules/marshal.js"); -var Stdlib__Parsing = require("melange/stdlib_modules/parsing.js"); -var CamlinternalLazy = require("melange/stdlib_modules/camlinternalLazy.js"); -var Stdlib__Filename = require("melange/stdlib_modules/filename.js"); -var Stdlib__Printexc = require("melange/stdlib_modules/printexc.js"); +var Stdlib__Hashtbl = require("melange/./hashtbl.js"); +var Stdlib__Marshal = require("melange/./marshal.js"); +var Stdlib__Parsing = require("melange/./parsing.js"); +var CamlinternalLazy = require("melange/./camlinternalLazy.js"); +var Stdlib__Filename = require("melange/./filename.js"); +var Stdlib__Printexc = require("melange/./printexc.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); var Caml_external_polyfill = require("melange.runtime/caml_external_polyfill.js"); diff --git a/jscomp/test/dist/jscomp/test/offset.js b/jscomp/test/dist/jscomp/test/offset.js index cf50cb5104..1cd704afb6 100644 --- a/jscomp/test/dist/jscomp/test/offset.js +++ b/jscomp/test/dist/jscomp/test/offset.js @@ -5,9 +5,9 @@ var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_obj = require("melange.runtime/caml_obj.js"); var Caml_option = require("melange.runtime/caml_option.js"); -var Stdlib__Seq = require("melange/stdlib_modules/seq.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__String = require("melange/stdlib_modules/string.js"); +var Stdlib__Seq = require("melange/./seq.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__String = require("melange/./string.js"); var funarg = { compare: Stdlib__String.compare diff --git a/jscomp/test/dist/jscomp/test/opr_3576_test.js b/jscomp/test/dist/jscomp/test/opr_3576_test.js index a12a601cef..0b5ef57463 100644 --- a/jscomp/test/dist/jscomp/test/opr_3576_test.js +++ b/jscomp/test/dist/jscomp/test/opr_3576_test.js @@ -4,7 +4,7 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Caml_oo_curry = require("melange.runtime/caml_oo_curry.js"); -var CamlinternalOO = require("melange/stdlib_modules/camlinternalOO.js"); +var CamlinternalOO = require("melange/./camlinternalOO.js"); var shared = [ "m1", diff --git a/jscomp/test/dist/jscomp/test/opr_4560_test.js b/jscomp/test/dist/jscomp/test/opr_4560_test.js index 579e37989d..eedf73f18f 100644 --- a/jscomp/test/dist/jscomp/test/opr_4560_test.js +++ b/jscomp/test/dist/jscomp/test/opr_4560_test.js @@ -4,7 +4,7 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Caml_oo_curry = require("melange.runtime/caml_oo_curry.js"); -var CamlinternalOO = require("melange/stdlib_modules/camlinternalOO.js"); +var CamlinternalOO = require("melange/./camlinternalOO.js"); var shared = ["b"]; diff --git a/jscomp/test/dist/jscomp/test/parser_api.js b/jscomp/test/dist/jscomp/test/parser_api.js index 4efb3c643f..6713787680 100644 --- a/jscomp/test/dist/jscomp/test/parser_api.js +++ b/jscomp/test/dist/jscomp/test/parser_api.js @@ -14,22 +14,22 @@ var Caml_int64 = require("melange.runtime/caml_int64.js"); var Caml_format = require("melange.runtime/caml_format.js"); var Caml_option = require("melange.runtime/caml_option.js"); var Caml_string = require("melange.runtime/caml_string.js"); -var Stdlib__Arg = require("melange/stdlib_modules/arg.js"); -var Stdlib__Sys = require("melange/stdlib_modules/sys.js"); -var Stdlib__Char = require("melange/stdlib_modules/char.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); -var Stdlib__Bytes = require("melange/stdlib_modules/bytes.js"); -var Stdlib__Buffer = require("melange/stdlib_modules/buffer.js"); -var Stdlib__Format = require("melange/stdlib_modules/format.js"); -var Stdlib__Lexing = require("melange/stdlib_modules/lexing.js"); -var Stdlib__Printf = require("melange/stdlib_modules/printf.js"); -var Stdlib__String = require("melange/stdlib_modules/string.js"); +var Stdlib__Arg = require("melange/./arg.js"); +var Stdlib__Sys = require("melange/./sys.js"); +var Stdlib__Char = require("melange/./char.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Array = require("melange/./array.js"); +var Stdlib__Bytes = require("melange/./bytes.js"); +var Stdlib__Buffer = require("melange/./buffer.js"); +var Stdlib__Format = require("melange/./format.js"); +var Stdlib__Lexing = require("melange/./lexing.js"); +var Stdlib__Printf = require("melange/./printf.js"); +var Stdlib__String = require("melange/./string.js"); var Caml_exceptions = require("melange.runtime/caml_exceptions.js"); -var Stdlib__Hashtbl = require("melange/stdlib_modules/hashtbl.js"); -var Stdlib__Parsing = require("melange/stdlib_modules/parsing.js"); -var CamlinternalLazy = require("melange/stdlib_modules/camlinternalLazy.js"); -var Stdlib__Filename = require("melange/stdlib_modules/filename.js"); +var Stdlib__Hashtbl = require("melange/./hashtbl.js"); +var Stdlib__Parsing = require("melange/./parsing.js"); +var CamlinternalLazy = require("melange/./camlinternalLazy.js"); +var Stdlib__Filename = require("melange/./filename.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); var Caml_external_polyfill = require("melange.runtime/caml_external_polyfill.js"); diff --git a/jscomp/test/dist/jscomp/test/parser_api_test.js b/jscomp/test/dist/jscomp/test/parser_api_test.js index af0759ce74..6a7e6c9657 100644 --- a/jscomp/test/dist/jscomp/test/parser_api_test.js +++ b/jscomp/test/dist/jscomp/test/parser_api_test.js @@ -3,7 +3,7 @@ var Mt = require("./mt.js"); var Parser_api = require("./parser_api.js"); -var Stdlib__Lexing = require("melange/stdlib_modules/lexing.js"); +var Stdlib__Lexing = require("melange/./lexing.js"); var suites = { contents: /* [] */0 diff --git a/jscomp/test/dist/jscomp/test/printf_sim.js b/jscomp/test/dist/jscomp/test/printf_sim.js index aef7e6336b..196a2efabb 100644 --- a/jscomp/test/dist/jscomp/test/printf_sim.js +++ b/jscomp/test/dist/jscomp/test/printf_sim.js @@ -2,7 +2,7 @@ 'use strict'; var Curry = require("melange.runtime/curry.js"); -var Stdlib__Printf = require("melange/stdlib_modules/printf.js"); +var Stdlib__Printf = require("melange/./printf.js"); Curry._1(Stdlib__Printf.printf(/* Format */{ _0: { diff --git a/jscomp/test/dist/jscomp/test/printf_test.js b/jscomp/test/dist/jscomp/test/printf_test.js index 6026d02100..0a1707ffc6 100644 --- a/jscomp/test/dist/jscomp/test/printf_test.js +++ b/jscomp/test/dist/jscomp/test/printf_test.js @@ -3,8 +3,8 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); -var Stdlib__Format = require("melange/stdlib_modules/format.js"); -var Stdlib__Printf = require("melange/stdlib_modules/printf.js"); +var Stdlib__Format = require("melange/./format.js"); +var Stdlib__Printf = require("melange/./printf.js"); function print_pair(fmt, param) { Curry._2(Stdlib__Format.fprintf(fmt)(/* Format */{ diff --git a/jscomp/test/dist/jscomp/test/qcc.js b/jscomp/test/dist/jscomp/test/qcc.js index c2207c88ad..edea621498 100644 --- a/jscomp/test/dist/jscomp/test/qcc.js +++ b/jscomp/test/dist/jscomp/test/qcc.js @@ -10,11 +10,11 @@ var Caml_array = require("melange.runtime/caml_array.js"); var Caml_bytes = require("melange.runtime/caml_bytes.js"); var Caml_option = require("melange.runtime/caml_option.js"); var Caml_string = require("melange.runtime/caml_string.js"); -var Stdlib__Char = require("melange/stdlib_modules/char.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Bytes = require("melange/stdlib_modules/bytes.js"); -var Stdlib__Printf = require("melange/stdlib_modules/printf.js"); -var Stdlib__String = require("melange/stdlib_modules/string.js"); +var Stdlib__Char = require("melange/./char.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Bytes = require("melange/./bytes.js"); +var Stdlib__Printf = require("melange/./printf.js"); +var Stdlib__String = require("melange/./string.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); var Caml_external_polyfill = require("melange.runtime/caml_external_polyfill.js"); diff --git a/jscomp/test/dist/jscomp/test/queue_test.js b/jscomp/test/dist/jscomp/test/queue_test.js index ee4ac4ab89..85d4e62f8d 100644 --- a/jscomp/test/dist/jscomp/test/queue_test.js +++ b/jscomp/test/dist/jscomp/test/queue_test.js @@ -4,8 +4,8 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Caml_array = require("melange.runtime/caml_array.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); -var Stdlib__Queue = require("melange/stdlib_modules/queue.js"); +var Stdlib__Array = require("melange/./array.js"); +var Stdlib__Queue = require("melange/./queue.js"); function Test(Queue) { var to_array = function (q) { diff --git a/jscomp/test/dist/jscomp/test/random_test.js b/jscomp/test/dist/jscomp/test/random_test.js index 9f8dad3df7..6e9cb8c9e8 100644 --- a/jscomp/test/dist/jscomp/test/random_test.js +++ b/jscomp/test/dist/jscomp/test/random_test.js @@ -5,9 +5,9 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Mt_global = require("./mt_global.js"); var Caml_array = require("melange.runtime/caml_array.js"); -var Stdlib__Int64 = require("melange/stdlib_modules/int64.js"); -var Stdlib__Printf = require("melange/stdlib_modules/printf.js"); -var Stdlib__Random = require("melange/stdlib_modules/random.js"); +var Stdlib__Int64 = require("melange/./int64.js"); +var Stdlib__Printf = require("melange/./printf.js"); +var Stdlib__Random = require("melange/./random.js"); var id = { contents: 0 diff --git a/jscomp/test/dist/jscomp/test/raw_hash_tbl_bench.js b/jscomp/test/dist/jscomp/test/raw_hash_tbl_bench.js index 6e9e0f096c..7eca175e3d 100644 --- a/jscomp/test/dist/jscomp/test/raw_hash_tbl_bench.js +++ b/jscomp/test/dist/jscomp/test/raw_hash_tbl_bench.js @@ -1,7 +1,7 @@ // Generated by Melange 'use strict'; -var Stdlib__Hashtbl = require("melange/stdlib_modules/hashtbl.js"); +var Stdlib__Hashtbl = require("melange/./hashtbl.js"); function bench(param) { var table = Stdlib__Hashtbl.create(undefined, 1000000); diff --git a/jscomp/test/dist/jscomp/test/raw_pure_test.js b/jscomp/test/dist/jscomp/test/raw_pure_test.js index 3ef178d1a6..6a8867d805 100644 --- a/jscomp/test/dist/jscomp/test/raw_pure_test.js +++ b/jscomp/test/dist/jscomp/test/raw_pure_test.js @@ -5,7 +5,7 @@ // hello 'use strict'; -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); var x0 = null; diff --git a/jscomp/test/dist/jscomp/test/re_or_res/hello_res.js b/jscomp/test/dist/jscomp/test/re_or_res/hello_res.js index 310cd3d150..e50fb4cac4 100644 --- a/jscomp/test/dist/jscomp/test/re_or_res/hello_res.js +++ b/jscomp/test/dist/jscomp/test/re_or_res/hello_res.js @@ -1,7 +1,7 @@ // Generated by Melange 'use strict'; -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); var b = Stdlib__List.length({ hd: 1, diff --git a/jscomp/test/dist/jscomp/test/re_or_res/inline_map_demo.js b/jscomp/test/dist/jscomp/test/re_or_res/inline_map_demo.js index e07e3b2bd0..107b908671 100644 --- a/jscomp/test/dist/jscomp/test/re_or_res/inline_map_demo.js +++ b/jscomp/test/dist/jscomp/test/re_or_res/inline_map_demo.js @@ -4,7 +4,7 @@ var Mt = require("../mt.js"); var Caml = require("melange.runtime/caml.js"); var Stdlib = require("melange/./stdlib.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); function height(x) { if (x) { diff --git a/jscomp/test/dist/jscomp/test/re_or_res/lazy_demo.js b/jscomp/test/dist/jscomp/test/re_or_res/lazy_demo.js index 1675b90599..bbcd564200 100644 --- a/jscomp/test/dist/jscomp/test/re_or_res/lazy_demo.js +++ b/jscomp/test/dist/jscomp/test/re_or_res/lazy_demo.js @@ -1,7 +1,7 @@ // Generated by Melange 'use strict'; -var CamlinternalLazy = require("melange/stdlib_modules/camlinternalLazy.js"); +var CamlinternalLazy = require("melange/./camlinternalLazy.js"); var lazy1 = { LAZY_DONE: false, diff --git a/jscomp/test/dist/jscomp/test/re_or_res/reactjs_ppx_custom.js b/jscomp/test/dist/jscomp/test/re_or_res/reactjs_ppx_custom.js index a6d2304a63..9100e22fbe 100644 --- a/jscomp/test/dist/jscomp/test/re_or_res/reactjs_ppx_custom.js +++ b/jscomp/test/dist/jscomp/test/re_or_res/reactjs_ppx_custom.js @@ -8,7 +8,7 @@ function Reactjs_ppx_custom$Internal$header(Props) { RE_EXN_ID: "Assert_failure", _1: [ "reactjs_ppx_custom.re", - 6, + 4, 21 ], Error: new Error() diff --git a/jscomp/test/dist/jscomp/test/rec_module_opt.js b/jscomp/test/dist/jscomp/test/rec_module_opt.js index d0530a00c1..727f798470 100644 --- a/jscomp/test/dist/jscomp/test/rec_module_opt.js +++ b/jscomp/test/dist/jscomp/test/rec_module_opt.js @@ -3,7 +3,7 @@ var Caml = require("melange.runtime/caml.js"); var Curry = require("melange.runtime/curry.js"); -var Stdlib__Set = require("melange/stdlib_modules/set.js"); +var Stdlib__Set = require("melange/./set.js"); function compare(t1, t2) { if (t1.TAG === /* Leaf */0) { diff --git a/jscomp/test/dist/jscomp/test/rec_module_test.js b/jscomp/test/dist/jscomp/test/rec_module_test.js index 53b0ff54d5..b327b349cd 100644 --- a/jscomp/test/dist/jscomp/test/rec_module_test.js +++ b/jscomp/test/dist/jscomp/test/rec_module_test.js @@ -7,8 +7,8 @@ var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_obj = require("melange.runtime/caml_obj.js"); var Caml_option = require("melange.runtime/caml_option.js"); -var Stdlib__Seq = require("melange/stdlib_modules/seq.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__Seq = require("melange/./seq.js"); +var Stdlib__List = require("melange/./list.js"); function even(n) { if (n === 0) { diff --git a/jscomp/test/dist/jscomp/test/rec_value_test.js b/jscomp/test/dist/jscomp/test/rec_value_test.js index 9e7cfc4af0..05472985be 100644 --- a/jscomp/test/dist/jscomp/test/rec_value_test.js +++ b/jscomp/test/dist/jscomp/test/rec_value_test.js @@ -4,8 +4,8 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Caml_obj = require("melange.runtime/caml_obj.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var CamlinternalLazy = require("melange/stdlib_modules/camlinternalLazy.js"); +var Stdlib__List = require("melange/./list.js"); +var CamlinternalLazy = require("melange/./camlinternalLazy.js"); var x = {}; diff --git a/jscomp/test/dist/jscomp/test/record_debug_test.js b/jscomp/test/dist/jscomp/test/record_debug_test.js index af91f6b7a7..5f11a70238 100644 --- a/jscomp/test/dist/jscomp/test/record_debug_test.js +++ b/jscomp/test/dist/jscomp/test/record_debug_test.js @@ -2,7 +2,7 @@ 'use strict'; var Mt = require("./mt.js"); -var Stdlib__Format = require("melange/stdlib_modules/format.js"); +var Stdlib__Format = require("melange/./format.js"); var Caml_exceptions = require("melange.runtime/caml_exceptions.js"); var suites = { diff --git a/jscomp/test/dist/jscomp/test/recursive_module.js b/jscomp/test/dist/jscomp/test/recursive_module.js index fd3536ad41..8f69181210 100644 --- a/jscomp/test/dist/jscomp/test/recursive_module.js +++ b/jscomp/test/dist/jscomp/test/recursive_module.js @@ -5,8 +5,8 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_module = require("melange.runtime/caml_module.js"); -var Stdlib__Lazy = require("melange/stdlib_modules/lazy.js"); -var CamlinternalLazy = require("melange/stdlib_modules/camlinternalLazy.js"); +var Stdlib__Lazy = require("melange/./lazy.js"); +var CamlinternalLazy = require("melange/./camlinternalLazy.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); var Caml_external_polyfill = require("melange.runtime/caml_external_polyfill.js"); diff --git a/jscomp/test/dist/jscomp/test/recursive_records_test.js b/jscomp/test/dist/jscomp/test/recursive_records_test.js index f7d65af861..ab2846ac9f 100644 --- a/jscomp/test/dist/jscomp/test/recursive_records_test.js +++ b/jscomp/test/dist/jscomp/test/recursive_records_test.js @@ -3,7 +3,7 @@ var Mt = require("./mt.js"); var Caml_obj = require("melange.runtime/caml_obj.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); var suites = { contents: /* [] */0 diff --git a/jscomp/test/dist/jscomp/test/scanf_io.js b/jscomp/test/dist/jscomp/test/scanf_io.js index 0b6aa24c3c..18dd6adc0d 100644 --- a/jscomp/test/dist/jscomp/test/scanf_io.js +++ b/jscomp/test/dist/jscomp/test/scanf_io.js @@ -6,12 +6,12 @@ var Stdlib = require("melange/./stdlib.js"); var Caml_io = require("melange.runtime/caml_io.js"); var Caml_obj = require("melange.runtime/caml_obj.js"); var Caml_bytes = require("melange.runtime/caml_bytes.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Bytes = require("melange/stdlib_modules/bytes.js"); -var Stdlib__Scanf = require("melange/stdlib_modules/scanf.js"); -var Stdlib__Buffer = require("melange/stdlib_modules/buffer.js"); -var Stdlib__Digest = require("melange/stdlib_modules/digest.js"); -var Stdlib__Printf = require("melange/stdlib_modules/printf.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Bytes = require("melange/./bytes.js"); +var Stdlib__Scanf = require("melange/./scanf.js"); +var Stdlib__Buffer = require("melange/./buffer.js"); +var Stdlib__Digest = require("melange/./digest.js"); +var Stdlib__Printf = require("melange/./printf.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); var Caml_external_polyfill = require("melange.runtime/caml_external_polyfill.js"); diff --git a/jscomp/test/dist/jscomp/test/scanf_reference_error_regression_test.js b/jscomp/test/dist/jscomp/test/scanf_reference_error_regression_test.js index 46a09541ae..5ee9826e0a 100644 --- a/jscomp/test/dist/jscomp/test/scanf_reference_error_regression_test.js +++ b/jscomp/test/dist/jscomp/test/scanf_reference_error_regression_test.js @@ -4,9 +4,9 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Mt_global = require("./mt_global.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Scanf = require("melange/stdlib_modules/scanf.js"); -var Stdlib__Printf = require("melange/stdlib_modules/printf.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Scanf = require("melange/./scanf.js"); +var Stdlib__Printf = require("melange/./printf.js"); var suites = { contents: /* [] */0 diff --git a/jscomp/test/dist/jscomp/test/scanf_test.js b/jscomp/test/dist/jscomp/test/scanf_test.js index 6ee0986747..be88540101 100644 --- a/jscomp/test/dist/jscomp/test/scanf_test.js +++ b/jscomp/test/dist/jscomp/test/scanf_test.js @@ -4,7 +4,7 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Mt_global = require("./mt_global.js"); -var Stdlib__Scanf = require("melange/stdlib_modules/scanf.js"); +var Stdlib__Scanf = require("melange/./scanf.js"); var suites = { contents: /* [] */0 diff --git a/jscomp/test/dist/jscomp/test/set_gen.js b/jscomp/test/dist/jscomp/test/set_gen.js index 93359af771..023a9f35c3 100644 --- a/jscomp/test/dist/jscomp/test/set_gen.js +++ b/jscomp/test/dist/jscomp/test/set_gen.js @@ -4,7 +4,7 @@ var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_obj = require("melange.runtime/caml_obj.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); var Caml_exceptions = require("melange.runtime/caml_exceptions.js"); function cons_enum(_s, _e) { diff --git a/jscomp/test/dist/jscomp/test/sexp.js b/jscomp/test/dist/jscomp/test/sexp.js index 625003fa05..42e777a344 100644 --- a/jscomp/test/dist/jscomp/test/sexp.js +++ b/jscomp/test/dist/jscomp/test/sexp.js @@ -6,8 +6,8 @@ var Stdlib = require("melange/./stdlib.js"); var Caml_obj = require("melange.runtime/caml_obj.js"); var Caml_format = require("melange.runtime/caml_format.js"); var Caml_option = require("melange.runtime/caml_option.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Hashtbl = require("melange/stdlib_modules/hashtbl.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Hashtbl = require("melange/./hashtbl.js"); var equal = Caml_obj.caml_equal; diff --git a/jscomp/test/dist/jscomp/test/sexpm.js b/jscomp/test/dist/jscomp/test/sexpm.js index dc06f01ef2..9d58e7d971 100644 --- a/jscomp/test/dist/jscomp/test/sexpm.js +++ b/jscomp/test/dist/jscomp/test/sexpm.js @@ -6,15 +6,15 @@ var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_io = require("melange.runtime/caml_io.js"); var Caml_bytes = require("melange.runtime/caml_bytes.js"); -var Stdlib__Sys = require("melange/stdlib_modules/sys.js"); -var Stdlib__Char = require("melange/stdlib_modules/char.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Bytes = require("melange/stdlib_modules/bytes.js"); -var Stdlib__Buffer = require("melange/stdlib_modules/buffer.js"); -var Stdlib__Format = require("melange/stdlib_modules/format.js"); -var Stdlib__Printf = require("melange/stdlib_modules/printf.js"); -var Stdlib__String = require("melange/stdlib_modules/string.js"); -var Stdlib__Printexc = require("melange/stdlib_modules/printexc.js"); +var Stdlib__Sys = require("melange/./sys.js"); +var Stdlib__Char = require("melange/./char.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Bytes = require("melange/./bytes.js"); +var Stdlib__Buffer = require("melange/./buffer.js"); +var Stdlib__Format = require("melange/./format.js"); +var Stdlib__Printf = require("melange/./printf.js"); +var Stdlib__String = require("melange/./string.js"); +var Stdlib__Printexc = require("melange/./printexc.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); var Caml_external_polyfill = require("melange.runtime/caml_external_polyfill.js"); diff --git a/jscomp/test/dist/jscomp/test/sexpm_test.js b/jscomp/test/dist/jscomp/test/sexpm_test.js index 6b98153abd..2dbe1e31bb 100644 --- a/jscomp/test/dist/jscomp/test/sexpm_test.js +++ b/jscomp/test/dist/jscomp/test/sexpm_test.js @@ -4,7 +4,7 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Sexpm = require("./sexpm.js"); -var Stdlib__Format = require("melange/stdlib_modules/format.js"); +var Stdlib__Format = require("melange/./format.js"); var suites = { contents: /* [] */0 diff --git a/jscomp/test/dist/jscomp/test/simple_lexer_test.js b/jscomp/test/dist/jscomp/test/simple_lexer_test.js index b2e35757fc..8f4aeb6fa3 100644 --- a/jscomp/test/dist/jscomp/test/simple_lexer_test.js +++ b/jscomp/test/dist/jscomp/test/simple_lexer_test.js @@ -4,8 +4,8 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Caml_bytes = require("melange.runtime/caml_bytes.js"); -var Stdlib__Bytes = require("melange/stdlib_modules/bytes.js"); -var Stdlib__Lexing = require("melange/stdlib_modules/lexing.js"); +var Stdlib__Bytes = require("melange/./bytes.js"); +var Stdlib__Lexing = require("melange/./lexing.js"); var __ocaml_lex_tables = { lex_base: "\0\0\xfd\xff\xfe\xff\0\0\0\0\x01\0\0\0\0\0\0\0\0\0\0\0\0\0\x04\0\x01\0\x04\0\x03\0\0\0\x06\0\0\0\xff\xff", diff --git a/jscomp/test/dist/jscomp/test/sprintf_reg_test.js b/jscomp/test/dist/jscomp/test/sprintf_reg_test.js index dfae022516..5470f58ffb 100644 --- a/jscomp/test/dist/jscomp/test/sprintf_reg_test.js +++ b/jscomp/test/dist/jscomp/test/sprintf_reg_test.js @@ -4,7 +4,7 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Mt_global = require("./mt_global.js"); -var Stdlib__Printf = require("melange/stdlib_modules/printf.js"); +var Stdlib__Printf = require("melange/./printf.js"); var suites = { contents: /* [] */0 diff --git a/jscomp/test/dist/jscomp/test/stack_comp_test.js b/jscomp/test/dist/jscomp/test/stack_comp_test.js index 64185c665e..82a666ccfb 100644 --- a/jscomp/test/dist/jscomp/test/stack_comp_test.js +++ b/jscomp/test/dist/jscomp/test/stack_comp_test.js @@ -5,8 +5,8 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Caml_obj = require("melange.runtime/caml_obj.js"); var Mt_global = require("./mt_global.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Stack = require("melange/stdlib_modules/stack.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Stack = require("melange/./stack.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); var suites = { diff --git a/jscomp/test/dist/jscomp/test/stack_test.js b/jscomp/test/dist/jscomp/test/stack_test.js index 9441d65aab..fe8603e8c3 100644 --- a/jscomp/test/dist/jscomp/test/stack_test.js +++ b/jscomp/test/dist/jscomp/test/stack_test.js @@ -3,8 +3,8 @@ var Mt = require("./mt.js"); var Caml_obj = require("melange.runtime/caml_obj.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Stack = require("melange/stdlib_modules/stack.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Stack = require("melange/./stack.js"); function to_list(v) { var acc = /* [] */0; diff --git a/jscomp/test/dist/jscomp/test/stream_parser_test.js b/jscomp/test/dist/jscomp/test/stream_parser_test.js index a40f33b206..93dcc395fd 100644 --- a/jscomp/test/dist/jscomp/test/stream_parser_test.js +++ b/jscomp/test/dist/jscomp/test/stream_parser_test.js @@ -4,9 +4,9 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Caml_int32 = require("melange.runtime/caml_int32.js"); -var Stdlib__Queue = require("melange/stdlib_modules/queue.js"); -var Stdlib__Genlex = require("melange/stdlib_modules/genlex.js"); -var Stdlib__Stream = require("melange/stdlib_modules/stream.js"); +var Stdlib__Queue = require("melange/./queue.js"); +var Stdlib__Genlex = require("melange/./genlex.js"); +var Stdlib__Stream = require("melange/./stream.js"); var Caml_exceptions = require("melange.runtime/caml_exceptions.js"); var Parse_error = /* @__PURE__ */Caml_exceptions.create("Stream_parser_test.Parse_error"); diff --git a/jscomp/test/dist/jscomp/test/string_runtime_test.js b/jscomp/test/dist/jscomp/test/string_runtime_test.js index 44e215bb1c..84751f2593 100644 --- a/jscomp/test/dist/jscomp/test/string_runtime_test.js +++ b/jscomp/test/dist/jscomp/test/string_runtime_test.js @@ -4,8 +4,8 @@ var Mt = require("./mt.js"); var Test_char = require("./test_char.js"); var Caml_bytes = require("melange.runtime/caml_bytes.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Bytes = require("melange/stdlib_modules/bytes.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Bytes = require("melange/./bytes.js"); var suites_0 = [ "caml_is_printable", diff --git a/jscomp/test/dist/jscomp/test/string_set.js b/jscomp/test/dist/jscomp/test/string_set.js index 0e0fc88e86..9258b4b85c 100644 --- a/jscomp/test/dist/jscomp/test/string_set.js +++ b/jscomp/test/dist/jscomp/test/string_set.js @@ -4,9 +4,9 @@ var Caml = require("melange.runtime/caml.js"); var Stdlib = require("melange/./stdlib.js"); var Set_gen = require("./set_gen.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); -var Stdlib__String = require("melange/stdlib_modules/string.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Array = require("melange/./array.js"); +var Stdlib__String = require("melange/./string.js"); function split(x, tree) { if (!tree) { diff --git a/jscomp/test/dist/jscomp/test/string_test.js b/jscomp/test/dist/jscomp/test/string_test.js index c03abd5698..448e0bc899 100644 --- a/jscomp/test/dist/jscomp/test/string_test.js +++ b/jscomp/test/dist/jscomp/test/string_test.js @@ -4,9 +4,9 @@ var Mt = require("./mt.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_bytes = require("melange.runtime/caml_bytes.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Bytes = require("melange/stdlib_modules/bytes.js"); -var Stdlib__String = require("melange/stdlib_modules/string.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Bytes = require("melange/./bytes.js"); +var Stdlib__String = require("melange/./string.js"); var Ext_string_test = require("./ext_string_test.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); diff --git a/jscomp/test/dist/jscomp/test/tailcall_inline_test.js b/jscomp/test/dist/jscomp/test/tailcall_inline_test.js index 19ab37f4d4..f0ef4fc934 100644 --- a/jscomp/test/dist/jscomp/test/tailcall_inline_test.js +++ b/jscomp/test/dist/jscomp/test/tailcall_inline_test.js @@ -3,7 +3,7 @@ var Mt = require("./mt.js"); var Caml_array = require("melange.runtime/caml_array.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); +var Stdlib__Array = require("melange/./array.js"); function f(param) { var f$1 = function (_acc, _n) { diff --git a/jscomp/test/dist/jscomp/test/test_alias.js b/jscomp/test/dist/jscomp/test/test_alias.js index a54bc839f0..4b836b34f9 100644 --- a/jscomp/test/dist/jscomp/test/test_alias.js +++ b/jscomp/test/dist/jscomp/test/test_alias.js @@ -1,7 +1,7 @@ // Generated by Melange 'use strict'; -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); var v = Stdlib__List.length; diff --git a/jscomp/test/dist/jscomp/test/test_ari.js b/jscomp/test/dist/jscomp/test/test_ari.js index 01debe25bc..8e309a9085 100644 --- a/jscomp/test/dist/jscomp/test/test_ari.js +++ b/jscomp/test/dist/jscomp/test/test_ari.js @@ -4,7 +4,7 @@ var U = require("U"); var VV = require("VV"); var Curry = require("melange.runtime/curry.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); function f(x) { return function (param) { diff --git a/jscomp/test/dist/jscomp/test/test_array.js b/jscomp/test/dist/jscomp/test/test_array.js index 72656de278..b64a4ecf22 100644 --- a/jscomp/test/dist/jscomp/test/test_array.js +++ b/jscomp/test/dist/jscomp/test/test_array.js @@ -2,7 +2,7 @@ 'use strict'; var Caml_array = require("melange.runtime/caml_array.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); +var Stdlib__Array = require("melange/./array.js"); var v = Caml_array.make(6, 5); diff --git a/jscomp/test/dist/jscomp/test/test_array_append.js b/jscomp/test/dist/jscomp/test/test_array_append.js index c6d3e5899c..f78aba5794 100644 --- a/jscomp/test/dist/jscomp/test/test_array_append.js +++ b/jscomp/test/dist/jscomp/test/test_array_append.js @@ -1,7 +1,7 @@ // Generated by Melange 'use strict'; -var Stdlib__Array = require("melange/stdlib_modules/array.js"); +var Stdlib__Array = require("melange/./array.js"); var const_v = Stdlib__Array.append([ 1, diff --git a/jscomp/test/dist/jscomp/test/test_bug.js b/jscomp/test/dist/jscomp/test/test_bug.js index e134bef5dc..fe1b25335b 100644 --- a/jscomp/test/dist/jscomp/test/test_bug.js +++ b/jscomp/test/dist/jscomp/test/test_bug.js @@ -3,7 +3,7 @@ var Test_char = require("./test_char.js"); var Caml_bytes = require("melange.runtime/caml_bytes.js"); -var Stdlib__Bytes = require("melange/stdlib_modules/bytes.js"); +var Stdlib__Bytes = require("melange/./bytes.js"); function escaped(s) { var n = 0; diff --git a/jscomp/test/dist/jscomp/test/test_closure.js b/jscomp/test/dist/jscomp/test/test_closure.js index fc879459ce..46471631b8 100644 --- a/jscomp/test/dist/jscomp/test/test_closure.js +++ b/jscomp/test/dist/jscomp/test/test_closure.js @@ -3,7 +3,7 @@ var Curry = require("melange.runtime/curry.js"); var Caml_array = require("melange.runtime/caml_array.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); +var Stdlib__Array = require("melange/./array.js"); var v = { contents: 0 diff --git a/jscomp/test/dist/jscomp/test/test_demo.js b/jscomp/test/dist/jscomp/test/test_demo.js index 4da875a1ad..84df6f4a0b 100644 --- a/jscomp/test/dist/jscomp/test/test_demo.js +++ b/jscomp/test/dist/jscomp/test/test_demo.js @@ -2,7 +2,7 @@ 'use strict'; var Curry = require("melange.runtime/curry.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); function fib(n) { if (n === 2 || n === 1) { diff --git a/jscomp/test/dist/jscomp/test/test_filename.js b/jscomp/test/dist/jscomp/test/test_filename.js index 2c64c1ef1c..22b1f16649 100644 --- a/jscomp/test/dist/jscomp/test/test_filename.js +++ b/jscomp/test/dist/jscomp/test/test_filename.js @@ -1,8 +1,8 @@ // Generated by Melange 'use strict'; -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Filename = require("melange/stdlib_modules/filename.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Filename = require("melange/./filename.js"); var u = Stdlib__Filename.chop_extension; diff --git a/jscomp/test/dist/jscomp/test/test_for_loop.js b/jscomp/test/dist/jscomp/test/test_for_loop.js index f39ef46218..57436276a4 100644 --- a/jscomp/test/dist/jscomp/test/test_for_loop.js +++ b/jscomp/test/dist/jscomp/test/test_for_loop.js @@ -3,7 +3,7 @@ var Curry = require("melange.runtime/curry.js"); var Caml_array = require("melange.runtime/caml_array.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); +var Stdlib__Array = require("melange/./array.js"); function for_(x) { for(var i = 0 ,i_finish = (console.log("hi"), x.length); i <= i_finish; ++i){ diff --git a/jscomp/test/dist/jscomp/test/test_for_map.js b/jscomp/test/dist/jscomp/test/test_for_map.js index f28fdc2a8a..e3a6b72325 100644 --- a/jscomp/test/dist/jscomp/test/test_for_map.js +++ b/jscomp/test/dist/jscomp/test/test_for_map.js @@ -5,7 +5,7 @@ var Caml = require("melange.runtime/caml.js"); var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_option = require("melange.runtime/caml_option.js"); -var Stdlib__Seq = require("melange/stdlib_modules/seq.js"); +var Stdlib__Seq = require("melange/./seq.js"); var compare = Caml.caml_int_compare; diff --git a/jscomp/test/dist/jscomp/test/test_format.js b/jscomp/test/dist/jscomp/test/test_format.js index 2e3f659092..9d117ceede 100644 --- a/jscomp/test/dist/jscomp/test/test_format.js +++ b/jscomp/test/dist/jscomp/test/test_format.js @@ -2,7 +2,7 @@ 'use strict'; var Curry = require("melange.runtime/curry.js"); -var Stdlib__Format = require("melange/stdlib_modules/format.js"); +var Stdlib__Format = require("melange/./format.js"); Curry._1(Stdlib__Format.fprintf(Stdlib__Format.std_formatter)(/* Format */{ _0: { diff --git a/jscomp/test/dist/jscomp/test/test_google_closure.js b/jscomp/test/dist/jscomp/test/test_google_closure.js index 9d1a316814..94f6b6060f 100644 --- a/jscomp/test/dist/jscomp/test/test_google_closure.js +++ b/jscomp/test/dist/jscomp/test/test_google_closure.js @@ -2,7 +2,7 @@ 'use strict'; var Caml_array = require("melange.runtime/caml_array.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); +var Stdlib__Array = require("melange/./array.js"); function f(a, b, param) { return a + b | 0; diff --git a/jscomp/test/dist/jscomp/test/test_include.js b/jscomp/test/dist/jscomp/test/test_include.js index 5e623388c7..bcde5d469a 100644 --- a/jscomp/test/dist/jscomp/test/test_include.js +++ b/jscomp/test/dist/jscomp/test/test_include.js @@ -2,8 +2,8 @@ 'use strict'; var Test_order = require("./test_order.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__String = require("melange/stdlib_modules/string.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__String = require("melange/./string.js"); function Make(U) { var compare = U.compare; diff --git a/jscomp/test/dist/jscomp/test/test_int_map_find.js b/jscomp/test/dist/jscomp/test/test_int_map_find.js index 83ba5e4131..dadb6eb810 100644 --- a/jscomp/test/dist/jscomp/test/test_int_map_find.js +++ b/jscomp/test/dist/jscomp/test/test_int_map_find.js @@ -3,7 +3,7 @@ var Caml = require("melange.runtime/caml.js"); var Curry = require("melange.runtime/curry.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); var compare = Caml.caml_int_compare; diff --git a/jscomp/test/dist/jscomp/test/test_internalOO.js b/jscomp/test/dist/jscomp/test/test_internalOO.js index d88c32a4dd..bc33629280 100644 --- a/jscomp/test/dist/jscomp/test/test_internalOO.js +++ b/jscomp/test/dist/jscomp/test/test_internalOO.js @@ -10,10 +10,10 @@ var Caml_array = require("melange.runtime/caml_array.js"); var Caml_int32 = require("melange.runtime/caml_int32.js"); var Caml_option = require("melange.runtime/caml_option.js"); var Caml_string = require("melange.runtime/caml_string.js"); -var Stdlib__Seq = require("melange/stdlib_modules/seq.js"); -var Stdlib__Sys = require("melange/stdlib_modules/sys.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); +var Stdlib__Seq = require("melange/./seq.js"); +var Stdlib__Sys = require("melange/./sys.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Array = require("melange/./array.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); function copy(o) { diff --git a/jscomp/test/dist/jscomp/test/test_js_ffi.js b/jscomp/test/dist/jscomp/test/test_js_ffi.js index 80cc87211f..f14962a969 100644 --- a/jscomp/test/dist/jscomp/test/test_js_ffi.js +++ b/jscomp/test/dist/jscomp/test/test_js_ffi.js @@ -1,7 +1,7 @@ // Generated by Melange 'use strict'; -var Stdlib__String = require("melange/stdlib_modules/string.js"); +var Stdlib__String = require("melange/./string.js"); function v(u) { t({ diff --git a/jscomp/test/dist/jscomp/test/test_list.js b/jscomp/test/dist/jscomp/test/test_list.js index 9e36257838..15cae97691 100644 --- a/jscomp/test/dist/jscomp/test/test_list.js +++ b/jscomp/test/dist/jscomp/test/test_list.js @@ -4,7 +4,7 @@ var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_obj = require("melange.runtime/caml_obj.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); function length_aux(_len, _param) { while(true) { diff --git a/jscomp/test/dist/jscomp/test/test_mutliple.js b/jscomp/test/dist/jscomp/test/test_mutliple.js index c8a19423bf..7d619e390a 100644 --- a/jscomp/test/dist/jscomp/test/test_mutliple.js +++ b/jscomp/test/dist/jscomp/test/test_mutliple.js @@ -1,7 +1,7 @@ // Generated by Melange 'use strict'; -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); var f = Stdlib__List.length(/* [] */0); diff --git a/jscomp/test/dist/jscomp/test/test_pervasive.js b/jscomp/test/dist/jscomp/test/test_pervasive.js index 4bdf40c631..fc8950d8b7 100644 --- a/jscomp/test/dist/jscomp/test/test_pervasive.js +++ b/jscomp/test/dist/jscomp/test/test_pervasive.js @@ -1,8 +1,8 @@ // Generated by Melange 'use strict'; -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Pervasives = require("melange/stdlib_modules/pervasives.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Pervasives = require("melange/./pervasives.js"); var Pervasives = { length: Stdlib__List.length, diff --git a/jscomp/test/dist/jscomp/test/test_pervasives2.js b/jscomp/test/dist/jscomp/test/test_pervasives2.js index d908121ce5..d08bc3ba19 100644 --- a/jscomp/test/dist/jscomp/test/test_pervasives2.js +++ b/jscomp/test/dist/jscomp/test/test_pervasives2.js @@ -1,9 +1,9 @@ // Generated by Melange 'use strict'; -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Stack = require("melange/stdlib_modules/stack.js"); -var Stdlib__Pervasives = require("melange/stdlib_modules/pervasives.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Stack = require("melange/./stack.js"); +var Stdlib__Pervasives = require("melange/./pervasives.js"); var List = { length: Stdlib__List.length, diff --git a/jscomp/test/dist/jscomp/test/test_pervasives3.js b/jscomp/test/dist/jscomp/test/test_pervasives3.js index ca5b08765e..c95e614f3f 100644 --- a/jscomp/test/dist/jscomp/test/test_pervasives3.js +++ b/jscomp/test/dist/jscomp/test/test_pervasives3.js @@ -1,8 +1,8 @@ // Generated by Melange 'use strict'; -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Pervasives = require("melange/stdlib_modules/pervasives.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Pervasives = require("melange/./pervasives.js"); var Pervasives = { invalid_arg: Stdlib__Pervasives.invalid_arg, diff --git a/jscomp/test/dist/jscomp/test/test_primitive.js b/jscomp/test/dist/jscomp/test/test_primitive.js index 5382ca4f85..04036ca932 100644 --- a/jscomp/test/dist/jscomp/test/test_primitive.js +++ b/jscomp/test/dist/jscomp/test/test_primitive.js @@ -4,7 +4,7 @@ var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_array = require("melange.runtime/caml_array.js"); -var CamlinternalLazy = require("melange/stdlib_modules/camlinternalLazy.js"); +var CamlinternalLazy = require("melange/./camlinternalLazy.js"); function a4(prim) { return [ diff --git a/jscomp/test/dist/jscomp/test/test_set.js b/jscomp/test/dist/jscomp/test/test_set.js index 37bf2dde6c..4a9f06d8ac 100644 --- a/jscomp/test/dist/jscomp/test/test_set.js +++ b/jscomp/test/dist/jscomp/test/test_set.js @@ -3,7 +3,7 @@ var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); function Make(Ord) { var height = function (param) { diff --git a/jscomp/test/dist/jscomp/test/test_simple_include.js b/jscomp/test/dist/jscomp/test/test_simple_include.js index 27979788e3..df7f8d9367 100644 --- a/jscomp/test/dist/jscomp/test/test_simple_include.js +++ b/jscomp/test/dist/jscomp/test/test_simple_include.js @@ -1,7 +1,7 @@ // Generated by Melange 'use strict'; -var Stdlib__Array = require("melange/stdlib_modules/array.js"); +var Stdlib__Array = require("melange/./array.js"); var v = { contents: 32 diff --git a/jscomp/test/dist/jscomp/test/test_simple_obj.js b/jscomp/test/dist/jscomp/test/test_simple_obj.js index ed444a7eeb..a806b2b3c6 100644 --- a/jscomp/test/dist/jscomp/test/test_simple_obj.js +++ b/jscomp/test/dist/jscomp/test/test_simple_obj.js @@ -2,7 +2,7 @@ 'use strict'; var Caml_oo_curry = require("melange.runtime/caml_oo_curry.js"); -var CamlinternalOO = require("melange/stdlib_modules/camlinternalOO.js"); +var CamlinternalOO = require("melange/./camlinternalOO.js"); var shared = ["add"]; diff --git a/jscomp/test/dist/jscomp/test/test_simple_pattern_match.js b/jscomp/test/dist/jscomp/test/test_simple_pattern_match.js index 214e2e152a..7b24c95c28 100644 --- a/jscomp/test/dist/jscomp/test/test_simple_pattern_match.js +++ b/jscomp/test/dist/jscomp/test/test_simple_pattern_match.js @@ -1,7 +1,7 @@ // Generated by Melange 'use strict'; -var Stdlib__Sys = require("melange/stdlib_modules/sys.js"); +var Stdlib__Sys = require("melange/./sys.js"); var match; diff --git a/jscomp/test/dist/jscomp/test/test_sprintf.js b/jscomp/test/dist/jscomp/test/test_sprintf.js index 8371e3b2c1..e16f2b2f85 100644 --- a/jscomp/test/dist/jscomp/test/test_sprintf.js +++ b/jscomp/test/dist/jscomp/test/test_sprintf.js @@ -2,7 +2,7 @@ 'use strict'; var Curry = require("melange.runtime/curry.js"); -var Stdlib__Printf = require("melange/stdlib_modules/printf.js"); +var Stdlib__Printf = require("melange/./printf.js"); console.error(Curry._2(Stdlib__Printf.sprintf(/* Format */{ _0: { diff --git a/jscomp/test/dist/jscomp/test/test_string_switch.js b/jscomp/test/dist/jscomp/test/test_string_switch.js index 607c8598d5..43cf08ef82 100644 --- a/jscomp/test/dist/jscomp/test/test_string_switch.js +++ b/jscomp/test/dist/jscomp/test/test_string_switch.js @@ -1,7 +1,7 @@ // Generated by Melange 'use strict'; -var Stdlib__Sys = require("melange/stdlib_modules/sys.js"); +var Stdlib__Sys = require("melange/./sys.js"); var os_version; diff --git a/jscomp/test/dist/jscomp/test/test_while_closure.js b/jscomp/test/dist/jscomp/test/test_while_closure.js index ed4c1d10ab..02a7445262 100644 --- a/jscomp/test/dist/jscomp/test/test_while_closure.js +++ b/jscomp/test/dist/jscomp/test/test_while_closure.js @@ -3,7 +3,7 @@ var Curry = require("melange.runtime/curry.js"); var Caml_array = require("melange.runtime/caml_array.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); +var Stdlib__Array = require("melange/./array.js"); var v = { contents: 0 diff --git a/jscomp/test/dist/jscomp/test/testing.js b/jscomp/test/dist/jscomp/test/testing.js index dc4de1415d..928f93846f 100644 --- a/jscomp/test/dist/jscomp/test/testing.js +++ b/jscomp/test/dist/jscomp/test/testing.js @@ -5,8 +5,8 @@ var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_io = require("melange.runtime/caml_io.js"); var Caml_obj = require("melange.runtime/caml_obj.js"); -var Stdlib__Scanf = require("melange/stdlib_modules/scanf.js"); -var Stdlib__Printf = require("melange/stdlib_modules/printf.js"); +var Stdlib__Scanf = require("melange/./scanf.js"); +var Stdlib__Printf = require("melange/./printf.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); var all_tests_ok = { diff --git a/jscomp/test/dist/jscomp/test/tfloat_record_test.js b/jscomp/test/dist/jscomp/test/tfloat_record_test.js index 93f65c3fa7..10df47d466 100644 --- a/jscomp/test/dist/jscomp/test/tfloat_record_test.js +++ b/jscomp/test/dist/jscomp/test/tfloat_record_test.js @@ -6,9 +6,9 @@ var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); var Mt_global = require("./mt_global.js"); var Float_array = require("./float_array.js"); -var Stdlib__Array = require("melange/stdlib_modules/array.js"); -var Stdlib__Buffer = require("melange/stdlib_modules/buffer.js"); -var Stdlib__Format = require("melange/stdlib_modules/format.js"); +var Stdlib__Array = require("melange/./array.js"); +var Stdlib__Buffer = require("melange/./buffer.js"); +var Stdlib__Format = require("melange/./format.js"); var buf = Stdlib__Buffer.create(50); diff --git a/jscomp/test/dist/jscomp/test/ticker.js b/jscomp/test/dist/jscomp/test/ticker.js index b41eaa2be9..37fee62aa1 100644 --- a/jscomp/test/dist/jscomp/test/ticker.js +++ b/jscomp/test/dist/jscomp/test/ticker.js @@ -7,10 +7,10 @@ var Stdlib = require("melange/./stdlib.js"); var Caml_obj = require("melange.runtime/caml_obj.js"); var Caml_format = require("melange.runtime/caml_format.js"); var Caml_option = require("melange.runtime/caml_option.js"); -var Stdlib__Seq = require("melange/stdlib_modules/seq.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Printf = require("melange/stdlib_modules/printf.js"); -var Stdlib__String = require("melange/stdlib_modules/string.js"); +var Stdlib__Seq = require("melange/./seq.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Printf = require("melange/./printf.js"); +var Stdlib__String = require("melange/./string.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); function split(delim, s) { diff --git a/jscomp/test/dist/jscomp/test/topsort_test.js b/jscomp/test/dist/jscomp/test/topsort_test.js index c681a202f9..ac01039ae6 100644 --- a/jscomp/test/dist/jscomp/test/topsort_test.js +++ b/jscomp/test/dist/jscomp/test/topsort_test.js @@ -5,9 +5,9 @@ var Curry = require("melange.runtime/curry.js"); var Stdlib = require("melange/./stdlib.js"); var Caml_obj = require("melange.runtime/caml_obj.js"); var Caml_option = require("melange.runtime/caml_option.js"); -var Stdlib__Seq = require("melange/stdlib_modules/seq.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__String = require("melange/stdlib_modules/string.js"); +var Stdlib__Seq = require("melange/./seq.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__String = require("melange/./string.js"); var Caml_exceptions = require("melange.runtime/caml_exceptions.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); diff --git a/jscomp/test/dist/jscomp/test/tscanf_test.js b/jscomp/test/dist/jscomp/test/tscanf_test.js index 4291c6a225..c29e76c994 100644 --- a/jscomp/test/dist/jscomp/test/tscanf_test.js +++ b/jscomp/test/dist/jscomp/test/tscanf_test.js @@ -12,13 +12,13 @@ var Caml_bytes = require("melange.runtime/caml_bytes.js"); var Caml_int64 = require("melange.runtime/caml_int64.js"); var Caml_format = require("melange.runtime/caml_format.js"); var Caml_string = require("melange.runtime/caml_string.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Bytes = require("melange/stdlib_modules/bytes.js"); -var Stdlib__Int32 = require("melange/stdlib_modules/int32.js"); -var Stdlib__Scanf = require("melange/stdlib_modules/scanf.js"); -var Stdlib__Buffer = require("melange/stdlib_modules/buffer.js"); -var Stdlib__Printf = require("melange/stdlib_modules/printf.js"); -var Stdlib__String = require("melange/stdlib_modules/string.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Bytes = require("melange/./bytes.js"); +var Stdlib__Int32 = require("melange/./int32.js"); +var Stdlib__Scanf = require("melange/./scanf.js"); +var Stdlib__Buffer = require("melange/./buffer.js"); +var Stdlib__Printf = require("melange/./printf.js"); +var Stdlib__String = require("melange/./string.js"); var Caml_js_exceptions = require("melange.runtime/caml_js_exceptions.js"); var suites = { diff --git a/jscomp/test/dist/jscomp/test/utf8_decode_test.js b/jscomp/test/dist/jscomp/test/utf8_decode_test.js index d309894236..474499acaf 100644 --- a/jscomp/test/dist/jscomp/test/utf8_decode_test.js +++ b/jscomp/test/dist/jscomp/test/utf8_decode_test.js @@ -4,8 +4,8 @@ var Mt = require("./mt.js"); var Curry = require("melange.runtime/curry.js"); var Caml_bytes = require("melange.runtime/caml_bytes.js"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); -var Stdlib__Stream = require("melange/stdlib_modules/stream.js"); +var Stdlib__List = require("melange/./list.js"); +var Stdlib__Stream = require("melange/./stream.js"); function classify(chr) { if ((chr & 128) === 0) { diff --git a/jscomp/test/dist/jscomp/test/webpack_config.js b/jscomp/test/dist/jscomp/test/webpack_config.js index 3b5f23f502..dfb332b07d 100644 --- a/jscomp/test/dist/jscomp/test/webpack_config.js +++ b/jscomp/test/dist/jscomp/test/webpack_config.js @@ -5,7 +5,7 @@ var List = require("List"); var List$1 = require("reactV"); var List$2 = require("reactX"); var Local = require("./local"); -var Stdlib__List = require("melange/stdlib_modules/list.js"); +var Stdlib__List = require("melange/./list.js"); var WebpackConfigJs = require("../../../webpack.config.js"); var WebpackMiddlewareConfigJs = require("../../../webpack.middleware.config.js");