From c52d0098663ed8592f88ffb3a11ac09d300adb53 Mon Sep 17 00:00:00 2001 From: Cristiano Calcagno Date: Thu, 30 Mar 2023 10:47:21 +0200 Subject: [PATCH] Test emitting let instead of var. Fixes https://github.com/rescript-lang/rescript-compiler/issues/856 --- CHANGELOG.md | 1 + .../custom_namespace/src/demo.bs.js | 2 +- jscomp/build_tests/devonly/src/demo.bs.js | 2 +- jscomp/build_tests/devonly/src/depdemo.bs.js | 2 +- jscomp/build_tests/devonly/src2/hello.bs.js | 2 +- .../build_tests/devonly/src2/hellodep.bs.js | 2 +- jscomp/build_tests/ns/src/demo.js | 2 +- jscomp/build_tests/ns/src/hello.js | 4 +- jscomp/build_tests/react_ppx/src/React.bs.js | 10 +- .../react_ppx/src/gpr_3695_test.bs.js | 12 +- .../react_ppx/src/gpr_3987_test.bs.js | 44 +- .../src/recursive_component_test.bs.js | 18 +- jscomp/core/js_dump.ml | 4 +- jscomp/core/js_dump_import_export.ml | 2 +- jscomp/core/js_dump_lit.ml | 2 +- .../src/Wrapper.res.js | 7 +- jscomp/test/406_primitive_test.js | 22 +- jscomp/test/AsInUncurriedExternals.js | 2 +- jscomp/test/Coercion.js | 4 +- jscomp/test/DerivingAccessorsCurried.js | 16 +- jscomp/test/DerivingAccessorsUncurried.js | 14 +- jscomp/test/DictInference.js | 6 +- jscomp/test/DotDotDot.js | 8 +- jscomp/test/EmptyRecord.js | 2 +- jscomp/test/FFI.js | 4 +- jscomp/test/Import.js | 50 +- jscomp/test/ImportAttributes.js | 8 +- jscomp/test/ImportAttributes.mjs | 4 +- jscomp/test/RecordCoercion.js | 4 +- jscomp/test/RecordOrObject.js | 4 +- jscomp/test/SafePromises.js | 10 +- jscomp/test/UncurriedAlways.js | 42 +- jscomp/test/UncurriedExternals.js | 56 +- jscomp/test/UntaggedVariants.js | 86 +- jscomp/test/VariantCoercion.js | 36 +- jscomp/test/VariantSpreads.js | 12 +- jscomp/test/a_filename_test.js | 10 +- jscomp/test/a_list_test.js | 10 +- jscomp/test/a_recursive_type.js | 10 +- jscomp/test/a_scope_bug.js | 8 +- jscomp/test/a_string_test.js | 16 +- jscomp/test/alias_default_value_test.js | 32 +- jscomp/test/alias_test.js | 18 +- jscomp/test/and_or_tailcall_test.js | 12 +- jscomp/test/argv_test.js | 14 +- jscomp/test/ari_regress_test.js | 22 +- jscomp/test/arith_lexer.js | 14 +- jscomp/test/arith_parser.js | 56 +- jscomp/test/arith_syntax.js | 2 +- jscomp/test/arity.js | 6 +- jscomp/test/arity_deopt.js | 6 +- jscomp/test/arity_infer.js | 6 +- jscomp/test/array_data_util.js | 6 +- jscomp/test/array_safe_get.js | 10 +- jscomp/test/array_subtle_test.js | 16 +- jscomp/test/array_test.js | 56 +- jscomp/test/as_inline_record_test.js | 2 +- jscomp/test/ast_abstract_test.js | 18 +- jscomp/test/async_await.js | 10 +- jscomp/test/async_inline.js | 24 +- jscomp/test/async_inside_loop.js | 4 +- jscomp/test/attr_test.js | 4 +- jscomp/test/b.js | 4 +- jscomp/test/bal_set_mini.js | 58 +- jscomp/test/basic_module_test.js | 14 +- jscomp/test/bb.js | 10 +- jscomp/test/bdd.js | 142 +-- jscomp/test/belt_internal_test.js | 8 +- jscomp/test/belt_result_alias_test.js | 2 +- jscomp/test/bench.js | 32 +- jscomp/test/big_polyvar_test.js | 2 +- jscomp/test/bigint_test.js | 28 +- jscomp/test/block_alias_test.js | 30 +- jscomp/test/boolean_test.js | 4 +- jscomp/test/bs_MapInt_test.js | 14 +- jscomp/test/bs_abstract_test.js | 8 +- jscomp/test/bs_array_test.js | 104 +-- jscomp/test/bs_auto_uncurry.js | 16 +- jscomp/test/bs_auto_uncurry_test.js | 8 +- jscomp/test/bs_float_test.js | 10 +- jscomp/test/bs_hashmap_test.js | 58 +- jscomp/test/bs_hashset_int_test.js | 64 +- jscomp/test/bs_hashtbl_string_test.js | 110 +-- jscomp/test/bs_ignore_effect.js | 12 +- jscomp/test/bs_int_test.js | 10 +- jscomp/test/bs_list_test.js | 52 +- jscomp/test/bs_map_set_dict_test.js | 96 +- jscomp/test/bs_map_test.js | 30 +- jscomp/test/bs_min_max_test.js | 18 +- jscomp/test/bs_mutable_set_test.js | 268 +++--- jscomp/test/bs_poly_map_test.js | 106 +-- jscomp/test/bs_poly_mutable_map_test.js | 36 +- jscomp/test/bs_poly_mutable_set_test.js | 94 +- jscomp/test/bs_poly_set_test.js | 148 +-- jscomp/test/bs_qualified.js | 8 +- jscomp/test/bs_queue_test.js | 82 +- jscomp/test/bs_rbset_int_bench.js | 14 +- jscomp/test/bs_rest_test.js | 6 +- jscomp/test/bs_set_bench.js | 14 +- jscomp/test/bs_set_int_test.js | 178 ++-- jscomp/test/bs_sort_test.js | 74 +- jscomp/test/bs_splice_partial.js | 6 +- jscomp/test/bs_stack_test.js | 64 +- jscomp/test/bs_string_test.js | 6 +- jscomp/test/bs_unwrap_test.js | 12 +- jscomp/test/buffer_test.js | 24 +- jscomp/test/bytes_split_gpr_743_test.js | 22 +- jscomp/test/caml_compare_bigint_test.js | 10 +- jscomp/test/caml_compare_test.js | 14 +- jscomp/test/caml_format_test.js | 58 +- jscomp/test/chain_code_test.js | 8 +- jscomp/test/chn_test.js | 12 +- jscomp/test/class_type_ffi_test.js | 2 +- jscomp/test/coercion_module_alias_test.js | 80 +- jscomp/test/complex_if_test.js | 24 +- jscomp/test/complex_test.js | 8 +- jscomp/test/complex_while_loop.js | 6 +- jscomp/test/condition_compilation_test.js | 22 +- jscomp/test/console_log_test.js | 4 +- jscomp/test/const_block_test.js | 18 +- jscomp/test/const_defs.js | 2 +- jscomp/test/const_defs_test.js | 2 +- jscomp/test/const_test.js | 4 +- jscomp/test/cps_test.js | 30 +- jscomp/test/cross_module_inline_test.js | 4 +- jscomp/test/custom_error_test.js | 16 +- jscomp/test/debug_mode_value.js | 4 +- jscomp/test/debugger_test.js | 2 +- jscomp/test/default_export_test.js | 2 +- jscomp/test/defunctor_make_test.js | 54 +- jscomp/test/demo_int_map.js | 48 +- jscomp/test/demo_page.js | 10 +- jscomp/test/derive_projector_test.js | 10 +- jscomp/test/digest_test.js | 14 +- jscomp/test/directives.js | 4 +- jscomp/test/div_by_zero_test.js | 10 +- jscomp/test/dollar_escape_test.js | 10 +- jscomp/test/earger_curry_test.js | 60 +- jscomp/test/effect.js | 6 +- jscomp/test/epsilon_test.js | 12 +- jscomp/test/equal_box_test.js | 18 +- jscomp/test/equal_exception_test.js | 38 +- jscomp/test/equal_test.js | 4 +- jscomp/test/es6_export.js | 2 +- jscomp/test/es6_export.mjs | 2 +- jscomp/test/es6_import.js | 2 +- jscomp/test/es6_module_test.js | 4 +- jscomp/test/escape_esmodule.js | 4 +- jscomp/test/event_ffi.js | 8 +- jscomp/test/exception_alias.js | 18 +- jscomp/test/exception_raise_test.js | 66 +- jscomp/test/exception_rebound_err_test.js | 22 +- jscomp/test/exception_value_test.js | 20 +- jscomp/test/exponentiation_precedence_test.js | 8 +- jscomp/test/export_keyword.js | 6 +- jscomp/test/ext_array_test.js | 112 +-- jscomp/test/ext_bytes_test.js | 62 +- jscomp/test/ext_filename_test.js | 164 ++-- jscomp/test/ext_list_test.js | 246 ++--- jscomp/test/ext_pervasives_test.js | 40 +- jscomp/test/ext_string_test.js | 186 ++-- jscomp/test/ext_sys_test.js | 4 +- jscomp/test/extensible_variant_test.js | 18 +- jscomp/test/external_polyfill_test.js | 10 +- jscomp/test/external_ppx.js | 6 +- jscomp/test/external_ppx2.js | 4 +- jscomp/test/ffi_arity_test.js | 14 +- jscomp/test/ffi_array_test.js | 6 +- jscomp/test/ffi_js_test.js | 32 +- jscomp/test/ffi_splice_test.js | 10 +- jscomp/test/ffi_test.js | 16 +- jscomp/test/fib.js | 20 +- jscomp/test/flattern_order_test.js | 8 +- jscomp/test/flexible_array_test.js | 76 +- jscomp/test/float_of_bits_test.js | 22 +- jscomp/test/float_test.js | 60 +- jscomp/test/floatarray_test.js | 14 +- jscomp/test/for_loop_test.js | 98 +- jscomp/test/for_side_effect_test.js | 12 +- jscomp/test/format_regression.js | 10 +- jscomp/test/format_test.js | 26 +- jscomp/test/fun_pattern_match.js | 18 +- jscomp/test/functor_app_test.js | 18 +- jscomp/test/functor_def.js | 6 +- jscomp/test/functor_ffi.js | 6 +- jscomp/test/functors.js | 18 +- jscomp/test/genlex_test.js | 24 +- jscomp/test/gentTypeReTest.js | 2 +- .../test/global_exception_regression_test.js | 14 +- jscomp/test/global_mangles.js | 28 +- jscomp/test/global_module_alias_test.js | 30 +- jscomp/test/google_closure_test.js | 4 +- jscomp/test/gpr496_test.js | 16 +- jscomp/test/gpr_1072.js | 50 +- jscomp/test/gpr_1072_reg.js | 2 +- jscomp/test/gpr_1150.js | 60 +- jscomp/test/gpr_1154_test.js | 14 +- jscomp/test/gpr_1240_missing_unbox.js | 4 +- jscomp/test/gpr_1245_test.js | 24 +- jscomp/test/gpr_1268.js | 2 +- jscomp/test/gpr_1409_test.js | 46 +- jscomp/test/gpr_1423_app_test.js | 10 +- jscomp/test/gpr_1481.js | 2 +- jscomp/test/gpr_1503_test.js | 18 +- jscomp/test/gpr_1539_test.js | 8 +- jscomp/test/gpr_1658_test.js | 10 +- jscomp/test/gpr_1667_test.js | 6 +- jscomp/test/gpr_1698_test.js | 28 +- jscomp/test/gpr_1701_test.js | 32 +- jscomp/test/gpr_1716_test.js | 12 +- jscomp/test/gpr_1717_test.js | 6 +- jscomp/test/gpr_1728_test.js | 10 +- jscomp/test/gpr_1749_test.js | 8 +- jscomp/test/gpr_1760_test.js | 22 +- jscomp/test/gpr_1762_test.js | 8 +- jscomp/test/gpr_1817_test.js | 20 +- jscomp/test/gpr_1822_test.js | 10 +- jscomp/test/gpr_1891_test.js | 2 +- jscomp/test/gpr_1943_test.js | 8 +- jscomp/test/gpr_1946_test.js | 12 +- jscomp/test/gpr_2316_test.js | 18 +- jscomp/test/gpr_2413_test.js | 10 +- jscomp/test/gpr_2474.js | 2 +- jscomp/test/gpr_2487.js | 6 +- jscomp/test/gpr_2503_test.js | 16 +- jscomp/test/gpr_2608_test.js | 20 +- jscomp/test/gpr_2614_test.js | 24 +- jscomp/test/gpr_2633_test.js | 2 +- jscomp/test/gpr_2642_test.js | 2 +- jscomp/test/gpr_2682_test.js | 16 +- jscomp/test/gpr_2731_test.js | 8 +- jscomp/test/gpr_2789_test.js | 6 +- jscomp/test/gpr_2931_test.js | 6 +- jscomp/test/gpr_3142_test.js | 14 +- jscomp/test/gpr_3154_test.js | 18 +- jscomp/test/gpr_3492_test.js | 6 +- jscomp/test/gpr_3519_jsx_test.js | 4 +- jscomp/test/gpr_3519_test.js | 2 +- jscomp/test/gpr_3536_test.js | 14 +- jscomp/test/gpr_3546_test.js | 4 +- jscomp/test/gpr_3548_test.js | 4 +- jscomp/test/gpr_3549_test.js | 16 +- jscomp/test/gpr_3566_drive_test.js | 14 +- jscomp/test/gpr_3566_test.js | 48 +- jscomp/test/gpr_3595_test.js | 8 +- jscomp/test/gpr_3697_test.js | 6 +- jscomp/test/gpr_373_test.js | 8 +- jscomp/test/gpr_3770_test.js | 2 +- jscomp/test/gpr_3852_alias.js | 2 +- jscomp/test/gpr_3852_alias_reify.js | 4 +- jscomp/test/gpr_3852_effect.js | 2 +- jscomp/test/gpr_3865.js | 6 +- jscomp/test/gpr_3865_foo.js | 2 +- jscomp/test/gpr_3875_test.js | 14 +- jscomp/test/gpr_3877_test.js | 4 +- jscomp/test/gpr_3931_test.js | 10 +- jscomp/test/gpr_3980_test.js | 6 +- jscomp/test/gpr_405_test.js | 52 +- jscomp/test/gpr_4069_test.js | 4 +- jscomp/test/gpr_4265_test.js | 16 +- jscomp/test/gpr_4274_test.js | 10 +- jscomp/test/gpr_4280_test.js | 18 +- jscomp/test/gpr_4407_test.js | 10 +- jscomp/test/gpr_4442_test.js | 8 +- jscomp/test/gpr_4519_test.js | 6 +- jscomp/test/gpr_459_test.js | 12 +- jscomp/test/gpr_4632.js | 6 +- jscomp/test/gpr_4900_test.js | 10 +- jscomp/test/gpr_4924_test.js | 10 +- jscomp/test/gpr_5071_test.js | 8 +- jscomp/test/gpr_5169_test.js | 30 +- jscomp/test/gpr_5218_test.js | 8 +- jscomp/test/gpr_5280_optimize_test.js | 4 +- jscomp/test/gpr_5312.js | 2 +- jscomp/test/gpr_5557.js | 2 +- jscomp/test/gpr_858_test.js | 4 +- jscomp/test/gpr_858_unit2_test.js | 10 +- jscomp/test/gpr_904_test.js | 6 +- jscomp/test/gpr_974_test.js | 4 +- jscomp/test/gpr_977_test.js | 16 +- .../test/gpr_return_type_unused_attribute.js | 2 +- jscomp/test/gray_code_test.js | 34 +- jscomp/test/hash_collision_test.js | 8 +- jscomp/test/hash_sugar_desugar.js | 6 +- jscomp/test/hash_test.js | 20 +- jscomp/test/hashtbl_test.js | 30 +- jscomp/test/hello_res.js | 10 +- jscomp/test/ignore_test.js | 6 +- jscomp/test/imm_map_bench.js | 30 +- jscomp/test/import2.js | 6 +- jscomp/test/import_external.js | 2 +- jscomp/test/import_side_effect.js | 4 +- jscomp/test/import_side_effect_free.js | 2 +- jscomp/test/include_side_effect.js | 2 +- jscomp/test/incomplete_toplevel_test.js | 8 +- jscomp/test/infer_type_test.js | 10 +- .../inline_condition_with_pattern_matching.js | 22 +- jscomp/test/inline_const.js | 8 +- jscomp/test/inline_const_test.js | 32 +- jscomp/test/inline_edge_cases.js | 12 +- jscomp/test/inline_map2_test.js | 602 ++++++------ jscomp/test/inline_map_demo.js | 46 +- jscomp/test/inline_map_test.js | 46 +- jscomp/test/inline_record_test.js | 46 +- jscomp/test/inline_regression_test.js | 24 +- jscomp/test/inner_call.js | 2 +- jscomp/test/inner_define.js | 6 +- jscomp/test/inner_unused.js | 2 +- jscomp/test/installation_test.js | 6 +- jscomp/test/int32_test.js | 36 +- jscomp/test/int64_mul_div_test.js | 60 +- jscomp/test/int64_string_bench.js | 16 +- jscomp/test/int64_string_test.js | 34 +- jscomp/test/int64_test.js | 62 +- jscomp/test/int_hashtbl_test.js | 32 +- jscomp/test/int_map.js | 324 +++---- jscomp/test/int_overflow_test.js | 14 +- jscomp/test/int_poly_var.js | 46 +- jscomp/test/int_switch_test.js | 14 +- jscomp/test/internal_unused_test.js | 18 +- jscomp/test/js_array_test.js | 32 +- jscomp/test/js_bool_test.js | 18 +- jscomp/test/js_cast_test.js | 8 +- jscomp/test/js_date_test.js | 108 +-- jscomp/test/js_dict_test.js | 12 +- jscomp/test/js_exception_catch_test.js | 30 +- jscomp/test/js_float_test.js | 10 +- jscomp/test/js_global_test.js | 12 +- jscomp/test/js_int_test.js | 8 +- jscomp/test/js_json_test.js | 106 +-- jscomp/test/js_list_test.js | 16 +- jscomp/test/js_math_test.js | 14 +- jscomp/test/js_null_test.js | 16 +- jscomp/test/js_null_undefined_test.js | 20 +- jscomp/test/js_nullable_test.js | 8 +- jscomp/test/js_obj_test.js | 8 +- jscomp/test/js_option_test.js | 10 +- jscomp/test/js_re_test.js | 46 +- jscomp/test/js_string_test.js | 20 +- jscomp/test/js_typed_array_test.js | 168 ++-- jscomp/test/js_undefined_test.js | 16 +- jscomp/test/js_val.js | 10 +- jscomp/test/jsoo_400_test.js | 6 +- jscomp/test/jsxv4_newtype.js | 8 +- jscomp/test/key_word_property.js | 24 +- jscomp/test/key_word_property2.js | 8 +- jscomp/test/key_word_property_plus_test.js | 8 +- jscomp/test/label_uncurry.js | 4 +- jscomp/test/large_record_duplication_test.js | 32 +- jscomp/test/largest_int_flow.js | 2 +- jscomp/test/lazy_demo.js | 10 +- jscomp/test/lazy_test.js | 48 +- jscomp/test/lib_js_test.js | 6 +- jscomp/test/libarg_test.js | 40 +- jscomp/test/libqueue_test.js | 70 +- jscomp/test/limits_test.js | 10 +- jscomp/test/list_stack.js | 2 +- jscomp/test/list_test.js | 14 +- jscomp/test/local_exception_test.js | 14 +- jscomp/test/loop_regression_test.js | 12 +- jscomp/test/loop_suites_test.js | 4 +- jscomp/test/map_find_test.js | 94 +- jscomp/test/map_test.js | 136 +-- jscomp/test/mario_game.js | 720 +++++++-------- jscomp/test/marshal.js | 8 +- jscomp/test/method_name_test.js | 12 +- jscomp/test/method_string_name.js | 2 +- jscomp/test/minimal_test.js | 4 +- jscomp/test/miss_colon_test.js | 16 +- jscomp/test/mock_mt.js | 8 +- jscomp/test/module_alias_test.js | 20 +- jscomp/test/module_as_class_ffi.js | 2 +- jscomp/test/module_as_function.js | 4 +- jscomp/test/module_missing_conversion.js | 14 +- jscomp/test/module_parameter_test.js | 16 +- jscomp/test/module_splice_test.js | 18 +- jscomp/test/more_poly_variant_test.js | 2 +- jscomp/test/mpr_6033_test.js | 12 +- jscomp/test/mt.js | 42 +- jscomp/test/mutable_uncurry_test.js | 92 +- jscomp/test/mutual_non_recursive_type.js | 4 +- jscomp/test/name_mangle_test.js | 32 +- jscomp/test/nested_module_alias.js | 4 +- jscomp/test/nested_obj_literal.js | 4 +- jscomp/test/nested_obj_test.js | 12 +- jscomp/test/nested_pattern_match_test.js | 52 +- jscomp/test/node_path_test.js | 2 +- jscomp/test/number_lexer.js | 10 +- jscomp/test/obj_literal_ppx.js | 8 +- jscomp/test/obj_literal_ppx_test.js | 2 +- jscomp/test/obj_magic_test.js | 8 +- jscomp/test/ocaml_re_test.js | 854 +++++++++--------- jscomp/test/of_string_test.js | 10 +- jscomp/test/offset.js | 316 +++---- ...it_trailing_undefined_in_external_calls.js | 4 +- jscomp/test/option_encoding_test.js | 6 +- jscomp/test/option_repr_test.js | 64 +- jscomp/test/optional_ffi_test.js | 40 +- jscomp/test/optional_regression_test.js | 12 +- jscomp/test/pipe_syntax.js | 28 +- jscomp/test/poly_empty_array.js | 2 +- jscomp/test/poly_variant_test.js | 10 +- jscomp/test/polymorphic_raw_test.js | 12 +- jscomp/test/polymorphism_test.js | 2 +- jscomp/test/polyvar_convert.js | 4 +- jscomp/test/polyvar_test.js | 2 +- jscomp/test/ppx_apply_test.js | 10 +- jscomp/test/pq_test.js | 24 +- jscomp/test/pr6726.js | 10 +- jscomp/test/pr_regression_test.js | 26 +- jscomp/test/prepend_data_ffi.js | 6 +- jscomp/test/print_alpha_test.js | 4 +- jscomp/test/queue_402.js | 66 +- jscomp/test/queue_test.js | 42 +- jscomp/test/random_test.js | 28 +- jscomp/test/raw_hash_tbl_bench.js | 12 +- jscomp/test/raw_output_test.js | 2 +- jscomp/test/raw_pure_test.js | 10 +- jscomp/test/rbset.js | 144 +-- jscomp/test/react.js | 14 +- jscomp/test/reactDOMRe.js | 26 +- jscomp/test/reactEvent.js | 30 +- jscomp/test/reactTestUtils.js | 22 +- jscomp/test/reasonReact.js | 34 +- jscomp/test/reasonReactCompat.js | 6 +- .../test/reasonReactOptimizedCreateClass.js | 10 +- jscomp/test/reasonReactRouter.js | 68 +- jscomp/test/rebind_module.js | 6 +- jscomp/test/rebind_module_test.js | 2 +- jscomp/test/rec_array_test.js | 6 +- jscomp/test/rec_fun_test.js | 20 +- jscomp/test/rec_module_opt.js | 20 +- jscomp/test/rec_module_test.js | 332 +++---- jscomp/test/recmodule.js | 30 +- jscomp/test/record_debug_test.js | 38 +- jscomp/test/record_extension_test.js | 26 +- jscomp/test/record_regression.js | 84 +- jscomp/test/record_type_spread.js | 8 +- jscomp/test/record_with_test.js | 16 +- jscomp/test/recursive_module.js | 54 +- jscomp/test/recursive_module_test.js | 18 +- jscomp/test/recursive_react_component.js | 4 +- jscomp/test/recursive_records_test.js | 26 +- jscomp/test/recursive_unbound_module_test.js | 12 +- jscomp/test/relative_path.js | 6 +- jscomp/test/res_debug.js | 36 +- jscomp/test/return_check.js | 14 +- jscomp/test/runtime_encoding_test.js | 2 +- jscomp/test/set_annotation.js | 2 +- jscomp/test/set_gen.js | 172 ++-- jscomp/test/sexp.js | 96 +- jscomp/test/sexpm.js | 84 +- jscomp/test/sexpm_test.js | 14 +- jscomp/test/side_effect2.js | 4 +- jscomp/test/side_effect_free.js | 2 +- jscomp/test/single_module_alias.js | 2 +- jscomp/test/singular_unit_test.js | 2 +- jscomp/test/small_inline_test.js | 12 +- jscomp/test/splice_test.js | 30 +- jscomp/test/stack_comp_test.js | 68 +- jscomp/test/stack_test.js | 14 +- jscomp/test/stream_parser_test.js | 74 +- jscomp/test/string_bound_get_test.js | 14 +- jscomp/test/string_constant_compare.js | 8 +- jscomp/test/string_get_set_test.js | 4 +- jscomp/test/string_runtime_test.js | 24 +- jscomp/test/string_set.js | 146 +-- jscomp/test/string_set_test.js | 12 +- jscomp/test/string_test.js | 48 +- jscomp/test/string_unicode_test.js | 6 +- jscomp/test/stringmatch_test.js | 370 ++++---- jscomp/test/submodule.js | 20 +- jscomp/test/submodule_call.js | 14 +- jscomp/test/switch_case_test.js | 6 +- jscomp/test/switch_string.js | 2 +- jscomp/test/tagged_template_test.js | 30 +- jscomp/test/tailcall_inline_test.js | 22 +- jscomp/test/template.js | 2 +- jscomp/test/test2.js | 4 +- jscomp/test/test_alias.js | 4 +- jscomp/test/test_ari.js | 120 +-- jscomp/test/test_array.js | 14 +- jscomp/test/test_array_append.js | 4 +- jscomp/test/test_array_primitive.js | 10 +- jscomp/test/test_bs_this.js | 16 +- jscomp/test/test_bug.js | 24 +- jscomp/test/test_bytes.js | 6 +- jscomp/test/test_case_opt_collision.js | 10 +- jscomp/test/test_case_set.js | 2 +- jscomp/test/test_closure.js | 14 +- jscomp/test/test_common.js | 6 +- jscomp/test/test_cpp.js | 4 +- jscomp/test/test_cps.js | 12 +- jscomp/test/test_demo.js | 22 +- jscomp/test/test_exception.js | 10 +- jscomp/test/test_exception_escape.js | 8 +- jscomp/test/test_external.js | 6 +- jscomp/test/test_external_unit.js | 4 +- jscomp/test/test_fib.js | 32 +- jscomp/test/test_filename.js | 8 +- jscomp/test/test_for_loop.js | 54 +- jscomp/test/test_for_map.js | 326 +++---- jscomp/test/test_functor_dead_code.js | 2 +- jscomp/test/test_generative_module.js | 2 +- jscomp/test/test_global_print.js | 8 +- jscomp/test/test_google_closure.js | 14 +- jscomp/test/test_include.js | 134 +-- jscomp/test/test_incr_ref.js | 4 +- jscomp/test/test_int_map_find.js | 42 +- jscomp/test/test_is_js.js | 6 +- jscomp/test/test_js_ffi.js | 4 +- jscomp/test/test_let.js | 2 +- jscomp/test/test_list.js | 386 ++++---- jscomp/test/test_literal.js | 16 +- jscomp/test/test_literals.js | 6 +- jscomp/test/test_match_exception.js | 6 +- jscomp/test/test_mutliple.js | 4 +- jscomp/test/test_nat64.js | 4 +- jscomp/test/test_nested_let.js | 2 +- jscomp/test/test_nested_print.js | 4 +- jscomp/test/test_order.js | 4 +- jscomp/test/test_order_tailcall.js | 26 +- jscomp/test/test_other_exn.js | 4 +- jscomp/test/test_per.js | 94 +- jscomp/test/test_pervasive.js | 8 +- jscomp/test/test_pervasives2.js | 16 +- jscomp/test/test_pervasives3.js | 8 +- jscomp/test/test_primitive.js | 36 +- jscomp/test/test_ramification.js | 16 +- jscomp/test/test_react.js | 16 +- jscomp/test/test_regex.js | 6 +- jscomp/test/test_runtime_encoding.js | 4 +- jscomp/test/test_scope.js | 4 +- jscomp/test/test_seq.js | 28 +- jscomp/test/test_set.js | 280 +++--- jscomp/test/test_side_effect_functor.js | 4 +- jscomp/test/test_simple_include.js | 68 +- jscomp/test/test_simple_pattern_match.js | 8 +- jscomp/test/test_simple_ref.js | 14 +- jscomp/test/test_simple_tailcall.js | 6 +- jscomp/test/test_small.js | 4 +- jscomp/test/test_static_catch_ident.js | 8 +- jscomp/test/test_string.js | 6 +- jscomp/test/test_string_const.js | 10 +- jscomp/test/test_string_map.js | 52 +- jscomp/test/test_string_switch.js | 4 +- jscomp/test/test_switch.js | 2 +- jscomp/test/test_trywith.js | 38 +- jscomp/test/test_tuple.js | 8 +- jscomp/test/test_tuple_destructring.js | 12 +- jscomp/test/test_type_based_arity.js | 8 +- jscomp/test/test_u.js | 4 +- jscomp/test/test_unknown.js | 4 +- jscomp/test/test_unsupported_primitive.js | 2 +- jscomp/test/test_while_closure.js | 16 +- jscomp/test/test_while_side_effect.js | 6 +- jscomp/test/test_zero_nullable.js | 46 +- jscomp/test/then_mangle_test.js | 6 +- jscomp/test/ticker.js | 450 ++++----- jscomp/test/to_string_test.js | 6 +- jscomp/test/topsort_test.js | 382 ++++---- jscomp/test/tramp_fib.js | 10 +- jscomp/test/tuple_alloc.js | 12 +- jscomp/test/type_disambiguate.js | 4 +- jscomp/test/typeof_test.js | 12 +- jscomp/test/unboxed_attribute_test.js | 16 +- jscomp/test/unboxed_crash.js | 4 +- jscomp/test/unboxed_use_case.js | 10 +- jscomp/test/uncurried_cast.js | 42 +- jscomp/test/uncurried_default.args.js | 66 +- jscomp/test/uncurried_pipe.js | 20 +- jscomp/test/uncurry_external_test.js | 8 +- jscomp/test/uncurry_glob_test.js | 2 +- jscomp/test/undef_regression2_test.js | 16 +- jscomp/test/undef_regression_test.js | 2 +- jscomp/test/undefine_conditional.js | 6 +- jscomp/test/unit_undefined_test.js | 14 +- jscomp/test/unsafe_ppx_test.js | 28 +- jscomp/test/update_record_test.js | 14 +- jscomp/test/variant.js | 46 +- jscomp/test/variantsMatching.js | 50 +- jscomp/test/webpack_config.js | 28 +- lib/es6/arg.js | 176 ++-- lib/es6/array.js | 200 ++-- lib/es6/arrayLabels.js | 200 ++-- lib/es6/belt.js | 34 +- lib/es6/belt_Array.js | 296 +++--- lib/es6/belt_Float.js | 2 +- lib/es6/belt_HashMap.js | 136 +-- lib/es6/belt_HashMapInt.js | 118 +-- lib/es6/belt_HashMapString.js | 118 +-- lib/es6/belt_HashSet.js | 110 +-- lib/es6/belt_HashSetInt.js | 94 +- lib/es6/belt_HashSetString.js | 94 +- lib/es6/belt_Id.js | 18 +- lib/es6/belt_Int.js | 2 +- lib/es6/belt_List.js | 400 ++++---- lib/es6/belt_Map.js | 38 +- lib/es6/belt_MapDict.js | 224 ++--- lib/es6/belt_MapInt.js | 162 ++-- lib/es6/belt_MapString.js | 162 ++-- lib/es6/belt_MutableMap.js | 68 +- lib/es6/belt_MutableMapInt.js | 54 +- lib/es6/belt_MutableMapString.js | 54 +- lib/es6/belt_MutableQueue.js | 76 +- lib/es6/belt_MutableSet.js | 146 +-- lib/es6/belt_MutableSetInt.js | 124 +-- lib/es6/belt_MutableSetString.js | 124 +-- lib/es6/belt_MutableStack.js | 26 +- lib/es6/belt_Range.js | 14 +- lib/es6/belt_Set.js | 46 +- lib/es6/belt_SetDict.js | 182 ++-- lib/es6/belt_SetInt.js | 174 ++-- lib/es6/belt_SetString.js | 174 ++-- lib/es6/belt_SortArray.js | 218 ++--- lib/es6/belt_SortArrayInt.js | 202 ++--- lib/es6/belt_SortArrayString.js | 202 ++--- lib/es6/belt_internalAVLset.js | 338 +++---- lib/es6/belt_internalAVLtree.js | 422 ++++----- lib/es6/belt_internalBuckets.js | 82 +- lib/es6/belt_internalBucketsType.js | 12 +- lib/es6/belt_internalMapInt.js | 120 +-- lib/es6/belt_internalMapString.js | 120 +-- lib/es6/belt_internalSetBuckets.js | 62 +- lib/es6/belt_internalSetInt.js | 68 +- lib/es6/belt_internalSetString.js | 68 +- lib/es6/buffer.js | 92 +- lib/es6/bytes.js | 184 ++-- lib/es6/bytesLabels.js | 184 ++-- lib/es6/caml.js | 4 +- lib/es6/caml_array.js | 38 +- lib/es6/caml_bytes.js | 26 +- lib/es6/caml_exceptions.js | 8 +- lib/es6/caml_external_polyfill.js | 6 +- lib/es6/caml_float.js | 38 +- lib/es6/caml_format.js | 206 ++--- lib/es6/caml_hash.js | 34 +- lib/es6/caml_hash_primitive.js | 22 +- lib/es6/caml_int64.js | 174 ++-- lib/es6/caml_js_exceptions.js | 2 +- lib/es6/caml_lexer.js | 6 +- lib/es6/caml_md5.js | 40 +- lib/es6/caml_module.js | 36 +- lib/es6/caml_obj.js | 82 +- lib/es6/caml_option.js | 2 +- lib/es6/caml_parser.js | 4 +- lib/es6/caml_splice_call.js | 6 +- lib/es6/caml_sys.js | 8 +- lib/es6/camlinternalLazy.js | 8 +- lib/es6/char.js | 6 +- lib/es6/complex.js | 34 +- lib/es6/curry.js | 44 +- lib/es6/digest.js | 18 +- lib/es6/dom.js | 4 +- lib/es6/filename.js | 122 +-- lib/es6/genlex.js | 88 +- lib/es6/hashtbl.js | 500 +++++----- lib/es6/hashtblLabels.js | 92 +- lib/es6/int32.js | 14 +- lib/es6/int64.js | 20 +- lib/es6/js.js | 74 +- lib/es6/js_OO.js | 2 +- lib/es6/js_dict.js | 46 +- lib/es6/js_exn.js | 2 +- lib/es6/js_int.js | 4 +- lib/es6/js_json.js | 6 +- lib/es6/js_list.js | 94 +- lib/es6/js_mapperRt.js | 12 +- lib/es6/js_math.js | 4 +- lib/es6/js_null.js | 2 +- lib/es6/js_null_undefined.js | 2 +- lib/es6/js_option.js | 4 +- lib/es6/js_promise2.js | 4 +- lib/es6/js_typed_array.js | 28 +- lib/es6/js_typed_array2.js | 22 +- lib/es6/js_types.js | 2 +- lib/es6/js_undefined.js | 2 +- lib/es6/js_vector.js | 48 +- lib/es6/jsxEventC.js | 32 +- lib/es6/jsxEventU.js | 32 +- lib/es6/jsxPPXReactSupportC.js | 2 +- lib/es6/jsxPPXReactSupportU.js | 2 +- lib/es6/lazy.js | 14 +- lib/es6/lexing.js | 40 +- lib/es6/list.js | 414 ++++----- lib/es6/listLabels.js | 414 ++++----- lib/es6/map.js | 398 ++++---- lib/es6/mapLabels.js | 382 ++++---- lib/es6/moreLabels.js | 766 ++++++++-------- lib/es6/parsing.js | 64 +- lib/es6/pervasives.js | 42 +- lib/es6/pervasivesU.js | 42 +- lib/es6/queue.js | 54 +- lib/es6/random.js | 58 +- lib/es6/set.js | 384 ++++---- lib/es6/setLabels.js | 378 ++++---- lib/es6/sort.js | 42 +- lib/es6/stack.js | 6 +- lib/es6/stdLabels.js | 8 +- lib/es6/stream.js | 64 +- lib/es6/string.js | 40 +- lib/es6/stringLabels.js | 40 +- lib/es6/sys.js | 90 +- lib/es6/uchar.js | 14 +- lib/js/arg.js | 204 ++--- lib/js/array.js | 210 ++--- lib/js/arrayLabels.js | 210 ++--- lib/js/belt.js | 34 +- lib/js/belt_Array.js | 304 +++---- lib/js/belt_Float.js | 2 +- lib/js/belt_HashMap.js | 142 +-- lib/js/belt_HashMapInt.js | 126 +-- lib/js/belt_HashMapString.js | 126 +-- lib/js/belt_HashSet.js | 114 +-- lib/js/belt_HashSetInt.js | 100 +- lib/js/belt_HashSetString.js | 100 +- lib/js/belt_Id.js | 20 +- lib/js/belt_Int.js | 2 +- lib/js/belt_List.js | 408 ++++----- lib/js/belt_Map.js | 42 +- lib/js/belt_MapDict.js | 230 ++--- lib/js/belt_MapInt.js | 170 ++-- lib/js/belt_MapString.js | 170 ++-- lib/js/belt_MutableMap.js | 74 +- lib/js/belt_MutableMapInt.js | 62 +- lib/js/belt_MutableMapString.js | 62 +- lib/js/belt_MutableQueue.js | 80 +- lib/js/belt_MutableSet.js | 152 ++-- lib/js/belt_MutableSetInt.js | 132 +-- lib/js/belt_MutableSetString.js | 132 +-- lib/js/belt_MutableStack.js | 30 +- lib/js/belt_Option.js | 4 +- lib/js/belt_Range.js | 16 +- lib/js/belt_Result.js | 2 +- lib/js/belt_Set.js | 50 +- lib/js/belt_SetDict.js | 184 ++-- lib/js/belt_SetInt.js | 178 ++-- lib/js/belt_SetString.js | 178 ++-- lib/js/belt_SortArray.js | 222 ++--- lib/js/belt_SortArrayInt.js | 204 ++--- lib/js/belt_SortArrayString.js | 204 ++--- lib/js/belt_internalAVLset.js | 344 +++---- lib/js/belt_internalAVLtree.js | 428 ++++----- lib/js/belt_internalBuckets.js | 88 +- lib/js/belt_internalBucketsType.js | 12 +- lib/js/belt_internalMapInt.js | 130 +-- lib/js/belt_internalMapString.js | 130 +-- lib/js/belt_internalSetBuckets.js | 66 +- lib/js/belt_internalSetInt.js | 72 +- lib/js/belt_internalSetString.js | 72 +- lib/js/buffer.js | 102 +-- lib/js/bytes.js | 194 ++-- lib/js/bytesLabels.js | 194 ++-- lib/js/caml.js | 4 +- lib/js/caml_array.js | 38 +- lib/js/caml_bytes.js | 26 +- lib/js/caml_exceptions.js | 8 +- lib/js/caml_external_polyfill.js | 6 +- lib/js/caml_float.js | 38 +- lib/js/caml_format.js | 210 ++--- lib/js/caml_hash.js | 36 +- lib/js/caml_hash_primitive.js | 22 +- lib/js/caml_int64.js | 176 ++-- lib/js/caml_js_exceptions.js | 6 +- lib/js/caml_lexer.js | 6 +- lib/js/caml_md5.js | 40 +- lib/js/caml_module.js | 38 +- lib/js/caml_obj.js | 84 +- lib/js/caml_option.js | 2 +- lib/js/caml_parser.js | 4 +- lib/js/caml_splice_call.js | 6 +- lib/js/caml_sys.js | 8 +- lib/js/camlinternalLazy.js | 10 +- lib/js/char.js | 8 +- lib/js/complex.js | 34 +- lib/js/curry.js | 46 +- lib/js/digest.js | 30 +- lib/js/dom.js | 4 +- lib/js/dom_storage.js | 2 +- lib/js/filename.js | 138 +-- lib/js/genlex.js | 106 +-- lib/js/hashtbl.js | 520 +++++------ lib/js/hashtblLabels.js | 96 +- lib/js/int32.js | 20 +- lib/js/int64.js | 28 +- lib/js/js.js | 74 +- lib/js/js_OO.js | 2 +- lib/js/js_array.js | 6 +- lib/js/js_dict.js | 48 +- lib/js/js_exn.js | 2 +- lib/js/js_int.js | 4 +- lib/js/js_json.js | 6 +- lib/js/js_list.js | 98 +- lib/js/js_mapperRt.js | 12 +- lib/js/js_math.js | 6 +- lib/js/js_null.js | 4 +- lib/js/js_null_undefined.js | 4 +- lib/js/js_option.js | 6 +- lib/js/js_promise.js | 2 +- lib/js/js_promise2.js | 4 +- lib/js/js_string.js | 6 +- lib/js/js_typed_array.js | 28 +- lib/js/js_typed_array2.js | 22 +- lib/js/js_types.js | 2 +- lib/js/js_undefined.js | 4 +- lib/js/js_vector.js | 48 +- lib/js/jsxEventC.js | 32 +- lib/js/jsxEventU.js | 32 +- lib/js/jsxPPXReactSupportC.js | 6 +- lib/js/jsxPPXReactSupportU.js | 6 +- lib/js/lazy.js | 18 +- lib/js/lexing.js | 50 +- lib/js/list.js | 422 ++++----- lib/js/listLabels.js | 422 ++++----- lib/js/map.js | 402 ++++----- lib/js/mapLabels.js | 386 ++++---- lib/js/moreLabels.js | 774 ++++++++-------- lib/js/parsing.js | 80 +- lib/js/pervasives.js | 56 +- lib/js/pervasivesU.js | 52 +- lib/js/queue.js | 58 +- lib/js/random.js | 74 +- lib/js/set.js | 390 ++++---- lib/js/setLabels.js | 384 ++++---- lib/js/sort.js | 44 +- lib/js/stack.js | 10 +- lib/js/stdLabels.js | 8 +- lib/js/stream.js | 78 +- lib/js/string.js | 52 +- lib/js/stringLabels.js | 52 +- lib/js/sys.js | 94 +- lib/js/uchar.js | 18 +- 832 files changed, 21342 insertions(+), 21342 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1912252a7..fe4ef2de8a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ - Remove empty export blocks in generated js code. https://github.com/rescript-lang/rescript-compiler/pull/6744 - Fix indent for returned/thrown/wrapped in parentheses objects in generated js code. https://github.com/rescript-lang/rescript-compiler/pull/6746 - Fix indent in generated js code. https://github.com/rescript-lang/rescript-compiler/pull/6747 +- In generated code, use `let` instead of `var`. https://github.com/rescript-lang/rescript-compiler/pull/6102 # 11.1.0 diff --git a/jscomp/build_tests/custom_namespace/src/demo.bs.js b/jscomp/build_tests/custom_namespace/src/demo.bs.js index 5bcd6ef35d..160a8f1d2b 100644 --- a/jscomp/build_tests/custom_namespace/src/demo.bs.js +++ b/jscomp/build_tests/custom_namespace/src/demo.bs.js @@ -1,7 +1,7 @@ 'use strict'; -var v = 42; +let v = 42; exports.v = v; /* No side effect */ diff --git a/jscomp/build_tests/devonly/src/demo.bs.js b/jscomp/build_tests/devonly/src/demo.bs.js index 83cfc1af8e..1b69c81d7f 100644 --- a/jscomp/build_tests/devonly/src/demo.bs.js +++ b/jscomp/build_tests/devonly/src/demo.bs.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Depdemo = require("./depdemo.bs.js"); +let Depdemo = require("./depdemo.bs.js"); console.log(Depdemo.a); diff --git a/jscomp/build_tests/devonly/src/depdemo.bs.js b/jscomp/build_tests/devonly/src/depdemo.bs.js index bd93031700..7a46d38e23 100644 --- a/jscomp/build_tests/devonly/src/depdemo.bs.js +++ b/jscomp/build_tests/devonly/src/depdemo.bs.js @@ -2,7 +2,7 @@ 'use strict'; -var a = 3; +let a = 3; exports.a = a; /* No side effect */ diff --git a/jscomp/build_tests/devonly/src2/hello.bs.js b/jscomp/build_tests/devonly/src2/hello.bs.js index fca2123bb7..e49a9a2be3 100644 --- a/jscomp/build_tests/devonly/src2/hello.bs.js +++ b/jscomp/build_tests/devonly/src2/hello.bs.js @@ -2,7 +2,7 @@ 'use strict'; -var v = 3; +let v = 3; exports.v = v; /* No side effect */ diff --git a/jscomp/build_tests/devonly/src2/hellodep.bs.js b/jscomp/build_tests/devonly/src2/hellodep.bs.js index 7d140c5d62..0f6e84ce17 100644 --- a/jscomp/build_tests/devonly/src2/hellodep.bs.js +++ b/jscomp/build_tests/devonly/src2/hellodep.bs.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Hello = require("./hello.bs.js"); +let Hello = require("./hello.bs.js"); console.log(Hello.v); diff --git a/jscomp/build_tests/ns/src/demo.js b/jscomp/build_tests/ns/src/demo.js index 18b4316989..951599e636 100644 --- a/jscomp/build_tests/ns/src/demo.js +++ b/jscomp/build_tests/ns/src/demo.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Hello$Ns = require("./hello.js"); +let Hello$Ns = require("./hello.js"); console.log(Hello$Ns.a + Hello$Ns.b | 0); diff --git a/jscomp/build_tests/ns/src/hello.js b/jscomp/build_tests/ns/src/hello.js index 928177b049..8f02cc6555 100644 --- a/jscomp/build_tests/ns/src/hello.js +++ b/jscomp/build_tests/ns/src/hello.js @@ -2,9 +2,9 @@ 'use strict'; -var a = 4; +let a = 4; -var b = 2; +let b = 2; exports.a = a; exports.b = b; diff --git a/jscomp/build_tests/react_ppx/src/React.bs.js b/jscomp/build_tests/react_ppx/src/React.bs.js index 3f1bab6b78..05c8865770 100644 --- a/jscomp/build_tests/react_ppx/src/React.bs.js +++ b/jscomp/build_tests/react_ppx/src/React.bs.js @@ -2,15 +2,15 @@ 'use strict'; -var Ref = {}; +let Ref = {}; -var Children = {}; +let Children = {}; -var Context = {}; +let Context = {}; -var Fragment = {}; +let Fragment = {}; -var Suspense = {}; +let Suspense = {}; exports.Ref = Ref; exports.Children = Children; diff --git a/jscomp/build_tests/react_ppx/src/gpr_3695_test.bs.js b/jscomp/build_tests/react_ppx/src/gpr_3695_test.bs.js index 76418055e4..c6bc6128c9 100644 --- a/jscomp/build_tests/react_ppx/src/gpr_3695_test.bs.js +++ b/jscomp/build_tests/react_ppx/src/gpr_3695_test.bs.js @@ -1,17 +1,17 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Foo = require("Foo"); -var Curry = require("rescript/lib/js/curry.js"); +let Foo = require("Foo"); +let Curry = require("rescript/lib/js/curry.js"); -var React = {}; +let React = {}; -var Test = {}; +let Test = {}; function test(className) { return Curry._1(Foo, { - className: className - }); + className: className + }); } exports.React = React; diff --git a/jscomp/build_tests/react_ppx/src/gpr_3987_test.bs.js b/jscomp/build_tests/react_ppx/src/gpr_3987_test.bs.js index aee858b0cf..e2a8d1556e 100644 --- a/jscomp/build_tests/react_ppx/src/gpr_3987_test.bs.js +++ b/jscomp/build_tests/react_ppx/src/gpr_3987_test.bs.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var React = require("react"); +let React = require("react"); function makeContainer(text) { - var container = document.createElement("div"); + let container = document.createElement("div"); container.className = "container"; - var title = document.createElement("div"); + let title = document.createElement("div"); title.className = "containerTitle"; title.innerText = text; - var content = document.createElement("div"); + let content = document.createElement("div"); content.className = "containerContent"; container.appendChild(title); container.appendChild(content); @@ -19,53 +19,53 @@ function makeContainer(text) { function makeProps(value, onChange, param) { return { - value: value, - onChange: onChange - }; + value: value, + onChange: onChange + }; } function make(_props) { return null; } -var Gpr3987ReproOk = { +let Gpr3987ReproOk = { makeProps: makeProps, make: make }; React.createElement(make, makeProps("test", (function (param, param$1) { - - }), undefined)); + +}), undefined)); function Gpr_3987_test$Gpr3987ReproOk2(Props) { return null; } -var Gpr3987ReproOk2 = { +let Gpr3987ReproOk2 = { make: Gpr_3987_test$Gpr3987ReproOk2 }; React.createElement(Gpr_3987_test$Gpr3987ReproOk2, { - value: "test", - onChange: (function (param, param$1) { - - }) - }); + value: "test", + onChange: (function (param, param$1) { + + }) +}); function Gpr_3987_test$Gpr3987ReproError(Props) { return null; } -var Gpr3987ReproError = { +let Gpr3987ReproError = { make: Gpr_3987_test$Gpr3987ReproError }; React.createElement(Gpr_3987_test$Gpr3987ReproError, { - value: "test", - onChange: (function (param, param$1) { - - }) - }); + value: "test", + onChange: (function (param, param$1) { + + }) +}); exports.makeContainer = makeContainer; exports.Gpr3987ReproOk = Gpr3987ReproOk; diff --git a/jscomp/build_tests/react_ppx/src/recursive_component_test.bs.js b/jscomp/build_tests/react_ppx/src/recursive_component_test.bs.js index 860ce62165..ed067ae1a8 100644 --- a/jscomp/build_tests/react_ppx/src/recursive_component_test.bs.js +++ b/jscomp/build_tests/react_ppx/src/recursive_component_test.bs.js @@ -1,28 +1,28 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var React = require("react"); +let React = require("react"); function make(Props) { - var foo = Props.foo; + let foo = Props.foo; return React.createElement(make, { - foo: foo - }); + foo: foo + }); } function mm(x) { return make$1({ - b: !x.b - }); + b: !x.b + }); } function make$1(props) { return mm({ - b: props.b - }); + b: props.b + }); } -var Rec = { +let Rec = { make: make$1, mm: mm }; diff --git a/jscomp/core/js_dump.ml b/jscomp/core/js_dump.ml index d443253dfa..bbd841bde6 100644 --- a/jscomp/core/js_dump.ml +++ b/jscomp/core/js_dump.ml @@ -182,7 +182,7 @@ let pp_paren_params (inner_cxt : cxt) (f : Ext_pp.t) (lexical : Ident.t list) : id) *) let pp_var_assign cxt f id = - P.string f L.var; + P.string f L.let_; P.space f; let acxt = Ext_pp_scope.ident cxt f id in P.space f; @@ -199,7 +199,7 @@ let pp_var_assign_this cxt f id = cxt let pp_var_declare cxt f id = - P.string f L.var; + P.string f L.let_; P.space f; let acxt = Ext_pp_scope.ident cxt f id in semi f; diff --git a/jscomp/core/js_dump_import_export.ml b/jscomp/core/js_dump_import_export.ml index b70048e6fe..b6e32d4dd9 100644 --- a/jscomp/core/js_dump_import_export.ml +++ b/jscomp/core/js_dump_import_export.ml @@ -111,7 +111,7 @@ let requires require_lit cxt f (modules : (Ident.t * string * bool) list) = in P.at_least_two_lines f; Ext_list.rev_iter reversed_list (fun (s, file, default) -> - P.string f L.var; + P.string f L.let_; P.space f; P.string f s; P.space f; diff --git a/jscomp/core/js_dump_lit.ml b/jscomp/core/js_dump_lit.ml index fbbe643e4f..b90eab0b25 100644 --- a/jscomp/core/js_dump_lit.ml +++ b/jscomp/core/js_dump_lit.ml @@ -29,7 +29,7 @@ let function_ = "function" let function_async ~async = if async then "async function" else "function" -let var = "var" (* should be able to switch to [let] easily*) +let let_ = "let" let return = "return" diff --git a/jscomp/gentype_tests/typescript-react-example/src/Wrapper.res.js b/jscomp/gentype_tests/typescript-react-example/src/Wrapper.res.js index 29f77ba8c5..e49a9a2be3 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Wrapper.res.js +++ b/jscomp/gentype_tests/typescript-react-example/src/Wrapper.res.js @@ -1,9 +1,8 @@ // Generated by ReScript, PLEASE EDIT WITH CARE +'use strict'; -var MyModuleAlias; +let v = 3; -export { - MyModuleAlias , -} +exports.v = v; /* No side effect */ diff --git a/jscomp/test/406_primitive_test.js b/jscomp/test/406_primitive_test.js index 0174788769..a84882e414 100644 --- a/jscomp/test/406_primitive_test.js +++ b/jscomp/test/406_primitive_test.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let Mt = require("./mt.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -19,7 +19,7 @@ function eq(loc, x, y) { eq("File \"406_primitive_test.res\", line 13, characters 3-10", 32, 32); -var backend_type = { +let backend_type = { TAG: "Other", _0: "BS" }; @@ -30,9 +30,9 @@ eq("File \"406_primitive_test.res\", line 23, characters 3-10", backend_type, { }); function f(param) { - var A = /* @__PURE__ */Caml_exceptions.create("A"); + let A = /* @__PURE__ */Caml_exceptions.create("A"); try { - for(var i = 0; i <= 200; ++i){ + for(let i = 0; i <= 200; ++i){ if (i === 10) { throw { RE_EXN_ID: A, @@ -45,7 +45,7 @@ function f(param) { return; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === A) { return; } @@ -55,9 +55,9 @@ function f(param) { Mt.from_pair_suites("406_primitive_test", suites.contents); -var v = 32; +let v = 32; -var max_array_length = /* Max_wosize */2147483647; +let max_array_length = /* Max_wosize */2147483647; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/AsInUncurriedExternals.js b/jscomp/test/AsInUncurriedExternals.js index c4478fb839..70125156e8 100644 --- a/jscomp/test/AsInUncurriedExternals.js +++ b/jscomp/test/AsInUncurriedExternals.js @@ -10,7 +10,7 @@ function mo(prim0, prim1) { }; } -var options = { +let options = { objectMode: false, name: "foo", someOther: true diff --git a/jscomp/test/Coercion.js b/jscomp/test/Coercion.js index 7e2ca2ca8b..2758b87ff9 100644 --- a/jscomp/test/Coercion.js +++ b/jscomp/test/Coercion.js @@ -6,9 +6,9 @@ function foo(x) { return x; } -var x = 1; +let x = 1; -var xx = 1; +let xx = 1; exports.x = x; exports.xx = xx; diff --git a/jscomp/test/DerivingAccessorsCurried.js b/jscomp/test/DerivingAccessorsCurried.js index 8446560fc2..2ad2d0eb53 100644 --- a/jscomp/test/DerivingAccessorsCurried.js +++ b/jscomp/test/DerivingAccessorsCurried.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); function myField(param) { return param.myField; @@ -26,22 +26,22 @@ function compose(a, accessor) { return Curry._1(accessor, a); } -var _composedMyField = 1; +let _composedMyField = 1; -var _composedNum = { +let _composedNum = { TAG: "Num", _0: 1 }; -var noParam = "NoParam"; +let noParam = "NoParam"; -var _myFieldAlias = myField; +let _myFieldAlias = myField; -var _noParamAlias = "NoParam"; +let _noParamAlias = "NoParam"; -var _numAlias = num; +let _numAlias = num; -var _doubleNumAlias = doubleNum; +let _doubleNumAlias = doubleNum; exports.myField = myField; exports.noParam = noParam; diff --git a/jscomp/test/DerivingAccessorsUncurried.js b/jscomp/test/DerivingAccessorsUncurried.js index 228957605f..49a7d6079e 100644 --- a/jscomp/test/DerivingAccessorsUncurried.js +++ b/jscomp/test/DerivingAccessorsUncurried.js @@ -25,22 +25,22 @@ function compose(a, accessor) { return accessor(a); } -var _composedMyField = 1; +let _composedMyField = 1; -var _composedNum = { +let _composedNum = { TAG: "Num", _0: 1 }; -var noParam = "NoParam"; +let noParam = "NoParam"; -var _myFieldAlias = myField; +let _myFieldAlias = myField; -var _noParamAlias = "NoParam"; +let _noParamAlias = "NoParam"; -var _numAlias = num; +let _numAlias = num; -var _doubleNumAlias = doubleNum; +let _doubleNumAlias = doubleNum; exports.myField = myField; exports.noParam = noParam; diff --git a/jscomp/test/DictInference.js b/jscomp/test/DictInference.js index 21819986a0..51e916fc66 100644 --- a/jscomp/test/DictInference.js +++ b/jscomp/test/DictInference.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Js_dict = require("../../lib/js/js_dict.js"); +let Js_dict = require("../../lib/js/js_dict.js"); -var dict = {}; +let dict = {}; dict["someKey1"] = 1; dict["someKey2"] = 2; -var asArray = Js_dict.values(dict); +let asArray = Js_dict.values(dict); exports.dict = dict; exports.asArray = asArray; diff --git a/jscomp/test/DotDotDot.js b/jscomp/test/DotDotDot.js index f95e0bd8df..0676103de3 100644 --- a/jscomp/test/DotDotDot.js +++ b/jscomp/test/DotDotDot.js @@ -2,20 +2,20 @@ 'use strict'; -var MultipleDotDotDots = { +let MultipleDotDotDots = { x: { x: 10, y: "abc" } }; -var v = { +let v = { x: 10, y: "", z: "" }; -var v2 = { +let v2 = { x: 10, y: "", z: "", @@ -23,7 +23,7 @@ var v2 = { w: 2.0 }; -var x = { +let x = { name: "test", x: "test" }; diff --git a/jscomp/test/EmptyRecord.js b/jscomp/test/EmptyRecord.js index 392d5ea5fd..57aa613b2b 100644 --- a/jscomp/test/EmptyRecord.js +++ b/jscomp/test/EmptyRecord.js @@ -12,7 +12,7 @@ function construct(b) { } } -var er = {}; +let er = {}; exports.construct = construct; exports.er = er; diff --git a/jscomp/test/FFI.js b/jscomp/test/FFI.js index 1aafaec01e..bdcec5cad2 100644 --- a/jscomp/test/FFI.js +++ b/jscomp/test/FFI.js @@ -2,11 +2,11 @@ 'use strict'; -var canUseCanvas = (function canUseCanvas() { +let canUseCanvas = (function canUseCanvas() { return !!document.createElement('canvas').getContext; }); -var add = ((x,y)=>x+y); +let add = ((x,y)=>x+y); exports.canUseCanvas = canUseCanvas; exports.add = add; diff --git a/jscomp/test/Import.js b/jscomp/test/Import.js index f7fc79a43b..bc1f456e50 100644 --- a/jscomp/test/Import.js +++ b/jscomp/test/Import.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); async function eachIntAsync(list, f) { return Curry._2(await import("../../lib/js/belt_List.js").then(function (m) { @@ -10,10 +10,10 @@ async function eachIntAsync(list, f) { } function eachIntLazy(list, f) { - var obj = import("../../lib/js/belt_List.js").then(function (m) { + let obj = import("../../lib/js/belt_List.js").then(function (m) { return m.forEach; }); - var arg1 = function (each) { + let arg1 = function (each) { return Promise.resolve(Curry._2(each, list, f)); }; return obj.then(arg1); @@ -45,35 +45,35 @@ eachIntAsync({ console.log("async", n); })); -var beltAsModule = await import("../../lib/js/belt_List.js"); +let beltAsModule = await import("../../lib/js/belt_List.js"); -var M = await import("../../lib/js/belt_List.js"); +let M = await import("../../lib/js/belt_List.js"); -var N0 = await import("../../lib/js/belt_List.js"); +let N0 = await import("../../lib/js/belt_List.js"); -var O = await import("../../lib/js/belt_List.js"); +let O = await import("../../lib/js/belt_List.js"); -var N1_each = O.forEach; +let N1_each = O.forEach; -var N1 = { +let N1 = { O: O, each: N1_each }; -var N2 = await import("../../lib/js/belt_List.js"); +let N2 = await import("../../lib/js/belt_List.js"); -var N_each = N2.forEach; +let N_each = N2.forEach; -var N = { +let N = { N0: N0, N1: N1, N2: N2, each: N_each }; -var M0 = await import("../../lib/js/belt_List.js"); +let M0 = await import("../../lib/js/belt_List.js"); -var M1 = await import("../../lib/js/belt_List.js"); +let M1 = await import("../../lib/js/belt_List.js"); async function f(param) { return (await import("../../lib/js/belt_List.js")).forEach; @@ -84,8 +84,8 @@ async function f1(param) { } async function f2(param) { - var M3 = await import("../../lib/js/belt_List.js"); - var M4 = await import("../../lib/js/belt_List.js"); + let M3 = await import("../../lib/js/belt_List.js"); + let M4 = await import("../../lib/js/belt_List.js"); return [ M3.forEach, M4.forEach @@ -93,8 +93,8 @@ async function f2(param) { } async function f3(param) { - var M3 = await import("../../lib/js/belt_List.js"); - var M4 = await import("../../lib/js/belt_List.js"); + let M3 = await import("../../lib/js/belt_List.js"); + let M4 = await import("../../lib/js/belt_List.js"); return [ M3.forEach, M4.forEach @@ -106,8 +106,8 @@ async function f4(param) { } async function f5(param) { - var A = await import("../../lib/js/belt_Array.js"); - var O = await import("../../lib/js/belt_Option.js"); + let A = await import("../../lib/js/belt_Array.js"); + let O = await import("../../lib/js/belt_Option.js"); return [ A.forEach, O.forEach @@ -115,8 +115,8 @@ async function f5(param) { } async function f6(param) { - var MS = await import("../../lib/js/belt_MapString.js"); - var A = await import("../../lib/js/belt_Array.js"); + let MS = await import("../../lib/js/belt_MapString.js"); + let A = await import("../../lib/js/belt_Array.js"); return [ 0, MS.forEach, @@ -129,11 +129,11 @@ async function f7(param) { return 1; } -var each = M1.forEach; +let each = M1.forEach; -var M2; +let M2; -var each2 = O.forEach; +let each2 = O.forEach; exports.eachIntAsync = eachIntAsync; exports.eachIntLazy = eachIntLazy; diff --git a/jscomp/test/ImportAttributes.js b/jscomp/test/ImportAttributes.js index 5efa401d50..2c8425718d 100644 --- a/jscomp/test/ImportAttributes.js +++ b/jscomp/test/ImportAttributes.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var MyCssCss = require("./myCss.css"); -var MyJsonJson = require("./myJson.json").default; +let MyCssCss = require("./myCss.css"); +let MyJsonJson = require("./myJson.json").default; -var myJson = MyJsonJson; +let myJson = MyJsonJson; console.log(myJson); -var buttonCss = MyCssCss.button; +let buttonCss = MyCssCss.button; console.log(buttonCss); diff --git a/jscomp/test/ImportAttributes.mjs b/jscomp/test/ImportAttributes.mjs index 324b98c6aa..3489b09547 100644 --- a/jscomp/test/ImportAttributes.mjs +++ b/jscomp/test/ImportAttributes.mjs @@ -3,11 +3,11 @@ import * as MyCssCss from "./myCss.css" with {"type": "css", "some-identifier": "yep"}; import MyJsonJson from "./myJson.json" with {"type": "json", "some-identifier": "yep"}; -var myJson = MyJsonJson; +let myJson = MyJsonJson; console.log(myJson); -var buttonCss = MyCssCss.button; +let buttonCss = MyCssCss.button; console.log(buttonCss); diff --git a/jscomp/test/RecordCoercion.js b/jscomp/test/RecordCoercion.js index ea6d174265..e9fa2b9606 100644 --- a/jscomp/test/RecordCoercion.js +++ b/jscomp/test/RecordCoercion.js @@ -2,12 +2,12 @@ 'use strict'; -var TestInlining_a = { +let TestInlining_a = { number: 42, name: "a" }; -var TestInlining = { +let TestInlining = { a: TestInlining_a, name: "a" }; diff --git a/jscomp/test/RecordOrObject.js b/jscomp/test/RecordOrObject.js index c972f7516b..9735fdfe20 100644 --- a/jscomp/test/RecordOrObject.js +++ b/jscomp/test/RecordOrObject.js @@ -2,12 +2,12 @@ 'use strict'; -var vxy = { +let vxy = { x: 10, y: "abc" }; -var xxi = { +let xxi = { x: 10 }; diff --git a/jscomp/test/SafePromises.js b/jscomp/test/SafePromises.js index 8853a997cb..99fab296d4 100644 --- a/jscomp/test/SafePromises.js +++ b/jscomp/test/SafePromises.js @@ -1,10 +1,10 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Js_promise2 = require("../../lib/js/js_promise2.js"); +let Js_promise2 = require("../../lib/js/js_promise2.js"); async function nestedPromise(xxx) { - var xx = await xxx; + let xx = await xxx; Js_promise2.then(xx, (function (x) { return Promise.resolve((console.log("Promise2.then", x), undefined)); })); @@ -12,7 +12,7 @@ async function nestedPromise(xxx) { console.log("Promise2.catch_", x); return Promise.resolve(0); })); - var arg1 = function (x) { + let arg1 = function (x) { return Promise.resolve((console.log("Promise.then_", x), undefined)); }; xx.then(arg1); @@ -23,9 +23,9 @@ async function create(x) { return x; } -var xx = create(10); +let xx = create(10); -var xxx = create(xx); +let xxx = create(xx); nestedPromise(xxx); diff --git a/jscomp/test/UncurriedAlways.js b/jscomp/test/UncurriedAlways.js index 3474f9929d..bb951912f0 100644 --- a/jscomp/test/UncurriedAlways.js +++ b/jscomp/test/UncurriedAlways.js @@ -6,17 +6,17 @@ function foo(x, y) { return x + y | 0; } -var z = 7; +let z = 7; function bar(x, y) { return x + y | 0; } -var b = 7; +let b = 7; -var w = 7; +let w = 7; -var a = 7; +let a = 7; console.log(a); @@ -72,7 +72,7 @@ function ptl$1(none, extra) { ]; } -var a1 = [ +let a1 = [ "x", "y", "z" @@ -80,14 +80,14 @@ var a1 = [ console.log("a1:", a1); -var AllLabels = { +let AllLabels = { foo: foo$1, ptl: ptl$1, a1: a1 }; function foo$2(x, y, z, dOpt) { - var d = dOpt !== undefined ? dOpt : "d=0"; + let d = dOpt !== undefined ? dOpt : "d=0"; return [ x, y, @@ -100,15 +100,15 @@ function ptl$2(none, extra, extra$1) { return foo$2(none, "y", extra, extra$1); } -var b1 = ptl$2("x", "z", undefined); +let b1 = ptl$2("x", "z", undefined); console.log("b1:", b1); -var b2 = ptl$2("x", "z", "d<-100"); +let b2 = ptl$2("x", "z", "d<-100"); console.log("b2:", b2); -var OptAtEnd = { +let OptAtEnd = { foo: foo$2, ptl: ptl$2, b1: b1, @@ -116,11 +116,11 @@ var OptAtEnd = { }; function foo$3(d1Opt, x, d2Opt, y, d3Opt, z, d4Opt, w, d5Opt) { - var d1 = d1Opt !== undefined ? d1Opt : "d1=0"; - var d2 = d2Opt !== undefined ? d2Opt : "d2=0"; - var d3 = d3Opt !== undefined ? d3Opt : "d3=0"; - var d4 = d4Opt !== undefined ? d4Opt : "d4=0"; - var d5 = d5Opt !== undefined ? d5Opt : "d5=0"; + let d1 = d1Opt !== undefined ? d1Opt : "d1=0"; + let d2 = d2Opt !== undefined ? d2Opt : "d2=0"; + let d3 = d3Opt !== undefined ? d3Opt : "d3=0"; + let d4 = d4Opt !== undefined ? d4Opt : "d4=0"; + let d5 = d5Opt !== undefined ? d5Opt : "d5=0"; return [ d1, x, @@ -138,19 +138,19 @@ function ptl$3(none, none$1, none$2, none$3, none$4, none$5, extra) { return foo$3(none, none$1, none$2, "y", none$3, none$4, none$5, "w", extra); } -var c1 = ptl$3(undefined, "x", undefined, undefined, "z", undefined, undefined); +let c1 = ptl$3(undefined, "x", undefined, undefined, "z", undefined, undefined); console.log("c1:", c1); -var c2 = ptl$3("d1<-100", "x", undefined, undefined, "z", undefined, undefined); +let c2 = ptl$3("d1<-100", "x", undefined, undefined, "z", undefined, undefined); console.log("c2:", c2); -var c3 = ptl$3(undefined, "x", "d2<-200", undefined, "z", "d4<-400", undefined); +let c3 = ptl$3(undefined, "x", "d2<-200", undefined, "z", "d4<-400", undefined); console.log("c3:", c3); -var OptMixed = { +let OptMixed = { foo: foo$3, ptl: ptl$3, c1: c1, @@ -196,9 +196,9 @@ function fz(none, none$1) { return f3(none, none$1, 1); } -var fxyz = f3(1, 1, 1); +let fxyz = f3(1, 1, 1); -var PartialApplication = { +let PartialApplication = { f3: f3, fx: fx, fy: fy, diff --git a/jscomp/test/UncurriedExternals.js b/jscomp/test/UncurriedExternals.js index 5bfc1b5311..a23c67f6f1 100644 --- a/jscomp/test/UncurriedExternals.js +++ b/jscomp/test/UncurriedExternals.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var React = require("react"); +let React = require("react"); function dd(param) { throw { @@ -10,53 +10,53 @@ function dd(param) { }; } -var h = sum(1.0, 2.0); +let h = sum(1.0, 2.0); -var M = { +let M = { sum: (function (prim0, prim1) { return sum(prim0, prim1); }) }; -var hh = M.sum(1.0, 2.0); +let hh = M.sum(1.0, 2.0); -var mf = 3 % 4; +let mf = 3 % 4; function tg(arr) { return arr[0]; } -var tc = Object.assign({}, "abc"); +let tc = Object.assign({}, "abc"); -var te = { +let te = { RE_EXN_ID: "Not_found" }; -var tcr = {}; +let tcr = {}; function tsiC(c) { c.increment = (function (amount) { - var me = this ; + let me = this ; console.log(me); }); } function tsiU(c) { c.increment = (function (amount) { - var me = this ; + let me = this ; console.log(me); }); } -var match = React.useState(function (param) { +let match = React.useState(function (param) { return 3; }); -var StandardNotation_get = match[0]; +let StandardNotation_get = match[0]; -var StandardNotation_set = match[1]; +let StandardNotation_set = match[1]; -var StandardNotation = { +let StandardNotation = { dd: dd, h: h, M: M, @@ -73,7 +73,7 @@ var StandardNotation = { }; function methodWithAsync(param) { - var $$this = this ; + let $$this = this ; return (async function (arg) { return $$this + arg | 0; })(param); @@ -86,58 +86,58 @@ function dd$1(param) { }; } -var h$1 = sum(1.0, 2.0); +let h$1 = sum(1.0, 2.0); -var M$1 = { +let M$1 = { sum: (function (prim0, prim1) { return sum(prim0, prim1); }) }; -var hh$1 = M$1.sum(1.0, 2.0); +let hh$1 = M$1.sum(1.0, 2.0); -var mf$1 = 3 % 4; +let mf$1 = 3 % 4; function tg$1(arr) { return arr[0]; } -var tc$1 = Object.assign({}, "abc"); +let tc$1 = Object.assign({}, "abc"); -var te$1 = { +let te$1 = { RE_EXN_ID: "Not_found" }; -var tcr$1 = {}; +let tcr$1 = {}; function tsiC$1(c) { c.increment = (function (amount) { - var me = this ; + let me = this ; console.log(me); }); } function tsiU$1(c) { c.increment = (function (amount) { - var me = this ; + let me = this ; console.log(me); }); } -var match$1 = React.useState(function () { +let match$1 = React.useState(function () { return 3; }); function methodWithAsyncU() { - var $$this = this ; + let $$this = this ; return async function (arg) { return $$this + arg | 0; }; } -var get = match$1[0]; +let get = match$1[0]; -var set = match$1[1]; +let set = match$1[1]; exports.StandardNotation = StandardNotation; exports.methodWithAsync = methodWithAsync; diff --git a/jscomp/test/UntaggedVariants.js b/jscomp/test/UntaggedVariants.js index a711a227aa..739535cd41 100644 --- a/jscomp/test/UntaggedVariants.js +++ b/jscomp/test/UntaggedVariants.js @@ -1,10 +1,10 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Js_dict = require("../../lib/js/js_dict.js"); -var Belt_Array = require("../../lib/js/belt_Array.js"); -var Caml_array = require("../../lib/js/caml_array.js"); -var Caml_option = require("../../lib/js/caml_option.js"); +let Js_dict = require("../../lib/js/js_dict.js"); +let Belt_Array = require("../../lib/js/belt_Array.js"); +let Caml_array = require("../../lib/js/caml_array.js"); +let Caml_option = require("../../lib/js/caml_option.js"); function classify(x) { if (x === "A" && typeof x !== "number") { @@ -36,9 +36,9 @@ function cls(x) { } } -var ListWithTuples = {}; +let ListWithTuples = {}; -var ListWithObjects = {}; +let ListWithObjects = {}; function tuplesToObjects(l) { if (Array.isArray(l)) { @@ -51,7 +51,7 @@ function tuplesToObjects(l) { } } -var l1 = [ +let l1 = [ 1, [ 2, @@ -62,7 +62,7 @@ var l1 = [ ] ]; -var l2 = tuplesToObjects(l1); +let l2 = tuplesToObjects(l1); console.log("l1", l1); @@ -76,7 +76,7 @@ function isTrue(x) { } } -var Truthy = { +let Truthy = { isTrue: isTrue }; @@ -92,7 +92,7 @@ function classify$1(x) { } } -var TwoObjects = { +let TwoObjects = { classify: classify$1 }; @@ -108,7 +108,7 @@ function classify$2(x) { return "Unknown"; } -var Unknown = { +let Unknown = { classify: classify$2 }; @@ -138,7 +138,7 @@ function classify$3(x) { } } -var MultipleBlocks = { +let MultipleBlocks = { classify: classify$3 }; @@ -154,7 +154,7 @@ function classify$4(x) { } } -var OnlyBlocks = { +let OnlyBlocks = { classify: classify$4 }; @@ -173,7 +173,7 @@ function classify$5(x) { } } -var WithArray = { +let WithArray = { classify: classify$5 }; @@ -216,7 +216,7 @@ function classify$6(x) { } } -var Json = { +let Json = { classify: classify$6 }; @@ -224,11 +224,11 @@ function check(s, y) { if (!Array.isArray(s)) { return 42; } - var x = s[0]; + let x = s[0]; if (!Array.isArray(x)) { return 42; } - var tmp = s[1]; + let tmp = s[1]; if (Array.isArray(tmp) || x === y) { return 42; } else { @@ -236,7 +236,7 @@ function check(s, y) { } } -var TrickyNested = { +let TrickyNested = { check: check }; @@ -255,7 +255,7 @@ function checkEnum(e) { } } -var OverlapString = { +let OverlapString = { checkEnum: checkEnum }; @@ -274,7 +274,7 @@ function checkEnum$1(e) { } } -var OverlapNumber = { +let OverlapNumber = { checkEnum: checkEnum$1 }; @@ -293,7 +293,7 @@ function checkEnum$2(e) { } } -var OverlapObject = { +let OverlapObject = { checkEnum: checkEnum$2 }; @@ -305,7 +305,7 @@ function classify$7(v) { } } -var RecordIsObject = { +let RecordIsObject = { classify: classify$7 }; @@ -317,7 +317,7 @@ function classify$8(v) { } } -var ArrayAndObject = { +let ArrayAndObject = { classify: classify$8 }; @@ -353,7 +353,7 @@ function untaggedInlineMultinaryOption(x) { return x; } -var OptionUnboxingHeuristic = { +let OptionUnboxingHeuristic = { testHasNull: testHasNull, testHasUndefined: testHasUndefined, untaggedWithOptionPayload: untaggedWithOptionPayload, @@ -377,16 +377,16 @@ function classify$9(v) { } } -var ff = (function (x) { +let ff = (function (x) { return x + 1 | 0; }); -var TestFunctionCase = { +let TestFunctionCase = { classify: classify$9, ff: ff }; -var someJson = '[{"name": "Haan"}, {"name": "Mr"}, false]'; +let someJson = '[{"name": "Haan"}, {"name": "Mr"}, false]'; function check$1(s) { if (!Array.isArray(s) && (s === null || typeof s !== "object") && typeof s !== "number" && typeof s !== "string") { @@ -398,11 +398,11 @@ function check$1(s) { console.log("Nope..."); return; } - var match = s[0]; + let match = s[0]; if (match === true) { - var match$1 = s[1]; + let match$1 = s[1]; if (match$1 === false) { - var match$2 = s[2]; + let match$2 = s[2]; if (!Array.isArray(match$2) && (match$2 === null || typeof match$2 !== "object") && typeof match$2 !== "number" && typeof match$2 !== "string") { console.log("Nope..."); return; @@ -412,13 +412,13 @@ function check$1(s) { console.log("Nope..."); return; } - var match$3 = match$2[0]; + let match$3 = match$2[0]; if (!Array.isArray(match$3) && (match$3 === null || typeof match$3 !== "object") && typeof match$3 !== "number" && typeof match$3 !== "string") { console.log("Nope..."); return; } if (typeof match$3 === "string" && match$3 === "My name is") { - var match$4 = match$2[1]; + let match$4 = match$2[1]; if (!Array.isArray(match$4) && (match$4 === null || typeof match$4 !== "object") && typeof match$4 !== "number" && typeof match$4 !== "string") { console.log("Nope..."); return; @@ -455,7 +455,7 @@ function check$1(s) { } } -var ComplexPattern = { +let ComplexPattern = { someJson: someJson, check: check$1 }; @@ -485,7 +485,7 @@ async function awaitUser(u) { } } -var PromiseSync = { +let PromiseSync = { getUserName: getUserName, awaitUser: awaitUser }; @@ -521,7 +521,7 @@ async function classify$10(a) { } } -var Arr = { +let Arr = { classify: classify$10 }; @@ -563,7 +563,7 @@ async function classifyAll(t) { } } -var AllInstanceofTypes = { +let AllInstanceofTypes = { classifyAll: classifyAll }; @@ -579,23 +579,23 @@ function test(t) { } } -var Aliased = { +let Aliased = { test: test }; -var OnlyOne = { +let OnlyOne = { onlyOne: "OnlyOne" }; -var i = 42; +let i = 42; -var i2 = 42.5; +let i2 = 42.5; -var s = "abc"; +let s = "abc"; -var s2 = "abc"; +let s2 = "abc"; -var w = { +let w = { x: 10, y: "" }; diff --git a/jscomp/test/VariantCoercion.js b/jscomp/test/VariantCoercion.js index 325b780648..90e334d343 100644 --- a/jscomp/test/VariantCoercion.js +++ b/jscomp/test/VariantCoercion.js @@ -2,23 +2,23 @@ 'use strict'; -var x = { +let x = { kind: "One", age: 1 }; -var CoerceVariants = { +let CoerceVariants = { a: 1.1, b: 1.1, x: x, y: x }; -var a = "hello"; +let a = "hello"; -var c = 100; +let c = 100; -var CoerceWithPayload = { +let CoerceWithPayload = { a: a, aa: "First", b: a, @@ -29,13 +29,13 @@ var CoerceWithPayload = { dd: 2 }; -var a$1 = "hello"; +let a$1 = "hello"; -var aa = "First"; +let aa = "First"; -var c$1 = "Hi"; +let c$1 = "Hi"; -var CoerceFromStringToVariant = { +let CoerceFromStringToVariant = { a: a$1, aa: aa, b: a$1, @@ -44,7 +44,7 @@ var CoerceFromStringToVariant = { cc: c$1 }; -var CoerceFromIntToVariant = { +let CoerceFromIntToVariant = { a: 100, aa: 1, b: 100, @@ -53,7 +53,7 @@ var CoerceFromIntToVariant = { cc: 120 }; -var CoerceFromFloatToVariant = { +let CoerceFromFloatToVariant = { a: 100, aa: 1, b: 100, @@ -62,7 +62,7 @@ var CoerceFromFloatToVariant = { cc: 120 }; -var CoerceFromBigintToVariant = { +let CoerceFromBigintToVariant = { a: 100n, aa: 1n, b: 100n, @@ -71,17 +71,17 @@ var CoerceFromBigintToVariant = { cc: 120n }; -var a$2 = "Three"; +let a$2 = "Three"; -var b = "Three"; +let b = "Three"; -var i = 1; +let i = 1; -var d = 1; +let d = 1; -var ii = 1.1; +let ii = 1.1; -var dd = 1.1; +let dd = 1.1; exports.a = a$2; exports.b = b; diff --git a/jscomp/test/VariantSpreads.js b/jscomp/test/VariantSpreads.js index 2a14decda1..b76df895a7 100644 --- a/jscomp/test/VariantSpreads.js +++ b/jscomp/test/VariantSpreads.js @@ -2,24 +2,24 @@ 'use strict'; -var S = {}; +let S = {}; -var b1 = "Two"; +let b1 = "Two"; -var b2 = { +let b2 = { TAG: "One", _0: true, _1: "Bar" }; -var c = { +let c = { TAG: "Five", _0: 2 }; -var ddd = "Six"; +let ddd = "Six"; -var q = { +let q = { TAG: "One", name: "hello" }; diff --git a/jscomp/test/a_filename_test.js b/jscomp/test/a_filename_test.js index c02e4e8f4c..214cec8a36 100644 --- a/jscomp/test/a_filename_test.js +++ b/jscomp/test/a_filename_test.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var $$Array = require("../../lib/js/array.js"); -var Ext_filename_test = require("./ext_filename_test.js"); +let Mt = require("./mt.js"); +let $$Array = require("../../lib/js/array.js"); +let Ext_filename_test = require("./ext_filename_test.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; diff --git a/jscomp/test/a_list_test.js b/jscomp/test/a_list_test.js index 3b6697de30..824e4783a2 100644 --- a/jscomp/test/a_list_test.js +++ b/jscomp/test/a_list_test.js @@ -1,10 +1,10 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Ext_list_test = require("./ext_list_test.js"); +let Mt = require("./mt.js"); +let Ext_list_test = require("./ext_list_test.js"); -var suites_0 = [ +let suites_0 = [ "drop", (function (param) { return { @@ -24,7 +24,7 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "drop1", (function (param) { @@ -104,7 +104,7 @@ var suites_1 = { } }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/a_recursive_type.js b/jscomp/test/a_recursive_type.js index 194921d99b..1c8ad8884f 100644 --- a/jscomp/test/a_recursive_type.js +++ b/jscomp/test/a_recursive_type.js @@ -1,25 +1,25 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); function g(x) { return Curry._1(x._0, x); } -var loop = g({ +let loop = g({ TAG: "A", _0: g }); -var x = { +let x = { TAG: "A", _0: g }; -var non_terminate = g(x); +let non_terminate = g(x); -var xx = {}; +let xx = {}; xx.xx = xx; diff --git a/jscomp/test/a_scope_bug.js b/jscomp/test/a_scope_bug.js index b2220ebda7..ec1433ef4e 100644 --- a/jscomp/test/a_scope_bug.js +++ b/jscomp/test/a_scope_bug.js @@ -4,16 +4,16 @@ function odd(_z) { while(true) { - var z = _z; - var even = Math.imul(z, z); - var a = (even + 4 | 0) + even | 0; + let z = _z; + let even = Math.imul(z, z); + let a = (even + 4 | 0) + even | 0; console.log(String(a)); _z = 32; continue ; }; } -var even = odd; +let even = odd; exports.odd = odd; exports.even = even; diff --git a/jscomp/test/a_string_test.js b/jscomp/test/a_string_test.js index 8d20dfabbf..c008b8256d 100644 --- a/jscomp/test/a_string_test.js +++ b/jscomp/test/a_string_test.js @@ -1,11 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var List = require("../../lib/js/list.js"); -var Ext_string_test = require("./ext_string_test.js"); +let Mt = require("./mt.js"); +let List = require("../../lib/js/list.js"); +let Ext_string_test = require("./ext_string_test.js"); -var suites_0 = [ +let suites_0 = [ "split", (function (param) { return { @@ -25,7 +25,7 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "split_non_empty", (function (param) { @@ -110,16 +110,16 @@ var suites_1 = { } }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; Mt.from_pair_suites("A_string_test", suites); -var split = Ext_string_test.split; +let split = Ext_string_test.split; -var split_by = Ext_string_test.split_by; +let split_by = Ext_string_test.split_by; exports.split = split; exports.split_by = split_by; diff --git a/jscomp/test/alias_default_value_test.js b/jscomp/test/alias_default_value_test.js index 4234d99cd4..7d09bad077 100644 --- a/jscomp/test/alias_default_value_test.js +++ b/jscomp/test/alias_default_value_test.js @@ -3,19 +3,19 @@ function Alias_default_value_test$C0(props) { - var __b = props.b; - var __a = props.a; - var a = __a !== undefined ? __a : 2; - var b = __b !== undefined ? __b : (a << 1); + let __b = props.b; + let __a = props.a; + let a = __a !== undefined ? __a : 2; + let b = __b !== undefined ? __b : (a << 1); return a + b | 0; } -var C0 = { +let C0 = { make: Alias_default_value_test$C0 }; function Alias_default_value_test$C1(props) { - var __bar = props.foo; + let __bar = props.foo; if (__bar !== undefined) { return __bar; } else { @@ -23,24 +23,24 @@ function Alias_default_value_test$C1(props) { } } -var C1 = { +let C1 = { make: Alias_default_value_test$C1 }; function Alias_default_value_test$C2(props) { - var __a = props.a; - var __bar = props.foo; - var bar = __bar !== undefined ? __bar : ""; - var a = __a !== undefined ? __a : bar; + let __a = props.a; + let __bar = props.foo; + let bar = __bar !== undefined ? __bar : ""; + let a = __a !== undefined ? __a : bar; return bar + a + props.b; } -var C2 = { +let C2 = { make: Alias_default_value_test$C2 }; function Alias_default_value_test$C3(props) { - var __text = props.text; + let __text = props.text; if (__text !== undefined) { return __text; } else { @@ -48,7 +48,7 @@ function Alias_default_value_test$C3(props) { } } -var C3 = { +let C3 = { make: Alias_default_value_test$C3 }; @@ -56,7 +56,7 @@ function Alias_default_value_test$C4(props) { return props.a; } -var C4 = { +let C4 = { make: Alias_default_value_test$C4 }; @@ -64,7 +64,7 @@ function Alias_default_value_test$C6(props) { return props.comp.xx; } -var C6 = { +let C6 = { make: Alias_default_value_test$C6 }; diff --git a/jscomp/test/alias_test.js b/jscomp/test/alias_test.js index 0ea3140892..637e178967 100644 --- a/jscomp/test/alias_test.js +++ b/jscomp/test/alias_test.js @@ -1,27 +1,27 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_string = require("../../lib/js/caml_string.js"); +let Caml_string = require("../../lib/js/caml_string.js"); -var a10 = "hello world"; +let a10 = "hello world"; -var a20 = a10 + "not"; +let a20 = a10 + "not"; -var v = Caml_string.get(a20, 0) === /* 'h' */104 ? 1 : 2; +let v = Caml_string.get(a20, 0) === /* 'h' */104 ? 1 : 2; -var a21 = a20 + a20; +let a21 = a20 + a20; -var a22 = "test " + (a21 + "hello"); +let a22 = "test " + (a21 + "hello"); function ff(param) { return "cool " + a22; } -var a23 = ff(); +let a23 = ff(); -var a15 = a10; +let a15 = a10; -var b15 = 111; +let b15 = 111; exports.a15 = a15; exports.b15 = b15; diff --git a/jscomp/test/and_or_tailcall_test.js b/jscomp/test/and_or_tailcall_test.js index 14799848d6..ebdaf7e274 100644 --- a/jscomp/test/and_or_tailcall_test.js +++ b/jscomp/test/and_or_tailcall_test.js @@ -1,11 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); function f(b, x, _n) { while(true) { - var n = _n; + let n = _n; if (n > 100000) { return false; } @@ -19,7 +19,7 @@ function f(b, x, _n) { function or_f(b, x, _n) { while(true) { - var n = _n; + let n = _n; if (n > 100000) { return false; } @@ -31,7 +31,7 @@ function or_f(b, x, _n) { }; } -var suites_0 = [ +let suites_0 = [ "and_tail", (function (param) { return { @@ -42,7 +42,7 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "or_tail", (function (param) { @@ -56,7 +56,7 @@ var suites_1 = { tl: /* [] */0 }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/argv_test.js b/jscomp/test/argv_test.js index 8d939ad3ae..727bfd8154 100644 --- a/jscomp/test/argv_test.js +++ b/jscomp/test/argv_test.js @@ -1,23 +1,23 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Arg = require("../../lib/js/arg.js"); +let Arg = require("../../lib/js/arg.js"); function anno_fun(arg) { } -var usage_msg = "Usage:\n"; +let usage_msg = "Usage:\n"; -var compile = { +let compile = { contents: false }; -var test = { +let test = { contents: true }; -var arg_spec_0 = [ +let arg_spec_0 = [ "-c", { TAG: "Set", @@ -26,7 +26,7 @@ var arg_spec_0 = [ " Compile" ]; -var arg_spec_1 = { +let arg_spec_1 = { hd: [ "-d", { @@ -38,7 +38,7 @@ var arg_spec_1 = { tl: /* [] */0 }; -var arg_spec = { +let arg_spec = { hd: arg_spec_0, tl: arg_spec_1 }; diff --git a/jscomp/test/ari_regress_test.js b/jscomp/test/ari_regress_test.js index 1917447aae..6e996c97f1 100644 --- a/jscomp/test/ari_regress_test.js +++ b/jscomp/test/ari_regress_test.js @@ -1,34 +1,34 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Curry = require("../../lib/js/curry.js"); +let Mt = require("./mt.js"); +let Curry = require("../../lib/js/curry.js"); -var g = 7; +let g = 7; -var h = { +let h = { contents: 0 }; function g1(x, y) { - var u = x + y | 0; + let u = x + y | 0; h.contents = h.contents + 1 | 0; return function (xx, yy) { return (xx + yy | 0) + u | 0; }; } -var u = 8; +let u = 8; -var x = u + 6 | 0; +let x = u + 6 | 0; -var partial_arg = g1(3, 4); +let partial_arg = g1(3, 4); function v(param) { return partial_arg(6, param); } -var suites_0 = [ +let suites_0 = [ "curry", (function (param) { return { @@ -39,7 +39,7 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "curry2", (function (param) { @@ -77,7 +77,7 @@ var suites_1 = { } }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/arith_lexer.js b/jscomp/test/arith_lexer.js index 010f5005a9..c2c648e4e4 100644 --- a/jscomp/test/arith_lexer.js +++ b/jscomp/test/arith_lexer.js @@ -1,12 +1,12 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); -var Lexing = require("../../lib/js/lexing.js"); -var Pervasives = require("../../lib/js/pervasives.js"); -var Caml_format = require("../../lib/js/caml_format.js"); +let Curry = require("../../lib/js/curry.js"); +let Lexing = require("../../lib/js/lexing.js"); +let Pervasives = require("../../lib/js/pervasives.js"); +let Caml_format = require("../../lib/js/caml_format.js"); -var __ocaml_lex_tables = { +let __ocaml_lex_tables = { lex_base: "\x00\x00\xf6\xff\xf7\xff\xf8\xff\xf9\xff\xfa\xff\xfb\xff\xfc\xff\ \x3a\x00\x85\x00\xff\xff", lex_backtrk: "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\ @@ -121,8 +121,8 @@ var __ocaml_lex_tables = { function __ocaml_lex_lexeme_rec(lexbuf, ___ocaml_lex_state) { while(true) { - var __ocaml_lex_state = ___ocaml_lex_state; - var __ocaml_lex_state$1 = Lexing.engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf); + let __ocaml_lex_state = ___ocaml_lex_state; + let __ocaml_lex_state$1 = Lexing.engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf); switch (__ocaml_lex_state$1) { case 0 : ___ocaml_lex_state = 0; diff --git a/jscomp/test/arith_parser.js b/jscomp/test/arith_parser.js index 2a18696a6b..215598b1a2 100644 --- a/jscomp/test/arith_parser.js +++ b/jscomp/test/arith_parser.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Parsing = require("../../lib/js/parsing.js"); +let Parsing = require("../../lib/js/parsing.js"); -var yytransl_const = [ +let yytransl_const = [ 259, 260, 261, @@ -15,42 +15,42 @@ var yytransl_const = [ 0 ]; -var yytransl_block = [ +let yytransl_block = [ 257, 258, 0 ]; -var yylhs = "\xff\xff\ +let yylhs = "\xff\xff\ \x01\x00\x02\x00\x02\x00\x02\x00\x02\x00\x02\x00\x02\x00\x02\x00\ \x02\x00\x00\x00"; -var yylen = "\x02\x00\ +let yylen = "\x02\x00\ \x02\x00\x01\x00\x01\x00\x03\x00\x03\x00\x03\x00\x03\x00\x02\x00\ \x03\x00\x02\x00"; -var yydefred = "\x00\x00\ +let yydefred = "\x00\x00\ \x00\x00\x00\x00\x02\x00\x03\x00\x00\x00\x00\x00\x0a\x00\x00\x00\ \x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x09\x00\ \x00\x00\x00\x00\x06\x00\x07\x00"; -var yydgoto = "\x02\x00\ +let yydgoto = "\x02\x00\ \x07\x00\x08\x00"; -var yysindex = "\xff\xff\ +let yysindex = "\xff\xff\ \x10\xff\x00\x00\x00\x00\x00\x00\x10\xff\x10\xff\x00\x00\x0a\x00\ \x00\x00\x16\xff\x10\xff\x10\xff\x10\xff\x10\xff\x00\x00\x00\x00\ \xff\xfe\xff\xfe\x00\x00\x00\x00"; -var yyrindex = "\x00\x00\ +let yyrindex = "\x00\x00\ \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\ \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\ \x01\x00\x03\x00\x00\x00\x00\x00"; -var yygindex = "\x00\x00\ +let yygindex = "\x00\x00\ \x00\x00\x02\x00"; -var yytable = "\x01\x00\ +let yytable = "\x01\x00\ \x04\x00\x00\x00\x05\x00\x0d\x00\x0e\x00\x00\x00\x09\x00\x0a\x00\ \x00\x00\x0f\x00\x00\x00\x00\x00\x11\x00\x12\x00\x13\x00\x14\x00\ \x03\x00\x04\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x06\x00\ @@ -86,7 +86,7 @@ var yytable = "\x01\x00\ \x00\x00\x00\x00\x00\x00\x04\x00\x04\x00\x05\x00\x05\x00\x00\x00\ \x00\x00\x04\x00\x00\x00\x05\x00\x0b\x00\x0c\x00\x0d\x00\x0e\x00"; -var yycheck = "\x01\x00\ +let yycheck = "\x01\x00\ \x00\x00\xff\xff\x00\x00\x05\x01\x06\x01\xff\xff\x05\x00\x06\x00\ \xff\xff\x00\x00\xff\xff\xff\xff\x0b\x00\x0c\x00\x0d\x00\x0e\x00\ \x01\x01\x02\x01\xff\xff\x04\x01\xff\xff\xff\xff\xff\xff\x08\x01\ @@ -122,7 +122,7 @@ var yycheck = "\x01\x00\ \xff\xff\xff\xff\xff\xff\x03\x01\x04\x01\x03\x01\x04\x01\xff\xff\ \xff\xff\x09\x01\xff\xff\x09\x01\x03\x01\x04\x01\x05\x01\x06\x01"; -var yynames_const = "\ +let yynames_const = "\ PLUS\x00\ MINUS\x00\ TIMES\x00\ @@ -133,12 +133,12 @@ var yynames_const = "\ EOF\x00\ "; -var yynames_block = "\ +let yynames_block = "\ NUMERAL\x00\ IDENT\x00\ "; -var yyact = [ +let yyact = [ (function (param) { throw { RE_EXN_ID: "Failure", @@ -150,22 +150,22 @@ var yyact = [ return Parsing.peek_val(__caml_parser_env, 1); }), (function (__caml_parser_env) { - var _1 = Parsing.peek_val(__caml_parser_env, 0); + let _1 = Parsing.peek_val(__caml_parser_env, 0); return { TAG: "Numeral", _0: _1 }; }), (function (__caml_parser_env) { - var _1 = Parsing.peek_val(__caml_parser_env, 0); + let _1 = Parsing.peek_val(__caml_parser_env, 0); return { TAG: "Variable", _0: _1 }; }), (function (__caml_parser_env) { - var _1 = Parsing.peek_val(__caml_parser_env, 2); - var _3 = Parsing.peek_val(__caml_parser_env, 0); + let _1 = Parsing.peek_val(__caml_parser_env, 2); + let _3 = Parsing.peek_val(__caml_parser_env, 0); return { TAG: "Plus", _0: _1, @@ -173,8 +173,8 @@ var yyact = [ }; }), (function (__caml_parser_env) { - var _1 = Parsing.peek_val(__caml_parser_env, 2); - var _3 = Parsing.peek_val(__caml_parser_env, 0); + let _1 = Parsing.peek_val(__caml_parser_env, 2); + let _3 = Parsing.peek_val(__caml_parser_env, 0); return { TAG: "Minus", _0: _1, @@ -182,8 +182,8 @@ var yyact = [ }; }), (function (__caml_parser_env) { - var _1 = Parsing.peek_val(__caml_parser_env, 2); - var _3 = Parsing.peek_val(__caml_parser_env, 0); + let _1 = Parsing.peek_val(__caml_parser_env, 2); + let _3 = Parsing.peek_val(__caml_parser_env, 0); return { TAG: "Times", _0: _1, @@ -191,8 +191,8 @@ var yyact = [ }; }), (function (__caml_parser_env) { - var _1 = Parsing.peek_val(__caml_parser_env, 2); - var _3 = Parsing.peek_val(__caml_parser_env, 0); + let _1 = Parsing.peek_val(__caml_parser_env, 2); + let _3 = Parsing.peek_val(__caml_parser_env, 0); return { TAG: "Divide", _0: _1, @@ -200,7 +200,7 @@ var yyact = [ }; }), (function (__caml_parser_env) { - var _2 = Parsing.peek_val(__caml_parser_env, 0); + let _2 = Parsing.peek_val(__caml_parser_env, 0); return { TAG: "Negate", _0: _2 @@ -218,7 +218,7 @@ var yyact = [ }) ]; -var yytables = { +let yytables = { actions: yyact, transl_const: yytransl_const, transl_block: yytransl_block, @@ -241,7 +241,7 @@ function toplevel(lexfun, lexbuf) { return Parsing.yyparse(yytables, 1, lexfun, lexbuf); } -var yytablesize = 272; +let yytablesize = 272; exports.yytransl_const = yytransl_const; exports.yytransl_block = yytransl_block; diff --git a/jscomp/test/arith_syntax.js b/jscomp/test/arith_syntax.js index d56fe97058..1847109dfd 100644 --- a/jscomp/test/arith_syntax.js +++ b/jscomp/test/arith_syntax.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Pervasives = require("../../lib/js/pervasives.js"); +let Pervasives = require("../../lib/js/pervasives.js"); function str(e) { switch (e.TAG) { diff --git a/jscomp/test/arity.js b/jscomp/test/arity.js index e265276a6c..c3c61451da 100644 --- a/jscomp/test/arity.js +++ b/jscomp/test/arity.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); function u(f, a, b) { console.log(f(a, b)); @@ -22,11 +22,11 @@ function add(prim0, prim1) { } function h(u) { - var m = u.hi; + let m = u.hi; return m(1, 2); } -var nested = { +let nested = { x: { y: 3 } diff --git a/jscomp/test/arity_deopt.js b/jscomp/test/arity_deopt.js index 721b1b85ef..7d1512fb7a 100644 --- a/jscomp/test/arity_deopt.js +++ b/jscomp/test/arity_deopt.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; diff --git a/jscomp/test/arity_infer.js b/jscomp/test/arity_infer.js index 8472ac3262..ed8941aabd 100644 --- a/jscomp/test/arity_infer.js +++ b/jscomp/test/arity_infer.js @@ -1,10 +1,10 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); function f0(x) { - var tmp; + let tmp; if (x > 3) { tmp = (function (x) { return x + 1 | 0; @@ -27,7 +27,7 @@ function f1(x) { } function f3(x) { - var tmp; + let tmp; switch (x) { case 0 : tmp = (function (x) { diff --git a/jscomp/test/array_data_util.js b/jscomp/test/array_data_util.js index 4a966b4ef3..cc98eaa8a8 100644 --- a/jscomp/test/array_data_util.js +++ b/jscomp/test/array_data_util.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Belt_Array = require("../../lib/js/belt_Array.js"); +let Belt_Array = require("../../lib/js/belt_Array.js"); function range(i, j) { return Belt_Array.makeBy((j - i | 0) + 1 | 0, (function (k) { @@ -10,14 +10,14 @@ function range(i, j) { } function randomRange(i, j) { - var v = Belt_Array.makeBy((j - i | 0) + 1 | 0, (function (k) { + let v = Belt_Array.makeBy((j - i | 0) + 1 | 0, (function (k) { return k + i | 0; })); Belt_Array.shuffleInPlace(v); return v; } -var A; +let A; exports.A = A; exports.range = range; diff --git a/jscomp/test/array_safe_get.js b/jscomp/test/array_safe_get.js index 7a539a12fe..9974405af7 100644 --- a/jscomp/test/array_safe_get.js +++ b/jscomp/test/array_safe_get.js @@ -1,21 +1,21 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_array = require("../../lib/js/caml_array.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let Caml_array = require("../../lib/js/caml_array.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); -var x = [ +let x = [ 1, 2 ]; -var y; +let y; try { y = Caml_array.get(x, 3); } catch (raw_msg){ - var msg = Caml_js_exceptions.internalToOCamlException(raw_msg); + let msg = Caml_js_exceptions.internalToOCamlException(raw_msg); if (msg.RE_EXN_ID === "Invalid_argument") { console.log(msg._1); y = 0; diff --git a/jscomp/test/array_subtle_test.js b/jscomp/test/array_subtle_test.js index e736670a35..519247aa1e 100644 --- a/jscomp/test/array_subtle_test.js +++ b/jscomp/test/array_subtle_test.js @@ -1,20 +1,20 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_array = require("../../lib/js/caml_array.js"); +let Mt = require("./mt.js"); +let Caml_array = require("../../lib/js/caml_array.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; function eq(loc, param) { - var y = param[1]; - var x = param[0]; + let y = param[1]; + let x = param[0]; test_id.contents = test_id.contents + 1 | 0; suites.contents = { hd: [ @@ -31,7 +31,7 @@ function eq(loc, param) { }; } -var v = [ +let v = [ 1, 2, 3, @@ -80,7 +80,7 @@ eq("File \"array_subtle_test.res\", line 29, characters 5-12", [ ]); function f(v) { - var x = v.pop(); + let x = v.pop(); if (x !== undefined) { console.log("hi"); } else { diff --git a/jscomp/test/array_test.js b/jscomp/test/array_test.js index a1161cbe26..a679a0bae7 100644 --- a/jscomp/test/array_test.js +++ b/jscomp/test/array_test.js @@ -1,25 +1,25 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml = require("../../lib/js/caml.js"); -var List = require("../../lib/js/list.js"); -var $$Array = require("../../lib/js/array.js"); -var Curry = require("../../lib/js/curry.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Caml_array = require("../../lib/js/caml_array.js"); -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let Mt = require("./mt.js"); +let Caml = require("../../lib/js/caml.js"); +let List = require("../../lib/js/list.js"); +let $$Array = require("../../lib/js/array.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Caml_array = require("../../lib/js/caml_array.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); function starts_with(xs, prefix, p) { - var H = /* @__PURE__ */Caml_exceptions.create("H"); - var len1 = xs.length; - var len2 = prefix.length; + let H = /* @__PURE__ */Caml_exceptions.create("H"); + let len1 = xs.length; + let len2 = prefix.length; if (len2 > len1) { return false; } try { - for(var i = 0; i < len2; ++i){ + for(let i = 0; i < len2; ++i){ if (!Curry._2(p, Caml_array.get(xs, i), Caml_array.get(prefix, i))) { throw { RE_EXN_ID: H, @@ -31,7 +31,7 @@ function starts_with(xs, prefix, p) { return true; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === H) { return false; } @@ -40,10 +40,10 @@ function starts_with(xs, prefix, p) { } function is_sorted(x) { - var len = x.length; - var _i = 0; + let len = x.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i >= (len - 1 | 0)) { return true; } @@ -55,7 +55,7 @@ function is_sorted(x) { }; } -var array_suites_0 = [ +let array_suites_0 = [ "init", (function (param) { return { @@ -74,11 +74,11 @@ var array_suites_0 = [ }) ]; -var array_suites_1 = { +let array_suites_1 = { hd: [ "toList", (function (param) { - var aux = function (xs) { + let aux = function (xs) { return List.fold_left((function (acc, param) { return { hd: [ @@ -89,7 +89,7 @@ var array_suites_1 = { }; }), /* [] */0, xs); }; - var match = List.split(aux({ + let match = List.split(aux({ hd: [ [], /* [] */0 @@ -185,12 +185,12 @@ var array_suites_1 = { hd: [ "blit", (function (param) { - var u = [ + let u = [ 100, 0, 0 ]; - var v = $$Array.init(3, (function (x) { + let v = $$Array.init(3, (function (x) { return (x << 1); })); $$Array.blit(v, 1, u, 1, 2); @@ -219,7 +219,7 @@ var array_suites_1 = { hd: [ "File \"array_test.res\", line 75, characters 8-15", (function (param) { - var a0 = $$Array.init(100, (function (i) { + let a0 = $$Array.init(100, (function (i) { return (i << 0); })); $$Array.blit(a0, 10, a0, 5, 20); @@ -261,7 +261,7 @@ var array_suites_1 = { hd: [ "File \"array_test.res\", line 118, characters 8-15", (function (param) { - var a0 = $$Array.init(100, (function (i) { + let a0 = $$Array.init(100, (function (i) { return (i << 0); })); $$Array.blit(a0, 5, a0, 10, 20); @@ -319,7 +319,7 @@ var array_suites_1 = { hd: [ "sort", (function (param) { - var u = [ + let u = [ 3, 0, 1 @@ -340,7 +340,7 @@ var array_suites_1 = { hd: [ "sort_large", (function (param) { - var v = $$Array.init(4, (function (i) { + let v = $$Array.init(4, (function (i) { return i % 17; })); $$Array.sort(Caml.int_compare, v); @@ -363,7 +363,7 @@ var array_suites_1 = { } }; -var array_suites = { +let array_suites = { hd: array_suites_0, tl: array_suites_1 }; diff --git a/jscomp/test/as_inline_record_test.js b/jscomp/test/as_inline_record_test.js index 9518636755..7a320bb8bf 100644 --- a/jscomp/test/as_inline_record_test.js +++ b/jscomp/test/as_inline_record_test.js @@ -18,7 +18,7 @@ function getAge$p(t) { return t.age; } -var user = { +let user = { TAG: "User", renamed: "Corentin", age: 35 diff --git a/jscomp/test/ast_abstract_test.js b/jscomp/test/ast_abstract_test.js index 967a7625c3..0e581029a3 100644 --- a/jscomp/test/ast_abstract_test.js +++ b/jscomp/test/ast_abstract_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Js_mapperRt = require("../../lib/js/js_mapperRt.js"); +let Mt = require("./mt.js"); +let Js_mapperRt = require("../../lib/js/js_mapperRt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -45,19 +45,19 @@ function tFromJs(param) { }; } -var v0 = { +let v0 = { x: 3, y: false, z: false }; -var v1 = { +let v1 = { x: 3, y: false, z: "" }; -var _map = {"a":"a","b":"b","c":"c"}; +let _map = {"a":"a","b":"b","c":"c"}; function xToJs(param) { return param; @@ -79,9 +79,9 @@ idx("c"); Mt.from_pair_suites("Ast_abstract_test", suites.contents); -var x0 = "a"; +let x0 = "a"; -var x1 = "b"; +let x1 = "b"; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/async_await.js b/jscomp/test/async_await.js index 74bc9836bc..ae29f57668 100644 --- a/jscomp/test/async_await.js +++ b/jscomp/test/async_await.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_array = require("../../lib/js/caml_array.js"); +let Caml_array = require("../../lib/js/caml_array.js"); function next(n) { return n + 1 | 0; @@ -12,7 +12,7 @@ async function useNext() { } function Make(I) { - var get = async function (key) { + let get = async function (key) { return await I.get(key); }; return { @@ -24,15 +24,15 @@ async function topFoo() { return 1; } -var arr = [ +let arr = [ 1, 2, 3 ]; -var toplevelAwait = await topFoo(); +let toplevelAwait = await topFoo(); -var toplevelAwait2 = Caml_array.get(arr, await topFoo()); +let toplevelAwait2 = Caml_array.get(arr, await topFoo()); async function f(value) { return await Promise.resolve(1); diff --git a/jscomp/test/async_inline.js b/jscomp/test/async_inline.js index 50c38d479f..de28f21fc0 100644 --- a/jscomp/test/async_inline.js +++ b/jscomp/test/async_inline.js @@ -1,25 +1,25 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); -var React = require("react"); +let Curry = require("../../lib/js/curry.js"); +let React = require("react"); async function willBeInlined(param) { return 3; } -var inlined = willBeInlined(); +let inlined = willBeInlined(); function wrapSomethingAsync(param) { ((async function (param) { - var test = await Promise.resolve("Test"); + let test = await Promise.resolve("Test"); console.log(test); })(777)); } function wrapSomethingAsync2(param) { ((async function (param) { - var test = await Promise.resolve("Test"); + let test = await Promise.resolve("Test"); console.log(test); })()); } @@ -28,9 +28,9 @@ async function doSomethingAsync(someAsyncFunction) { return await Curry._1(someAsyncFunction, undefined); } -var broken = doSomethingAsync; +let broken = doSomethingAsync; -var M = { +let M = { broken: broken }; @@ -38,7 +38,7 @@ async function broken$1(someAsyncFunction) { return await Curry._1(someAsyncFunction, undefined); } -var broken$2 = broken$1; +let broken$2 = broken$1; function curriedId(x) { return x; @@ -56,11 +56,11 @@ async function uncurriedIdAsync(x) { return x; } -var tcia = curriedIdAsync(3); +let tcia = curriedIdAsync(3); -var tui = 3; +let tui = 3; -var tuia = uncurriedIdAsync(3); +let tuia = uncurriedIdAsync(3); function nested1(param) { return async function (y) { @@ -80,7 +80,7 @@ function onSubmit(param) { }); } -var tci = 3; +let tci = 3; exports.willBeInlined = willBeInlined; exports.inlined = inlined; diff --git a/jscomp/test/async_inside_loop.js b/jscomp/test/async_inside_loop.js index 22abaebe8e..4a5b8f3945 100644 --- a/jscomp/test/async_inside_loop.js +++ b/jscomp/test/async_inside_loop.js @@ -3,8 +3,8 @@ async function topLevelAsyncFunction(param) { - for(var innerScopeVal = 0; innerScopeVal <= 3; ++innerScopeVal){ - var asyncClosureAccessingScopedVal = await(async function(innerScopeVal){ + for(let innerScopeVal = 0; innerScopeVal <= 3; ++innerScopeVal){ + let asyncClosureAccessingScopedVal = await(async function(innerScopeVal){ return async function asyncClosureAccessingScopedVal(param) { console.log("Accessing scoped var inside loop", innerScopeVal); return await Promise.resolve(); diff --git a/jscomp/test/attr_test.js b/jscomp/test/attr_test.js index c1b21aff87..4ad7b793fe 100644 --- a/jscomp/test/attr_test.js +++ b/jscomp/test/attr_test.js @@ -6,13 +6,13 @@ function u(x, y) { return x + y | 0; } -var h = 3; +let h = 3; function max2(x, y) { return x + y; } -var hh = 1 + 2; +let hh = 1 + 2; function f(x) { des(x, (function (param) { diff --git a/jscomp/test/b.js b/jscomp/test/b.js index f9e7f93d9c..350cd0e7d9 100644 --- a/jscomp/test/b.js +++ b/jscomp/test/b.js @@ -3,8 +3,8 @@ function f(point) { - var y = point.y; - var x = point.x; + let y = point.y; + let x = point.x; return Math.pow(x * x + y * y, 2); } diff --git a/jscomp/test/bal_set_mini.js b/jscomp/test/bal_set_mini.js index 0c032b60c2..7a8a039177 100644 --- a/jscomp/test/bal_set_mini.js +++ b/jscomp/test/bal_set_mini.js @@ -11,8 +11,8 @@ function height(x) { } function create(l, v, r) { - var hl = height(l); - var hr = height(r); + let hl = height(l); + let hr = height(r); return { TAG: "Node", _0: l, @@ -23,15 +23,15 @@ function create(l, v, r) { } function bal(l, v, r) { - var hl = height(l); - var hr = height(r); + let hl = height(l); + let hr = height(r); if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { return "Empty"; } - var lr = l._2; - var lv = l._1; - var ll = l._0; + let lr = l._2; + let lv = l._1; + let ll = l._0; if (height(ll) >= height(lr)) { return create(ll, lv, create(lr, v, r)); } else if (typeof lr !== "object") { @@ -52,9 +52,9 @@ function bal(l, v, r) { if (typeof r !== "object") { return "Empty"; } - var rr = r._2; - var rv = r._1; - var rl = r._0; + let rr = r._2; + let rv = r._1; + let rl = r._0; if (height(rr) >= height(rl)) { return create(create(l, v, rl), rv, rr); } else if (typeof rl !== "object") { @@ -84,10 +84,10 @@ function add(x, x_) { _3: 1 }; } - var r = x_._2; - var v = x_._1; - var l = x_._0; - var c = compare_int(x, v); + let r = x_._2; + let v = x_._1; + let l = x_._0; + let c = compare_int(x, v); if (c === 0) { return x_; } else if (c < 0) { @@ -99,12 +99,12 @@ function add(x, x_) { function min_elt(_def, _x) { while(true) { - var x = _x; - var def = _def; + let x = _x; + let def = _def; if (typeof x !== "object") { return def; } - var l = x._0; + let l = x._0; if (typeof l !== "object") { return x._1; } @@ -129,7 +129,7 @@ function internal_merge(l, r) { if (typeof r !== "object") { return l; } - var rv = r._1; + let rv = r._1; return bal(l, min_elt(rv, r), remove_min_elt(r._0, rv, r._2)); } @@ -137,10 +137,10 @@ function remove(x, tree) { if (typeof tree !== "object") { return "Empty"; } - var r = tree._2; - var v = tree._1; - var l = tree._0; - var c = compare_int(x, v); + let r = tree._2; + let v = tree._1; + let l = tree._0; + let c = compare_int(x, v); if (c === 0) { return internal_merge(l, r); } else if (c < 0) { @@ -152,11 +152,11 @@ function remove(x, tree) { function mem(x, _x_) { while(true) { - var x_ = _x_; + let x_ = _x_; if (typeof x_ !== "object") { return false; } - var c = compare_int(x, x_._1); + let c = compare_int(x, x_._1); if (c === 0) { return true; } @@ -165,24 +165,24 @@ function mem(x, _x_) { }; } -var v = "Empty"; +let v = "Empty"; -for(var i = 0; i <= 100000; ++i){ +for(let i = 0; i <= 100000; ++i){ v = add(i, v); } -for(var i$1 = 0; i$1 <= 100000; ++i$1){ +for(let i$1 = 0; i$1 <= 100000; ++i$1){ if (!mem(i$1, v)) { console.log("impossible"); } } -for(var i$2 = 0; i$2 <= 100000; ++i$2){ +for(let i$2 = 0; i$2 <= 100000; ++i$2){ v = remove(i$2, v); } -var match = v; +let match = v; if (typeof match === "object") { console.log("impossible"); diff --git a/jscomp/test/basic_module_test.js b/jscomp/test/basic_module_test.js index 1fa8240979..74cffaa95f 100644 --- a/jscomp/test/basic_module_test.js +++ b/jscomp/test/basic_module_test.js @@ -1,12 +1,12 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Curry = require("../../lib/js/curry.js"); -var Offset = require("./offset.js"); -var Mt_global = require("./mt_global.js"); +let Mt = require("./mt.js"); +let Curry = require("../../lib/js/curry.js"); +let Offset = require("./offset.js"); +let Mt_global = require("./mt_global.js"); -var count = { +let count = { contents: 0 }; @@ -16,11 +16,11 @@ function test(set) { test(Curry._1(Offset.M.$$Set.singleton, "42")); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; diff --git a/jscomp/test/bb.js b/jscomp/test/bb.js index 88083a93b3..8fda9fa71a 100644 --- a/jscomp/test/bb.js +++ b/jscomp/test/bb.js @@ -34,7 +34,7 @@ function ff(x) { } function test(x) { - var match; + let match; switch (x) { case "a" : match = "a"; @@ -65,13 +65,13 @@ function test(x) { } } -var test_poly = "a"; +let test_poly = "a"; -var c = f("a"); +let c = f("a"); -var d = f("b"); +let d = f("b"); -var e = f("c"); +let e = f("c"); exports.f = f; exports.ff = ff; diff --git a/jscomp/test/bdd.js b/jscomp/test/bdd.js index 5a62c994f1..bc6e3917a5 100644 --- a/jscomp/test/bdd.js +++ b/jscomp/test/bdd.js @@ -1,11 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_array = require("../../lib/js/caml_array.js"); +let Caml_array = require("../../lib/js/caml_array.js"); function $$eval(_bdd, vars) { while(true) { - var bdd = _bdd; + let bdd = _bdd; if (typeof bdd !== "object") { if (bdd === "One") { return true; @@ -34,19 +34,19 @@ function getId(bdd) { } } -var nodeC = { +let nodeC = { contents: 1 }; -var sz_1 = { +let sz_1 = { contents: 8191 }; -var htab = { +let htab = { contents: Caml_array.make(sz_1.contents + 1 | 0, /* [] */0) }; -var n_items = { +let n_items = { contents: 0 }; @@ -55,16 +55,16 @@ function hashVal(x, y, v) { } function resize(newSize) { - var arr = htab.contents; - var newSz_1 = newSize - 1 | 0; - var newArr = Caml_array.make(newSize, /* [] */0); - var copyBucket = function (_bucket) { + let arr = htab.contents; + let newSz_1 = newSize - 1 | 0; + let newArr = Caml_array.make(newSize, /* [] */0); + let copyBucket = function (_bucket) { while(true) { - var bucket = _bucket; + let bucket = _bucket; if (!bucket) { return; } - var n = bucket.hd; + let n = bucket.hd; if (typeof n !== "object") { if (n === "One") { throw { @@ -87,7 +87,7 @@ function resize(newSize) { Error: new Error() }; } else { - var ind = hashVal(getId(n._0), getId(n._3), n._1) & newSz_1; + let ind = hashVal(getId(n._0), getId(n._3), n._1) & newSz_1; Caml_array.set(newArr, ind, { hd: n, tl: Caml_array.get(newArr, ind) @@ -97,7 +97,7 @@ function resize(newSize) { } }; }; - for(var n = 0 ,n_finish = sz_1.contents; n <= n_finish; ++n){ + for(let n = 0 ,n_finish = sz_1.contents; n <= n_finish; ++n){ copyBucket(Caml_array.get(arr, n)); } htab.contents = newArr; @@ -114,7 +114,7 @@ function insert(idl, idh, v, ind, bucket, newNode) { return; } resize((sz_1.contents + sz_1.contents | 0) + 2 | 0); - var ind$1 = hashVal(idl, idh, v) & sz_1.contents; + let ind$1 = hashVal(idl, idh, v) & sz_1.contents; Caml_array.set(htab.contents, ind$1, { hd: newNode, tl: Caml_array.get(htab.contents, ind$1) @@ -129,18 +129,18 @@ function resetUnique(param) { } function mkNode(low, v, high) { - var idl = getId(low); - var idh = getId(high); + let idl = getId(low); + let idh = getId(high); if (idl === idh) { return low; } - var ind = hashVal(idl, idh, v) & sz_1.contents; - var bucket = Caml_array.get(htab.contents, ind); - var _b = bucket; + let ind = hashVal(idl, idh, v) & sz_1.contents; + let bucket = Caml_array.get(htab.contents, ind); + let _b = bucket; while(true) { - var b = _b; + let b = _b; if (b) { - var n = b.hd; + let n = b.hd; if (typeof n !== "object") { if (n === "One") { throw { @@ -170,8 +170,8 @@ function mkNode(low, v, high) { continue ; } } else { - var n_2 = (nodeC.contents = nodeC.contents + 1 | 0, nodeC.contents); - var n$1 = { + let n_2 = (nodeC.contents = nodeC.contents + 1 | 0, nodeC.contents); + let n$1 = { TAG: "Node", _0: low, _1: v, @@ -198,21 +198,21 @@ function mkVar(x) { return mkNode("Zero", x, "One"); } -var andslot1 = Caml_array.make(1999, 0); +let andslot1 = Caml_array.make(1999, 0); -var andslot2 = Caml_array.make(1999, 0); +let andslot2 = Caml_array.make(1999, 0); -var andslot3 = Caml_array.make(1999, "Zero"); +let andslot3 = Caml_array.make(1999, "Zero"); -var xorslot1 = Caml_array.make(1999, 0); +let xorslot1 = Caml_array.make(1999, 0); -var xorslot2 = Caml_array.make(1999, 0); +let xorslot2 = Caml_array.make(1999, 0); -var xorslot3 = Caml_array.make(1999, "Zero"); +let xorslot3 = Caml_array.make(1999, "Zero"); -var notslot1 = Caml_array.make(1999, 0); +let notslot1 = Caml_array.make(1999, 0); -var notslot2 = Caml_array.make(1999, "One"); +let notslot2 = Caml_array.make(1999, "One"); function hash(x, y) { return ((x << 1) + y | 0) % 1999; @@ -226,12 +226,12 @@ function not(n) { return "One"; } } - var id = n._2; - var h = id % 1999; + let id = n._2; + let h = id % 1999; if (id === Caml_array.get(notslot1, h)) { return Caml_array.get(notslot2, h); } - var f = mkNode(not(n._0), n._1, not(n._3)); + let f = mkNode(not(n._0), n._1, not(n._3)); Caml_array.set(notslot1, h, id); Caml_array.set(notslot2, h, f); return f; @@ -245,10 +245,10 @@ function and2(n1, n2) { return "Zero"; } } - var r1 = n1._3; - var i1 = n1._2; - var v1 = n1._1; - var l1 = n1._0; + let r1 = n1._3; + let i1 = n1._2; + let v1 = n1._1; + let l1 = n1._0; if (typeof n2 !== "object") { if (n2 === "One") { return n1; @@ -256,16 +256,16 @@ function and2(n1, n2) { return "Zero"; } } - var r2 = n2._3; - var i2 = n2._2; - var v2 = n2._1; - var l2 = n2._0; - var h = hash(i1, i2); + let r2 = n2._3; + let i2 = n2._2; + let v2 = n2._1; + let l2 = n2._0; + let h = hash(i1, i2); if (i1 === Caml_array.get(andslot1, h) && i2 === Caml_array.get(andslot2, h)) { return Caml_array.get(andslot3, h); } - var match = cmpVar(v1, v2); - var f; + let match = cmpVar(v1, v2); + let f; switch (match) { case "LESS" : f = mkNode(and2(l1, n2), v1, and2(r1, n2)); @@ -292,10 +292,10 @@ function xor(n1, n2) { return n2; } } - var r1 = n1._3; - var i1 = n1._2; - var v1 = n1._1; - var l1 = n1._0; + let r1 = n1._3; + let i1 = n1._2; + let v1 = n1._1; + let l1 = n1._0; if (typeof n2 !== "object") { if (n2 === "One") { return not(n1); @@ -303,16 +303,16 @@ function xor(n1, n2) { return n1; } } - var r2 = n2._3; - var i2 = n2._2; - var v2 = n2._1; - var l2 = n2._0; - var h = hash(i1, i2); + let r2 = n2._3; + let i2 = n2._2; + let v2 = n2._1; + let l2 = n2._0; + let h = hash(i1, i2); if (i1 === Caml_array.get(andslot1, h) && i2 === Caml_array.get(andslot2, h)) { return Caml_array.get(andslot3, h); } - var match = cmpVar(v1, v2); - var f; + let match = cmpVar(v1, v2); + let f; switch (match) { case "LESS" : f = mkNode(xor(l1, n2), v1, xor(r1, n2)); @@ -332,14 +332,14 @@ function xor(n1, n2) { } function hwb(n) { - var h = function (i, j) { + let h = function (i, j) { if (i === j) { return mkNode("Zero", i, "One"); } else { return xor(and2(not(mkNode("Zero", j, "One")), h(i, j - 1 | 0)), and2(mkNode("Zero", j, "One"), g(i, j - 1 | 0))); } }; - var g = function (i, j) { + let g = function (i, j) { if (i === j) { return mkNode("Zero", i, "One"); } else { @@ -349,7 +349,7 @@ function hwb(n) { return h(0, n - 1 | 0); } -var seed = { +let seed = { contents: 0 }; @@ -359,8 +359,8 @@ function random(param) { } function random_vars(n) { - var vars = Caml_array.make(n, false); - for(var i = 0; i < n; ++i){ + let vars = Caml_array.make(n, false); + for(let i = 0; i < n; ++i){ Caml_array.set(vars, i, random()); } return vars; @@ -381,8 +381,8 @@ function bool_equal(a, b) { } function test_hwb(bdd, vars) { - var ntrue = 0; - for(var i = 0 ,i_finish = vars.length; i < i_finish; ++i){ + let ntrue = 0; + for(let i = 0 ,i_finish = vars.length; i < i_finish; ++i){ if (Caml_array.get(vars, i)) { ntrue = ntrue + 1 | 0; } @@ -392,9 +392,9 @@ function test_hwb(bdd, vars) { } function main(param) { - var bdd = hwb(22); - var succeeded = true; - for(var i = 1; i <= 100; ++i){ + let bdd = hwb(22); + let succeeded = true; + for(let i = 1; i <= 100; ++i){ succeeded = succeeded && test_hwb(bdd, random_vars(22)); } if (succeeded) { @@ -413,13 +413,13 @@ function main(param) { main(); -var initSize_1 = 8191; +let initSize_1 = 8191; -var zero = "Zero"; +let zero = "Zero"; -var one = "One"; +let one = "One"; -var cacheSize = 1999; +let cacheSize = 1999; exports.$$eval = $$eval; exports.getId = getId; diff --git a/jscomp/test/belt_internal_test.js b/jscomp/test/belt_internal_test.js index a7eae4db89..c72bcdf600 100644 --- a/jscomp/test/belt_internal_test.js +++ b/jscomp/test/belt_internal_test.js @@ -14,10 +14,10 @@ function copy(n) { if (n === undefined) { return n; } - var v = n.value; - var h = n.height; - var l = n.left; - var r = n.right; + let v = n.value; + let h = n.height; + let l = n.left; + let r = n.right; return { value: v, height: h, diff --git a/jscomp/test/belt_result_alias_test.js b/jscomp/test/belt_result_alias_test.js index 0a50a1287d..8cc5b93095 100644 --- a/jscomp/test/belt_result_alias_test.js +++ b/jscomp/test/belt_result_alias_test.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Belt_Result = require("../../lib/js/belt_Result.js"); +let Belt_Result = require("../../lib/js/belt_Result.js"); Belt_Result.map({ TAG: "Ok", diff --git a/jscomp/test/bench.js b/jscomp/test/bench.js index c7d2ae306f..5ae761afb6 100644 --- a/jscomp/test/bench.js +++ b/jscomp/test/bench.js @@ -1,25 +1,25 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); -var Caml_array = require("../../lib/js/caml_array.js"); -var Pervasives = require("../../lib/js/pervasives.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_array = require("../../lib/js/caml_array.js"); +let Pervasives = require("../../lib/js/pervasives.js"); function map(f, a) { - var f$1 = Curry.__1(f); - var l = a.length; + let f$1 = Curry.__1(f); + let l = a.length; if (l === 0) { return []; } - var r = Caml_array.make(l, f$1(a[0])); - for(var i = 1; i < l; ++i){ + let r = Caml_array.make(l, f$1(a[0])); + for(let i = 1; i < l; ++i){ r[i] = f$1(a[i]); } return r; } function init(l, f) { - var f$1 = Curry.__1(f); + let f$1 = Curry.__1(f); if (l === 0) { return []; } @@ -30,30 +30,30 @@ function init(l, f) { Error: new Error() }; } - var res = Caml_array.make(l, f$1(0)); - for(var i = 1; i < l; ++i){ + let res = Caml_array.make(l, f$1(0)); + for(let i = 1; i < l; ++i){ res[i] = f$1(i); } return res; } function fold_left(f, x, a) { - var f$1 = Curry.__2(f); - var r = x; - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + let f$1 = Curry.__2(f); + let r = x; + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ r = f$1(r, a[i]); } return r; } function f2(param) { - var arr = init(3000000, (function (i) { + let arr = init(3000000, (function (i) { return i; })); - var b = map((function (i) { + let b = map((function (i) { return i + i - 1; }), arr); - var v = fold_left((function (prim0, prim1) { + let v = fold_left((function (prim0, prim1) { return prim0 + prim1; }), 0, b); console.log(Pervasives.string_of_float(v)); diff --git a/jscomp/test/big_polyvar_test.js b/jscomp/test/big_polyvar_test.js index 395a59aeea..20c276f20f 100644 --- a/jscomp/test/big_polyvar_test.js +++ b/jscomp/test/big_polyvar_test.js @@ -2,7 +2,7 @@ 'use strict'; -var _map = {"variant0":"variant0","variant1":"variant1","variant2":"variant2","variant3":"variant3","variant4":"variant4","variant5":"variant5","variant6":"variant6","variant7":"variant7","variant8":"variant8","variant9":"variant9","variant10":"variant10","variant11":"variant11","variant12":"variant12","variant13":"variant13","variant14":"variant14","variant15":"variant15","variant16":"variant16","variant17":"variant17","variant18":"variant18","variant19":"variant19","variant20":"variant20","variant21":"variant21","variant22":"variant22","variant23":"variant23","variant24":"variant24","variant25":"variant25","variant26":"variant26","variant27":"variant27","variant28":"variant28","variant29":"variant29","variant30":"variant30","variant31":"variant31","variant32":"variant32","variant33":"variant33","variant34":"variant34","variant35":"variant35","variant36":"variant36","variant37":"variant37","variant38":"variant38","variant39":"variant39","variant40":"variant40","variant41":"variant41","variant42":"variant42","variant43":"variant43","variant44":"variant44","variant45":"variant45","variant46":"variant46","variant47":"variant47","variant48":"variant48","variant49":"variant49","variant50":"variant50","variant51":"variant51","variant52":"variant52","variant53":"variant53","variant54":"variant54","variant55":"variant55","variant56":"variant56","variant57":"variant57","variant58":"variant58","variant59":"variant59","variant60":"variant60","variant61":"variant61","variant62":"variant62","variant63":"variant63","variant64":"variant64","variant65":"variant65","variant66":"variant66","variant67":"variant67","variant68":"variant68","variant69":"variant69","variant70":"variant70","variant71":"variant71","variant72":"variant72","variant73":"variant73","variant74":"variant74","variant75":"variant75","variant76":"variant76","variant77":"variant77","variant78":"variant78","variant79":"variant79","variant80":"variant80","variant81":"variant81","variant82":"variant82","variant83":"variant83","variant84":"variant84","variant85":"variant85","variant86":"variant86","variant87":"variant87","variant88":"variant88","variant89":"variant89","variant90":"variant90","variant91":"variant91","variant92":"variant92","variant93":"variant93","variant94":"variant94","variant95":"variant95","variant96":"variant96","variant97":"variant97","variant98":"variant98","variant99":"variant99","variant100":"variant100","variant101":"variant101","variant102":"variant102","variant103":"variant103","variant104":"variant104","variant105":"variant105","variant106":"variant106","variant107":"variant107","variant108":"variant108","variant109":"variant109","variant110":"variant110","variant111":"variant111","variant112":"variant112","variant113":"variant113","variant114":"variant114","variant115":"variant115","variant116":"variant116","variant117":"variant117","variant118":"variant118","variant119":"variant119","variant120":"variant120","variant121":"variant121","variant122":"variant122","variant123":"variant123","variant124":"variant124","variant125":"variant125","variant126":"variant126","variant127":"variant127","variant128":"variant128","variant129":"variant129","variant130":"variant130","variant131":"variant131","variant132":"variant132","variant133":"variant133","variant134":"variant134","variant135":"variant135","variant136":"variant136","variant137":"variant137","variant138":"variant138","variant139":"variant139","variant140":"variant140","variant141":"variant141","variant142":"variant142","variant143":"variant143","variant144":"variant144","variant145":"variant145","variant146":"variant146","variant147":"variant147","variant148":"variant148","variant149":"variant149","variant150":"variant150","variant151":"variant151","variant152":"variant152","variant153":"variant153","variant154":"variant154","variant155":"variant155","variant156":"variant156","variant157":"variant157","variant158":"variant158","variant159":"variant159","variant160":"variant160","variant161":"variant161","variant162":"variant162","variant163":"variant163","variant164":"variant164","variant165":"variant165","variant166":"variant166","variant167":"variant167","variant168":"variant168","variant169":"variant169","variant170":"variant170","variant171":"variant171","variant172":"variant172","variant173":"variant173","variant174":"variant174","variant175":"variant175","variant176":"variant176","variant177":"variant177","variant178":"variant178","variant179":"variant179","variant180":"variant180","variant181":"variant181","variant182":"variant182","variant183":"variant183","variant184":"variant184","variant185":"variant185","variant186":"variant186","variant187":"variant187","variant188":"variant188","variant189":"variant189","variant190":"variant190","variant191":"variant191","variant192":"variant192","variant193":"variant193","variant194":"variant194","variant195":"variant195","variant196":"variant196","variant197":"variant197","variant198":"variant198","variant199":"variant199","variant200":"variant200","variant201":"variant201","variant202":"variant202","variant203":"variant203","variant204":"variant204","variant205":"variant205","variant206":"variant206","variant207":"variant207","variant208":"variant208","variant209":"variant209","variant210":"variant210","variant211":"variant211","variant212":"variant212","variant213":"variant213","variant214":"variant214","variant215":"variant215","variant216":"variant216","variant217":"variant217","variant218":"variant218","variant219":"variant219","variant220":"variant220","variant221":"variant221","variant222":"variant222","variant223":"variant223","variant224":"variant224","variant225":"variant225","variant226":"variant226","variant227":"variant227","variant228":"variant228","variant229":"variant229","variant230":"variant230","variant231":"variant231","variant232":"variant232","variant233":"variant233","variant234":"variant234","variant235":"variant235","variant236":"variant236","variant237":"variant237","variant238":"variant238","variant239":"variant239","variant240":"variant240","variant241":"variant241","variant242":"variant242","variant243":"variant243","variant244":"variant244","variant245":"variant245","variant246":"variant246","variant247":"variant247","variant248":"variant248","variant249":"variant249","variant250":"variant250","variant251":"variant251","variant252":"variant252","variant253":"variant253","variant254":"variant254","variant255":"variant255","variant256":"variant256","variant257":"variant257","variant258":"variant258","variant259":"variant259","variant260":"variant260","variant261":"variant261","variant262":"variant262","variant263":"variant263","variant264":"variant264","variant265":"variant265","variant266":"variant266","variant267":"variant267","variant268":"variant268","variant269":"variant269","variant270":"variant270","variant271":"variant271","variant272":"variant272","variant273":"variant273","variant274":"variant274","variant275":"variant275","variant276":"variant276","variant277":"variant277","variant278":"variant278","variant279":"variant279","variant280":"variant280","variant281":"variant281","variant282":"variant282","variant283":"variant283","variant284":"variant284","variant285":"variant285","variant286":"variant286","variant287":"variant287","variant288":"variant288","variant289":"variant289","variant290":"variant290","variant291":"variant291","variant292":"variant292","variant293":"variant293","variant294":"variant294","variant295":"variant295","variant296":"variant296","variant297":"variant297","variant298":"variant298","variant299":"variant299"}; +let _map = {"variant0":"variant0","variant1":"variant1","variant2":"variant2","variant3":"variant3","variant4":"variant4","variant5":"variant5","variant6":"variant6","variant7":"variant7","variant8":"variant8","variant9":"variant9","variant10":"variant10","variant11":"variant11","variant12":"variant12","variant13":"variant13","variant14":"variant14","variant15":"variant15","variant16":"variant16","variant17":"variant17","variant18":"variant18","variant19":"variant19","variant20":"variant20","variant21":"variant21","variant22":"variant22","variant23":"variant23","variant24":"variant24","variant25":"variant25","variant26":"variant26","variant27":"variant27","variant28":"variant28","variant29":"variant29","variant30":"variant30","variant31":"variant31","variant32":"variant32","variant33":"variant33","variant34":"variant34","variant35":"variant35","variant36":"variant36","variant37":"variant37","variant38":"variant38","variant39":"variant39","variant40":"variant40","variant41":"variant41","variant42":"variant42","variant43":"variant43","variant44":"variant44","variant45":"variant45","variant46":"variant46","variant47":"variant47","variant48":"variant48","variant49":"variant49","variant50":"variant50","variant51":"variant51","variant52":"variant52","variant53":"variant53","variant54":"variant54","variant55":"variant55","variant56":"variant56","variant57":"variant57","variant58":"variant58","variant59":"variant59","variant60":"variant60","variant61":"variant61","variant62":"variant62","variant63":"variant63","variant64":"variant64","variant65":"variant65","variant66":"variant66","variant67":"variant67","variant68":"variant68","variant69":"variant69","variant70":"variant70","variant71":"variant71","variant72":"variant72","variant73":"variant73","variant74":"variant74","variant75":"variant75","variant76":"variant76","variant77":"variant77","variant78":"variant78","variant79":"variant79","variant80":"variant80","variant81":"variant81","variant82":"variant82","variant83":"variant83","variant84":"variant84","variant85":"variant85","variant86":"variant86","variant87":"variant87","variant88":"variant88","variant89":"variant89","variant90":"variant90","variant91":"variant91","variant92":"variant92","variant93":"variant93","variant94":"variant94","variant95":"variant95","variant96":"variant96","variant97":"variant97","variant98":"variant98","variant99":"variant99","variant100":"variant100","variant101":"variant101","variant102":"variant102","variant103":"variant103","variant104":"variant104","variant105":"variant105","variant106":"variant106","variant107":"variant107","variant108":"variant108","variant109":"variant109","variant110":"variant110","variant111":"variant111","variant112":"variant112","variant113":"variant113","variant114":"variant114","variant115":"variant115","variant116":"variant116","variant117":"variant117","variant118":"variant118","variant119":"variant119","variant120":"variant120","variant121":"variant121","variant122":"variant122","variant123":"variant123","variant124":"variant124","variant125":"variant125","variant126":"variant126","variant127":"variant127","variant128":"variant128","variant129":"variant129","variant130":"variant130","variant131":"variant131","variant132":"variant132","variant133":"variant133","variant134":"variant134","variant135":"variant135","variant136":"variant136","variant137":"variant137","variant138":"variant138","variant139":"variant139","variant140":"variant140","variant141":"variant141","variant142":"variant142","variant143":"variant143","variant144":"variant144","variant145":"variant145","variant146":"variant146","variant147":"variant147","variant148":"variant148","variant149":"variant149","variant150":"variant150","variant151":"variant151","variant152":"variant152","variant153":"variant153","variant154":"variant154","variant155":"variant155","variant156":"variant156","variant157":"variant157","variant158":"variant158","variant159":"variant159","variant160":"variant160","variant161":"variant161","variant162":"variant162","variant163":"variant163","variant164":"variant164","variant165":"variant165","variant166":"variant166","variant167":"variant167","variant168":"variant168","variant169":"variant169","variant170":"variant170","variant171":"variant171","variant172":"variant172","variant173":"variant173","variant174":"variant174","variant175":"variant175","variant176":"variant176","variant177":"variant177","variant178":"variant178","variant179":"variant179","variant180":"variant180","variant181":"variant181","variant182":"variant182","variant183":"variant183","variant184":"variant184","variant185":"variant185","variant186":"variant186","variant187":"variant187","variant188":"variant188","variant189":"variant189","variant190":"variant190","variant191":"variant191","variant192":"variant192","variant193":"variant193","variant194":"variant194","variant195":"variant195","variant196":"variant196","variant197":"variant197","variant198":"variant198","variant199":"variant199","variant200":"variant200","variant201":"variant201","variant202":"variant202","variant203":"variant203","variant204":"variant204","variant205":"variant205","variant206":"variant206","variant207":"variant207","variant208":"variant208","variant209":"variant209","variant210":"variant210","variant211":"variant211","variant212":"variant212","variant213":"variant213","variant214":"variant214","variant215":"variant215","variant216":"variant216","variant217":"variant217","variant218":"variant218","variant219":"variant219","variant220":"variant220","variant221":"variant221","variant222":"variant222","variant223":"variant223","variant224":"variant224","variant225":"variant225","variant226":"variant226","variant227":"variant227","variant228":"variant228","variant229":"variant229","variant230":"variant230","variant231":"variant231","variant232":"variant232","variant233":"variant233","variant234":"variant234","variant235":"variant235","variant236":"variant236","variant237":"variant237","variant238":"variant238","variant239":"variant239","variant240":"variant240","variant241":"variant241","variant242":"variant242","variant243":"variant243","variant244":"variant244","variant245":"variant245","variant246":"variant246","variant247":"variant247","variant248":"variant248","variant249":"variant249","variant250":"variant250","variant251":"variant251","variant252":"variant252","variant253":"variant253","variant254":"variant254","variant255":"variant255","variant256":"variant256","variant257":"variant257","variant258":"variant258","variant259":"variant259","variant260":"variant260","variant261":"variant261","variant262":"variant262","variant263":"variant263","variant264":"variant264","variant265":"variant265","variant266":"variant266","variant267":"variant267","variant268":"variant268","variant269":"variant269","variant270":"variant270","variant271":"variant271","variant272":"variant272","variant273":"variant273","variant274":"variant274","variant275":"variant275","variant276":"variant276","variant277":"variant277","variant278":"variant278","variant279":"variant279","variant280":"variant280","variant281":"variant281","variant282":"variant282","variant283":"variant283","variant284":"variant284","variant285":"variant285","variant286":"variant286","variant287":"variant287","variant288":"variant288","variant289":"variant289","variant290":"variant290","variant291":"variant291","variant292":"variant292","variant293":"variant293","variant294":"variant294","variant295":"variant295","variant296":"variant296","variant297":"variant297","variant298":"variant298","variant299":"variant299"}; function tToJs(param) { return param; diff --git a/jscomp/test/bigint_test.js b/jscomp/test/bigint_test.js index b6dac732aa..0875f84e71 100644 --- a/jscomp/test/bigint_test.js +++ b/jscomp/test/bigint_test.js @@ -1,16 +1,16 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml = require("../../lib/js/caml.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Mt_global = require("./mt_global.js"); +let Mt = require("./mt.js"); +let Caml = require("../../lib/js/caml.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Mt_global = require("./mt_global.js"); -var test_id = { +let test_id = { contents: 0 }; -var suites = { +let suites = { contents: /* [] */0 }; @@ -26,45 +26,45 @@ function approx(loc) { }; } -var bigint_compare = Caml.bigint_compare; +let bigint_compare = Caml.bigint_compare; -var generic_compare = Caml_obj.compare; +let generic_compare = Caml_obj.compare; function bigint_equal(x, y) { return x === y; } -var generic_equal = Caml_obj.equal; +let generic_equal = Caml_obj.equal; function bigint_notequal(x, y) { return x !== y; } -var generic_notequal = Caml_obj.notequal; +let generic_notequal = Caml_obj.notequal; function bigint_lessthan(x, y) { return x < y; } -var generic_lessthan = Caml_obj.lessthan; +let generic_lessthan = Caml_obj.lessthan; function bigint_greaterthan(x, y) { return x > y; } -var generic_greaterthan = Caml_obj.greaterthan; +let generic_greaterthan = Caml_obj.greaterthan; function bigint_lessequal(x, y) { return x <= y; } -var generic_lessequal = Caml_obj.lessequal; +let generic_lessequal = Caml_obj.lessequal; function bigint_greaterequal(x, y) { return x >= y; } -var generic_greaterequal = Caml_obj.greaterequal; +let generic_greaterequal = Caml_obj.greaterequal; function bigint_land(prim0, prim1) { return prim0 & prim1; diff --git a/jscomp/test/block_alias_test.js b/jscomp/test/block_alias_test.js index 20b7e2d643..51dc8b4193 100644 --- a/jscomp/test/block_alias_test.js +++ b/jscomp/test/block_alias_test.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var List = require("../../lib/js/list.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); +let Mt = require("./mt.js"); +let List = require("../../lib/js/list.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -21,36 +21,36 @@ function b(loc, x) { Mt.bool_suites(test_id, suites, loc, x); } -var Block = {}; +let Block = {}; -var v0 = { +let v0 = { TAG: "A", _0: 0, _1: 1 }; -var Block$1 = {}; +let Block$1 = {}; -var v1 = { +let v1 = { TAG: "A", _0: 0, _1: 1 }; -var N = { +let N = { Block: Block$1, v1: v1 }; -var Caml_obj$1 = {}; +let Caml_obj$1 = {}; -var List$1 = {}; +let List$1 = {}; -var V = { +let V = { List: List$1 }; -var f = Caml_obj.equal; +let f = Caml_obj.equal; eq("File \"block_alias_test.res\", line 27, characters 3-10", List.length({ hd: 1, @@ -70,7 +70,7 @@ eq("File \"block_alias_test.res\", line 29, characters 3-10", v0, v1); Mt.from_pair_suites("Block_alias_test", suites.contents); -var h = List.length; +let h = List.length; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/boolean_test.js b/jscomp/test/boolean_test.js index d64ec5ae96..ccf8ee22db 100644 --- a/jscomp/test/boolean_test.js +++ b/jscomp/test/boolean_test.js @@ -1,8 +1,8 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Test_bool_equal = require("./test_bool_equal.js"); +let Mt = require("./mt.js"); +let Test_bool_equal = require("./test_bool_equal.js"); Mt.from_suites("boolean", { hd: [ diff --git a/jscomp/test/bs_MapInt_test.js b/jscomp/test/bs_MapInt_test.js index 7dea07a710..b372c76603 100644 --- a/jscomp/test/bs_MapInt_test.js +++ b/jscomp/test/bs_MapInt_test.js @@ -1,8 +1,8 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Js_exn = require("../../lib/js/js_exn.js"); -var Belt_MapInt = require("../../lib/js/belt_MapInt.js"); +let Js_exn = require("../../lib/js/js_exn.js"); +let Belt_MapInt = require("../../lib/js/belt_MapInt.js"); function should(b) { if (!b) { @@ -12,14 +12,14 @@ function should(b) { } function test(param) { - var m; - for(var i = 0; i <= 999999; ++i){ + let m; + for(let i = 0; i <= 999999; ++i){ m = Belt_MapInt.set(m, i, i); } - for(var i$1 = 0; i$1 <= 999999; ++i$1){ + for(let i$1 = 0; i$1 <= 999999; ++i$1){ should(Belt_MapInt.get(m, i$1) !== undefined); } - for(var i$2 = 0; i$2 <= 999999; ++i$2){ + for(let i$2 = 0; i$2 <= 999999; ++i$2){ m = Belt_MapInt.remove(m, i$2); } should(Belt_MapInt.isEmpty(m)); @@ -27,7 +27,7 @@ function test(param) { test(); -var M; +let M; exports.should = should; exports.M = M; diff --git a/jscomp/test/bs_abstract_test.js b/jscomp/test/bs_abstract_test.js index c05cf5631a..04b65a9ae0 100644 --- a/jscomp/test/bs_abstract_test.js +++ b/jscomp/test/bs_abstract_test.js @@ -1,16 +1,16 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); -var v = { +let v = { hd: 3, tl: null }; v.tl = v; -var f = { +let f = { k: (function (x, y) { return x === y; }), @@ -38,7 +38,7 @@ function uff2(f) { } function uff3(f) { - var x = f.yyyy2; + let x = f.yyyy2; if (x !== undefined) { return Curry._1(x, 0); } else { diff --git a/jscomp/test/bs_array_test.js b/jscomp/test/bs_array_test.js index f5e587d105..84ffb53c49 100644 --- a/jscomp/test/bs_array_test.js +++ b/jscomp/test/bs_array_test.js @@ -1,21 +1,21 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml = require("../../lib/js/caml.js"); -var Curry = require("../../lib/js/curry.js"); -var Js_list = require("../../lib/js/js_list.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Belt_List = require("../../lib/js/belt_List.js"); -var Js_vector = require("../../lib/js/js_vector.js"); -var Belt_Array = require("../../lib/js/belt_Array.js"); -var Caml_array = require("../../lib/js/caml_array.js"); - -var suites = { +let Mt = require("./mt.js"); +let Caml = require("../../lib/js/caml.js"); +let Curry = require("../../lib/js/curry.js"); +let Js_list = require("../../lib/js/js_list.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Belt_List = require("../../lib/js/belt_List.js"); +let Js_vector = require("../../lib/js/js_vector.js"); +let Belt_Array = require("../../lib/js/belt_Array.js"); +let Caml_array = require("../../lib/js/caml_array.js"); + +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -65,7 +65,7 @@ console.log([ return x + y | 0; }), 0)); -var v = [ +let v = [ 1, 2 ]; @@ -98,7 +98,7 @@ $$throw("File \"bs_array_test.res\", line 36, characters 8-15", (function (param ], 2); })); -var partial_arg = [ +let partial_arg = [ 0, 1 ]; @@ -134,7 +134,7 @@ b("File \"bs_array_test.res\", line 46, characters 4-11", !Belt_Array.set([ 2 ], 2, 0)); -var v$1 = [ +let v$1 = [ 1, 2 ]; @@ -153,7 +153,7 @@ if (!Belt_Array.set(v$1, 0, 0)) { b("File \"bs_array_test.res\", line 48, characters 4-11", Belt_Array.getExn(v$1, 0) === 0); -var v$2 = [ +let v$2 = [ 1, 2 ]; @@ -172,14 +172,14 @@ if (!Belt_Array.set(v$2, 1, 0)) { b("File \"bs_array_test.res\", line 56, characters 4-11", Belt_Array.getExn(v$2, 1) === 0); -var v$3 = [ +let v$3 = [ 1, 2 ]; b("File \"bs_array_test.res\", line 64, characters 4-11", (Belt_Array.setExn(v$3, 0, 0), Belt_Array.getExn(v$3, 0) === 0)); -var v$4 = [ +let v$4 = [ 1, 2 ]; @@ -225,7 +225,7 @@ eq("File \"bs_array_test.res\", line 86, characters 5-12", Caml_array.make(5, 3) 3 ]); -var a = Js_vector.init(5, (function (i) { +let a = Js_vector.init(5, (function (i) { return i + 1 | 0; })); @@ -236,7 +236,7 @@ eq("File \"bs_array_test.res\", line 88, characters 4-11", (Js_vector.filterInPl 4 ]); -var a$1 = Js_vector.init(5, (function (i) { +let a$1 = Js_vector.init(5, (function (i) { return i + 1 | 0; })); @@ -300,11 +300,11 @@ function add(x, y) { return x + y | 0; } -var v$5 = Belt_Array.makeBy(3000, (function (i) { +let v$5 = Belt_Array.makeBy(3000, (function (i) { return i; })); -var u = Belt_Array.shuffle(v$5); +let u = Belt_Array.shuffle(v$5); neq("File \"bs_array_test.res\", line 122, characters 6-13", u, v$5); @@ -402,10 +402,10 @@ function makeMatrixExn(sx, sy, init) { Error: new Error() }; } - var res = new Array(sx); - for(var x = 0; x < sx; ++x){ - var initY = new Array(sy); - for(var y = 0; y < sy; ++y){ + let res = new Array(sx); + for(let x = 0; x < sx; ++x){ + let initY = new Array(sy); + for(let y = 0; y < sy; ++y){ initY[y] = init; } res[x] = initY; @@ -541,19 +541,19 @@ eq("File \"bs_array_test.res\", line 183, characters 5-12", Belt_List.toArray({ 3 ]); -var v$6 = Belt_Array.makeBy(10, (function (i) { +let v$6 = Belt_Array.makeBy(10, (function (i) { return i; })); -var v0 = Belt_Array.keep(v$6, (function (x) { +let v0 = Belt_Array.keep(v$6, (function (x) { return x % 2 === 0; })); -var v1 = Belt_Array.keep(v$6, (function (x) { +let v1 = Belt_Array.keep(v$6, (function (x) { return x % 3 === 0; })); -var v2 = Belt_Array.keepMap(v$6, (function (x) { +let v2 = Belt_Array.keepMap(v$6, (function (x) { if (x % 2 === 0) { return x + 1 | 0; } @@ -583,7 +583,7 @@ eq("File \"bs_array_test.res\", line 199, characters 5-12", v2, [ 9 ]); -var a$2 = [ +let a$2 = [ 1, 2, 3, @@ -591,7 +591,7 @@ var a$2 = [ 5 ]; -var match = Belt_Array.partition(a$2, (function (x) { +let match = Belt_Array.partition(a$2, (function (x) { return x % 2 === 0; })); @@ -606,7 +606,7 @@ eq("File \"bs_array_test.res\", line 206, characters 5-12", match[1], [ 5 ]); -var match$1 = Belt_Array.partition(a$2, (function (x) { +let match$1 = Belt_Array.partition(a$2, (function (x) { return x === 2; })); @@ -619,7 +619,7 @@ eq("File \"bs_array_test.res\", line 209, characters 5-12", match$1[1], [ 5 ]); -var match$2 = Belt_Array.partition([], (function (x) { +let match$2 = Belt_Array.partition([], (function (x) { return false; })); @@ -627,7 +627,7 @@ eq("File \"bs_array_test.res\", line 211, characters 5-12", match$2[0], []); eq("File \"bs_array_test.res\", line 212, characters 5-12", match$2[1], []); -var a$3 = [ +let a$3 = [ 1, 2, 3, @@ -709,7 +709,7 @@ eq("File \"bs_array_test.res\", line 231, characters 5-12", Belt_Array.slice(a$3 eq("File \"bs_array_test.res\", line 232, characters 5-12", Belt_Array.slice(a$3, 0, -1), []); -var a$4 = [ +let a$4 = [ 1, 2, 3, @@ -746,7 +746,7 @@ eq("File \"bs_array_test.res\", line 242, characters 5-12", Belt_Array.sliceToEn eq("File \"bs_array_test.res\", line 243, characters 5-12", Belt_Array.sliceToEnd(a$4, 6), []); -var a$5 = Belt_Array.makeBy(10, (function (x) { +let a$5 = Belt_Array.makeBy(10, (function (x) { return x; })); @@ -893,7 +893,7 @@ Belt_Array.fill(a$5, 0, -1, 2); eq("File \"bs_array_test.res\", line 268, characters 5-12", a$5.slice(0), Belt_Array.make(10, 7)); -var b$1 = [ +let b$1 = [ 1, 2, 3 @@ -915,11 +915,11 @@ eq("File \"bs_array_test.res\", line 273, characters 5-12", b$1, [ 3 ]); -var a0 = Belt_Array.makeBy(10, (function (x) { +let a0 = Belt_Array.makeBy(10, (function (x) { return x; })); -var b0 = Belt_Array.make(10, 3); +let b0 = Belt_Array.make(10, 3); Belt_Array.blit(a0, 1, b0, 2, 5); @@ -989,7 +989,7 @@ Belt_Array.blit(a0, -11, b0, -11, 2); eq("File \"bs_array_test.res\", line 290, characters 5-12", b0.slice(0), a0); -var aa = Belt_Array.makeBy(10, (function (x) { +let aa = Belt_Array.makeBy(10, (function (x) { return x; })); @@ -1057,7 +1057,7 @@ eq("File \"bs_array_test.res\", line 300, characters 5-12", Belt_Array.make(0, 3 eq("File \"bs_array_test.res\", line 301, characters 5-12", Belt_Array.make(-1, 3), []); -var c = [ +let c = [ 0, 1, 2 @@ -1182,7 +1182,7 @@ eq("File \"bs_array_test.res\", line 312, characters 5-12", Belt_Array.unzip([ ]); function sumUsingForEach(xs) { - var v = { + let v = { contents: 0 }; Belt_Array.forEach(xs, (function (x) { @@ -1233,7 +1233,7 @@ b("File \"bs_array_test.res\", line 328, characters 4-11", !Belt_Array.eq([ return prim0 === prim1; }))); -var c$1 = { +let c$1 = { contents: 0 }; @@ -1246,7 +1246,7 @@ b("File \"bs_array_test.res\", line 330, characters 4-11", (Belt_Array.forEachWi })), c$1.contents === 6)); function id$1(loc, x) { - var u = x.slice(0); + let u = x.slice(0); eq("File \"bs_array_test.res\", line 341, characters 4-11", Belt_Array.reverse(x), (Belt_Array.reverseInPlace(u), u)); } @@ -1273,16 +1273,16 @@ id$1("File \"bs_array_test.res\", line 355, characters 5-12", [ ]); function every2(xs, ys) { - var partial_arg = Belt_List.toArray(ys); - var partial_arg$1 = Belt_List.toArray(xs); + let partial_arg = Belt_List.toArray(ys); + let partial_arg$1 = Belt_List.toArray(xs); return function (param) { return Belt_Array.every2(partial_arg$1, partial_arg, param); }; } function some2(xs, ys) { - var partial_arg = Belt_List.toArray(ys); - var partial_arg$1 = Belt_List.toArray(xs); + let partial_arg = Belt_List.toArray(ys); + let partial_arg$1 = Belt_List.toArray(xs); return function (param) { return Belt_Array.some2(partial_arg$1, partial_arg, param); }; @@ -1595,7 +1595,7 @@ eq("File \"bs_array_test.res\", line 400, characters 5-12", Belt_Array.getIndexB return x > 3; })), undefined); -var arr = []; +let arr = []; arr.push(3); @@ -1611,9 +1611,9 @@ eq("File \"bs_array_test.res\", line 408, characters 5-12", arr, [ Mt.from_pair_suites("File \"bs_array_test.res\", line 411, characters 20-27", suites.contents); -var A; +let A; -var L; +let L; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/bs_auto_uncurry.js b/jscomp/test/bs_auto_uncurry.js index 1d8eb87f75..c1a250bc22 100644 --- a/jscomp/test/bs_auto_uncurry.js +++ b/jscomp/test/bs_auto_uncurry.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); -var Caml_splice_call = require("../../lib/js/caml_splice_call.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_splice_call = require("../../lib/js/caml_splice_call.js"); -var Curry$1 = {}; +let Curry$1 = {}; -var Block = {}; +let Block = {}; -var xbs = Array.prototype.map.call([ +let xbs = Array.prototype.map.call([ 1, 2, 3, @@ -26,7 +26,7 @@ function f(cb) { ], Curry.__1(cb)); } -var xs = Array.prototype.map.call([ +let xs = Array.prototype.map.call([ 1, 1, 2 @@ -72,7 +72,7 @@ function h(x, y, z) { } function h1(x, y, u, z) { - var partial_arg = Curry._1(z, u); + let partial_arg = Curry._1(z, u); return map2(x, y, Curry.__2(partial_arg)); } @@ -122,7 +122,7 @@ function unit_magic(param) { return 3; } -var f_unit_magic = unit_magic(); +let f_unit_magic = unit_magic(); function hh(xs) { return function (param) { diff --git a/jscomp/test/bs_auto_uncurry_test.js b/jscomp/test/bs_auto_uncurry_test.js index d965725a81..e5b40de25a 100644 --- a/jscomp/test/bs_auto_uncurry_test.js +++ b/jscomp/test/bs_auto_uncurry_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -34,7 +34,7 @@ function hi (cb){ } ; -var xs = { +let xs = { contents: /* [] */0 }; diff --git a/jscomp/test/bs_float_test.js b/jscomp/test/bs_float_test.js index ea3940d789..321f9d6b52 100644 --- a/jscomp/test/bs_float_test.js +++ b/jscomp/test/bs_float_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Belt_Float = require("../../lib/js/belt_Float.js"); +let Mt = require("./mt.js"); +let Belt_Float = require("../../lib/js/belt_Float.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -87,7 +87,7 @@ eq("File \"bs_float_test.res\", line 52, characters 5-12", 3.0 / 2.0, 1.5); Mt.from_pair_suites("File \"bs_float_test.res\", line 55, characters 20-27", suites.contents); -var F; +let F; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/bs_hashmap_test.js b/jscomp/test/bs_hashmap_test.js index b5ebd4a8d1..e44cd0452e 100644 --- a/jscomp/test/bs_hashmap_test.js +++ b/jscomp/test/bs_hashmap_test.js @@ -1,21 +1,21 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml = require("../../lib/js/caml.js"); -var Belt_Id = require("../../lib/js/belt_Id.js"); -var Hashtbl = require("../../lib/js/hashtbl.js"); -var Belt_Array = require("../../lib/js/belt_Array.js"); -var Belt_HashMap = require("../../lib/js/belt_HashMap.js"); -var Belt_SortArray = require("../../lib/js/belt_SortArray.js"); -var Array_data_util = require("./array_data_util.js"); -var Belt_internalBucketsType = require("../../lib/js/belt_internalBucketsType.js"); - -var suites = { +let Mt = require("./mt.js"); +let Caml = require("../../lib/js/caml.js"); +let Belt_Id = require("../../lib/js/belt_Id.js"); +let Hashtbl = require("../../lib/js/hashtbl.js"); +let Belt_Array = require("../../lib/js/belt_Array.js"); +let Belt_HashMap = require("../../lib/js/belt_HashMap.js"); +let Belt_SortArray = require("../../lib/js/belt_SortArray.js"); +let Array_data_util = require("./array_data_util.js"); +let Belt_internalBucketsType = require("../../lib/js/belt_internalBucketsType.js"); + +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -31,13 +31,13 @@ function eq(x, y) { return x === y; } -var hash = Hashtbl.hash; +let hash = Hashtbl.hash; -var cmp = Caml.int_compare; +let cmp = Caml.int_compare; -var Y = Belt_Id.hashable(hash, eq); +let Y = Belt_Id.hashable(hash, eq); -var empty = Belt_internalBucketsType.make(Y.hash, Y.eq, 30); +let empty = Belt_internalBucketsType.make(Y.hash, Y.eq, 30); function add(prim0, prim1) { return prim0 + prim1 | 0; @@ -66,31 +66,31 @@ eqx("File \"bs_hashmap_test.res\", line 30, characters 6-13", Belt_HashMap.get(e eqx("File \"bs_hashmap_test.res\", line 31, characters 6-13", empty.size, 3); -var u = Belt_Array.concat(Array_data_util.randomRange(30, 100), Array_data_util.randomRange(40, 120)); +let u = Belt_Array.concat(Array_data_util.randomRange(30, 100), Array_data_util.randomRange(40, 120)); -var v = Belt_Array.zip(u, u); +let v = Belt_Array.zip(u, u); -var xx = Belt_HashMap.fromArray(v, Y); +let xx = Belt_HashMap.fromArray(v, Y); eqx("File \"bs_hashmap_test.res\", line 41, characters 6-13", xx.size, 91); eqx("File \"bs_hashmap_test.res\", line 42, characters 6-13", Belt_SortArray.stableSortBy(Belt_HashMap.keysToArray(xx), cmp), Array_data_util.range(30, 120)); -var u$1 = Belt_Array.concat(Array_data_util.randomRange(0, 100000), Array_data_util.randomRange(0, 100)); +let u$1 = Belt_Array.concat(Array_data_util.randomRange(0, 100000), Array_data_util.randomRange(0, 100)); -var v$1 = Belt_internalBucketsType.make(Y.hash, Y.eq, 40); +let v$1 = Belt_internalBucketsType.make(Y.hash, Y.eq, 40); Belt_HashMap.mergeMany(v$1, Belt_Array.zip(u$1, u$1)); eqx("File \"bs_hashmap_test.res\", line 49, characters 6-13", v$1.size, 100001); -for(var i = 0; i <= 1000; ++i){ +for(let i = 0; i <= 1000; ++i){ Belt_HashMap.remove(v$1, i); } eqx("File \"bs_hashmap_test.res\", line 53, characters 6-13", v$1.size, 99000); -for(var i$1 = 0; i$1 <= 2000; ++i$1){ +for(let i$1 = 0; i$1 <= 2000; ++i$1){ Belt_HashMap.remove(v$1, i$1); } @@ -102,17 +102,17 @@ b("File \"bs_hashmap_test.res\", line 58, characters 4-11", Belt_Array.every(Arr Mt.from_pair_suites("Bs_hashmap_test", suites.contents); -var N; +let N; -var S; +let S; -var I; +let I; -var $plus$plus = Belt_Array.concat; +let $plus$plus = Belt_Array.concat; -var A; +let A; -var So; +let So; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/bs_hashset_int_test.js b/jscomp/test/bs_hashset_int_test.js index d15ad075ba..3abb87e389 100644 --- a/jscomp/test/bs_hashset_int_test.js +++ b/jscomp/test/bs_hashset_int_test.js @@ -1,19 +1,19 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Belt_Array = require("../../lib/js/belt_Array.js"); -var Belt_SetInt = require("../../lib/js/belt_SetInt.js"); -var Array_data_util = require("./array_data_util.js"); -var Belt_HashSetInt = require("../../lib/js/belt_HashSetInt.js"); -var Belt_SortArrayInt = require("../../lib/js/belt_SortArrayInt.js"); -var Belt_internalBucketsType = require("../../lib/js/belt_internalBucketsType.js"); - -var suites = { +let Mt = require("./mt.js"); +let Belt_Array = require("../../lib/js/belt_Array.js"); +let Belt_SetInt = require("../../lib/js/belt_SetInt.js"); +let Array_data_util = require("./array_data_util.js"); +let Belt_HashSetInt = require("../../lib/js/belt_HashSetInt.js"); +let Belt_SortArrayInt = require("../../lib/js/belt_SortArrayInt.js"); +let Belt_internalBucketsType = require("../../lib/js/belt_internalBucketsType.js"); + +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -30,7 +30,7 @@ function add(x, y) { } function sum2(h) { - var v = { + let v = { contents: 0 }; Belt_HashSetInt.forEach(h, (function (x) { @@ -39,13 +39,13 @@ function sum2(h) { return v.contents; } -var u = Belt_Array.concat(Array_data_util.randomRange(30, 100), Array_data_util.randomRange(40, 120)); +let u = Belt_Array.concat(Array_data_util.randomRange(30, 100), Array_data_util.randomRange(40, 120)); -var v = Belt_HashSetInt.fromArray(u); +let v = Belt_HashSetInt.fromArray(u); eq("File \"bs_hashset_int_test.res\", line 20, characters 5-12", v.size, 91); -var xs = Belt_SetInt.toArray(Belt_SetInt.fromArray(Belt_HashSetInt.toArray(v))); +let xs = Belt_SetInt.toArray(Belt_SetInt.fromArray(Belt_HashSetInt.toArray(v))); eq("File \"bs_hashset_int_test.res\", line 22, characters 5-12", xs, Array_data_util.range(30, 120)); @@ -53,43 +53,43 @@ eq("File \"bs_hashset_int_test.res\", line 24, characters 5-12", Belt_HashSetInt eq("File \"bs_hashset_int_test.res\", line 25, characters 5-12", sum2(v), 6825); -var u$1 = Belt_Array.concat(Array_data_util.randomRange(0, 100000), Array_data_util.randomRange(0, 100)); +let u$1 = Belt_Array.concat(Array_data_util.randomRange(0, 100000), Array_data_util.randomRange(0, 100)); -var v$1 = Belt_internalBucketsType.make(undefined, undefined, 40); +let v$1 = Belt_internalBucketsType.make(undefined, undefined, 40); Belt_HashSetInt.mergeMany(v$1, u$1); eq("File \"bs_hashset_int_test.res\", line 32, characters 5-12", v$1.size, 100001); -for(var i = 0; i <= 1000; ++i){ +for(let i = 0; i <= 1000; ++i){ Belt_HashSetInt.remove(v$1, i); } eq("File \"bs_hashset_int_test.res\", line 36, characters 5-12", v$1.size, 99000); -for(var i$1 = 0; i$1 <= 2000; ++i$1){ +for(let i$1 = 0; i$1 <= 2000; ++i$1){ Belt_HashSetInt.remove(v$1, i$1); } eq("File \"bs_hashset_int_test.res\", line 40, characters 5-12", v$1.size, 98000); -var u0 = Belt_HashSetInt.fromArray(Array_data_util.randomRange(0, 100000)); +let u0 = Belt_HashSetInt.fromArray(Array_data_util.randomRange(0, 100000)); -var u1 = Belt_HashSetInt.copy(u0); +let u1 = Belt_HashSetInt.copy(u0); eq("File \"bs_hashset_int_test.res\", line 49, characters 5-12", Belt_HashSetInt.toArray(u0), Belt_HashSetInt.toArray(u1)); -for(var i$2 = 0; i$2 <= 2000; ++i$2){ +for(let i$2 = 0; i$2 <= 2000; ++i$2){ Belt_HashSetInt.remove(u1, i$2); } -for(var i$3 = 0; i$3 <= 1000; ++i$3){ +for(let i$3 = 0; i$3 <= 1000; ++i$3){ Belt_HashSetInt.remove(u0, i$3); } -var v0 = Belt_Array.concat(Array_data_util.range(0, 1000), Belt_HashSetInt.toArray(u0)); +let v0 = Belt_Array.concat(Array_data_util.range(0, 1000), Belt_HashSetInt.toArray(u0)); -var v1 = Belt_Array.concat(Array_data_util.range(0, 2000), Belt_HashSetInt.toArray(u1)); +let v1 = Belt_Array.concat(Array_data_util.range(0, 2000), Belt_HashSetInt.toArray(u1)); Belt_SortArrayInt.stableSortInPlace(v0); @@ -97,25 +97,25 @@ Belt_SortArrayInt.stableSortInPlace(v1); eq("File \"bs_hashset_int_test.res\", line 60, characters 5-12", v0, v1); -var h = Belt_HashSetInt.fromArray(Array_data_util.randomRange(0, 1000000)); +let h = Belt_HashSetInt.fromArray(Array_data_util.randomRange(0, 1000000)); -var histo = Belt_HashSetInt.getBucketHistogram(h); +let histo = Belt_HashSetInt.getBucketHistogram(h); b("File \"bs_hashset_int_test.res\", line 66, characters 4-11", histo.length <= 10); Mt.from_pair_suites("Bs_hashset_int_test", suites.contents); -var N; +let N; -var S; +let S; -var I; +let I; -var $plus$plus = Belt_Array.concat; +let $plus$plus = Belt_Array.concat; -var A; +let A; -var SI; +let SI; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/bs_hashtbl_string_test.js b/jscomp/test/bs_hashtbl_string_test.js index 2b3d29e775..3252a97b0b 100644 --- a/jscomp/test/bs_hashtbl_string_test.js +++ b/jscomp/test/bs_hashtbl_string_test.js @@ -1,22 +1,22 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml = require("../../lib/js/caml.js"); -var Belt_Id = require("../../lib/js/belt_Id.js"); -var Hashtbl = require("../../lib/js/hashtbl.js"); -var Belt_HashMap = require("../../lib/js/belt_HashMap.js"); -var Belt_MapDict = require("../../lib/js/belt_MapDict.js"); -var Belt_HashMapInt = require("../../lib/js/belt_HashMapInt.js"); -var Belt_HashSetInt = require("../../lib/js/belt_HashSetInt.js"); -var Belt_HashMapString = require("../../lib/js/belt_HashMapString.js"); -var Caml_hash_primitive = require("../../lib/js/caml_hash_primitive.js"); -var Belt_internalBucketsType = require("../../lib/js/belt_internalBucketsType.js"); +let Caml = require("../../lib/js/caml.js"); +let Belt_Id = require("../../lib/js/belt_Id.js"); +let Hashtbl = require("../../lib/js/hashtbl.js"); +let Belt_HashMap = require("../../lib/js/belt_HashMap.js"); +let Belt_MapDict = require("../../lib/js/belt_MapDict.js"); +let Belt_HashMapInt = require("../../lib/js/belt_HashMapInt.js"); +let Belt_HashSetInt = require("../../lib/js/belt_HashSetInt.js"); +let Belt_HashMapString = require("../../lib/js/belt_HashMapString.js"); +let Caml_hash_primitive = require("../../lib/js/caml_hash_primitive.js"); +let Belt_internalBucketsType = require("../../lib/js/belt_internalBucketsType.js"); function hash_string(s) { return Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, s)); } -var hashString = (function(str){ +let hashString = (function(str){ var hash = 5381, i = str.length | 0; @@ -25,31 +25,31 @@ var hashString = (function(str){ } return hash}); -var $$String = Belt_Id.hashable(Hashtbl.hash, (function (x, y) { +let $$String = Belt_Id.hashable(Hashtbl.hash, (function (x, y) { return x === y; })); -var String1 = Belt_Id.hashable(hashString, (function (x, y) { +let String1 = Belt_Id.hashable(hashString, (function (x, y) { return x === y; })); -var String2 = Belt_Id.hashable((function (x) { +let String2 = Belt_Id.hashable((function (x) { return Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, x)); }), (function (x, y) { return x === y; })); -var Int = Belt_Id.hashable(Hashtbl.hash, (function (x, y) { +let Int = Belt_Id.hashable(Hashtbl.hash, (function (x, y) { return x === y; })); -var empty = Belt_internalBucketsType.make(Int.hash, Int.eq, 500000); +let empty = Belt_internalBucketsType.make(Int.hash, Int.eq, 500000); function bench(param) { - for(var i = 0; i <= 1000000; ++i){ + for(let i = 0; i <= 1000000; ++i){ Belt_HashMap.set(empty, i, i); } - for(var i$1 = 0; i$1 <= 1000000; ++i$1){ + for(let i$1 = 0; i$1 <= 1000000; ++i$1){ if (!Belt_HashMap.has(empty, i$1)) { throw { RE_EXN_ID: "Assert_failure", @@ -67,11 +67,11 @@ function bench(param) { } function bench2(m) { - var empty = Belt_internalBucketsType.make(m.hash, m.eq, 1000000); - for(var i = 0; i <= 1000000; ++i){ + let empty = Belt_internalBucketsType.make(m.hash, m.eq, 1000000); + for(let i = 0; i <= 1000000; ++i){ Belt_HashMap.set(empty, String(i), i); } - for(var i$1 = 0; i$1 <= 1000000; ++i$1){ + for(let i$1 = 0; i$1 <= 1000000; ++i$1){ if (!Belt_HashMap.has(empty, String(i$1))) { throw { RE_EXN_ID: "Assert_failure", @@ -85,7 +85,7 @@ function bench2(m) { } } - for(var i$2 = 0; i$2 <= 1000000; ++i$2){ + for(let i$2 = 0; i$2 <= 1000000; ++i$2){ Belt_HashMap.remove(empty, String(i$2)); } if (empty.size === 0) { @@ -103,13 +103,13 @@ function bench2(m) { } function bench3(m) { - var empty_cmp = m.cmp; - var cmp = m.cmp; - var table = undefined; - for(var i = 0; i <= 1000000; ++i){ + let empty_cmp = m.cmp; + let cmp = m.cmp; + let table = undefined; + for(let i = 0; i <= 1000000; ++i){ table = Belt_MapDict.set(table, String(i), i, cmp); } - for(var i$1 = 0; i$1 <= 1000000; ++i$1){ + for(let i$1 = 0; i$1 <= 1000000; ++i$1){ if (!Belt_MapDict.has(table, String(i$1), cmp)) { throw { RE_EXN_ID: "Assert_failure", @@ -123,7 +123,7 @@ function bench3(m) { } } - for(var i$2 = 0; i$2 <= 1000000; ++i$2){ + for(let i$2 = 0; i$2 <= 1000000; ++i$2){ table = Belt_MapDict.remove(table, String(i$2), cmp); } if (Belt_MapDict.size(table) === 0) { @@ -140,14 +140,14 @@ function bench3(m) { }; } -var Sx = Belt_Id.comparable(Caml.string_compare); +let Sx = Belt_Id.comparable(Caml.string_compare); function bench4(param) { - var table = Belt_internalBucketsType.make(undefined, undefined, 1000000); - for(var i = 0; i <= 1000000; ++i){ + let table = Belt_internalBucketsType.make(undefined, undefined, 1000000); + for(let i = 0; i <= 1000000; ++i){ Belt_HashMapString.set(table, String(i), i); } - for(var i$1 = 0; i$1 <= 1000000; ++i$1){ + for(let i$1 = 0; i$1 <= 1000000; ++i$1){ if (!Belt_HashMapString.has(table, String(i$1))) { throw { RE_EXN_ID: "Assert_failure", @@ -161,7 +161,7 @@ function bench4(param) { } } - for(var i$2 = 0; i$2 <= 1000000; ++i$2){ + for(let i$2 = 0; i$2 <= 1000000; ++i$2){ Belt_HashMapString.remove(table, String(i$2)); } if (Belt_HashMapString.isEmpty(table)) { @@ -179,14 +179,14 @@ function bench4(param) { } function bench5(param) { - var table = Belt_internalBucketsType.make(Int.hash, Int.eq, 1000000); + let table = Belt_internalBucketsType.make(Int.hash, Int.eq, 1000000); console.time("bs_hashtbl_string_test.res 112"); - for(var i = 0; i <= 1000000; ++i){ + for(let i = 0; i <= 1000000; ++i){ Belt_HashMap.set(table, i, i); } console.timeEnd("bs_hashtbl_string_test.res 112"); console.time("bs_hashtbl_string_test.res 117"); - for(var i$1 = 0; i$1 <= 1000000; ++i$1){ + for(let i$1 = 0; i$1 <= 1000000; ++i$1){ if (!Belt_HashMap.has(table, i$1)) { throw { RE_EXN_ID: "Assert_failure", @@ -202,7 +202,7 @@ function bench5(param) { } console.timeEnd("bs_hashtbl_string_test.res 117"); console.time("bs_hashtbl_string_test.res 122"); - for(var i$2 = 0; i$2 <= 1000000; ++i$2){ + for(let i$2 = 0; i$2 <= 1000000; ++i$2){ Belt_HashMap.remove(table, i$2); } console.timeEnd("bs_hashtbl_string_test.res 122"); @@ -221,11 +221,11 @@ function bench5(param) { } function bench6(param) { - var table = Belt_internalBucketsType.make(undefined, undefined, 1000000); - for(var i = 0; i <= 1000000; ++i){ + let table = Belt_internalBucketsType.make(undefined, undefined, 1000000); + for(let i = 0; i <= 1000000; ++i){ Belt_HashMapInt.set(table, i, i); } - for(var i$1 = 0; i$1 <= 1000000; ++i$1){ + for(let i$1 = 0; i$1 <= 1000000; ++i$1){ if (!Belt_HashMapInt.has(table, i$1)) { throw { RE_EXN_ID: "Assert_failure", @@ -239,7 +239,7 @@ function bench6(param) { } } - for(var i$2 = 0; i$2 <= 1000000; ++i$2){ + for(let i$2 = 0; i$2 <= 1000000; ++i$2){ Belt_HashMapInt.remove(table, i$2); } if (table.size === 0) { @@ -257,11 +257,11 @@ function bench6(param) { } function bench7(param) { - var table = Belt_internalBucketsType.make(undefined, undefined, 2000000); - for(var i = 0; i <= 1000000; ++i){ + let table = Belt_internalBucketsType.make(undefined, undefined, 2000000); + for(let i = 0; i <= 1000000; ++i){ Belt_HashSetInt.add(table, i); } - for(var i$1 = 0; i$1 <= 1000000; ++i$1){ + for(let i$1 = 0; i$1 <= 1000000; ++i$1){ if (!Belt_HashSetInt.has(table, i$1)) { throw { RE_EXN_ID: "Assert_failure", @@ -275,7 +275,7 @@ function bench7(param) { } } - for(var i$2 = 0; i$2 <= 1000000; ++i$2){ + for(let i$2 = 0; i$2 <= 1000000; ++i$2){ Belt_HashSetInt.remove(table, i$2); } if (table.size === 0) { @@ -298,25 +298,25 @@ bench7(); console.timeEnd("bs_hashtbl_string_test.res 181"); -var N; +let N; -var count = 1000000; +let count = 1000000; -var initial_size = 1000000; +let initial_size = 1000000; -var M; +let M; -var Md; +let Md; -var Md0; +let Md0; -var H; +let H; -var H0; +let H0; -var HI; +let HI; -var S; +let S; exports.hash_string = hash_string; exports.hashString = hashString; diff --git a/jscomp/test/bs_ignore_effect.js b/jscomp/test/bs_ignore_effect.js index 42e21c8a57..f080ab193c 100644 --- a/jscomp/test/bs_ignore_effect.js +++ b/jscomp/test/bs_ignore_effect.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -33,16 +33,16 @@ function add(x,y){ } ; -var v = { +let v = { contents: 0 }; -var h = (v.contents = v.contents + 1 | 0, { +let h = (v.contents = v.contents + 1 | 0, { hi: 2, lo: 0 }); -var z = (v.contents = v.contents + 1 | 0, "Float", add(3.0, 2.0)); +let z = (v.contents = v.contents + 1 | 0, "Float", add(3.0, 2.0)); eq("File \"bs_ignore_effect.res\", line 34, characters 5-12", v.contents, 2); diff --git a/jscomp/test/bs_int_test.js b/jscomp/test/bs_int_test.js index cd30e35d2f..d411ee74ea 100644 --- a/jscomp/test/bs_int_test.js +++ b/jscomp/test/bs_int_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Belt_Int = require("../../lib/js/belt_Int.js"); +let Mt = require("./mt.js"); +let Belt_Int = require("../../lib/js/belt_Int.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -85,7 +85,7 @@ eq("File \"bs_int_test.res\", line 51, characters 5-12", 0, 0); Mt.from_pair_suites("File \"bs_int_test.res\", line 54, characters 20-27", suites.contents); -var I; +let I; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/bs_list_test.js b/jscomp/test/bs_list_test.js index bee9d6169e..21987afb08 100644 --- a/jscomp/test/bs_list_test.js +++ b/jscomp/test/bs_list_test.js @@ -1,17 +1,17 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml = require("../../lib/js/caml.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Belt_List = require("../../lib/js/belt_List.js"); -var Belt_Array = require("../../lib/js/belt_Array.js"); +let Mt = require("./mt.js"); +let Caml = require("../../lib/js/caml.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Belt_List = require("../../lib/js/belt_List.js"); +let Belt_Array = require("../../lib/js/belt_Array.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -28,7 +28,7 @@ function $$throw(loc, x) { } function sum(xs) { - var v = { + let v = { contents: 0 }; Belt_List.forEach(xs, (function (x) { @@ -38,7 +38,7 @@ function sum(xs) { } function sum2(xs, ys) { - var v = { + let v = { contents: 0 }; Belt_List.forEach2(xs, ys, (function (x, y) { @@ -47,7 +47,7 @@ function sum2(xs, ys) { return v.contents; } -var u = Belt_List.makeBy(5, (function (i) { +let u = Belt_List.makeBy(5, (function (i) { return Math.imul(i, i); })); @@ -55,7 +55,7 @@ function f(i) { eq("File \"bs_list_test.res\", line 27, characters 18-25", Belt_List.getExn(u, i), Math.imul(i, i)); } -for(var i = 0; i <= 4; ++i){ +for(let i = 0; i <= 4; ++i){ f(i); } @@ -761,11 +761,11 @@ function add(a, b) { return a + b | 0; } -var length_10_id = Belt_List.makeBy(10, id); +let length_10_id = Belt_List.makeBy(10, id); -var length_8_id = Belt_List.makeBy(8, id); +let length_8_id = Belt_List.makeBy(8, id); -var d = Belt_List.makeBy(10, (function (x) { +let d = Belt_List.makeBy(10, (function (x) { return (x << 1); })); @@ -801,7 +801,7 @@ eq("MAP2", Belt_List.reverse(Belt_List.mapReverse2(length_10_id, length_10_id, a return (x << 1); }))); -var xs = Belt_List.reverse(Belt_List.mapReverse2(length_8_id, length_10_id, add)); +let xs = Belt_List.reverse(Belt_List.mapReverse2(length_8_id, length_10_id, add)); eq("File \"bs_list_test.res\", line 163, characters 5-12", Belt_List.length(xs), 8); @@ -893,7 +893,7 @@ eq("DROP", Belt_List.drop(length_10_id, 0), length_10_id); eq("DROP", Belt_List.drop(length_8_id, -1), undefined); -var a = Belt_List.makeBy(5, id); +let a = Belt_List.makeBy(5, id); eq("SPLIT", Belt_List.splitAt(/* [] */0, 1), undefined); @@ -1305,7 +1305,7 @@ eq("REMOVEASSOQ", Belt_List.removeAssoc({ eq("REMOVEASSOQ", Belt_List.removeAssoc(/* [] */0, 2, eqx), /* [] */0); -var ll = { +let ll = { hd: [ 1, "1" @@ -1325,11 +1325,11 @@ var ll = { } }; -var ll0 = Belt_List.removeAssoc(ll, 0, eqx); +let ll0 = Belt_List.removeAssoc(ll, 0, eqx); b("File \"bs_list_test.res\", line 222, characters 4-11", ll === ll0); -var ll1 = Belt_List.setAssoc(ll, 2, "22", (function (prim0, prim1) { +let ll1 = Belt_List.setAssoc(ll, 2, "22", (function (prim0, prim1) { return prim0 === prim1; })); @@ -1353,7 +1353,7 @@ eq("File \"bs_list_test.res\", line 224, characters 5-12", ll1, { } }); -var ll2 = Belt_List.setAssoc(ll1, 22, "2", (function (prim0, prim1) { +let ll2 = Belt_List.setAssoc(ll1, 22, "2", (function (prim0, prim1) { return prim0 === prim1; })); @@ -1929,7 +1929,7 @@ b("File \"bs_list_test.res\", line 319, characters 4-11", Belt_List.reduceRevers return (acc + x | 0) + y | 0; })) === 6); -var a$1 = Belt_List.makeBy(10000, (function (i) { +let a$1 = Belt_List.makeBy(10000, (function (i) { return i; })); @@ -2444,11 +2444,11 @@ b("File \"bs_list_test.res\", line 377, characters 4-11", !Belt_List.eq({ return prim0 === prim1; }))); -var u0 = Belt_List.makeBy(20, (function (x) { +let u0 = Belt_List.makeBy(20, (function (x) { return x; })); -var u1 = Belt_List.keepMap(u0, (function (x) { +let u1 = Belt_List.keepMap(u0, (function (x) { if (x % 7 === 0) { return x + 1 | 0; } @@ -2512,11 +2512,11 @@ b("File \"bs_list_test.res\", line 404, characters 4-11", Belt_List.keepMap({ Mt.from_pair_suites("Bs_list_test", suites.contents); -var N; +let N; -var A; +let A; -var J; +let J; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/bs_map_set_dict_test.js b/jscomp/test/bs_map_set_dict_test.js index 8be6144f13..e881facfed 100644 --- a/jscomp/test/bs_map_set_dict_test.js +++ b/jscomp/test/bs_map_set_dict_test.js @@ -1,21 +1,21 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml = require("../../lib/js/caml.js"); -var Belt_Id = require("../../lib/js/belt_Id.js"); -var Belt_Map = require("../../lib/js/belt_Map.js"); -var Belt_List = require("../../lib/js/belt_List.js"); -var Belt_Array = require("../../lib/js/belt_Array.js"); -var Belt_MapDict = require("../../lib/js/belt_MapDict.js"); -var Belt_SetDict = require("../../lib/js/belt_SetDict.js"); -var Array_data_util = require("./array_data_util.js"); - -var suites = { +let Mt = require("./mt.js"); +let Caml = require("../../lib/js/caml.js"); +let Belt_Id = require("../../lib/js/belt_Id.js"); +let Belt_Map = require("../../lib/js/belt_Map.js"); +let Belt_List = require("../../lib/js/belt_List.js"); +let Belt_Array = require("../../lib/js/belt_Array.js"); +let Belt_MapDict = require("../../lib/js/belt_MapDict.js"); +let Belt_SetDict = require("../../lib/js/belt_SetDict.js"); +let Array_data_util = require("./array_data_util.js"); + +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -27,76 +27,76 @@ function b(loc, v) { Mt.bool_suites(test_id, suites, loc, v); } -var Icmp = Belt_Id.comparable(Caml.int_compare); +let Icmp = Belt_Id.comparable(Caml.int_compare); -var Icmp2 = Belt_Id.comparable(Caml.int_compare); +let Icmp2 = Belt_Id.comparable(Caml.int_compare); -var Ic3 = Belt_Id.comparable(Caml.int_compare); +let Ic3 = Belt_Id.comparable(Caml.int_compare); -var m0_cmp = Icmp.cmp; +let m0_cmp = Icmp.cmp; -var m0 = { +let m0 = { cmp: m0_cmp, data: undefined }; -var m00_cmp = Ic3.cmp; +let m00_cmp = Ic3.cmp; -var m00 = { +let m00 = { cmp: m00_cmp, data: undefined }; -var I2 = Belt_Id.comparable(function (x, y) { +let I2 = Belt_Id.comparable(function (x, y) { return Caml.int_compare(y, x); }); -var m_cmp = Icmp2.cmp; +let m_cmp = Icmp2.cmp; -var m = { +let m = { cmp: m_cmp, data: undefined }; -var m2_cmp = I2.cmp; +let m2_cmp = I2.cmp; -var m2 = { +let m2 = { cmp: m2_cmp, data: undefined }; -var data; +let data; Belt_Map.getId(m2); -var m_dict = Belt_Map.getId(m); +let m_dict = Belt_Map.getId(m); -for(var i = 0; i <= 100000; ++i){ +for(let i = 0; i <= 100000; ++i){ data = Belt_MapDict.set(data, i, i, m_dict.cmp); } -var data$1 = data; +let data$1 = data; -var newm_cmp = m_dict.cmp; +let newm_cmp = m_dict.cmp; -var newm = { +let newm = { cmp: newm_cmp, data: data$1 }; console.log(newm); -var m11 = Belt_MapDict.set(undefined, 1, 1, Icmp.cmp); +let m11 = Belt_MapDict.set(undefined, 1, 1, Icmp.cmp); console.log(m11); -var m_dict$1 = Belt_Map.getId(m); +let m_dict$1 = Belt_Map.getId(m); -var cmp = m_dict$1.cmp; +let cmp = m_dict$1.cmp; -var data$2; +let data$2; -for(var i$1 = 0; i$1 <= 100000; ++i$1){ +for(let i$1 = 0; i$1 <= 100000; ++i$1){ data$2 = Belt_SetDict.add(data$2, i$1, cmp); } @@ -112,14 +112,14 @@ function $eq$tilde(a, b) { }; } -var u0 = f(Belt_Array.map(Array_data_util.randomRange(0, 39), (function (x) { +let u0 = f(Belt_Array.map(Array_data_util.randomRange(0, 39), (function (x) { return [ x, x ]; }))); -var u1 = Belt_Map.set(u0, 39, 120); +let u1 = Belt_Map.set(u0, 39, 120); b("File \"bs_map_set_dict_test.res\", line 72, characters 4-11", Belt_Array.every2(Belt_MapDict.toArray(u0.data), Belt_Array.map(Array_data_util.range(0, 39), (function (x) { return [ @@ -151,7 +151,7 @@ eq("File \"bs_map_set_dict_test.res\", line 84, characters 5-12", Belt_Map.get(u eq("File \"bs_map_set_dict_test.res\", line 85, characters 5-12", Belt_Map.get(u1, 39), 120); -var u = f(Belt_Array.makeByAndShuffle(10000, (function (x) { +let u = f(Belt_Array.makeByAndShuffle(10000, (function (x) { return [ x, x @@ -167,25 +167,25 @@ eq("File \"bs_map_set_dict_test.res\", line 90, characters 5-12", Belt_Array.mak Mt.from_pair_suites("Bs_map_set_dict_test", suites.contents); -var M; +let M; -var MI; +let MI; -var I; +let I; -var A; +let A; -var L; +let L; -var vv; +let vv; -var vv2; +let vv2; -var Md0; +let Md0; -var ISet; +let ISet; -var S0; +let S0; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/bs_map_test.js b/jscomp/test/bs_map_test.js index dd411928f0..84523270b4 100644 --- a/jscomp/test/bs_map_test.js +++ b/jscomp/test/bs_map_test.js @@ -1,16 +1,16 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Belt_Array = require("../../lib/js/belt_Array.js"); -var Belt_MapInt = require("../../lib/js/belt_MapInt.js"); -var Belt_SetInt = require("../../lib/js/belt_SetInt.js"); +let Mt = require("./mt.js"); +let Belt_Array = require("../../lib/js/belt_Array.js"); +let Belt_MapInt = require("../../lib/js/belt_MapInt.js"); +let Belt_SetInt = require("../../lib/js/belt_SetInt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -47,28 +47,28 @@ function b(loc, v) { }; } -var mapOfArray = Belt_MapInt.fromArray; +let mapOfArray = Belt_MapInt.fromArray; -var setOfArray = Belt_SetInt.fromArray; +let setOfArray = Belt_SetInt.fromArray; function emptyMap(param) { } -var v = Belt_Array.makeByAndShuffle(1000000, (function (i) { +let v = Belt_Array.makeByAndShuffle(1000000, (function (i) { return [ i, i ]; })); -var u = Belt_MapInt.fromArray(v); +let u = Belt_MapInt.fromArray(v); Belt_MapInt.checkInvariantInternal(u); -var firstHalf = Belt_Array.slice(v, 0, 2000); +let firstHalf = Belt_Array.slice(v, 0, 2000); -var xx = Belt_Array.reduce(firstHalf, u, (function (acc, param) { +let xx = Belt_Array.reduce(firstHalf, u, (function (acc, param) { return Belt_MapInt.remove(acc, param[0]); })); @@ -78,11 +78,11 @@ Belt_MapInt.checkInvariantInternal(xx); Mt.from_pair_suites("Bs_map_test", suites.contents); -var M; +let M; -var N; +let N; -var A; +let A; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/bs_min_max_test.js b/jscomp/test/bs_min_max_test.js index d15a770798..d32dc27d56 100644 --- a/jscomp/test/bs_min_max_test.js +++ b/jscomp/test/bs_min_max_test.js @@ -1,16 +1,16 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml = require("../../lib/js/caml.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Caml_int64 = require("../../lib/js/caml_int64.js"); +let Mt = require("./mt.js"); +let Caml = require("../../lib/js/caml.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Caml_int64 = require("../../lib/js/caml_int64.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -30,7 +30,7 @@ function f2(x, y) { return Caml.int_compare(x + y | 0, y); } -var f3 = Caml.int_compare; +let f3 = Caml.int_compare; function f4(x, y) { if (x < y) { @@ -40,9 +40,9 @@ function f4(x, y) { } } -var f5_min = Caml_obj.min; +let f5_min = Caml_obj.min; -var f5_max = Caml_obj.max; +let f5_max = Caml_obj.max; b("File \"bs_min_max_test.res\", line 19, characters 4-11", Caml.i64_eq(Caml.i64_min(Caml_int64.zero, Caml_int64.one), Caml_int64.zero)); diff --git a/jscomp/test/bs_mutable_set_test.js b/jscomp/test/bs_mutable_set_test.js index 8348831a38..16d171bb1f 100644 --- a/jscomp/test/bs_mutable_set_test.js +++ b/jscomp/test/bs_mutable_set_test.js @@ -1,21 +1,21 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Belt_List = require("../../lib/js/belt_List.js"); -var Belt_Array = require("../../lib/js/belt_Array.js"); -var Belt_Range = require("../../lib/js/belt_Range.js"); -var Caml_array = require("../../lib/js/caml_array.js"); -var Array_data_util = require("./array_data_util.js"); -var Belt_MutableSetInt = require("../../lib/js/belt_MutableSetInt.js"); -var Belt_internalAVLset = require("../../lib/js/belt_internalAVLset.js"); -var Belt_internalSetInt = require("../../lib/js/belt_internalSetInt.js"); - -var suites = { +let Mt = require("./mt.js"); +let Belt_List = require("../../lib/js/belt_List.js"); +let Belt_Array = require("../../lib/js/belt_Array.js"); +let Belt_Range = require("../../lib/js/belt_Range.js"); +let Caml_array = require("../../lib/js/caml_array.js"); +let Array_data_util = require("./array_data_util.js"); +let Belt_MutableSetInt = require("../../lib/js/belt_MutableSetInt.js"); +let Belt_internalAVLset = require("../../lib/js/belt_internalAVLset.js"); +let Belt_internalSetInt = require("../../lib/js/belt_internalSetInt.js"); + +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -27,9 +27,9 @@ function b(loc, x) { Mt.bool_suites(test_id, suites, loc, x); } -var xs = Array_data_util.range(0, 30); +let xs = Array_data_util.range(0, 30); -var u = { +let u = { data: Belt_internalSetInt.fromArray(xs) }; @@ -43,7 +43,7 @@ b("File \"bs_mutable_set_test.res\", line 24, characters 8-15", Belt_MutableSetI eq("File \"bs_mutable_set_test.res\", line 25, characters 9-16", Belt_internalAVLset.size(u.data), 28); -var r = Array_data_util.randomRange(0, 30); +let r = Array_data_util.randomRange(0, 30); b("File \"bs_mutable_set_test.res\", line 27, characters 8-15", 29 === Belt_internalAVLset.maxUndefined(u.data)); @@ -51,7 +51,7 @@ b("File \"bs_mutable_set_test.res\", line 28, characters 8-15", 1 === Belt_inter Belt_MutableSetInt.add(u, 3); -for(var i = 0 ,i_finish = r.length; i < i_finish; ++i){ +for(let i = 0 ,i_finish = r.length; i < i_finish; ++i){ Belt_MutableSetInt.remove(u, r[i]); } @@ -69,7 +69,7 @@ eq("File \"bs_mutable_set_test.res\", line 38, characters 9-16", Belt_internalAV b("File \"bs_mutable_set_test.res\", line 39, characters 8-15", !Belt_MutableSetInt.isEmpty(u)); -for(var i$1 = 0; i$1 <= 3; ++i$1){ +for(let i$1 = 0; i$1 <= 3; ++i$1){ Belt_MutableSetInt.remove(u, i$1); } @@ -107,17 +107,17 @@ Belt_MutableSetInt.removeMany(u, Array_data_util.randomRange(10000, 30000)); b("File \"bs_mutable_set_test.res\", line 59, characters 8-15", Belt_MutableSetInt.isEmpty(u)); -var xs$1 = Array_data_util.randomRange(1000, 2000); +let xs$1 = Array_data_util.randomRange(1000, 2000); -var v = { +let v = { data: Belt_internalSetInt.fromArray(xs$1) }; -var bs = Belt_Array.map(Array_data_util.randomRange(500, 1499), (function (x) { +let bs = Belt_Array.map(Array_data_util.randomRange(500, 1499), (function (x) { return Belt_MutableSetInt.removeCheck(v, x); })); -var indeedRemoved = Belt_Array.reduce(bs, 0, (function (acc, x) { +let indeedRemoved = Belt_Array.reduce(bs, 0, (function (acc, x) { if (x) { return acc + 1 | 0; } else { @@ -129,11 +129,11 @@ eq("File \"bs_mutable_set_test.res\", line 72, characters 9-16", indeedRemoved, eq("File \"bs_mutable_set_test.res\", line 73, characters 9-16", Belt_internalAVLset.size(v.data), 501); -var cs = Belt_Array.map(Array_data_util.randomRange(500, 2000), (function (x) { +let cs = Belt_Array.map(Array_data_util.randomRange(500, 2000), (function (x) { return Belt_MutableSetInt.addCheck(v, x); })); -var indeedAded = Belt_Array.reduce(cs, 0, (function (acc, x) { +let indeedAded = Belt_Array.reduce(cs, 0, (function (acc, x) { if (x) { return acc + 1 | 0; } else { @@ -175,13 +175,13 @@ eq("File \"bs_mutable_set_test.res\", line 93, characters 9-16", Belt_internalSe eq("File \"bs_mutable_set_test.res\", line 94, characters 9-16", Belt_internalSetInt.get(v.data, 1200), 1200); -var match = Belt_MutableSetInt.split(v, 1000); +let match = Belt_MutableSetInt.split(v, 1000); -var match$1 = match[0]; +let match$1 = match[0]; -var bb = match$1[1]; +let bb = match$1[1]; -var aa = match$1[0]; +let aa = match$1[0]; b("File \"bs_mutable_set_test.res\", line 96, characters 8-15", match[1]); @@ -199,17 +199,17 @@ b("File \"bs_mutable_set_test.res\", line 100, characters 8-15", Belt_MutableSet b("File \"bs_mutable_set_test.res\", line 101, characters 8-15", Belt_MutableSetInt.isEmpty(Belt_MutableSetInt.intersect(aa, bb))); -var c = Belt_MutableSetInt.removeCheck(v, 1000); +let c = Belt_MutableSetInt.removeCheck(v, 1000); b("File \"bs_mutable_set_test.res\", line 103, characters 8-15", c); -var match$2 = Belt_MutableSetInt.split(v, 1000); +let match$2 = Belt_MutableSetInt.split(v, 1000); -var match$3 = match$2[0]; +let match$3 = match$2[0]; -var bb$1 = match$3[1]; +let bb$1 = match$3[1]; -var aa$1 = match$3[0]; +let aa$1 = match$3[0]; b("File \"bs_mutable_set_test.res\", line 105, characters 8-15", !match$2[1]); @@ -227,31 +227,31 @@ b("File \"bs_mutable_set_test.res\", line 109, characters 8-15", Belt_MutableSet b("File \"bs_mutable_set_test.res\", line 110, characters 8-15", Belt_MutableSetInt.isEmpty(Belt_MutableSetInt.intersect(aa$1, bb$1))); -var xs$2 = Array_data_util.randomRange(0, 100); +let xs$2 = Array_data_util.randomRange(0, 100); -var aa$2 = { +let aa$2 = { data: Belt_internalSetInt.fromArray(xs$2) }; -var xs$3 = Array_data_util.randomRange(40, 120); +let xs$3 = Array_data_util.randomRange(40, 120); -var bb$2 = { +let bb$2 = { data: Belt_internalSetInt.fromArray(xs$3) }; -var cc = Belt_MutableSetInt.union(aa$2, bb$2); +let cc = Belt_MutableSetInt.union(aa$2, bb$2); -var xs$4 = Array_data_util.randomRange(0, 120); +let xs$4 = Array_data_util.randomRange(0, 120); b("File \"bs_mutable_set_test.res\", line 120, characters 8-15", Belt_MutableSetInt.eq(cc, { data: Belt_internalSetInt.fromArray(xs$4) })); -var xs$5 = Array_data_util.randomRange(0, 20); +let xs$5 = Array_data_util.randomRange(0, 20); -var xs$6 = Array_data_util.randomRange(21, 40); +let xs$6 = Array_data_util.randomRange(21, 40); -var xs$7 = Array_data_util.randomRange(0, 40); +let xs$7 = Array_data_util.randomRange(0, 40); b("File \"bs_mutable_set_test.res\", line 123, characters 8-15", Belt_MutableSetInt.eq(Belt_MutableSetInt.union({ data: Belt_internalSetInt.fromArray(xs$5) @@ -261,17 +261,17 @@ b("File \"bs_mutable_set_test.res\", line 123, characters 8-15", Belt_MutableSet data: Belt_internalSetInt.fromArray(xs$7) })); -var dd = Belt_MutableSetInt.intersect(aa$2, bb$2); +let dd = Belt_MutableSetInt.intersect(aa$2, bb$2); -var xs$8 = Array_data_util.randomRange(40, 100); +let xs$8 = Array_data_util.randomRange(40, 100); b("File \"bs_mutable_set_test.res\", line 127, characters 8-15", Belt_MutableSetInt.eq(dd, { data: Belt_internalSetInt.fromArray(xs$8) })); -var xs$9 = Array_data_util.randomRange(0, 20); +let xs$9 = Array_data_util.randomRange(0, 20); -var xs$10 = Array_data_util.randomRange(21, 40); +let xs$10 = Array_data_util.randomRange(21, 40); b("File \"bs_mutable_set_test.res\", line 129, characters 8-15", Belt_MutableSetInt.eq(Belt_MutableSetInt.intersect({ data: Belt_internalSetInt.fromArray(xs$9) @@ -281,9 +281,9 @@ b("File \"bs_mutable_set_test.res\", line 129, characters 8-15", Belt_MutableSet data: undefined })); -var xs$11 = Array_data_util.randomRange(21, 40); +let xs$11 = Array_data_util.randomRange(21, 40); -var xs$12 = Array_data_util.randomRange(0, 20); +let xs$12 = Array_data_util.randomRange(0, 20); b("File \"bs_mutable_set_test.res\", line 136, characters 8-15", Belt_MutableSetInt.eq(Belt_MutableSetInt.intersect({ data: Belt_internalSetInt.fromArray(xs$11) @@ -318,23 +318,23 @@ b("File \"bs_mutable_set_test.res\", line 142, characters 8-15", Belt_MutableSet ]) })); -var xs$13 = Array_data_util.randomRange(0, 39); +let xs$13 = Array_data_util.randomRange(0, 39); b("File \"bs_mutable_set_test.res\", line 143, characters 8-15", Belt_MutableSetInt.eq(Belt_MutableSetInt.diff(aa$2, bb$2), { data: Belt_internalSetInt.fromArray(xs$13) })); -var xs$14 = Array_data_util.randomRange(101, 120); +let xs$14 = Array_data_util.randomRange(101, 120); b("File \"bs_mutable_set_test.res\", line 144, characters 8-15", Belt_MutableSetInt.eq(Belt_MutableSetInt.diff(bb$2, aa$2), { data: Belt_internalSetInt.fromArray(xs$14) })); -var xs$15 = Array_data_util.randomRange(21, 40); +let xs$15 = Array_data_util.randomRange(21, 40); -var xs$16 = Array_data_util.randomRange(0, 20); +let xs$16 = Array_data_util.randomRange(0, 20); -var xs$17 = Array_data_util.randomRange(21, 40); +let xs$17 = Array_data_util.randomRange(21, 40); b("File \"bs_mutable_set_test.res\", line 146, characters 8-15", Belt_MutableSetInt.eq(Belt_MutableSetInt.diff({ data: Belt_internalSetInt.fromArray(xs$15) @@ -344,11 +344,11 @@ b("File \"bs_mutable_set_test.res\", line 146, characters 8-15", Belt_MutableSet data: Belt_internalSetInt.fromArray(xs$17) })); -var xs$18 = Array_data_util.randomRange(0, 20); +let xs$18 = Array_data_util.randomRange(0, 20); -var xs$19 = Array_data_util.randomRange(21, 40); +let xs$19 = Array_data_util.randomRange(21, 40); -var xs$20 = Array_data_util.randomRange(0, 20); +let xs$20 = Array_data_util.randomRange(0, 20); b("File \"bs_mutable_set_test.res\", line 153, characters 8-15", Belt_MutableSetInt.eq(Belt_MutableSetInt.diff({ data: Belt_internalSetInt.fromArray(xs$18) @@ -358,11 +358,11 @@ b("File \"bs_mutable_set_test.res\", line 153, characters 8-15", Belt_MutableSet data: Belt_internalSetInt.fromArray(xs$20) })); -var xs$21 = Array_data_util.randomRange(0, 20); +let xs$21 = Array_data_util.randomRange(0, 20); -var xs$22 = Array_data_util.randomRange(0, 40); +let xs$22 = Array_data_util.randomRange(0, 40); -var xs$23 = Array_data_util.randomRange(0, -1); +let xs$23 = Array_data_util.randomRange(0, -1); b("File \"bs_mutable_set_test.res\", line 161, characters 8-15", Belt_MutableSetInt.eq(Belt_MutableSetInt.diff({ data: Belt_internalSetInt.fromArray(xs$21) @@ -372,27 +372,27 @@ b("File \"bs_mutable_set_test.res\", line 161, characters 8-15", Belt_MutableSet data: Belt_internalSetInt.fromArray(xs$23) })); -var xs$24 = Array_data_util.randomRange(0, 1000); +let xs$24 = Array_data_util.randomRange(0, 1000); -var a0 = { +let a0 = { data: Belt_internalSetInt.fromArray(xs$24) }; -var a1 = Belt_MutableSetInt.keep(a0, (function (x) { +let a1 = Belt_MutableSetInt.keep(a0, (function (x) { return x % 2 === 0; })); -var a2 = Belt_MutableSetInt.keep(a0, (function (x) { +let a2 = Belt_MutableSetInt.keep(a0, (function (x) { return x % 2 !== 0; })); -var match$4 = Belt_MutableSetInt.partition(a0, (function (x) { +let match$4 = Belt_MutableSetInt.partition(a0, (function (x) { return x % 2 === 0; })); -var a4 = match$4[1]; +let a4 = match$4[1]; -var a3 = match$4[0]; +let a3 = match$4[0]; b("File \"bs_mutable_set_test.res\", line 173, characters 8-15", Belt_MutableSetInt.eq(a1, a3)); @@ -417,11 +417,11 @@ Belt_List.forEach({ Belt_internalAVLset.checkInvariantInternal(x.data); })); -var v$1 = { +let v$1 = { data: undefined }; -for(var i$2 = 0; i$2 <= 100000; ++i$2){ +for(let i$2 = 0; i$2 <= 100000; ++i$2){ Belt_MutableSetInt.add(v$1, i$2); } @@ -433,9 +433,9 @@ b("File \"bs_mutable_set_test.res\", line 188, characters 10-17", Belt_Range.eve eq("File \"bs_mutable_set_test.res\", line 189, characters 5-12", Belt_internalAVLset.size(v$1.data), 100001); -var u$1 = Belt_Array.concat(Array_data_util.randomRange(30, 100), Array_data_util.randomRange(40, 120)); +let u$1 = Belt_Array.concat(Array_data_util.randomRange(30, 100), Array_data_util.randomRange(40, 120)); -var v$2 = { +let v$2 = { data: undefined }; @@ -445,25 +445,25 @@ eq("File \"bs_mutable_set_test.res\", line 196, characters 5-12", Belt_internalA eq("File \"bs_mutable_set_test.res\", line 197, characters 5-12", Belt_internalAVLset.toArray(v$2.data), Array_data_util.range(30, 120)); -var u$2 = Belt_Array.concat(Array_data_util.randomRange(0, 100000), Array_data_util.randomRange(0, 100)); +let u$2 = Belt_Array.concat(Array_data_util.randomRange(0, 100000), Array_data_util.randomRange(0, 100)); -var v$3 = { +let v$3 = { data: Belt_internalSetInt.fromArray(u$2) }; eq("File \"bs_mutable_set_test.res\", line 203, characters 5-12", Belt_internalAVLset.size(v$3.data), 100001); -var u$3 = Array_data_util.randomRange(50000, 80000); +let u$3 = Array_data_util.randomRange(50000, 80000); -for(var i$3 = 0 ,i_finish$1 = u$3.length; i$3 < i_finish$1; ++i$3){ +for(let i$3 = 0 ,i_finish$1 = u$3.length; i$3 < i_finish$1; ++i$3){ Belt_MutableSetInt.remove(v$3, i$3); } eq("File \"bs_mutable_set_test.res\", line 210, characters 5-12", Belt_internalAVLset.size(v$3.data), 70000); -var vv = Array_data_util.randomRange(0, 100000); +let vv = Array_data_util.randomRange(0, 100000); -for(var i$4 = 0 ,i_finish$2 = vv.length; i$4 < i_finish$2; ++i$4){ +for(let i$4 = 0 ,i_finish$2 = vv.length; i$4 < i_finish$2; ++i$4){ Belt_MutableSetInt.remove(v$3, Caml_array.get(vv, i$4)); } @@ -471,11 +471,11 @@ eq("File \"bs_mutable_set_test.res\", line 216, characters 5-12", Belt_internalA b("File \"bs_mutable_set_test.res\", line 217, characters 4-11", Belt_MutableSetInt.isEmpty(v$3)); -var xs$25 = Belt_Array.makeBy(30, (function (i) { +let xs$25 = Belt_Array.makeBy(30, (function (i) { return i; })); -var v$4 = { +let v$4 = { data: Belt_internalSetInt.fromArray(xs$25) }; @@ -491,16 +491,16 @@ b("File \"bs_mutable_set_test.res\", line 226, characters 4-11", 1 === Belt_inte eq("File \"bs_mutable_set_test.res\", line 227, characters 5-12", Belt_internalAVLset.size(v$4.data), 28); -var vv$1 = Array_data_util.randomRange(1, 28); +let vv$1 = Array_data_util.randomRange(1, 28); -for(var i$5 = 0 ,i_finish$3 = vv$1.length; i$5 < i_finish$3; ++i$5){ +for(let i$5 = 0 ,i_finish$3 = vv$1.length; i$5 < i_finish$3; ++i$5){ Belt_MutableSetInt.remove(v$4, Caml_array.get(vv$1, i$5)); } eq("File \"bs_mutable_set_test.res\", line 232, characters 5-12", Belt_internalAVLset.size(v$4.data), 0); function id(loc, x) { - var u = { + let u = { data: Belt_internalAVLset.fromSortedArrayUnsafe(x) }; Belt_internalAVLset.checkInvariantInternal(u.data); @@ -592,25 +592,25 @@ id("File \"bs_mutable_set_test.res\", line 252, characters 5-12", [ id("File \"bs_mutable_set_test.res\", line 253, characters 5-12", Array_data_util.range(0, 1000)); -var xs$26 = Array_data_util.randomRange(0, 1000); +let xs$26 = Array_data_util.randomRange(0, 1000); -var v$5 = { +let v$5 = { data: Belt_internalSetInt.fromArray(xs$26) }; -var copyV = Belt_MutableSetInt.keep(v$5, (function (x) { +let copyV = Belt_MutableSetInt.keep(v$5, (function (x) { return x % 8 === 0; })); -var match$5 = Belt_MutableSetInt.partition(v$5, (function (x) { +let match$5 = Belt_MutableSetInt.partition(v$5, (function (x) { return x % 8 === 0; })); -var cc$1 = Belt_MutableSetInt.keep(v$5, (function (x) { +let cc$1 = Belt_MutableSetInt.keep(v$5, (function (x) { return x % 8 !== 0; })); -for(var i$6 = 0; i$6 <= 200; ++i$6){ +for(let i$6 = 0; i$6 <= 200; ++i$6){ Belt_MutableSetInt.remove(v$5, i$6); } @@ -626,41 +626,41 @@ b("File \"bs_mutable_set_test.res\", line 267, characters 4-11", Belt_MutableSet b("File \"bs_mutable_set_test.res\", line 268, characters 4-11", Belt_MutableSetInt.eq(cc$1, match$5[1])); -var xs$27 = Array_data_util.randomRange(0, 1000); +let xs$27 = Array_data_util.randomRange(0, 1000); -var v$6 = { +let v$6 = { data: Belt_internalSetInt.fromArray(xs$27) }; -var match$6 = Belt_MutableSetInt.split(v$6, 400); +let match$6 = Belt_MutableSetInt.split(v$6, 400); -var match$7 = match$6[0]; +let match$7 = match$6[0]; -var xs$28 = Array_data_util.randomRange(0, 399); +let xs$28 = Array_data_util.randomRange(0, 399); b("File \"bs_mutable_set_test.res\", line 274, characters 4-11", Belt_MutableSetInt.eq(match$7[0], { data: Belt_internalSetInt.fromArray(xs$28) })); -var xs$29 = Array_data_util.randomRange(401, 1000); +let xs$29 = Array_data_util.randomRange(401, 1000); b("File \"bs_mutable_set_test.res\", line 275, characters 4-11", Belt_MutableSetInt.eq(match$7[1], { data: Belt_internalSetInt.fromArray(xs$29) })); -var xs$30 = Belt_Array.map(Array_data_util.randomRange(0, 1000), (function (x) { +let xs$30 = Belt_Array.map(Array_data_util.randomRange(0, 1000), (function (x) { return (x << 1); })); -var d = { +let d = { data: Belt_internalSetInt.fromArray(xs$30) }; -var match$8 = Belt_MutableSetInt.split(d, 1001); +let match$8 = Belt_MutableSetInt.split(d, 1001); -var match$9 = match$8[0]; +let match$9 = match$8[0]; -var xs$31 = Belt_Array.makeBy(501, (function (x) { +let xs$31 = Belt_Array.makeBy(501, (function (x) { return (x << 1); })); @@ -668,7 +668,7 @@ b("File \"bs_mutable_set_test.res\", line 278, characters 4-11", Belt_MutableSet data: Belt_internalSetInt.fromArray(xs$31) })); -var xs$32 = Belt_Array.makeBy(500, (function (x) { +let xs$32 = Belt_Array.makeBy(500, (function (x) { return 1002 + (x << 1) | 0; })); @@ -676,31 +676,31 @@ b("File \"bs_mutable_set_test.res\", line 279, characters 4-11", Belt_MutableSet data: Belt_internalSetInt.fromArray(xs$32) })); -var xs$33 = Array_data_util.randomRange(0, 100); +let xs$33 = Array_data_util.randomRange(0, 100); -var aa$3 = { +let aa$3 = { data: Belt_internalSetInt.fromArray(xs$33) }; -var xs$34 = Array_data_util.randomRange(40, 120); +let xs$34 = Array_data_util.randomRange(40, 120); -var bb$3 = { +let bb$3 = { data: Belt_internalSetInt.fromArray(xs$34) }; -var cc$2 = Belt_MutableSetInt.union(aa$3, bb$3); +let cc$2 = Belt_MutableSetInt.union(aa$3, bb$3); -var xs$35 = Array_data_util.randomRange(0, 120); +let xs$35 = Array_data_util.randomRange(0, 120); b("File \"bs_mutable_set_test.res\", line 289, characters 4-11", Belt_MutableSetInt.eq(cc$2, { data: Belt_internalSetInt.fromArray(xs$35) })); -var xs$36 = Array_data_util.randomRange(0, 20); +let xs$36 = Array_data_util.randomRange(0, 20); -var xs$37 = Array_data_util.randomRange(21, 40); +let xs$37 = Array_data_util.randomRange(21, 40); -var xs$38 = Array_data_util.randomRange(0, 40); +let xs$38 = Array_data_util.randomRange(0, 40); b("File \"bs_mutable_set_test.res\", line 292, characters 4-11", Belt_MutableSetInt.eq(Belt_MutableSetInt.union({ data: Belt_internalSetInt.fromArray(xs$36) @@ -710,17 +710,17 @@ b("File \"bs_mutable_set_test.res\", line 292, characters 4-11", Belt_MutableSet data: Belt_internalSetInt.fromArray(xs$38) })); -var dd$1 = Belt_MutableSetInt.intersect(aa$3, bb$3); +let dd$1 = Belt_MutableSetInt.intersect(aa$3, bb$3); -var xs$39 = Array_data_util.randomRange(40, 100); +let xs$39 = Array_data_util.randomRange(40, 100); b("File \"bs_mutable_set_test.res\", line 296, characters 4-11", Belt_MutableSetInt.eq(dd$1, { data: Belt_internalSetInt.fromArray(xs$39) })); -var xs$40 = Array_data_util.randomRange(0, 20); +let xs$40 = Array_data_util.randomRange(0, 20); -var xs$41 = Array_data_util.randomRange(21, 40); +let xs$41 = Array_data_util.randomRange(21, 40); b("File \"bs_mutable_set_test.res\", line 298, characters 4-11", Belt_MutableSetInt.eq(Belt_MutableSetInt.intersect({ data: Belt_internalSetInt.fromArray(xs$40) @@ -730,9 +730,9 @@ b("File \"bs_mutable_set_test.res\", line 298, characters 4-11", Belt_MutableSet data: undefined })); -var xs$42 = Array_data_util.randomRange(21, 40); +let xs$42 = Array_data_util.randomRange(21, 40); -var xs$43 = Array_data_util.randomRange(0, 20); +let xs$43 = Array_data_util.randomRange(0, 20); b("File \"bs_mutable_set_test.res\", line 302, characters 4-11", Belt_MutableSetInt.eq(Belt_MutableSetInt.intersect({ data: Belt_internalSetInt.fromArray(xs$42) @@ -767,23 +767,23 @@ b("File \"bs_mutable_set_test.res\", line 305, characters 4-11", Belt_MutableSet ]) })); -var xs$44 = Array_data_util.randomRange(0, 39); +let xs$44 = Array_data_util.randomRange(0, 39); b("File \"bs_mutable_set_test.res\", line 306, characters 4-11", Belt_MutableSetInt.eq(Belt_MutableSetInt.diff(aa$3, bb$3), { data: Belt_internalSetInt.fromArray(xs$44) })); -var xs$45 = Array_data_util.randomRange(101, 120); +let xs$45 = Array_data_util.randomRange(101, 120); b("File \"bs_mutable_set_test.res\", line 307, characters 4-11", Belt_MutableSetInt.eq(Belt_MutableSetInt.diff(bb$3, aa$3), { data: Belt_internalSetInt.fromArray(xs$45) })); -var xs$46 = Array_data_util.randomRange(21, 40); +let xs$46 = Array_data_util.randomRange(21, 40); -var xs$47 = Array_data_util.randomRange(0, 20); +let xs$47 = Array_data_util.randomRange(0, 20); -var xs$48 = Array_data_util.randomRange(21, 40); +let xs$48 = Array_data_util.randomRange(21, 40); b("File \"bs_mutable_set_test.res\", line 309, characters 4-11", Belt_MutableSetInt.eq(Belt_MutableSetInt.diff({ data: Belt_internalSetInt.fromArray(xs$46) @@ -793,11 +793,11 @@ b("File \"bs_mutable_set_test.res\", line 309, characters 4-11", Belt_MutableSet data: Belt_internalSetInt.fromArray(xs$48) })); -var xs$49 = Array_data_util.randomRange(0, 20); +let xs$49 = Array_data_util.randomRange(0, 20); -var xs$50 = Array_data_util.randomRange(21, 40); +let xs$50 = Array_data_util.randomRange(21, 40); -var xs$51 = Array_data_util.randomRange(0, 20); +let xs$51 = Array_data_util.randomRange(0, 20); b("File \"bs_mutable_set_test.res\", line 316, characters 4-11", Belt_MutableSetInt.eq(Belt_MutableSetInt.diff({ data: Belt_internalSetInt.fromArray(xs$49) @@ -807,11 +807,11 @@ b("File \"bs_mutable_set_test.res\", line 316, characters 4-11", Belt_MutableSet data: Belt_internalSetInt.fromArray(xs$51) })); -var xs$52 = Array_data_util.randomRange(0, 20); +let xs$52 = Array_data_util.randomRange(0, 20); -var xs$53 = Array_data_util.randomRange(0, 40); +let xs$53 = Array_data_util.randomRange(0, 40); -var xs$54 = Array_data_util.randomRange(0, -1); +let xs$54 = Array_data_util.randomRange(0, -1); b("File \"bs_mutable_set_test.res\", line 324, characters 4-11", Belt_MutableSetInt.eq(Belt_MutableSetInt.diff({ data: Belt_internalSetInt.fromArray(xs$52) @@ -823,25 +823,25 @@ b("File \"bs_mutable_set_test.res\", line 324, characters 4-11", Belt_MutableSet Mt.from_pair_suites("Bs_mutable_set_test", suites.contents); -var N; +let N; -var I; +let I; -var R; +let R; -var A; +let A; -var L; +let L; -var empty = Belt_MutableSetInt.make; +let empty = Belt_MutableSetInt.make; -var fromArray = Belt_MutableSetInt.fromArray; +let fromArray = Belt_MutableSetInt.fromArray; -var $plus$plus = Belt_MutableSetInt.union; +let $plus$plus = Belt_MutableSetInt.union; -var f = Belt_MutableSetInt.fromArray; +let f = Belt_MutableSetInt.fromArray; -var $eq$tilde = Belt_MutableSetInt.eq; +let $eq$tilde = Belt_MutableSetInt.eq; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/bs_poly_map_test.js b/jscomp/test/bs_poly_map_test.js index 6e91009013..700bc4a593 100644 --- a/jscomp/test/bs_poly_map_test.js +++ b/jscomp/test/bs_poly_map_test.js @@ -1,21 +1,21 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml = require("../../lib/js/caml.js"); -var Belt_Id = require("../../lib/js/belt_Id.js"); -var Belt_Map = require("../../lib/js/belt_Map.js"); -var Belt_Set = require("../../lib/js/belt_Set.js"); -var Belt_Array = require("../../lib/js/belt_Array.js"); -var Caml_option = require("../../lib/js/caml_option.js"); -var Belt_MapDict = require("../../lib/js/belt_MapDict.js"); -var Array_data_util = require("./array_data_util.js"); - -var suites = { +let Mt = require("./mt.js"); +let Caml = require("../../lib/js/caml.js"); +let Belt_Id = require("../../lib/js/belt_Id.js"); +let Belt_Map = require("../../lib/js/belt_Map.js"); +let Belt_Set = require("../../lib/js/belt_Set.js"); +let Belt_Array = require("../../lib/js/belt_Array.js"); +let Caml_option = require("../../lib/js/caml_option.js"); +let Belt_MapDict = require("../../lib/js/belt_MapDict.js"); +let Array_data_util = require("./array_data_util.js"); + +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -27,7 +27,7 @@ function b(loc, v) { Mt.bool_suites(test_id, suites, loc, v); } -var Icmp = Belt_Id.comparable(Caml.int_compare); +let Icmp = Belt_Id.comparable(Caml.int_compare); function mapOfArray(x) { return Belt_Map.fromArray(x, Icmp); @@ -45,7 +45,7 @@ function emptyMap(param) { } function mergeInter(s1, s2) { - var m = Belt_Map.merge(s1, s2, (function (k, v1, v2) { + let m = Belt_Map.merge(s1, s2, (function (k, v1, v2) { if (v1 !== undefined && v2 !== undefined) { return Caml_option.some(undefined); } @@ -55,7 +55,7 @@ function mergeInter(s1, s2) { } function mergeUnion(s1, s2) { - var m = Belt_Map.merge(s1, s2, (function (k, v1, v2) { + let m = Belt_Map.merge(s1, s2, (function (k, v1, v2) { if (v1 !== undefined || v2 !== undefined) { return Caml_option.some(undefined); } @@ -65,7 +65,7 @@ function mergeUnion(s1, s2) { } function mergeDiff(s1, s2) { - var m = Belt_Map.merge(s1, s2, (function (k, v1, v2) { + let m = Belt_Map.merge(s1, s2, (function (k, v1, v2) { if (v1 !== undefined && v2 === undefined) { return Caml_option.some(undefined); } @@ -83,9 +83,9 @@ function randomRange(i, j) { })); } -var u0 = Belt_Map.fromArray(randomRange(0, 100), Icmp); +let u0 = Belt_Map.fromArray(randomRange(0, 100), Icmp); -var u1 = Belt_Map.fromArray(randomRange(30, 120), Icmp); +let u1 = Belt_Map.fromArray(randomRange(30, 120), Icmp); b("File \"bs_poly_map_test.res\", line 64, characters 4-11", Belt_Set.eq(mergeInter(u0, u1), Belt_Set.fromArray(Array_data_util.range(30, 100), Icmp))); @@ -95,13 +95,13 @@ b("File \"bs_poly_map_test.res\", line 66, characters 4-11", Belt_Set.eq(mergeDi b("File \"bs_poly_map_test.res\", line 67, characters 4-11", Belt_Set.eq(mergeDiff(u1, u0), Belt_Set.fromArray(Array_data_util.range(101, 120), Icmp))); -var a0 = Belt_Map.fromArray(randomRange(0, 10), Icmp); +let a0 = Belt_Map.fromArray(randomRange(0, 10), Icmp); -var a1 = Belt_Map.set(a0, 3, 33); +let a1 = Belt_Map.set(a0, 3, 33); -var a2 = Belt_Map.remove(a1, 3); +let a2 = Belt_Map.remove(a1, 3); -var a3 = Belt_Map.update(a2, 3, (function (k) { +let a3 = Belt_Map.update(a2, 3, (function (k) { if (k !== undefined) { return k + 1 | 0; } else { @@ -109,16 +109,16 @@ var a3 = Belt_Map.update(a2, 3, (function (k) { } })); -var a4 = Belt_Map.update(a2, 3, (function (k) { +let a4 = Belt_Map.update(a2, 3, (function (k) { if (k !== undefined) { return k + 1 | 0; } })); -var a5 = Belt_Map.remove(a0, 3); +let a5 = Belt_Map.remove(a0, 3); -var a6 = Belt_Map.remove(a5, 3); +let a6 = Belt_Map.remove(a5, 3); b("File \"bs_poly_map_test.res\", line 88, characters 4-11", a5 === a6); @@ -136,7 +136,7 @@ b("File \"bs_poly_map_test.res\", line 95, characters 4-11", 11 === Belt_Map.get b("File \"bs_poly_map_test.res\", line 96, characters 4-11", Belt_Map.getUndefined(a4, 3) === undefined); -var a7 = Belt_Map.removeMany(a0, [ +let a7 = Belt_Map.removeMany(a0, [ 7, 8, 0, @@ -155,13 +155,13 @@ eq("File \"bs_poly_map_test.res\", line 99, characters 5-12", Belt_MapDict.keysT 10 ]); -var a8 = Belt_Map.removeMany(a7, Array_data_util.randomRange(0, 100)); +let a8 = Belt_Map.removeMany(a7, Array_data_util.randomRange(0, 100)); b("File \"bs_poly_map_test.res\", line 101, characters 4-11", Belt_MapDict.isEmpty(a8.data)); -var u0$1 = Belt_Map.fromArray(randomRange(0, 100), Icmp); +let u0$1 = Belt_Map.fromArray(randomRange(0, 100), Icmp); -var u1$1 = Belt_Map.set(u0$1, 3, 32); +let u1$1 = Belt_Map.set(u0$1, 3, 32); eq("File \"bs_poly_map_test.res\", line 108, characters 5-12", Belt_Map.get(u1$1, 3), 32); @@ -179,14 +179,14 @@ function acc(m, is) { })); } -var m_cmp = Icmp.cmp; +let m_cmp = Icmp.cmp; -var m = { +let m = { cmp: m_cmp, data: undefined }; -var m1 = acc(m, Belt_Array.concat(Array_data_util.randomRange(0, 20), Array_data_util.randomRange(10, 30))); +let m1 = acc(m, Belt_Array.concat(Array_data_util.randomRange(0, 20), Array_data_util.randomRange(10, 30))); b("File \"bs_poly_map_test.res\", line 126, characters 4-11", Belt_Map.eq(m1, Belt_Map.fromArray(Belt_Array.makeBy(31, (function (i) { return [ @@ -197,21 +197,21 @@ b("File \"bs_poly_map_test.res\", line 126, characters 4-11", Belt_Map.eq(m1, Be return x === y; }))); -var v0_cmp = Icmp.cmp; +let v0_cmp = Icmp.cmp; -var v0 = { +let v0 = { cmp: v0_cmp, data: undefined }; -var v1 = Belt_Map.mergeMany(v0, Belt_Array.map(Array_data_util.randomRange(0, 10000), (function (x) { +let v1 = Belt_Map.mergeMany(v0, Belt_Array.map(Array_data_util.randomRange(0, 10000), (function (x) { return [ x, x ]; }))); -var v2 = Belt_Map.fromArray(Belt_Array.map(Array_data_util.randomRange(0, 10000), (function (x) { +let v2 = Belt_Map.fromArray(Belt_Array.map(Array_data_util.randomRange(0, 10000), (function (x) { return [ x, x @@ -230,36 +230,36 @@ function inc(x) { } } -var v3 = Belt_Map.update(v1, 10, inc); +let v3 = Belt_Map.update(v1, 10, inc); -var v4 = Belt_Map.update(v3, -10, inc); +let v4 = Belt_Map.update(v3, -10, inc); -var match = Belt_Map.split(v3, 5000); +let match = Belt_Map.split(v3, 5000); -var pres = match[1]; +let pres = match[1]; -var match$1 = match[0]; +let match$1 = match[0]; -var match$2 = Belt_Map.get(v3, 10); +let match$2 = Belt_Map.get(v3, 10); b("File \"bs_poly_map_test.res\", line 161, characters 4-11", match$2 !== undefined ? match$2 === 11 : false); -var match$3 = Belt_Map.get(v3, -10); +let match$3 = Belt_Map.get(v3, -10); b("File \"bs_poly_map_test.res\", line 168, characters 4-11", match$3 === undefined); -var match$4 = Belt_Map.get(v4, -10); +let match$4 = Belt_Map.get(v4, -10); b("File \"bs_poly_map_test.res\", line 175, characters 4-11", match$4 !== undefined ? match$4 === 0 : false); -var map = Belt_Map.remove({ +let map = Belt_Map.remove({ cmp: Icmp.cmp, data: undefined }, 0); b("File \"bs_poly_map_test.res\", line 181, characters 4-11", Belt_MapDict.isEmpty(map.data)); -var map$1 = Belt_Map.removeMany({ +let map$1 = Belt_Map.removeMany({ cmp: Icmp.cmp, data: undefined }, [0]); @@ -280,11 +280,11 @@ b("File \"bs_poly_map_test.res\", line 191, characters 4-11", Belt_Array.eq(Belt return prim0 === prim1; }))); -var v7 = Belt_Map.remove(v3, 5000); +let v7 = Belt_Map.remove(v3, 5000); -var match$5 = Belt_Map.split(v7, 5000); +let match$5 = Belt_Map.split(v7, 5000); -var match$6 = match$5[0]; +let match$6 = match$5[0]; b("File \"bs_poly_map_test.res\", line 196, characters 4-11", match$5[1] === undefined); @@ -302,13 +302,13 @@ b("File \"bs_poly_map_test.res\", line 203, characters 4-11", Belt_Array.eq(Belt Mt.from_pair_suites("Bs_poly_map_test", suites.contents); -var M; +let M; -var N; +let N; -var A; +let A; -var I; +let I; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/bs_poly_mutable_map_test.js b/jscomp/test/bs_poly_mutable_map_test.js index 2e4816b6e0..9563788e47 100644 --- a/jscomp/test/bs_poly_mutable_map_test.js +++ b/jscomp/test/bs_poly_mutable_map_test.js @@ -1,20 +1,20 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml = require("../../lib/js/caml.js"); -var Belt_Id = require("../../lib/js/belt_Id.js"); -var Belt_Set = require("../../lib/js/belt_Set.js"); -var Belt_Array = require("../../lib/js/belt_Array.js"); -var Array_data_util = require("./array_data_util.js"); -var Belt_MutableMap = require("../../lib/js/belt_MutableMap.js"); -var Belt_internalAVLtree = require("../../lib/js/belt_internalAVLtree.js"); - -var suites = { +let Mt = require("./mt.js"); +let Caml = require("../../lib/js/caml.js"); +let Belt_Id = require("../../lib/js/belt_Id.js"); +let Belt_Set = require("../../lib/js/belt_Set.js"); +let Belt_Array = require("../../lib/js/belt_Array.js"); +let Array_data_util = require("./array_data_util.js"); +let Belt_MutableMap = require("../../lib/js/belt_MutableMap.js"); +let Belt_internalAVLtree = require("../../lib/js/belt_internalAVLtree.js"); + +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -26,7 +26,7 @@ function b(loc, v) { Mt.bool_suites(test_id, suites, loc, v); } -var Icmp = Belt_Id.comparable(Caml.int_compare); +let Icmp = Belt_Id.comparable(Caml.int_compare); function f(x) { return Belt_MutableMap.fromArray(x, Icmp); @@ -45,7 +45,7 @@ function randomRange(i, j) { })); } -var a0 = Belt_MutableMap.fromArray(randomRange(0, 10), Icmp); +let a0 = Belt_MutableMap.fromArray(randomRange(0, 10), Icmp); Belt_MutableMap.set(a0, 3, 33); @@ -74,7 +74,7 @@ Belt_MutableMap.removeMany(a0, Array_data_util.randomRange(0, 100)); b("File \"bs_poly_mutable_map_test.res\", line 31, characters 4-11", Belt_MutableMap.isEmpty(a0)); -var a0$1 = Belt_MutableMap.fromArray(randomRange(0, 10000), Icmp); +let a0$1 = Belt_MutableMap.fromArray(randomRange(0, 10000), Icmp); Belt_MutableMap.set(a0$1, 2000, 33); @@ -103,13 +103,13 @@ eq("File \"bs_poly_mutable_map_test.res\", line 39, characters 5-12", Belt_inter Mt.from_pair_suites("Bs_poly_mutable_map_test", suites.contents); -var M; +let M; -var N; +let N; -var A; +let A; -var I; +let I; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/bs_poly_mutable_set_test.js b/jscomp/test/bs_poly_mutable_set_test.js index 1dcf4eaf38..191ff290e4 100644 --- a/jscomp/test/bs_poly_mutable_set_test.js +++ b/jscomp/test/bs_poly_mutable_set_test.js @@ -1,20 +1,20 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml = require("../../lib/js/caml.js"); -var Belt_Id = require("../../lib/js/belt_Id.js"); -var Belt_List = require("../../lib/js/belt_List.js"); -var Belt_Array = require("../../lib/js/belt_Array.js"); -var Array_data_util = require("./array_data_util.js"); -var Belt_MutableSet = require("../../lib/js/belt_MutableSet.js"); -var Belt_internalAVLset = require("../../lib/js/belt_internalAVLset.js"); - -var suites = { +let Mt = require("./mt.js"); +let Caml = require("../../lib/js/caml.js"); +let Belt_Id = require("../../lib/js/belt_Id.js"); +let Belt_List = require("../../lib/js/belt_List.js"); +let Belt_Array = require("../../lib/js/belt_Array.js"); +let Array_data_util = require("./array_data_util.js"); +let Belt_MutableSet = require("../../lib/js/belt_MutableSet.js"); +let Belt_internalAVLset = require("../../lib/js/belt_internalAVLset.js"); + +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -26,7 +26,7 @@ function b(loc, x) { Mt.bool_suites(test_id, suites, loc, x); } -var IntCmp = Belt_Id.comparable(Caml.int_compare); +let IntCmp = Belt_Id.comparable(Caml.int_compare); function fromArray(param) { return Belt_MutableSet.fromArray(param, IntCmp); @@ -39,7 +39,7 @@ function empty(param) { }; } -var u = fromArray(Array_data_util.range(0, 30)); +let u = fromArray(Array_data_util.range(0, 30)); b("File \"bs_poly_mutable_set_test.res\", line 16, characters 4-11", Belt_MutableSet.removeCheck(u, 0)); @@ -51,7 +51,7 @@ b("File \"bs_poly_mutable_set_test.res\", line 19, characters 4-11", Belt_Mutabl eq("File \"bs_poly_mutable_set_test.res\", line 20, characters 5-12", Belt_internalAVLset.size(u.data), 28); -var r = Array_data_util.randomRange(0, 30); +let r = Array_data_util.randomRange(0, 30); b("File \"bs_poly_mutable_set_test.res\", line 22, characters 4-11", 29 === Belt_internalAVLset.maxUndefined(u.data)); @@ -59,7 +59,7 @@ b("File \"bs_poly_mutable_set_test.res\", line 23, characters 4-11", 1 === Belt_ Belt_MutableSet.add(u, 3); -for(var i = 0 ,i_finish = r.length; i < i_finish; ++i){ +for(let i = 0 ,i_finish = r.length; i < i_finish; ++i){ Belt_MutableSet.remove(u, r[i]); } @@ -77,7 +77,7 @@ eq("File \"bs_poly_mutable_set_test.res\", line 33, characters 5-12", Belt_inter b("File \"bs_poly_mutable_set_test.res\", line 34, characters 4-11", !Belt_MutableSet.isEmpty(u)); -for(var i$1 = 0; i$1 <= 3; ++i$1){ +for(let i$1 = 0; i$1 <= 3; ++i$1){ Belt_MutableSet.remove(u, i$1); } @@ -115,13 +115,13 @@ Belt_MutableSet.removeMany(u, Array_data_util.randomRange(10000, 30000)); b("File \"bs_poly_mutable_set_test.res\", line 54, characters 4-11", Belt_MutableSet.isEmpty(u)); -var v = fromArray(Array_data_util.randomRange(1000, 2000)); +let v = fromArray(Array_data_util.randomRange(1000, 2000)); -var bs = Belt_Array.map(Array_data_util.randomRange(500, 1499), (function (x) { +let bs = Belt_Array.map(Array_data_util.randomRange(500, 1499), (function (x) { return Belt_MutableSet.removeCheck(v, x); })); -var indeedRemoved = Belt_Array.reduce(bs, 0, (function (acc, x) { +let indeedRemoved = Belt_Array.reduce(bs, 0, (function (acc, x) { if (x) { return acc + 1 | 0; } else { @@ -133,11 +133,11 @@ eq("File \"bs_poly_mutable_set_test.res\", line 67, characters 5-12", indeedRemo eq("File \"bs_poly_mutable_set_test.res\", line 68, characters 5-12", Belt_internalAVLset.size(v.data), 501); -var cs = Belt_Array.map(Array_data_util.randomRange(500, 2000), (function (x) { +let cs = Belt_Array.map(Array_data_util.randomRange(500, 2000), (function (x) { return Belt_MutableSet.addCheck(v, x); })); -var indeedAded = Belt_Array.reduce(cs, 0, (function (acc, x) { +let indeedAded = Belt_Array.reduce(cs, 0, (function (acc, x) { if (x) { return acc + 1 | 0; } else { @@ -180,13 +180,13 @@ eq("File \"bs_poly_mutable_set_test.res\", line 88, characters 5-12", Belt_Mutab eq("File \"bs_poly_mutable_set_test.res\", line 89, characters 5-12", Belt_MutableSet.get(v, 1200), 1200); -var match = Belt_MutableSet.split(v, 1000); +let match = Belt_MutableSet.split(v, 1000); -var match$1 = match[0]; +let match$1 = match[0]; -var bb = match$1[1]; +let bb = match$1[1]; -var aa = match$1[0]; +let aa = match$1[0]; b("File \"bs_poly_mutable_set_test.res\", line 91, characters 4-11", match[1]); @@ -204,17 +204,17 @@ b("File \"bs_poly_mutable_set_test.res\", line 95, characters 4-11", Belt_Mutabl b("File \"bs_poly_mutable_set_test.res\", line 96, characters 4-11", Belt_MutableSet.isEmpty(Belt_MutableSet.intersect(aa, bb))); -var c = Belt_MutableSet.removeCheck(v, 1000); +let c = Belt_MutableSet.removeCheck(v, 1000); b("File \"bs_poly_mutable_set_test.res\", line 98, characters 4-11", c); -var match$2 = Belt_MutableSet.split(v, 1000); +let match$2 = Belt_MutableSet.split(v, 1000); -var match$3 = match$2[0]; +let match$3 = match$2[0]; -var bb$1 = match$3[1]; +let bb$1 = match$3[1]; -var aa$1 = match$3[0]; +let aa$1 = match$3[0]; b("File \"bs_poly_mutable_set_test.res\", line 100, characters 4-11", !match$2[1]); @@ -232,17 +232,17 @@ b("File \"bs_poly_mutable_set_test.res\", line 104, characters 4-11", Belt_Mutab b("File \"bs_poly_mutable_set_test.res\", line 105, characters 4-11", Belt_MutableSet.isEmpty(Belt_MutableSet.intersect(aa$1, bb$1))); -var aa$2 = fromArray(Array_data_util.randomRange(0, 100)); +let aa$2 = fromArray(Array_data_util.randomRange(0, 100)); -var bb$2 = fromArray(Array_data_util.randomRange(40, 120)); +let bb$2 = fromArray(Array_data_util.randomRange(40, 120)); -var cc = Belt_MutableSet.union(aa$2, bb$2); +let cc = Belt_MutableSet.union(aa$2, bb$2); b("File \"bs_poly_mutable_set_test.res\", line 115, characters 4-11", Belt_MutableSet.eq(cc, fromArray(Array_data_util.randomRange(0, 120)))); b("File \"bs_poly_mutable_set_test.res\", line 118, characters 4-11", Belt_MutableSet.eq(Belt_MutableSet.union(fromArray(Array_data_util.randomRange(0, 20)), fromArray(Array_data_util.randomRange(21, 40))), fromArray(Array_data_util.randomRange(0, 40)))); -var dd = Belt_MutableSet.intersect(aa$2, bb$2); +let dd = Belt_MutableSet.intersect(aa$2, bb$2); b("File \"bs_poly_mutable_set_test.res\", line 122, characters 4-11", Belt_MutableSet.eq(dd, fromArray(Array_data_util.randomRange(40, 100)))); @@ -285,23 +285,23 @@ b("File \"bs_poly_mutable_set_test.res\", line 142, characters 4-11", Belt_Mutab b("File \"bs_poly_mutable_set_test.res\", line 150, characters 4-11", Belt_MutableSet.eq(Belt_MutableSet.diff(fromArray(Array_data_util.randomRange(0, 20)), fromArray(Array_data_util.randomRange(0, 40))), fromArray(Array_data_util.randomRange(0, -1)))); -var a0 = fromArray(Array_data_util.randomRange(0, 1000)); +let a0 = fromArray(Array_data_util.randomRange(0, 1000)); -var a1 = Belt_MutableSet.keep(a0, (function (x) { +let a1 = Belt_MutableSet.keep(a0, (function (x) { return x % 2 === 0; })); -var a2 = Belt_MutableSet.keep(a0, (function (x) { +let a2 = Belt_MutableSet.keep(a0, (function (x) { return x % 2 !== 0; })); -var match$4 = Belt_MutableSet.partition(a0, (function (x) { +let match$4 = Belt_MutableSet.partition(a0, (function (x) { return x % 2 === 0; })); -var a4 = match$4[1]; +let a4 = match$4[1]; -var a3 = match$4[0]; +let a3 = match$4[0]; b("File \"bs_poly_mutable_set_test.res\", line 162, characters 4-11", Belt_MutableSet.eq(a1, a3)); @@ -328,19 +328,19 @@ Belt_List.forEach({ Mt.from_pair_suites("Bs_poly_mutable_set_test", suites.contents); -var N; +let N; -var I; +let I; -var A; +let A; -var L; +let L; -var $plus$plus = Belt_MutableSet.union; +let $plus$plus = Belt_MutableSet.union; -var f = fromArray; +let f = fromArray; -var $eq$tilde = Belt_MutableSet.eq; +let $eq$tilde = Belt_MutableSet.eq; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/bs_poly_set_test.js b/jscomp/test/bs_poly_set_test.js index 1a76db7941..ce833839b9 100644 --- a/jscomp/test/bs_poly_set_test.js +++ b/jscomp/test/bs_poly_set_test.js @@ -1,22 +1,22 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml = require("../../lib/js/caml.js"); -var Belt_Id = require("../../lib/js/belt_Id.js"); -var Belt_Set = require("../../lib/js/belt_Set.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Belt_List = require("../../lib/js/belt_List.js"); -var Belt_Array = require("../../lib/js/belt_Array.js"); -var Belt_SetDict = require("../../lib/js/belt_SetDict.js"); -var Belt_SortArray = require("../../lib/js/belt_SortArray.js"); -var Array_data_util = require("./array_data_util.js"); - -var suites = { +let Mt = require("./mt.js"); +let Caml = require("../../lib/js/caml.js"); +let Belt_Id = require("../../lib/js/belt_Id.js"); +let Belt_Set = require("../../lib/js/belt_Set.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Belt_List = require("../../lib/js/belt_List.js"); +let Belt_Array = require("../../lib/js/belt_Array.js"); +let Belt_SetDict = require("../../lib/js/belt_SetDict.js"); +let Belt_SortArray = require("../../lib/js/belt_SortArray.js"); +let Array_data_util = require("./array_data_util.js"); + +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -32,53 +32,53 @@ function t(loc, x) { Mt.throw_suites(test_id, suites, loc, x); } -var IntCmp = Belt_Id.comparable(Caml.int_compare); +let IntCmp = Belt_Id.comparable(Caml.int_compare); -var u0 = Belt_Set.fromArray(Array_data_util.range(0, 30), IntCmp); +let u0 = Belt_Set.fromArray(Array_data_util.range(0, 30), IntCmp); -var u1 = Belt_Set.remove(u0, 0); +let u1 = Belt_Set.remove(u0, 0); -var u2 = Belt_Set.remove(u1, 0); +let u2 = Belt_Set.remove(u1, 0); -var u3 = Belt_Set.remove(u2, 30); +let u3 = Belt_Set.remove(u2, 30); -var u4 = Belt_Set.remove(u3, 20); +let u4 = Belt_Set.remove(u3, 20); -var r = Array_data_util.randomRange(0, 30); +let r = Array_data_util.randomRange(0, 30); -var u5 = Belt_Set.add(u4, 3); +let u5 = Belt_Set.add(u4, 3); -var u6 = Belt_Set.removeMany(u5, r); +let u6 = Belt_Set.removeMany(u5, r); -var u7 = Belt_Set.mergeMany(u6, [ +let u7 = Belt_Set.mergeMany(u6, [ 0, 1, 2, 0 ]); -var u8 = Belt_Set.removeMany(u7, [ +let u8 = Belt_Set.removeMany(u7, [ 0, 1, 2, 3 ]); -var u9 = Belt_Set.mergeMany(u8, Array_data_util.randomRange(0, 20000)); +let u9 = Belt_Set.mergeMany(u8, Array_data_util.randomRange(0, 20000)); -var u10 = Belt_Set.mergeMany(u9, Array_data_util.randomRange(0, 200)); +let u10 = Belt_Set.mergeMany(u9, Array_data_util.randomRange(0, 200)); -var u11 = Belt_Set.removeMany(u10, Array_data_util.randomRange(0, 200)); +let u11 = Belt_Set.removeMany(u10, Array_data_util.randomRange(0, 200)); -var u12 = Belt_Set.removeMany(u11, Array_data_util.randomRange(0, 1000)); +let u12 = Belt_Set.removeMany(u11, Array_data_util.randomRange(0, 1000)); -var u13 = Belt_Set.removeMany(u12, Array_data_util.randomRange(0, 1000)); +let u13 = Belt_Set.removeMany(u12, Array_data_util.randomRange(0, 1000)); -var u14 = Belt_Set.removeMany(u13, Array_data_util.randomRange(1000, 10000)); +let u14 = Belt_Set.removeMany(u13, Array_data_util.randomRange(1000, 10000)); -var u15 = Belt_Set.removeMany(u14, Array_data_util.randomRange(10000, 19999)); +let u15 = Belt_Set.removeMany(u14, Array_data_util.randomRange(10000, 19999)); -var u16 = Belt_Set.removeMany(u15, Array_data_util.randomRange(20000, 21000)); +let u16 = Belt_Set.removeMany(u15, Array_data_util.randomRange(20000, 21000)); b("File \"bs_poly_set_test.res\", line 34, characters 4-11", u0 !== u1); @@ -122,38 +122,38 @@ b("File \"bs_poly_set_test.res\", line 56, characters 4-11", !Belt_Set.has(u15, b("File \"bs_poly_set_test.res\", line 57, characters 4-11", Belt_SetDict.isEmpty(u16.data)); -var u17 = Belt_Set.fromArray(Array_data_util.randomRange(0, 100), IntCmp); +let u17 = Belt_Set.fromArray(Array_data_util.randomRange(0, 100), IntCmp); -var u18 = Belt_Set.fromArray(Array_data_util.randomRange(59, 200), IntCmp); +let u18 = Belt_Set.fromArray(Array_data_util.randomRange(59, 200), IntCmp); -var u19 = Belt_Set.union(u17, u18); +let u19 = Belt_Set.union(u17, u18); -var u20 = Belt_Set.fromArray(Array_data_util.randomRange(0, 200), IntCmp); +let u20 = Belt_Set.fromArray(Array_data_util.randomRange(0, 200), IntCmp); -var u21 = Belt_Set.intersect(u17, u18); +let u21 = Belt_Set.intersect(u17, u18); -var u22 = Belt_Set.diff(u17, u18); +let u22 = Belt_Set.diff(u17, u18); -var u23 = Belt_Set.diff(u18, u17); +let u23 = Belt_Set.diff(u18, u17); -var u24 = Belt_Set.union(u18, u17); +let u24 = Belt_Set.union(u18, u17); -var u25 = Belt_Set.add(u22, 59); +let u25 = Belt_Set.add(u22, 59); -var u26 = Belt_Set.add({ +let u26 = Belt_Set.add({ cmp: IntCmp.cmp, data: undefined }, 3); -var ss = Belt_Array.makeByAndShuffle(100, (function (i) { +let ss = Belt_Array.makeByAndShuffle(100, (function (i) { return (i << 1); })); -var u27 = Belt_Set.fromArray(ss, IntCmp); +let u27 = Belt_Set.fromArray(ss, IntCmp); -var u28 = Belt_Set.union(u27, u26); +let u28 = Belt_Set.union(u27, u26); -var u29 = Belt_Set.union(u26, u27); +let u29 = Belt_Set.union(u26, u27); b("File \"bs_poly_set_test.res\", line 71, characters 4-11", Belt_Set.eq(u28, u29)); @@ -196,7 +196,7 @@ b("File \"bs_poly_set_test.res\", line 90, characters 4-11", Belt_SetDict.minUnd b("File \"bs_poly_set_test.res\", line 91, characters 4-11", Belt_SetDict.maxUndefined(undefined) === undefined); function testIterToList(xs) { - var v = { + let v = { contents: /* [] */0 }; Belt_Set.forEach(xs, (function (x) { @@ -209,7 +209,7 @@ function testIterToList(xs) { } function testIterToList2(xs) { - var v = { + let v = { contents: /* [] */0 }; Belt_SetDict.forEach(xs.data, (function (x) { @@ -221,11 +221,11 @@ function testIterToList2(xs) { return Belt_List.reverse(v.contents); } -var u0$1 = Belt_Set.fromArray(Array_data_util.randomRange(0, 20), IntCmp); +let u0$1 = Belt_Set.fromArray(Array_data_util.randomRange(0, 20), IntCmp); -var u1$1 = Belt_Set.remove(u0$1, 17); +let u1$1 = Belt_Set.remove(u0$1, 17); -var u2$1 = Belt_Set.add(u1$1, 33); +let u2$1 = Belt_Set.add(u1$1, 33); b("File \"bs_poly_set_test.res\", line 110, characters 4-11", Belt_List.every2(testIterToList(u0$1), Belt_List.makeBy(21, (function (i) { return i; @@ -275,23 +275,23 @@ b("File \"bs_poly_set_test.res\", line 119, characters 4-11", Belt_Set.cmp(u1$1, b("File \"bs_poly_set_test.res\", line 120, characters 4-11", Belt_Set.cmp(u0$1, u1$1) > 0); -var a0 = Belt_Set.fromArray(Array_data_util.randomRange(0, 1000), IntCmp); +let a0 = Belt_Set.fromArray(Array_data_util.randomRange(0, 1000), IntCmp); -var a1 = Belt_Set.keep(a0, (function (x) { +let a1 = Belt_Set.keep(a0, (function (x) { return x % 2 === 0; })); -var a2 = Belt_Set.keep(a0, (function (x) { +let a2 = Belt_Set.keep(a0, (function (x) { return x % 2 !== 0; })); -var match = Belt_Set.partition(a0, (function (x) { +let match = Belt_Set.partition(a0, (function (x) { return x % 2 === 0; })); -var a4 = match[1]; +let a4 = match[1]; -var a3 = match[0]; +let a3 = match[0]; b("File \"bs_poly_set_test.res\", line 127, characters 4-11", Belt_Set.eq(a1, a3)); @@ -313,9 +313,9 @@ eq("File \"bs_poly_set_test.res\", line 133, characters 5-12", Belt_SetDict.size b("File \"bs_poly_set_test.res\", line 134, characters 4-11", !Belt_SetDict.isEmpty(a0.data)); -var match$1 = Belt_Set.split(a0, 200); +let match$1 = Belt_Set.split(a0, 200); -var match$2 = match$1[0]; +let match$2 = match$1[0]; b("File \"bs_poly_set_test.res\", line 136, characters 4-11", match$1[1]); @@ -327,15 +327,15 @@ eq("File \"bs_poly_set_test.res\", line 138, characters 5-12", Belt_SetDict.toLi return i + 201 | 0; }))); -var a7 = Belt_Set.remove(a0, 200); +let a7 = Belt_Set.remove(a0, 200); -var match$3 = Belt_Set.split(a7, 200); +let match$3 = Belt_Set.split(a7, 200); -var match$4 = match$3[0]; +let match$4 = match$3[0]; -var a9 = match$4[1]; +let a9 = match$4[1]; -var a8 = match$4[0]; +let a8 = match$4[0]; b("File \"bs_poly_set_test.res\", line 141, characters 4-11", !match$3[1]); @@ -370,20 +370,20 @@ Belt_List.forEach({ Belt_SetDict.checkInvariantInternal(x.data); })); -var a = Belt_Set.fromArray([], IntCmp); +let a = Belt_Set.fromArray([], IntCmp); -var m = Belt_Set.keep(a, (function (x) { +let m = Belt_Set.keep(a, (function (x) { return x % 2 === 0; })); b("File \"bs_poly_set_test.res\", line 151, characters 4-11", Belt_SetDict.isEmpty(m.data)); -var match$5 = Belt_Set.split({ +let match$5 = Belt_Set.split({ cmp: IntCmp.cmp, data: undefined }, 0); -var match$6 = match$5[0]; +let match$6 = match$5[0]; b("File \"bs_poly_set_test.res\", line 156, characters 4-11", Belt_SetDict.isEmpty(match$6[0].data)); @@ -393,17 +393,17 @@ b("File \"bs_poly_set_test.res\", line 158, characters 4-11", !match$5[1]); Mt.from_pair_suites("Bs_poly_set_test", suites.contents); -var N; +let N; -var D; +let D; -var I; +let I; -var A; +let A; -var S; +let S; -var L; +let L; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/bs_qualified.js b/jscomp/test/bs_qualified.js index af827d2232..28491a3ee5 100644 --- a/jscomp/test/bs_qualified.js +++ b/jscomp/test/bs_qualified.js @@ -1,10 +1,10 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var ZZ = require("X"); -var Z = require("z"); -var Vscode = require("vscode"); -var GlMatrix = require("gl-matrix"); +let ZZ = require("X"); +let Z = require("z"); +let Vscode = require("vscode"); +let GlMatrix = require("gl-matrix"); function f(a, b, c) { Vscode.commands.executeCommands("hi", a, b, c); diff --git a/jscomp/test/bs_queue_test.js b/jscomp/test/bs_queue_test.js index f45e5ce2a2..952013e908 100644 --- a/jscomp/test/bs_queue_test.js +++ b/jscomp/test/bs_queue_test.js @@ -1,17 +1,17 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Curry = require("../../lib/js/curry.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Belt_Array = require("../../lib/js/belt_Array.js"); -var Belt_MutableQueue = require("../../lib/js/belt_MutableQueue.js"); +let Mt = require("./mt.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Belt_Array = require("../../lib/js/belt_Array.js"); +let Belt_MutableQueue = require("../../lib/js/belt_MutableQueue.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -38,7 +38,7 @@ function $plus$plus(q, x) { return q; } -var q = { +let q = { length: 0, first: undefined, last: undefined @@ -231,7 +231,7 @@ if (!does_raise(Belt_MutableQueue.popExn, q)) { }; } -var q$1 = { +let q$1 = { length: 0, first: undefined, last: undefined @@ -297,7 +297,7 @@ if (q$1.length !== 0) { }; } -var q$2 = { +let q$2 = { length: 0, first: undefined, last: undefined @@ -435,13 +435,13 @@ if (!does_raise(Belt_MutableQueue.peekExn, q$2)) { }; } -var q$3 = { +let q$3 = { length: 0, first: undefined, last: undefined }; -for(var i = 1; i <= 10; ++i){ +for(let i = 1; i <= 10; ++i){ Belt_MutableQueue.add(q$3, i); } @@ -501,17 +501,17 @@ if (Belt_MutableQueue.popExn(q$3) !== 42) { }; } -var q1 = { +let q1 = { length: 0, first: undefined, last: undefined }; -for(var i$1 = 1; i$1 <= 10; ++i$1){ +for(let i$1 = 1; i$1 <= 10; ++i$1){ Belt_MutableQueue.add(q1, i$1); } -var q2 = Belt_MutableQueue.copy(q1); +let q2 = Belt_MutableQueue.copy(q1); if (!Caml_obj.equal(Belt_MutableQueue.toArray(q1), [ 1, @@ -583,7 +583,7 @@ if (q2.length !== 10) { }; } -for(var i$2 = 1; i$2 <= 10; ++i$2){ +for(let i$2 = 1; i$2 <= 10; ++i$2){ if (Belt_MutableQueue.popExn(q1) !== i$2) { throw { RE_EXN_ID: "Assert_failure", @@ -598,7 +598,7 @@ for(var i$2 = 1; i$2 <= 10; ++i$2){ } -for(var i$3 = 1; i$3 <= 10; ++i$3){ +for(let i$3 = 1; i$3 <= 10; ++i$3){ if (Belt_MutableQueue.popExn(q2) !== i$3) { throw { RE_EXN_ID: "Assert_failure", @@ -613,7 +613,7 @@ for(var i$3 = 1; i$3 <= 10; ++i$3){ } -var q$4 = { +let q$4 = { length: 0, first: undefined, last: undefined @@ -631,7 +631,7 @@ if (q$4.length !== 0) { }; } -for(var i$4 = 1; i$4 <= 10; ++i$4){ +for(let i$4 = 1; i$4 <= 10; ++i$4){ Belt_MutableQueue.add(q$4, i$4); if (q$4.length !== i$4) { throw { @@ -658,7 +658,7 @@ for(var i$4 = 1; i$4 <= 10; ++i$4){ } -for(var i$5 = 10; i$5 >= 1; --i$5){ +for(let i$5 = 10; i$5 >= 1; --i$5){ if (q$4.length !== i$5) { throw { RE_EXN_ID: "Assert_failure", @@ -708,17 +708,17 @@ if (q$4.length !== 0) { }; } -var q$5 = { +let q$5 = { length: 0, first: undefined, last: undefined }; -for(var i$6 = 1; i$6 <= 10; ++i$6){ +for(let i$6 = 1; i$6 <= 10; ++i$6){ Belt_MutableQueue.add(q$5, i$6); } -var i$7 = { +let i$7 = { contents: 1 }; @@ -737,13 +737,13 @@ Belt_MutableQueue.forEach(q$5, (function (j) { i$7.contents = i$7.contents + 1 | 0; })); -var q1$1 = { +let q1$1 = { length: 0, first: undefined, last: undefined }; -var q2$1 = { +let q2$1 = { length: 0, first: undefined, last: undefined @@ -847,19 +847,19 @@ if (!Caml_obj.equal(Belt_MutableQueue.toArray(q2$1), [])) { }; } -var q1$2 = { +let q1$2 = { length: 0, first: undefined, last: undefined }; -var q2$2 = { +let q2$2 = { length: 0, first: undefined, last: undefined }; -for(var i$8 = 1; i$8 <= 4; ++i$8){ +for(let i$8 = 1; i$8 <= 4; ++i$8){ Belt_MutableQueue.add(q1$2, i$8); } @@ -971,19 +971,19 @@ if (!Caml_obj.equal(Belt_MutableQueue.toArray(q2$2), [ }; } -var q1$3 = { +let q1$3 = { length: 0, first: undefined, last: undefined }; -var q2$3 = { +let q2$3 = { length: 0, first: undefined, last: undefined }; -for(var i$9 = 5; i$9 <= 8; ++i$9){ +for(let i$9 = 5; i$9 <= 8; ++i$9){ Belt_MutableQueue.add(q2$3, i$9); } @@ -1095,23 +1095,23 @@ if (!Caml_obj.equal(Belt_MutableQueue.toArray(q2$3), [ }; } -var q1$4 = { +let q1$4 = { length: 0, first: undefined, last: undefined }; -var q2$4 = { +let q2$4 = { length: 0, first: undefined, last: undefined }; -for(var i$10 = 1; i$10 <= 4; ++i$10){ +for(let i$10 = 1; i$10 <= 4; ++i$10){ Belt_MutableQueue.add(q1$4, i$10); } -for(var i$11 = 5; i$11 <= 8; ++i$11){ +for(let i$11 = 5; i$11 <= 8; ++i$11){ Belt_MutableQueue.add(q2$4, i$11); } @@ -1199,7 +1199,7 @@ if (!Caml_obj.equal(Belt_MutableQueue.toArray(q1$4), [])) { }; } -var v = [ +let v = [ 5, 6, 7, @@ -1252,14 +1252,14 @@ if (Belt_MutableQueue.reduce(q2$4, 0, (function (x, y) { console.log("OK"); -var q$6 = Belt_MutableQueue.fromArray([ +let q$6 = Belt_MutableQueue.fromArray([ 1, 2, 3, 4 ]); -var q1$5 = Belt_MutableQueue.map(q$6, (function (x) { +let q1$5 = Belt_MutableQueue.map(q$6, (function (x) { return x - 1 | 0; })); @@ -1270,11 +1270,11 @@ eq("File \"bs_queue_test.res\", line 197, characters 5-12", Belt_MutableQueue.to 3 ]); -var q$7 = Belt_MutableQueue.fromArray([]); +let q$7 = Belt_MutableQueue.fromArray([]); b("File \"bs_queue_test.res\", line 198, characters 4-11", q$7.length === 0); -var q$8 = Belt_MutableQueue.map(Belt_MutableQueue.fromArray([]), (function (x) { +let q$8 = Belt_MutableQueue.map(Belt_MutableQueue.fromArray([]), (function (x) { return x + 1 | 0; })); @@ -1282,7 +1282,7 @@ b("File \"bs_queue_test.res\", line 199, characters 4-11", q$8.length === 0); Mt.from_pair_suites("Bs_queue_test", suites.contents); -var Q; +let Q; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/bs_rbset_int_bench.js b/jscomp/test/bs_rbset_int_bench.js index baff8a0d8d..1e013f250d 100644 --- a/jscomp/test/bs_rbset_int_bench.js +++ b/jscomp/test/bs_rbset_int_bench.js @@ -1,17 +1,17 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Rbset = require("./rbset.js"); +let Rbset = require("./rbset.js"); function bench(param) { - var data = "Empty"; + let data = "Empty"; console.time("bs_rbset_int_bench.res 6"); - for(var i = 0; i <= 1000000; ++i){ + for(let i = 0; i <= 1000000; ++i){ data = Rbset.add(i, data); } console.timeEnd("bs_rbset_int_bench.res 6"); console.time("bs_rbset_int_bench.res 11"); - for(var i$1 = 0; i$1 <= 1000000; ++i$1){ + for(let i$1 = 0; i$1 <= 1000000; ++i$1){ if (!Rbset.mem(i$1, data)) { throw { RE_EXN_ID: "Assert_failure", @@ -27,7 +27,7 @@ function bench(param) { } console.timeEnd("bs_rbset_int_bench.res 11"); console.time("bs_rbset_int_bench.res 16"); - for(var i$2 = 0; i$2 <= 1000000; ++i$2){ + for(let i$2 = 0; i$2 <= 1000000; ++i$2){ data = Rbset.remove(i$2, data); } console.timeEnd("bs_rbset_int_bench.res 16"); @@ -51,9 +51,9 @@ bench(); console.timeEnd("bs_rbset_int_bench.res 24"); -var count = 1000000; +let count = 1000000; -var V; +let V; exports.count = count; exports.V = V; diff --git a/jscomp/test/bs_rest_test.js b/jscomp/test/bs_rest_test.js index 23f13954af..c982367412 100644 --- a/jscomp/test/bs_rest_test.js +++ b/jscomp/test/bs_rest_test.js @@ -7,15 +7,15 @@ function x(v){return [v]} x("3"); -var v = x(3); +let v = x(3); function xxx(prim) { return x(prim); } -var u = x(3); +let u = x(3); -var xx = x("3"); +let xx = x("3"); exports.v = v; exports.xxx = xxx; diff --git a/jscomp/test/bs_set_bench.js b/jscomp/test/bs_set_bench.js index 61a57afab9..9c4f63def7 100644 --- a/jscomp/test/bs_set_bench.js +++ b/jscomp/test/bs_set_bench.js @@ -1,17 +1,17 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Belt_SetInt = require("../../lib/js/belt_SetInt.js"); +let Belt_SetInt = require("../../lib/js/belt_SetInt.js"); function bench(param) { - var data; + let data; console.time("bs_set_bench.res 6"); - for(var i = 0; i <= 1000000; ++i){ + for(let i = 0; i <= 1000000; ++i){ data = Belt_SetInt.add(data, i); } console.timeEnd("bs_set_bench.res 6"); console.time("bs_set_bench.res 11"); - for(var i$1 = 0; i$1 <= 1000000; ++i$1){ + for(let i$1 = 0; i$1 <= 1000000; ++i$1){ if (!Belt_SetInt.has(data, i$1)) { throw { RE_EXN_ID: "Assert_failure", @@ -27,7 +27,7 @@ function bench(param) { } console.timeEnd("bs_set_bench.res 11"); console.time("bs_set_bench.res 16"); - for(var i$2 = 0; i$2 <= 1000000; ++i$2){ + for(let i$2 = 0; i$2 <= 1000000; ++i$2){ data = Belt_SetInt.remove(data, i$2); } console.timeEnd("bs_set_bench.res 16"); @@ -51,9 +51,9 @@ bench(); console.timeEnd("bs_set_bench.res 24"); -var count = 1000000; +let count = 1000000; -var N; +let N; exports.count = count; exports.N = N; diff --git a/jscomp/test/bs_set_int_test.js b/jscomp/test/bs_set_int_test.js index 3e86d1feb4..80039fd7d5 100644 --- a/jscomp/test/bs_set_int_test.js +++ b/jscomp/test/bs_set_int_test.js @@ -1,18 +1,18 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var List = require("../../lib/js/list.js"); -var $$Array = require("../../lib/js/array.js"); -var Belt_Array = require("../../lib/js/belt_Array.js"); -var Belt_SetInt = require("../../lib/js/belt_SetInt.js"); -var Array_data_util = require("./array_data_util.js"); - -var suites = { +let Mt = require("./mt.js"); +let List = require("../../lib/js/list.js"); +let $$Array = require("../../lib/js/array.js"); +let Belt_Array = require("../../lib/js/belt_Array.js"); +let Belt_SetInt = require("../../lib/js/belt_SetInt.js"); +let Array_data_util = require("./array_data_util.js"); + +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -42,7 +42,7 @@ b("File \"bs_set_int_test.res\", line 21, characters 11-18", $eq$star([ 1 ])); -var u = Belt_SetInt.intersect(Belt_SetInt.fromArray([ +let u = Belt_SetInt.intersect(Belt_SetInt.fromArray([ 1, 2, 3 @@ -66,21 +66,21 @@ function revRange(i, j) { }))))); } -var v = Belt_SetInt.fromArray($$Array.append(range(100, 1000), revRange(400, 1500))); +let v = Belt_SetInt.fromArray($$Array.append(range(100, 1000), revRange(400, 1500))); -var i = range(100, 1500); +let i = range(100, 1500); b("File \"bs_set_int_test.res\", line 37, characters 4-11", Belt_SetInt.eq(Belt_SetInt.fromArray(i), v)); -var match = Belt_SetInt.partition(v, (function (x) { +let match = Belt_SetInt.partition(v, (function (x) { return x % 3 === 0; })); -var l; +let l; -var r; +let r; -for(var i$1 = 100; i$1 <= 1500; ++i$1){ +for(let i$1 = 100; i$1 <= 1500; ++i$1){ if (i$1 % 3 === 0) { l = Belt_SetInt.add(l, i$1); } else { @@ -88,51 +88,51 @@ for(var i$1 = 100; i$1 <= 1500; ++i$1){ } } -var nl = l; +let nl = l; -var nr = r; +let nr = r; b("File \"bs_set_int_test.res\", line 50, characters 4-11", Belt_SetInt.eq(match[0], nl)); b("File \"bs_set_int_test.res\", line 51, characters 4-11", Belt_SetInt.eq(match[1], nr)); -var i$2 = range(50, 100); +let i$2 = range(50, 100); -var s = Belt_SetInt.intersect(Belt_SetInt.fromArray(range(1, 100)), Belt_SetInt.fromArray(range(50, 200))); +let s = Belt_SetInt.intersect(Belt_SetInt.fromArray(range(1, 100)), Belt_SetInt.fromArray(range(50, 200))); b("File \"bs_set_int_test.res\", line 55, characters 2-9", Belt_SetInt.eq(Belt_SetInt.fromArray(i$2), s)); -var i$3 = range(1, 200); +let i$3 = range(1, 200); -var s$1 = Belt_SetInt.union(Belt_SetInt.fromArray(range(1, 100)), Belt_SetInt.fromArray(range(50, 200))); +let s$1 = Belt_SetInt.union(Belt_SetInt.fromArray(range(1, 100)), Belt_SetInt.fromArray(range(50, 200))); b("File \"bs_set_int_test.res\", line 66, characters 2-9", Belt_SetInt.eq(Belt_SetInt.fromArray(i$3), s$1)); -var i$4 = range(1, 49); +let i$4 = range(1, 49); -var s$2 = Belt_SetInt.diff(Belt_SetInt.fromArray(range(1, 100)), Belt_SetInt.fromArray(range(50, 200))); +let s$2 = Belt_SetInt.diff(Belt_SetInt.fromArray(range(1, 100)), Belt_SetInt.fromArray(range(50, 200))); b("File \"bs_set_int_test.res\", line 77, characters 2-9", Belt_SetInt.eq(Belt_SetInt.fromArray(i$4), s$2)); -var i$5 = revRange(50, 100); +let i$5 = revRange(50, 100); -var s$3 = Belt_SetInt.intersect(Belt_SetInt.fromArray(revRange(1, 100)), Belt_SetInt.fromArray(revRange(50, 200))); +let s$3 = Belt_SetInt.intersect(Belt_SetInt.fromArray(revRange(1, 100)), Belt_SetInt.fromArray(revRange(50, 200))); b("File \"bs_set_int_test.res\", line 88, characters 2-9", Belt_SetInt.eq(Belt_SetInt.fromArray(i$5), s$3)); -var i$6 = revRange(1, 200); +let i$6 = revRange(1, 200); -var s$4 = Belt_SetInt.union(Belt_SetInt.fromArray(revRange(1, 100)), Belt_SetInt.fromArray(revRange(50, 200))); +let s$4 = Belt_SetInt.union(Belt_SetInt.fromArray(revRange(1, 100)), Belt_SetInt.fromArray(revRange(50, 200))); b("File \"bs_set_int_test.res\", line 99, characters 2-9", Belt_SetInt.eq(Belt_SetInt.fromArray(i$6), s$4)); -var i$7 = revRange(1, 49); +let i$7 = revRange(1, 49); -var s$5 = Belt_SetInt.diff(Belt_SetInt.fromArray(revRange(1, 100)), Belt_SetInt.fromArray(revRange(50, 200))); +let s$5 = Belt_SetInt.diff(Belt_SetInt.fromArray(revRange(1, 100)), Belt_SetInt.fromArray(revRange(50, 200))); b("File \"bs_set_int_test.res\", line 110, characters 2-9", Belt_SetInt.eq(Belt_SetInt.fromArray(i$7), s$5)); -var ss = [ +let ss = [ 1, 222, 3, @@ -143,7 +143,7 @@ var ss = [ -1 ]; -var v$1 = Belt_SetInt.fromArray([ +let v$1 = Belt_SetInt.fromArray([ 1, 222, 3, @@ -154,9 +154,9 @@ var v$1 = Belt_SetInt.fromArray([ -1 ]); -var minv = Belt_SetInt.minUndefined(v$1); +let minv = Belt_SetInt.minUndefined(v$1); -var maxv = Belt_SetInt.maxUndefined(v$1); +let maxv = Belt_SetInt.maxUndefined(v$1); function approx(loc, x, y) { b(loc, x === y); @@ -172,73 +172,73 @@ approx("File \"bs_set_int_test.res\", line 126, characters 9-16", -1, minv); approx("File \"bs_set_int_test.res\", line 127, characters 9-16", 222, maxv); -var v$2 = Belt_SetInt.remove(v$1, 3); +let v$2 = Belt_SetInt.remove(v$1, 3); -var minv$1 = Belt_SetInt.minimum(v$2); +let minv$1 = Belt_SetInt.minimum(v$2); -var maxv$1 = Belt_SetInt.maximum(v$2); +let maxv$1 = Belt_SetInt.maximum(v$2); eq("File \"bs_set_int_test.res\", line 130, characters 5-12", minv$1, -1); eq("File \"bs_set_int_test.res\", line 131, characters 5-12", maxv$1, 222); -var v$3 = Belt_SetInt.remove(v$2, 222); +let v$3 = Belt_SetInt.remove(v$2, 222); -var minv$2 = Belt_SetInt.minimum(v$3); +let minv$2 = Belt_SetInt.minimum(v$3); -var maxv$2 = Belt_SetInt.maximum(v$3); +let maxv$2 = Belt_SetInt.maximum(v$3); eq("File \"bs_set_int_test.res\", line 134, characters 5-12", minv$2, -1); eq("File \"bs_set_int_test.res\", line 135, characters 5-12", maxv$2, 33); -var v$4 = Belt_SetInt.remove(v$3, -1); +let v$4 = Belt_SetInt.remove(v$3, -1); -var minv$3 = Belt_SetInt.minimum(v$4); +let minv$3 = Belt_SetInt.minimum(v$4); -var maxv$3 = Belt_SetInt.maximum(v$4); +let maxv$3 = Belt_SetInt.maximum(v$4); eq("File \"bs_set_int_test.res\", line 138, characters 5-12", minv$3, 0); eq("File \"bs_set_int_test.res\", line 139, characters 5-12", maxv$3, 33); -var v$5 = Belt_SetInt.remove(v$4, 0); +let v$5 = Belt_SetInt.remove(v$4, 0); -var v$6 = Belt_SetInt.remove(v$5, 33); +let v$6 = Belt_SetInt.remove(v$5, 33); -var v$7 = Belt_SetInt.remove(v$6, 2); +let v$7 = Belt_SetInt.remove(v$6, 2); -var v$8 = Belt_SetInt.remove(v$7, 3); +let v$8 = Belt_SetInt.remove(v$7, 3); -var v$9 = Belt_SetInt.remove(v$8, 4); +let v$9 = Belt_SetInt.remove(v$8, 4); -var v$10 = Belt_SetInt.remove(v$9, 1); +let v$10 = Belt_SetInt.remove(v$9, 1); b("File \"bs_set_int_test.res\", line 146, characters 4-11", Belt_SetInt.isEmpty(v$10)); -var v$11 = Belt_Array.makeByAndShuffle(1000000, (function (i) { +let v$11 = Belt_Array.makeByAndShuffle(1000000, (function (i) { return i; })); -var u$1 = Belt_SetInt.fromArray(v$11); +let u$1 = Belt_SetInt.fromArray(v$11); Belt_SetInt.checkInvariantInternal(u$1); -var firstHalf = Belt_Array.slice(v$11, 0, 2000); +let firstHalf = Belt_Array.slice(v$11, 0, 2000); -var xx = Belt_Array.reduce(firstHalf, u$1, Belt_SetInt.remove); +let xx = Belt_Array.reduce(firstHalf, u$1, Belt_SetInt.remove); Belt_SetInt.checkInvariantInternal(u$1); b("File \"bs_set_int_test.res\", line 158, characters 4-11", Belt_SetInt.eq(Belt_SetInt.union(Belt_SetInt.fromArray(firstHalf), xx), u$1)); -var aa = Belt_SetInt.fromArray(Array_data_util.randomRange(0, 100)); +let aa = Belt_SetInt.fromArray(Array_data_util.randomRange(0, 100)); -var bb = Belt_SetInt.fromArray(Array_data_util.randomRange(0, 200)); +let bb = Belt_SetInt.fromArray(Array_data_util.randomRange(0, 200)); -var cc = Belt_SetInt.fromArray(Array_data_util.randomRange(120, 200)); +let cc = Belt_SetInt.fromArray(Array_data_util.randomRange(120, 200)); -var dd = Belt_SetInt.union(aa, cc); +let dd = Belt_SetInt.union(aa, cc); b("File \"bs_set_int_test.res\", line 171, characters 4-11", Belt_SetInt.subset(aa, bb)); @@ -252,15 +252,15 @@ b("File \"bs_set_int_test.res\", line 175, characters 4-11", Belt_SetInt.add(dd, b("File \"bs_set_int_test.res\", line 176, characters 4-11", !Belt_SetInt.subset(Belt_SetInt.add(dd, 201), bb)); -var aa$1 = Belt_SetInt.fromArray(Array_data_util.randomRange(0, 100)); +let aa$1 = Belt_SetInt.fromArray(Array_data_util.randomRange(0, 100)); -var bb$1 = Belt_SetInt.fromArray(Array_data_util.randomRange(0, 100)); +let bb$1 = Belt_SetInt.fromArray(Array_data_util.randomRange(0, 100)); -var cc$1 = Belt_SetInt.add(bb$1, 101); +let cc$1 = Belt_SetInt.add(bb$1, 101); -var dd$1 = Belt_SetInt.remove(bb$1, 99); +let dd$1 = Belt_SetInt.remove(bb$1, 99); -var ee = Belt_SetInt.add(dd$1, 101); +let ee = Belt_SetInt.add(dd$1, 101); b("File \"bs_set_int_test.res\", line 185, characters 4-11", Belt_SetInt.eq(aa$1, bb$1)); @@ -270,19 +270,19 @@ b("File \"bs_set_int_test.res\", line 187, characters 4-11", !Belt_SetInt.eq(dd$ b("File \"bs_set_int_test.res\", line 188, characters 4-11", !Belt_SetInt.eq(bb$1, ee)); -var a1 = Belt_SetInt.mergeMany(undefined, Array_data_util.randomRange(0, 100)); +let a1 = Belt_SetInt.mergeMany(undefined, Array_data_util.randomRange(0, 100)); -var a2 = Belt_SetInt.removeMany(a1, Array_data_util.randomRange(40, 100)); +let a2 = Belt_SetInt.removeMany(a1, Array_data_util.randomRange(40, 100)); -var a3 = Belt_SetInt.fromArray(Array_data_util.randomRange(0, 39)); +let a3 = Belt_SetInt.fromArray(Array_data_util.randomRange(0, 39)); -var match$1 = Belt_SetInt.split(a1, 40); +let match$1 = Belt_SetInt.split(a1, 40); -var match$2 = match$1[0]; +let match$2 = match$1[0]; -var a5 = match$2[1]; +let a5 = match$2[1]; -var a4 = match$2[0]; +let a4 = match$2[0]; b("File \"bs_set_int_test.res\", line 197, characters 4-11", Belt_SetInt.eq(a1, Belt_SetInt.fromArray(Array_data_util.randomRange(0, 100)))); @@ -292,17 +292,17 @@ b("File \"bs_set_int_test.res\", line 199, characters 4-11", match$1[1]); b("File \"bs_set_int_test.res\", line 200, characters 4-11", Belt_SetInt.eq(a3, a4)); -var a6 = Belt_SetInt.remove(Belt_SetInt.removeMany(a1, Array_data_util.randomRange(0, 39)), 40); +let a6 = Belt_SetInt.remove(Belt_SetInt.removeMany(a1, Array_data_util.randomRange(0, 39)), 40); b("File \"bs_set_int_test.res\", line 202, characters 4-11", Belt_SetInt.eq(a5, a6)); -var a7 = Belt_SetInt.remove(a1, 40); +let a7 = Belt_SetInt.remove(a1, 40); -var match$3 = Belt_SetInt.split(a7, 40); +let match$3 = Belt_SetInt.split(a7, 40); -var match$4 = match$3[0]; +let match$4 = match$3[0]; -var a9 = match$4[1]; +let a9 = match$4[1]; b("File \"bs_set_int_test.res\", line 205, characters 4-11", !match$3[1]); @@ -310,17 +310,17 @@ b("File \"bs_set_int_test.res\", line 206, characters 4-11", Belt_SetInt.eq(a4, b("File \"bs_set_int_test.res\", line 207, characters 4-11", Belt_SetInt.eq(a5, a9)); -var a10 = Belt_SetInt.removeMany(a9, Array_data_util.randomRange(42, 2000)); +let a10 = Belt_SetInt.removeMany(a9, Array_data_util.randomRange(42, 2000)); eq("File \"bs_set_int_test.res\", line 209, characters 5-12", Belt_SetInt.size(a10), 1); -var a11 = Belt_SetInt.removeMany(a9, Array_data_util.randomRange(0, 2000)); +let a11 = Belt_SetInt.removeMany(a9, Array_data_util.randomRange(0, 2000)); b("File \"bs_set_int_test.res\", line 211, characters 4-11", Belt_SetInt.isEmpty(a11)); -var match$5 = Belt_SetInt.split(undefined, 0); +let match$5 = Belt_SetInt.split(undefined, 0); -var match$6 = match$5[0]; +let match$6 = match$5[0]; b("File \"bs_set_int_test.res\", line 216, characters 4-11", Belt_SetInt.isEmpty(match$6[0])); @@ -328,24 +328,24 @@ b("File \"bs_set_int_test.res\", line 217, characters 4-11", Belt_SetInt.isEmpty b("File \"bs_set_int_test.res\", line 218, characters 4-11", !match$5[1]); -var v$12 = Belt_SetInt.fromArray(Array_data_util.randomRange(0, 2000)); +let v$12 = Belt_SetInt.fromArray(Array_data_util.randomRange(0, 2000)); -var v0 = Belt_SetInt.fromArray(Array_data_util.randomRange(0, 2000)); +let v0 = Belt_SetInt.fromArray(Array_data_util.randomRange(0, 2000)); -var v1 = Belt_SetInt.fromArray(Array_data_util.randomRange(1, 2001)); +let v1 = Belt_SetInt.fromArray(Array_data_util.randomRange(1, 2001)); -var v2 = Belt_SetInt.fromArray(Array_data_util.randomRange(3, 2002)); +let v2 = Belt_SetInt.fromArray(Array_data_util.randomRange(3, 2002)); -var v3 = Belt_SetInt.removeMany(v2, [ +let v3 = Belt_SetInt.removeMany(v2, [ 2002, 2001 ]); -var us = Belt_Array.map(Array_data_util.randomRange(1000, 3000), (function (x) { +let us = Belt_Array.map(Array_data_util.randomRange(1000, 3000), (function (x) { return Belt_SetInt.has(v$12, x); })); -var counted = Belt_Array.reduce(us, 0, (function (acc, x) { +let counted = Belt_Array.reduce(us, 0, (function (acc, x) { if (x) { return acc + 1 | 0; } else { @@ -373,13 +373,13 @@ eq("File \"bs_set_int_test.res\", line 243, characters 5-12", Belt_SetInt.get(v$ Mt.from_pair_suites("Bs_set_int_test", suites.contents); -var N; +let N; -var I; +let I; -var A; +let A; -var ofA = Belt_SetInt.fromArray; +let ofA = Belt_SetInt.fromArray; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/bs_sort_test.js b/jscomp/test/bs_sort_test.js index 2640bf94f8..6c4b2a8c3b 100644 --- a/jscomp/test/bs_sort_test.js +++ b/jscomp/test/bs_sort_test.js @@ -1,19 +1,19 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml = require("../../lib/js/caml.js"); -var Belt_Array = require("../../lib/js/belt_Array.js"); -var Belt_Range = require("../../lib/js/belt_Range.js"); -var Belt_SortArray = require("../../lib/js/belt_SortArray.js"); -var Array_data_util = require("./array_data_util.js"); -var Belt_SortArrayInt = require("../../lib/js/belt_SortArrayInt.js"); - -var suites = { +let Mt = require("./mt.js"); +let Caml = require("../../lib/js/caml.js"); +let Belt_Array = require("../../lib/js/belt_Array.js"); +let Belt_Range = require("../../lib/js/belt_Range.js"); +let Belt_SortArray = require("../../lib/js/belt_SortArray.js"); +let Array_data_util = require("./array_data_util.js"); +let Belt_SortArrayInt = require("../../lib/js/belt_SortArrayInt.js"); + +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -30,28 +30,28 @@ function cmp(x, y) { } function unions(xs, ys) { - var lenX = xs.length; - var lenY = ys.length; - var o = new Array(lenX + lenY | 0); - var v = Belt_SortArray.union(xs, 0, lenX, ys, 0, lenY, o, 0, cmp); + let lenX = xs.length; + let lenY = ys.length; + let o = new Array(lenX + lenY | 0); + let v = Belt_SortArray.union(xs, 0, lenX, ys, 0, lenY, o, 0, cmp); o.length = v; return o; } function inters(xs, ys) { - var lenX = xs.length; - var lenY = ys.length; - var o = new Array(lenX); - var v = Belt_SortArray.intersect(xs, 0, lenX, ys, 0, lenY, o, 0, cmp); + let lenX = xs.length; + let lenY = ys.length; + let o = new Array(lenX); + let v = Belt_SortArray.intersect(xs, 0, lenX, ys, 0, lenY, o, 0, cmp); o.length = v; return o; } function diffs(xs, ys) { - var lenX = xs.length; - var lenY = ys.length; - var o = new Array(lenX); - var v = Belt_SortArray.diff(xs, 0, lenX, ys, 0, lenY, o, 0, cmp); + let lenX = xs.length; + let lenY = ys.length; + let o = new Array(lenX); + let v = Belt_SortArray.diff(xs, 0, lenX, ys, 0, lenY, o, 0, cmp); o.length = v; return o; } @@ -93,13 +93,13 @@ eq("File \"bs_sort_test.res\", line 52, characters 5-12", diffs(Array_data_util. ]); b("File \"bs_sort_test.res\", line 56, characters 4-11", Belt_Range.every(0, 200, (function (i) { - var v = Array_data_util.randomRange(0, i); + let v = Array_data_util.randomRange(0, i); Belt_SortArray.stableSortInPlaceBy(v, cmp); return Belt_SortArray.isSorted(v, cmp); }))); b("File \"bs_sort_test.res\", line 64, characters 4-11", Belt_Range.every(0, 200, (function (i) { - var v = Array_data_util.randomRange(0, i); + let v = Array_data_util.randomRange(0, i); Belt_SortArray.stableSortInPlaceBy(v, cmp); return Belt_SortArray.isSorted(v, cmp); }))); @@ -118,11 +118,11 @@ b("File \"bs_sort_test.res\", line 76, characters 4-11", !Belt_SortArray.isSorte 0 ], cmp)); -var u = Array_data_util.randomRange(0, 1000000); +let u = Array_data_util.randomRange(0, 1000000); -var u1 = u.slice(0); +let u1 = u.slice(0); -var u2 = u.slice(0); +let u2 = u.slice(0); console.time("bs_sort_test.res 85"); @@ -148,7 +148,7 @@ console.timeEnd("bs_sort_test.res 89"); b("File \"bs_sort_test.res\", line 90, characters 4-11", Belt_SortArray.isSorted(u1, cmp)); -var u$1 = [ +let u$1 = [ [ 1, "a" @@ -180,7 +180,7 @@ eq("File \"bs_sort_test.res\", line 95, characters 5-12", Belt_SortArray.stableS ] ]); -var u$2 = [ +let u$2 = [ [ 1, "b" @@ -220,7 +220,7 @@ eq("File \"bs_sort_test.res\", line 98, characters 4-11", Belt_SortArray.stableS ] ]); -var u$3 = [ +let u$3 = [ [ 1, "c" @@ -333,13 +333,13 @@ eq("File \"bs_sort_test.res\", line 116, characters 5-12", Belt_SortArray.binary 36 ], 4, cmp), 3); -var aa = Array_data_util.range(0, 1000); +let aa = Array_data_util.range(0, 1000); b("File \"bs_sort_test.res\", line 118, characters 10-17", Belt_Range.every(0, 1000, (function (i) { return Belt_SortArray.binarySearchBy(aa, i, cmp) === i; }))); -var cc = Belt_Array.map(Array_data_util.range(0, 2000), (function (x) { +let cc = Belt_Array.map(Array_data_util.range(0, 2000), (function (x) { return (x << 1); })); @@ -412,15 +412,15 @@ eq("File \"bs_sort_test.res\", line 145, characters 5-12", Belt_SortArray.strict Mt.from_pair_suites("Bs_sort_test", suites.contents); -var I; +let I; -var S; +let S; -var R; +let R; -var A; +let A; -var SI; +let SI; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/bs_splice_partial.js b/jscomp/test/bs_splice_partial.js index 697fc4aa41..301af7f9df 100644 --- a/jscomp/test/bs_splice_partial.js +++ b/jscomp/test/bs_splice_partial.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); function test(g) { g.xx(10, 3, "xxx", 1, 2, 3); } function test_hi(x) { - var y = x.hi(1, 2, 3); + let y = x.hi(1, 2, 3); if (y !== null) { console.log(y); return 2; @@ -18,7 +18,7 @@ function test_hi(x) { } function test_hi__2(x) { - var match = x.hi__2(); + let match = x.hi__2(); if (match == null) { return 1; } else { diff --git a/jscomp/test/bs_stack_test.js b/jscomp/test/bs_stack_test.js index e9f0caffd8..4a59183ec0 100644 --- a/jscomp/test/bs_stack_test.js +++ b/jscomp/test/bs_stack_test.js @@ -1,17 +1,17 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_option = require("../../lib/js/caml_option.js"); -var Js_undefined = require("../../lib/js/js_undefined.js"); -var Belt_MutableQueue = require("../../lib/js/belt_MutableQueue.js"); -var Belt_MutableStack = require("../../lib/js/belt_MutableStack.js"); +let Mt = require("./mt.js"); +let Caml_option = require("../../lib/js/caml_option.js"); +let Js_undefined = require("../../lib/js/js_undefined.js"); +let Belt_MutableQueue = require("../../lib/js/belt_MutableQueue.js"); +let Belt_MutableStack = require("../../lib/js/belt_MutableStack.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -20,27 +20,27 @@ function eq(loc, x, y) { } function inOrder(v) { - var current = v; - var s = { + let current = v; + let s = { root: undefined }; - var q = { + let q = { length: 0, first: undefined, last: undefined }; while(current !== undefined) { - var v$1 = current; + let v$1 = current; Belt_MutableStack.push(s, v$1); current = v$1.left; }; while(s.root !== undefined) { current = Belt_MutableStack.popUndefined(s); - var v$2 = current; + let v$2 = current; Belt_MutableQueue.add(q, v$2.value); current = v$2.right; while(current !== undefined) { - var v$3 = current; + let v$3 = current; Belt_MutableStack.push(s, v$3); current = v$3.left; }; @@ -49,25 +49,25 @@ function inOrder(v) { } function inOrder3(v) { - var current = v; - var s = { + let current = v; + let s = { root: undefined }; - var q = { + let q = { length: 0, first: undefined, last: undefined }; while(current !== undefined) { - var v$1 = current; + let v$1 = current; Belt_MutableStack.push(s, v$1); current = v$1.left; }; Belt_MutableStack.dynamicPopIter(s, (function (popped) { Belt_MutableQueue.add(q, popped.value); - var current = popped.right; + let current = popped.right; while(current !== undefined) { - var v = current; + let v = current; Belt_MutableStack.push(s, v); current = v.left; }; @@ -76,24 +76,24 @@ function inOrder3(v) { } function inOrder2(v) { - var todo = true; - var cursor = v; - var s = { + let todo = true; + let cursor = v; + let s = { root: undefined }; - var q = { + let q = { length: 0, first: undefined, last: undefined }; while(todo) { if (cursor !== undefined) { - var v$1 = cursor; + let v$1 = cursor; Belt_MutableStack.push(s, v$1); cursor = v$1.left; } else if (s.root !== undefined) { cursor = Belt_MutableStack.popUndefined(s); - var current = cursor; + let current = cursor; Belt_MutableQueue.add(q, current.value); cursor = current.right; } else { @@ -110,20 +110,20 @@ function n(l, r, a) { }; } -var test1 = n(Caml_option.some(n(Caml_option.some(n(undefined, undefined, 4)), Caml_option.some(n(undefined, undefined, 5)), 2)), Caml_option.some(n(undefined, undefined, 3)), 1); +let test1 = n(Caml_option.some(n(Caml_option.some(n(undefined, undefined, 4)), Caml_option.some(n(undefined, undefined, 5)), 2)), Caml_option.some(n(undefined, undefined, 3)), 1); function pushAllLeft(st1, s1) { - var current = st1; + let current = st1; while(current !== undefined) { - var v = current; + let v = current; Belt_MutableStack.push(s1, v); current = v.left; }; } -var test2 = n(Caml_option.some(n(Caml_option.some(n(Caml_option.some(n(Caml_option.some(n(undefined, undefined, 4)), undefined, 2)), undefined, 5)), undefined, 1)), undefined, 3); +let test2 = n(Caml_option.some(n(Caml_option.some(n(Caml_option.some(n(Caml_option.some(n(undefined, undefined, 4)), undefined, 2)), undefined, 5)), undefined, 1)), undefined, 3); -var test3 = n(Caml_option.some(n(Caml_option.some(n(Caml_option.some(n(undefined, undefined, 4)), undefined, 2)), undefined, 5)), Caml_option.some(n(undefined, undefined, 3)), 1); +let test3 = n(Caml_option.some(n(Caml_option.some(n(Caml_option.some(n(undefined, undefined, 4)), undefined, 2)), undefined, 5)), Caml_option.some(n(undefined, undefined, 3)), 1); eq("File \"bs_stack_test.res\", line 98, characters 3-10", inOrder(test1), [ 4, @@ -143,9 +143,9 @@ eq("File \"bs_stack_test.res\", line 99, characters 3-10", inOrder3(test1), [ Mt.from_pair_suites("bs_stack_test.res", suites.contents); -var S; +let S; -var Q; +let Q; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/bs_string_test.js b/jscomp/test/bs_string_test.js index f9e0ee90b2..9c14cda158 100644 --- a/jscomp/test/bs_string_test.js +++ b/jscomp/test/bs_string_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; diff --git a/jscomp/test/bs_unwrap_test.js b/jscomp/test/bs_unwrap_test.js index 88e44b139a..f49fc94cbf 100644 --- a/jscomp/test/bs_unwrap_test.js +++ b/jscomp/test/bs_unwrap_test.js @@ -1,8 +1,8 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); -var Caml_option = require("../../lib/js/caml_option.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_option = require("../../lib/js/caml_option.js"); console.log([ "hello world", @@ -13,14 +13,14 @@ console.log(1337); console.log("hello world"); -var arg_string = { +let arg_string = { NAME: "String", VAL: "hi runtime" }; console.log(arg_string.VAL); -var arg_pair = { +let arg_pair = { NAME: "Pair", VAL: [ "hi", @@ -40,7 +40,7 @@ console.log(3, "hi"); console.log(4, undefined); -var some_arg = { +let some_arg = { NAME: "Bool", VAL: true }; @@ -97,7 +97,7 @@ function test00(param) { }; } -var none_arg; +let none_arg; exports.arg_string = arg_string; exports.arg_pair = arg_pair; diff --git a/jscomp/test/buffer_test.js b/jscomp/test/buffer_test.js index dd7705f22c..c1268be622 100644 --- a/jscomp/test/buffer_test.js +++ b/jscomp/test/buffer_test.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Bytes = require("../../lib/js/bytes.js"); -var $$Buffer = require("../../lib/js/buffer.js"); -var Caml_bytes = require("../../lib/js/caml_bytes.js"); -var Caml_string = require("../../lib/js/caml_string.js"); +let Mt = require("./mt.js"); +let Bytes = require("../../lib/js/bytes.js"); +let $$Buffer = require("../../lib/js/buffer.js"); +let Caml_bytes = require("../../lib/js/caml_bytes.js"); +let Caml_string = require("../../lib/js/caml_string.js"); -var v = "gso"; +let v = "gso"; -var suites_0 = [ +let suites_0 = [ "equal", (function (param) { return { @@ -26,11 +26,11 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "equal2", (function (param) { - var u = Bytes.make(3, /* 'a' */97); + let u = Bytes.make(3, /* 'a' */97); u[0] = /* 'b' */98; return { TAG: "Eq", @@ -49,8 +49,8 @@ var suites_1 = { hd: [ "buffer", (function (param) { - var v = $$Buffer.create(30); - for(var i = 0; i <= 10; ++i){ + let v = $$Buffer.create(30); + for(let i = 0; i <= 10; ++i){ $$Buffer.add_string(v, String(i)); } return { @@ -64,7 +64,7 @@ var suites_1 = { } }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/bytes_split_gpr_743_test.js b/jscomp/test/bytes_split_gpr_743_test.js index 520d8142f2..84742bac6c 100644 --- a/jscomp/test/bytes_split_gpr_743_test.js +++ b/jscomp/test/bytes_split_gpr_743_test.js @@ -1,21 +1,21 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Bytes = require("../../lib/js/bytes.js"); -var Caml_bytes = require("../../lib/js/caml_bytes.js"); +let Mt = require("./mt.js"); +let Bytes = require("../../lib/js/bytes.js"); +let Caml_bytes = require("../../lib/js/caml_bytes.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; function eq(loc, param) { - var y = param[1]; - var x = param[0]; + let y = param[1]; + let x = param[0]; test_id.contents = test_id.contents + 1 | 0; suites.contents = { hd: [ @@ -32,7 +32,7 @@ function eq(loc, param) { }; } -var b = [ +let b = [ 0, 0, 0 @@ -46,7 +46,7 @@ Caml_bytes.set(b, 2, /* 'c' */99); Bytes.blit(b, 0, b, 1, 2); -var res = Bytes.unsafe_to_string(b); +let res = Bytes.unsafe_to_string(b); console.log(res); @@ -55,7 +55,7 @@ eq("File \"bytes_split_gpr_743_test.res\", line 17, characters 5-12", [ res ]); -var b$1 = [ +let b$1 = [ 0, 0, 0 @@ -69,7 +69,7 @@ Caml_bytes.set(b$1, 2, /* 'c' */99); Bytes.blit(b$1, 1, b$1, 0, 2); -var res2 = Bytes.unsafe_to_string(b$1); +let res2 = Bytes.unsafe_to_string(b$1); console.log(res2); diff --git a/jscomp/test/caml_compare_bigint_test.js b/jscomp/test/caml_compare_bigint_test.js index ffbb87e527..1427f44a73 100644 --- a/jscomp/test/caml_compare_bigint_test.js +++ b/jscomp/test/caml_compare_bigint_test.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Pervasives = require("../../lib/js/pervasives.js"); +let Mt = require("./mt.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Pervasives = require("../../lib/js/pervasives.js"); function isLessThan(title, small, big) { return { @@ -421,9 +421,9 @@ function isEqual(title, num1, num2) { }; } -var five = BigInt("5"); +let five = BigInt("5"); -var suites = Pervasives.$at(isLessThan("123 and 555555", BigInt("123"), BigInt("555555")), Pervasives.$at(isEqual("98765 and 98765", BigInt("98765"), BigInt("98765")), isEqual("same instance", five, five))); +let suites = Pervasives.$at(isLessThan("123 and 555555", BigInt("123"), BigInt("555555")), Pervasives.$at(isEqual("98765 and 98765", BigInt("98765"), BigInt("98765")), isEqual("same instance", five, five))); Mt.from_pair_suites("caml_compare_bigint_test.res", suites); diff --git a/jscomp/test/caml_compare_test.js b/jscomp/test/caml_compare_test.js index 43a2c638b3..1b75ec4c72 100644 --- a/jscomp/test/caml_compare_test.js +++ b/jscomp/test/caml_compare_test.js @@ -1,11 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let Mt = require("./mt.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); -var function_equal_test; +let function_equal_test; try { function_equal_test = Caml_obj.equal((function (x) { @@ -15,11 +15,11 @@ try { })); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); function_equal_test = exn.RE_EXN_ID === "Invalid_argument" && exn._1 === "equal: functional value" ? true : false; } -var suites = { +let suites = { contents: { hd: [ "File \"caml_compare_test.res\", line 12, characters 5-12", @@ -1124,7 +1124,7 @@ var suites = { } }; -var test_id = { +let test_id = { contents: 0 }; diff --git a/jscomp/test/caml_format_test.js b/jscomp/test/caml_format_test.js index ce1fce3b8c..6030a74115 100644 --- a/jscomp/test/caml_format_test.js +++ b/jscomp/test/caml_format_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var $$Array = require("../../lib/js/array.js"); -var Caml_int64 = require("../../lib/js/caml_int64.js"); -var Pervasives = require("../../lib/js/pervasives.js"); -var Caml_format = require("../../lib/js/caml_format.js"); +let Mt = require("./mt.js"); +let $$Array = require("../../lib/js/array.js"); +let Caml_int64 = require("../../lib/js/caml_int64.js"); +let Pervasives = require("../../lib/js/pervasives.js"); +let Caml_format = require("../../lib/js/caml_format.js"); -var of_string = [ +let of_string = [ [ 0, "0" @@ -86,8 +86,8 @@ function from_float_of_string(xs) { function from_of_string(xs) { return $$Array.to_list($$Array.mapi((function (i, param) { - var b = param[1]; - var a = param[0]; + let b = param[1]; + let a = param[0]; return [ "of_string " + String(i), (function (param) { @@ -101,9 +101,9 @@ function from_of_string(xs) { }), of_string)); } -var to_str = Caml_format.int_of_string; +let to_str = Caml_format.int_of_string; -var pairs = [ +let pairs = [ [ "FP_infinite", "infinity" @@ -126,7 +126,7 @@ var pairs = [ ] ]; -var pairs$1 = [ +let pairs$1 = [ [ 3232, "32_32.0" @@ -141,7 +141,7 @@ var pairs$1 = [ ] ]; -var suites = Pervasives.$at(from_of_string(of_string), Pervasives.$at({ +let suites = Pervasives.$at(from_of_string(of_string), Pervasives.$at({ hd: [ "isnan_of_string", (function (param) { @@ -154,8 +154,8 @@ var suites = Pervasives.$at(from_of_string(of_string), Pervasives.$at({ ], tl: /* [] */0 }, Pervasives.$at($$Array.to_list($$Array.mapi((function (i, param) { - var b = param[1]; - var a = param[0]; + let b = param[1]; + let a = param[0]; return [ "infinity_of_string " + String(i), (function (param) { @@ -192,8 +192,8 @@ var suites = Pervasives.$at(from_of_string(of_string), Pervasives.$at({ tl: /* [] */0 } }, $$Array.to_list($$Array.mapi((function (i, param) { - var b = param[1]; - var a = param[0]; + let b = param[1]; + let a = param[0]; return [ "normal_float_of_string " + String(i), (function (param) { @@ -210,7 +210,7 @@ function ff(param) { return Caml_format.format_int("%32d", param); } -var float_data = [ +let float_data = [ [ "%f", 32, @@ -318,7 +318,7 @@ var float_data = [ ] ]; -var int64_suites_0 = [ +let int64_suites_0 = [ "i64_simple7", (function (param) { return { @@ -332,7 +332,7 @@ var int64_suites_0 = [ }) ]; -var int64_suites_1 = { +let int64_suites_1 = { hd: [ "i64_simple15", (function (param) { @@ -361,12 +361,12 @@ var int64_suites_1 = { } }; -var int64_suites = { +let int64_suites = { hd: int64_suites_0, tl: int64_suites_1 }; -var of_string_data = [ +let of_string_data = [ [ Caml_int64.zero, "0" @@ -424,9 +424,9 @@ var of_string_data = [ ]; Mt.from_pair_suites("Caml_format_test", Pervasives.$at(suites, Pervasives.$at($$Array.to_list($$Array.mapi((function (i, param) { - var str_result = param[2]; - var f = param[1]; - var fmt = param[0]; + let str_result = param[2]; + let f = param[1]; + let fmt = param[0]; return [ "loat_format " + String(i), (function (param) { @@ -438,8 +438,8 @@ Mt.from_pair_suites("Caml_format_test", Pervasives.$at(suites, Pervasives.$at($$ }) ]; }), float_data)), Pervasives.$at(int64_suites, $$Array.to_list($$Array.mapi((function (i, param) { - var b = param[1]; - var a = param[0]; + let b = param[1]; + let a = param[0]; return [ "int64_of_string " + String(i) + " ", (function (param) { @@ -452,17 +452,17 @@ Mt.from_pair_suites("Caml_format_test", Pervasives.$at(suites, Pervasives.$at($$ ]; }), of_string_data)))))); -var float_suites = { +let float_suites = { hd: "float_nan", tl: /* [] */0 }; -var hh = [ +let hh = [ 214748364, 3435973836 ]; -var hhh = [ +let hhh = [ 268435456, 0 ]; diff --git a/jscomp/test/chain_code_test.js b/jscomp/test/chain_code_test.js index e5524db491..00d412fbe8 100644 --- a/jscomp/test/chain_code_test.js +++ b/jscomp/test/chain_code_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Curry = require("../../lib/js/curry.js"); +let Mt = require("./mt.js"); +let Curry = require("../../lib/js/curry.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; diff --git a/jscomp/test/chn_test.js b/jscomp/test/chn_test.js index cb8977688b..12d568fe57 100644 --- a/jscomp/test/chn_test.js +++ b/jscomp/test/chn_test.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var $$Array = require("../../lib/js/array.js"); -var Caml_string = require("../../lib/js/caml_string.js"); +let Mt = require("./mt.js"); +let $$Array = require("../../lib/js/array.js"); +let Caml_string = require("../../lib/js/caml_string.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -36,7 +36,7 @@ console.log("\x3f\u003f\b\t\n\v\f\r\0\"'"); function convert(s) { return $$Array.to_list(Array.from(s, (function (x) { - var x$1 = x.codePointAt(0); + let x$1 = x.codePointAt(0); if (x$1 !== undefined) { return x$1; } diff --git a/jscomp/test/class_type_ffi_test.js b/jscomp/test/class_type_ffi_test.js index 8718f0bf7b..8f7154c819 100644 --- a/jscomp/test/class_type_ffi_test.js +++ b/jscomp/test/class_type_ffi_test.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); function test_set(x) { x.length__aux = 3; diff --git a/jscomp/test/coercion_module_alias_test.js b/jscomp/test/coercion_module_alias_test.js index 39ca005025..abdd32ce6f 100644 --- a/jscomp/test/coercion_module_alias_test.js +++ b/jscomp/test/coercion_module_alias_test.js @@ -1,31 +1,31 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Char = require("../../lib/js/char.js"); -var List = require("../../lib/js/list.js"); -var Curry = require("../../lib/js/curry.js"); +let Char = require("../../lib/js/char.js"); +let List = require("../../lib/js/list.js"); +let Curry = require("../../lib/js/curry.js"); function l(prim) { console.log(prim); } -var C$p = Char; +let C$p = Char; -var prim = Char.chr(66); +let prim = Char.chr(66); console.log(prim); -var prim$1 = Char.chr(66); +let prim$1 = Char.chr(66); console.log(prim$1); -var C3 = Char; +let C3 = Char; -var prim$2 = Char.chr(66); +let prim$2 = Char.chr(66); console.log(prim$2); -var f = List.length; +let f = List.length; function g(x) { return List.length(List.map((function (prim) { @@ -37,9 +37,9 @@ function F(X) { return Char; } -var C4 = Char; +let C4 = Char; -var prim$3 = Char.chr(66); +let prim$3 = Char.chr(66); console.log(prim$3); @@ -47,56 +47,56 @@ function G(X) { return X; } -var M = {}; +let M = {}; -var N = { +let N = { x: 1 }; -var N$p; +let N$p; -var M$p = { +let M$p = { N: N, N$p: N$p }; console.log(1); -var M$p$p = { +let M$p$p = { N$p: N }; console.log(M$p$p.N$p.x); -var M2 = { +let M2 = { N: N, N$p: N$p }; -var M3 = { +let M3 = { N$p: N }; console.log(1); -var M3$p = { +let M3$p = { N$p: N }; console.log(M3$p.N$p.x); -var N$1 = { +let N$1 = { x: 1 }; -var M4 = { +let M4 = { N$p: N$1 }; console.log(1); function F0(X) { - var N = { + let N = { x: 1 }; return { @@ -105,27 +105,27 @@ function F0(X) { }; } -var N$2 = { +let N$2 = { x: 1 }; -var M5 = { +let M5 = { N$p: N$2 }; console.log(M5.N$p.x); -var D = { +let D = { y: 3 }; -var N$3 = { +let N$3 = { x: 1 }; -var N$p$1; +let N$p$1; -var M6 = { +let M6 = { D: D, N: N$3, N$p: N$p$1 @@ -133,7 +133,7 @@ var M6 = { console.log(1); -var M7 = { +let M7 = { N$p: N$3 }; @@ -141,38 +141,38 @@ console.log(M7.N$p.x); console.log(1); -var C$p$1; +let C$p$1; -var M8 = { +let M8 = { C: undefined, C$p: C$p$1 }; -var M9 = { +let M9 = { C: Char, C$p: C$p$1 }; -var prim$4 = Curry._1(Char.chr, 66); +let prim$4 = Curry._1(Char.chr, 66); console.log(prim$4); -var M10 = { +let M10 = { C$p: Char }; -var prim$5 = Curry._1(M10.C$p.chr, 66); +let prim$5 = Curry._1(M10.C$p.chr, 66); console.log(prim$5); -var C; +let C; -var C$p$p$p = C$p; +let C$p$p$p = C$p; -var C$p$p = Char; +let C$p$p = Char; function G0(funarg) { - var N = { + let N = { x: 1 }; return { @@ -180,7 +180,7 @@ function G0(funarg) { }; } -var M1 = { +let M1 = { N: N$3, N$p: N$p$1 }; diff --git a/jscomp/test/complex_if_test.js b/jscomp/test/complex_if_test.js index b9b4150424..ac9d60a393 100644 --- a/jscomp/test/complex_if_test.js +++ b/jscomp/test/complex_if_test.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Bytes = require("../../lib/js/bytes.js"); -var Caml_bytes = require("../../lib/js/caml_bytes.js"); +let Mt = require("./mt.js"); +let Bytes = require("../../lib/js/bytes.js"); +let Caml_bytes = require("../../lib/js/caml_bytes.js"); function fib(x) { if (x !== 1 && x !== 23) { @@ -14,9 +14,9 @@ function fib(x) { } function escaped(s) { - var n = 0; - for(var i = 0 ,i_finish = s.length; i < i_finish; ++i){ - var match = s[i]; + let n = 0; + for(let i = 0 ,i_finish = s.length; i < i_finish; ++i){ + let match = s[i]; n = n + ( match >= 32 ? ( match > 92 || match < 34 ? ( @@ -36,11 +36,11 @@ function escaped(s) { if (n === s.length) { return Bytes.copy(s); } - var s$p = Caml_bytes.create(n); + let s$p = Caml_bytes.create(n); n = 0; - for(var i$1 = 0 ,i_finish$1 = s.length; i$1 < i_finish$1; ++i$1){ - var c = s[i$1]; - var exit = 0; + for(let i$1 = 0 ,i_finish$1 = s.length; i$1 < i_finish$1; ++i$1){ + let c = s[i$1]; + let exit = 0; if (c >= 35) { if (c !== 92) { if (c >= 127) { @@ -122,7 +122,7 @@ function string_escaped(s) { return Bytes.to_string(escaped(Bytes.of_string(s))); } -var suites_0 = [ +let suites_0 = [ "complete_escape", (function (param) { return { @@ -133,7 +133,7 @@ var suites_0 = [ }) ]; -var suites = { +let suites = { hd: suites_0, tl: /* [] */0 }; diff --git a/jscomp/test/complex_test.js b/jscomp/test/complex_test.js index 27bd84a692..042a16c82b 100644 --- a/jscomp/test/complex_test.js +++ b/jscomp/test/complex_test.js @@ -1,10 +1,10 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Complex = require("../../lib/js/complex.js"); +let Mt = require("./mt.js"); +let Complex = require("../../lib/js/complex.js"); -var suites_0 = [ +let suites_0 = [ "basic_add", (function (param) { return { @@ -18,7 +18,7 @@ var suites_0 = [ }) ]; -var suites = { +let suites = { hd: suites_0, tl: /* [] */0 }; diff --git a/jscomp/test/complex_while_loop.js b/jscomp/test/complex_while_loop.js index b9da0bebc9..d533daffeb 100644 --- a/jscomp/test/complex_while_loop.js +++ b/jscomp/test/complex_while_loop.js @@ -3,9 +3,9 @@ function f(param) { - var n = 0; + let n = 0; while((function () { - var fib = function (x) { + let fib = function (x) { if (x === 0 || x === 1) { return 1; } else { @@ -21,7 +21,7 @@ function f(param) { function ff(param) { while((function () { - var b = 9; + let b = 9; return (3 + b | 0) > 10; })()) { diff --git a/jscomp/test/condition_compilation_test.js b/jscomp/test/condition_compilation_test.js index 97dbb21326..b4fcba6b4b 100644 --- a/jscomp/test/condition_compilation_test.js +++ b/jscomp/test/condition_compilation_test.js @@ -1,21 +1,21 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var v = { +let v = { contents: 1 }; v.contents = v.contents + 1 | 0; -var a = v.contents; +let a = v.contents; -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -42,17 +42,17 @@ eq("File \"condition_compilation_test.res\", line 61, characters 5-12", v.conten Mt.from_pair_suites("Condition_compilation_test", suites.contents); -var b = "u"; +let b = "u"; -var buffer_size = 1; +let buffer_size = 1; -var vv = 3; +let vv = 3; -var version_gt_3 = true; +let version_gt_3 = true; -var version = -1; +let version = -1; -var ocaml_veriosn = "unknown"; +let ocaml_veriosn = "unknown"; exports.b = b; exports.buffer_size = buffer_size; diff --git a/jscomp/test/console_log_test.js b/jscomp/test/console_log_test.js index 9a63c34085..a366b77f4e 100644 --- a/jscomp/test/console_log_test.js +++ b/jscomp/test/console_log_test.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../../lib/js/caml_obj.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); function min_int(prim0, prim1) { return Math.min(prim0, prim1); @@ -11,7 +11,7 @@ function say(prim0, prim1) { return prim0.say(prim1); } -var v = Caml_obj.compare; +let v = Caml_obj.compare; exports.min_int = min_int; exports.say = say; diff --git a/jscomp/test/const_block_test.js b/jscomp/test/const_block_test.js index 0bcd4bdffb..0750029c96 100644 --- a/jscomp/test/const_block_test.js +++ b/jscomp/test/const_block_test.js @@ -1,22 +1,22 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_array = require("../../lib/js/caml_array.js"); +let Mt = require("./mt.js"); +let Caml_array = require("../../lib/js/caml_array.js"); -var a = [ +let a = [ 0, 1, 2 ]; -var b = [ +let b = [ 0, 1, 2 ]; -var c = [ +let c = [ 0, 1, 2, @@ -49,12 +49,12 @@ function g(param) { }; } -var suites_0 = [ +let suites_0 = [ "const_block_test", g ]; -var suites_1 = { +let suites_1 = { hd: [ "avoid_mutable_inline_test", (function (param) { @@ -77,14 +77,14 @@ var suites_1 = { tl: /* [] */0 }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; Mt.from_pair_suites("Const_block_test", suites); -var v = [ +let v = [ 0, 1, 2, diff --git a/jscomp/test/const_defs.js b/jscomp/test/const_defs.js index ed299476ec..4e308ce038 100644 --- a/jscomp/test/const_defs.js +++ b/jscomp/test/const_defs.js @@ -2,7 +2,7 @@ 'use strict'; -var v = true; +let v = true; exports.v = v; /* No side effect */ diff --git a/jscomp/test/const_defs_test.js b/jscomp/test/const_defs_test.js index 640d056071..b94f4305fa 100644 --- a/jscomp/test/const_defs_test.js +++ b/jscomp/test/const_defs_test.js @@ -2,7 +2,7 @@ 'use strict'; -var u = 3; +let u = 3; function f(param) { throw { diff --git a/jscomp/test/const_test.js b/jscomp/test/const_test.js index 53b6172a49..3ea696e740 100644 --- a/jscomp/test/const_test.js +++ b/jscomp/test/const_test.js @@ -11,7 +11,7 @@ function ff(x) { } function fff(x) { - var x$1 = { + let x$1 = { TAG: "A", _0: x }; @@ -40,7 +40,7 @@ function hh(param) { return 3; } -var g = h("A"); +let g = h("A"); exports.f = f; exports.ff = ff; diff --git a/jscomp/test/cps_test.js b/jscomp/test/cps_test.js index c546f32027..b85d0b4ee5 100644 --- a/jscomp/test/cps_test.js +++ b/jscomp/test/cps_test.js @@ -1,19 +1,19 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var $$Array = require("../../lib/js/array.js"); -var Curry = require("../../lib/js/curry.js"); -var Caml_array = require("../../lib/js/caml_array.js"); +let Mt = require("./mt.js"); +let $$Array = require("../../lib/js/array.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_array = require("../../lib/js/caml_array.js"); function test(param) { - var v = { + let v = { contents: 0 }; - var f = function (_n, _acc) { + let f = function (_n, _acc) { while(true) { - var acc = _acc; - var n = _n; + let acc = _acc; + let n = _n; if (n === 0) { return Curry._1(acc, undefined); } @@ -34,13 +34,13 @@ function test(param) { } function test_closure(param) { - var v = { + let v = { contents: 0 }; - var arr = Caml_array.make(6, (function (x) { + let arr = Caml_array.make(6, (function (x) { return x; })); - for(var i = 0; i <= 5; ++i){ + for(let i = 0; i <= 5; ++i){ Caml_array.set(arr, i, (function(i){ return function (param) { return i; @@ -54,14 +54,14 @@ function test_closure(param) { } function test_closure2(param) { - var v = { + let v = { contents: 0 }; - var arr = Caml_array.make(6, (function (x) { + let arr = Caml_array.make(6, (function (x) { return x; })); - for(var i = 0; i <= 5; ++i){ - var j = i + i | 0; + for(let i = 0; i <= 5; ++i){ + let j = i + i | 0; Caml_array.set(arr, i, (function(j){ return function (param) { return j; diff --git a/jscomp/test/cross_module_inline_test.js b/jscomp/test/cross_module_inline_test.js index 6c0cb2d15e..eb32c53f16 100644 --- a/jscomp/test/cross_module_inline_test.js +++ b/jscomp/test/cross_module_inline_test.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Test_char = require("./test_char.js"); +let Test_char = require("./test_char.js"); -var v = Test_char.caml_is_printable(/* 'a' */97); +let v = Test_char.caml_is_printable(/* 'a' */97); exports.v = v; /* v Not a pure module */ diff --git a/jscomp/test/custom_error_test.js b/jscomp/test/custom_error_test.js index 333414d2a0..f6d09ba131 100644 --- a/jscomp/test/custom_error_test.js +++ b/jscomp/test/custom_error_test.js @@ -1,16 +1,16 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Js_exn = require("../../lib/js/js_exn.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let Js_exn = require("../../lib/js/js_exn.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); function test_js_error(param) { - var e; + let e; try { e = JSON.parse(" {\"x\" : }"); } catch (raw_err){ - var err = Caml_js_exceptions.internalToOCamlException(raw_err); + let err = Caml_js_exceptions.internalToOCamlException(raw_err); if (err.RE_EXN_ID === Js_exn.$$Error) { console.log(err._1.stack); return; @@ -25,7 +25,7 @@ function test_js_error2(param) { return JSON.parse(" {\"x\" : }"); } catch (raw_e){ - var e = Caml_js_exceptions.internalToOCamlException(raw_e); + let e = Caml_js_exceptions.internalToOCamlException(raw_e); if (e.RE_EXN_ID === Js_exn.$$Error) { console.log(e._1.stack); throw e; @@ -35,12 +35,12 @@ function test_js_error2(param) { } function example1(param) { - var v; + let v; try { v = JSON.parse(" {\"x\" }"); } catch (raw_err){ - var err = Caml_js_exceptions.internalToOCamlException(raw_err); + let err = Caml_js_exceptions.internalToOCamlException(raw_err); if (err.RE_EXN_ID === Js_exn.$$Error) { console.log(err._1.stack); return; @@ -55,7 +55,7 @@ function example2(param) { return JSON.parse(" {\"x\"}"); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === Js_exn.$$Error) { return; } diff --git a/jscomp/test/debug_mode_value.js b/jscomp/test/debug_mode_value.js index bab7b2e781..2e14ec1623 100644 --- a/jscomp/test/debug_mode_value.js +++ b/jscomp/test/debug_mode_value.js @@ -2,14 +2,14 @@ 'use strict'; -var u = { +let u = { TAG: "A", _0: 1, _1: 2, [Symbol.for("name")]: "A" }; -var h = { +let h = { hd: 1, tl: /* [] */0 }; diff --git a/jscomp/test/debugger_test.js b/jscomp/test/debugger_test.js index 50a479929b..592eba45df 100644 --- a/jscomp/test/debugger_test.js +++ b/jscomp/test/debugger_test.js @@ -21,7 +21,7 @@ function g(param) { function exterme_g(param) { f(1, 2); debugger; - var v; + let v; console.log(v); f(1, 2); debugger; diff --git a/jscomp/test/default_export_test.js b/jscomp/test/default_export_test.js index a2728d6e69..86a2657e3a 100644 --- a/jscomp/test/default_export_test.js +++ b/jscomp/test/default_export_test.js @@ -2,7 +2,7 @@ 'use strict'; -var $$default = "xx"; +let $$default = "xx"; exports.default = $$default; exports.__esModule = true; diff --git a/jscomp/test/defunctor_make_test.js b/jscomp/test/defunctor_make_test.js index a72694f115..efc2f442f8 100644 --- a/jscomp/test/defunctor_make_test.js +++ b/jscomp/test/defunctor_make_test.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml = require("../../lib/js/caml.js"); +let Caml = require("../../lib/js/caml.js"); function getcompare(x) { return x; @@ -11,7 +11,7 @@ function Make(M) { return M; } -var Comparable = { +let Comparable = { getcompare: getcompare, Make: Make }; @@ -25,8 +25,8 @@ function height(x) { } function create(l, x, d, r) { - var hl = height(l); - var hr = height(r); + let hl = height(l); + let hr = height(r); return { TAG: "Node", _0: l, @@ -38,9 +38,9 @@ function create(l, x, d, r) { } function bal(l, x, d, r) { - var hl; + let hl; hl = typeof l !== "object" ? 0 : l._4; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r._4; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -50,10 +50,10 @@ function bal(l, x, d, r) { Error: new Error() }; } - var lr = l._3; - var ld = l._2; - var lv = l._1; - var ll = l._0; + let lr = l._3; + let ld = l._2; + let lv = l._1; + let ll = l._0; if (height(ll) >= height(lr)) { return create(ll, lv, ld, create(lr, x, d, r)); } @@ -83,10 +83,10 @@ function bal(l, x, d, r) { Error: new Error() }; } - var rr = r._3; - var rd = r._2; - var rv = r._1; - var rl = r._0; + let rr = r._3; + let rd = r._2; + let rv = r._1; + let rl = r._0; if (height(rr) >= height(rl)) { return create(create(l, x, d, rl), rv, rd, rr); } @@ -111,11 +111,11 @@ function add(x, data, compare, x_) { _4: 1 }; } - var r = x_._3; - var d = x_._2; - var v = x_._1; - var l = x_._0; - var c = compare(x, v); + let r = x_._3; + let d = x_._2; + let v = x_._1; + let l = x_._0; + let c = compare(x, v); if (c === 0) { return { TAG: "Node", @@ -133,7 +133,7 @@ function add(x, data, compare, x_) { } function add$1(x, data, v) { - var X = v.compare; + let X = v.compare; return { compare: v.compare, data: add(x, data, X.compare, v.data) @@ -147,29 +147,29 @@ function empty(v) { }; } -var compare = Caml.int_compare; +let compare = Caml.int_compare; -var V0 = { +let V0 = { compare: compare }; -var compare$1 = Caml.int_compare; +let compare$1 = Caml.int_compare; -var V1 = { +let V1 = { compare: compare$1 }; -var v0 = { +let v0 = { compare: V0, data: "Empty" }; -var v1 = { +let v1 = { compare: V1, data: "Empty" }; -var v3 = add$1(3, "a", v0); +let v3 = add$1(3, "a", v0); console.log(v3); diff --git a/jscomp/test/demo_int_map.js b/jscomp/test/demo_int_map.js index b082c9371f..3acfa2431f 100644 --- a/jscomp/test/demo_int_map.js +++ b/jscomp/test/demo_int_map.js @@ -11,8 +11,8 @@ function height(param) { } function create(l, x, d, r) { - var hl = height(l); - var hr = height(r); + let hl = height(l); + let hr = height(r); return { TAG: "Node", l: l, @@ -24,9 +24,9 @@ function create(l, x, d, r) { } function bal(l, x, d, r) { - var hl; + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -36,10 +36,10 @@ function bal(l, x, d, r) { Error: new Error() }; } - var lr = l.r; - var ld = l.d; - var lv = l.v; - var ll = l.l; + let lr = l.r; + let ld = l.d; + let lv = l.v; + let ll = l.l; if (height(ll) >= height(lr)) { return create(ll, lv, ld, create(lr, x, d, r)); } @@ -69,10 +69,10 @@ function bal(l, x, d, r) { Error: new Error() }; } - var rr = r.r; - var rd = r.d; - var rv = r.v; - var rl = r.l; + let rr = r.r; + let rd = r.d; + let rv = r.v; + let rl = r.l; if (height(rr) >= height(rl)) { return create(create(l, x, d, rl), rv, rd, rr); } @@ -97,11 +97,11 @@ function add(x, data, param) { h: 1 }; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = x - v | 0; + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = x - v | 0; if (c === 0) { if (d === data) { return param; @@ -117,14 +117,14 @@ function add(x, data, param) { } } if (c < 0) { - var ll = add(x, data, l); + let ll = add(x, data, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = add(x, data, r); + let rr = add(x, data, r); if (r === rr) { return param; } else { @@ -134,14 +134,14 @@ function add(x, data, param) { function find(x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var c = x - param.v | 0; + let c = x - param.v | 0; if (c === 0) { return param.d; } @@ -151,11 +151,11 @@ function find(x, _param) { } function test(param) { - var m = "Empty"; - for(var i = 0; i <= 1000000; ++i){ + let m = "Empty"; + for(let i = 0; i <= 1000000; ++i){ m = add(i, i, m); } - for(var i$1 = 0; i$1 <= 1000000; ++i$1){ + for(let i$1 = 0; i$1 <= 1000000; ++i$1){ find(i$1, m); } } diff --git a/jscomp/test/demo_page.js b/jscomp/test/demo_page.js index b1d0047364..e7c9ae5352 100644 --- a/jscomp/test/demo_page.js +++ b/jscomp/test/demo_page.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); -var React = require("react"); -var ReactDom = require("react-dom"); +let Curry = require("../../lib/js/curry.js"); +let React = require("react"); +let ReactDom = require("react-dom"); function fib(x) { if (x === 2 || x === 1) { @@ -14,8 +14,8 @@ function fib(x) { } function sum(n) { - var v = 0; - for(var i = 0; i <= n; ++i){ + let v = 0; + for(let i = 0; i <= n; ++i){ v = v + i | 0; } return v; diff --git a/jscomp/test/derive_projector_test.js b/jscomp/test/derive_projector_test.js index ba7461db9e..6ed61163a3 100644 --- a/jscomp/test/derive_projector_test.js +++ b/jscomp/test/derive_projector_test.js @@ -51,12 +51,12 @@ function d(param) { return param.d; } -var v = { +let v = { TAG: "D_int", _0: 3 }; -var h_1 = { +let h_1 = { hd: { TAG: "D_int", _0: 3 @@ -86,7 +86,7 @@ var h_1 = { } }; -var h = { +let h = { hd: "D_empty", tl: h_1 }; @@ -105,9 +105,9 @@ function a(param_0) { }; } -var d_empty = "D_empty"; +let d_empty = "D_empty"; -var hei = "Hei"; +let hei = "Hei"; exports.u_x = u_x; exports.b_x = b_x; diff --git a/jscomp/test/digest_test.js b/jscomp/test/digest_test.js index 57ff64e773..2ceaad6b71 100644 --- a/jscomp/test/digest_test.js +++ b/jscomp/test/digest_test.js @@ -1,18 +1,18 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var $$Array = require("../../lib/js/array.js"); -var Digest = require("../../lib/js/digest.js"); -var Caml_array = require("../../lib/js/caml_array.js"); -var Pervasives = require("../../lib/js/pervasives.js"); -var Ext_array_test = require("./ext_array_test.js"); +let Mt = require("./mt.js"); +let $$Array = require("../../lib/js/array.js"); +let Digest = require("../../lib/js/digest.js"); +let Caml_array = require("../../lib/js/caml_array.js"); +let Pervasives = require("../../lib/js/pervasives.js"); +let Ext_array_test = require("./ext_array_test.js"); function f(x) { return Digest.to_hex(Digest.string(x)); } -var ref = [ +let ref = [ "d41d8cd98f00b204e9800998ecf8427e", "0cc175b9c0f1b6a831c399e269772661", "4124bc0a9335c27f086f24ba207a4912", diff --git a/jscomp/test/directives.js b/jscomp/test/directives.js index bb2c1a80d8..b06be85582 100644 --- a/jscomp/test/directives.js +++ b/jscomp/test/directives.js @@ -3,9 +3,9 @@ second directive; // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Belt_Array = require("../../lib/js/belt_Array.js"); +let Belt_Array = require("../../lib/js/belt_Array.js"); -var a = Belt_Array.forEach; +let a = Belt_Array.forEach; exports.a = a; /* No side effect */ diff --git a/jscomp/test/div_by_zero_test.js b/jscomp/test/div_by_zero_test.js index a5b993cf9f..b2851ede0a 100644 --- a/jscomp/test/div_by_zero_test.js +++ b/jscomp/test/div_by_zero_test.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_int32 = require("../../lib/js/caml_int32.js"); -var Caml_int64 = require("../../lib/js/caml_int64.js"); +let Mt = require("./mt.js"); +let Caml_int32 = require("../../lib/js/caml_int32.js"); +let Caml_int64 = require("../../lib/js/caml_int64.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; diff --git a/jscomp/test/dollar_escape_test.js b/jscomp/test/dollar_escape_test.js index 04aca38a5a..b5c9c7532a 100644 --- a/jscomp/test/dollar_escape_test.js +++ b/jscomp/test/dollar_escape_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -42,9 +42,9 @@ eq("File \"dollar_escape_test.res\", line 18, characters 3-10", 3, 3); Mt.from_pair_suites("Dollar_escape_test", suites.contents); -var v = 3; +let v = 3; -var u = 3; +let u = 3; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/earger_curry_test.js b/jscomp/test/earger_curry_test.js index 01806dd556..698bed75a6 100644 --- a/jscomp/test/earger_curry_test.js +++ b/jscomp/test/earger_curry_test.js @@ -1,26 +1,26 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Curry = require("../../lib/js/curry.js"); -var Caml_array = require("../../lib/js/caml_array.js"); -var Pervasives = require("../../lib/js/pervasives.js"); +let Mt = require("./mt.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_array = require("../../lib/js/caml_array.js"); +let Pervasives = require("../../lib/js/pervasives.js"); function map(f, a) { - var f$1 = Curry.__1(f); - var l = a.length; + let f$1 = Curry.__1(f); + let l = a.length; if (l === 0) { return []; } - var r = Caml_array.make(l, f$1(a[0])); - for(var i = 1; i < l; ++i){ + let r = Caml_array.make(l, f$1(a[0])); + for(let i = 1; i < l; ++i){ r[i] = f$1(a[i]); } return r; } function init(l, f) { - var f$1 = Curry.__1(f); + let f$1 = Curry.__1(f); if (l === 0) { return []; } @@ -31,30 +31,30 @@ function init(l, f) { Error: new Error() }; } - var res = Caml_array.make(l, f$1(0)); - for(var i = 1; i < l; ++i){ + let res = Caml_array.make(l, f$1(0)); + for(let i = 1; i < l; ++i){ res[i] = f$1(i); } return res; } function fold_left(f, x, a) { - var f$1 = Curry.__2(f); - var r = x; - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + let f$1 = Curry.__2(f); + let r = x; + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ r = f$1(r, a[i]); } return r; } function f2(param) { - var arr = init(30000000, (function (i) { + let arr = init(30000000, (function (i) { return i; })); - var b = map((function (i) { + let b = map((function (i) { return i + i - 1; }), arr); - var v = fold_left((function (prim0, prim1) { + let v = fold_left((function (prim0, prim1) { return prim0 + prim1; }), 0, b); console.log(Pervasives.string_of_float(v)); @@ -62,11 +62,11 @@ function f2(param) { f2(); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -87,11 +87,11 @@ function eq(loc, x, y) { }; } -var v = { +let v = { contents: 0 }; -var all_v = { +let all_v = { contents: /* [] */0 }; @@ -112,9 +112,9 @@ function add5(a0, a1, a2, a3, a4) { function f(x) { v.contents = v.contents + 1 | 0; - var partial_arg = 2; + let partial_arg = 2; v.contents = v.contents + 1 | 0; - var partial_arg$1 = 1; + let partial_arg$1 = 1; return function (param, param$1) { return add5(x, partial_arg$1, partial_arg, param, param$1); }; @@ -122,10 +122,10 @@ function f(x) { function g(x) { v.contents = v.contents + 1 | 0; - var partial_arg = 2; + let partial_arg = 2; v.contents = v.contents + 1 | 0; - var partial_arg$1 = 1; - var u = function (param, param$1) { + let partial_arg$1 = 1; + let u = function (param, param$1) { return add5(x, partial_arg$1, partial_arg, param, param$1); }; all_v.contents = { @@ -135,13 +135,13 @@ function g(x) { return u; } -var a = f(0)(3, 4); +let a = f(0)(3, 4); -var b = f(0)(3, 5); +let b = f(0)(3, 5); -var c = Curry._2(g(0), 3, 4); +let c = Curry._2(g(0), 3, 4); -var d = Curry._2(g(0), 3, 5); +let d = Curry._2(g(0), 3, 5); eq("File \"earger_curry_test.res\", line 138, characters 5-12", a, 10); diff --git a/jscomp/test/effect.js b/jscomp/test/effect.js index 9dbab81408..9b2a8742c7 100644 --- a/jscomp/test/effect.js +++ b/jscomp/test/effect.js @@ -6,11 +6,11 @@ console.log("hello"); console.log("hey"); -var a = 3; +let a = 3; -var b = 4; +let b = 4; -var c = 3; +let c = 3; exports.a = a; exports.b = b; diff --git a/jscomp/test/epsilon_test.js b/jscomp/test/epsilon_test.js index 9e710bb2e9..07c8ae1e65 100644 --- a/jscomp/test/epsilon_test.js +++ b/jscomp/test/epsilon_test.js @@ -1,12 +1,12 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Pervasives = require("../../lib/js/pervasives.js"); +let Mt = require("./mt.js"); +let Pervasives = require("../../lib/js/pervasives.js"); -var v = (Number.EPSILON?Number.EPSILON:2.220446049250313e-16); +let v = (Number.EPSILON?Number.EPSILON:2.220446049250313e-16); -var suites_0 = [ +let suites_0 = [ "epsilon", (function (param) { return { @@ -17,7 +17,7 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "raw_epsilon", (function (param) { @@ -31,7 +31,7 @@ var suites_1 = { tl: /* [] */0 }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/equal_box_test.js b/jscomp/test/equal_box_test.js index 12d1d4eaed..ee87a62d8a 100644 --- a/jscomp/test/equal_box_test.js +++ b/jscomp/test/equal_box_test.js @@ -1,21 +1,21 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Caml_int64 = require("../../lib/js/caml_int64.js"); +let Mt = require("./mt.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Caml_int64 = require("../../lib/js/caml_int64.js"); -var aa = Caml_obj.equal_null; +let aa = Caml_obj.equal_null; -var bb = Caml_obj.equal_undefined; +let bb = Caml_obj.equal_undefined; -var cc = Caml_obj.equal_nullable; +let cc = Caml_obj.equal_nullable; -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -59,7 +59,7 @@ b("File \"equal_box_test.res\", line 28, characters 4-11", true); b("File \"equal_box_test.res\", line 29, characters 4-11", !Caml_obj.equal_null(3, undefined)); -var v = null; +let v = null; b("File \"equal_box_test.res\", line 34, characters 4-11", 3 !== v); diff --git a/jscomp/test/equal_exception_test.js b/jscomp/test/equal_exception_test.js index 57f9b97fe7..f5594faac7 100644 --- a/jscomp/test/equal_exception_test.js +++ b/jscomp/test/equal_exception_test.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Bytes = require("../../lib/js/bytes.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Caml_bytes = require("../../lib/js/caml_bytes.js"); -var Caml_string = require("../../lib/js/caml_string.js"); -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let Mt = require("./mt.js"); +let Bytes = require("../../lib/js/bytes.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Caml_bytes = require("../../lib/js/caml_bytes.js"); +let Caml_string = require("../../lib/js/caml_string.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); -var v = "gso"; +let v = "gso"; function is_equal(param) { if (Caml_bytes.get(Bytes.make(3, /* 'a' */97), 0) !== /* 'a' */97) { @@ -34,7 +34,7 @@ function is_equal(param) { Error: new Error() }; } - var u = Bytes.make(3, /* 'a' */97); + let u = Bytes.make(3, /* 'a' */97); u[0] = /* 'b' */98; if (u[0] !== /* 'b' */98) { throw { @@ -69,7 +69,7 @@ function is_exception(param) { }; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { return; } @@ -78,8 +78,8 @@ function is_exception(param) { } function is_normal_exception(_x) { - var A = /* @__PURE__ */Caml_exceptions.create("A"); - var v = { + let A = /* @__PURE__ */Caml_exceptions.create("A"); + let v = { RE_EXN_ID: A, _1: 3 }; @@ -87,7 +87,7 @@ function is_normal_exception(_x) { throw v; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === A) { if (exn._1 === 3) { return; @@ -99,7 +99,7 @@ function is_normal_exception(_x) { } function is_arbitrary_exception(param) { - var A = /* @__PURE__ */Caml_exceptions.create("A"); + let A = /* @__PURE__ */Caml_exceptions.create("A"); try { throw { RE_EXN_ID: A, @@ -111,12 +111,12 @@ function is_arbitrary_exception(param) { } } -var suites_0 = [ +let suites_0 = [ "is_equal", is_equal ]; -var suites_1 = { +let suites_1 = { hd: [ "is_exception", is_exception @@ -136,12 +136,12 @@ var suites_1 = { } }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; -var e = { +let e = { RE_EXN_ID: "Not_found" }; @@ -149,7 +149,7 @@ function eq(x) { return x.RE_EXN_ID === "Not_found"; } -var Not_found = /* @__PURE__ */Caml_exceptions.create("Equal_exception_test.Not_found"); +let Not_found = /* @__PURE__ */Caml_exceptions.create("Equal_exception_test.Not_found"); if (Caml_obj.equal(e, { RE_EXN_ID: Not_found diff --git a/jscomp/test/equal_test.js b/jscomp/test/equal_test.js index c7f3bd2662..f41ecca9b3 100644 --- a/jscomp/test/equal_test.js +++ b/jscomp/test/equal_test.js @@ -6,7 +6,7 @@ function str_equal(x, y) { return x === y; } -var str_b = true; +let str_b = true; function int_equal(x, y) { return x === y; @@ -16,7 +16,7 @@ function float_equal(x, y) { return x === y; } -var v = false; +let v = false; exports.str_equal = str_equal; exports.str_b = str_b; diff --git a/jscomp/test/es6_export.js b/jscomp/test/es6_export.js index 6ea1b9683b..b3edc62b7a 100644 --- a/jscomp/test/es6_export.js +++ b/jscomp/test/es6_export.js @@ -2,7 +2,7 @@ 'use strict'; -var $$default = 3; +let $$default = 3; exports.default = $$default; exports.__esModule = true; diff --git a/jscomp/test/es6_export.mjs b/jscomp/test/es6_export.mjs index e20f50b87f..7ffde2b65e 100644 --- a/jscomp/test/es6_export.mjs +++ b/jscomp/test/es6_export.mjs @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE -var $$default = 3; +let $$default = 3; export { $$default as default, diff --git a/jscomp/test/es6_import.js b/jscomp/test/es6_import.js index 8af25c4b9f..a196ed1ef7 100644 --- a/jscomp/test/es6_import.js +++ b/jscomp/test/es6_import.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Es6_export = require("./es6_export.js"); +let Es6_export = require("./es6_export.js"); console.log(Es6_export.default); diff --git a/jscomp/test/es6_module_test.js b/jscomp/test/es6_module_test.js index 50c8346001..08a57ee793 100644 --- a/jscomp/test/es6_module_test.js +++ b/jscomp/test/es6_module_test.js @@ -1,8 +1,8 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var List = require("../../lib/js/list.js"); +let Mt = require("./mt.js"); +let List = require("../../lib/js/list.js"); function length(param) { return 3; diff --git a/jscomp/test/escape_esmodule.js b/jscomp/test/escape_esmodule.js index 40ca26b287..3e8d98b76b 100644 --- a/jscomp/test/escape_esmodule.js +++ b/jscomp/test/escape_esmodule.js @@ -2,9 +2,9 @@ 'use strict'; -var $$__esModule = false; +let $$__esModule = false; -var $$default = 4; +let $$default = 4; exports.$$__esModule = $$__esModule; exports.default = $$default; diff --git a/jscomp/test/event_ffi.js b/jscomp/test/event_ffi.js index e422d719e3..eefdb27560 100644 --- a/jscomp/test/event_ffi.js +++ b/jscomp/test/event_ffi.js @@ -1,8 +1,8 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var List = require("../../lib/js/list.js"); -var Curry = require("../../lib/js/curry.js"); +let List = require("../../lib/js/list.js"); +let Curry = require("../../lib/js/curry.js"); function h0(x) { return x(); @@ -35,7 +35,7 @@ function h34(x) { } function ocaml_run(b, c) { - var x = 1; + let x = 1; return (x + b | 0) + c | 0; } @@ -63,7 +63,7 @@ function xx(param) { }; } -var test_as = List.map; +let test_as = List.map; exports.h0 = h0; exports.h00 = h00; diff --git a/jscomp/test/exception_alias.js b/jscomp/test/exception_alias.js index 98cc19f7fe..da3b52db8c 100644 --- a/jscomp/test/exception_alias.js +++ b/jscomp/test/exception_alias.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var List = require("../../lib/js/list.js"); +let List = require("../../lib/js/list.js"); -var a0 = { +let a0 = { RE_EXN_ID: "Not_found" }; -var b = List.length({ +let b = List.length({ hd: 1, tl: { hd: 2, @@ -15,7 +15,7 @@ var b = List.length({ } }); -var List$1 = { +let List$1 = { compare_lengths: List.compare_lengths, compare_length_with: List.compare_length_with, cons: List.cons, @@ -71,15 +71,15 @@ var List$1 = { length: 3 }; -var a1 = a0; +let a1 = a0; -var a2 = a0; +let a2 = a0; -var a3 = a0; +let a3 = a0; -var a4 = a0; +let a4 = a0; -var a5 = a0; +let a5 = a0; exports.a0 = a0; exports.a1 = a1; diff --git a/jscomp/test/exception_raise_test.js b/jscomp/test/exception_raise_test.js index 96e27358c4..de64bce735 100644 --- a/jscomp/test/exception_raise_test.js +++ b/jscomp/test/exception_raise_test.js @@ -1,28 +1,28 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var List = require("../../lib/js/list.js"); -var Curry = require("../../lib/js/curry.js"); -var Js_exn = require("../../lib/js/js_exn.js"); -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let Mt = require("./mt.js"); +let List = require("../../lib/js/list.js"); +let Curry = require("../../lib/js/curry.js"); +let Js_exn = require("../../lib/js/js_exn.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); -var Local = /* @__PURE__ */Caml_exceptions.create("Exception_raise_test.Local"); +let Local = /* @__PURE__ */Caml_exceptions.create("Exception_raise_test.Local"); -var B = /* @__PURE__ */Caml_exceptions.create("Exception_raise_test.B"); +let B = /* @__PURE__ */Caml_exceptions.create("Exception_raise_test.B"); -var C = /* @__PURE__ */Caml_exceptions.create("Exception_raise_test.C"); +let C = /* @__PURE__ */Caml_exceptions.create("Exception_raise_test.C"); -var D = /* @__PURE__ */Caml_exceptions.create("Exception_raise_test.D"); +let D = /* @__PURE__ */Caml_exceptions.create("Exception_raise_test.D"); function appf(g, x) { - var A = /* @__PURE__ */Caml_exceptions.create("A"); + let A = /* @__PURE__ */Caml_exceptions.create("A"); try { return Curry._1(g, x); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === Local) { return 3; } @@ -41,15 +41,15 @@ function appf(g, x) { return 4; } } - var match = exn._1; + let match = exn._1; if (!match) { return 4; } - var match$1 = match.tl; + let match$1 = match.tl; if (!match$1) { return 4; } - var match$2 = match$1.tl; + let match$2 = match$1.tl; if (match$2) { return match$2.hd; } else { @@ -58,45 +58,45 @@ function appf(g, x) { } } -var A = /* @__PURE__ */Caml_exceptions.create("Exception_raise_test.A"); +let A = /* @__PURE__ */Caml_exceptions.create("Exception_raise_test.A"); -var f; +let f; try { f = (function () {throw (new Error ("x"))} ()); } catch (raw_x){ - var x = Caml_js_exceptions.internalToOCamlException(raw_x); + let x = Caml_js_exceptions.internalToOCamlException(raw_x); f = x.RE_EXN_ID === A ? x._1 : 2; } -var ff; +let ff; try { ff = (function () {throw 3} ()); } catch (raw_x$1){ - var x$1 = Caml_js_exceptions.internalToOCamlException(raw_x$1); + let x$1 = Caml_js_exceptions.internalToOCamlException(raw_x$1); ff = x$1.RE_EXN_ID === A ? x$1._1 : 2; } -var fff; +let fff; try { fff = (function () {throw 2} ()); } catch (raw_x$2){ - var x$2 = Caml_js_exceptions.internalToOCamlException(raw_x$2); + let x$2 = Caml_js_exceptions.internalToOCamlException(raw_x$2); fff = x$2.RE_EXN_ID === A ? x$2._1 : 2; } -var a0; +let a0; try { a0 = (function (){throw 2} ()); } catch (raw_x$3){ - var x$3 = Caml_js_exceptions.internalToOCamlException(raw_x$3); + let x$3 = Caml_js_exceptions.internalToOCamlException(raw_x$3); if (x$3.RE_EXN_ID === A || x$3.RE_EXN_ID === Js_exn.$$Error) { a0 = x$3._1; } else { @@ -112,7 +112,7 @@ catch (raw_x$3){ } } -var a1; +let a1; try { a1 = (function (){throw 2} ()); @@ -121,7 +121,7 @@ catch (raw_e){ a1 = Caml_js_exceptions.internalToOCamlException(raw_e); } -var a2; +let a2; try { a2 = (function (){throw (new Error("x"))} ()); @@ -130,7 +130,7 @@ catch (raw_e$1){ a2 = Caml_js_exceptions.internalToOCamlException(raw_e$1); } -var suites = { +let suites = { contents: { hd: [ "File \"exception_raise_test.res\", line 120, characters 5-12", @@ -179,7 +179,7 @@ var suites = { } }; -var test_id = { +let test_id = { contents: 0 }; @@ -191,7 +191,7 @@ try { ((()=>{throw 2})()); } catch (raw_e$2){ - var e = Caml_js_exceptions.internalToOCamlException(raw_e$2); + let e = Caml_js_exceptions.internalToOCamlException(raw_e$2); eq("File \"exception_raise_test.res\", line 137, characters 10-17", Caml_js_exceptions.as_js_exn(e) !== undefined, true); } @@ -202,12 +202,12 @@ try { }; } catch (raw_e$3){ - var e$1 = Caml_js_exceptions.internalToOCamlException(raw_e$3); + let e$1 = Caml_js_exceptions.internalToOCamlException(raw_e$3); eq("File \"exception_raise_test.res\", line 141, characters 10-17", Caml_js_exceptions.as_js_exn(e$1) !== undefined, false); } function fff0(x, g) { - var val; + let val; try { val = Curry._1(x, undefined); } @@ -219,8 +219,8 @@ function fff0(x, g) { function input_lines(ic, _acc) { while(true) { - var acc = _acc; - var line; + let acc = _acc; + let line; try { line = input_line(ic); } diff --git a/jscomp/test/exception_rebound_err_test.js b/jscomp/test/exception_rebound_err_test.js index 0e11e84aaa..d9ad524e89 100644 --- a/jscomp/test/exception_rebound_err_test.js +++ b/jscomp/test/exception_rebound_err_test.js @@ -1,16 +1,16 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Curry = require("../../lib/js/curry.js"); -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let Mt = require("./mt.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -31,11 +31,11 @@ function eq(loc, x, y) { }; } -var A = /* @__PURE__ */Caml_exceptions.create("Exception_rebound_err_test.A"); +let A = /* @__PURE__ */Caml_exceptions.create("Exception_rebound_err_test.A"); -var B = /* @__PURE__ */Caml_exceptions.create("Exception_rebound_err_test.B"); +let B = /* @__PURE__ */Caml_exceptions.create("Exception_rebound_err_test.B"); -var C = /* @__PURE__ */Caml_exceptions.create("Exception_rebound_err_test.C"); +let C = /* @__PURE__ */Caml_exceptions.create("Exception_rebound_err_test.C"); function test_js_error4(param) { try { @@ -43,7 +43,7 @@ function test_js_error4(param) { return 1; } catch (raw_e){ - var e = Caml_js_exceptions.internalToOCamlException(raw_e); + let e = Caml_js_exceptions.internalToOCamlException(raw_e); if (e.RE_EXN_ID === "Not_found") { return 2; } @@ -71,7 +71,7 @@ function f(g) { return Curry._1(g, undefined); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { return 1; } diff --git a/jscomp/test/exception_value_test.js b/jscomp/test/exception_value_test.js index b58704a480..aba2a66913 100644 --- a/jscomp/test/exception_value_test.js +++ b/jscomp/test/exception_value_test.js @@ -1,10 +1,10 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); -var Js_exn = require("../../lib/js/js_exn.js"); -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let Curry = require("../../lib/js/curry.js"); +let Js_exn = require("../../lib/js/js_exn.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); function f(param) { throw { @@ -35,13 +35,13 @@ function hh(param) { }; } -var A = /* @__PURE__ */Caml_exceptions.create("Exception_value_test.A"); +let A = /* @__PURE__ */Caml_exceptions.create("Exception_value_test.A"); -var B = /* @__PURE__ */Caml_exceptions.create("Exception_value_test.B"); +let B = /* @__PURE__ */Caml_exceptions.create("Exception_value_test.B"); -var C = /* @__PURE__ */Caml_exceptions.create("Exception_value_test.C"); +let C = /* @__PURE__ */Caml_exceptions.create("Exception_value_test.C"); -var u = { +let u = { RE_EXN_ID: A, _1: 3 }; @@ -51,7 +51,7 @@ function test_not_found(f, param) { return Curry._1(f, undefined); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { return 2; } @@ -64,7 +64,7 @@ function test_js_error2(param) { return JSON.parse(" {\"x\" : }"); } catch (raw_e){ - var e = Caml_js_exceptions.internalToOCamlException(raw_e); + let e = Caml_js_exceptions.internalToOCamlException(raw_e); if (e.RE_EXN_ID === Js_exn.$$Error) { console.log(e._1.stack); throw e; diff --git a/jscomp/test/exponentiation_precedence_test.js b/jscomp/test/exponentiation_precedence_test.js index 49fb7f5e84..9b5fbe7102 100644 --- a/jscomp/test/exponentiation_precedence_test.js +++ b/jscomp/test/exponentiation_precedence_test.js @@ -2,13 +2,13 @@ 'use strict'; -var a = Math.pow(2, Math.pow(3, 2)); +let a = Math.pow(2, Math.pow(3, 2)); -var b = Math.pow(2, Math.pow(-3, 2)); +let b = Math.pow(2, Math.pow(-3, 2)); -var c = Math.pow(Math.pow(2, 3), 2); +let c = Math.pow(Math.pow(2, 3), 2); -var d = Math.pow(-2, 2); +let d = Math.pow(-2, 2); exports.a = a; exports.b = b; diff --git a/jscomp/test/export_keyword.js b/jscomp/test/export_keyword.js index 5ac6904154..b69b473b54 100644 --- a/jscomp/test/export_keyword.js +++ b/jscomp/test/export_keyword.js @@ -2,11 +2,11 @@ 'use strict'; -var $$case = 3; +let $$case = 3; -var $$window = 2; +let $$window = 2; -var $$switch = 3; +let $$switch = 3; exports.$$case = $$case; exports.$$window = $$window; diff --git a/jscomp/test/ext_array_test.js b/jscomp/test/ext_array_test.js index 0e90858fa9..010a958828 100644 --- a/jscomp/test/ext_array_test.js +++ b/jscomp/test/ext_array_test.js @@ -1,18 +1,18 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var List = require("../../lib/js/list.js"); -var $$Array = require("../../lib/js/array.js"); -var Curry = require("../../lib/js/curry.js"); -var Caml_array = require("../../lib/js/caml_array.js"); -var Caml_option = require("../../lib/js/caml_option.js"); +let List = require("../../lib/js/list.js"); +let $$Array = require("../../lib/js/array.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_array = require("../../lib/js/caml_array.js"); +let Caml_option = require("../../lib/js/caml_option.js"); function reverse_range(a, i, len) { if (len === 0) { return; } - for(var k = 0 ,k_finish = (len - 1 | 0) / 2 | 0; k <= k_finish; ++k){ - var t = a[i + k | 0]; + for(let k = 0 ,k_finish = (len - 1 | 0) / 2 | 0; k <= k_finish; ++k){ + let t = a[i + k | 0]; a[i + k | 0] = a[((i + len | 0) - 1 | 0) - k | 0]; a[((i + len | 0) - 1 | 0) - k | 0] = t; } @@ -23,12 +23,12 @@ function reverse_in_place(a) { } function reverse(a) { - var b_len = a.length; + let b_len = a.length; if (b_len === 0) { return []; } - var b = $$Array.copy(a); - for(var i = 0; i < b_len; ++i){ + let b = $$Array.copy(a); + for(let i = 0; i < b_len; ++i){ b[i] = a[(b_len - 1 | 0) - i | 0]; } return b; @@ -38,13 +38,13 @@ function reverse_of_list(x) { if (!x) { return []; } - var len = List.length(x); - var a = Caml_array.make(len, x.hd); - var _i = 0; - var _x = x.tl; + let len = List.length(x); + let a = Caml_array.make(len, x.hd); + let _i = 0; + let _x = x.tl; while(true) { - var x$1 = _x; - var i = _i; + let x$1 = _x; + let i = _i; if (!x$1) { return a; } @@ -56,16 +56,16 @@ function reverse_of_list(x) { } function filter(f, a) { - var arr_len = a.length; - var _acc = /* [] */0; - var _i = 0; + let arr_len = a.length; + let _acc = /* [] */0; + let _i = 0; while(true) { - var i = _i; - var acc = _acc; + let i = _i; + let acc = _acc; if (i === arr_len) { return reverse_of_list(acc); } - var v = a[i]; + let v = a[i]; if (Curry._1(f, v)) { _i = i + 1 | 0; _acc = { @@ -80,17 +80,17 @@ function filter(f, a) { } function filter_map(f, a) { - var arr_len = a.length; - var _acc = /* [] */0; - var _i = 0; + let arr_len = a.length; + let _acc = /* [] */0; + let _i = 0; while(true) { - var i = _i; - var acc = _acc; + let i = _i; + let acc = _acc; if (i === arr_len) { return reverse_of_list(acc); } - var v = a[i]; - var v$1 = Curry._1(f, v); + let v = a[i]; + let v$1 = Curry._1(f, v); if (v$1 !== undefined) { _i = i + 1 | 0; _acc = { @@ -118,7 +118,7 @@ function range(from, to_) { } function map2i(f, a, b) { - var len = a.length; + let len = a.length; if (len !== b.length) { throw { RE_EXN_ID: "Invalid_argument", @@ -133,13 +133,13 @@ function map2i(f, a, b) { function tolist_aux(a, f, _i, _res) { while(true) { - var res = _res; - var i = _i; + let res = _res; + let i = _i; if (i < 0) { return res; } - var v = a[i]; - var v$1 = Curry._1(f, v); + let v = a[i]; + let v$1 = Curry._1(f, v); _res = v$1 !== undefined ? ({ hd: Caml_option.valFromOption(v$1), tl: res @@ -161,15 +161,15 @@ function of_list_map(f, a) { if (!a) { return []; } - var tl = a.tl; - var hd = Curry._1(f, a.hd); - var len = List.length(tl) + 1 | 0; - var arr = Caml_array.make(len, hd); - var _i = 1; - var _x = tl; + let tl = a.tl; + let hd = Curry._1(f, a.hd); + let len = List.length(tl) + 1 | 0; + let arr = Caml_array.make(len, hd); + let _i = 1; + let _x = tl; while(true) { - var x = _x; - var i = _i; + let x = _x; + let i = _i; if (!x) { return arr; } @@ -181,10 +181,10 @@ function of_list_map(f, a) { } function rfind_with_index(arr, cmp, v) { - var len = arr.length; - var _i = len - 1 | 0; + let len = arr.length; + let _i = len - 1 | 0; while(true) { - var i = _i; + let i = _i; if (i < 0) { return i; } @@ -197,7 +197,7 @@ function rfind_with_index(arr, cmp, v) { } function rfind_and_split(arr, cmp, v) { - var i = rfind_with_index(arr, cmp, v); + let i = rfind_with_index(arr, cmp, v); if (i < 0) { return "No_split"; } else { @@ -212,10 +212,10 @@ function rfind_and_split(arr, cmp, v) { } function find_with_index(arr, cmp, v) { - var len = arr.length; - var _i = 0; + let len = arr.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i >= len) { return -1; } @@ -228,7 +228,7 @@ function find_with_index(arr, cmp, v) { } function find_and_split(arr, cmp, v) { - var i = find_with_index(arr, cmp, v); + let i = find_with_index(arr, cmp, v); if (i < 0) { return "No_split"; } else { @@ -243,10 +243,10 @@ function find_and_split(arr, cmp, v) { } function exists(p, a) { - var n = a.length; - var _i = 0; + let n = a.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === n) { return false; } @@ -264,7 +264,7 @@ function is_empty(arr) { function unsafe_loop(_index, len, p, xs, ys) { while(true) { - var index = _index; + let index = _index; if (index >= len) { return true; } @@ -277,8 +277,8 @@ function unsafe_loop(_index, len, p, xs, ys) { } function for_all2_no_exn(p, xs, ys) { - var len_xs = xs.length; - var len_ys = ys.length; + let len_xs = xs.length; + let len_ys = ys.length; if (len_xs === len_ys) { return unsafe_loop(0, len_xs, p, xs, ys); } else { diff --git a/jscomp/test/ext_bytes_test.js b/jscomp/test/ext_bytes_test.js index 3a2bd14234..5867be472a 100644 --- a/jscomp/test/ext_bytes_test.js +++ b/jscomp/test/ext_bytes_test.js @@ -1,20 +1,20 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml = require("../../lib/js/caml.js"); -var Char = require("../../lib/js/char.js"); -var Bytes = require("../../lib/js/bytes.js"); -var Curry = require("../../lib/js/curry.js"); -var Caml_bytes = require("../../lib/js/caml_bytes.js"); -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); - -var suites = { +let Mt = require("./mt.js"); +let Caml = require("../../lib/js/caml.js"); +let Char = require("../../lib/js/char.js"); +let Bytes = require("../../lib/js/bytes.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_bytes = require("../../lib/js/caml_bytes.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); + +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -23,9 +23,9 @@ function eq(loc, x, y) { } function escaped(s) { - var n = 0; - for(var i = 0 ,i_finish = s.length; i < i_finish; ++i){ - var match = s[i]; + let n = 0; + for(let i = 0 ,i_finish = s.length; i < i_finish; ++i){ + let match = s[i]; n = n + ( match >= 32 ? ( match > 92 || match < 34 ? ( @@ -45,11 +45,11 @@ function escaped(s) { if (n === s.length) { return Bytes.copy(s); } - var s$p = Caml_bytes.create(n); + let s$p = Caml_bytes.create(n); n = 0; - for(var i$1 = 0 ,i_finish$1 = s.length; i$1 < i_finish$1; ++i$1){ - var c = s[i$1]; - var exit = 0; + for(let i$1 = 0 ,i_finish$1 = s.length; i$1 < i_finish$1; ++i$1){ + let c = s[i$1]; + let exit = 0; if (c >= 35) { if (c !== 92) { if (c >= 127) { @@ -128,14 +128,14 @@ function escaped(s) { } function starts_with(xs, prefix, p) { - var H = /* @__PURE__ */Caml_exceptions.create("H"); - var len1 = xs.length; - var len2 = prefix.length; + let H = /* @__PURE__ */Caml_exceptions.create("H"); + let len1 = xs.length; + let len2 = prefix.length; if (len2 > len1) { return false; } try { - for(var i = 0; i < len2; ++i){ + for(let i = 0; i < len2; ++i){ if (!Curry._2(p, Caml_bytes.get(xs, i), Caml_bytes.get(prefix, i))) { throw { RE_EXN_ID: H, @@ -147,7 +147,7 @@ function starts_with(xs, prefix, p) { return true; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === H) { return false; } @@ -155,23 +155,23 @@ function starts_with(xs, prefix, p) { } } -var a = Bytes.init(100, Char.chr); +let a = Bytes.init(100, Char.chr); Bytes.blit(a, 5, a, 10, 10); eq("File \"ext_bytes_test.res\", line 116, characters 4-11", a, Bytes.of_string("\x00\x01\x02\x03\x04\x05\x06\x07\b\t\x05\x06\x07\b\t\n\x0b\x0c\r\x0e\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abc")); -var a$1 = Bytes.init(100, Char.chr); +let a$1 = Bytes.init(100, Char.chr); Bytes.blit(a$1, 10, a$1, 5, 10); eq("File \"ext_bytes_test.res\", line 128, characters 4-11", a$1, Bytes.of_string("\x00\x01\x02\x03\x04\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abc")); -var f = Char.chr; +let f = Char.chr; -var a$2 = Bytes.unsafe_to_string(Bytes.init(100, f)); +let a$2 = Bytes.unsafe_to_string(Bytes.init(100, f)); -var b = Bytes.init(100, (function (i) { +let b = Bytes.init(100, (function (i) { return /* '\000' */0; })); @@ -179,13 +179,13 @@ Bytes.blit_string(a$2, 10, b, 5, 10); eq("File \"ext_bytes_test.res\", line 141, characters 4-11", b, Bytes.of_string("\x00\x00\x00\x00\x00\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00")); -var s = Bytes.init(50000, (function (i) { +let s = Bytes.init(50000, (function (i) { return Char.chr(i % 137); })); -var s1 = Bytes.to_string(s); +let s1 = Bytes.to_string(s); -var s2 = Bytes.of_string(s1); +let s2 = Bytes.of_string(s1); eq("File \"ext_bytes_test.res\", line 153, characters 5-12", s, s2); diff --git a/jscomp/test/ext_filename_test.js b/jscomp/test/ext_filename_test.js index 6b1d38112a..05da3e3a3e 100644 --- a/jscomp/test/ext_filename_test.js +++ b/jscomp/test/ext_filename_test.js @@ -1,26 +1,26 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Sys = require("../../lib/js/sys.js"); -var List = require("../../lib/js/list.js"); -var $$Array = require("../../lib/js/array.js"); -var Bytes = require("../../lib/js/bytes.js"); -var Curry = require("../../lib/js/curry.js"); -var Caml_sys = require("../../lib/js/caml_sys.js"); -var Filename = require("../../lib/js/filename.js"); -var Pervasives = require("../../lib/js/pervasives.js"); -var Test_literals = require("./test_literals.js"); -var Ext_string_test = require("./ext_string_test.js"); -var CamlinternalLazy = require("../../lib/js/camlinternalLazy.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let Sys = require("../../lib/js/sys.js"); +let List = require("../../lib/js/list.js"); +let $$Array = require("../../lib/js/array.js"); +let Bytes = require("../../lib/js/bytes.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_sys = require("../../lib/js/caml_sys.js"); +let Filename = require("../../lib/js/filename.js"); +let Pervasives = require("../../lib/js/pervasives.js"); +let Test_literals = require("./test_literals.js"); +let Ext_string_test = require("./ext_string_test.js"); +let CamlinternalLazy = require("../../lib/js/camlinternalLazy.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); -var node_sep = "/"; +let node_sep = "/"; -var node_parent = ".."; +let node_parent = ".."; -var node_current = "."; +let node_current = "."; -var cwd = CamlinternalLazy.from_fun(function () { +let cwd = CamlinternalLazy.from_fun(function () { return Caml_sys.sys_getcwd(); }); @@ -33,12 +33,12 @@ function path_as_directory(x) { } function absolute_path(s) { - var s$1 = Curry._1(Filename.is_relative, s) ? Filename.concat(CamlinternalLazy.force(cwd), s) : s; - var aux = function (_s) { + let s$1 = Curry._1(Filename.is_relative, s) ? Filename.concat(CamlinternalLazy.force(cwd), s) : s; + let aux = function (_s) { while(true) { - var s = _s; - var base = Curry._1(Filename.basename, s); - var dir = Curry._1(Filename.dirname, s); + let s = _s; + let base = Curry._1(Filename.basename, s); + let dir = Curry._1(Filename.dirname, s); if (dir === s) { return dir; } @@ -57,14 +57,14 @@ function absolute_path(s) { } function chop_extension(locOpt, name) { - var loc = locOpt !== undefined ? locOpt : ""; + let loc = locOpt !== undefined ? locOpt : ""; try { return Filename.chop_extension(name); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Invalid_argument") { - var s = "Filename.chop_extension ( " + loc + " : " + name + " )"; + let s = "Filename.chop_extension ( " + loc + " : " + name + " )"; throw { RE_EXN_ID: "Invalid_argument", _1: s, @@ -80,7 +80,7 @@ function chop_extension_if_any(fname) { return Filename.chop_extension(fname); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Invalid_argument") { return fname; } @@ -88,17 +88,17 @@ function chop_extension_if_any(fname) { } } -var os_path_separator_char = Filename.dir_sep.codePointAt(0); +let os_path_separator_char = Filename.dir_sep.codePointAt(0); function relative_path(file_or_dir_1, file_or_dir_2) { - var relevant_dir1 = file_or_dir_1.NAME === "File" ? Curry._1(Filename.dirname, file_or_dir_1.VAL) : file_or_dir_1.VAL; - var relevant_dir2 = file_or_dir_2.NAME === "File" ? Curry._1(Filename.dirname, file_or_dir_2.VAL) : file_or_dir_2.VAL; - var dir1 = Ext_string_test.split(undefined, relevant_dir1, os_path_separator_char); - var dir2 = Ext_string_test.split(undefined, relevant_dir2, os_path_separator_char); - var go = function (_dir1, _dir2) { + let relevant_dir1 = file_or_dir_1.NAME === "File" ? Curry._1(Filename.dirname, file_or_dir_1.VAL) : file_or_dir_1.VAL; + let relevant_dir2 = file_or_dir_2.NAME === "File" ? Curry._1(Filename.dirname, file_or_dir_2.VAL) : file_or_dir_2.VAL; + let dir1 = Ext_string_test.split(undefined, relevant_dir1, os_path_separator_char); + let dir2 = Ext_string_test.split(undefined, relevant_dir2, os_path_separator_char); + let go = function (_dir1, _dir2) { while(true) { - var dir2 = _dir2; - var dir1 = _dir1; + let dir2 = _dir2; + let dir1 = _dir1; if (dir1 && dir2 && dir1.hd === dir2.hd) { _dir2 = dir2.tl; _dir1 = dir1.tl; @@ -109,18 +109,18 @@ function relative_path(file_or_dir_1, file_or_dir_2) { }), dir2), dir1); }; }; - var ys = go(dir1, dir2); + let ys = go(dir1, dir2); if (ys) { if (ys.hd === node_parent) { return $$Array.of_list(ys).join(node_sep); } - var xs = { + let xs = { hd: node_current, tl: ys }; return $$Array.of_list(xs).join(node_sep); } - var xs$1 = { + let xs$1 = { hd: node_current, tl: ys }; @@ -128,9 +128,9 @@ function relative_path(file_or_dir_1, file_or_dir_2) { } function node_relative_path(node_modules_shorten, file1, dep_file) { - var file2 = dep_file.VAL; - var v = Ext_string_test.find(undefined, Test_literals.node_modules, file2); - var len = file2.length; + let file2 = dep_file.VAL; + let v = Ext_string_test.find(undefined, Test_literals.node_modules, file2); + let len = file2.length; if (!(node_modules_shorten && v >= 0)) { return relative_path(dep_file.NAME === "File" ? ({ NAME: "File", @@ -146,18 +146,18 @@ function node_relative_path(node_modules_shorten, file1, dep_file) { VAL: absolute_path(file1.VAL) })) + (node_sep + Curry._1(Filename.basename, file2)); } - var skip = function (_i) { + let skip = function (_i) { while(true) { - var i = _i; + let i = _i; if (i >= len) { - var s = "invalid path: " + file2; + let s = "invalid path: " + file2; throw { RE_EXN_ID: "Failure", _1: s, Error: new Error() }; } - var curr_char = file2.codePointAt(i); + let curr_char = file2.codePointAt(i); if (!(curr_char === os_path_separator_char || curr_char === /* '.' */46)) { return i; } @@ -170,16 +170,16 @@ function node_relative_path(node_modules_shorten, file1, dep_file) { function find_root_filename(_cwd, filename) { while(true) { - var cwd = _cwd; + let cwd = _cwd; if (Caml_sys.sys_file_exists(Filename.concat(cwd, filename))) { return cwd; } - var cwd$p = Curry._1(Filename.dirname, cwd); + let cwd$p = Curry._1(Filename.dirname, cwd); if (cwd$p.length < cwd.length) { _cwd = cwd$p; continue ; } - var s = filename + " not found from " + cwd; + let s = filename + " not found from " + cwd; throw { RE_EXN_ID: "Failure", _1: s, @@ -192,18 +192,18 @@ function find_package_json_dir(cwd) { return find_root_filename(cwd, Test_literals.bsconfig_json); } -var package_dir = CamlinternalLazy.from_fun(function () { - var cwd$1 = CamlinternalLazy.force(cwd); +let package_dir = CamlinternalLazy.from_fun(function () { + let cwd$1 = CamlinternalLazy.force(cwd); return find_root_filename(cwd$1, Test_literals.bsconfig_json); }); function module_name_of_file(file) { - var s = Filename.chop_extension(Curry._1(Filename.basename, file)); + let s = Filename.chop_extension(Curry._1(Filename.basename, file)); return Bytes.unsafe_to_string(Bytes.capitalize_ascii(Bytes.unsafe_of_string(s))); } function module_name_of_file_if_any(file) { - var s = chop_extension_if_any(Curry._1(Filename.basename, file)); + let s = chop_extension_if_any(Curry._1(Filename.basename, file)); return Bytes.unsafe_to_string(Bytes.capitalize_ascii(Bytes.unsafe_of_string(s))); } @@ -220,19 +220,19 @@ function combine(p1, p2) { } function split_aux(p) { - var _p = p; - var _acc = /* [] */0; + let _p = p; + let _acc = /* [] */0; while(true) { - var acc = _acc; - var p$1 = _p; - var dir = Curry._1(Filename.dirname, p$1); + let acc = _acc; + let p$1 = _p; + let dir = Curry._1(Filename.dirname, p$1); if (dir === p$1) { return [ dir, acc ]; } - var new_path = Curry._1(Filename.basename, p$1); + let new_path = Curry._1(Filename.basename, p$1); if (new_path === Filename.dir_sep) { _p = dir; continue ; @@ -247,17 +247,17 @@ function split_aux(p) { } function rel_normalized_absolute_path(from, to_) { - var match = split_aux(from); - var match$1 = split_aux(to_); - var root2 = match$1[0]; + let match = split_aux(from); + let match$1 = split_aux(to_); + let root2 = match$1[0]; if (match[0] !== root2) { return root2; } - var _xss = match[1]; - var _yss = match$1[1]; + let _xss = match[1]; + let _yss = match$1[1]; while(true) { - var yss = _yss; - var xss = _xss; + let yss = _yss; + let xss = _xss; if (!xss) { if (yss) { return List.fold_left(Filename.concat, yss.hd, yss.tl); @@ -265,7 +265,7 @@ function rel_normalized_absolute_path(from, to_) { return Ext_string_test.empty; } } - var xs = xss.tl; + let xs = xss.tl; if (!yss) { return List.fold_left((function (acc, param) { return Filename.concat(acc, Ext_string_test.parent_dir_lit); @@ -276,7 +276,7 @@ function rel_normalized_absolute_path(from, to_) { _xss = xs; continue ; } - var start = List.fold_left((function (acc, param) { + let start = List.fold_left((function (acc, param) { return Filename.concat(acc, Ext_string_test.parent_dir_lit); }), Ext_string_test.parent_dir_lit, xs); return List.fold_left(Filename.concat, start, yss); @@ -284,22 +284,22 @@ function rel_normalized_absolute_path(from, to_) { } function normalize_absolute_path(x) { - var drop_if_exist = function (xs) { + let drop_if_exist = function (xs) { if (xs) { return xs.tl; } else { return /* [] */0; } }; - var normalize_list = function (_acc, _paths) { + let normalize_list = function (_acc, _paths) { while(true) { - var paths = _paths; - var acc = _acc; + let paths = _paths; + let acc = _acc; if (!paths) { return acc; } - var xs = paths.tl; - var x = paths.hd; + let xs = paths.tl; + let x = paths.hd; if (x === Ext_string_test.current_dir_lit) { _paths = xs; continue ; @@ -317,15 +317,15 @@ function normalize_absolute_path(x) { continue ; }; }; - var match = split_aux(x); - var root = match[0]; - var rev_paths = normalize_list(/* [] */0, match[1]); + let match = split_aux(x); + let root = match[0]; + let rev_paths = normalize_list(/* [] */0, match[1]); if (rev_paths) { - var _acc = rev_paths.hd; - var _rev_paths = rev_paths.tl; + let _acc = rev_paths.hd; + let _rev_paths = rev_paths.tl; while(true) { - var rev_paths$1 = _rev_paths; - var acc = _acc; + let rev_paths$1 = _rev_paths; + let acc = _acc; if (!rev_paths$1) { return Filename.concat(root, acc); } @@ -339,7 +339,7 @@ function normalize_absolute_path(x) { } function get_extension(x) { - var pos = Ext_string_test.rindex_neg(x, /* '.' */46); + let pos = Ext_string_test.rindex_neg(x, /* '.' */46); if (pos < 0) { return ""; } else { @@ -347,7 +347,7 @@ function get_extension(x) { } } -var simple_convert_node_path_to_os_path; +let simple_convert_node_path_to_os_path; if (Sys.unix) { simple_convert_node_path_to_os_path = (function (x) { @@ -356,7 +356,7 @@ if (Sys.unix) { } else if (Sys.win32 || false) { simple_convert_node_path_to_os_path = Ext_string_test.replace_slash_backward; } else { - var s = "Unknown OS : " + Sys.os_type; + let s = "Unknown OS : " + Sys.os_type; throw { RE_EXN_ID: "Failure", _1: s, @@ -364,7 +364,7 @@ if (Sys.unix) { }; } -var $slash$slash = Filename.concat; +let $slash$slash = Filename.concat; exports.node_sep = node_sep; exports.node_parent = node_parent; diff --git a/jscomp/test/ext_list_test.js b/jscomp/test/ext_list_test.js index f4f5606243..da73dd7a37 100644 --- a/jscomp/test/ext_list_test.js +++ b/jscomp/test/ext_list_test.js @@ -1,20 +1,20 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var List = require("../../lib/js/list.js"); -var $$Array = require("../../lib/js/array.js"); -var Curry = require("../../lib/js/curry.js"); -var Caml_option = require("../../lib/js/caml_option.js"); -var Ext_string_test = require("./ext_string_test.js"); +let List = require("../../lib/js/list.js"); +let $$Array = require("../../lib/js/array.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_option = require("../../lib/js/caml_option.js"); +let Ext_string_test = require("./ext_string_test.js"); function filter_map(f, _xs) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return /* [] */0; } - var ys = xs.tl; - var z = Curry._1(f, xs.hd); + let ys = xs.tl; + let z = Curry._1(f, xs.hd); if (z !== undefined) { return { hd: Caml_option.valFromOption(z), @@ -27,18 +27,18 @@ function filter_map(f, _xs) { } function excludes(p, l) { - var excluded = { + let excluded = { contents: false }; - var aux = function (_accu, _x) { + let aux = function (_accu, _x) { while(true) { - var x = _x; - var accu = _accu; + let x = _x; + let accu = _accu; if (!x) { return List.rev(accu); } - var l = x.tl; - var x$1 = x.hd; + let l = x.tl; + let x$1 = x.hd; if (Curry._1(p, x$1)) { excluded.contents = true; _x = l; @@ -52,7 +52,7 @@ function excludes(p, l) { continue ; }; }; - var v = aux(/* [] */0, l); + let v = aux(/* [] */0, l); if (excluded.contents) { return [ true, @@ -67,18 +67,18 @@ function excludes(p, l) { } function exclude_with_fact(p, l) { - var excluded = { + let excluded = { contents: undefined }; - var aux = function (_accu, _x) { + let aux = function (_accu, _x) { while(true) { - var x = _x; - var accu = _accu; + let x = _x; + let accu = _accu; if (!x) { return List.rev(accu); } - var l = x.tl; - var x$1 = x.hd; + let l = x.tl; + let x$1 = x.hd; if (Curry._1(p, x$1)) { excluded.contents = Caml_option.some(x$1); _x = l; @@ -92,7 +92,7 @@ function exclude_with_fact(p, l) { continue ; }; }; - var v = aux(/* [] */0, l); + let v = aux(/* [] */0, l); return [ excluded.contents, excluded.contents !== undefined ? v : l @@ -100,21 +100,21 @@ function exclude_with_fact(p, l) { } function exclude_with_fact2(p1, p2, l) { - var excluded1 = { + let excluded1 = { contents: undefined }; - var excluded2 = { + let excluded2 = { contents: undefined }; - var aux = function (_accu, _x) { + let aux = function (_accu, _x) { while(true) { - var x = _x; - var accu = _accu; + let x = _x; + let accu = _accu; if (!x) { return List.rev(accu); } - var l = x.tl; - var x$1 = x.hd; + let l = x.tl; + let x$1 = x.hd; if (Curry._1(p1, x$1)) { excluded1.contents = Caml_option.some(x$1); _x = l; @@ -133,7 +133,7 @@ function exclude_with_fact2(p1, p2, l) { continue ; }; }; - var v = aux(/* [] */0, l); + let v = aux(/* [] */0, l); return [ excluded1.contents, excluded2.contents, @@ -143,8 +143,8 @@ function exclude_with_fact2(p1, p2, l) { function same_length(_xs, _ys) { while(true) { - var ys = _ys; - var xs = _xs; + let ys = _ys; + let xs = _xs; if (!xs) { if (ys) { return false; @@ -162,15 +162,15 @@ function same_length(_xs, _ys) { } function filter_mapi(f, xs) { - var aux = function (_i, _xs) { + let aux = function (_i, _xs) { while(true) { - var xs = _xs; - var i = _i; + let xs = _xs; + let i = _i; if (!xs) { return /* [] */0; } - var ys = xs.tl; - var z = Curry._2(f, i, xs.hd); + let ys = xs.tl; + let z = Curry._2(f, i, xs.hd); if (z !== undefined) { return { hd: Caml_option.valFromOption(z), @@ -187,13 +187,13 @@ function filter_mapi(f, xs) { function filter_map2(f, _xs, _ys) { while(true) { - var ys = _ys; - var xs = _xs; + let ys = _ys; + let xs = _xs; if (xs) { if (ys) { - var vs = ys.tl; - var us = xs.tl; - var z = Curry._2(f, xs.hd, ys.hd); + let vs = ys.tl; + let us = xs.tl; + let z = Curry._2(f, xs.hd, ys.hd); if (z !== undefined) { return { hd: Caml_option.valFromOption(z), @@ -222,16 +222,16 @@ function filter_map2(f, _xs, _ys) { } function filter_map2i(f, xs, ys) { - var aux = function (_i, _xs, _ys) { + let aux = function (_i, _xs, _ys) { while(true) { - var ys = _ys; - var xs = _xs; - var i = _i; + let ys = _ys; + let xs = _xs; + let i = _i; if (xs) { if (ys) { - var vs = ys.tl; - var us = xs.tl; - var z = Curry._3(f, i, xs.hd, ys.hd); + let vs = ys.tl; + let us = xs.tl; + let z = Curry._3(f, i, xs.hd, ys.hd); if (z !== undefined) { return { hd: Caml_option.valFromOption(z), @@ -264,8 +264,8 @@ function filter_map2i(f, xs, ys) { function rev_map_append(f, _l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { return l2; } @@ -279,13 +279,13 @@ function rev_map_append(f, _l1, _l2) { } function flat_map2(f, lx, ly) { - var _acc = /* [] */0; - var _lx = lx; - var _ly = ly; + let _acc = /* [] */0; + let _lx = lx; + let _ly = ly; while(true) { - var ly$1 = _ly; - var lx$1 = _lx; - var acc = _acc; + let ly$1 = _ly; + let lx$1 = _lx; + let acc = _acc; if (lx$1) { if (ly$1) { _ly = ly$1.tl; @@ -312,8 +312,8 @@ function flat_map2(f, lx, ly) { function flat_map_aux(f, _acc, append, _lx) { while(true) { - var lx = _lx; - var acc = _acc; + let lx = _lx; + let acc = _acc; if (!lx) { return List.rev_append(acc, append); } @@ -333,8 +333,8 @@ function flat_map_acc(f, append, lx) { function map2_last(f, l1, l2) { if (l1) { - var l1$1 = l1.tl; - var u = l1.hd; + let l1$1 = l1.tl; + let u = l1.hd; if (!l1$1) { if (l2) { if (!l2.tl) { @@ -353,7 +353,7 @@ function map2_last(f, l1, l2) { } } if (l2) { - var r = Curry._3(f, false, u, l2.hd); + let r = Curry._3(f, false, u, l2.hd); return { hd: r, tl: map2_last(f, l1$1, l2.tl) @@ -379,15 +379,15 @@ function map_last(f, l1) { if (!l1) { return /* [] */0; } - var l1$1 = l1.tl; - var u = l1.hd; + let l1$1 = l1.tl; + let u = l1.hd; if (!l1$1) { return { hd: Curry._2(f, true, u), tl: /* [] */0 }; } - var r = Curry._2(f, false, u); + let r = Curry._2(f, false, u); return { hd: r, tl: map_last(f, l1$1) @@ -396,8 +396,8 @@ function map_last(f, l1) { function fold_right2_last(f, l1, l2, accu) { if (l1) { - var l1$1 = l1.tl; - var last1 = l1.hd; + let l1$1 = l1.tl; + let last1 = l1.hd; if (!l1$1) { if (l2) { if (!l2.tl) { @@ -436,8 +436,8 @@ function init(n, f) { } function take(n, l) { - var arr = $$Array.of_list(l); - var arr_length = arr.length; + let arr = $$Array.of_list(l); + let arr_length = arr.length; if (arr_length < n) { throw { RE_EXN_ID: "Invalid_argument", @@ -452,8 +452,8 @@ function take(n, l) { } function try_take(n, l) { - var arr = $$Array.of_list(l); - var arr_length = arr.length; + let arr = $$Array.of_list(l); + let arr_length = arr.length; if (arr_length <= n) { return [ l, @@ -471,8 +471,8 @@ function try_take(n, l) { function length_compare(_l, _n) { while(true) { - var n = _n; - var l = _l; + let n = _n; + let l = _l; if (n < 0) { return "Gt"; } @@ -491,8 +491,8 @@ function length_compare(_l, _n) { function length_larger_than_n(n, _xs, _ys) { while(true) { - var ys = _ys; - var xs = _xs; + let ys = _ys; + let xs = _xs; if (!ys) { return length_compare(xs, n) === "Eq"; } @@ -506,14 +506,14 @@ function length_larger_than_n(n, _xs, _ys) { } function exclude_tail(x) { - var _acc = /* [] */0; - var _x = x; + let _acc = /* [] */0; + let _x = x; while(true) { - var x$1 = _x; - var acc = _acc; + let x$1 = _x; + let acc = _acc; if (x$1) { - var ys = x$1.tl; - var x$2 = x$1.hd; + let ys = x$1.tl; + let x$2 = x$1.hd; if (!ys) { return [ x$2, @@ -553,8 +553,8 @@ function aux(cmp, x, xss) { tl: /* [] */0 }; } - var ys = xss.tl; - var y = xss.hd; + let ys = xss.tl; + let y = xss.hd; if (Curry._2(cmp, x, List.hd(y))) { return { hd: { @@ -577,8 +577,8 @@ function stable_group(cmp, lst) { function drop(_n, _h) { while(true) { - var h = _h; - var n = _n; + let h = _h; + let n = _n; if (n < 0) { throw { RE_EXN_ID: "Invalid_argument", @@ -604,11 +604,11 @@ function drop(_n, _h) { function find_first_not(p, _x) { while(true) { - var x = _x; + let x = _x; if (!x) { return; } - var a = x.hd; + let a = x.hd; if (!Curry._1(p, a)) { return Caml_option.some(a); } @@ -619,11 +619,11 @@ function find_first_not(p, _x) { function for_all_opt(p, _x) { while(true) { - var x = _x; + let x = _x; if (!x) { return; } - var v = Curry._1(p, x.hd); + let v = Curry._1(p, x.hd); if (v !== undefined) { return v; } @@ -639,11 +639,11 @@ function fold(f, l, init) { } function rev_map_acc(acc, f, l) { - var _accu = acc; - var _x = l; + let _accu = acc; + let _x = l; while(true) { - var x = _x; - var accu = _accu; + let x = _x; + let accu = _accu; if (!x) { return accu; } @@ -677,8 +677,8 @@ function rev_iter(f, xs) { function for_all2_no_exn(p, _l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { if (l2) { return false; @@ -700,11 +700,11 @@ function for_all2_no_exn(p, _l1, _l2) { function find_no_exn(p, _x) { while(true) { - var x = _x; + let x = _x; if (!x) { return; } - var x$1 = x.hd; + let x$1 = x.hd; if (Curry._1(p, x$1)) { return Caml_option.some(x$1); } @@ -715,11 +715,11 @@ function find_no_exn(p, _x) { function find_opt(p, _x) { while(true) { - var x = _x; + let x = _x; if (!x) { return; } - var v = Curry._1(p, x.hd); + let v = Curry._1(p, x.hd); if (v !== undefined) { return v; } @@ -729,20 +729,20 @@ function find_opt(p, _x) { } function split_map(f, xs) { - var _bs = /* [] */0; - var _cs = /* [] */0; - var _xs = xs; + let _bs = /* [] */0; + let _cs = /* [] */0; + let _xs = xs; while(true) { - var xs$1 = _xs; - var cs = _cs; - var bs = _bs; + let xs$1 = _xs; + let cs = _cs; + let bs = _bs; if (!xs$1) { return [ List.rev(bs), List.rev(cs) ]; } - var match = Curry._1(f, xs$1.hd); + let match = Curry._1(f, xs$1.hd); _xs = xs$1.tl; _cs = { hd: match[1], @@ -757,7 +757,7 @@ function split_map(f, xs) { } function reduce_from_right(fn, lst) { - var match = List.rev(lst); + let match = List.rev(lst); if (match) { return List.fold_left((function (x, y) { return Curry._2(fn, y, x); @@ -788,7 +788,7 @@ function create_ref_empty(param) { } function ref_top(x) { - var match = x.contents; + let match = x.contents; if (match) { return match.hd; } @@ -800,7 +800,7 @@ function ref_top(x) { } function ref_empty(x) { - var match = x.contents; + let match = x.contents; if (match) { return false; } else { @@ -816,7 +816,7 @@ function ref_push(x, refs) { } function ref_pop(refs) { - var match = refs.contents; + let match = refs.contents; if (match) { refs.contents = match.tl; return match.hd; @@ -829,14 +829,14 @@ function ref_pop(refs) { } function rev_except_last(xs) { - var _acc = /* [] */0; - var _xs = xs; + let _acc = /* [] */0; + let _xs = xs; while(true) { - var xs$1 = _xs; - var acc = _acc; + let xs$1 = _xs; + let acc = _acc; if (xs$1) { - var xs$2 = xs$1.tl; - var x = xs$1.hd; + let xs$2 = xs$1.tl; + let x = xs$1.hd; if (!xs$2) { return [ acc, @@ -859,16 +859,16 @@ function rev_except_last(xs) { } function sort_via_array(cmp, lst) { - var arr = $$Array.of_list(lst); + let arr = $$Array.of_list(lst); $$Array.sort(cmp, arr); return $$Array.to_list(arr); } function last(_xs) { while(true) { - var xs = _xs; + let xs = _xs; if (xs) { - var tl = xs.tl; + let tl = xs.tl; if (!tl) { return xs.hd; } @@ -885,9 +885,9 @@ function last(_xs) { function assoc_by_string(def, k, _lst) { while(true) { - var lst = _lst; + let lst = _lst; if (lst) { - var match = lst.hd; + let match = lst.hd; if (match[0] === k) { return match[1]; } @@ -911,9 +911,9 @@ function assoc_by_string(def, k, _lst) { function assoc_by_int(def, k, _lst) { while(true) { - var lst = _lst; + let lst = _lst; if (lst) { - var match = lst.hd; + let match = lst.hd; if (match[0] === k) { return match[1]; } diff --git a/jscomp/test/ext_pervasives_test.js b/jscomp/test/ext_pervasives_test.js index 84110a5f00..10c923ada3 100644 --- a/jscomp/test/ext_pervasives_test.js +++ b/jscomp/test/ext_pervasives_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); -var Caml_string = require("../../lib/js/caml_string.js"); -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_string = require("../../lib/js/caml_string.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); function $$finally(v, action, f) { - var e; + let e; try { e = Curry._1(f, v); } @@ -20,13 +20,13 @@ function $$finally(v, action, f) { } function is_pos_pow(n) { - var E = /* @__PURE__ */Caml_exceptions.create("E"); + let E = /* @__PURE__ */Caml_exceptions.create("E"); try { - var _c = 0; - var _n = n; + let _c = 0; + let _n = n; while(true) { - var n$1 = _n; - var c = _c; + let n$1 = _n; + let c = _c; if (n$1 <= 0) { return -2; } @@ -45,7 +45,7 @@ function is_pos_pow(n) { }; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === E) { return -1; } @@ -54,13 +54,13 @@ function is_pos_pow(n) { } function is_pos_pow_2(n) { - var E = /* @__PURE__ */Caml_exceptions.create("E"); + let E = /* @__PURE__ */Caml_exceptions.create("E"); try { - var _c = 0; - var _n = n; + let _c = 0; + let _n = n; while(true) { - var n$1 = _n; - var c = _c; + let n$1 = _n; + let c = _c; if (n$1 <= 0) { return -2; } @@ -79,7 +79,7 @@ function is_pos_pow_2(n) { }; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === E) { return -1; } @@ -88,8 +88,8 @@ function is_pos_pow_2(n) { } function hash_variant(s) { - var accu = 0; - for(var i = 0 ,i_finish = s.length; i < i_finish; ++i){ + let accu = 0; + for(let i = 0 ,i_finish = s.length; i < i_finish; ++i){ accu = Math.imul(223, accu) + Caml_string.get(s, i) | 0; } accu = accu & 2147483647; @@ -100,7 +100,7 @@ function hash_variant(s) { } } -var LargeFile = { +let LargeFile = { u: 3 }; diff --git a/jscomp/test/ext_string_test.js b/jscomp/test/ext_string_test.js index 9256d655e1..0a99db29f8 100644 --- a/jscomp/test/ext_string_test.js +++ b/jscomp/test/ext_string_test.js @@ -1,26 +1,26 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var List = require("../../lib/js/list.js"); -var Bytes = require("../../lib/js/bytes.js"); -var Curry = require("../../lib/js/curry.js"); -var $$String = require("../../lib/js/string.js"); -var Caml_bytes = require("../../lib/js/caml_bytes.js"); -var Caml_string = require("../../lib/js/caml_string.js"); -var Ext_bytes_test = require("./ext_bytes_test.js"); -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let List = require("../../lib/js/list.js"); +let Bytes = require("../../lib/js/bytes.js"); +let Curry = require("../../lib/js/curry.js"); +let $$String = require("../../lib/js/string.js"); +let Caml_bytes = require("../../lib/js/caml_bytes.js"); +let Caml_string = require("../../lib/js/caml_string.js"); +let Ext_bytes_test = require("./ext_bytes_test.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); function split_by(keep_emptyOpt, is_delim, str) { - var keep_empty = keep_emptyOpt !== undefined ? keep_emptyOpt : false; - var len = str.length; - var _acc = /* [] */0; - var _last_pos = len; - var _pos = len - 1 | 0; + let keep_empty = keep_emptyOpt !== undefined ? keep_emptyOpt : false; + let len = str.length; + let _acc = /* [] */0; + let _last_pos = len; + let _pos = len - 1 | 0; while(true) { - var pos = _pos; - var last_pos = _last_pos; - var acc = _acc; + let pos = _pos; + let last_pos = _last_pos; + let acc = _acc; if (pos === -1) { if (last_pos === 0 && !keep_empty) { return acc; @@ -32,9 +32,9 @@ function split_by(keep_emptyOpt, is_delim, str) { } } if (Curry._1(is_delim, Caml_string.get(str, pos))) { - var new_len = (last_pos - pos | 0) - 1 | 0; + let new_len = (last_pos - pos | 0) - 1 | 0; if (new_len !== 0 || keep_empty) { - var v = $$String.sub(str, pos + 1 | 0, new_len); + let v = $$String.sub(str, pos + 1 | 0, new_len); _pos = pos - 1 | 0; _last_pos = pos; _acc = { @@ -53,23 +53,23 @@ function split_by(keep_emptyOpt, is_delim, str) { } function trim(s) { - var i = 0; - var j = s.length; + let i = 0; + let j = s.length; while((function () { - var tmp = false; + let tmp = false; if (i < j) { - var u = s.codePointAt(i); + let u = s.codePointAt(i); tmp = u === /* '\t' */9 || u === /* '\n' */10 || u === /* ' ' */32; } return tmp; })()) { i = i + 1 | 0; }; - var k = j - 1 | 0; + let k = j - 1 | 0; while((function () { - var tmp = false; + let tmp = false; if (k >= i) { - var u = s.codePointAt(k); + let u = s.codePointAt(k); tmp = u === /* '\t' */9 || u === /* '\n' */10 || u === /* ' ' */32; } return tmp; @@ -100,12 +100,12 @@ function quick_split_by_ws(str) { } function starts_with(s, beg) { - var beg_len = beg.length; - var s_len = s.length; + let beg_len = beg.length; + let s_len = s.length; if (beg_len > s_len) { return false; } - var i = 0; + let i = 0; while(i < beg_len && s.codePointAt(i) === beg.codePointAt(i)) { i = i + 1 | 0; }; @@ -113,16 +113,16 @@ function starts_with(s, beg) { } function ends_with_index(s, end_) { - var s_finish = s.length - 1 | 0; - var s_beg = end_.length - 1 | 0; + let s_finish = s.length - 1 | 0; + let s_beg = end_.length - 1 | 0; if (s_beg > s_finish) { return -1; } - var _j = s_finish; - var _k = s_beg; + let _j = s_finish; + let _k = s_beg; while(true) { - var k = _k; - var j = _j; + let k = _k; + let j = _j; if (k < 0) { return j + 1 | 0; } @@ -140,7 +140,7 @@ function ends_with(s, end_) { } function ends_with_then_chop(s, beg) { - var i = ends_with_index(s, beg); + let i = ends_with_index(s, beg); if (i >= 0) { return $$String.sub(s, 0, i); } @@ -154,13 +154,13 @@ function check_any_suffix_case(s, suffixes) { } function check_any_suffix_case_then_chop(s, suffixes) { - var _suffixes = suffixes; + let _suffixes = suffixes; while(true) { - var suffixes$1 = _suffixes; + let suffixes$1 = _suffixes; if (!suffixes$1) { return; } - var id = ends_with_index(s, suffixes$1.hd); + let id = ends_with_index(s, suffixes$1.hd); if (id >= 0) { return $$String.sub(s, 0, id); } @@ -170,13 +170,13 @@ function check_any_suffix_case_then_chop(s, suffixes) { } function escaped(s) { - var needs_escape = function (_i) { + let needs_escape = function (_i) { while(true) { - var i = _i; + let i = _i; if (i >= s.length) { return false; } - var match = s.codePointAt(i); + let match = s.codePointAt(i); if (match < 32) { return true; } @@ -203,7 +203,7 @@ function escaped(s) { function unsafe_for_all_range(s, _start, finish, p) { while(true) { - var start = _start; + let start = _start; if (start > finish) { return true; } @@ -216,7 +216,7 @@ function unsafe_for_all_range(s, _start, finish, p) { } function for_all_range(s, start, finish, p) { - var len = s.length; + let len = s.length; if (start < 0 || finish >= len) { throw { RE_EXN_ID: "Invalid_argument", @@ -236,9 +236,9 @@ function is_empty(s) { } function repeat(n, s) { - var len = s.length; - var res = Caml_bytes.create(Math.imul(n, len)); - for(var i = 0; i < n; ++i){ + let len = s.length; + let res = Caml_bytes.create(Math.imul(n, len)); + for(let i = 0; i < n; ++i){ $$String.blit(s, 0, res, Math.imul(i, len), len); } return Bytes.to_string(res); @@ -246,9 +246,9 @@ function repeat(n, s) { function unsafe_is_sub(sub, i, s, j, len) { if ((j + len | 0) <= s.length) { - var _k = 0; + let _k = 0; while(true) { - var k = _k; + let k = _k; if (k === len) { return true; } @@ -263,13 +263,13 @@ function unsafe_is_sub(sub, i, s, j, len) { } } -var Local_exit = /* @__PURE__ */Caml_exceptions.create("Ext_string_test.Local_exit"); +let Local_exit = /* @__PURE__ */Caml_exceptions.create("Ext_string_test.Local_exit"); function find(startOpt, sub, s) { - var start = startOpt !== undefined ? startOpt : 0; - var n = sub.length; - var s_len = s.length; - var i = start; + let start = startOpt !== undefined ? startOpt : 0; + let n = sub.length; + let s_len = s.length; + let i = start; try { while((i + n | 0) <= s_len) { if (unsafe_is_sub(sub, 0, s, i, n)) { @@ -283,7 +283,7 @@ function find(startOpt, sub, s) { return -1; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === Local_exit) { return i; } @@ -296,7 +296,7 @@ function contain_substring(s, sub) { } function non_overlap_count(sub, s) { - var sub_len = sub.length; + let sub_len = sub.length; if (sub.length === 0) { throw { RE_EXN_ID: "Invalid_argument", @@ -304,12 +304,12 @@ function non_overlap_count(sub, s) { Error: new Error() }; } - var _acc = 0; - var _off = 0; + let _acc = 0; + let _off = 0; while(true) { - var off = _off; - var acc = _acc; - var i = find(off, sub, s); + let off = _off; + let acc = _acc; + let i = find(off, sub, s); if (i < 0) { return acc; } @@ -320,8 +320,8 @@ function non_overlap_count(sub, s) { } function rfind(sub, s) { - var n = sub.length; - var i = s.length - n | 0; + let n = sub.length; + let i = s.length - n | 0; try { while(i >= 0) { if (unsafe_is_sub(sub, 0, s, i, n)) { @@ -335,7 +335,7 @@ function rfind(sub, s) { return -1; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === Local_exit) { return i; } @@ -344,11 +344,11 @@ function rfind(sub, s) { } function tail_from(s, x) { - var len = s.length; + let len = s.length; if (x <= len) { return $$String.sub(s, x, len - x | 0); } - var s$1 = "Ext_string_test.tail_from " + (s + (" : " + String(x))); + let s$1 = "Ext_string_test.tail_from " + (s + (" : " + String(x))); throw { RE_EXN_ID: "Invalid_argument", _1: s$1, @@ -357,11 +357,11 @@ function tail_from(s, x) { } function digits_of_str(s, offset, x) { - var _i = 0; - var _acc = 0; + let _i = 0; + let _acc = 0; while(true) { - var acc = _acc; - var i = _i; + let acc = _acc; + let i = _i; if (i >= x) { return acc; } @@ -372,13 +372,13 @@ function digits_of_str(s, offset, x) { } function starts_with_and_number(s, offset, beg) { - var beg_len = beg.length; - var s_len = s.length; - var finish_delim = offset + beg_len | 0; + let beg_len = beg.length; + let s_len = s.length; + let finish_delim = offset + beg_len | 0; if (finish_delim > s_len) { return -1; } - var i = offset; + let i = offset; while(i < finish_delim && s.codePointAt(i) === beg.codePointAt(i - offset | 0)) { i = i + 1 | 0; }; @@ -395,7 +395,7 @@ function equal(x, y) { function rindex_rec(s, _i, c) { while(true) { - var i = _i; + let i = _i; if (i < 0) { return i; } @@ -409,7 +409,7 @@ function rindex_rec(s, _i, c) { function rindex_rec_opt(s, _i, c) { while(true) { - var i = _i; + let i = _i; if (i < 0) { return; } @@ -430,11 +430,11 @@ function rindex_opt(s, c) { } function is_valid_module_file(s) { - var len = s.length; + let len = s.length; if (len <= 0) { return false; } - var match = s.codePointAt(0); + let match = s.codePointAt(0); if (match >= 91) { if (match > 122 || match < 97) { return false; @@ -459,14 +459,14 @@ function is_valid_module_file(s) { } function is_valid_npm_package_name(s) { - var len = s.length; + let len = s.length; if (len > 214) { return false; } if (len <= 0) { return false; } - var match = s.codePointAt(0); + let match = s.codePointAt(0); if (match >= 97) { if (match >= 123) { return false; @@ -491,7 +491,7 @@ function is_valid_npm_package_name(s) { } function is_valid_source_name(name) { - var x = check_any_suffix_case_then_chop(name, { + let x = check_any_suffix_case_then_chop(name, { hd: ".ml", tl: { hd: ".res", @@ -517,7 +517,7 @@ function is_valid_source_name(name) { function unsafe_no_char(x, ch, _i, last_idx) { while(true) { - var i = _i; + let i = _i; if (i > last_idx) { return true; } @@ -531,7 +531,7 @@ function unsafe_no_char(x, ch, _i, last_idx) { function unsafe_no_char_idx(x, ch, _i, last_idx) { while(true) { - var i = _i; + let i = _i; if (i > last_idx) { return -1; } @@ -544,7 +544,7 @@ function unsafe_no_char_idx(x, ch, _i, last_idx) { } function no_char(x, ch, i, len) { - var str_len = x.length; + let str_len = x.length; if (i < 0 || i >= str_len || len >= str_len) { throw { RE_EXN_ID: "Invalid_argument", @@ -564,7 +564,7 @@ function no_slash_idx(x) { } function replace_slash_backward(x) { - var len = x.length; + let len = x.length; if (unsafe_no_char(x, /* '/' */47, 0, len - 1 | 0)) { return x; } else { @@ -579,7 +579,7 @@ function replace_slash_backward(x) { } function replace_backward_slash(x) { - var len = x.length; + let len = x.length; if (unsafe_no_char(x, /* '\\' */92, 0, len - 1 | 0)) { return x; } else { @@ -593,19 +593,19 @@ function replace_backward_slash(x) { } } -var check_suffix_case = ends_with; +let check_suffix_case = ends_with; -var check_suffix_case_then_chop = ends_with_then_chop; +let check_suffix_case_then_chop = ends_with_then_chop; -var empty = ""; +let empty = ""; -var single_space = " "; +let single_space = " "; -var single_colon = ":"; +let single_colon = ":"; -var parent_dir_lit = ".."; +let parent_dir_lit = ".."; -var current_dir_lit = "."; +let current_dir_lit = "."; exports.split_by = split_by; exports.trim = trim; diff --git a/jscomp/test/ext_sys_test.js b/jscomp/test/ext_sys_test.js index 5ee49cfb55..c002fe1c74 100644 --- a/jscomp/test/ext_sys_test.js +++ b/jscomp/test/ext_sys_test.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Sys = require("../../lib/js/sys.js"); +let Sys = require("../../lib/js/sys.js"); -var is_windows_or_cygwin = Sys.win32 || false; +let is_windows_or_cygwin = Sys.win32 || false; exports.is_windows_or_cygwin = is_windows_or_cygwin; /* No side effect */ diff --git a/jscomp/test/extensible_variant_test.js b/jscomp/test/extensible_variant_test.js index ca2eae284f..5a5f46352e 100644 --- a/jscomp/test/extensible_variant_test.js +++ b/jscomp/test/extensible_variant_test.js @@ -1,18 +1,18 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Mt = require("./mt.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var Str = /* @__PURE__ */Caml_exceptions.create("Extensible_variant_test.Str"); +let Str = /* @__PURE__ */Caml_exceptions.create("Extensible_variant_test.Str"); -var Int = /* @__PURE__ */Caml_exceptions.create("Extensible_variant_test.N.Int"); +let Int = /* @__PURE__ */Caml_exceptions.create("Extensible_variant_test.N.Int"); -var N = { +let N = { Int: Int }; -var Int$1 = /* @__PURE__ */Caml_exceptions.create("Extensible_variant_test.Int"); +let Int$1 = /* @__PURE__ */Caml_exceptions.create("Extensible_variant_test.Int"); function to_int(x) { if (x.RE_EXN_ID === Str) { @@ -35,7 +35,7 @@ function to_int(x) { }; } -var suites_0 = [ +let suites_0 = [ "test_int", (function (param) { return { @@ -50,7 +50,7 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "test_int2", (function (param) { @@ -83,7 +83,7 @@ var suites_1 = { } }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/external_polyfill_test.js b/jscomp/test/external_polyfill_test.js index beebe438d4..05cacaccd3 100644 --- a/jscomp/test/external_polyfill_test.js +++ b/jscomp/test/external_polyfill_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_external_polyfill = require("../../lib/js/caml_external_polyfill.js"); +let Mt = require("./mt.js"); +let Caml_external_polyfill = require("../../lib/js/caml_external_polyfill.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -21,7 +21,7 @@ require('../../lib/js/caml_external_polyfill.js').register("fancy_add", function }) ; -var h = Caml_external_polyfill.resolve("fancy_add")(1, 2); +let h = Caml_external_polyfill.resolve("fancy_add")(1, 2); eq("File \"external_polyfill_test.res\", line 15, characters 12-19", h, 12); diff --git a/jscomp/test/external_ppx.js b/jscomp/test/external_ppx.js index d7bcc73ac0..48b694f509 100644 --- a/jscomp/test/external_ppx.js +++ b/jscomp/test/external_ppx.js @@ -1,10 +1,10 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var External_ppxGen = require("./external_ppx.gen"); +let External_ppxGen = require("./external_ppx.gen"); function renamed(param) { - var tmp = { + let tmp = { type: "123", normal: 12 }; @@ -14,7 +14,7 @@ function renamed(param) { return tmp; } -var u = { +let u = { hi: 2, lo: 3, lo2: {hi:-3 }, diff --git a/jscomp/test/external_ppx2.js b/jscomp/test/external_ppx2.js index 048bce8137..f4c9318e9d 100644 --- a/jscomp/test/external_ppx2.js +++ b/jscomp/test/external_ppx2.js @@ -4,9 +4,9 @@ f("\h\e\l\lo", 42); -var x = "\h\e\l\lo"; +let x = "\h\e\l\lo"; -var y; +let y; exports.x = x; exports.y = y; diff --git a/jscomp/test/ffi_arity_test.js b/jscomp/test/ffi_arity_test.js index 5250f2f254..2dbb783de4 100644 --- a/jscomp/test/ffi_arity_test.js +++ b/jscomp/test/ffi_arity_test.js @@ -1,8 +1,8 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Curry = require("../../lib/js/curry.js"); +let Mt = require("./mt.js"); +let Curry = require("../../lib/js/curry.js"); function f(v) { if (v % 2 === 0) { @@ -16,7 +16,7 @@ function f(v) { } } -var v = [ +let v = [ 1, 2, 3 @@ -24,7 +24,7 @@ var v = [ return f(a)(b); }); -var vv = [ +let vv = [ 1, 2, 3 @@ -32,7 +32,7 @@ var vv = [ return a + b | 0; }); -var hh = [ +let hh = [ "1", "2", "3" @@ -44,7 +44,7 @@ function u() { return 3; } -var vvv = { +let vvv = { contents: 0 }; @@ -64,7 +64,7 @@ function abc(x, y, z) { return (x + y | 0) + z | 0; } -var abc_u = abc; +let abc_u = abc; fff(); diff --git a/jscomp/test/ffi_array_test.js b/jscomp/test/ffi_array_test.js index d906908811..a858a8a7ef 100644 --- a/jscomp/test/ffi_array_test.js +++ b/jscomp/test/ffi_array_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; diff --git a/jscomp/test/ffi_js_test.js b/jscomp/test/ffi_js_test.js index e787eda018..9883b2d69b 100644 --- a/jscomp/test/ffi_js_test.js +++ b/jscomp/test/ffi_js_test.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var keys = (function (x){return Object.keys(x)}); +let keys = (function (x){return Object.keys(x)}); function $$higher_order(x){ return function(y,z){ @@ -12,17 +12,17 @@ function $$higher_order(x){ } ; -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; function eq(loc, param) { - var y = param[1]; - var x = param[0]; + let y = param[1]; + let x = param[0]; test_id.contents = test_id.contents + 1 | 0; suites.contents = { hd: [ @@ -39,12 +39,12 @@ function eq(loc, param) { }; } -var int_config = { +let int_config = { hi: 3, low: 32 }; -var string_config = { +let string_config = { hi: 3, low: "32" }; @@ -54,7 +54,7 @@ eq("File \"ffi_js_test.res\", line 30, characters 12-19", [ $$higher_order(1)(2, 3) ]); -var same_type_0 = { +let same_type_0 = { hd: int_config, tl: { hd: { @@ -65,7 +65,7 @@ var same_type_0 = { } }; -var same_type_1 = { +let same_type_1 = { hd: string_config, tl: { hd: { @@ -76,7 +76,7 @@ var same_type_1 = { } }; -var same_type = [ +let same_type = [ same_type_0, same_type_1 ]; @@ -91,11 +91,11 @@ eq("File \"ffi_js_test.res\", line 39, characters 5-12", [ 2 ]); -var u = { +let u = { contents: 3 }; -var side_effect_config = (u.contents = u.contents + 1 | 0, "Int", { +let side_effect_config = (u.contents = u.contents + 1 | 0, "Int", { hi: 3, low: 32 }); @@ -139,15 +139,15 @@ function ffff(x) { "3", 3 ]; - var match = x[3]; + let match = x[3]; console.log([ match[0], match[1] ]); console.log(x.getGADT); - var match$1 = x.getGADT2; + let match$1 = x.getGADT2; console.log(match$1[0], match$1[1]); - var match$2 = x[0]; + let match$2 = x[0]; console.log(match$2[0], match$2[1]); x[0] = [ 1, diff --git a/jscomp/test/ffi_splice_test.js b/jscomp/test/ffi_splice_test.js index 27500b5281..c4e4b6c483 100644 --- a/jscomp/test/ffi_splice_test.js +++ b/jscomp/test/ffi_splice_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -52,9 +52,9 @@ function f(x) { return x.test("a", "b").test("a", "b"); } -var v = new Make(1, 2, 3, 4); +let v = new Make(1, 2, 3, 4); -var u = v.sum(); +let u = v.sum(); eq("File \"ffi_splice_test.res\", line 56, characters 12-19", u, 10); diff --git a/jscomp/test/ffi_test.js b/jscomp/test/ffi_test.js index 3898e73e35..c89bc21459 100644 --- a/jscomp/test/ffi_test.js +++ b/jscomp/test/ffi_test.js @@ -6,29 +6,29 @@ function u(param) { return xx(3); } -var Textarea = {}; +let Textarea = {}; -var $$Int32Array = {}; +let $$Int32Array = {}; function v(param) { - var u = new TextArea(); + let u = new TextArea(); u.minHeight = 3; return u.minHeight; } function f(param) { - var v = new Int32Array(32); + let v = new Int32Array(32); v[0] = 3; return v[0]; } -var a = true; +let a = true; -var b = false; +let b = false; -var c = null; +let c = null; -var d; +let d; exports.u = u; exports.a = a; diff --git a/jscomp/test/fib.js b/jscomp/test/fib.js index bcebe6c966..64d68d78ff 100644 --- a/jscomp/test/fib.js +++ b/jscomp/test/fib.js @@ -11,13 +11,13 @@ function fib(x) { } function fib2(n) { - var _a = 1; - var _b = 1; - var _i = 0; + let _a = 1; + let _b = 1; + let _i = 0; while(true) { - var i = _i; - var b = _b; - var a = _a; + let i = _i; + let b = _b; + let a = _a; if (n === i) { return a; } @@ -29,10 +29,10 @@ function fib2(n) { } function fib3(n) { - var a = 1; - var b = 1; - for(var i = 1; i <= n; ++i){ - var tmp = a; + let a = 1; + let b = 1; + for(let i = 1; i <= n; ++i){ + let tmp = a; a = b; b = b + tmp | 0; } diff --git a/jscomp/test/flattern_order_test.js b/jscomp/test/flattern_order_test.js index 24017629b4..2ea0a95359 100644 --- a/jscomp/test/flattern_order_test.js +++ b/jscomp/test/flattern_order_test.js @@ -4,7 +4,7 @@ function even(_n) { while(true) { - var n = _n; + let n = _n; if (n === 0) { return true; } @@ -17,7 +17,7 @@ function even2(n) { if (n === 0) { return true; } else { - var n$1 = n - 1 | 0; + let n$1 = n - 1 | 0; if (n$1 === 1) { return true; } else { @@ -26,7 +26,7 @@ function even2(n) { } } -var v = { +let v = { contents: 0 }; @@ -38,7 +38,7 @@ function obj_set(i) { v.contents = i; } -var obj = { +let obj = { get: obj_get, set: obj_set }; diff --git a/jscomp/test/flexible_array_test.js b/jscomp/test/flexible_array_test.js index 9f750278c3..5efba02281 100644 --- a/jscomp/test/flexible_array_test.js +++ b/jscomp/test/flexible_array_test.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var $$Array = require("../../lib/js/array.js"); -var Curry = require("../../lib/js/curry.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Caml_array = require("../../lib/js/caml_array.js"); +let $$Array = require("../../lib/js/array.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Caml_array = require("../../lib/js/caml_array.js"); function sub(_tr, _k) { while(true) { - var k = _k; - var tr = _tr; + let k = _k; + let tr = _tr; if (typeof tr !== "object") { throw { RE_EXN_ID: "Not_found", @@ -45,8 +45,8 @@ function update(tr, k, w) { Error: new Error() }; } - var r = tr._2; - var l = tr._1; + let r = tr._2; + let l = tr._1; if (k === 1) { return { TAG: "Br", @@ -55,7 +55,7 @@ function update(tr, k, w) { _2: r }; } - var v = tr._0; + let v = tr._0; if (k % 2 === 0) { return { TAG: "Br", @@ -83,9 +83,9 @@ function $$delete(tr, n) { if (n === 1) { return "Lf"; } - var r = tr._2; - var l = tr._1; - var v = tr._0; + let r = tr._2; + let l = tr._1; + let v = tr._0; if (n % 2 === 0) { return { TAG: "Br", @@ -128,7 +128,7 @@ function lorem(tr) { Error: new Error() }; } - var l = tr._1; + let l = tr._1; if (typeof l === "object") { return { TAG: "Br", @@ -137,7 +137,7 @@ function lorem(tr) { _2: lorem(l) }; } - var tmp = tr._2; + let tmp = tr._2; if (typeof tmp !== "object") { return "Lf"; } @@ -152,7 +152,7 @@ function lorem(tr) { }; } -var empty = [ +let empty = [ "Lf", 0 ]; @@ -173,7 +173,7 @@ function get(param, i) { } function set(param, i, v) { - var k = param[1]; + let k = param[1]; if (i >= 0 && i < k) { return [ update(param[0], i + 1 | 0, v), @@ -195,7 +195,7 @@ function push_front(param, v) { } function pop_front(param) { - var k = param[1]; + let k = param[1]; if (k > 0) { return [ lorem(param[0]), @@ -210,7 +210,7 @@ function pop_front(param) { } function push_back(param, v) { - var k = param[1]; + let k = param[1]; return [ update(param[0], k + 1 | 0, v), k + 1 | 0 @@ -218,7 +218,7 @@ function push_back(param, v) { } function pop_back(param) { - var k = param[1]; + let k = param[1]; if (k > 0) { return [ $$delete(param[0], k), @@ -233,9 +233,9 @@ function pop_back(param) { } function filter_from(i, p, s) { - var u = empty; - for(var i$1 = i ,i_finish = length(s); i$1 < i_finish; ++i$1){ - var ele = get(s, i$1); + let u = empty; + for(let i$1 = i ,i_finish = length(s); i$1 < i_finish; ++i$1){ + let ele = get(s, i$1); if (Curry._1(p, ele)) { u = push_back(u, ele); } @@ -245,42 +245,42 @@ function filter_from(i, p, s) { } function append(a, b) { - var empty$1 = empty; - for(var i = 0 ,i_finish = length(a); i < i_finish; ++i){ + let empty$1 = empty; + for(let i = 0 ,i_finish = length(a); i < i_finish; ++i){ empty$1 = push_back(empty$1, get(a, i)); } - for(var i$1 = 0 ,i_finish$1 = length(b); i$1 < i_finish$1; ++i$1){ + for(let i$1 = 0 ,i_finish$1 = length(b); i$1 < i_finish$1; ++i$1){ empty$1 = push_back(empty$1, get(b, i$1)); } return empty$1; } function sort(s) { - var size = length(s); + let size = length(s); if (size <= 1) { return s; } - var head = get(s, 0); - var larger = sort(filter_from(1, (function (x) { + let head = get(s, 0); + let larger = sort(filter_from(1, (function (x) { return Caml_obj.greaterthan(x, head); }), s)); - var smaller = sort(filter_from(1, (function (x) { + let smaller = sort(filter_from(1, (function (x) { return Caml_obj.lessequal(x, head); }), s)); return append(smaller, push_front(larger, head)); } function of_array(arr) { - var v = empty; - for(var i = 0 ,i_finish = arr.length; i < i_finish; ++i){ + let v = empty; + for(let i = 0 ,i_finish = arr.length; i < i_finish; ++i){ v = push_back(v, Caml_array.get(arr, i)); } return v; } -var equal = Caml_obj.equal; +let equal = Caml_obj.equal; -var Int_array = { +let Int_array = { empty: empty, get: get, set: set, @@ -298,7 +298,7 @@ function $eq$tilde(x, y) { return Caml_obj.equal(x, of_array(y)); } -var u = of_array([ +let u = of_array([ 1, 2, 2, @@ -307,7 +307,7 @@ var u = of_array([ 6 ]); -var x = sort(u); +let x = sort(u); if (!Caml_obj.equal(x, of_array([ 1, @@ -328,15 +328,15 @@ if (!Caml_obj.equal(x, of_array([ }; } -var v = $$Array.init(500, (function (i) { +let v = $$Array.init(500, (function (i) { return 500 - i | 0; })); -var y = $$Array.init(500, (function (i) { +let y = $$Array.init(500, (function (i) { return i + 1 | 0; })); -var x$1 = sort(of_array(v)); +let x$1 = sort(of_array(v)); Caml_obj.equal(x$1, of_array(y)); diff --git a/jscomp/test/float_of_bits_test.js b/jscomp/test/float_of_bits_test.js index 8a87ef8bdc..ab56973d40 100644 --- a/jscomp/test/float_of_bits_test.js +++ b/jscomp/test/float_of_bits_test.js @@ -1,19 +1,19 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var List = require("../../lib/js/list.js"); -var $$Array = require("../../lib/js/array.js"); -var Caml_float = require("../../lib/js/caml_float.js"); -var Caml_int64 = require("../../lib/js/caml_int64.js"); -var Pervasives = require("../../lib/js/pervasives.js"); +let Mt = require("./mt.js"); +let List = require("../../lib/js/list.js"); +let $$Array = require("../../lib/js/array.js"); +let Caml_float = require("../../lib/js/caml_float.js"); +let Caml_int64 = require("../../lib/js/caml_int64.js"); +let Pervasives = require("../../lib/js/pervasives.js"); -var one_float = [ +let one_float = [ 1072693248, 0 ]; -var int32_pairs = [ +let int32_pairs = [ [ 32, 4.48415508583941463e-44 @@ -26,8 +26,8 @@ var int32_pairs = [ function from_pairs(pair) { return List.concat($$Array.to_list($$Array.mapi((function (i, param) { - var f = param[1]; - var i32 = param[0]; + let f = param[1]; + let i32 = param[0]; return { hd: [ "int32_float_of_bits " + i, @@ -56,7 +56,7 @@ function from_pairs(pair) { }), int32_pairs))); } -var suites = Pervasives.$at({ +let suites = Pervasives.$at({ hd: [ "one", (function (param) { diff --git a/jscomp/test/float_test.js b/jscomp/test/float_test.js index b842335ae0..c09c9a97b9 100644 --- a/jscomp/test/float_test.js +++ b/jscomp/test/float_test.js @@ -1,20 +1,20 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml = require("../../lib/js/caml.js"); -var $$Array = require("../../lib/js/array.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Mt_global = require("./mt_global.js"); -var Caml_float = require("../../lib/js/caml_float.js"); -var Caml_int64 = require("../../lib/js/caml_int64.js"); -var Pervasives = require("../../lib/js/pervasives.js"); - -var test_id = { +let Mt = require("./mt.js"); +let Caml = require("../../lib/js/caml.js"); +let $$Array = require("../../lib/js/array.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Mt_global = require("./mt_global.js"); +let Caml_float = require("../../lib/js/caml_float.js"); +let Caml_int64 = require("../../lib/js/caml_int64.js"); +let Pervasives = require("../../lib/js/pervasives.js"); + +let test_id = { contents: 0 }; -var suites = { +let suites = { contents: /* [] */0 }; @@ -30,18 +30,18 @@ function approx(loc) { }; } -var epsilon_float = Caml_int64.float_of_bits([ +let epsilon_float = Caml_int64.float_of_bits([ 1018167296, 0 ]); -var match = Caml_float.frexp_float(12.0); +let match = Caml_float.frexp_float(12.0); -var match$1 = Caml_float.frexp_float(0); +let match$1 = Caml_float.frexp_float(0); -var match$2 = Caml_float.frexp_float(-12.0); +let match$2 = Caml_float.frexp_float(-12.0); -var results = $$Array.append([ +let results = $$Array.append([ [ Math.log10(2), 0.301029995663981198 @@ -123,8 +123,8 @@ var results = $$Array.append([ function from_pairs(ps) { return $$Array.to_list($$Array.mapi((function (i, param) { - var b = param[1]; - var a = param[0]; + let b = param[1]; + let a = param[0]; return [ "pair " + i, (function (param) { @@ -138,45 +138,45 @@ function from_pairs(ps) { }), ps)); } -var float_compare = Caml.float_compare; +let float_compare = Caml.float_compare; -var generic_compare = Caml_obj.compare; +let generic_compare = Caml_obj.compare; function float_equal(x, y) { return x === y; } -var generic_equal = Caml_obj.equal; +let generic_equal = Caml_obj.equal; function float_notequal(x, y) { return x !== y; } -var generic_notequal = Caml_obj.notequal; +let generic_notequal = Caml_obj.notequal; function float_lessthan(x, y) { return x < y; } -var generic_lessthan = Caml_obj.lessthan; +let generic_lessthan = Caml_obj.lessthan; function float_greaterthan(x, y) { return x > y; } -var generic_greaterthan = Caml_obj.greaterthan; +let generic_greaterthan = Caml_obj.greaterthan; function float_lessequal(x, y) { return x <= y; } -var generic_lessequal = Caml_obj.lessequal; +let generic_lessequal = Caml_obj.lessequal; function float_greaterequal(x, y) { return x >= y; } -var generic_greaterequal = Caml_obj.greaterequal; +let generic_greaterequal = Caml_obj.greaterequal; Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 59, characters 5-12", Pervasives.classify_float(3), "FP_normal"); @@ -185,7 +185,7 @@ Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 60, charact -3 ]); -var match$3 = Caml_float.modf_float(Number.NaN); +let match$3 = Caml_float.modf_float(Number.NaN); Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 62, characters 4-11", [ Number.isNaN(match$3[0]), @@ -320,11 +320,11 @@ Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 129, charac Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 130, characters 5-12", Caml_obj.greaterequal(NaN, 4.2), false); -var match$4 = Caml_float.modf_float(32.3); +let match$4 = Caml_float.modf_float(32.3); -var b = match$4[1]; +let b = match$4[1]; -var a = match$4[0]; +let a = match$4[0]; Mt.from_pair_suites("Float_test", Pervasives.$at({ hd: [ diff --git a/jscomp/test/floatarray_test.js b/jscomp/test/floatarray_test.js index 465e00be66..bc248ec6d9 100644 --- a/jscomp/test/floatarray_test.js +++ b/jscomp/test/floatarray_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_array = require("../../lib/js/caml_array.js"); +let Mt = require("./mt.js"); +let Caml_array = require("../../lib/js/caml_array.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -16,9 +16,9 @@ function eq(loc, x, y) { Mt.eq_suites(test_id, suites, loc, x, y); } -var v = Caml_array.make_float(5); +let v = Caml_array.make_float(5); -for(var i = 0; i <= 4; ++i){ +for(let i = 0; i <= 4; ++i){ v[i] = 0; } @@ -36,7 +36,7 @@ eq("File \"floatarray_test.res\", line 15, characters 5-12", [ Mt.from_pair_suites("Floatarray_test", suites.contents); -var K; +let K; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/for_loop_test.js b/jscomp/test/for_loop_test.js index acfee78076..7f447c2fd9 100644 --- a/jscomp/test/for_loop_test.js +++ b/jscomp/test/for_loop_test.js @@ -1,20 +1,20 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var List = require("../../lib/js/list.js"); -var $$Array = require("../../lib/js/array.js"); -var Curry = require("../../lib/js/curry.js"); -var Caml_array = require("../../lib/js/caml_array.js"); +let List = require("../../lib/js/list.js"); +let $$Array = require("../../lib/js/array.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_array = require("../../lib/js/caml_array.js"); function for_3(x) { - var v = { + let v = { contents: 0 }; - var arr = $$Array.map((function (param, param$1) { + let arr = $$Array.map((function (param, param$1) { }), x); - for(var i = 0 ,i_finish = x.length; i < i_finish; ++i){ - var j = (i << 1); + for(let i = 0 ,i_finish = x.length; i < i_finish; ++i){ + let j = (i << 1); Caml_array.set(arr, i, (function(j){ return function (param) { v.contents = v.contents + j | 0; @@ -28,15 +28,15 @@ function for_3(x) { } function for_4(x) { - var v = { + let v = { contents: 0 }; - var arr = $$Array.map((function (param, param$1) { + let arr = $$Array.map((function (param, param$1) { }), x); - for(var i = 0 ,i_finish = x.length; i < i_finish; ++i){ - var j = (i << 1); - var k = (j << 1); + for(let i = 0 ,i_finish = x.length; i < i_finish; ++i){ + let j = (i << 1); + let k = (j << 1); Caml_array.set(arr, i, (function(k){ return function (param) { v.contents = v.contents + k | 0; @@ -50,14 +50,14 @@ function for_4(x) { } function for_5(x, u) { - var v = { + let v = { contents: 0 }; - var arr = $$Array.map((function (param, param$1) { + let arr = $$Array.map((function (param, param$1) { }), x); - for(var i = 0 ,i_finish = x.length; i < i_finish; ++i){ - var k = Math.imul((u << 1), u); + for(let i = 0 ,i_finish = x.length; i < i_finish; ++i){ + let k = Math.imul((u << 1), u); Caml_array.set(arr, i, (function(k){ return function (param) { v.contents = v.contents + k | 0; @@ -71,29 +71,29 @@ function for_5(x, u) { } function for_6(x, u) { - var v = { + let v = { contents: 0 }; - var arr = $$Array.map((function (param, param$1) { + let arr = $$Array.map((function (param, param$1) { }), x); - var v4 = { + let v4 = { contents: 0 }; - var v5 = { + let v5 = { contents: 0 }; - var inspect_3 = -1; + let inspect_3 = -1; v4.contents = v4.contents + 1 | 0; - for(var j = 0; j <= 1; ++j){ + for(let j = 0; j <= 1; ++j){ v5.contents = v5.contents + 1 | 0; - var v2 = { + let v2 = { contents: 0 }; (function(v2){ - for(var i = 0 ,i_finish = x.length; i < i_finish; ++i){ - var k = Math.imul((u << 1), u); - var h = (v5.contents << 1); + for(let i = 0 ,i_finish = x.length; i < i_finish; ++i){ + let k = Math.imul((u << 1), u); + let h = (v5.contents << 1); v2.contents = v2.contents + 1 | 0; Caml_array.set(arr, i, (function(k,h){ return function (param) { @@ -116,15 +116,15 @@ function for_6(x, u) { } function for_7(param) { - var v = { + let v = { contents: 0 }; - var arr = Caml_array.make(21, (function (param) { + let arr = Caml_array.make(21, (function (param) { })); - for(var i = 0; i <= 6; ++i){ + for(let i = 0; i <= 6; ++i){ (function(i){ - for(var j = 0; j <= 2; ++j){ + for(let j = 0; j <= 2; ++j){ Caml_array.set(arr, Math.imul(i, 3) + j | 0, (function(j){ return function (param) { v.contents = (v.contents + i | 0) + j | 0; @@ -140,17 +140,17 @@ function for_7(param) { } function for_8(param) { - var v = { + let v = { contents: 0 }; - var arr = Caml_array.make(21, (function (param) { + let arr = Caml_array.make(21, (function (param) { })); - for(var i = 0; i <= 6; ++i){ - var k = (i << 1); + for(let i = 0; i <= 6; ++i){ + let k = (i << 1); (function(i,k){ - for(var j = 0; j <= 2; ++j){ - var h = i + j | 0; + for(let j = 0; j <= 2; ++j){ + let h = i + j | 0; Caml_array.set(arr, Math.imul(i, 3) + j | 0, (function(j,h){ return function (param) { v.contents = (((v.contents + i | 0) + j | 0) + h | 0) + k | 0; @@ -166,34 +166,34 @@ function for_8(param) { } function for_9(param) { - var v = { + let v = { contents: /* [] */0 }; - var collect = function (x) { + let collect = function (x) { v.contents = { hd: x, tl: v.contents }; }; - var vv = { + let vv = { contents: 0 }; - var vv2 = { + let vv2 = { contents: 0 }; - var arr = Caml_array.make(4, (function (param) { + let arr = Caml_array.make(4, (function (param) { })); - var arr2 = Caml_array.make(2, (function (param) { + let arr2 = Caml_array.make(2, (function (param) { })); - for(var i = 0; i <= 1; ++i){ - var v$1 = { + for(let i = 0; i <= 1; ++i){ + let v$1 = { contents: 0 }; v$1.contents = v$1.contents + i | 0; (function(v$1){ - for(var j = 0; j <= 1; ++j){ + for(let j = 0; j <= 1; ++j){ v$1.contents = v$1.contents + 1 | 0; collect(v$1.contents); Caml_array.set(arr, (i << 1) + j | 0, (function (param) { @@ -220,7 +220,7 @@ function for_9(param) { ]]; } -var suites_0 = [ +let suites_0 = [ "for_loop_test_3", (function (param) { return { @@ -231,7 +231,7 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "for_loop_test_4", (function (param) { @@ -319,7 +319,7 @@ var suites_1 = { } }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/for_side_effect_test.js b/jscomp/test/for_side_effect_test.js index 821bd79b79..cf4074acee 100644 --- a/jscomp/test/for_side_effect_test.js +++ b/jscomp/test/for_side_effect_test.js @@ -1,25 +1,25 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); function tst(param) { - for(var i = (console.log("hi"), 0) ,i_finish = (console.log("hello"), 3); i <= i_finish; ++i){ + for(let i = (console.log("hi"), 0) ,i_finish = (console.log("hello"), 3); i <= i_finish; ++i){ } } function test2(param) { - var v = 0; + let v = 0; v = 3; v = 10; - for(var i = 0; i <= 1; ++i){ + for(let i = 0; i <= 1; ++i){ } return v; } -var suites_0 = [ +let suites_0 = [ "for_order", (function (param) { return { @@ -30,7 +30,7 @@ var suites_0 = [ }) ]; -var suites = { +let suites = { hd: suites_0, tl: /* [] */0 }; diff --git a/jscomp/test/format_regression.js b/jscomp/test/format_regression.js index 8249ea818e..d18ab27a51 100644 --- a/jscomp/test/format_regression.js +++ b/jscomp/test/format_regression.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); function peek_queue(param) { throw { @@ -53,9 +53,9 @@ function format_pp_token(param, param$1) { function advance_loop(state) { while(true) { - var match = peek_queue(state.pp_queue); - var size = match.elem_size; - var size$1 = int_of_size(size); + let match = peek_queue(state.pp_queue); + let size = match.elem_size; + let size$1 = int_of_size(size); if (size$1 < 0 && (state.pp_right_total - state.pp_left_total | 0) < state.pp_space_left) { return; } @@ -66,7 +66,7 @@ function advance_loop(state) { }; } -var pp_infinity = 1000000010; +let pp_infinity = 1000000010; exports.peek_queue = peek_queue; exports.int_of_size = int_of_size; diff --git a/jscomp/test/format_test.js b/jscomp/test/format_test.js index 041603ffc7..54cec63dd7 100644 --- a/jscomp/test/format_test.js +++ b/jscomp/test/format_test.js @@ -1,17 +1,17 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var List = require("../../lib/js/list.js"); -var Bytes = require("../../lib/js/bytes.js"); -var Pervasives = require("../../lib/js/pervasives.js"); -var Caml_format = require("../../lib/js/caml_format.js"); +let Mt = require("./mt.js"); +let List = require("../../lib/js/list.js"); +let Bytes = require("../../lib/js/bytes.js"); +let Pervasives = require("../../lib/js/pervasives.js"); +let Caml_format = require("../../lib/js/caml_format.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -38,7 +38,7 @@ function eq3(loc, a, b, c) { eq(loc, a, c); } -var M = {}; +let M = {}; eq("File \"format_test.res\", line 23, characters 5-12", 7.875, 7.875); @@ -112,12 +112,12 @@ function aux_list(loc, ls) { }), ls); } -var literals_0 = [ +let literals_0 = [ 7.875, "0x1.f8p+2" ]; -var literals_1 = { +let literals_1 = { hd: [ 0.3, "0x1.3333333333333p-2" @@ -167,14 +167,14 @@ var literals_1 = { } }; -var literals = { +let literals = { hd: literals_0, tl: literals_1 }; aux_list("File \"format_test.res\", line 72, characters 18-25", literals); -var s = Caml_format.hexstring_of_float(7.875, -1, /* '-' */45); +let s = Caml_format.hexstring_of_float(7.875, -1, /* '-' */45); eq("File \"format_test.res\", line 74, characters 12-19", Bytes.unsafe_to_string(Bytes.uppercase_ascii(Bytes.unsafe_of_string(s))), "0X1.F8P+2"); @@ -190,7 +190,7 @@ List.iter((function (param) { scan_float("File \"format_test.res\", line 82, characters 35-42", param[1], param[0]); }), literals); -var f1 = - -9.9; +let f1 = - -9.9; eq("File \"format_test.res\", line 88, characters 5-12", f1, 9.9); diff --git a/jscomp/test/fun_pattern_match.js b/jscomp/test/fun_pattern_match.js index dd57ac1a15..964a3f85c7 100644 --- a/jscomp/test/fun_pattern_match.js +++ b/jscomp/test/fun_pattern_match.js @@ -1,8 +1,8 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml = require("../../lib/js/caml.js"); -var Curry = require("../../lib/js/curry.js"); +let Caml = require("../../lib/js/caml.js"); +let Curry = require("../../lib/js/curry.js"); function f(param, v) { return ((((param.x0 + param.x1 | 0) + param.x2 | 0) + param.x3 | 0) + param.x4 | 0) + v | 0; @@ -13,9 +13,9 @@ function f2(param, param$1) { } function f3(param) { - var lhs = param.rank; + let lhs = param.rank; return function (param) { - var rhs = param.rank; + let rhs = param.rank; if (typeof lhs !== "object") { lhs === "Uninitialized"; } else { @@ -37,9 +37,9 @@ function f3(param) { } function f4(param) { - var lhs = param.rank; + let lhs = param.rank; return function (param) { - var rhs = param.rank; + let rhs = param.rank; if (typeof lhs !== "object") { lhs === "Uninitialized"; } else { @@ -60,7 +60,7 @@ function f4(param) { }; } -var x = { +let x = { NAME: "A", VAL: r }; @@ -69,9 +69,9 @@ function r(param) { return x; } -var match = r(); +let match = r(); -var v = Curry._1(match.VAL, undefined); +let v = Curry._1(match.VAL, undefined); console.log(v); diff --git a/jscomp/test/functor_app_test.js b/jscomp/test/functor_app_test.js index 6305fc7ab7..e2cb33f434 100644 --- a/jscomp/test/functor_app_test.js +++ b/jscomp/test/functor_app_test.js @@ -1,16 +1,16 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Curry = require("../../lib/js/curry.js"); -var Functor_def = require("./functor_def.js"); -var Functor_inst = require("./functor_inst.js"); +let Mt = require("./mt.js"); +let Curry = require("../../lib/js/curry.js"); +let Functor_def = require("./functor_def.js"); +let Functor_inst = require("./functor_inst.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -31,15 +31,15 @@ function eq(loc, x, y) { }; } -var Y0 = Functor_def.Make(Functor_inst); +let Y0 = Functor_def.Make(Functor_inst); -var Y1 = Functor_def.Make(Functor_inst); +let Y1 = Functor_def.Make(Functor_inst); eq("File \"functor_app_test.res\", line 15, characters 3-10", Curry._2(Y0.h, 1, 2), 4); eq("File \"functor_app_test.res\", line 16, characters 3-10", Curry._2(Y1.h, 2, 3), 6); -var v = Functor_def.$$return(); +let v = Functor_def.$$return(); eq("File \"functor_app_test.res\", line 20, characters 3-10", v, 2); diff --git a/jscomp/test/functor_def.js b/jscomp/test/functor_def.js index b294578896..75d6056744 100644 --- a/jscomp/test/functor_def.js +++ b/jscomp/test/functor_def.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); -var v = { +let v = { contents: 0 }; @@ -17,7 +17,7 @@ function $$return(param) { } function Make(U) { - var h = function (x, x$1) { + let h = function (x, x$1) { console.log(f(x$1, x$1)); return Curry._2(U.say, x$1, x$1); }; diff --git a/jscomp/test/functor_ffi.js b/jscomp/test/functor_ffi.js index 74c1029b40..0d7c442e2e 100644 --- a/jscomp/test/functor_ffi.js +++ b/jscomp/test/functor_ffi.js @@ -1,10 +1,10 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_option = require("../../lib/js/caml_option.js"); +let Caml_option = require("../../lib/js/caml_option.js"); function Make(S) { - var opt_get = function (f, i) { + let opt_get = function (f, i) { return Caml_option.undefined_to_opt(f[i]); }; return { @@ -16,7 +16,7 @@ function opt_get(f, i) { return Caml_option.undefined_to_opt(f[i]); } -var Int_arr = { +let Int_arr = { opt_get: opt_get }; diff --git a/jscomp/test/functors.js b/jscomp/test/functors.js index cd42b3af76..d0b513a63c 100644 --- a/jscomp/test/functors.js +++ b/jscomp/test/functors.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); function O(X) { - var cow = function (x) { + let cow = function (x) { return Curry._1(X.foo, x); }; - var sheep = function (x) { + let sheep = function (x) { return 1 + Curry._1(X.foo, x) | 0; }; return { @@ -17,10 +17,10 @@ function O(X) { } function F(X, Y) { - var cow = function (x) { + let cow = function (x) { return Curry._1(Y.foo, Curry._1(X.foo, x)); }; - var sheep = function (x) { + let sheep = function (x) { return 1 + Curry._1(Y.foo, Curry._1(X.foo, x)) | 0; }; return { @@ -30,7 +30,7 @@ function F(X, Y) { } function F1(X, Y) { - var sheep = function (x) { + let sheep = function (x) { return 1 + Curry._1(Y.foo, Curry._1(X.foo, x)) | 0; }; return { @@ -39,7 +39,7 @@ function F1(X, Y) { } function F2(X, Y) { - var sheep = function (x) { + let sheep = function (x) { return 1 + Curry._1(Y.foo, Curry._1(X.foo, x)) | 0; }; return { @@ -47,9 +47,9 @@ function F2(X, Y) { }; } -var M = { +let M = { F: (function (funarg, funarg$1) { - var sheep = function (x) { + let sheep = function (x) { return 1 + Curry._1(funarg$1.foo, Curry._1(funarg.foo, x)) | 0; }; return { diff --git a/jscomp/test/genlex_test.js b/jscomp/test/genlex_test.js index 3fcefd3b65..df2ac0ff36 100644 --- a/jscomp/test/genlex_test.js +++ b/jscomp/test/genlex_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var List = require("../../lib/js/list.js"); -var Genlex = require("../../lib/js/genlex.js"); -var Stream = require("../../lib/js/stream.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let Mt = require("./mt.js"); +let List = require("../../lib/js/list.js"); +let Genlex = require("../../lib/js/genlex.js"); +let Stream = require("../../lib/js/stream.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); -var lexer = Genlex.make_lexer({ +let lexer = Genlex.make_lexer({ hd: "+", tl: { hd: "-", @@ -34,15 +34,15 @@ var lexer = Genlex.make_lexer({ }); function to_list(s) { - var _acc = /* [] */0; + let _acc = /* [] */0; while(true) { - var acc = _acc; - var v; + let acc = _acc; + let v; try { v = Stream.next(s); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === Stream.Failure) { return List.rev(acc); } @@ -56,7 +56,7 @@ function to_list(s) { }; } -var suites_0 = [ +let suites_0 = [ "lexer_stream_genlex", (function (param) { return { @@ -109,7 +109,7 @@ var suites_0 = [ }) ]; -var suites = { +let suites = { hd: suites_0, tl: /* [] */0 }; diff --git a/jscomp/test/gentTypeReTest.js b/jscomp/test/gentTypeReTest.js index af4cc95e6b..7f7b74c9d4 100644 --- a/jscomp/test/gentTypeReTest.js +++ b/jscomp/test/gentTypeReTest.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var GentTypeReTestGen = require("./gentTypeReTest.gen"); +let GentTypeReTestGen = require("./gentTypeReTest.gen"); function f(prim) { return GentTypeReTestGen.f(prim); diff --git a/jscomp/test/global_exception_regression_test.js b/jscomp/test/global_exception_regression_test.js index 22b914151a..443bf1ee90 100644 --- a/jscomp/test/global_exception_regression_test.js +++ b/jscomp/test/global_exception_regression_test.js @@ -1,21 +1,21 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var v = { +let v = { RE_EXN_ID: "Not_found" }; -var u = { +let u = { RE_EXN_ID: "Not_found" }; -var s = { +let s = { RE_EXN_ID: "End_of_file" }; -var suites_0 = [ +let suites_0 = [ "not_found_equal", (function (param) { return { @@ -26,7 +26,7 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "not_found_not_equal_end_of_file", (function (param) { @@ -40,7 +40,7 @@ var suites_1 = { tl: /* [] */0 }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/global_mangles.js b/jscomp/test/global_mangles.js index 1430b840df..d34e7b5e60 100644 --- a/jscomp/test/global_mangles.js +++ b/jscomp/test/global_mangles.js @@ -2,33 +2,33 @@ 'use strict'; -var $$__dirname = 1; +let $$__dirname = 1; -var $$__filename = 2; +let $$__filename = 2; -var $$clearImmediate = 3; +let $$clearImmediate = 3; -var $$clearInterval = 4; +let $$clearInterval = 4; -var $$clearTimeout = 5; +let $$clearTimeout = 5; -var $$console = 6; +let $$console = 6; -var $$exports = 7; +let $$exports = 7; -var $$global = 8; +let $$global = 8; -var _module = 9; +let _module = 9; -var $$process = 10; +let $$process = 10; -var $$require = 11; +let $$require = 11; -var $$setImmediate = 12; +let $$setImmediate = 12; -var $$setInterval = 13; +let $$setInterval = 13; -var $$setTimeout = 14; +let $$setTimeout = 14; exports.$$__dirname = $$__dirname; exports.$$__filename = $$__filename; diff --git a/jscomp/test/global_module_alias_test.js b/jscomp/test/global_module_alias_test.js index 34ecd12089..b0c757dba9 100644 --- a/jscomp/test/global_module_alias_test.js +++ b/jscomp/test/global_module_alias_test.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var List = require("../../lib/js/list.js"); -var Curry = require("../../lib/js/curry.js"); +let Mt = require("./mt.js"); +let List = require("../../lib/js/list.js"); +let Curry = require("../../lib/js/curry.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -30,7 +30,7 @@ function eq(loc, x, y) { }; } -var v = { +let v = { contents: 0 }; @@ -83,7 +83,7 @@ v.contents = v.contents + 1 | 0; v.contents = v.contents + 1 | 0; -var H = List; +let H = List; eq("File \"global_module_alias_test.res\", line 52, characters 12-19", v.contents, 12); @@ -112,7 +112,7 @@ function xx(param) { eq("File \"global_module_alias_test.res\", line 80, characters 12-19", g(), 4); -var V = xx(); +let V = xx(); eq("File \"global_module_alias_test.res\", line 84, characters 5-12", Curry._1(V.length, { hd: 1, @@ -127,7 +127,7 @@ eq("File \"global_module_alias_test.res\", line 84, characters 5-12", Curry._1(V eq("File \"global_module_alias_test.res\", line 85, characters 5-12", v.contents, 15); -var H$1 = f(); +let H$1 = f(); eq("File \"global_module_alias_test.res\", line 87, characters 5-12", Curry._1(H$1.length, { hd: 1, @@ -141,17 +141,17 @@ eq("File \"global_module_alias_test.res\", line 88, characters 5-12", v.contents Mt.from_pair_suites("Global_module_alias_test", suites.contents); -var A; +let A; -var B; +let B; -var C; +let C; -var D; +let D; -var E; +let E; -var F; +let F; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/google_closure_test.js b/jscomp/test/google_closure_test.js index 254ae291cb..922111d0a7 100644 --- a/jscomp/test/google_closure_test.js +++ b/jscomp/test/google_closure_test.js @@ -1,8 +1,8 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Test_google_closure = require("./test_google_closure.js"); +let Mt = require("./mt.js"); +let Test_google_closure = require("./test_google_closure.js"); Mt.from_pair_suites("Closure", { hd: [ diff --git a/jscomp/test/gpr496_test.js b/jscomp/test/gpr496_test.js index afc9f6e9d3..d00555cf45 100644 --- a/jscomp/test/gpr496_test.js +++ b/jscomp/test/gpr496_test.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml = require("../../lib/js/caml.js"); -var Curry = require("../../lib/js/curry.js"); +let Mt = require("./mt.js"); +let Caml = require("../../lib/js/caml.js"); +let Curry = require("../../lib/js/curry.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -30,7 +30,7 @@ function eq(loc, x, y) { }; } -var expected = [ +let expected = [ false, false, true, @@ -41,7 +41,7 @@ var expected = [ 0 ]; -var expected2 = [ +let expected2 = [ false, false, true, @@ -52,7 +52,7 @@ var expected2 = [ 0 ]; -var u = [ +let u = [ false, false, true, diff --git a/jscomp/test/gpr_1072.js b/jscomp/test/gpr_1072.js index 157ac2f688..5331e079e6 100644 --- a/jscomp/test/gpr_1072.js +++ b/jscomp/test/gpr_1072.js @@ -2,16 +2,16 @@ 'use strict'; -var u = { +let u = { y: 3 }; -var v_ice_cream3_0 = { +let v_ice_cream3_0 = { flavor: "vanilla", num: 3 }; -var v_ice_cream3_1 = { +let v_ice_cream3_1 = { hd: { flavor: "x", num: 3 @@ -25,17 +25,17 @@ var v_ice_cream3_1 = { } }; -var v_ice_cream3 = { +let v_ice_cream3 = { hd: v_ice_cream3_0, tl: v_ice_cream3_1 }; -var v_ice_cream4_0 = { +let v_ice_cream4_0 = { flavor: "vanilla", num: 3 }; -var v_ice_cream4_1 = { +let v_ice_cream4_1 = { hd: { flavor: "x", num: 3 @@ -43,26 +43,26 @@ var v_ice_cream4_1 = { tl: /* [] */0 }; -var v_ice_cream4 = { +let v_ice_cream4 = { hd: v_ice_cream4_0, tl: v_ice_cream4_1 }; -var vv = { +let vv = { x__ignore: 3 }; -var int_expect = { +let int_expect = { x__ignore: 0 }; -var int_expect2 = { +let int_expect2 = { x__ignore: 0 }; -var int_expects_0 = {}; +let int_expects_0 = {}; -var int_expects_1 = { +let int_expects_1 = { hd: { x__ignore: 2 }, @@ -74,52 +74,52 @@ var int_expects_1 = { } }; -var int_expects = { +let int_expects = { hd: int_expects_0, tl: int_expects_1 }; -var mk_ice = { +let mk_ice = { flavour: "vanilla", num: 3 }; -var my_ice2 = { +let my_ice2 = { flavour: "vanilla", num: 1 }; -var my_ice3 = { +let my_ice3 = { num: 2 }; -var v_mk4 = { +let v_mk4 = { y: 3 }; -var v_mk5 = { +let v_mk5 = { x: undefined, y: 3 }; -var v_mk6 = { +let v_mk6 = { y: 3 }; -var v_mk6_1 = { +let v_mk6_1 = { x: undefined, y: 3 }; -var mk_u = { +let mk_u = { x__ignore: 0 }; -var v_mk7_0 = { +let v_mk7_0 = { y: 3 }; -var v_mk7_1 = { +let v_mk7_1 = { hd: { y: 2 }, @@ -131,7 +131,7 @@ var v_mk7_1 = { } }; -var v_mk7 = { +let v_mk7 = { hd: v_mk7_0, tl: v_mk7_1 }; @@ -150,7 +150,7 @@ again3(3); again3(2); -var side_effect = { +let side_effect = { contents: 0 }; diff --git a/jscomp/test/gpr_1072_reg.js b/jscomp/test/gpr_1072_reg.js index 34098fdbab..282186115c 100644 --- a/jscomp/test/gpr_1072_reg.js +++ b/jscomp/test/gpr_1072_reg.js @@ -2,7 +2,7 @@ 'use strict'; -var v1 = { +let v1 = { localeMatcher: "best fit", formatMatcher: "basic", day: "2-digit", diff --git a/jscomp/test/gpr_1150.js b/jscomp/test/gpr_1150.js index 1476eab843..b5cc9c15ab 100644 --- a/jscomp/test/gpr_1150.js +++ b/jscomp/test/gpr_1150.js @@ -6,21 +6,21 @@ function f(children) { if (!children) { return []; } - var children$1 = children.tl; - var a0 = children.hd; + let children$1 = children.tl; + let a0 = children.hd; if (!children$1) { return [a0]; } - var children$2 = children$1.tl; - var a1 = children$1.hd; + let children$2 = children$1.tl; + let a1 = children$1.hd; if (!children$2) { return [ a0, a1 ]; } - var children$3 = children$2.tl; - var a2 = children$2.hd; + let children$3 = children$2.tl; + let a2 = children$2.hd; if (!children$3) { return [ a0, @@ -28,8 +28,8 @@ function f(children) { a2 ]; } - var children$4 = children$3.tl; - var a3 = children$3.hd; + let children$4 = children$3.tl; + let a3 = children$3.hd; if (!children$4) { return [ a0, @@ -38,8 +38,8 @@ function f(children) { a3 ]; } - var children$5 = children$4.tl; - var a4 = children$4.hd; + let children$5 = children$4.tl; + let a4 = children$4.hd; if (!children$5) { return [ a0, @@ -49,8 +49,8 @@ function f(children) { a4 ]; } - var children$6 = children$5.tl; - var a5 = children$5.hd; + let children$6 = children$5.tl; + let a5 = children$5.hd; if (!children$6) { return [ a0, @@ -61,8 +61,8 @@ function f(children) { a5 ]; } - var children$7 = children$6.tl; - var a6 = children$6.hd; + let children$7 = children$6.tl; + let a6 = children$6.hd; if (!children$7) { return [ a0, @@ -74,8 +74,8 @@ function f(children) { a6 ]; } - var children$8 = children$7.tl; - var a7 = children$7.hd; + let children$8 = children$7.tl; + let a7 = children$7.hd; if (!children$8) { return [ a0, @@ -88,8 +88,8 @@ function f(children) { a7 ]; } - var children$9 = children$8.tl; - var a8 = children$8.hd; + let children$9 = children$8.tl; + let a8 = children$8.hd; if (!children$9) { return [ a0, @@ -103,8 +103,8 @@ function f(children) { a8 ]; } - var children$10 = children$9.tl; - var a9 = children$9.hd; + let children$10 = children$9.tl; + let a9 = children$9.hd; if (!children$10) { return [ a0, @@ -119,8 +119,8 @@ function f(children) { a9 ]; } - var children$11 = children$10.tl; - var a10 = children$10.hd; + let children$11 = children$10.tl; + let a10 = children$10.hd; if (!children$11) { return [ a0, @@ -136,8 +136,8 @@ function f(children) { a10 ]; } - var children$12 = children$11.tl; - var a11 = children$11.hd; + let children$12 = children$11.tl; + let a11 = children$11.hd; if (!children$12) { return [ a0, @@ -154,8 +154,8 @@ function f(children) { a11 ]; } - var children$13 = children$12.tl; - var a12 = children$12.hd; + let children$13 = children$12.tl; + let a12 = children$12.hd; if (!children$13) { return [ a0, @@ -173,8 +173,8 @@ function f(children) { a12 ]; } - var children$14 = children$13.tl; - var a13 = children$13.hd; + let children$14 = children$13.tl; + let a13 = children$13.hd; if (!children$14) { return [ a0, @@ -193,8 +193,8 @@ function f(children) { a13 ]; } - var children$15 = children$14.tl; - var a14 = children$14.hd; + let children$15 = children$14.tl; + let a14 = children$14.hd; if (!children$15) { return [ a0, diff --git a/jscomp/test/gpr_1154_test.js b/jscomp/test/gpr_1154_test.js index 87e2a46b10..5313e06294 100644 --- a/jscomp/test/gpr_1154_test.js +++ b/jscomp/test/gpr_1154_test.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Int64 = require("../../lib/js/int64.js"); -var Caml_int64 = require("../../lib/js/caml_int64.js"); +let Mt = require("./mt.js"); +let Int64 = require("../../lib/js/int64.js"); +let Caml_int64 = require("../../lib/js/caml_int64.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -39,7 +39,7 @@ function g(x) { return Caml_int64.or_(x, (console.log("f"), x)); } -var v = { +let v = { contents: 0 }; @@ -52,7 +52,7 @@ function g2(x) { return Caml_int64.or_(x, (v.contents = v.contents + 1 | 0, x)); } -var a = Caml_int64.or_(Int64.one, (v.contents = v.contents + 1 | 0, Int64.one)); +let a = Caml_int64.or_(Int64.one, (v.contents = v.contents + 1 | 0, Int64.one)); eq("File \"gpr_1154_test.res\", line 28, characters 12-19", v.contents, 1); diff --git a/jscomp/test/gpr_1240_missing_unbox.js b/jscomp/test/gpr_1240_missing_unbox.js index c0d74864a7..abd18ac83d 100644 --- a/jscomp/test/gpr_1240_missing_unbox.js +++ b/jscomp/test/gpr_1240_missing_unbox.js @@ -3,8 +3,8 @@ function f(x, y) { - var x$1 = x; - var y$1 = y; + let x$1 = x; + let y$1 = y; return [ x$1, y$1 diff --git a/jscomp/test/gpr_1245_test.js b/jscomp/test/gpr_1245_test.js index 79ff9d7815..0ce7961ca2 100644 --- a/jscomp/test/gpr_1245_test.js +++ b/jscomp/test/gpr_1245_test.js @@ -1,23 +1,23 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); -var x = { +let x = { contents: 1 }; -var y = { +let y = { contents: 2 }; function f(param) { - var a = { + let a = { contents: param[0] }; - var b = { + let b = { contents: param[1] }; console.log(a, b); @@ -28,7 +28,7 @@ function g(param) { } function a0(f) { - var u = Curry._1(f, undefined); + let u = Curry._1(f, undefined); if (u !== null) { console.log(u); console.log(u); @@ -39,12 +39,12 @@ function a0(f) { } function a1(f) { - var E = /* @__PURE__ */Caml_exceptions.create("E"); + let E = /* @__PURE__ */Caml_exceptions.create("E"); try { return Curry._1(f, undefined); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === E) { return 1; } @@ -52,9 +52,9 @@ function a1(f) { } } -var a = 1; +let a = 1; -var b = 2; +let b = 2; exports.a = a; exports.b = b; diff --git a/jscomp/test/gpr_1268.js b/jscomp/test/gpr_1268.js index 4ba2f859a1..883fd90291 100644 --- a/jscomp/test/gpr_1268.js +++ b/jscomp/test/gpr_1268.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); function f_add2(a, b, x, y) { return add(Curry._1(b, y), Curry._1(a, x)); diff --git a/jscomp/test/gpr_1409_test.js b/jscomp/test/gpr_1409_test.js index 5c1c015870..aacdda3c1b 100644 --- a/jscomp/test/gpr_1409_test.js +++ b/jscomp/test/gpr_1409_test.js @@ -1,17 +1,17 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var $$Array = require("../../lib/js/array.js"); -var Curry = require("../../lib/js/curry.js"); -var String_set = require("./string_set.js"); -var Caml_option = require("../../lib/js/caml_option.js"); +let Mt = require("./mt.js"); +let $$Array = require("../../lib/js/array.js"); +let Curry = require("../../lib/js/curry.js"); +let String_set = require("./string_set.js"); +let Caml_option = require("../../lib/js/caml_option.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -32,9 +32,9 @@ function eq(loc, x, y) { }; } -var a = {}; +let a = {}; -var b = { +let b = { foo: "42" }; @@ -46,11 +46,11 @@ function map(f, x) { } function make(foo) { - var partial_arg = map((function (prim) { + let partial_arg = map((function (prim) { return String(prim); }), foo); return function (param) { - var tmp = {}; + let tmp = {}; if (partial_arg !== undefined) { tmp.foo = partial_arg; } @@ -58,9 +58,9 @@ function make(foo) { }; } -var a_ = make(undefined)(); +let a_ = make(undefined)(); -var b_ = make(42)(); +let b_ = make(42)(); eq("File \"gpr_1409_test.res\", line 26, characters 3-10", b_.foo, "42"); @@ -70,12 +70,12 @@ console.log(a, b, a_, b_); eq("File \"gpr_1409_test.res\", line 31, characters 3-10", Object.keys(a_).length, 0); -var test2 = { +let test2 = { hi: 2 }; function test3(_open, xx__hi) { - var tmp = { + let tmp = { hi: 2 }; if (_open !== undefined) { @@ -89,7 +89,7 @@ function test3(_open, xx__hi) { function test4(_open, xx__hi) { console.log("no inlin"); - var tmp = { + let tmp = { _open: _open, hi: 2 }; @@ -101,14 +101,14 @@ function test4(_open, xx__hi) { function test5(f, x) { console.log("no inline"); - var tmp = { + let tmp = { hi: 2 }; - var tmp$1 = Curry._1(f, x); + let tmp$1 = Curry._1(f, x); if (tmp$1 !== undefined) { tmp._open = tmp$1; } - var tmp$2 = Curry._1(f, x); + let tmp$2 = Curry._1(f, x); if (tmp$2 !== undefined) { tmp.xx__hi = tmp$2; } @@ -117,17 +117,17 @@ function test5(f, x) { function test6(f, x) { console.log("no inline"); - var x$1 = { + let x$1 = { contents: 3 }; - var tmp = { + let tmp = { hi: 2 }; - var tmp$1 = (x$1.contents = x$1.contents + 1 | 0, x$1.contents); + let tmp$1 = (x$1.contents = x$1.contents + 1 | 0, x$1.contents); if (tmp$1 !== undefined) { tmp._open = tmp$1; } - var tmp$2 = f(x$1); + let tmp$2 = f(x$1); if (tmp$2 !== undefined) { tmp.xx__hi = tmp$2; } diff --git a/jscomp/test/gpr_1423_app_test.js b/jscomp/test/gpr_1423_app_test.js index 4cfc400ade..20b6db0834 100644 --- a/jscomp/test/gpr_1423_app_test.js +++ b/jscomp/test/gpr_1423_app_test.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Curry = require("../../lib/js/curry.js"); -var Gpr_1423_nav = require("./gpr_1423_nav.js"); +let Mt = require("./mt.js"); +let Curry = require("../../lib/js/curry.js"); +let Gpr_1423_nav = require("./gpr_1423_nav.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; diff --git a/jscomp/test/gpr_1481.js b/jscomp/test/gpr_1481.js index 2e8a9ff782..abdd9f8224 100644 --- a/jscomp/test/gpr_1481.js +++ b/jscomp/test/gpr_1481.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Moduleid = require("#moduleid"); +let Moduleid = require("#moduleid"); function f(param) { return Moduleid.name; diff --git a/jscomp/test/gpr_1503_test.js b/jscomp/test/gpr_1503_test.js index 4700978982..e74ed31179 100644 --- a/jscomp/test/gpr_1503_test.js +++ b/jscomp/test/gpr_1503_test.js @@ -1,16 +1,16 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Int64 = require("../../lib/js/int64.js"); -var Caml_int64 = require("../../lib/js/caml_int64.js"); -var Caml_format = require("../../lib/js/caml_format.js"); +let Mt = require("./mt.js"); +let Int64 = require("../../lib/js/int64.js"); +let Caml_int64 = require("../../lib/js/caml_int64.js"); +let Caml_format = require("../../lib/js/caml_format.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -35,14 +35,14 @@ function id(x) { return Caml_format.int64_of_string(Caml_int64.to_string(x)); } -var i = [ +let i = [ 2074848171, 2880154539 ]; -var s = Caml_int64.to_string(i); +let s = Caml_int64.to_string(i); -var i$p = Caml_format.int64_of_string(s); +let i$p = Caml_format.int64_of_string(s); eq("File \"gpr_1503_test.res\", line 15, characters 5-12", i, i$p); diff --git a/jscomp/test/gpr_1539_test.js b/jscomp/test/gpr_1539_test.js index e1a1e4e264..3cd7784433 100644 --- a/jscomp/test/gpr_1539_test.js +++ b/jscomp/test/gpr_1539_test.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_module = require("../../lib/js/caml_module.js"); +let Caml_module = require("../../lib/js/caml_module.js"); -var Point = Caml_module.init_mod([ +let Point = Caml_module.init_mod([ "gpr_1539_test.res", 11, 4 @@ -27,9 +27,9 @@ Caml_module.update_mod({ }) }); -var CRS; +let CRS; -var Layer; +let Layer; exports.CRS = CRS; exports.Layer = Layer; diff --git a/jscomp/test/gpr_1658_test.js b/jscomp/test/gpr_1658_test.js index 8e88ca028e..100bef7e91 100644 --- a/jscomp/test/gpr_1658_test.js +++ b/jscomp/test/gpr_1658_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Js_types = require("../../lib/js/js_types.js"); +let Mt = require("./mt.js"); +let Js_types = require("../../lib/js/js_types.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -31,7 +31,7 @@ function eq(loc, x, y) { eq("File \"gpr_1658_test.res\", line 10, characters 5-12", null, null); -var match = Js_types.classify(null); +let match = Js_types.classify(null); if (typeof match !== "object" && match === "JSNull") { eq("File \"gpr_1658_test.res\", line 12, characters 17-24", true, true); diff --git a/jscomp/test/gpr_1667_test.js b/jscomp/test/gpr_1667_test.js index 45e135779c..3f998c6183 100644 --- a/jscomp/test/gpr_1667_test.js +++ b/jscomp/test/gpr_1667_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; diff --git a/jscomp/test/gpr_1698_test.js b/jscomp/test/gpr_1698_test.js index df96e7f21a..fc04a0f4e0 100644 --- a/jscomp/test/gpr_1698_test.js +++ b/jscomp/test/gpr_1698_test.js @@ -4,7 +4,7 @@ function is_number(_expr) { while(true) { - var expr = _expr; + let expr = _expr; switch (expr.TAG) { case "Val" : if (expr._0.TAG === "Natural") { @@ -27,16 +27,16 @@ function is_number(_expr) { function compare(context, state, _a, _b) { while(true) { - var b = _b; - var a = _a; - var exit = 0; - var na; - var da; - var nb; - var db; - var exit$1 = 0; - var exit$2 = 0; - var exit$3 = 0; + let b = _b; + let a = _a; + let exit = 0; + let na; + let da; + let nb; + let db; + let exit$1 = 0; + let exit$2 = 0; + let exit$3 = 0; switch (a.TAG) { case "Val" : switch (b.TAG) { @@ -172,7 +172,7 @@ function compare(context, state, _a, _b) { return -1; } case 2 : - var denom = compare(context, state, da, db); + let denom = compare(context, state, da, db); if (denom !== 0) { return denom; } @@ -184,7 +184,7 @@ function compare(context, state, _a, _b) { }; } -var a = { +let a = { TAG: "Sum", _0: { hd: { @@ -207,7 +207,7 @@ var a = { } }; -var b = { +let b = { TAG: "Val", _0: { TAG: "Symbol", diff --git a/jscomp/test/gpr_1701_test.js b/jscomp/test/gpr_1701_test.js index 7a3cec5153..5240ba4787 100644 --- a/jscomp/test/gpr_1701_test.js +++ b/jscomp/test/gpr_1701_test.js @@ -1,11 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var List = require("../../lib/js/list.js"); -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let List = require("../../lib/js/list.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); -var Foo = /* @__PURE__ */Caml_exceptions.create("Gpr_1701_test.Foo"); +let Foo = /* @__PURE__ */Caml_exceptions.create("Gpr_1701_test.Foo"); function test(n) { if (n === 0) { @@ -18,7 +18,7 @@ function test(n) { return test(n - 1 | 0); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === Foo) { return; } @@ -29,15 +29,15 @@ function test(n) { test(100); function read_lines(inc) { - var _acc = /* [] */0; + let _acc = /* [] */0; while(true) { - var acc = _acc; - var l; + let acc = _acc; + let l; try { l = input_line(inc); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "End_of_file") { l = undefined; } else { @@ -56,15 +56,15 @@ function read_lines(inc) { } function read_lines2(inc) { - var _acc = /* [] */0; + let _acc = /* [] */0; while(true) { - var acc = _acc; - var l; + let acc = _acc; + let l; try { l = input_line(inc); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "End_of_file") { return List.rev(acc); } @@ -79,16 +79,16 @@ function read_lines2(inc) { } function read_lines3(inc) { - var loop = function (acc) { + let loop = function (acc) { try { - var l = input_line(inc); + let l = input_line(inc); return loop({ hd: l, tl: acc }); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "End_of_file") { return List.rev(acc); } diff --git a/jscomp/test/gpr_1716_test.js b/jscomp/test/gpr_1716_test.js index 89a927beb1..5bc111d5e9 100644 --- a/jscomp/test/gpr_1716_test.js +++ b/jscomp/test/gpr_1716_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); +let Mt = require("./mt.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -29,9 +29,9 @@ function eq(loc, x, y) { }; } -var a = {}; +let a = {}; -var b = {}; +let b = {}; Caml_obj.update_dummy(a, { b: b diff --git a/jscomp/test/gpr_1717_test.js b/jscomp/test/gpr_1717_test.js index 830c967b22..f1543fa85f 100644 --- a/jscomp/test/gpr_1717_test.js +++ b/jscomp/test/gpr_1717_test.js @@ -2,11 +2,11 @@ 'use strict'; -var A = {}; +let A = {}; -var A0 = {}; +let A0 = {}; -var A1 = {}; +let A1 = {}; exports.A = A; exports.A0 = A0; diff --git a/jscomp/test/gpr_1728_test.js b/jscomp/test/gpr_1728_test.js index 8beb12eb96..f16ea44529 100644 --- a/jscomp/test/gpr_1728_test.js +++ b/jscomp/test/gpr_1728_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_format = require("../../lib/js/caml_format.js"); +let Mt = require("./mt.js"); +let Caml_format = require("../../lib/js/caml_format.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -34,7 +34,7 @@ function foo(x) { } function badInlining(obj) { - var x = obj.field; + let x = obj.field; Caml_format.int_of_string(x) !== 3; } diff --git a/jscomp/test/gpr_1749_test.js b/jscomp/test/gpr_1749_test.js index 2ef3e7f6fd..51d6d79c68 100644 --- a/jscomp/test/gpr_1749_test.js +++ b/jscomp/test/gpr_1749_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -32,7 +32,7 @@ eq("File \"gpr_1749_test.res\", line 15, characters 3-10", 0, 0); Mt.from_pair_suites("Gpr_1749_test", suites.contents); -var a = 0; +let a = 0; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/gpr_1760_test.js b/jscomp/test/gpr_1760_test.js index 552398ce6c..4f2ea803ad 100644 --- a/jscomp/test/gpr_1760_test.js +++ b/jscomp/test/gpr_1760_test.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_int32 = require("../../lib/js/caml_int32.js"); -var Caml_int64 = require("../../lib/js/caml_int64.js"); +let Mt = require("./mt.js"); +let Caml_int32 = require("../../lib/js/caml_int32.js"); +let Caml_int64 = require("../../lib/js/caml_int64.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -30,7 +30,7 @@ function eq(loc, x, y) { }; } -var a0; +let a0; try { Caml_int32.div(0, 0); @@ -40,7 +40,7 @@ catch (exn){ a0 = 1; } -var a1; +let a1; try { Caml_int32.mod_(0, 0); @@ -50,7 +50,7 @@ catch (exn$1){ a1 = 1; } -var a4; +let a4; try { Caml_int32.div(0, 0); @@ -60,7 +60,7 @@ catch (exn$2){ a4 = 1; } -var a5; +let a5; try { Caml_int32.mod_(0, 0); @@ -70,7 +70,7 @@ catch (exn$3){ a5 = 1; } -var a6; +let a6; try { Caml_int64.div(Caml_int64.zero, Caml_int64.zero); @@ -80,7 +80,7 @@ catch (exn$4){ a6 = 1; } -var a7; +let a7; try { Caml_int64.mod_(Caml_int64.zero, Caml_int64.zero); diff --git a/jscomp/test/gpr_1762_test.js b/jscomp/test/gpr_1762_test.js index 06965afd85..eade611bfc 100644 --- a/jscomp/test/gpr_1762_test.js +++ b/jscomp/test/gpr_1762_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -28,7 +28,7 @@ function eq(loc, x, y) { }; } -var v = { +let v = { contents: 3 }; diff --git a/jscomp/test/gpr_1817_test.js b/jscomp/test/gpr_1817_test.js index 587c30c787..d5a3941fcc 100644 --- a/jscomp/test/gpr_1817_test.js +++ b/jscomp/test/gpr_1817_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); +let Mt = require("./mt.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -30,8 +30,8 @@ function eq(loc, x, y) { } function f(param) { - var x = new Date(); - var y = new Date(); + let x = new Date(); + let y = new Date(); return [ Caml_obj.greaterthan(y, x), Caml_obj.lessthan(y, x), @@ -39,13 +39,13 @@ function f(param) { ]; } -var match = f(); +let match = f(); -var a2 = match[2]; +let a2 = match[2]; -var a1 = match[1]; +let a1 = match[1]; -var a0 = match[0]; +let a0 = match[0]; console.log(a0, a1); diff --git a/jscomp/test/gpr_1822_test.js b/jscomp/test/gpr_1822_test.js index 73e2c7fada..333bf62326 100644 --- a/jscomp/test/gpr_1822_test.js +++ b/jscomp/test/gpr_1822_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -28,12 +28,12 @@ function eq(loc, x, y) { }; } -var myShape = { +let myShape = { TAG: "Circle", _0: 10 }; -var area; +let area; area = myShape.TAG === "Circle" ? 100 * 3.14 : Math.imul(10, myShape._1); diff --git a/jscomp/test/gpr_1891_test.js b/jscomp/test/gpr_1891_test.js index bbaf49b1fd..2237c480ad 100644 --- a/jscomp/test/gpr_1891_test.js +++ b/jscomp/test/gpr_1891_test.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); function foo(x) { if (typeof x === "object" && x.NAME === "Foo" && x.VAL === 3) { diff --git a/jscomp/test/gpr_1943_test.js b/jscomp/test/gpr_1943_test.js index 5e84fee2fd..cc0e287369 100644 --- a/jscomp/test/gpr_1943_test.js +++ b/jscomp/test/gpr_1943_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -40,7 +40,7 @@ function f(x) { ]; } -var v = f({ +let v = f({ _003: 0, _50: 1, _50x: 2, diff --git a/jscomp/test/gpr_1946_test.js b/jscomp/test/gpr_1946_test.js index 50553a00ce..69de7169e9 100644 --- a/jscomp/test/gpr_1946_test.js +++ b/jscomp/test/gpr_1946_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -15,16 +15,16 @@ function eq(loc, x, y) { Mt.eq_suites(test_id, suites, loc, x, y); } -var x = ({ +let x = ({ x: 3, y: 4 }).x; -var zz = ({ +let zz = ({ _5: 3 })._5; -var h = { +let h = { "0123": 2, "123_456": 3 }; diff --git a/jscomp/test/gpr_2316_test.js b/jscomp/test/gpr_2316_test.js index 54e85ae658..8a2570b931 100644 --- a/jscomp/test/gpr_2316_test.js +++ b/jscomp/test/gpr_2316_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let Mt = require("./mt.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -29,7 +29,7 @@ function eq(loc, x, y) { }; } -var y; +let y; try { throw { @@ -39,7 +39,7 @@ try { }; } catch (raw_msg){ - var msg = Caml_js_exceptions.internalToOCamlException(raw_msg); + let msg = Caml_js_exceptions.internalToOCamlException(raw_msg); if (msg.RE_EXN_ID === "Failure") { y = msg._1; } else { @@ -47,9 +47,9 @@ catch (raw_msg){ } } -var x; +let x; -var exit = 0; +let exit = 0; try { throw { @@ -59,7 +59,7 @@ try { }; } catch (raw_msg$1){ - var msg$1 = Caml_js_exceptions.internalToOCamlException(raw_msg$1); + let msg$1 = Caml_js_exceptions.internalToOCamlException(raw_msg$1); if (msg$1.RE_EXN_ID === "Failure") { x = msg$1._1; } else { diff --git a/jscomp/test/gpr_2413_test.js b/jscomp/test/gpr_2413_test.js index 44fb314781..bd7a3f24c9 100644 --- a/jscomp/test/gpr_2413_test.js +++ b/jscomp/test/gpr_2413_test.js @@ -5,25 +5,25 @@ function f(x) { switch (x.TAG) { case "A" : - var a = x._0; + let a = x._0; if (a.TAG === "P") { - var a$1 = a._0; + let a$1 = a._0; return a$1 + a$1 | 0; } - var a$2 = a._0; + let a$2 = a._0; return a$2 - a$2 | 0; case "B" : case "C" : break; } - var a$3 = x._0._0; + let a$3 = x._0._0; return Math.imul(a$3, a$3); } function ff(c) { c.contents = c.contents + 1 | 0; - var match = (1 + c.contents | 0) + 1 | 0; + let match = (1 + c.contents | 0) + 1 | 0; if (match > 3 || match < 0) { return 0; } else { diff --git a/jscomp/test/gpr_2474.js b/jscomp/test/gpr_2474.js index a375d93a9d..891bfb92bb 100644 --- a/jscomp/test/gpr_2474.js +++ b/jscomp/test/gpr_2474.js @@ -2,7 +2,7 @@ 'use strict'; -var coordinates = 1; +let coordinates = 1; exports.coordinates = coordinates; /* No side effect */ diff --git a/jscomp/test/gpr_2487.js b/jscomp/test/gpr_2487.js index ed12c34597..64a188c760 100644 --- a/jscomp/test/gpr_2487.js +++ b/jscomp/test/gpr_2487.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Belt_Array = require("../../lib/js/belt_Array.js"); +let Belt_Array = require("../../lib/js/belt_Array.js"); -var b = Belt_Array.eq([ +let b = Belt_Array.eq([ 1, 2, 3 @@ -15,7 +15,7 @@ var b = Belt_Array.eq([ return prim0 === prim1; })); -var A; +let A; exports.A = A; exports.b = b; diff --git a/jscomp/test/gpr_2503_test.js b/jscomp/test/gpr_2503_test.js index 423b6b4fb0..5c6dd53d0f 100644 --- a/jscomp/test/gpr_2503_test.js +++ b/jscomp/test/gpr_2503_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_option = require("../../lib/js/caml_option.js"); +let Mt = require("./mt.js"); +let Caml_option = require("../../lib/js/caml_option.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -21,7 +21,7 @@ function b(loc, b$1) { } function makeWrapper(foo, param) { - var tmp = {}; + let tmp = {}; if (foo !== undefined) { tmp.foo = Caml_option.valFromOption(foo); } @@ -38,7 +38,7 @@ makeWrapper2("a", undefined); function makeWrapper3(foo, param) { console.log(2); - var tmp = {}; + let tmp = {}; if (foo !== undefined) { tmp.foo = Caml_option.valFromOption(foo); } @@ -47,8 +47,8 @@ function makeWrapper3(foo, param) { function makeWrapper4(foo, param) { console.log(2); - var tmp = {}; - var tmp$1 = foo > 100 ? undefined : ( + let tmp = {}; + let tmp$1 = foo > 100 ? undefined : ( foo > 10 ? "b" : "a" ); if (tmp$1 !== undefined) { diff --git a/jscomp/test/gpr_2608_test.js b/jscomp/test/gpr_2608_test.js index e52f8e6c4f..81367dfca2 100644 --- a/jscomp/test/gpr_2608_test.js +++ b/jscomp/test/gpr_2608_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var List = require("../../lib/js/list.js"); +let Mt = require("./mt.js"); +let List = require("../../lib/js/list.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -16,24 +16,24 @@ function eq(loc, x, y) { Mt.eq_suites(test_id, suites, loc, x, y); } -var oppHeroes = { +let oppHeroes = { hd: 0, tl: /* [] */0 }; -var huntGrootCondition = false; +let huntGrootCondition = false; if (List.length(/* [] */0) > 0) { - var x = List.filter(function (h) { + let x = List.filter(function (h) { return List.hd(/* [] */0) <= 1000; })(oppHeroes); huntGrootCondition = List.length(x) === 0; } -var huntGrootCondition2 = true; +let huntGrootCondition2 = true; if (List.length(/* [] */0) < 0) { - var x$1 = List.filter(function (h) { + let x$1 = List.filter(function (h) { return List.hd(/* [] */0) <= 1000; })(oppHeroes); huntGrootCondition2 = List.length(x$1) === 0; @@ -45,7 +45,7 @@ eq("File \"gpr_2608_test.res\", line 22, characters 5-12", huntGrootCondition2, Mt.from_pair_suites("Gpr_2608_test", suites.contents); -var nearestGroots = /* [] */0; +let nearestGroots = /* [] */0; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/gpr_2614_test.js b/jscomp/test/gpr_2614_test.js index 96bc52ad6b..7bbb9b9c1b 100644 --- a/jscomp/test/gpr_2614_test.js +++ b/jscomp/test/gpr_2614_test.js @@ -1,27 +1,27 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_option = require("../../lib/js/caml_option.js"); +let Caml_option = require("../../lib/js/caml_option.js"); -var v = { +let v = { "Content-Type": 3, l: 2, open: 2 }; -var b = v.l; +let b = v.l; -var c = v.open; +let c = v.open; function ff(param) { v["Content-Type"] = 3; v.l = 2; } -var partial_arg = "x"; +let partial_arg = "x"; function h0(param) { - var tmp = { + let tmp = { hi: 2 }; if (partial_arg !== undefined) { @@ -30,12 +30,12 @@ function h0(param) { return tmp; } -var h1 = { +let h1 = { "lo-x": "x", hi: 2 }; -var h2 = { +let h2 = { hi: 2 }; @@ -45,7 +45,7 @@ function hh(x) { } function hh2(x) { - var match = x["lo-x"]; + let match = x["lo-x"]; if (match !== undefined) { return 1; } else { @@ -53,13 +53,13 @@ function hh2(x) { } } -var u = { +let u = { "xx-yy": 3 }; -var x = u["xx-yy"]; +let x = u["xx-yy"]; -var v$1 = x !== undefined ? x : 0; +let v$1 = x !== undefined ? x : 0; exports.b = b; exports.c = c; diff --git a/jscomp/test/gpr_2633_test.js b/jscomp/test/gpr_2633_test.js index 56b8b9e698..850ef7b215 100644 --- a/jscomp/test/gpr_2633_test.js +++ b/jscomp/test/gpr_2633_test.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); function on1(foo, $$event) { foo.on($$event.NAME, $$event.VAL); diff --git a/jscomp/test/gpr_2642_test.js b/jscomp/test/gpr_2642_test.js index f6dd411f09..d9a7332d89 100644 --- a/jscomp/test/gpr_2642_test.js +++ b/jscomp/test/gpr_2642_test.js @@ -4,7 +4,7 @@ function isfree(id, _x) { while(true) { - var x = _x; + let x = _x; switch (x.TAG) { case "Pident" : return id === x._0; diff --git a/jscomp/test/gpr_2682_test.js b/jscomp/test/gpr_2682_test.js index 437d296fba..c9acc105a9 100644 --- a/jscomp/test/gpr_2682_test.js +++ b/jscomp/test/gpr_2682_test.js @@ -2,19 +2,19 @@ 'use strict'; -var sum = ((a,b) => a + b); +let sum = ((a,b) => a + b); -var v = sum(1, 2); +let v = sum(1, 2); function f(a) { return a + 3 | 0; } -var b = f(1); +let b = f(1); -var c = f(2); +let c = f(2); -var forIn = ((o,foo)=> { +let forIn = ((o,foo)=> { for (var i in o){ foo(o) } @@ -24,7 +24,7 @@ function log(x) { console.log(x); } -var N = { +let N = { log2: log }; @@ -41,9 +41,9 @@ forIn({ console.log(x); })); -var f3 = (()=>true); +let f3 = (()=>true); -var bbbb = f3(); +let bbbb = f3(); if (!bbbb) { throw { diff --git a/jscomp/test/gpr_2731_test.js b/jscomp/test/gpr_2731_test.js index a12d56ab70..0226d7729c 100644 --- a/jscomp/test/gpr_2731_test.js +++ b/jscomp/test/gpr_2731_test.js @@ -6,17 +6,17 @@ function f(x) { return x + 1 | 0; } -var a = f(1); +let a = f(1); -var b = f(2); +let b = f(2); function g(param) { return 1; } -var c = g(); +let c = g(); -var d = g(); +let d = g(); exports.f = f; exports.a = a; diff --git a/jscomp/test/gpr_2789_test.js b/jscomp/test/gpr_2789_test.js index 640465333a..ee5bceb7ef 100644 --- a/jscomp/test/gpr_2789_test.js +++ b/jscomp/test/gpr_2789_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; diff --git a/jscomp/test/gpr_2931_test.js b/jscomp/test/gpr_2931_test.js index 9c4bf21f84..4061622889 100644 --- a/jscomp/test/gpr_2931_test.js +++ b/jscomp/test/gpr_2931_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; diff --git a/jscomp/test/gpr_3142_test.js b/jscomp/test/gpr_3142_test.js index f89745168b..fc15d1979d 100644 --- a/jscomp/test/gpr_3142_test.js +++ b/jscomp/test/gpr_3142_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -15,9 +15,9 @@ function eq(loc, x, y) { Mt.eq_suites(test_id, suites, loc, x, y); } -var _map = {"a":"x","u":"hi","b":"你","c":"我"}; +let _map = {"a":"x","u":"hi","b":"你","c":"我"}; -var _revMap = {"x":"a","hi":"u","你":"b","我":"c"}; +let _revMap = {"x":"a","hi":"u","你":"b","我":"c"}; function tToJs(param) { return _map[param]; @@ -47,9 +47,9 @@ eq("File \"gpr_3142_test.res\", line 26, characters 3-10", tFromJs("xx"), undefi Mt.from_pair_suites("Gpr_3142_test", suites.contents); -var v = tToJs; +let v = tToJs; -var u = tFromJs; +let u = tFromJs; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/gpr_3154_test.js b/jscomp/test/gpr_3154_test.js index 640d60dacc..c0967f09a3 100644 --- a/jscomp/test/gpr_3154_test.js +++ b/jscomp/test/gpr_3154_test.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Js_dict = require("../../lib/js/js_dict.js"); -var Caml_option = require("../../lib/js/caml_option.js"); +let Mt = require("./mt.js"); +let Js_dict = require("../../lib/js/js_dict.js"); +let Caml_option = require("../../lib/js/caml_option.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -21,11 +21,11 @@ function b(loc, x) { Mt.bool_suites(test_id, suites, loc, x); } -var d = {}; +let d = {}; d["foo"] = undefined; -var match = Js_dict.get(d, "foo"); +let match = Js_dict.get(d, "foo"); if (match !== undefined && Caml_option.valFromOption(match) === undefined) { b("File \"gpr_3154_test.res\", line 12, characters 20-27", true); @@ -33,7 +33,7 @@ if (match !== undefined && Caml_option.valFromOption(match) === undefined) { b("File \"gpr_3154_test.res\", line 13, characters 11-18", false); } -var d0 = {}; +let d0 = {}; d0["foo"] = undefined; @@ -41,7 +41,7 @@ eq("File \"gpr_3154_test.res\", line 20, characters 5-12", Js_dict.get(d0, "foo" Mt.from_pair_suites("Gpr_3154_test", suites.contents); -var J; +let J; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/gpr_3492_test.js b/jscomp/test/gpr_3492_test.js index c1d9d84ad5..80ed2b1bb2 100644 --- a/jscomp/test/gpr_3492_test.js +++ b/jscomp/test/gpr_3492_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; diff --git a/jscomp/test/gpr_3519_jsx_test.js b/jscomp/test/gpr_3519_jsx_test.js index dbda2720fa..50cf7d45a2 100644 --- a/jscomp/test/gpr_3519_jsx_test.js +++ b/jscomp/test/gpr_3519_jsx_test.js @@ -2,7 +2,7 @@ 'use strict'; -var React = { +let React = { $$null: undefined }; @@ -10,7 +10,7 @@ function make(param, param$1) { } -var Foo = { +let Foo = { make: make }; diff --git a/jscomp/test/gpr_3519_test.js b/jscomp/test/gpr_3519_test.js index fb55a38838..a56ca06670 100644 --- a/jscomp/test/gpr_3519_test.js +++ b/jscomp/test/gpr_3519_test.js @@ -2,7 +2,7 @@ 'use strict'; -var Foo = {}; +let Foo = {}; exports.Foo = Foo; /* No side effect */ diff --git a/jscomp/test/gpr_3536_test.js b/jscomp/test/gpr_3536_test.js index 7f8f93ca2e..51f486cf3f 100644 --- a/jscomp/test/gpr_3536_test.js +++ b/jscomp/test/gpr_3536_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Curry = require("../../lib/js/curry.js"); +let Mt = require("./mt.js"); +let Curry = require("../../lib/js/curry.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -16,7 +16,7 @@ function eq(loc, x, y) { Mt.eq_suites(test_id, suites, loc, x, y); } -var X = {}; +let X = {}; function xx(obj, a0, a1, a2, a3, a4, a5) { return (Curry._2(a4, Curry._2(a2, Curry._2(a0, obj, a1), a3), a5) - 1 | 0) - 3 | 0; @@ -34,9 +34,9 @@ eq("File \"gpr_3536_test.res\", line 20, characters 12-19", xx(3, (function (pri Mt.from_pair_suites("Gpr_3536_test", suites.contents); -var v = 5; +let v = 5; -var u = { +let u = { TAG: "Some", _0: 3 }; diff --git a/jscomp/test/gpr_3546_test.js b/jscomp/test/gpr_3546_test.js index 055024d260..eded96c5c3 100644 --- a/jscomp/test/gpr_3546_test.js +++ b/jscomp/test/gpr_3546_test.js @@ -9,9 +9,9 @@ function t_error3(param_0) { }; } -var t_error = "T_error"; +let t_error = "T_error"; -var t_error2 = "T_error2"; +let t_error2 = "T_error2"; exports.t_error = t_error; exports.t_error2 = t_error2; diff --git a/jscomp/test/gpr_3548_test.js b/jscomp/test/gpr_3548_test.js index b8bc6e4139..d8d45b39b1 100644 --- a/jscomp/test/gpr_3548_test.js +++ b/jscomp/test/gpr_3548_test.js @@ -2,9 +2,9 @@ 'use strict'; -var _map = {"Horizontal":"horizontal","Vertical":"vertical"}; +let _map = {"Horizontal":"horizontal","Vertical":"vertical"}; -var _revMap = {"horizontal":"Horizontal","vertical":"Vertical"}; +let _revMap = {"horizontal":"Horizontal","vertical":"Vertical"}; function orientationToJs(param) { return _map[param]; diff --git a/jscomp/test/gpr_3549_test.js b/jscomp/test/gpr_3549_test.js index 5146f21fa6..709541175c 100644 --- a/jscomp/test/gpr_3549_test.js +++ b/jscomp/test/gpr_3549_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -15,7 +15,7 @@ function eq(loc, x, y) { Mt.eq_suites(test_id, suites, loc, x, y); } -var others = [ +let others = [ 0, 0, 1, @@ -41,13 +41,13 @@ eq("File \"gpr_3549_test.res\", line 17, characters 5-12", others, [ Mt.from_pair_suites("Gpr_3549_test", suites.contents); -var u = 32; +let u = 32; -var x = 7.0; +let x = 7.0; -var y = 2e3; +let y = 2e3; -var z = 0.2; +let z = 0.2; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/gpr_3566_drive_test.js b/jscomp/test/gpr_3566_drive_test.js index c04df355f8..8ed48f0e0f 100644 --- a/jscomp/test/gpr_3566_drive_test.js +++ b/jscomp/test/gpr_3566_drive_test.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_option = require("../../lib/js/caml_option.js"); -var Gpr_3566_test = require("./gpr_3566_test.js"); +let Mt = require("./mt.js"); +let Caml_option = require("../../lib/js/caml_option.js"); +let Gpr_3566_test = require("./gpr_3566_test.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -17,11 +17,11 @@ function eq(loc, x, y) { Mt.eq_suites(test_id, suites, loc, x, y); } -var H = Gpr_3566_test.Test({}); +let H = Gpr_3566_test.Test({}); eq("File \"gpr_3566_drive_test.res\", line 7, characters 12-19", H.b, true); -var Caml_option$1 = {}; +let Caml_option$1 = {}; function f(x) { return Caml_option.some(x); diff --git a/jscomp/test/gpr_3566_test.js b/jscomp/test/gpr_3566_test.js index d2a609678f..6bcf903005 100644 --- a/jscomp/test/gpr_3566_test.js +++ b/jscomp/test/gpr_3566_test.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Caml_option = require("../../lib/js/caml_option.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Caml_option = require("../../lib/js/caml_option.js"); function eq_A(x, y) { if (x.TAG === "A" && y.TAG === "A") { @@ -15,12 +15,12 @@ function eq_A(x, y) { function Test($star) { console.log("no inline"); - var u = { + let u = { TAG: "A", _0: 3 }; - var Block = {}; - var b = eq_A({ + let Block = {}; + let b = eq_A({ TAG: "A", _0: 3 }, u); @@ -34,8 +34,8 @@ function Test($star) { function Test2($star) { console.log("no inline"); - var Block = {}; - var b = eq_A({ + let Block = {}; + let b = eq_A({ TAG: "A", _0: 3 }, { @@ -50,7 +50,7 @@ function Test2($star) { } function f(i, y) { - var x = { + let x = { TAG: "A", _0: i }; @@ -58,8 +58,8 @@ function f(i, y) { } function Test3($star) { - var f = Caml_obj.equal; - var Caml_obj$1 = {}; + let f = Caml_obj.equal; + let Caml_obj$1 = {}; return { f: f, Caml_obj: Caml_obj$1 @@ -67,8 +67,8 @@ function Test3($star) { } function Test4($star) { - var Caml_obj$1 = {}; - var f = Caml_obj.equal; + let Caml_obj$1 = {}; + let f = Caml_obj.equal; return { Caml_obj: Caml_obj$1, f: f @@ -76,10 +76,10 @@ function Test4($star) { } function Test5($star) { - var f = function (x) { + let f = function (x) { return Caml_option.some(x); }; - var Caml_option$1 = {}; + let Caml_option$1 = {}; return { f: f, Caml_option: Caml_option$1 @@ -87,8 +87,8 @@ function Test5($star) { } function Test6($star) { - var Caml_option$1 = {}; - var f = function (x) { + let Caml_option$1 = {}; + let f = function (x) { return Caml_option.some(x); }; return { @@ -98,15 +98,15 @@ function Test6($star) { } function Test7($star) { - var Caml_option = {}; + let Caml_option = {}; return { Caml_option: Caml_option }; } function Test8($star) { - var Curry$1 = {}; - var f = function (x) { + let Curry$1 = {}; + let f = function (x) { return Curry._1(x, 1); }; return { @@ -116,10 +116,10 @@ function Test8($star) { } function Test9($star) { - var f = function (x) { + let f = function (x) { return Curry._1(x, 1); }; - var Curry$1 = {}; + let Curry$1 = {}; return { f: f, Curry: Curry$1 @@ -127,13 +127,13 @@ function Test9($star) { } function Test10($star) { - var Curry = {}; + let Curry = {}; return { Curry: Curry }; } -var x = 3; +let x = 3; exports.eq_A = eq_A; exports.Test = Test; diff --git a/jscomp/test/gpr_3595_test.js b/jscomp/test/gpr_3595_test.js index c794191a10..9606c9b577 100644 --- a/jscomp/test/gpr_3595_test.js +++ b/jscomp/test/gpr_3595_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -15,7 +15,7 @@ function eq(loc, x, y) { Mt.eq_suites(test_id, suites, loc, x, y); } -var x = 1; +let x = 1; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/gpr_3697_test.js b/jscomp/test/gpr_3697_test.js index 96a55ee1aa..7fea25f904 100644 --- a/jscomp/test/gpr_3697_test.js +++ b/jscomp/test/gpr_3697_test.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var CamlinternalLazy = require("../../lib/js/camlinternalLazy.js"); +let CamlinternalLazy = require("../../lib/js/camlinternalLazy.js"); function fix(param) { return { @@ -14,7 +14,7 @@ function fix(param) { function unfixLeak(_f) { while(true) { - var f = _f; + let f = _f; _f = CamlinternalLazy.force(f._0); continue ; }; @@ -22,7 +22,7 @@ function unfixLeak(_f) { function unfix(p) { while(true) { - var h = p.contents; + let h = p.contents; p.contents = CamlinternalLazy.force(h._0); }; } diff --git a/jscomp/test/gpr_373_test.js b/jscomp/test/gpr_373_test.js index f04dccc896..500f2af235 100644 --- a/jscomp/test/gpr_373_test.js +++ b/jscomp/test/gpr_373_test.js @@ -2,13 +2,13 @@ 'use strict'; -var overflow_dec_i32_number = 272872590; +let overflow_dec_i32_number = 272872590; -var overflow_dec_i32_number_2 = 0; +let overflow_dec_i32_number_2 = 0; -var not_overflow_dec_i32_number_3 = -1; +let not_overflow_dec_i32_number_3 = -1; -var overflow_hex_i32_number = -1; +let overflow_hex_i32_number = -1; exports.overflow_dec_i32_number = overflow_dec_i32_number; exports.overflow_dec_i32_number_2 = overflow_dec_i32_number_2; diff --git a/jscomp/test/gpr_3770_test.js b/jscomp/test/gpr_3770_test.js index 683fc487a9..6c9bf03c73 100644 --- a/jscomp/test/gpr_3770_test.js +++ b/jscomp/test/gpr_3770_test.js @@ -3,7 +3,7 @@ function show(x) { - var a = x._0; + let a = x._0; if (a === 0 && x._1 === 0 && x._2 === 0) { return "zeroes"; } diff --git a/jscomp/test/gpr_3852_alias.js b/jscomp/test/gpr_3852_alias.js index 50f6cf1dc9..37c7ce97db 100644 --- a/jscomp/test/gpr_3852_alias.js +++ b/jscomp/test/gpr_3852_alias.js @@ -2,7 +2,7 @@ 'use strict'; -var A; +let A; exports.A = A; /* No side effect */ diff --git a/jscomp/test/gpr_3852_alias_reify.js b/jscomp/test/gpr_3852_alias_reify.js index 281b80429f..cd1305a2c7 100644 --- a/jscomp/test/gpr_3852_alias_reify.js +++ b/jscomp/test/gpr_3852_alias_reify.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Gpr_3852_effect = require("./gpr_3852_effect.js"); +let Gpr_3852_effect = require("./gpr_3852_effect.js"); -var A = Gpr_3852_effect; +let A = Gpr_3852_effect; exports.A = A; /* Gpr_3852_effect Not a pure module */ diff --git a/jscomp/test/gpr_3852_effect.js b/jscomp/test/gpr_3852_effect.js index d16bef9900..5ff5e0c92e 100644 --- a/jscomp/test/gpr_3852_effect.js +++ b/jscomp/test/gpr_3852_effect.js @@ -4,7 +4,7 @@ console.log("hello"); -var v = 0; +let v = 0; exports.v = v; /* Not a pure module */ diff --git a/jscomp/test/gpr_3865.js b/jscomp/test/gpr_3865.js index ae1f07a841..1eb9de4f87 100644 --- a/jscomp/test/gpr_3865.js +++ b/jscomp/test/gpr_3865.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Gpr_3865_foo = require("./gpr_3865_foo.js"); +let Gpr_3865_foo = require("./gpr_3865_foo.js"); -var B = Gpr_3865_foo; +let B = Gpr_3865_foo; console.log(Gpr_3865_foo.$$return); console.log(Gpr_3865_foo.$$return); -var F; +let F; exports.F = F; exports.B = B; diff --git a/jscomp/test/gpr_3865_foo.js b/jscomp/test/gpr_3865_foo.js index c99bc65b1f..4871e7aa37 100644 --- a/jscomp/test/gpr_3865_foo.js +++ b/jscomp/test/gpr_3865_foo.js @@ -2,7 +2,7 @@ 'use strict'; -var $$return = 5; +let $$return = 5; exports.$$return = $$return; /* No side effect */ diff --git a/jscomp/test/gpr_3875_test.js b/jscomp/test/gpr_3875_test.js index 3c3c1115d5..404c98f932 100644 --- a/jscomp/test/gpr_3875_test.js +++ b/jscomp/test/gpr_3875_test.js @@ -1,10 +1,10 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Curry = require("../../lib/js/curry.js"); +let Mt = require("./mt.js"); +let Curry = require("../../lib/js/curry.js"); -var result = { +let result = { contents: "" }; @@ -12,12 +12,12 @@ function log(x) { result.contents = x; } -var Xx = { +let Xx = { log: log }; function compilerBug(a, b, c, f) { - var exit = 0; + let exit = 0; if (a !== "x") { exit = 2; } @@ -47,11 +47,11 @@ function compilerBug(a, b, c, f) { } } -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; diff --git a/jscomp/test/gpr_3877_test.js b/jscomp/test/gpr_3877_test.js index ae93bf14d8..27c66d7aef 100644 --- a/jscomp/test/gpr_3877_test.js +++ b/jscomp/test/gpr_3877_test.js @@ -16,9 +16,9 @@ function test(code) { } } -var a = "good response"; +let a = "good response"; -var b = "bad response"; +let b = "bad response"; if (a !== "good response") { throw { diff --git a/jscomp/test/gpr_3931_test.js b/jscomp/test/gpr_3931_test.js index c3c6a9eaf5..7c6e386b5f 100644 --- a/jscomp/test/gpr_3931_test.js +++ b/jscomp/test/gpr_3931_test.js @@ -1,11 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var $$Array = require("../../lib/js/array.js"); -var Curry = require("../../lib/js/curry.js"); -var Caml_module = require("../../lib/js/caml_module.js"); +let $$Array = require("../../lib/js/array.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_module = require("../../lib/js/caml_module.js"); -var PA = Caml_module.init_mod([ +let PA = Caml_module.init_mod([ "gpr_3931_test.res", 3, 4 @@ -17,7 +17,7 @@ var PA = Caml_module.init_mod([ ]] }); -var P = Caml_module.init_mod([ +let P = Caml_module.init_mod([ "gpr_3931_test.res", 12, 4 diff --git a/jscomp/test/gpr_3980_test.js b/jscomp/test/gpr_3980_test.js index 779dc69aa5..3dc94cb04b 100644 --- a/jscomp/test/gpr_3980_test.js +++ b/jscomp/test/gpr_3980_test.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Js_math = require("../../lib/js/js_math.js"); +let Js_math = require("../../lib/js/js_math.js"); -var match = 1; +let match = 1; if (match !== undefined) { if (match !== 1) { @@ -17,7 +17,7 @@ if (match !== undefined) { Error: new Error() }; } - var match$1 = 1; + let match$1 = 1; if (match$1 !== 1) { if (match$1 !== 2) { throw { diff --git a/jscomp/test/gpr_405_test.js b/jscomp/test/gpr_405_test.js index c6f7507dd5..3cfa9fdac3 100644 --- a/jscomp/test/gpr_405_test.js +++ b/jscomp/test/gpr_405_test.js @@ -1,41 +1,41 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml = require("../../lib/js/caml.js"); -var Curry = require("../../lib/js/curry.js"); -var Hashtbl = require("../../lib/js/hashtbl.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let Caml = require("../../lib/js/caml.js"); +let Curry = require("../../lib/js/curry.js"); +let Hashtbl = require("../../lib/js/hashtbl.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); function Make(funarg) { - var $$let = funarg.V; - var H = Hashtbl.Make({ + let $$let = funarg.V; + let H = Hashtbl.Make({ equal: $$let.equal, hash: $$let.hash }); - var find_default = function (htbl, x) { + let find_default = function (htbl, x) { try { return Curry._2(H.find, htbl, x); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { return false; } throw exn; } }; - var min_cutset = function (gr, first_node) { - var n_labels = Curry._1(H.create, 97); - var l_labels = Curry._1(H.create, 97); - var already_processed = Curry._1(H.create, 97); - var on_the_stack = Curry._1(H.create, 97); - var cut_set = { + let min_cutset = function (gr, first_node) { + let n_labels = Curry._1(H.create, 97); + let l_labels = Curry._1(H.create, 97); + let already_processed = Curry._1(H.create, 97); + let on_the_stack = Curry._1(H.create, 97); + let cut_set = { contents: /* [] */0 }; - var counter = { + let counter = { contents: 1 }; - var step2 = function (top, rest_of_stack) { + let step2 = function (top, rest_of_stack) { if (find_default(already_processed, top)) { throw { RE_EXN_ID: "Assert_failure", @@ -63,15 +63,15 @@ function Make(funarg) { counter.contents = counter.contents + 1 | 0; Curry._3(H.add, l_labels, top, 0); Curry._3(H.add, already_processed, top, true); - var _successors = Curry._2(funarg.succ, gr, top); - var _top = top; - var _rest_of_stack = rest_of_stack; + let _successors = Curry._2(funarg.succ, gr, top); + let _top = top; + let _rest_of_stack = rest_of_stack; while(true) { - var rest_of_stack$1 = _rest_of_stack; - var top$1 = _top; - var successors = _successors; + let rest_of_stack$1 = _rest_of_stack; + let top$1 = _top; + let successors = _successors; if (successors) { - var successor = successors.hd; + let successor = successors.hd; if (!find_default(already_processed, successor)) { return step2(successor, { hd: [ @@ -81,7 +81,7 @@ function Make(funarg) { tl: rest_of_stack$1 }); } - var x = find_default(on_the_stack, successor) ? Curry._2(H.find, n_labels, successor) : Curry._2(H.find, l_labels, successor); + let x = find_default(on_the_stack, successor) ? Curry._2(H.find, n_labels, successor) : Curry._2(H.find, l_labels, successor); Curry._3(H.add, l_labels, top$1, Caml.int_max(Curry._2(H.find, l_labels, top$1), x)); _successors = successors.tl; continue ; @@ -103,8 +103,8 @@ function Make(funarg) { if (!rest_of_stack$1) { return cut_set.contents; } - var match = rest_of_stack$1.hd; - var new_top = match[0]; + let match = rest_of_stack$1.hd; + let new_top = match[0]; Curry._3(H.add, on_the_stack, top$1, false); Curry._3(H.add, l_labels, new_top, Caml.int_max(Curry._2(H.find, l_labels, top$1), Curry._2(H.find, l_labels, new_top))); _rest_of_stack = rest_of_stack$1.tl; diff --git a/jscomp/test/gpr_4069_test.js b/jscomp/test/gpr_4069_test.js index b2a58b83e4..bbb85781f4 100644 --- a/jscomp/test/gpr_4069_test.js +++ b/jscomp/test/gpr_4069_test.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); function f(value) { if (value == null) { @@ -12,7 +12,7 @@ function f(value) { } function fxx(v) { - var match = Curry._1(v, undefined); + let match = Curry._1(v, undefined); switch (match) { case 1 : return /* 'a' */97; diff --git a/jscomp/test/gpr_4265_test.js b/jscomp/test/gpr_4265_test.js index b5e9236bb5..56b6ad3757 100644 --- a/jscomp/test/gpr_4265_test.js +++ b/jscomp/test/gpr_4265_test.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Belt_MutableMapInt = require("../../lib/js/belt_MutableMapInt.js"); -var Belt_internalMapInt = require("../../lib/js/belt_internalMapInt.js"); +let Mt = require("./mt.js"); +let Belt_MutableMapInt = require("../../lib/js/belt_MutableMapInt.js"); +let Belt_internalMapInt = require("../../lib/js/belt_internalMapInt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -17,7 +17,7 @@ function eq(loc, x, y) { Mt.eq_suites(test_id, suites, loc, x, y); } -var mockMap = { +let mockMap = { data: undefined }; @@ -32,13 +32,13 @@ function remove(id) { add(1726); -var n = add(6667); +let n = add(6667); add(486); Belt_MutableMapInt.remove(mockMap, 1726); -var n1 = Belt_internalMapInt.getExn(mockMap.data, 6667); +let n1 = Belt_internalMapInt.getExn(mockMap.data, 6667); eq("File \"gpr_4265_test.res\", line 18, characters 3-10", n, n1); diff --git a/jscomp/test/gpr_4274_test.js b/jscomp/test/gpr_4274_test.js index 9bb8f04c80..395c96e869 100644 --- a/jscomp/test/gpr_4274_test.js +++ b/jscomp/test/gpr_4274_test.js @@ -1,10 +1,10 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Belt_List = require("../../lib/js/belt_List.js"); -var Belt_Array = require("../../lib/js/belt_Array.js"); +let Belt_List = require("../../lib/js/belt_List.js"); +let Belt_Array = require("../../lib/js/belt_Array.js"); -var N = {}; +let N = {}; function f(X, xs) { X.forEach(xs, { @@ -23,9 +23,9 @@ Belt_List.forEachU({ console.log(x.x); })); -var Foo = {}; +let Foo = {}; -var bar = [{ +let bar = [{ foo: "bar" }]; diff --git a/jscomp/test/gpr_4280_test.js b/jscomp/test/gpr_4280_test.js index 2e509a63cd..216ce2193d 100644 --- a/jscomp/test/gpr_4280_test.js +++ b/jscomp/test/gpr_4280_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -15,28 +15,28 @@ function eq(loc, x, y) { Mt.eq_suites(test_id, suites, loc, x, y); } -var u = { +let u = { contents: 0 }; function div(children, param) { - for(var i = 0; i <= 1; ++i){ + for(let i = 0; i <= 1; ++i){ u.contents = 300; console.log("nonline"); } } function string(s) { - for(var i = 0; i <= 1; ++i){ + for(let i = 0; i <= 1; ++i){ u.contents = 200; console.log("no"); } } function fn(authState, route) { - var onboardingRoute; + let onboardingRoute; if (typeof authState === "object") { - var exit = 0; + let exit = 0; if (typeof route === "object" && route.NAME === "Onboarding") { onboardingRoute = route.VAL; } else { @@ -52,7 +52,7 @@ function fn(authState, route) { } } else { - var exit$1 = 0; + let exit$1 = 0; if (typeof route === "object") { if (route.NAME === "Onboarding") { onboardingRoute = route.VAL; diff --git a/jscomp/test/gpr_4407_test.js b/jscomp/test/gpr_4407_test.js index 746f29ae3f..f2acc97937 100644 --- a/jscomp/test/gpr_4407_test.js +++ b/jscomp/test/gpr_4407_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Debug_mode_value = require("./debug_mode_value.js"); +let Mt = require("./mt.js"); +let Debug_mode_value = require("./debug_mode_value.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -16,7 +16,7 @@ function eq(loc, x, y) { Mt.eq_suites(test_id, suites, loc, x, y); } -var non_debug_u = { +let non_debug_u = { TAG: "A", _0: 1, _1: 2 diff --git a/jscomp/test/gpr_4442_test.js b/jscomp/test/gpr_4442_test.js index 746ca0e795..3aed6757a0 100644 --- a/jscomp/test/gpr_4442_test.js +++ b/jscomp/test/gpr_4442_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -15,7 +15,7 @@ function eq(loc, x, y) { Mt.eq_suites(test_id, suites, loc, x, y); } -var u = (function fib(n){ +let u = (function fib(n){ if(n===0||n==1){ return 1 } diff --git a/jscomp/test/gpr_4519_test.js b/jscomp/test/gpr_4519_test.js index 30bc3be279..108f0cc1ed 100644 --- a/jscomp/test/gpr_4519_test.js +++ b/jscomp/test/gpr_4519_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; diff --git a/jscomp/test/gpr_459_test.js b/jscomp/test/gpr_459_test.js index 357ab5328b..327b55d68c 100644 --- a/jscomp/test/gpr_459_test.js +++ b/jscomp/test/gpr_459_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -28,17 +28,17 @@ function eq(loc, x, y) { }; } -var uu = { +let uu = { "_'x": 3 }; -var uu2 = { +let uu2 = { _then: 1, catch: 2, "_'x": 3 }; -var hh = uu["_'x"]; +let hh = uu["_'x"]; eq("File \"gpr_459_test.res\", line 23, characters 12-19", hh, 3); diff --git a/jscomp/test/gpr_4632.js b/jscomp/test/gpr_4632.js index 785f867fdb..fa3f84ae3c 100644 --- a/jscomp/test/gpr_4632.js +++ b/jscomp/test/gpr_4632.js @@ -2,7 +2,7 @@ 'use strict'; -var T0_myList = { +let T0_myList = { hd: 1, tl: { hd: 2, @@ -10,12 +10,12 @@ var T0_myList = { } }; -var T0_tail = { +let T0_tail = { hd: 2, tl: /* [] */0 }; -var T0 = { +let T0 = { myList: T0_myList, head: 1, tail: T0_tail diff --git a/jscomp/test/gpr_4900_test.js b/jscomp/test/gpr_4900_test.js index 4109122a0d..35fd666726 100644 --- a/jscomp/test/gpr_4900_test.js +++ b/jscomp/test/gpr_4900_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -27,9 +27,9 @@ Mt.eq_suites(test_id, suites, "File \"gpr_4900_test.res\", line 15, characters 2 Mt.from_pair_suites("File \"gpr_4900_test.res\", line 17, characters 17-24", suites.contents); -var from_pair_suites = Mt.from_pair_suites; +let from_pair_suites = Mt.from_pair_suites; -var eq_suites = Mt.eq_suites; +let eq_suites = Mt.eq_suites; exports.from_pair_suites = from_pair_suites; exports.eq_suites = eq_suites; diff --git a/jscomp/test/gpr_4924_test.js b/jscomp/test/gpr_4924_test.js index dbae579e13..ddb8218754 100644 --- a/jscomp/test/gpr_4924_test.js +++ b/jscomp/test/gpr_4924_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -75,9 +75,9 @@ function u6(b) { Mt.from_pair_suites("File \"gpr_4924_test.res\", line 54, characters 17-24", suites.contents); -var from_pair_suites = Mt.from_pair_suites; +let from_pair_suites = Mt.from_pair_suites; -var eq_suites = Mt.eq_suites; +let eq_suites = Mt.eq_suites; exports.from_pair_suites = from_pair_suites; exports.eq_suites = eq_suites; diff --git a/jscomp/test/gpr_5071_test.js b/jscomp/test/gpr_5071_test.js index 1940728eca..999c63139b 100644 --- a/jscomp/test/gpr_5071_test.js +++ b/jscomp/test/gpr_5071_test.js @@ -2,14 +2,14 @@ 'use strict'; -var Test = {}; +let Test = {}; -var u = { +let u = { s: "hello" }; function f(s, y) { - var tmp = {}; + let tmp = {}; if (s !== undefined) { tmp.s = s; } @@ -25,7 +25,7 @@ function make(s) { } } -var H = { +let H = { make: make }; diff --git a/jscomp/test/gpr_5169_test.js b/jscomp/test/gpr_5169_test.js index 8afd1a3ebf..68e20efdaf 100644 --- a/jscomp/test/gpr_5169_test.js +++ b/jscomp/test/gpr_5169_test.js @@ -2,38 +2,38 @@ 'use strict'; -var NotOption = {}; +let NotOption = {}; -var TotallyNotOption = {}; +let TotallyNotOption = {}; -var NotOption2 = {}; +let NotOption2 = {}; -var a; +let a; -var b = 1; +let b = 1; -var c; +let c; -var d = 1; +let d = 1; -var e; +let e; -var f = 1; +let f = 1; -var g; +let g; -var h = 1; +let h = 1; -var i = "None"; +let i = "None"; -var j = { +let j = { TAG: "Some", _0: 1 }; -var k = "None"; +let k = "None"; -var l = { +let l = { TAG: "Some", _0: 1 }; diff --git a/jscomp/test/gpr_5218_test.js b/jscomp/test/gpr_5218_test.js index 878c084c66..9d13cb0be4 100644 --- a/jscomp/test/gpr_5218_test.js +++ b/jscomp/test/gpr_5218_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var test_id = { +let test_id = { contents: 0 }; -var suites = { +let suites = { contents: /* [] */0 }; @@ -43,7 +43,7 @@ Mt.eq_suites(test_id, suites, "File \"gpr_5218_test.res\", line 13, characters 2 Mt.from_pair_suites("gpr_5218_test.res", suites.contents); -var eq_suites = Mt.eq_suites; +let eq_suites = Mt.eq_suites; exports.eq_suites = eq_suites; exports.test_id = test_id; diff --git a/jscomp/test/gpr_5280_optimize_test.js b/jscomp/test/gpr_5280_optimize_test.js index b4e9c8b4d1..47f58f76b4 100644 --- a/jscomp/test/gpr_5280_optimize_test.js +++ b/jscomp/test/gpr_5280_optimize_test.js @@ -2,12 +2,12 @@ 'use strict'; -var a = { +let a = { TAG: "Color", _0: "#ffff" }; -var c; +let c; c = typeof a !== "object" ? "orange" : "white"; diff --git a/jscomp/test/gpr_5312.js b/jscomp/test/gpr_5312.js index cf3f2bd2b3..237cd351ad 100644 --- a/jscomp/test/gpr_5312.js +++ b/jscomp/test/gpr_5312.js @@ -6,7 +6,7 @@ function someFunction(arg1, arg2, obj) { obj.someFunction(arg1, arg2); } -var MyModule = { +let MyModule = { someFunction: someFunction }; diff --git a/jscomp/test/gpr_5557.js b/jscomp/test/gpr_5557.js index a7ffaaaeba..54715699d9 100644 --- a/jscomp/test/gpr_5557.js +++ b/jscomp/test/gpr_5557.js @@ -17,7 +17,7 @@ function isA(c) { }; } -var h = /* 'a' */97; +let h = /* 'a' */97; exports.isA = isA; exports.h = h; diff --git a/jscomp/test/gpr_858_test.js b/jscomp/test/gpr_858_test.js index 84dbb9e305..6d77cc2118 100644 --- a/jscomp/test/gpr_858_test.js +++ b/jscomp/test/gpr_858_test.js @@ -2,11 +2,11 @@ 'use strict'; -var direct = { +let direct = { contents: /* [] */0 }; -var indirect = { +let indirect = { contents: /* [] */0 }; diff --git a/jscomp/test/gpr_858_unit2_test.js b/jscomp/test/gpr_858_unit2_test.js index fe549c6e9d..877e0c0185 100644 --- a/jscomp/test/gpr_858_unit2_test.js +++ b/jscomp/test/gpr_858_unit2_test.js @@ -1,19 +1,19 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); -var delayed = { +let delayed = { contents: (function (param) { }) }; -for(var i = 1; i <= 2; ++i){ - var f = (function(i){ +for(let i = 1; i <= 2; ++i){ + let f = (function(i){ return function f(n, x) { if (x !== 0) { - var prev = delayed.contents; + let prev = delayed.contents; delayed.contents = (function (param) { Curry._1(prev, undefined); f(((n + 1 | 0) + i | 0) - i | 0, x - 1 | 0); diff --git a/jscomp/test/gpr_904_test.js b/jscomp/test/gpr_904_test.js index 90a8fda0e8..f00953f8ee 100644 --- a/jscomp/test/gpr_904_test.js +++ b/jscomp/test/gpr_904_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; diff --git a/jscomp/test/gpr_974_test.js b/jscomp/test/gpr_974_test.js index b878e5793d..97b799e72a 100644 --- a/jscomp/test/gpr_974_test.js +++ b/jscomp/test/gpr_974_test.js @@ -1,8 +1,8 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Caml_option = require("../../lib/js/caml_option.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Caml_option = require("../../lib/js/caml_option.js"); if (!Caml_obj.equal(Caml_option.nullable_to_opt(""), "")) { throw { diff --git a/jscomp/test/gpr_977_test.js b/jscomp/test/gpr_977_test.js index 76b608dd58..c1032909f3 100644 --- a/jscomp/test/gpr_977_test.js +++ b/jscomp/test/gpr_977_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Int32 = require("../../lib/js/int32.js"); +let Mt = require("./mt.js"); +let Int32 = require("../../lib/js/int32.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -30,20 +30,20 @@ function eq(loc, x, y) { } function f(x) { - for(var i = 0; i <= 100; ++i){ + for(let i = 0; i <= 100; ++i){ console.log("."); } return -x | 0; } function int32_f(x) { - for(var i = 0; i <= 100; ++i){ + for(let i = 0; i <= 100; ++i){ console.log("."); } return -x | 0; } -var u = f(-2147483648); +let u = f(-2147483648); eq("File \"gpr_977_test.res\", line 33, characters 5-12", -2147483648, u); @@ -51,7 +51,7 @@ eq("File \"gpr_977_test.res\", line 34, characters 5-12", Int32.min_int, int32_f Mt.from_pair_suites("Gpr_977_test", suites.contents); -var min_32_int = -2147483648; +let min_32_int = -2147483648; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/gpr_return_type_unused_attribute.js b/jscomp/test/gpr_return_type_unused_attribute.js index cf81aea1f9..389cfde1b9 100644 --- a/jscomp/test/gpr_return_type_unused_attribute.js +++ b/jscomp/test/gpr_return_type_unused_attribute.js @@ -2,7 +2,7 @@ 'use strict'; -var v = mk(2); +let v = mk(2); exports.v = v; /* v Not a pure module */ diff --git a/jscomp/test/gray_code_test.js b/jscomp/test/gray_code_test.js index dbfe89ad65..f308aadc6f 100644 --- a/jscomp/test/gray_code_test.js +++ b/jscomp/test/gray_code_test.js @@ -1,19 +1,19 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Bytes = require("../../lib/js/bytes.js"); -var Caml_bytes = require("../../lib/js/caml_bytes.js"); +let Bytes = require("../../lib/js/bytes.js"); +let Caml_bytes = require("../../lib/js/caml_bytes.js"); function gray_encode(b) { return b ^ (b >>> 1); } function gray_decode(n) { - var _p = n; - var _n = (n >>> 1); + let _p = n; + let _n = (n >>> 1); while(true) { - var n$1 = _n; - var p = _p; + let n$1 = _n; + let p = _p; if (n$1 === 0) { return p; } @@ -24,12 +24,12 @@ function gray_decode(n) { } function bool_string(len, n) { - var s = Bytes.make(len, /* '0' */48); - var _i = len - 1 | 0; - var _n = n; + let s = Bytes.make(len, /* '0' */48); + let _i = len - 1 | 0; + let _n = n; while(true) { - var n$1 = _n; - var i = _i; + let n$1 = _n; + let i = _i; if ((n$1 & 1) === 1) { Caml_bytes.set(s, i, /* '1' */49); } @@ -43,12 +43,12 @@ function bool_string(len, n) { } function next_power(v) { - var v$1 = v - 1 | 0; - var v$2 = (v$1 >>> 1) | v$1; - var v$3 = (v$2 >>> 2) | v$2; - var v$4 = (v$3 >>> 4) | v$3; - var v$5 = (v$4 >>> 8) | v$4; - var v$6 = (v$5 >>> 16) | v$5; + let v$1 = v - 1 | 0; + let v$2 = (v$1 >>> 1) | v$1; + let v$3 = (v$2 >>> 2) | v$2; + let v$4 = (v$3 >>> 4) | v$3; + let v$5 = (v$4 >>> 8) | v$4; + let v$6 = (v$5 >>> 16) | v$5; return v$6 + 1 | 0; } diff --git a/jscomp/test/hash_collision_test.js b/jscomp/test/hash_collision_test.js index edc1a77dec..4636497da7 100644 --- a/jscomp/test/hash_collision_test.js +++ b/jscomp/test/hash_collision_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -31,7 +31,7 @@ function f1(x) { } } -var hi = [ +let hi = [ "Eric_Cooper", "azdwbie" ]; diff --git a/jscomp/test/hash_sugar_desugar.js b/jscomp/test/hash_sugar_desugar.js index 4cf64de412..3d903dcf61 100644 --- a/jscomp/test/hash_sugar_desugar.js +++ b/jscomp/test/hash_sugar_desugar.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); function h1(u) { return u.p; } function h3(u) { - var f = u.hi; + let f = u.hi; return Curry._2(f, 1, 2); } @@ -29,7 +29,7 @@ function h7(u) { } function h8(u) { - var f = u.hi; + let f = u.hi; return Curry._2(f, 1, 2); } diff --git a/jscomp/test/hash_test.js b/jscomp/test/hash_test.js index 1abe8a9d8f..e1689aae41 100644 --- a/jscomp/test/hash_test.js +++ b/jscomp/test/hash_test.js @@ -1,18 +1,18 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Char = require("../../lib/js/char.js"); -var $$Array = require("../../lib/js/array.js"); -var Hashtbl = require("../../lib/js/hashtbl.js"); -var Mt_global = require("./mt_global.js"); -var Caml_string = require("../../lib/js/caml_string.js"); +let Mt = require("./mt.js"); +let Char = require("../../lib/js/char.js"); +let $$Array = require("../../lib/js/array.js"); +let Hashtbl = require("../../lib/js/hashtbl.js"); +let Mt_global = require("./mt_global.js"); +let Caml_string = require("../../lib/js/caml_string.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -22,11 +22,11 @@ function eq(f) { }; } -var test_strings = $$Array.init(32, (function (i) { +let test_strings = $$Array.init(32, (function (i) { return Caml_string.make(i, Char.chr(i)); })); -var test_strings_hash_results = [ +let test_strings_hash_results = [ 0, 904391063, 889600889, diff --git a/jscomp/test/hashtbl_test.js b/jscomp/test/hashtbl_test.js index 52861b3083..4b7983a031 100644 --- a/jscomp/test/hashtbl_test.js +++ b/jscomp/test/hashtbl_test.js @@ -1,12 +1,12 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml = require("../../lib/js/caml.js"); -var List = require("../../lib/js/list.js"); -var $$Array = require("../../lib/js/array.js"); -var Hashtbl = require("../../lib/js/hashtbl.js"); -var MoreLabels = require("../../lib/js/moreLabels.js"); +let Mt = require("./mt.js"); +let Caml = require("../../lib/js/caml.js"); +let List = require("../../lib/js/list.js"); +let $$Array = require("../../lib/js/array.js"); +let Hashtbl = require("../../lib/js/hashtbl.js"); +let MoreLabels = require("../../lib/js/moreLabels.js"); function to_list(tbl) { return Hashtbl.fold((function (k, v, acc) { @@ -21,7 +21,7 @@ function to_list(tbl) { } function f(param) { - var tbl = Hashtbl.create(undefined, 17); + let tbl = Hashtbl.create(undefined, 17); Hashtbl.add(tbl, 1, /* '1' */49); Hashtbl.add(tbl, 2, /* '2' */50); return List.sort((function (param, param$1) { @@ -30,20 +30,20 @@ function f(param) { } function g(count) { - var tbl = Hashtbl.create(undefined, 17); - for(var i = 0; i <= count; ++i){ + let tbl = Hashtbl.create(undefined, 17); + for(let i = 0; i <= count; ++i){ Hashtbl.replace(tbl, (i << 1), String(i)); } - for(var i$1 = 0; i$1 <= count; ++i$1){ + for(let i$1 = 0; i$1 <= count; ++i$1){ Hashtbl.replace(tbl, (i$1 << 1), String(i$1)); } - var v = to_list(tbl); + let v = to_list(tbl); return $$Array.of_list(List.sort((function (param, param$1) { return Caml.int_compare(param[0], param$1[0]); }), v)); } -var suites_0 = [ +let suites_0 = [ "simple", (function (param) { return { @@ -66,7 +66,7 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "more_iterations", (function (param) { @@ -86,7 +86,7 @@ var suites_1 = { hd: [ "More_labels_regressionfix_374", (function (param) { - var tbl = MoreLabels.Hashtbl.create(undefined, 30); + let tbl = MoreLabels.Hashtbl.create(undefined, 30); Hashtbl.add(tbl, 3, 3); return { TAG: "Eq", @@ -99,7 +99,7 @@ var suites_1 = { } }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/hello_res.js b/jscomp/test/hello_res.js index 8853737348..ee2ced30c1 100644 --- a/jscomp/test/hello_res.js +++ b/jscomp/test/hello_res.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var List = require("../../lib/js/list.js"); +let List = require("../../lib/js/list.js"); -var b = List.length({ +let b = List.length({ hd: 1, tl: { hd: 2, @@ -14,7 +14,7 @@ var b = List.length({ } }); -var a = b - 1 | 0; +let a = b - 1 | 0; console.log("hello, res"); @@ -36,9 +36,9 @@ console.log([ 1 ]); -var to = 3; +let to = 3; -var downto = 1; +let downto = 1; exports.a = a; exports.to = to; diff --git a/jscomp/test/ignore_test.js b/jscomp/test/ignore_test.js index 99acff62b6..1665fc6e6f 100644 --- a/jscomp/test/ignore_test.js +++ b/jscomp/test/ignore_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; diff --git a/jscomp/test/imm_map_bench.js b/jscomp/test/imm_map_bench.js index 48c66a4133..2232d0bde6 100644 --- a/jscomp/test/imm_map_bench.js +++ b/jscomp/test/imm_map_bench.js @@ -1,16 +1,16 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Immutable = require("immutable"); -var Belt_Array = require("../../lib/js/belt_Array.js"); -var Belt_MapInt = require("../../lib/js/belt_MapInt.js"); +let Immutable = require("immutable"); +let Belt_Array = require("../../lib/js/belt_Array.js"); +let Belt_MapInt = require("../../lib/js/belt_MapInt.js"); -var empty = new Immutable.OrderedMap(); +let empty = new Immutable.OrderedMap(); function fromArray(kvs) { - var v = empty; - for(var i = 0 ,i_finish = kvs.length; i < i_finish; ++i){ - var match = kvs[i]; + let v = empty; + for(let i = 0 ,i_finish = kvs.length; i < i_finish; ++i){ + let match = kvs[i]; v = v.set(match[0], match[1]); } return v; @@ -23,7 +23,7 @@ function should(b) { throw new Error("impossible"); } -var shuffledDataAdd = Belt_Array.makeByAndShuffle(1000001, (function (i) { +let shuffledDataAdd = Belt_Array.makeByAndShuffle(1000001, (function (i) { return [ i, i @@ -31,15 +31,15 @@ var shuffledDataAdd = Belt_Array.makeByAndShuffle(1000001, (function (i) { })); function test(param) { - var v = fromArray(shuffledDataAdd); - for(var j = 0; j <= 1000000; ++j){ + let v = fromArray(shuffledDataAdd); + for(let j = 0; j <= 1000000; ++j){ should(v.has(j)); } } function test2(param) { - var v = Belt_MapInt.fromArray(shuffledDataAdd); - for(var j = 0; j <= 1000000; ++j){ + let v = Belt_MapInt.fromArray(shuffledDataAdd); + for(let j = 0; j <= 1000000; ++j){ should(Belt_MapInt.has(v, j)); } } @@ -56,11 +56,11 @@ test2(); console.timeEnd("imm_map_bench.res 44"); -var A; +let A; -var count = 1000000; +let count = 1000000; -var M; +let M; exports.A = A; exports.empty = empty; diff --git a/jscomp/test/import2.js b/jscomp/test/import2.js index b39e596551..54321a1a75 100644 --- a/jscomp/test/import2.js +++ b/jscomp/test/import2.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var A = require("a").default; +let A = require("a").default; -var a = import("a").then(function (m) { +let a = import("a").then(function (m) { return m.default; }); -var b = A; +let b = A; exports.a = a; exports.b = b; diff --git a/jscomp/test/import_external.js b/jscomp/test/import_external.js index 4b84a859e5..324766ba4b 100644 --- a/jscomp/test/import_external.js +++ b/jscomp/test/import_external.js @@ -2,7 +2,7 @@ 'use strict'; -var f8 = import("a").then(function (m) { +let f8 = import("a").then(function (m) { return m.default; }); diff --git a/jscomp/test/import_side_effect.js b/jscomp/test/import_side_effect.js index 83fbd9d487..a00f681262 100644 --- a/jscomp/test/import_side_effect.js +++ b/jscomp/test/import_side_effect.js @@ -2,11 +2,11 @@ 'use strict'; -var a = import("./side_effect2.js").then(function (m) { +let a = import("./side_effect2.js").then(function (m) { return m.a; }); -var M = await import("./side_effect.js"); +let M = await import("./side_effect.js"); exports.a = a; exports.M = M; diff --git a/jscomp/test/import_side_effect_free.js b/jscomp/test/import_side_effect_free.js index c99fa4ba9a..918c70f482 100644 --- a/jscomp/test/import_side_effect_free.js +++ b/jscomp/test/import_side_effect_free.js @@ -2,7 +2,7 @@ 'use strict'; -var a = await import("./side_effect_free.js").then(function (m) { +let a = await import("./side_effect_free.js").then(function (m) { return m.a; }); diff --git a/jscomp/test/include_side_effect.js b/jscomp/test/include_side_effect.js index c2d25e0970..63aed7ac46 100644 --- a/jscomp/test/include_side_effect.js +++ b/jscomp/test/include_side_effect.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Side_effect = require("./side_effect.js"); +let Side_effect = require("./side_effect.js"); /* Side_effect Not a pure module */ diff --git a/jscomp/test/incomplete_toplevel_test.js b/jscomp/test/incomplete_toplevel_test.js index 7797064bc9..d9c1d15a84 100644 --- a/jscomp/test/incomplete_toplevel_test.js +++ b/jscomp/test/incomplete_toplevel_test.js @@ -11,13 +11,13 @@ function f(param) { ]; } -var match = f(); +let match = f(); -var a = match[0]; +let a = match[0]; -var b = match[1]; +let b = match[1]; -var c = match[2]; +let c = match[2]; exports.f = f; exports.a = a; diff --git a/jscomp/test/infer_type_test.js b/jscomp/test/infer_type_test.js index 7a260247dc..45b8ea9433 100644 --- a/jscomp/test/infer_type_test.js +++ b/jscomp/test/infer_type_test.js @@ -2,25 +2,25 @@ 'use strict'; -var hh = { +let hh = { hi: 30, lo: 20 }; -var v = { +let v = { hi: 32, lo: 3 }; -var vv = { +let vv = { hi: 3, lo: 3, width: 3 }; -var u = v.hi; +let u = v.hi; -var uu = v.width; +let uu = v.width; exports.hh = hh; exports.v = v; diff --git a/jscomp/test/inline_condition_with_pattern_matching.js b/jscomp/test/inline_condition_with_pattern_matching.js index d7663edd6a..71d45b5669 100644 --- a/jscomp/test/inline_condition_with_pattern_matching.js +++ b/jscomp/test/inline_condition_with_pattern_matching.js @@ -2,43 +2,43 @@ 'use strict'; -var person1 = { +let person1 = { TAG: "Teacher", age: 12345 }; -var message; +let message; if (person1.TAG === "Teacher") { message = "b"; } else { - var tmp = 12345; + let tmp = 12345; message = typeof tmp !== "object" || tmp.TAG === "Vacations" ? "a" : "b"; } -var Test1 = { +let Test1 = { person1: person1, message: message }; -var person2 = { +let person2 = { TAG: "Teacher", name: "Jane", age: 12345 }; -var message$1; +let message$1; if (person2.TAG === "Teacher") { message$1 = "Hello Jane."; } else { - var name = "Jane"; - var match = person2.reportCard; + let name = "Jane"; + let match = person2.reportCard; if (match.passing) { message$1 = "Congrats " + name + ", nice GPA of " + match.gpa.toString() + " you got there!"; } else { - var exit = 0; - var tmp$1 = 12345; + let exit = 0; + let tmp$1 = 12345; if (typeof tmp$1 !== "object") { message$1 = tmp$1 === "Sick" ? "How are you feeling?" : "Good luck next semester " + name + "!"; } else { @@ -51,7 +51,7 @@ if (person2.TAG === "Teacher") { } } -var Test2 = { +let Test2 = { person2: person2, message: message$1 }; diff --git a/jscomp/test/inline_const.js b/jscomp/test/inline_const.js index e4fa75bc1b..d5cd71d47f 100644 --- a/jscomp/test/inline_const.js +++ b/jscomp/test/inline_const.js @@ -2,22 +2,22 @@ 'use strict'; -var N = {}; +let N = {}; -var hh = "hellohello"; +let hh = "hellohello"; console.log([ 3e-6, 3e-6 ]); -var x = true; +let x = true; function N1(funarg) { return {}; } -var h = "hello"; +let h = "hello"; exports.x = x; exports.N = N; diff --git a/jscomp/test/inline_const_test.js b/jscomp/test/inline_const_test.js index 71cf1e79ff..7170b94e74 100644 --- a/jscomp/test/inline_const_test.js +++ b/jscomp/test/inline_const_test.js @@ -1,16 +1,16 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Int64 = require("../../lib/js/int64.js"); -var Caml_int64 = require("../../lib/js/caml_int64.js"); -var Inline_const = require("./inline_const.js"); +let Mt = require("./mt.js"); +let Int64 = require("../../lib/js/int64.js"); +let Caml_int64 = require("../../lib/js/caml_int64.js"); +let Inline_const = require("./inline_const.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -18,17 +18,17 @@ function eq(loc, x, y) { Mt.eq_suites(test_id, suites, loc, x, y); } -var H = {}; +let H = {}; -var f = "hello"; +let f = "hello"; -var f1 = "a"; +let f1 = "a"; -var f2 = "中文"; +let f2 = "中文"; -var f3 = "中文"; +let f3 = "中文"; -var f4 = "中文"; +let f4 = "中文"; eq("File \"inline_const_test.res\", line 13, characters 5-12", f, "hello"); @@ -46,18 +46,18 @@ eq("File \"inline_const_test.res\", line 19, characters 5-12", 1, 1); eq("File \"inline_const_test.res\", line 20, characters 5-12", 3e-6, 0.000003); -var h = Caml_int64.add(Caml_int64.add([ +let h = Caml_int64.add(Caml_int64.add([ 0, 100 ], Int64.one), Caml_int64.one); Mt.from_pair_suites("File \"inline_const_test.res\", line 28, characters 29-36", suites.contents); -var f5 = true; +let f5 = true; -var f6 = 1; +let f6 = 1; -var f7 = 3e-6; +let f7 = 3e-6; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/inline_edge_cases.js b/jscomp/test/inline_edge_cases.js index 7b16cfd866..a309c5c08d 100644 --- a/jscomp/test/inline_edge_cases.js +++ b/jscomp/test/inline_edge_cases.js @@ -4,7 +4,7 @@ function test3(_n) { while(true) { - var n = _n; + let n = _n; if (n === 0) { return (n + 5 | 0) + 4 | 0; } @@ -15,7 +15,7 @@ function test3(_n) { function test2(_n) { while(true) { - var n = _n; + let n = _n; if (n === 0) { return test3(n) + 3 | 0; } @@ -26,11 +26,11 @@ function test2(_n) { function test0(_n) { while(true) { - var n = _n; + let n = _n; if (n === 0) { - var _n$1 = n; + let _n$1 = n; while(true) { - var n$1 = _n$1; + let n$1 = _n$1; if (n$1 === 0) { return test2(n$1) + 2 | 0; } @@ -43,7 +43,7 @@ function test0(_n) { }; } -var v = test0(10); +let v = test0(10); test0(10) + 2 | 0; diff --git a/jscomp/test/inline_map2_test.js b/jscomp/test/inline_map2_test.js index 59aa5650a5..9243db3b42 100644 --- a/jscomp/test/inline_map2_test.js +++ b/jscomp/test/inline_map2_test.js @@ -1,23 +1,23 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml = require("../../lib/js/caml.js"); -var List = require("../../lib/js/list.js"); -var Curry = require("../../lib/js/curry.js"); -var Caml_option = require("../../lib/js/caml_option.js"); +let Mt = require("./mt.js"); +let Caml = require("../../lib/js/caml.js"); +let List = require("../../lib/js/list.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_option = require("../../lib/js/caml_option.js"); function Make(Ord) { - var height = function (x) { + let height = function (x) { if (typeof x !== "object") { return 0; } else { return x._4; } }; - var create = function (l, x, d, r) { - var hl = height(l); - var hr = height(r); + let create = function (l, x, d, r) { + let hl = height(l); + let hr = height(r); return { TAG: "Node", _0: l, @@ -27,7 +27,7 @@ function Make(Ord) { _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0 }; }; - var singleton = function (x, d) { + let singleton = function (x, d) { return { TAG: "Node", _0: "Empty", @@ -37,10 +37,10 @@ function Make(Ord) { _4: 1 }; }; - var bal = function (l, x, d, r) { - var hl; + let bal = function (l, x, d, r) { + let hl; hl = typeof l !== "object" ? 0 : l._4; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r._4; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -50,10 +50,10 @@ function Make(Ord) { Error: new Error() }; } - var lr = l._3; - var ld = l._2; - var lv = l._1; - var ll = l._0; + let lr = l._3; + let ld = l._2; + let lv = l._1; + let ll = l._0; if (height(ll) >= height(lr)) { return create(ll, lv, ld, create(lr, x, d, r)); } @@ -83,10 +83,10 @@ function Make(Ord) { Error: new Error() }; } - var rr = r._3; - var rd = r._2; - var rv = r._1; - var rl = r._0; + let rr = r._3; + let rd = r._2; + let rv = r._1; + let rl = r._0; if (height(rr) >= height(rl)) { return create(create(l, x, d, rl), rv, rd, rr); } @@ -99,14 +99,14 @@ function Make(Ord) { Error: new Error() }; }; - var is_empty = function (x) { + let is_empty = function (x) { if (typeof x !== "object") { return true; } else { return false; } }; - var add = function (x, data, x_) { + let add = function (x, data, x_) { if (typeof x_ !== "object") { return { TAG: "Node", @@ -117,11 +117,11 @@ function Make(Ord) { _4: 1 }; } - var r = x_._3; - var d = x_._2; - var v = x_._1; - var l = x_._0; - var c = Curry._2(Ord.compare, x, v); + let r = x_._3; + let d = x_._2; + let v = x_._1; + let l = x_._0; + let c = Curry._2(Ord.compare, x, v); if (c === 0) { return { TAG: "Node", @@ -137,16 +137,16 @@ function Make(Ord) { return bal(l, v, d, add(x, data, r)); } }; - var find = function (x, _x_) { + let find = function (x, _x_) { while(true) { - var x_ = _x_; + let x_ = _x_; if (typeof x_ !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var c = Curry._2(Ord.compare, x, x_._1); + let c = Curry._2(Ord.compare, x, x_._1); if (c === 0) { return x_._2; } @@ -154,13 +154,13 @@ function Make(Ord) { continue ; }; }; - var mem = function (x, _x_) { + let mem = function (x, _x_) { while(true) { - var x_ = _x_; + let x_ = _x_; if (typeof x_ !== "object") { return false; } - var c = Curry._2(Ord.compare, x, x_._1); + let c = Curry._2(Ord.compare, x, x_._1); if (c === 0) { return true; } @@ -168,16 +168,16 @@ function Make(Ord) { continue ; }; }; - var min_binding = function (_x) { + let min_binding = function (_x) { while(true) { - var x = _x; + let x = _x; if (typeof x !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var l = x._0; + let l = x._0; if (typeof l !== "object") { return [ x._1, @@ -188,16 +188,16 @@ function Make(Ord) { continue ; }; }; - var max_binding = function (_x) { + let max_binding = function (_x) { while(true) { - var x = _x; + let x = _x; if (typeof x !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var r = x._3; + let r = x._3; if (typeof r !== "object") { return [ x._1, @@ -208,7 +208,7 @@ function Make(Ord) { continue ; }; }; - var remove_min_binding = function (x) { + let remove_min_binding = function (x) { if (typeof x !== "object") { throw { RE_EXN_ID: "Invalid_argument", @@ -216,22 +216,22 @@ function Make(Ord) { Error: new Error() }; } - var l = x._0; + let l = x._0; if (typeof l !== "object") { return x._3; } else { return bal(remove_min_binding(l), x._1, x._2, x._3); } }; - var remove = function (x, x_) { + let remove = function (x, x_) { if (typeof x_ !== "object") { return "Empty"; } - var r = x_._3; - var d = x_._2; - var v = x_._1; - var l = x_._0; - var c = Curry._2(Ord.compare, x, v); + let r = x_._3; + let d = x_._2; + let v = x_._1; + let l = x_._0; + let c = Curry._2(Ord.compare, x, v); if (c === 0) { if (typeof l !== "object") { return r; @@ -239,7 +239,7 @@ function Make(Ord) { if (typeof r !== "object") { return l; } - var match = min_binding(r); + let match = min_binding(r); return bal(l, match[0], match[1], remove_min_binding(r)); } else if (c < 0) { return bal(remove(x, l), v, d, r); @@ -247,9 +247,9 @@ function Make(Ord) { return bal(l, v, d, remove(x, r)); } }; - var iter = function (f, _x) { + let iter = function (f, _x) { while(true) { - var x = _x; + let x = _x; if (typeof x !== "object") { return; } @@ -259,13 +259,13 @@ function Make(Ord) { continue ; }; }; - var map = function (f, x) { + let map = function (f, x) { if (typeof x !== "object") { return "Empty"; } - var l$p = map(f, x._0); - var d$p = Curry._1(f, x._2); - var r$p = map(f, x._3); + let l$p = map(f, x._0); + let d$p = Curry._1(f, x._2); + let r$p = map(f, x._3); return { TAG: "Node", _0: l$p, @@ -275,14 +275,14 @@ function Make(Ord) { _4: x._4 }; }; - var mapi = function (f, x) { + let mapi = function (f, x) { if (typeof x !== "object") { return "Empty"; } - var v = x._1; - var l$p = mapi(f, x._0); - var d$p = Curry._2(f, v, x._2); - var r$p = mapi(f, x._3); + let v = x._1; + let l$p = mapi(f, x._0); + let d$p = Curry._2(f, v, x._2); + let r$p = mapi(f, x._3); return { TAG: "Node", _0: l$p, @@ -292,10 +292,10 @@ function Make(Ord) { _4: x._4 }; }; - var fold = function (f, _m, _accu) { + let fold = function (f, _m, _accu) { while(true) { - var accu = _accu; - var m = _m; + let accu = _accu; + let m = _m; if (typeof m !== "object") { return accu; } @@ -304,9 +304,9 @@ function Make(Ord) { continue ; }; }; - var for_all = function (p, _x) { + let for_all = function (p, _x) { while(true) { - var x = _x; + let x = _x; if (typeof x !== "object") { return true; } @@ -320,9 +320,9 @@ function Make(Ord) { continue ; }; }; - var exists = function (p, _x) { + let exists = function (p, _x) { while(true) { - var x = _x; + let x = _x; if (typeof x !== "object") { return false; } @@ -336,29 +336,29 @@ function Make(Ord) { continue ; }; }; - var add_min_binding = function (k, v, x) { + let add_min_binding = function (k, v, x) { if (typeof x !== "object") { return singleton(k, v); } else { return bal(add_min_binding(k, v, x._0), x._1, x._2, x._3); } }; - var add_max_binding = function (k, v, x) { + let add_max_binding = function (k, v, x) { if (typeof x !== "object") { return singleton(k, v); } else { return bal(x._0, x._1, x._2, add_max_binding(k, v, x._3)); } }; - var join = function (l, v, d, r) { + let join = function (l, v, d, r) { if (typeof l !== "object") { return add_min_binding(v, d, r); } - var lh = l._4; + let lh = l._4; if (typeof r !== "object") { return add_max_binding(v, d, l); } - var rh = r._4; + let rh = r._4; if (lh > (rh + 2 | 0)) { return bal(l._0, l._1, l._2, join(l._3, v, d, r)); } else if (rh > (lh + 2 | 0)) { @@ -367,24 +367,24 @@ function Make(Ord) { return create(l, v, d, r); } }; - var concat = function (t1, t2) { + let concat = function (t1, t2) { if (typeof t1 !== "object") { return t2; } if (typeof t2 !== "object") { return t1; } - var match = min_binding(t2); + let match = min_binding(t2); return join(t1, match[0], match[1], remove_min_binding(t2)); }; - var concat_or_join = function (t1, v, d, t2) { + let concat_or_join = function (t1, v, d, t2) { if (d !== undefined) { return join(t1, v, Caml_option.valFromOption(d), t2); } else { return concat(t1, t2); } }; - var split = function (x, x_) { + let split = function (x, x_) { if (typeof x_ !== "object") { return [ "Empty", @@ -392,11 +392,11 @@ function Make(Ord) { "Empty" ]; } - var r = x_._3; - var d = x_._2; - var v = x_._1; - var l = x_._0; - var c = Curry._2(Ord.compare, x, v); + let r = x_._3; + let d = x_._2; + let v = x_._1; + let l = x_._0; + let c = Curry._2(Ord.compare, x, v); if (c === 0) { return [ l, @@ -405,30 +405,30 @@ function Make(Ord) { ]; } if (c < 0) { - var match = split(x, l); + let match = split(x, l); return [ match[0], match[1], join(match[2], v, d, r) ]; } - var match$1 = split(x, r); + let match$1 = split(x, r); return [ join(l, v, d, match$1[0]), match$1[1], match$1[2] ]; }; - var merge = function (f, s1, s2) { + let merge = function (f, s1, s2) { if (typeof s1 !== "object") { if (typeof s2 !== "object") { return "Empty"; } } else { - var v1 = s1._1; + let v1 = s1._1; if (s1._4 >= height(s2)) { - var match = split(v1, s2); + let match = split(v1, s2); return concat_or_join(merge(f, s1._0, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1._2), match[1]), merge(f, s1._3, match[2])); } @@ -444,41 +444,41 @@ function Make(Ord) { Error: new Error() }; } - var v2 = s2._1; - var match$1 = split(v2, s1); + let v2 = s2._1; + let match$1 = split(v2, s1); return concat_or_join(merge(f, match$1[0], s2._0), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2._2)), merge(f, match$1[2], s2._3)); }; - var filter = function (p, x) { + let filter = function (p, x) { if (typeof x !== "object") { return "Empty"; } - var d = x._2; - var v = x._1; - var l$p = filter(p, x._0); - var pvd = Curry._2(p, v, d); - var r$p = filter(p, x._3); + let d = x._2; + let v = x._1; + let l$p = filter(p, x._0); + let pvd = Curry._2(p, v, d); + let r$p = filter(p, x._3); if (pvd) { return join(l$p, v, d, r$p); } else { return concat(l$p, r$p); } }; - var partition = function (p, x) { + let partition = function (p, x) { if (typeof x !== "object") { return [ "Empty", "Empty" ]; } - var d = x._2; - var v = x._1; - var match = partition(p, x._0); - var lf = match[1]; - var lt = match[0]; - var pvd = Curry._2(p, v, d); - var match$1 = partition(p, x._3); - var rf = match$1[1]; - var rt = match$1[0]; + let d = x._2; + let v = x._1; + let match = partition(p, x._0); + let lf = match[1]; + let lt = match[0]; + let pvd = Curry._2(p, v, d); + let match$1 = partition(p, x._3); + let rf = match$1[1]; + let rt = match$1[0]; if (pvd) { return [ join(lt, v, d, rt), @@ -491,10 +491,10 @@ function Make(Ord) { ]; } }; - var cons_enum = function (_m, _e) { + let cons_enum = function (_m, _e) { while(true) { - var e = _e; - var m = _m; + let e = _e; + let m = _m; if (typeof m !== "object") { return e; } @@ -509,12 +509,12 @@ function Make(Ord) { continue ; }; }; - var compare = function (cmp, m1, m2) { - var _e1 = cons_enum(m1, "End"); - var _e2 = cons_enum(m2, "End"); + let compare = function (cmp, m1, m2) { + let _e1 = cons_enum(m1, "End"); + let _e2 = cons_enum(m2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return 0; @@ -525,11 +525,11 @@ function Make(Ord) { if (typeof e2 !== "object") { return 1; } - var c = Curry._2(Ord.compare, e1._0, e2._0); + let c = Curry._2(Ord.compare, e1._0, e2._0); if (c !== 0) { return c; } - var c$1 = Curry._2(cmp, e1._1, e2._1); + let c$1 = Curry._2(cmp, e1._1, e2._1); if (c$1 !== 0) { return c$1; } @@ -538,12 +538,12 @@ function Make(Ord) { continue ; }; }; - var equal = function (cmp, m1, m2) { - var _e1 = cons_enum(m1, "End"); - var _e2 = cons_enum(m2, "End"); + let equal = function (cmp, m1, m2) { + let _e1 = cons_enum(m1, "End"); + let _e2 = cons_enum(m2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return true; @@ -565,17 +565,17 @@ function Make(Ord) { continue ; }; }; - var cardinal = function (x) { + let cardinal = function (x) { if (typeof x !== "object") { return 0; } else { return (cardinal(x._0) + 1 | 0) + cardinal(x._3) | 0; } }; - var bindings_aux = function (_accu, _x) { + let bindings_aux = function (_accu, _x) { while(true) { - var x = _x; - var accu = _accu; + let x = _x; + let accu = _accu; if (typeof x !== "object") { return accu; } @@ -590,7 +590,7 @@ function Make(Ord) { continue ; }; }; - var bindings = function (s) { + let bindings = function (s) { return bindings_aux(/* [] */0, s); }; return { @@ -641,8 +641,8 @@ function height(x) { } function create(l, x, d, r) { - var hl = height(l); - var hr = height(r); + let hl = height(l); + let hr = height(r); return { TAG: "Node", _0: l, @@ -665,9 +665,9 @@ function singleton(x, d) { } function bal(l, x, d, r) { - var hl; + let hl; hl = typeof l !== "object" ? 0 : l._4; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r._4; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -677,10 +677,10 @@ function bal(l, x, d, r) { Error: new Error() }; } - var lr = l._3; - var ld = l._2; - var lv = l._1; - var ll = l._0; + let lr = l._3; + let ld = l._2; + let lv = l._1; + let ll = l._0; if (height(ll) >= height(lr)) { return create(ll, lv, ld, create(lr, x, d, r)); } @@ -710,10 +710,10 @@ function bal(l, x, d, r) { Error: new Error() }; } - var rr = r._3; - var rd = r._2; - var rv = r._1; - var rl = r._0; + let rr = r._3; + let rd = r._2; + let rv = r._1; + let rl = r._0; if (height(rr) >= height(rl)) { return create(create(l, x, d, rl), rv, rd, rr); } @@ -746,11 +746,11 @@ function add(x, data, x_) { _4: 1 }; } - var r = x_._3; - var d = x_._2; - var v = x_._1; - var l = x_._0; - var c = Caml.int_compare(x, v); + let r = x_._3; + let d = x_._2; + let v = x_._1; + let l = x_._0; + let c = Caml.int_compare(x, v); if (c === 0) { return { TAG: "Node", @@ -769,14 +769,14 @@ function add(x, data, x_) { function find(x, _x_) { while(true) { - var x_ = _x_; + let x_ = _x_; if (typeof x_ !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var c = Caml.int_compare(x, x_._1); + let c = Caml.int_compare(x, x_._1); if (c === 0) { return x_._2; } @@ -787,11 +787,11 @@ function find(x, _x_) { function mem(x, _x_) { while(true) { - var x_ = _x_; + let x_ = _x_; if (typeof x_ !== "object") { return false; } - var c = Caml.int_compare(x, x_._1); + let c = Caml.int_compare(x, x_._1); if (c === 0) { return true; } @@ -802,14 +802,14 @@ function mem(x, _x_) { function min_binding(_x) { while(true) { - var x = _x; + let x = _x; if (typeof x !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var l = x._0; + let l = x._0; if (typeof l !== "object") { return [ x._1, @@ -823,14 +823,14 @@ function min_binding(_x) { function max_binding(_x) { while(true) { - var x = _x; + let x = _x; if (typeof x !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var r = x._3; + let r = x._3; if (typeof r !== "object") { return [ x._1, @@ -850,7 +850,7 @@ function remove_min_binding(x) { Error: new Error() }; } - var l = x._0; + let l = x._0; if (typeof l !== "object") { return x._3; } else { @@ -862,11 +862,11 @@ function remove(x, x_) { if (typeof x_ !== "object") { return "Empty"; } - var r = x_._3; - var d = x_._2; - var v = x_._1; - var l = x_._0; - var c = Caml.int_compare(x, v); + let r = x_._3; + let d = x_._2; + let v = x_._1; + let l = x_._0; + let c = Caml.int_compare(x, v); if (c === 0) { if (typeof l !== "object") { return r; @@ -874,7 +874,7 @@ function remove(x, x_) { if (typeof r !== "object") { return l; } - var match = min_binding(r); + let match = min_binding(r); return bal(l, match[0], match[1], remove_min_binding(r)); } else if (c < 0) { return bal(remove(x, l), v, d, r); @@ -885,7 +885,7 @@ function remove(x, x_) { function iter(f, _x) { while(true) { - var x = _x; + let x = _x; if (typeof x !== "object") { return; } @@ -900,9 +900,9 @@ function map(f, x) { if (typeof x !== "object") { return "Empty"; } - var l$p = map(f, x._0); - var d$p = Curry._1(f, x._2); - var r$p = map(f, x._3); + let l$p = map(f, x._0); + let d$p = Curry._1(f, x._2); + let r$p = map(f, x._3); return { TAG: "Node", _0: l$p, @@ -917,10 +917,10 @@ function mapi(f, x) { if (typeof x !== "object") { return "Empty"; } - var v = x._1; - var l$p = mapi(f, x._0); - var d$p = Curry._2(f, v, x._2); - var r$p = mapi(f, x._3); + let v = x._1; + let l$p = mapi(f, x._0); + let d$p = Curry._2(f, v, x._2); + let r$p = mapi(f, x._3); return { TAG: "Node", _0: l$p, @@ -933,8 +933,8 @@ function mapi(f, x) { function fold(f, _m, _accu) { while(true) { - var accu = _accu; - var m = _m; + let accu = _accu; + let m = _m; if (typeof m !== "object") { return accu; } @@ -946,7 +946,7 @@ function fold(f, _m, _accu) { function for_all(p, _x) { while(true) { - var x = _x; + let x = _x; if (typeof x !== "object") { return true; } @@ -963,7 +963,7 @@ function for_all(p, _x) { function exists(p, _x) { while(true) { - var x = _x; + let x = _x; if (typeof x !== "object") { return false; } @@ -998,11 +998,11 @@ function join(l, v, d, r) { if (typeof l !== "object") { return add_min_binding(v, d, r); } - var lh = l._4; + let lh = l._4; if (typeof r !== "object") { return add_max_binding(v, d, l); } - var rh = r._4; + let rh = r._4; if (lh > (rh + 2 | 0)) { return bal(l._0, l._1, l._2, join(l._3, v, d, r)); } else if (rh > (lh + 2 | 0)) { @@ -1019,7 +1019,7 @@ function concat(t1, t2) { if (typeof t2 !== "object") { return t1; } - var match = min_binding(t2); + let match = min_binding(t2); return join(t1, match[0], match[1], remove_min_binding(t2)); } @@ -1039,11 +1039,11 @@ function split(x, x_) { "Empty" ]; } - var r = x_._3; - var d = x_._2; - var v = x_._1; - var l = x_._0; - var c = Caml.int_compare(x, v); + let r = x_._3; + let d = x_._2; + let v = x_._1; + let l = x_._0; + let c = Caml.int_compare(x, v); if (c === 0) { return [ l, @@ -1052,14 +1052,14 @@ function split(x, x_) { ]; } if (c < 0) { - var match = split(x, l); + let match = split(x, l); return [ match[0], match[1], join(match[2], v, d, r) ]; } - var match$1 = split(x, r); + let match$1 = split(x, r); return [ join(l, v, d, match$1[0]), match$1[1], @@ -1074,9 +1074,9 @@ function merge(f, s1, s2) { } } else { - var v1 = s1._1; + let v1 = s1._1; if (s1._4 >= height(s2)) { - var match = split(v1, s2); + let match = split(v1, s2); return concat_or_join(merge(f, s1._0, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1._2), match[1]), merge(f, s1._3, match[2])); } @@ -1092,8 +1092,8 @@ function merge(f, s1, s2) { Error: new Error() }; } - var v2 = s2._1; - var match$1 = split(v2, s1); + let v2 = s2._1; + let match$1 = split(v2, s1); return concat_or_join(merge(f, match$1[0], s2._0), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2._2)), merge(f, match$1[2], s2._3)); } @@ -1101,11 +1101,11 @@ function filter(p, x) { if (typeof x !== "object") { return "Empty"; } - var d = x._2; - var v = x._1; - var l$p = filter(p, x._0); - var pvd = Curry._2(p, v, d); - var r$p = filter(p, x._3); + let d = x._2; + let v = x._1; + let l$p = filter(p, x._0); + let pvd = Curry._2(p, v, d); + let r$p = filter(p, x._3); if (pvd) { return join(l$p, v, d, r$p); } else { @@ -1120,15 +1120,15 @@ function partition(p, x) { "Empty" ]; } - var d = x._2; - var v = x._1; - var match = partition(p, x._0); - var lf = match[1]; - var lt = match[0]; - var pvd = Curry._2(p, v, d); - var match$1 = partition(p, x._3); - var rf = match$1[1]; - var rt = match$1[0]; + let d = x._2; + let v = x._1; + let match = partition(p, x._0); + let lf = match[1]; + let lt = match[0]; + let pvd = Curry._2(p, v, d); + let match$1 = partition(p, x._3); + let rf = match$1[1]; + let rt = match$1[0]; if (pvd) { return [ join(lt, v, d, rt), @@ -1144,8 +1144,8 @@ function partition(p, x) { function cons_enum(_m, _e) { while(true) { - var e = _e; - var m = _m; + let e = _e; + let m = _m; if (typeof m !== "object") { return e; } @@ -1162,11 +1162,11 @@ function cons_enum(_m, _e) { } function compare(cmp, m1, m2) { - var _e1 = cons_enum(m1, "End"); - var _e2 = cons_enum(m2, "End"); + let _e1 = cons_enum(m1, "End"); + let _e2 = cons_enum(m2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return 0; @@ -1177,11 +1177,11 @@ function compare(cmp, m1, m2) { if (typeof e2 !== "object") { return 1; } - var c = Caml.int_compare(e1._0, e2._0); + let c = Caml.int_compare(e1._0, e2._0); if (c !== 0) { return c; } - var c$1 = Curry._2(cmp, e1._1, e2._1); + let c$1 = Curry._2(cmp, e1._1, e2._1); if (c$1 !== 0) { return c$1; } @@ -1192,11 +1192,11 @@ function compare(cmp, m1, m2) { } function equal(cmp, m1, m2) { - var _e1 = cons_enum(m1, "End"); - var _e2 = cons_enum(m2, "End"); + let _e1 = cons_enum(m1, "End"); + let _e2 = cons_enum(m2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return true; @@ -1229,8 +1229,8 @@ function cardinal(x) { function bindings_aux(_accu, _x) { while(true) { - var x = _x; - var accu = _accu; + let x = _x; + let accu = _accu; if (typeof x !== "object") { return accu; } @@ -1250,7 +1250,7 @@ function bindings(s) { return bindings_aux(/* [] */0, s); } -var IntMap = { +let IntMap = { height: height, create: create, singleton: singleton, @@ -1288,7 +1288,7 @@ var IntMap = { choose: min_binding }; -var m = List.fold_left((function (acc, param) { +let m = List.fold_left((function (acc, param) { return add(param[0], param[1], acc); }), "Empty", { hd: [ @@ -1325,8 +1325,8 @@ function height$1(x) { } function create$1(l, x, d, r) { - var hl = height$1(l); - var hr = height$1(r); + let hl = height$1(l); + let hr = height$1(r); return { TAG: "Node", _0: l, @@ -1349,9 +1349,9 @@ function singleton$1(x, d) { } function bal$1(l, x, d, r) { - var hl; + let hl; hl = typeof l !== "object" ? 0 : l._4; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r._4; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -1361,10 +1361,10 @@ function bal$1(l, x, d, r) { Error: new Error() }; } - var lr = l._3; - var ld = l._2; - var lv = l._1; - var ll = l._0; + let lr = l._3; + let ld = l._2; + let lv = l._1; + let ll = l._0; if (height$1(ll) >= height$1(lr)) { return create$1(ll, lv, ld, create$1(lr, x, d, r)); } @@ -1394,10 +1394,10 @@ function bal$1(l, x, d, r) { Error: new Error() }; } - var rr = r._3; - var rd = r._2; - var rv = r._1; - var rl = r._0; + let rr = r._3; + let rd = r._2; + let rv = r._1; + let rl = r._0; if (height$1(rr) >= height$1(rl)) { return create$1(create$1(l, x, d, rl), rv, rd, rr); } @@ -1430,11 +1430,11 @@ function add$1(x, data, x_) { _4: 1 }; } - var r = x_._3; - var d = x_._2; - var v = x_._1; - var l = x_._0; - var c = Caml.string_compare(x, v); + let r = x_._3; + let d = x_._2; + let v = x_._1; + let l = x_._0; + let c = Caml.string_compare(x, v); if (c === 0) { return { TAG: "Node", @@ -1453,14 +1453,14 @@ function add$1(x, data, x_) { function find$1(x, _x_) { while(true) { - var x_ = _x_; + let x_ = _x_; if (typeof x_ !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var c = Caml.string_compare(x, x_._1); + let c = Caml.string_compare(x, x_._1); if (c === 0) { return x_._2; } @@ -1471,11 +1471,11 @@ function find$1(x, _x_) { function mem$1(x, _x_) { while(true) { - var x_ = _x_; + let x_ = _x_; if (typeof x_ !== "object") { return false; } - var c = Caml.string_compare(x, x_._1); + let c = Caml.string_compare(x, x_._1); if (c === 0) { return true; } @@ -1486,14 +1486,14 @@ function mem$1(x, _x_) { function min_binding$1(_x) { while(true) { - var x = _x; + let x = _x; if (typeof x !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var l = x._0; + let l = x._0; if (typeof l !== "object") { return [ x._1, @@ -1507,14 +1507,14 @@ function min_binding$1(_x) { function max_binding$1(_x) { while(true) { - var x = _x; + let x = _x; if (typeof x !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var r = x._3; + let r = x._3; if (typeof r !== "object") { return [ x._1, @@ -1534,7 +1534,7 @@ function remove_min_binding$1(x) { Error: new Error() }; } - var l = x._0; + let l = x._0; if (typeof l !== "object") { return x._3; } else { @@ -1546,11 +1546,11 @@ function remove$1(x, x_) { if (typeof x_ !== "object") { return "Empty"; } - var r = x_._3; - var d = x_._2; - var v = x_._1; - var l = x_._0; - var c = Caml.string_compare(x, v); + let r = x_._3; + let d = x_._2; + let v = x_._1; + let l = x_._0; + let c = Caml.string_compare(x, v); if (c === 0) { if (typeof l !== "object") { return r; @@ -1558,7 +1558,7 @@ function remove$1(x, x_) { if (typeof r !== "object") { return l; } - var match = min_binding$1(r); + let match = min_binding$1(r); return bal$1(l, match[0], match[1], remove_min_binding$1(r)); } else if (c < 0) { return bal$1(remove$1(x, l), v, d, r); @@ -1569,7 +1569,7 @@ function remove$1(x, x_) { function iter$1(f, _x) { while(true) { - var x = _x; + let x = _x; if (typeof x !== "object") { return; } @@ -1584,9 +1584,9 @@ function map$1(f, x) { if (typeof x !== "object") { return "Empty"; } - var l$p = map$1(f, x._0); - var d$p = Curry._1(f, x._2); - var r$p = map$1(f, x._3); + let l$p = map$1(f, x._0); + let d$p = Curry._1(f, x._2); + let r$p = map$1(f, x._3); return { TAG: "Node", _0: l$p, @@ -1601,10 +1601,10 @@ function mapi$1(f, x) { if (typeof x !== "object") { return "Empty"; } - var v = x._1; - var l$p = mapi$1(f, x._0); - var d$p = Curry._2(f, v, x._2); - var r$p = mapi$1(f, x._3); + let v = x._1; + let l$p = mapi$1(f, x._0); + let d$p = Curry._2(f, v, x._2); + let r$p = mapi$1(f, x._3); return { TAG: "Node", _0: l$p, @@ -1617,8 +1617,8 @@ function mapi$1(f, x) { function fold$1(f, _m, _accu) { while(true) { - var accu = _accu; - var m = _m; + let accu = _accu; + let m = _m; if (typeof m !== "object") { return accu; } @@ -1630,7 +1630,7 @@ function fold$1(f, _m, _accu) { function for_all$1(p, _x) { while(true) { - var x = _x; + let x = _x; if (typeof x !== "object") { return true; } @@ -1647,7 +1647,7 @@ function for_all$1(p, _x) { function exists$1(p, _x) { while(true) { - var x = _x; + let x = _x; if (typeof x !== "object") { return false; } @@ -1682,11 +1682,11 @@ function join$1(l, v, d, r) { if (typeof l !== "object") { return add_min_binding$1(v, d, r); } - var lh = l._4; + let lh = l._4; if (typeof r !== "object") { return add_max_binding$1(v, d, l); } - var rh = r._4; + let rh = r._4; if (lh > (rh + 2 | 0)) { return bal$1(l._0, l._1, l._2, join$1(l._3, v, d, r)); } else if (rh > (lh + 2 | 0)) { @@ -1703,7 +1703,7 @@ function concat$1(t1, t2) { if (typeof t2 !== "object") { return t1; } - var match = min_binding$1(t2); + let match = min_binding$1(t2); return join$1(t1, match[0], match[1], remove_min_binding$1(t2)); } @@ -1723,11 +1723,11 @@ function split$1(x, x_) { "Empty" ]; } - var r = x_._3; - var d = x_._2; - var v = x_._1; - var l = x_._0; - var c = Caml.string_compare(x, v); + let r = x_._3; + let d = x_._2; + let v = x_._1; + let l = x_._0; + let c = Caml.string_compare(x, v); if (c === 0) { return [ l, @@ -1736,14 +1736,14 @@ function split$1(x, x_) { ]; } if (c < 0) { - var match = split$1(x, l); + let match = split$1(x, l); return [ match[0], match[1], join$1(match[2], v, d, r) ]; } - var match$1 = split$1(x, r); + let match$1 = split$1(x, r); return [ join$1(l, v, d, match$1[0]), match$1[1], @@ -1758,9 +1758,9 @@ function merge$1(f, s1, s2) { } } else { - var v1 = s1._1; + let v1 = s1._1; if (s1._4 >= height$1(s2)) { - var match = split$1(v1, s2); + let match = split$1(v1, s2); return concat_or_join$1(merge$1(f, s1._0, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1._2), match[1]), merge$1(f, s1._3, match[2])); } @@ -1776,8 +1776,8 @@ function merge$1(f, s1, s2) { Error: new Error() }; } - var v2 = s2._1; - var match$1 = split$1(v2, s1); + let v2 = s2._1; + let match$1 = split$1(v2, s1); return concat_or_join$1(merge$1(f, match$1[0], s2._0), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2._2)), merge$1(f, match$1[2], s2._3)); } @@ -1785,11 +1785,11 @@ function filter$1(p, x) { if (typeof x !== "object") { return "Empty"; } - var d = x._2; - var v = x._1; - var l$p = filter$1(p, x._0); - var pvd = Curry._2(p, v, d); - var r$p = filter$1(p, x._3); + let d = x._2; + let v = x._1; + let l$p = filter$1(p, x._0); + let pvd = Curry._2(p, v, d); + let r$p = filter$1(p, x._3); if (pvd) { return join$1(l$p, v, d, r$p); } else { @@ -1804,15 +1804,15 @@ function partition$1(p, x) { "Empty" ]; } - var d = x._2; - var v = x._1; - var match = partition$1(p, x._0); - var lf = match[1]; - var lt = match[0]; - var pvd = Curry._2(p, v, d); - var match$1 = partition$1(p, x._3); - var rf = match$1[1]; - var rt = match$1[0]; + let d = x._2; + let v = x._1; + let match = partition$1(p, x._0); + let lf = match[1]; + let lt = match[0]; + let pvd = Curry._2(p, v, d); + let match$1 = partition$1(p, x._3); + let rf = match$1[1]; + let rt = match$1[0]; if (pvd) { return [ join$1(lt, v, d, rt), @@ -1828,8 +1828,8 @@ function partition$1(p, x) { function cons_enum$1(_m, _e) { while(true) { - var e = _e; - var m = _m; + let e = _e; + let m = _m; if (typeof m !== "object") { return e; } @@ -1846,11 +1846,11 @@ function cons_enum$1(_m, _e) { } function compare$1(cmp, m1, m2) { - var _e1 = cons_enum$1(m1, "End"); - var _e2 = cons_enum$1(m2, "End"); + let _e1 = cons_enum$1(m1, "End"); + let _e2 = cons_enum$1(m2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return 0; @@ -1861,11 +1861,11 @@ function compare$1(cmp, m1, m2) { if (typeof e2 !== "object") { return 1; } - var c = Caml.string_compare(e1._0, e2._0); + let c = Caml.string_compare(e1._0, e2._0); if (c !== 0) { return c; } - var c$1 = Curry._2(cmp, e1._1, e2._1); + let c$1 = Curry._2(cmp, e1._1, e2._1); if (c$1 !== 0) { return c$1; } @@ -1876,11 +1876,11 @@ function compare$1(cmp, m1, m2) { } function equal$1(cmp, m1, m2) { - var _e1 = cons_enum$1(m1, "End"); - var _e2 = cons_enum$1(m2, "End"); + let _e1 = cons_enum$1(m1, "End"); + let _e2 = cons_enum$1(m2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return true; @@ -1913,8 +1913,8 @@ function cardinal$1(x) { function bindings_aux$1(_accu, _x) { while(true) { - var x = _x; - var accu = _accu; + let x = _x; + let accu = _accu; if (typeof x !== "object") { return accu; } @@ -1934,7 +1934,7 @@ function bindings$1(s) { return bindings_aux$1(/* [] */0, s); } -var SMap = { +let SMap = { height: height$1, create: create$1, singleton: singleton$1, @@ -1972,7 +1972,7 @@ var SMap = { choose: min_binding$1 }; -var s = List.fold_left((function (acc, param) { +let s = List.fold_left((function (acc, param) { return add$1(param[0], param[1], acc); }), "Empty", { hd: [ @@ -2026,7 +2026,7 @@ Mt.from_pair_suites("Inline_map2_test", { } }); -var empty = "Empty"; +let empty = "Empty"; exports.Make = Make; exports.IntMap = IntMap; diff --git a/jscomp/test/inline_map_demo.js b/jscomp/test/inline_map_demo.js index 2867708415..1c988d3fc4 100644 --- a/jscomp/test/inline_map_demo.js +++ b/jscomp/test/inline_map_demo.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml = require("../../lib/js/caml.js"); -var List = require("../../lib/js/list.js"); +let Mt = require("./mt.js"); +let Caml = require("../../lib/js/caml.js"); +let List = require("../../lib/js/list.js"); function height(x) { if (typeof x !== "object") { @@ -14,8 +14,8 @@ function height(x) { } function create(l, x, d, r) { - var hl = height(l); - var hr = height(r); + let hl = height(l); + let hr = height(r); return { TAG: "Node", _0: l, @@ -27,9 +27,9 @@ function create(l, x, d, r) { } function bal(l, x, d, r) { - var hl; + let hl; hl = typeof l !== "object" ? 0 : l._4; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r._4; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -43,10 +43,10 @@ function bal(l, x, d, r) { Error: new Error() }; } - var lr = l._3; - var ld = l._2; - var lv = l._1; - var ll = l._0; + let lr = l._3; + let ld = l._2; + let lv = l._1; + let ll = l._0; if (height(ll) >= height(lr)) { return create(ll, lv, ld, create(lr, x, d, r)); } @@ -84,10 +84,10 @@ function bal(l, x, d, r) { Error: new Error() }; } - var rr = r._3; - var rd = r._2; - var rv = r._1; - var rl = r._0; + let rr = r._3; + let rd = r._2; + let rv = r._1; + let rl = r._0; if (height(rr) >= height(rl)) { return create(create(l, x, d, rl), rv, rd, rr); } @@ -116,11 +116,11 @@ function add(x, data, tree) { _4: 1 }; } - var r = tree._3; - var d = tree._2; - var v = tree._1; - var l = tree._0; - var c = Caml.int_compare(x, v); + let r = tree._3; + let d = tree._2; + let v = tree._1; + let l = tree._0; + let c = Caml.int_compare(x, v); if (c === 0) { return { TAG: "Node", @@ -137,7 +137,7 @@ function add(x, data, tree) { } } -var m = List.fold_left((function (acc, param) { +let m = List.fold_left((function (acc, param) { return add(param[0], param[1], acc); }), "Empty", { hd: [ @@ -167,14 +167,14 @@ var m = List.fold_left((function (acc, param) { function find(px, _x) { while(true) { - var x = _x; + let x = _x; if (typeof x !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var c = Caml.int_compare(px, x._1); + let c = Caml.int_compare(px, x._1); if (c === 0) { return x._2; } diff --git a/jscomp/test/inline_map_test.js b/jscomp/test/inline_map_test.js index 159f3e0450..94d7fd7471 100644 --- a/jscomp/test/inline_map_test.js +++ b/jscomp/test/inline_map_test.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml = require("../../lib/js/caml.js"); -var List = require("../../lib/js/list.js"); +let Mt = require("./mt.js"); +let Caml = require("../../lib/js/caml.js"); +let List = require("../../lib/js/list.js"); function height(x) { if (typeof x !== "object") { @@ -14,8 +14,8 @@ function height(x) { } function create(l, x, d, r) { - var hl = height(l); - var hr = height(r); + let hl = height(l); + let hr = height(r); return { TAG: "Node", _0: l, @@ -27,9 +27,9 @@ function create(l, x, d, r) { } function bal(l, x, d, r) { - var hl; + let hl; hl = typeof l !== "object" ? 0 : l._4; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r._4; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -39,10 +39,10 @@ function bal(l, x, d, r) { Error: new Error() }; } - var lr = l._3; - var ld = l._2; - var lv = l._1; - var ll = l._0; + let lr = l._3; + let ld = l._2; + let lv = l._1; + let ll = l._0; if (height(ll) >= height(lr)) { return create(ll, lv, ld, create(lr, x, d, r)); } @@ -72,10 +72,10 @@ function bal(l, x, d, r) { Error: new Error() }; } - var rr = r._3; - var rd = r._2; - var rv = r._1; - var rl = r._0; + let rr = r._3; + let rd = r._2; + let rv = r._1; + let rl = r._0; if (height(rr) >= height(rl)) { return create(create(l, x, d, rl), rv, rd, rr); } @@ -100,11 +100,11 @@ function add(x, data, x_) { _4: 1 }; } - var r = x_._3; - var d = x_._2; - var v = x_._1; - var l = x_._0; - var c = Caml.int_compare(x, v); + let r = x_._3; + let d = x_._2; + let v = x_._1; + let l = x_._0; + let c = Caml.int_compare(x, v); if (c === 0) { return { TAG: "Node", @@ -123,14 +123,14 @@ function add(x, data, x_) { function find(x, _x_) { while(true) { - var x_ = _x_; + let x_ = _x_; if (typeof x_ !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var c = Caml.int_compare(x, x_._1); + let c = Caml.int_compare(x, x_._1); if (c === 0) { return x_._2; } @@ -139,7 +139,7 @@ function find(x, _x_) { }; } -var m = List.fold_left((function (acc, param) { +let m = List.fold_left((function (acc, param) { return add(param[0], param[1], acc); }), "Empty", { hd: [ diff --git a/jscomp/test/inline_record_test.js b/jscomp/test/inline_record_test.js index 4c31eb856d..af7c8ed2ff 100644 --- a/jscomp/test/inline_record_test.js +++ b/jscomp/test/inline_record_test.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var List = require("../../lib/js/list.js"); -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Mt = require("./mt.js"); +let List = require("../../lib/js/list.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -17,13 +17,13 @@ function eq(loc, x, y) { Mt.eq_suites(test_id, suites, loc, x, y); } -var v = { +let v = { TAG: "A0", lbl: 3, more: /* [] */0 }; -var v1 = { +let v1 = { TAG: "A1", more: { hd: 1, @@ -54,15 +54,15 @@ console.log(f(v)); console.log(f(v1)); -var A0 = /* @__PURE__ */Caml_exceptions.create("Inline_record_test.A0"); +let A0 = /* @__PURE__ */Caml_exceptions.create("Inline_record_test.A0"); -var v3 = { +let v3 = { RE_EXN_ID: A0, lbl: 3, more: /* [] */0 }; -var tmp; +let tmp; if (A0 === A0) { tmp = 3; @@ -88,24 +88,24 @@ function ff(x) { } } -var v4 = { +let v4 = { TAG: "A0", x: 0, y: 0, z: 0 }; -var v5 = { +let v5 = { TAG: "A1", z: 0 }; -for(var i = 0; i <= 10; ++i){ +for(let i = 0; i <= 10; ++i){ ff(v4); ff(v5); } -var tmp$1; +let tmp$1; if (v4.TAG === "A0") { tmp$1 = v4.x; @@ -123,7 +123,7 @@ if (v4.TAG === "A0") { eq("File \"inline_record_test.res\", line 71, characters 2-9", tmp$1, 11); -var tmp$2; +let tmp$2; if (v5.TAG === "A0") { throw { @@ -141,9 +141,9 @@ tmp$2 = v5.z; eq("File \"inline_record_test.res\", line 80, characters 2-9", tmp$2, 22); -var A4 = /* @__PURE__ */Caml_exceptions.create("Inline_record_test.A4"); +let A4 = /* @__PURE__ */Caml_exceptions.create("Inline_record_test.A4"); -var v6 = { +let v6 = { RE_EXN_ID: A4, x: 0, y: 0, @@ -159,11 +159,11 @@ function ff0(x) { } -for(var i$1 = 0; i$1 <= 10; ++i$1){ +for(let i$1 = 0; i$1 <= 10; ++i$1){ ff0(v6); } -var tmp$3; +let tmp$3; if (v6.RE_EXN_ID === A4) { tmp$3 = v6.x; @@ -195,7 +195,7 @@ function ff1(x) { Mt.from_pair_suites("Inline_record_test", suites.contents); -var b = { +let b = { TAG: "B" }; @@ -207,19 +207,19 @@ if (typeof b !== "object") { console.log("10!"); -var v2 = { +let v2 = { TAG: "A0", lbl: 3, more: /* [] */0 }; -var vvv = { +let vvv = { TAG: "A0", lbl: 3, more: /* [] */0 }; -var r = { +let r = { y: 10 }; diff --git a/jscomp/test/inline_regression_test.js b/jscomp/test/inline_regression_test.js index 0e4621fab2..b1ee26c1c9 100644 --- a/jscomp/test/inline_regression_test.js +++ b/jscomp/test/inline_regression_test.js @@ -1,27 +1,27 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Curry = require("../../lib/js/curry.js"); -var $$String = require("../../lib/js/string.js"); -var Filename = require("../../lib/js/filename.js"); -var Caml_string = require("../../lib/js/caml_string.js"); +let Mt = require("./mt.js"); +let Curry = require("../../lib/js/curry.js"); +let $$String = require("../../lib/js/string.js"); +let Filename = require("../../lib/js/filename.js"); +let Caml_string = require("../../lib/js/caml_string.js"); function generic_basename(is_dir_sep, current_dir_name, name) { if (name === "") { return current_dir_name; } else { - var _n = name.length - 1 | 0; + let _n = name.length - 1 | 0; while(true) { - var n = _n; + let n = _n; if (n < 0) { return $$String.sub(name, 0, 1); } if (!Curry._2(is_dir_sep, name, n)) { - var _n$1 = n; - var p = n + 1 | 0; + let _n$1 = n; + let p = n + 1 | 0; while(true) { - var n$1 = _n$1; + let n$1 = _n$1; if (n$1 < 0) { return $$String.sub(name, 0, p); } @@ -44,7 +44,7 @@ function basename(param) { }), Filename.current_dir_name, param); } -var suites_0 = [ +let suites_0 = [ "basename", (function (param) { return { @@ -55,7 +55,7 @@ var suites_0 = [ }) ]; -var suites = { +let suites = { hd: suites_0, tl: /* [] */0 }; diff --git a/jscomp/test/inner_call.js b/jscomp/test/inner_call.js index daf1227fd2..0c024ff4b5 100644 --- a/jscomp/test/inner_call.js +++ b/jscomp/test/inner_call.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Inner_define = require("./inner_define.js"); +let Inner_define = require("./inner_define.js"); console.log(Inner_define.N.add(1, 2)); diff --git a/jscomp/test/inner_define.js b/jscomp/test/inner_define.js index 503683b800..adf0620cb6 100644 --- a/jscomp/test/inner_define.js +++ b/jscomp/test/inner_define.js @@ -6,7 +6,7 @@ function add(x, y) { return x + y | 0; } -var N = { +let N = { add: add }; @@ -22,7 +22,7 @@ function f3(param, param$1, param$2) { } -var N0 = { +let N0 = { f1: f1, f2: f2, f3: f3 @@ -36,7 +36,7 @@ function f3$1(param, param$1, param$2) { } -var N1 = { +let N1 = { f2: f2$1, f3: f3$1 }; diff --git a/jscomp/test/inner_unused.js b/jscomp/test/inner_unused.js index 8882d0a42c..a4d727f7ea 100644 --- a/jscomp/test/inner_unused.js +++ b/jscomp/test/inner_unused.js @@ -7,7 +7,7 @@ function f(x) { } function M(S) { - var f = function (x) { + let f = function (x) { return x; }; return { diff --git a/jscomp/test/installation_test.js b/jscomp/test/installation_test.js index 234a716c02..2a75e8e236 100644 --- a/jscomp/test/installation_test.js +++ b/jscomp/test/installation_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; diff --git a/jscomp/test/int32_test.js b/jscomp/test/int32_test.js index ae6277dbf7..0513cfb023 100644 --- a/jscomp/test/int32_test.js +++ b/jscomp/test/int32_test.js @@ -1,12 +1,12 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var $$Array = require("../../lib/js/array.js"); -var Int32 = require("../../lib/js/int32.js"); -var Caml_float = require("../../lib/js/caml_float.js"); -var Pervasives = require("../../lib/js/pervasives.js"); -var Ext_array_test = require("./ext_array_test.js"); +let Mt = require("./mt.js"); +let $$Array = require("../../lib/js/array.js"); +let Int32 = require("../../lib/js/int32.js"); +let Caml_float = require("../../lib/js/caml_float.js"); +let Pervasives = require("../../lib/js/pervasives.js"); +let Ext_array_test = require("./ext_array_test.js"); function f(x) { return [ @@ -16,11 +16,11 @@ function f(x) { ]; } -var shift_right_logical_tests_0 = $$Array.map((function (x) { +let shift_right_logical_tests_0 = $$Array.map((function (x) { return (-1 >>> x) | 0; }), Ext_array_test.range(0, 31)); -var shift_right_logical_tests_1 = [ +let shift_right_logical_tests_1 = [ -1, 2147483647, 1073741823, @@ -55,16 +55,16 @@ var shift_right_logical_tests_1 = [ 1 ]; -var shift_right_logical_tests = [ +let shift_right_logical_tests = [ shift_right_logical_tests_0, shift_right_logical_tests_1 ]; -var shift_right_tests_0 = $$Array.map((function (x) { +let shift_right_tests_0 = $$Array.map((function (x) { return (Int32.min_int >> x); }), Ext_array_test.range(0, 31)); -var shift_right_tests_1 = [ +let shift_right_tests_1 = [ -2147483648, -1073741824, -536870912, @@ -99,16 +99,16 @@ var shift_right_tests_1 = [ -1 ]; -var shift_right_tests = [ +let shift_right_tests = [ shift_right_tests_0, shift_right_tests_1 ]; -var shift_left_tests_0 = $$Array.map((function (x) { +let shift_left_tests_0 = $$Array.map((function (x) { return (1 << x); }), Ext_array_test.range(0, 31)); -var shift_left_tests_1 = [ +let shift_left_tests_1 = [ 1, 2, 4, @@ -143,7 +143,7 @@ var shift_left_tests_1 = [ -2147483648 ]; -var shift_left_tests = [ +let shift_left_tests = [ shift_left_tests_0, shift_left_tests_1 ]; @@ -152,7 +152,7 @@ function $star$tilde(prim0, prim1) { return Math.imul(prim0, prim1); } -var suites = { +let suites = { contents: Pervasives.$at({ hd: [ "File \"int32_test.res\", line 131, characters 9-16", @@ -213,7 +213,7 @@ var suites = { }), shift_left_tests_0, shift_left_tests_1))))) }; -var test_id = { +let test_id = { contents: 0 }; @@ -227,7 +227,7 @@ eq("File \"int32_test.res\", line 171, characters 5-12", Caml_float.int_float_of Mt.from_pair_suites("Int32_test", suites.contents); -var test_div = 30; +let test_div = 30; exports.f = f; exports.shift_right_logical_tests = shift_right_logical_tests; diff --git a/jscomp/test/int64_mul_div_test.js b/jscomp/test/int64_mul_div_test.js index cc0828cd66..99ee078baf 100644 --- a/jscomp/test/int64_mul_div_test.js +++ b/jscomp/test/int64_mul_div_test.js @@ -1,12 +1,12 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var List = require("../../lib/js/list.js"); -var $$Array = require("../../lib/js/array.js"); -var Int64 = require("../../lib/js/int64.js"); -var Caml_int64 = require("../../lib/js/caml_int64.js"); -var Pervasives = require("../../lib/js/pervasives.js"); +let Mt = require("./mt.js"); +let List = require("../../lib/js/list.js"); +let $$Array = require("../../lib/js/array.js"); +let Int64 = require("../../lib/js/int64.js"); +let Caml_int64 = require("../../lib/js/caml_int64.js"); +let Pervasives = require("../../lib/js/pervasives.js"); function commutative_mul(result, a, b) { return { @@ -22,7 +22,7 @@ function commutative_mul(result, a, b) { }; } -var pairs = [ +let pairs = [ [ [ -1482940033, @@ -307,9 +307,9 @@ var pairs = [ function from_pairs(prefix, pairs) { return $$Array.to_list($$Array.mapi((function (i, param) { - var b = param[2]; - var a = param[1]; - var result = param[0]; + let b = param[2]; + let a = param[1]; + let result = param[0]; return [ prefix + "_" + i, (function (param) { @@ -319,7 +319,7 @@ function from_pairs(prefix, pairs) { }), pairs)); } -var small_pairs = [ +let small_pairs = [ [ [ 0, @@ -406,7 +406,7 @@ var small_pairs = [ ] ]; -var to_floats = [ +let to_floats = [ [ Caml_int64.one, 1 @@ -851,7 +851,7 @@ var to_floats = [ ] ]; -var check_complete_compare = [ +let check_complete_compare = [ true, true, true, @@ -862,7 +862,7 @@ var check_complete_compare = [ true ]; -var of_float_pairs = [ +let of_float_pairs = [ [ 6853066956871844, [ @@ -1145,7 +1145,7 @@ var of_float_pairs = [ ] ]; -var simple_divs = [ +let simple_divs = [ [ [ 0, @@ -1510,10 +1510,10 @@ var simple_divs = [ function from(xs) { return List.mapi((function (i, param) { - var d = param[3]; - var c = param[2]; - var b = param[1]; - var a = param[0]; + let d = param[3]; + let c = param[2]; + let b = param[1]; + let a = param[0]; return [ "small_divs " + i, (function (param) { @@ -1533,12 +1533,12 @@ function from(xs) { }), $$Array.to_list(xs)); } -var to_string = [[ +let to_string = [[ Caml_int64.zero, "0" ]]; -var int64_compare_tests = [ +let int64_compare_tests = [ [ Caml_int64.one, [ @@ -1567,9 +1567,9 @@ var int64_compare_tests = [ function from_compare(xs) { return List.mapi((function (i, param) { - var c = param[2]; - var b = param[1]; - var a = param[0]; + let c = param[2]; + let b = param[1]; + let a = param[0]; return [ "int64_compare " + i, (function (param) { @@ -1585,8 +1585,8 @@ function from_compare(xs) { function from_to_string(xs) { return List.mapi((function (i, param) { - var str_a = param[1]; - var a = param[0]; + let str_a = param[1]; + let a = param[0]; return [ "to_string " + i, (function (param) { @@ -1601,8 +1601,8 @@ function from_to_string(xs) { } Mt.from_pair_suites("Int64_mul_div_test", Pervasives.$at(from_pairs("random", pairs), Pervasives.$at(from_pairs("small", small_pairs), Pervasives.$at(List.mapi((function (i, param) { - var f = param[1]; - var i64 = param[0]; + let f = param[1]; + let i64 = param[0]; return [ "to_float_" + i, (function (param) { @@ -1614,8 +1614,8 @@ Mt.from_pair_suites("Int64_mul_div_test", Pervasives.$at(from_pairs("random", pa }) ]; }), $$Array.to_list(to_floats)), Pervasives.$at(List.mapi((function (i, param) { - var i64 = param[1]; - var f = param[0]; + let i64 = param[1]; + let f = param[0]; return [ "of_float_" + i, (function (param) { diff --git a/jscomp/test/int64_string_bench.js b/jscomp/test/int64_string_bench.js index eedad7bf4f..0d1de13d39 100644 --- a/jscomp/test/int64_string_bench.js +++ b/jscomp/test/int64_string_bench.js @@ -1,17 +1,17 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Int64 = require("../../lib/js/int64.js"); -var Caml_int64 = require("../../lib/js/caml_int64.js"); +let Int64 = require("../../lib/js/int64.js"); +let Caml_int64 = require("../../lib/js/caml_int64.js"); console.time("Int64.to_string"); -var u = Caml_int64.sub(Int64.max_int, [ +let u = Caml_int64.sub(Int64.max_int, [ 0, 200000 ]); -for(var i = 0; i <= 100000; ++i){ +for(let i = 0; i <= 100000; ++i){ Caml_int64.to_string(u); } @@ -21,12 +21,12 @@ console.log(Caml_int64.to_string(u)); console.time("Int64.to_string"); -var u$1 = [ +let u$1 = [ 0, 30000000 ]; -for(var i$1 = 0; i$1 <= 100000; ++i$1){ +for(let i$1 = 0; i$1 <= 100000; ++i$1){ Caml_int64.to_string(u$1); } @@ -36,12 +36,12 @@ console.log(Caml_int64.to_string(u$1)); console.time("Int64.to_string"); -var u$2 = Caml_int64.add(Int64.min_int, [ +let u$2 = Caml_int64.add(Int64.min_int, [ 0, 100 ]); -for(var i$2 = 0; i$2 <= 100000; ++i$2){ +for(let i$2 = 0; i$2 <= 100000; ++i$2){ Caml_int64.to_string(u$2); } diff --git a/jscomp/test/int64_string_test.js b/jscomp/test/int64_string_test.js index d4539d3143..08f1b9759f 100644 --- a/jscomp/test/int64_string_test.js +++ b/jscomp/test/int64_string_test.js @@ -1,16 +1,16 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Int64 = require("../../lib/js/int64.js"); -var Belt_List = require("../../lib/js/belt_List.js"); -var Caml_int64 = require("../../lib/js/caml_int64.js"); +let Mt = require("./mt.js"); +let Int64 = require("../../lib/js/int64.js"); +let Belt_List = require("../../lib/js/belt_List.js"); +let Caml_int64 = require("../../lib/js/caml_int64.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -18,7 +18,7 @@ function eq(loc, x, y) { Mt.eq_suites(test_id, suites, loc, x, y); } -var v = Caml_int64.to_string(Int64.max_int); +let v = Caml_int64.to_string(Int64.max_int); eq("File \"int64_string_test.res\", line 6, characters 3-10", v, "9223372036854775807"); @@ -26,7 +26,7 @@ function f(a, b) { eq("File \"int64_string_test.res\", line 7, characters 21-28", Caml_int64.to_string(a), b); } -var hh = Caml_int64.add(Int64.min_int, [ +let hh = Caml_int64.add(Int64.min_int, [ 0, 100 ]); @@ -55,33 +55,33 @@ f([ 2764472320 ], "1000000000000000"); -for(var i = 0; i <= 8; ++i){ +for(let i = 0; i <= 8; ++i){ eq("File \"int64_string_test.res\", line 22, characters 4-11", Caml_int64.to_string(Caml_int64.add(Int64.min_int, Caml_int64.of_int32(i))), "-922337203685477580" + String(8 - i | 0)); } -for(var i$1 = 0; i$1 <= 8; ++i$1){ +for(let i$1 = 0; i$1 <= 8; ++i$1){ eq("File \"int64_string_test.res\", line 32, characters 4-11", Caml_int64.to_string(Caml_int64.add(Int64.min_int, Caml_int64.of_int32(100 + i$1 | 0))), "-922337203685477570" + String(8 - i$1 | 0)); } -for(var i$2 = 0; i$2 <= 8; ++i$2){ +for(let i$2 = 0; i$2 <= 8; ++i$2){ eq("File \"int64_string_test.res\", line 42, characters 4-11", Caml_int64.to_string(Caml_int64.add(Int64.min_int, Caml_int64.of_int32(1000000 + i$2 | 0))), "-922337203685377580" + String(8 - i$2 | 0)); } -var u = [ +let u = [ 2097151, 4294957295 ]; -for(var i$3 = 0; i$3 <= 6; ++i$3){ +for(let i$3 = 0; i$3 <= 6; ++i$3){ eq("File \"int64_string_test.res\", line 56, characters 4-11", Caml_int64.to_string(Caml_int64.add(u, Caml_int64.of_int32(Math.imul(i$3, 10000)))), "90071992547" + (String(3 + i$3 | 0) + "0991")); } -var v$1 = [ +let v$1 = [ -2097153, 4294917297 ]; -for(var i$4 = 0; i$4 <= 9; ++i$4){ +for(let i$4 = 0; i$4 <= 9; ++i$4){ eq("File \"int64_string_test.res\", line 67, characters 4-11", Caml_int64.to_string(Caml_int64.add(v$1, Caml_int64.of_int32(Math.imul(i$4, 10000)))), "-90071992547" + (String(9 - i$4 | 0) + "0991")); } @@ -102,7 +102,7 @@ eq("File \"int64_string_test.res\", line 75, characters 3-10", Caml_int64.to_str eq("File \"int64_string_test.res\", line 77, characters 2-9", Caml_int64.to_string(Caml_int64.max_int), "9223372036854775807"); -var random_data = { +let random_data = { hd: { hd: [ [ @@ -1317,7 +1317,7 @@ Belt_List.forEach(random_data, (function (u) { Error: new Error() }; } - var match = u.hd; + let match = u.hd; return eq("File \"int64_string_test.res\", line 190, characters 25-32", Caml_int64.to_string(match[0]), match[1]); } throw { diff --git a/jscomp/test/int64_test.js b/jscomp/test/int64_test.js index 1c3ced7939..5a9e4ec179 100644 --- a/jscomp/test/int64_test.js +++ b/jscomp/test/int64_test.js @@ -1,20 +1,20 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var $$Array = require("../../lib/js/array.js"); -var Int32 = require("../../lib/js/int32.js"); -var Int64 = require("../../lib/js/int64.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Caml_int64 = require("../../lib/js/caml_int64.js"); -var Pervasives = require("../../lib/js/pervasives.js"); -var Ext_array_test = require("./ext_array_test.js"); +let Mt = require("./mt.js"); +let $$Array = require("../../lib/js/array.js"); +let Int32 = require("../../lib/js/int32.js"); +let Int64 = require("../../lib/js/int64.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Caml_int64 = require("../../lib/js/caml_int64.js"); +let Pervasives = require("../../lib/js/pervasives.js"); +let Ext_array_test = require("./ext_array_test.js"); -var v = Caml_int64.add(Caml_int64.of_int32(Int32.max_int), Int64.one); +let v = Caml_int64.add(Caml_int64.of_int32(Int32.max_int), Int64.one); -var h = Caml_int64.neg(v); +let h = Caml_int64.neg(v); -var a = [ +let a = [ 0, 2147483647 ]; @@ -33,13 +33,13 @@ function commutative_add(result, a, b) { }; } -var generic_compare = Caml_obj.compare; +let generic_compare = Caml_obj.compare; -var shift_left_tests_0 = $$Array.map((function (i) { +let shift_left_tests_0 = $$Array.map((function (i) { return Caml_int64.lsl_(Caml_int64.one, i); }), Ext_array_test.range(0, 63)); -var shift_left_tests_1 = [ +let shift_left_tests_1 = [ Caml_int64.one, [ 0, @@ -292,16 +292,16 @@ var shift_left_tests_1 = [ Caml_int64.min_int ]; -var shift_left_tests = [ +let shift_left_tests = [ shift_left_tests_0, shift_left_tests_1 ]; -var shift_right_tests_0 = $$Array.map((function (i) { +let shift_right_tests_0 = $$Array.map((function (i) { return Caml_int64.asr_(Caml_int64.min_int, i); }), Ext_array_test.range(0, 63)); -var shift_right_tests_1 = [ +let shift_right_tests_1 = [ Caml_int64.min_int, [ -1073741824, @@ -554,16 +554,16 @@ var shift_right_tests_1 = [ Caml_int64.neg_one ]; -var shift_right_tests = [ +let shift_right_tests = [ shift_right_tests_0, shift_right_tests_1 ]; -var shift_right_logical_suites_0 = $$Array.map((function (i) { +let shift_right_logical_suites_0 = $$Array.map((function (i) { return Caml_int64.lsr_(Caml_int64.min_int, i); }), Ext_array_test.range(0, 63)); -var shift_right_logical_suites_1 = [ +let shift_right_logical_suites_1 = [ Caml_int64.min_int, [ 1073741824, @@ -816,16 +816,16 @@ var shift_right_logical_suites_1 = [ Caml_int64.one ]; -var shift_right_logical_suites = [ +let shift_right_logical_suites = [ shift_right_logical_suites_0, shift_right_logical_suites_1 ]; function fib(_n, _a, _b) { while(true) { - var b = _b; - var a = _a; - var n = _n; + let b = _b; + let a = _a; + let n = _n; if (n === 0) { return a; } @@ -838,8 +838,8 @@ function fib(_n, _a, _b) { function fac(_n, _acc) { while(true) { - var acc = _acc; - var n = _n; + let acc = _acc; + let n = _n; if (n === 0) { return acc; } @@ -849,7 +849,7 @@ function fac(_n, _acc) { }; } -var suites = Pervasives.$at({ +let suites = Pervasives.$at({ hd: [ "add_one", (function (param) { @@ -2133,11 +2133,11 @@ var suites = Pervasives.$at({ ]; }), shift_right_logical_suites_0, shift_right_logical_suites_1))))); -var suites$1 = { +let suites$1 = { contents: suites }; -var test_id = { +let test_id = { contents: 0 }; @@ -2146,8 +2146,8 @@ function eq(loc, x, y) { } function id(loc, x) { - var float_value = Caml_int64.float_of_bits(x); - var match = Pervasives.classify_float(float_value); + let float_value = Caml_int64.float_of_bits(x); + let match = Pervasives.classify_float(float_value); if (match === "FP_nan") { return; } else { diff --git a/jscomp/test/int_hashtbl_test.js b/jscomp/test/int_hashtbl_test.js index db5a30f52c..75ca3080e8 100644 --- a/jscomp/test/int_hashtbl_test.js +++ b/jscomp/test/int_hashtbl_test.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml = require("../../lib/js/caml.js"); -var List = require("../../lib/js/list.js"); -var $$Array = require("../../lib/js/array.js"); -var Curry = require("../../lib/js/curry.js"); -var Hashtbl = require("../../lib/js/hashtbl.js"); +let Mt = require("./mt.js"); +let Caml = require("../../lib/js/caml.js"); +let List = require("../../lib/js/list.js"); +let $$Array = require("../../lib/js/array.js"); +let Curry = require("../../lib/js/curry.js"); +let Hashtbl = require("../../lib/js/hashtbl.js"); function f(H) { - var tbl = Curry._1(H.create, 17); + let tbl = Curry._1(H.create, 17); Curry._3(H.add, tbl, 1, /* '1' */49); Curry._3(H.add, tbl, 2, /* '2' */50); return List.sort((function (param, param$1) { @@ -26,14 +26,14 @@ function f(H) { } function g(H, count) { - var tbl = Curry._1(H.create, 17); - for(var i = 0; i <= count; ++i){ + let tbl = Curry._1(H.create, 17); + for(let i = 0; i <= count; ++i){ Curry._3(H.replace, tbl, (i << 1), String(i)); } - for(var i$1 = 0; i$1 <= count; ++i$1){ + for(let i$1 = 0; i$1 <= count; ++i$1){ Curry._3(H.replace, tbl, (i$1 << 1), String(i$1)); } - var v = Curry._3(H.fold, (function (k, v, acc) { + let v = Curry._3(H.fold, (function (k, v, acc) { return { hd: [ k, @@ -47,18 +47,18 @@ function g(H, count) { }), v)); } -var hash = Hashtbl.hash; +let hash = Hashtbl.hash; function equal(x, y) { return x === y; } -var Int_hash = Hashtbl.Make({ +let Int_hash = Hashtbl.Make({ equal: equal, hash: hash }); -var suites_0 = [ +let suites_0 = [ "simple", (function (param) { return { @@ -81,7 +81,7 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "more_iterations", (function (param) { @@ -100,7 +100,7 @@ var suites_1 = { tl: /* [] */0 }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/int_map.js b/jscomp/test/int_map.js index bc5ae5c56a..13340dc512 100644 --- a/jscomp/test/int_map.js +++ b/jscomp/test/int_map.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml = require("../../lib/js/caml.js"); -var Curry = require("../../lib/js/curry.js"); -var Caml_option = require("../../lib/js/caml_option.js"); +let Caml = require("../../lib/js/caml.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_option = require("../../lib/js/caml_option.js"); function height(param) { if (typeof param !== "object") { @@ -14,8 +14,8 @@ function height(param) { } function create(l, x, d, r) { - var hl = height(l); - var hr = height(r); + let hl = height(l); + let hr = height(r); return { TAG: "Node", l: l, @@ -38,9 +38,9 @@ function singleton(x, d) { } function bal(l, x, d, r) { - var hl; + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -50,10 +50,10 @@ function bal(l, x, d, r) { Error: new Error() }; } - var lr = l.r; - var ld = l.d; - var lv = l.v; - var ll = l.l; + let lr = l.r; + let ld = l.d; + let lv = l.v; + let ll = l.l; if (height(ll) >= height(lr)) { return create(ll, lv, ld, create(lr, x, d, r)); } @@ -83,10 +83,10 @@ function bal(l, x, d, r) { Error: new Error() }; } - var rr = r.r; - var rd = r.d; - var rv = r.v; - var rl = r.l; + let rr = r.r; + let rd = r.d; + let rv = r.v; + let rl = r.l; if (height(rr) >= height(rl)) { return create(create(l, x, d, rl), rv, rd, rr); } @@ -119,11 +119,11 @@ function add(x, data, param) { h: 1 }; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Caml.int_compare(x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Caml.int_compare(x, v); if (c === 0) { if (d === data) { return param; @@ -139,14 +139,14 @@ function add(x, data, param) { } } if (c < 0) { - var ll = add(x, data, l); + let ll = add(x, data, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = add(x, data, r); + let rr = add(x, data, r); if (r === rr) { return param; } else { @@ -156,14 +156,14 @@ function add(x, data, param) { function find(x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var c = Caml.int_compare(x, param.v); + let c = Caml.int_compare(x, param.v); if (c === 0) { return param.d; } @@ -174,29 +174,29 @@ function find(x, _param) { function find_first(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _d0 = param.d; - var _param$1 = param.l; + let _v0 = v; + let _d0 = param.d; + let _param$1 = param.l; while(true) { - var param$1 = _param$1; - var d0 = _d0; - var v0 = _v0; + let param$1 = _param$1; + let d0 = _d0; + let v0 = _v0; if (typeof param$1 !== "object") { return [ v0, d0 ]; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.l; _d0 = param$1.d; @@ -214,26 +214,26 @@ function find_first(f, _param) { function find_first_opt(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _d0 = param.d; - var _param$1 = param.l; + let _v0 = v; + let _d0 = param.d; + let _param$1 = param.l; while(true) { - var param$1 = _param$1; - var d0 = _d0; - var v0 = _v0; + let param$1 = _param$1; + let d0 = _d0; + let v0 = _v0; if (typeof param$1 !== "object") { return [ v0, d0 ]; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.l; _d0 = param$1.d; @@ -251,29 +251,29 @@ function find_first_opt(f, _param) { function find_last(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _d0 = param.d; - var _param$1 = param.r; + let _v0 = v; + let _d0 = param.d; + let _param$1 = param.r; while(true) { - var param$1 = _param$1; - var d0 = _d0; - var v0 = _v0; + let param$1 = _param$1; + let d0 = _d0; + let v0 = _v0; if (typeof param$1 !== "object") { return [ v0, d0 ]; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.r; _d0 = param$1.d; @@ -291,26 +291,26 @@ function find_last(f, _param) { function find_last_opt(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _d0 = param.d; - var _param$1 = param.r; + let _v0 = v; + let _d0 = param.d; + let _param$1 = param.r; while(true) { - var param$1 = _param$1; - var d0 = _d0; - var v0 = _v0; + let param$1 = _param$1; + let d0 = _d0; + let v0 = _v0; if (typeof param$1 !== "object") { return [ v0, d0 ]; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.r; _d0 = param$1.d; @@ -328,11 +328,11 @@ function find_last_opt(f, _param) { function find_opt(x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var c = Caml.int_compare(x, param.v); + let c = Caml.int_compare(x, param.v); if (c === 0) { return Caml_option.some(param.d); } @@ -343,11 +343,11 @@ function find_opt(x, _param) { function mem(x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } - var c = Caml.int_compare(x, param.v); + let c = Caml.int_compare(x, param.v); if (c === 0) { return true; } @@ -358,14 +358,14 @@ function mem(x, _param) { function min_binding(_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return [ param.v, @@ -379,11 +379,11 @@ function min_binding(_param) { function min_binding_opt(_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return [ param.v, @@ -397,14 +397,14 @@ function min_binding_opt(_param) { function max_binding(_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return [ param.v, @@ -418,11 +418,11 @@ function max_binding(_param) { function max_binding_opt(_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return [ param.v, @@ -442,7 +442,7 @@ function remove_min_binding(param) { Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return param.r; } else { @@ -457,7 +457,7 @@ function merge(t1, t2) { if (typeof t2 !== "object") { return t1; } - var match = min_binding(t2); + let match = min_binding(t2); return bal(t1, match[0], match[1], remove_min_binding(t2)); } @@ -465,23 +465,23 @@ function remove(x, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Caml.int_compare(x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Caml.int_compare(x, v); if (c === 0) { return merge(l, r); } if (c < 0) { - var ll = remove(x, l); + let ll = remove(x, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = remove(x, r); + let rr = remove(x, r); if (r === rr) { return param; } else { @@ -491,7 +491,7 @@ function remove(x, param) { function update(x, f, param) { if (typeof param !== "object") { - var data = Curry._1(f, undefined); + let data = Curry._1(f, undefined); if (data !== undefined) { return { TAG: "Node", @@ -505,17 +505,17 @@ function update(x, f, param) { return "Empty"; } } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Caml.int_compare(x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Caml.int_compare(x, v); if (c === 0) { - var data$1 = Curry._1(f, Caml_option.some(d)); + let data$1 = Curry._1(f, Caml_option.some(d)); if (data$1 === undefined) { return merge(l, r); } - var data$2 = Caml_option.valFromOption(data$1); + let data$2 = Caml_option.valFromOption(data$1); if (d === data$2) { return param; } else { @@ -530,14 +530,14 @@ function update(x, f, param) { } } if (c < 0) { - var ll = update(x, f, l); + let ll = update(x, f, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = update(x, f, r); + let rr = update(x, f, r); if (r === rr) { return param; } else { @@ -547,7 +547,7 @@ function update(x, f, param) { function iter(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } @@ -562,9 +562,9 @@ function map(f, param) { if (typeof param !== "object") { return "Empty"; } - var l$p = map(f, param.l); - var d$p = Curry._1(f, param.d); - var r$p = map(f, param.r); + let l$p = map(f, param.l); + let d$p = Curry._1(f, param.d); + let r$p = map(f, param.r); return { TAG: "Node", l: l$p, @@ -579,10 +579,10 @@ function mapi(f, param) { if (typeof param !== "object") { return "Empty"; } - var v = param.v; - var l$p = mapi(f, param.l); - var d$p = Curry._2(f, v, param.d); - var r$p = mapi(f, param.r); + let v = param.v; + let l$p = mapi(f, param.l); + let d$p = Curry._2(f, v, param.d); + let r$p = mapi(f, param.r); return { TAG: "Node", l: l$p, @@ -595,8 +595,8 @@ function mapi(f, param) { function fold(f, _m, _accu) { while(true) { - var accu = _accu; - var m = _m; + let accu = _accu; + let m = _m; if (typeof m !== "object") { return accu; } @@ -608,7 +608,7 @@ function fold(f, _m, _accu) { function for_all(p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return true; } @@ -625,7 +625,7 @@ function for_all(p, _param) { function exists(p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } @@ -660,11 +660,11 @@ function join(l, v, d, r) { if (typeof l !== "object") { return add_min_binding(v, d, r); } - var lh = l.h; + let lh = l.h; if (typeof r !== "object") { return add_max_binding(v, d, l); } - var rh = r.h; + let rh = r.h; if (lh > (rh + 2 | 0)) { return bal(l.l, l.v, l.d, join(l.r, v, d, r)); } else if (rh > (lh + 2 | 0)) { @@ -681,7 +681,7 @@ function concat(t1, t2) { if (typeof t2 !== "object") { return t1; } - var match = min_binding(t2); + let match = min_binding(t2); return join(t1, match[0], match[1], remove_min_binding(t2)); } @@ -701,11 +701,11 @@ function split(x, param) { "Empty" ]; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Caml.int_compare(x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Caml.int_compare(x, v); if (c === 0) { return [ l, @@ -714,14 +714,14 @@ function split(x, param) { ]; } if (c < 0) { - var match = split(x, l); + let match = split(x, l); return [ match[0], match[1], join(match[2], v, d, r) ]; } - var match$1 = split(x, r); + let match$1 = split(x, r); return [ join(l, v, d, match$1[0]), match$1[1], @@ -736,9 +736,9 @@ function merge$1(f, s1, s2) { } } else { - var v1 = s1.v; + let v1 = s1.v; if (s1.h >= height(s2)) { - var match = split(v1, s2); + let match = split(v1, s2); return concat_or_join(merge$1(f, s1.l, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2])); } @@ -754,8 +754,8 @@ function merge$1(f, s1, s2) { Error: new Error() }; } - var v2 = s2.v; - var match$1 = split(v2, s1); + let v2 = s2.v; + let match$1 = split(v2, s1); return concat_or_join(merge$1(f, match$1[0], s2.l), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r)); } @@ -763,28 +763,28 @@ function union(f, s1, s2) { if (typeof s1 !== "object") { return s2; } - var d1 = s1.d; - var v1 = s1.v; + let d1 = s1.d; + let v1 = s1.v; if (typeof s2 !== "object") { return s1; } - var d2 = s2.d; - var v2 = s2.v; + let d2 = s2.d; + let v2 = s2.v; if (s1.h >= s2.h) { - var match = split(v1, s2); - var d2$1 = match[1]; - var l = union(f, s1.l, match[0]); - var r = union(f, s1.r, match[2]); + let match = split(v1, s2); + let d2$1 = match[1]; + let l = union(f, s1.l, match[0]); + let r = union(f, s1.r, match[2]); if (d2$1 !== undefined) { return concat_or_join(l, v1, Curry._3(f, v1, d1, Caml_option.valFromOption(d2$1)), r); } else { return join(l, v1, d1, r); } } - var match$1 = split(v2, s1); - var d1$1 = match$1[1]; - var l$1 = union(f, match$1[0], s2.l); - var r$1 = union(f, match$1[2], s2.r); + let match$1 = split(v2, s1); + let d1$1 = match$1[1]; + let l$1 = union(f, match$1[0], s2.l); + let r$1 = union(f, match$1[2], s2.r); if (d1$1 !== undefined) { return concat_or_join(l$1, v2, Curry._3(f, v2, Caml_option.valFromOption(d1$1), d2), r$1); } else { @@ -796,13 +796,13 @@ function filter(p, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var l$p = filter(p, l); - var pvd = Curry._2(p, v, d); - var r$p = filter(p, r); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let l$p = filter(p, l); + let pvd = Curry._2(p, v, d); + let r$p = filter(p, r); if (pvd) { if (l === l$p && r === r$p) { return param; @@ -821,15 +821,15 @@ function partition(p, param) { "Empty" ]; } - var d = param.d; - var v = param.v; - var match = partition(p, param.l); - var lf = match[1]; - var lt = match[0]; - var pvd = Curry._2(p, v, d); - var match$1 = partition(p, param.r); - var rf = match$1[1]; - var rt = match$1[0]; + let d = param.d; + let v = param.v; + let match = partition(p, param.l); + let lf = match[1]; + let lt = match[0]; + let pvd = Curry._2(p, v, d); + let match$1 = partition(p, param.r); + let rf = match$1[1]; + let rt = match$1[0]; if (pvd) { return [ join(lt, v, d, rt), @@ -845,8 +845,8 @@ function partition(p, param) { function cons_enum(_m, _e) { while(true) { - var e = _e; - var m = _m; + let e = _e; + let m = _m; if (typeof m !== "object") { return e; } @@ -863,11 +863,11 @@ function cons_enum(_m, _e) { } function compare(cmp, m1, m2) { - var _e1 = cons_enum(m1, "End"); - var _e2 = cons_enum(m2, "End"); + let _e1 = cons_enum(m1, "End"); + let _e2 = cons_enum(m2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return 0; @@ -878,11 +878,11 @@ function compare(cmp, m1, m2) { if (typeof e2 !== "object") { return 1; } - var c = Caml.int_compare(e1._0, e2._0); + let c = Caml.int_compare(e1._0, e2._0); if (c !== 0) { return c; } - var c$1 = Curry._2(cmp, e1._1, e2._1); + let c$1 = Curry._2(cmp, e1._1, e2._1); if (c$1 !== 0) { return c$1; } @@ -893,11 +893,11 @@ function compare(cmp, m1, m2) { } function equal(cmp, m1, m2) { - var _e1 = cons_enum(m1, "End"); - var _e2 = cons_enum(m2, "End"); + let _e1 = cons_enum(m1, "End"); + let _e2 = cons_enum(m2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return true; @@ -930,8 +930,8 @@ function cardinal(param) { function bindings_aux(_accu, _param) { while(true) { - var param = _param; - var accu = _accu; + let param = _param; + let accu = _accu; if (typeof param !== "object") { return accu; } @@ -951,11 +951,11 @@ function bindings(s) { return bindings_aux(/* [] */0, s); } -var empty = "Empty"; +let empty = "Empty"; -var choose = min_binding; +let choose = min_binding; -var choose_opt = min_binding_opt; +let choose_opt = min_binding_opt; exports.empty = empty; exports.is_empty = is_empty; diff --git a/jscomp/test/int_overflow_test.js b/jscomp/test/int_overflow_test.js index 458cd8f32f..11099804f7 100644 --- a/jscomp/test/int_overflow_test.js +++ b/jscomp/test/int_overflow_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Int32 = require("../../lib/js/int32.js"); -var Caml_string = require("../../lib/js/caml_string.js"); +let Mt = require("./mt.js"); +let Int32 = require("../../lib/js/int32.js"); +let Caml_string = require("../../lib/js/caml_string.js"); function hash_variant(s) { - var accu = 0; - for(var i = 0 ,i_finish = s.length; i < i_finish; ++i){ + let accu = 0; + for(let i = 0 ,i_finish = s.length; i < i_finish; ++i){ accu = Math.imul(223, accu) + Caml_string.get(s, i) & 2147483647; } if (accu > 1073741823) { @@ -18,8 +18,8 @@ function hash_variant(s) { } function hash_variant2(s) { - var accu = 0; - for(var i = 0 ,i_finish = s.length; i < i_finish; ++i){ + let accu = 0; + for(let i = 0 ,i_finish = s.length; i < i_finish; ++i){ accu = Math.imul(223, accu) + Caml_string.get(s, i) | 0; } accu = accu & 2147483647; diff --git a/jscomp/test/int_poly_var.js b/jscomp/test/int_poly_var.js index 9ddc994b3f..c58817214f 100644 --- a/jscomp/test/int_poly_var.js +++ b/jscomp/test/int_poly_var.js @@ -1,19 +1,19 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var test_id = { +let test_id = { contents: 0 }; -var suites = { +let suites = { contents: /* [] */0 }; function nest(x) { if (x.TAG === "A") { - var match = x._0; + let match = x._0; if (match === 0) { return 0; } else if (match === 1) { @@ -22,7 +22,7 @@ function nest(x) { return 2; } } - var match$1 = x._0; + let match$1 = x._0; if (x._1 !== 0) { if (match$1 === 1) { return 4; @@ -52,7 +52,7 @@ function f3(x, b) { if (typeof x !== "object") { return 3; } - var variant = x.NAME; + let variant = x.NAME; if (variant === 32) { return x.VAL[0]; } else if (variant === 333) { @@ -66,62 +66,62 @@ function h(x) { return x === 0; } -var hihi = f3(3, 0); +let hihi = f3(3, 0); -var hh10 = "3" === 3; +let hh10 = "3" === 3; -var tuple_0 = nest({ +let tuple_0 = nest({ TAG: "A", _0: 0 }); -var tuple_1 = nest({ +let tuple_1 = nest({ TAG: "A", _0: 1 }); -var tuple_2 = nest({ +let tuple_2 = nest({ TAG: "A", _0: 2 }); -var tuple_3 = nest({ +let tuple_3 = nest({ TAG: "B", _0: 1, _1: 0 }); -var tuple_4 = nest({ +let tuple_4 = nest({ TAG: "B", _0: 1, _1: 1 }); -var tuple_5 = nest({ +let tuple_5 = nest({ TAG: "B", _0: 2, _1: 1 }); -var tuple_6 = nest({ +let tuple_6 = nest({ TAG: "B", _0: 2, _1: 2 }); -var tuple_7 = nest({ +let tuple_7 = nest({ TAG: "B", _0: 0, _1: 0 }); -var tuple_8 = nest({ +let tuple_8 = nest({ TAG: "B", _0: 0, _1: 1 }); -var tuple = [ +let tuple = [ tuple_0, tuple_1, tuple_2, @@ -169,15 +169,15 @@ function f(x) { Mt.from_pair_suites("int_poly_var.res", suites.contents); -var eq_suites = Mt.eq_suites; +let eq_suites = Mt.eq_suites; -var u = 1; +let u = 1; -var g = /* 'b' */98; +let g = /* 'b' */98; -var hh9 = true; +let hh9 = true; -var begin = 3; +let begin = 3; exports.eq_suites = eq_suites; exports.test_id = test_id; diff --git a/jscomp/test/int_switch_test.js b/jscomp/test/int_switch_test.js index 1294df8ad9..0cdd07393a 100644 --- a/jscomp/test/int_switch_test.js +++ b/jscomp/test/int_switch_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Curry = require("../../lib/js/curry.js"); +let Mt = require("./mt.js"); +let Curry = require("../../lib/js/curry.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -21,7 +21,7 @@ function b(loc, x) { } function f(x) { - var match = Curry._1(x, undefined); + let match = Curry._1(x, undefined); switch (match) { case 1 : return /* 'a' */97; @@ -35,7 +35,7 @@ function f(x) { } function f22(x) { - var match = Curry._1(x, undefined); + let match = Curry._1(x, undefined); switch (match) { case 1 : return /* 'a' */97; @@ -49,7 +49,7 @@ function f22(x) { } function f33(x) { - var match = Curry._1(x, undefined); + let match = Curry._1(x, undefined); switch (match) { case "A" : return /* 'a' */97; diff --git a/jscomp/test/internal_unused_test.js b/jscomp/test/internal_unused_test.js index 215542834a..0a1e938c2a 100644 --- a/jscomp/test/internal_unused_test.js +++ b/jscomp/test/internal_unused_test.js @@ -1,11 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); console.log(3); -var A = /* @__PURE__ */Caml_exceptions.create("Internal_unused_test.P1.A"); +let A = /* @__PURE__ */Caml_exceptions.create("Internal_unused_test.P1.A"); function f(param) { throw { @@ -14,19 +14,19 @@ function f(param) { }; } -var c = 5; +let c = 5; -var h1 = 2; +let h1 = 2; -var h2 = h1 + 1 | 0; +let h2 = h1 + 1 | 0; -var h4 = 2; +let h4 = 2; -var h5 = h4 + 1 | 0; +let h5 = h4 + 1 | 0; -var b = 5; +let b = 5; -var N = { +let N = { b: b }; diff --git a/jscomp/test/js_array_test.js b/jscomp/test/js_array_test.js index eeb489b293..5c3db77382 100644 --- a/jscomp/test/js_array_test.js +++ b/jscomp/test/js_array_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Js_vector = require("../../lib/js/js_vector.js"); -var Caml_option = require("../../lib/js/caml_option.js"); +let Mt = require("./mt.js"); +let Js_vector = require("../../lib/js/js_vector.js"); +let Caml_option = require("../../lib/js/caml_option.js"); -var suites_0 = [ +let suites_0 = [ "File \"js_array_test.res\", line 5, characters 6-13", (function (param) { - var x = [ + let x = [ 1, 2, 3, @@ -28,11 +28,11 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "File \"js_array_test.res\", line 16, characters 6-13", (function (param) { - var x = [ + let x = [ 1, 2, 3, @@ -356,13 +356,13 @@ var suites_1 = { hd: [ "spliceInPlace", (function (param) { - var arr = [ + let arr = [ 1, 2, 3, 4 ]; - var removed = arr.splice(2, 0, 5); + let removed = arr.splice(2, 0, 5); return { TAG: "Eq", _0: [ @@ -386,13 +386,13 @@ var suites_1 = { hd: [ "removeFromInPlace", (function (param) { - var arr = [ + let arr = [ 1, 2, 3, 4 ]; - var removed = arr.splice(2); + let removed = arr.splice(2); return { TAG: "Eq", _0: [ @@ -416,13 +416,13 @@ var suites_1 = { hd: [ "removeCountInPlace", (function (param) { - var arr = [ + let arr = [ 1, 2, 3, 4 ]; - var removed = arr.splice(2, 1); + let removed = arr.splice(2, 1); return { TAG: "Eq", _0: [ @@ -932,7 +932,7 @@ var suites_1 = { hd: [ "forEach", (function (param) { - var sum = { + let sum = { contents: 0 }; [ @@ -953,7 +953,7 @@ var suites_1 = { hd: [ "forEachi", (function (param) { - var sum = { + let sum = { contents: 0 }; [ @@ -1185,7 +1185,7 @@ var suites_1 = { } }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/js_bool_test.js b/jscomp/test/js_bool_test.js index cde1d0b4e4..1c1f6bd5fe 100644 --- a/jscomp/test/js_bool_test.js +++ b/jscomp/test/js_bool_test.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); function f(x) { if (x) { @@ -27,11 +27,11 @@ function f4(x) { } } -var u = 1; +let u = 1; -var v = true; +let v = true; -var suites_0 = [ +let suites_0 = [ "?bool_eq_caml_bool", (function (param) { return { @@ -42,7 +42,7 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "js_bool_eq_js_bool", (function (param) { @@ -68,7 +68,7 @@ var suites_1 = { } }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; @@ -114,7 +114,7 @@ function bb(x) { ]; } -var consts = [ +let consts = [ false, false, true, @@ -125,14 +125,14 @@ var consts = [ true ]; -var bool_array = [ +let bool_array = [ true, false ]; Mt.from_pair_suites("Js_bool_test", suites); -var f3 = true; +let f3 = true; exports.f = f; exports.f2 = f2; diff --git a/jscomp/test/js_cast_test.js b/jscomp/test/js_cast_test.js index fd989e1ecd..ee261560a5 100644 --- a/jscomp/test/js_cast_test.js +++ b/jscomp/test/js_cast_test.js @@ -1,19 +1,19 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var counter = { +let counter = { contents: 0 }; function add_test(loc, test) { counter.contents = counter.contents + 1 | 0; - var id = loc + (" id " + String(counter.contents)); + let id = loc + (" id " + String(counter.contents)); suites.contents = { hd: [ id, diff --git a/jscomp/test/js_date_test.js b/jscomp/test/js_date_test.js index d64282c5cb..18d562756f 100644 --- a/jscomp/test/js_date_test.js +++ b/jscomp/test/js_date_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); +let Mt = require("./mt.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); function date(param) { return new Date("1976-03-08T12:34:56.789+01:23"); } -var suites_0 = [ +let suites_0 = [ "valueOf", (function (param) { return { @@ -19,7 +19,7 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "make", (function (param) { @@ -86,7 +86,7 @@ var suites_1 = { hd: [ "makeWithYM", (function (param) { - var d = new Date(1984, 4); + let d = new Date(1984, 4); return { TAG: "Eq", _0: [ @@ -104,7 +104,7 @@ var suites_1 = { hd: [ "makeWithYMD", (function (param) { - var d = new Date(1984, 4, 6); + let d = new Date(1984, 4, 6); return { TAG: "Eq", _0: [ @@ -124,7 +124,7 @@ var suites_1 = { hd: [ "makeWithYMDH", (function (param) { - var d = new Date(1984, 4, 6, 3); + let d = new Date(1984, 4, 6, 3); return { TAG: "Eq", _0: [ @@ -146,7 +146,7 @@ var suites_1 = { hd: [ "makeWithYMDHM", (function (param) { - var d = new Date(1984, 4, 6, 3, 59); + let d = new Date(1984, 4, 6, 3, 59); return { TAG: "Eq", _0: [ @@ -170,7 +170,7 @@ var suites_1 = { hd: [ "makeWithYMDHMS", (function (param) { - var d = new Date(1984, 4, 6, 3, 59, 27); + let d = new Date(1984, 4, 6, 3, 59, 27); return { TAG: "Eq", _0: [ @@ -196,8 +196,8 @@ var suites_1 = { hd: [ "utcWithYM", (function (param) { - var d = Date.UTC(1984, 4); - var d$1 = new Date(d); + let d = Date.UTC(1984, 4); + let d$1 = new Date(d); return { TAG: "Eq", _0: [ @@ -215,8 +215,8 @@ var suites_1 = { hd: [ "utcWithYMD", (function (param) { - var d = Date.UTC(1984, 4, 6); - var d$1 = new Date(d); + let d = Date.UTC(1984, 4, 6); + let d$1 = new Date(d); return { TAG: "Eq", _0: [ @@ -236,8 +236,8 @@ var suites_1 = { hd: [ "utcWithYMDH", (function (param) { - var d = Date.UTC(1984, 4, 6, 3); - var d$1 = new Date(d); + let d = Date.UTC(1984, 4, 6, 3); + let d$1 = new Date(d); return { TAG: "Eq", _0: [ @@ -259,8 +259,8 @@ var suites_1 = { hd: [ "utcWithYMDHM", (function (param) { - var d = Date.UTC(1984, 4, 6, 3, 59); - var d$1 = new Date(d); + let d = Date.UTC(1984, 4, 6, 3, 59); + let d$1 = new Date(d); return { TAG: "Eq", _0: [ @@ -284,8 +284,8 @@ var suites_1 = { hd: [ "utcWithYMDHMS", (function (param) { - var d = Date.UTC(1984, 4, 6, 3, 59, 27); - var d$1 = new Date(d); + let d = Date.UTC(1984, 4, 6, 3, 59, 27); + let d$1 = new Date(d); return { TAG: "Eq", _0: [ @@ -454,7 +454,7 @@ var suites_1 = { hd: [ "setDate", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setDate(12); return { TAG: "Eq", @@ -467,7 +467,7 @@ var suites_1 = { hd: [ "setFullYear", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setFullYear(1986); return { TAG: "Eq", @@ -480,7 +480,7 @@ var suites_1 = { hd: [ "setFullYearM", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setFullYear(1986, 7); return { TAG: "Eq", @@ -499,7 +499,7 @@ var suites_1 = { hd: [ "setFullYearMD", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setFullYear(1986, 7, 23); return { TAG: "Eq", @@ -520,7 +520,7 @@ var suites_1 = { hd: [ "setHours", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setHours(22); return { TAG: "Eq", @@ -533,7 +533,7 @@ var suites_1 = { hd: [ "setHoursM", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setHours(22, 48); return { TAG: "Eq", @@ -552,7 +552,7 @@ var suites_1 = { hd: [ "setHoursMS", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setHours(22, 48, 54); return { TAG: "Eq", @@ -573,7 +573,7 @@ var suites_1 = { hd: [ "setMilliseconds", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setMilliseconds(543); return { TAG: "Eq", @@ -586,7 +586,7 @@ var suites_1 = { hd: [ "setMinutes", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setMinutes(18); return { TAG: "Eq", @@ -599,7 +599,7 @@ var suites_1 = { hd: [ "setMinutesS", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setMinutes(18, 42); return { TAG: "Eq", @@ -618,7 +618,7 @@ var suites_1 = { hd: [ "setMinutesSMs", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setMinutes(18, 42, 311); return { TAG: "Eq", @@ -639,7 +639,7 @@ var suites_1 = { hd: [ "setMonth", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setMonth(10); return { TAG: "Eq", @@ -652,7 +652,7 @@ var suites_1 = { hd: [ "setMonthD", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setMonth(10, 14); return { TAG: "Eq", @@ -671,7 +671,7 @@ var suites_1 = { hd: [ "setSeconds", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setSeconds(36); return { TAG: "Eq", @@ -684,7 +684,7 @@ var suites_1 = { hd: [ "setSecondsMs", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setSeconds(36, 420); return { TAG: "Eq", @@ -703,7 +703,7 @@ var suites_1 = { hd: [ "setUTCDate", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setUTCDate(12); return { TAG: "Eq", @@ -716,7 +716,7 @@ var suites_1 = { hd: [ "setUTCFullYear", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setUTCFullYear(1986); return { TAG: "Eq", @@ -729,7 +729,7 @@ var suites_1 = { hd: [ "setUTCFullYearM", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setUTCFullYear(1986, 7); return { TAG: "Eq", @@ -748,7 +748,7 @@ var suites_1 = { hd: [ "setUTCFullYearMD", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setUTCFullYear(1986, 7, 23); return { TAG: "Eq", @@ -769,7 +769,7 @@ var suites_1 = { hd: [ "setUTCHours", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setUTCHours(22); return { TAG: "Eq", @@ -782,7 +782,7 @@ var suites_1 = { hd: [ "setUTCHoursM", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setUTCHours(22, 48); return { TAG: "Eq", @@ -801,7 +801,7 @@ var suites_1 = { hd: [ "setUTCHoursMS", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setUTCHours(22, 48, 54); return { TAG: "Eq", @@ -822,7 +822,7 @@ var suites_1 = { hd: [ "setUTCMilliseconds", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setUTCMilliseconds(543); return { TAG: "Eq", @@ -835,7 +835,7 @@ var suites_1 = { hd: [ "setUTCMinutes", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setUTCMinutes(18); return { TAG: "Eq", @@ -848,7 +848,7 @@ var suites_1 = { hd: [ "setUTCMinutesS", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setUTCMinutes(18, 42); return { TAG: "Eq", @@ -867,7 +867,7 @@ var suites_1 = { hd: [ "setUTCMinutesSMs", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setUTCMinutes(18, 42, 311); return { TAG: "Eq", @@ -888,7 +888,7 @@ var suites_1 = { hd: [ "setUTCMonth", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setUTCMonth(10); return { TAG: "Eq", @@ -901,7 +901,7 @@ var suites_1 = { hd: [ "setUTCMonthD", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setUTCMonth(10, 14); return { TAG: "Eq", @@ -920,7 +920,7 @@ var suites_1 = { hd: [ "setUTCSeconds", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setUTCSeconds(36); return { TAG: "Eq", @@ -933,7 +933,7 @@ var suites_1 = { hd: [ "setUTCSecondsMs", (function (param) { - var d = new Date("1976-03-08T12:34:56.789+01:23"); + let d = new Date("1976-03-08T12:34:56.789+01:23"); d.setUTCSeconds(36, 420); return { TAG: "Eq", @@ -1018,9 +1018,9 @@ var suites_1 = { hd: [ "eq", (function (param) { - var a = new Date("2013-03-01T01:10:00"); - var b = new Date("2013-03-01T01:10:00"); - var c = new Date("2013-03-01T01:10:01"); + let a = new Date("2013-03-01T01:10:00"); + let b = new Date("2013-03-01T01:10:00"); + let c = new Date("2013-03-01T01:10:01"); return { TAG: "Ok", _0: Caml_obj.equal(a, b) && Caml_obj.notequal(b, c) && Caml_obj.greaterthan(c, b) @@ -1095,14 +1095,14 @@ var suites_1 = { } }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; Mt.from_pair_suites("Js_date_test", suites); -var N; +let N; exports.N = N; exports.date = date; diff --git a/jscomp/test/js_dict_test.js b/jscomp/test/js_dict_test.js index a09304d2a0..6fd120e2c8 100644 --- a/jscomp/test/js_dict_test.js +++ b/jscomp/test/js_dict_test.js @@ -1,8 +1,8 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Js_dict = require("../../lib/js/js_dict.js"); +let Mt = require("./mt.js"); +let Js_dict = require("../../lib/js/js_dict.js"); function obj(param) { return { @@ -11,7 +11,7 @@ function obj(param) { }; } -var suites_0 = [ +let suites_0 = [ "empty", (function (param) { return { @@ -22,7 +22,7 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "get", (function (param) { @@ -68,7 +68,7 @@ var suites_1 = { hd: [ "set", (function (param) { - var o = { + let o = { foo: 43, bar: 86 }; @@ -253,7 +253,7 @@ var suites_1 = { } }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/js_exception_catch_test.js b/jscomp/test/js_exception_catch_test.js index e3c2d95b62..53a6c9da30 100644 --- a/jscomp/test/js_exception_catch_test.js +++ b/jscomp/test/js_exception_catch_test.js @@ -1,23 +1,23 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Curry = require("../../lib/js/curry.js"); -var Js_exn = require("../../lib/js/js_exn.js"); -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let Mt = require("./mt.js"); +let Curry = require("../../lib/js/curry.js"); +let Js_exn = require("../../lib/js/js_exn.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var counter = { +let counter = { contents: 0 }; function add_test(loc, test) { counter.contents = counter.contents + 1 | 0; - var id = loc + (" id " + String(counter.contents)); + let id = loc + (" id " + String(counter.contents)); suites.contents = { hd: [ id, @@ -55,16 +55,16 @@ function true_(loc) { })); } -var exit = 0; +let exit = 0; -var e; +let e; try { e = JSON.parse(" {\"x\"}"); exit = 1; } catch (raw_x){ - var x = Caml_js_exceptions.internalToOCamlException(raw_x); + let x = Caml_js_exceptions.internalToOCamlException(raw_x); if (x.RE_EXN_ID === Js_exn.$$Error) { add_test("File \"js_exception_catch_test.res\", line 18, characters 37-44", (function (param) { return { @@ -86,11 +86,11 @@ if (exit === 1) { })); } -var A = /* @__PURE__ */Caml_exceptions.create("Js_exception_catch_test.A"); +let A = /* @__PURE__ */Caml_exceptions.create("Js_exception_catch_test.A"); -var B = /* @__PURE__ */Caml_exceptions.create("Js_exception_catch_test.B"); +let B = /* @__PURE__ */Caml_exceptions.create("Js_exception_catch_test.B"); -var C = /* @__PURE__ */Caml_exceptions.create("Js_exception_catch_test.C"); +let C = /* @__PURE__ */Caml_exceptions.create("Js_exception_catch_test.C"); function test(f) { try { @@ -98,7 +98,7 @@ function test(f) { return "No_error"; } catch (raw_e){ - var e = Caml_js_exceptions.internalToOCamlException(raw_e); + let e = Caml_js_exceptions.internalToOCamlException(raw_e); if (e.RE_EXN_ID === "Not_found") { return "Not_found"; } else if (e.RE_EXN_ID === "Invalid_argument") { diff --git a/jscomp/test/js_float_test.js b/jscomp/test/js_float_test.js index fcf55631bd..5c509bb326 100644 --- a/jscomp/test/js_float_test.js +++ b/jscomp/test/js_float_test.js @@ -1,10 +1,10 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Pervasives = require("../../lib/js/pervasives.js"); +let Mt = require("./mt.js"); +let Pervasives = require("../../lib/js/pervasives.js"); -var suites_0 = [ +let suites_0 = [ "_NaN <> _NaN", (function (param) { return { @@ -15,7 +15,7 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "isNaN - _NaN", (function (param) { @@ -530,7 +530,7 @@ var suites_1 = { } }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/js_global_test.js b/jscomp/test/js_global_test.js index ee7af8589b..8b8a343d04 100644 --- a/jscomp/test/js_global_test.js +++ b/jscomp/test/js_global_test.js @@ -1,12 +1,12 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites_0 = [ +let suites_0 = [ "setTimeout/clearTimeout sanity check", (function (param) { - var handle = setTimeout((function (param) { + let handle = setTimeout((function (param) { }), 0); clearTimeout(handle); @@ -17,11 +17,11 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "setInerval/clearInterval sanity check", (function (param) { - var handle = setInterval((function (param) { + let handle = setInterval((function (param) { }), 0); clearInterval(handle); @@ -82,7 +82,7 @@ var suites_1 = { } }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/js_int_test.js b/jscomp/test/js_int_test.js index 50e533737e..7cb8f148af 100644 --- a/jscomp/test/js_int_test.js +++ b/jscomp/test/js_int_test.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites_0 = [ +let suites_0 = [ "toExponential", (function (param) { return { @@ -14,7 +14,7 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "toExponentialWithPrecision - digits:2", (function (param) { @@ -239,7 +239,7 @@ var suites_1 = { } }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/js_json_test.js b/jscomp/test/js_json_test.js index 6b4a0e1fa8..3603dd8dcd 100644 --- a/jscomp/test/js_json_test.js +++ b/jscomp/test/js_json_test.js @@ -1,26 +1,26 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var $$Array = require("../../lib/js/array.js"); -var Js_dict = require("../../lib/js/js_dict.js"); -var Js_json = require("../../lib/js/js_json.js"); -var Belt_List = require("../../lib/js/belt_List.js"); -var Belt_Array = require("../../lib/js/belt_Array.js"); -var Caml_array = require("../../lib/js/caml_array.js"); -var Caml_option = require("../../lib/js/caml_option.js"); - -var suites = { +let Mt = require("./mt.js"); +let $$Array = require("../../lib/js/array.js"); +let Js_dict = require("../../lib/js/js_dict.js"); +let Js_json = require("../../lib/js/js_json.js"); +let Belt_List = require("../../lib/js/belt_List.js"); +let Belt_Array = require("../../lib/js/belt_Array.js"); +let Caml_array = require("../../lib/js/caml_array.js"); +let Caml_option = require("../../lib/js/caml_option.js"); + +let suites = { contents: /* [] */0 }; -var counter = { +let counter = { contents: 0 }; function add_test(loc, test) { counter.contents = counter.contents + 1 | 0; - var id = loc + (" id " + String(counter.contents)); + let id = loc + (" id " + String(counter.contents)); suites.contents = { hd: [ id, @@ -58,10 +58,10 @@ function true_(loc) { })); } -var v = JSON.parse(" { \"x\" : [1, 2, 3 ] } "); +let v = JSON.parse(" { \"x\" : [1, 2, 3 ] } "); add_test("File \"js_json_test.res\", line 22, characters 11-18", (function (param) { - var ty = Js_json.classify(v); + let ty = Js_json.classify(v); if (typeof ty !== "object") { return { TAG: "Ok", @@ -74,14 +74,14 @@ add_test("File \"js_json_test.res\", line 22, characters 11-18", (function (para _0: false }; } - var v$1 = Js_dict.get(ty._0, "x"); + let v$1 = Js_dict.get(ty._0, "x"); if (v$1 === undefined) { return { TAG: "Ok", _0: false }; } - var ty2 = Js_json.classify(v$1); + let ty2 = Js_json.classify(v$1); if (typeof ty2 !== "object") { return { TAG: "Ok", @@ -95,7 +95,7 @@ add_test("File \"js_json_test.res\", line 22, characters 11-18", (function (para }; } ty2._0.forEach(function (x) { - var ty3 = Js_json.classify(x); + let ty3 = Js_json.classify(x); if (typeof ty3 !== "object") { throw { RE_EXN_ID: "Assert_failure", @@ -128,9 +128,9 @@ add_test("File \"js_json_test.res\", line 22, characters 11-18", (function (para eq("File \"js_json_test.res\", line 48, characters 5-12", Js_json.test(v, "Object"), true); -var json = JSON.parse(JSON.stringify(null)); +let json = JSON.parse(JSON.stringify(null)); -var ty = Js_json.classify(json); +let ty = Js_json.classify(json); if (typeof ty !== "object") { if (ty === "JSONNull") { @@ -159,9 +159,9 @@ if (typeof ty !== "object") { })); } -var json$1 = JSON.parse(JSON.stringify("test string")); +let json$1 = JSON.parse(JSON.stringify("test string")); -var ty$1 = Js_json.classify(json$1); +let ty$1 = Js_json.classify(json$1); if (typeof ty$1 !== "object") { add_test("File \"js_json_test.res\", line 68, characters 16-23", (function (param) { @@ -181,11 +181,11 @@ if (typeof ty$1 !== "object") { })); } -var json$2 = JSON.parse(JSON.stringify(1.23456789)); +let json$2 = JSON.parse(JSON.stringify(1.23456789)); -var ty$2 = Js_json.classify(json$2); +let ty$2 = Js_json.classify(json$2); -var exit = 0; +let exit = 0; if (typeof ty$2 !== "object" || ty$2.TAG !== "JSONNumber") { exit = 1; @@ -202,11 +202,11 @@ if (exit === 1) { })); } -var json$3 = JSON.parse(JSON.stringify(-1347440721)); +let json$3 = JSON.parse(JSON.stringify(-1347440721)); -var ty$3 = Js_json.classify(json$3); +let ty$3 = Js_json.classify(json$3); -var exit$1 = 0; +let exit$1 = 0; if (typeof ty$3 !== "object" || ty$3.TAG !== "JSONNumber") { exit$1 = 1; @@ -224,8 +224,8 @@ if (exit$1 === 1) { } function test(v) { - var json = JSON.parse(JSON.stringify(v)); - var ty = Js_json.classify(json); + let json = JSON.parse(JSON.stringify(v)); + let ty = Js_json.classify(json); if (typeof ty === "object") { return add_test("File \"js_json_test.res\", line 100, characters 18-25", (function (param) { return { @@ -268,15 +268,15 @@ function option_get(x) { }; } -var dict = {}; +let dict = {}; dict["a"] = "test string"; dict["b"] = 123.0; -var json$4 = JSON.parse(JSON.stringify(dict)); +let json$4 = JSON.parse(JSON.stringify(dict)); -var ty$4 = Js_json.classify(json$4); +let ty$4 = Js_json.classify(json$4); if (typeof ty$4 !== "object") { add_test("File \"js_json_test.res\", line 142, characters 16-23", (function (param) { @@ -286,8 +286,8 @@ if (typeof ty$4 !== "object") { }; })); } else if (ty$4.TAG === "JSONObject") { - var x = ty$4._0; - var ta = Js_json.classify(option_get(Js_dict.get(x, "a"))); + let x = ty$4._0; + let ta = Js_json.classify(option_get(Js_dict.get(x, "a"))); if (typeof ta !== "object") { add_test("File \"js_json_test.res\", line 140, characters 18-25", (function (param) { return { @@ -304,7 +304,7 @@ if (typeof ty$4 !== "object") { }; })); } else { - var ty$5 = Js_json.classify(option_get(Js_dict.get(x, "b"))); + let ty$5 = Js_json.classify(option_get(Js_dict.get(x, "b"))); if (typeof ty$5 !== "object") { add_test("File \"js_json_test.res\", line 137, characters 22-29", (function (param) { return { @@ -313,7 +313,7 @@ if (typeof ty$4 !== "object") { }; })); } else if (ty$5.TAG === "JSONNumber") { - var b = ty$5._0; + let b = ty$5._0; add_test("File \"js_json_test.res\", line 136, characters 38-45", (function (param) { return { TAG: "Approx", @@ -348,7 +348,7 @@ if (typeof ty$4 !== "object") { } function eq_at_i(loc, json, i, kind, expected) { - var ty = Js_json.classify(json); + let ty = Js_json.classify(json); if (typeof ty !== "object") { return add_test(loc, (function (param) { return { @@ -365,7 +365,7 @@ function eq_at_i(loc, json, i, kind, expected) { }; })); } - var ty$1 = Js_json.classify(Caml_array.get(ty._0, i)); + let ty$1 = Js_json.classify(Caml_array.get(ty._0, i)); switch (kind) { case "String" : if (typeof ty$1 !== "object") { @@ -490,7 +490,7 @@ function eq_at_i(loc, json, i, kind, expected) { } } -var json$5 = JSON.parse(JSON.stringify($$Array.map((function (prim) { +let json$5 = JSON.parse(JSON.stringify($$Array.map((function (prim) { return prim; }), [ "string 0", @@ -504,7 +504,7 @@ eq_at_i("File \"js_json_test.res\", line 200, characters 10-17", json$5, 1, "Str eq_at_i("File \"js_json_test.res\", line 201, characters 10-17", json$5, 2, "String", "string 2"); -var json$6 = JSON.parse(JSON.stringify([ +let json$6 = JSON.parse(JSON.stringify([ "string 0", "string 1", "string 2" @@ -516,13 +516,13 @@ eq_at_i("File \"js_json_test.res\", line 209, characters 10-17", json$6, 1, "Str eq_at_i("File \"js_json_test.res\", line 210, characters 10-17", json$6, 2, "String", "string 2"); -var a = [ +let a = [ 1.0000001, 10000000000.1, 123.0 ]; -var json$7 = JSON.parse(JSON.stringify(a)); +let json$7 = JSON.parse(JSON.stringify(a)); eq_at_i("File \"js_json_test.res\", line 219, characters 10-17", json$7, 0, "Number", Caml_array.get(a, 0)); @@ -530,13 +530,13 @@ eq_at_i("File \"js_json_test.res\", line 220, characters 10-17", json$7, 1, "Num eq_at_i("File \"js_json_test.res\", line 221, characters 10-17", json$7, 2, "Number", Caml_array.get(a, 2)); -var a$1 = [ +let a$1 = [ 0, -1347440721, -268391749 ]; -var json$8 = JSON.parse(JSON.stringify($$Array.map((function (prim) { +let json$8 = JSON.parse(JSON.stringify($$Array.map((function (prim) { return prim; }), a$1))); @@ -546,13 +546,13 @@ eq_at_i("File \"js_json_test.res\", line 231, characters 10-17", json$8, 1, "Num eq_at_i("File \"js_json_test.res\", line 232, characters 10-17", json$8, 2, "Number", Caml_array.get(a$1, 2)); -var a$2 = [ +let a$2 = [ true, false, true ]; -var json$9 = JSON.parse(JSON.stringify(a$2)); +let json$9 = JSON.parse(JSON.stringify(a$2)); eq_at_i("File \"js_json_test.res\", line 241, characters 10-17", json$9, 0, "Boolean", Caml_array.get(a$2, 0)); @@ -561,20 +561,20 @@ eq_at_i("File \"js_json_test.res\", line 242, characters 10-17", json$9, 1, "Boo eq_at_i("File \"js_json_test.res\", line 243, characters 10-17", json$9, 2, "Boolean", Caml_array.get(a$2, 2)); function make_d(s, i) { - var d = {}; + let d = {}; d["a"] = s; d["b"] = i; return d; } -var a$3 = [ +let a$3 = [ make_d("aaa", 123), make_d("bbb", 456) ]; -var json$10 = JSON.parse(JSON.stringify(a$3)); +let json$10 = JSON.parse(JSON.stringify(a$3)); -var ty$6 = Js_json.classify(json$10); +let ty$6 = Js_json.classify(json$10); if (typeof ty$6 !== "object") { add_test("File \"js_json_test.res\", line 271, characters 16-23", (function (param) { @@ -584,7 +584,7 @@ if (typeof ty$6 !== "object") { }; })); } else if (ty$6.TAG === "JSONArray") { - var ty$7 = Js_json.classify(Caml_array.get(ty$6._0, 1)); + let ty$7 = Js_json.classify(Caml_array.get(ty$6._0, 1)); if (typeof ty$7 !== "object") { add_test("File \"js_json_test.res\", line 269, characters 18-25", (function (param) { return { @@ -593,7 +593,7 @@ if (typeof ty$6 !== "object") { }; })); } else if (ty$7.TAG === "JSONObject") { - var ty$8 = Js_json.classify(option_get(Js_dict.get(ty$7._0, "a"))); + let ty$8 = Js_json.classify(option_get(Js_dict.get(ty$7._0, "a"))); if (typeof ty$8 !== "object") { add_test("File \"js_json_test.res\", line 267, characters 20-27", (function (param) { return { @@ -773,7 +773,7 @@ idtest(Belt_Array.makeBy(500, (function (i) { Mt.from_pair_suites("Js_json_test", suites.contents); -var J; +let J; exports.suites = suites; exports.J = J; diff --git a/jscomp/test/js_list_test.js b/jscomp/test/js_list_test.js index acfb0db176..fa56dc2efb 100644 --- a/jscomp/test/js_list_test.js +++ b/jscomp/test/js_list_test.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Js_list = require("../../lib/js/js_list.js"); -var Js_vector = require("../../lib/js/js_vector.js"); +let Mt = require("./mt.js"); +let Js_list = require("../../lib/js/js_list.js"); +let Js_vector = require("../../lib/js/js_vector.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -177,13 +177,13 @@ function f(i) { return i; } -var v = Js_vector.toList(Js_vector.init(100000, f)); +let v = Js_vector.toList(Js_vector.init(100000, f)); eq("File \"js_list_test.res\", line 31, characters 5-12", Js_list.countBy((function (x) { return x % 2 === 0; }), v), 50000); -var vv = Js_list.foldRight((function (x, y) { +let vv = Js_list.foldRight((function (x, y) { return { hd: x, tl: y @@ -194,7 +194,7 @@ eq("File \"js_list_test.res\", line 33, characters 5-12", true, Js_list.equal((f return x === y; }), v, vv)); -var vvv = Js_list.filter((function (x) { +let vvv = Js_list.filter((function (x) { return x % 10 === 0; }), vv); diff --git a/jscomp/test/js_math_test.js b/jscomp/test/js_math_test.js index b7ca5e9810..1d1ab94d30 100644 --- a/jscomp/test/js_math_test.js +++ b/jscomp/test/js_math_test.js @@ -1,10 +1,10 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Js_math = require("../../lib/js/js_math.js"); +let Mt = require("./mt.js"); +let Js_math = require("../../lib/js/js_math.js"); -var suites_0 = [ +let suites_0 = [ "_E", (function (param) { return { @@ -16,7 +16,7 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "_LN2", (function (param) { @@ -517,7 +517,7 @@ var suites_1 = { hd: [ "random", (function (param) { - var a = Math.random(); + let a = Math.random(); return { TAG: "Ok", _0: a >= 0 && a < 1 @@ -528,7 +528,7 @@ var suites_1 = { hd: [ "random_int", (function (param) { - var a = Js_math.random_int(1, 3); + let a = Js_math.random_int(1, 3); return { TAG: "Ok", _0: a >= 1 && a < 3 @@ -731,7 +731,7 @@ var suites_1 = { } }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/js_null_test.js b/jscomp/test/js_null_test.js index 1d035ad660..1e3b56e403 100644 --- a/jscomp/test/js_null_test.js +++ b/jscomp/test/js_null_test.js @@ -1,11 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Js_null = require("../../lib/js/js_null.js"); -var Caml_option = require("../../lib/js/caml_option.js"); +let Mt = require("./mt.js"); +let Js_null = require("../../lib/js/js_null.js"); +let Caml_option = require("../../lib/js/caml_option.js"); -var suites_0 = [ +let suites_0 = [ "toOption - empty", (function (param) { return { @@ -16,7 +16,7 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "toOption - 'a", (function (param) { @@ -90,7 +90,7 @@ var suites_1 = { hd: [ "iter - empty", (function (param) { - var hit = { + let hit = { contents: false }; Js_null.iter(null, (function (param) { @@ -107,7 +107,7 @@ var suites_1 = { hd: [ "iter - 'a", (function (param) { - var hit = { + let hit = { contents: 0 }; Js_null.iter(2, (function (v) { @@ -154,7 +154,7 @@ var suites_1 = { } }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/js_null_undefined_test.js b/jscomp/test/js_null_undefined_test.js index 4ffbf1acb1..74c496f7d8 100644 --- a/jscomp/test/js_null_undefined_test.js +++ b/jscomp/test/js_null_undefined_test.js @@ -1,11 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_option = require("../../lib/js/caml_option.js"); -var Js_null_undefined = require("../../lib/js/js_null_undefined.js"); +let Mt = require("./mt.js"); +let Caml_option = require("../../lib/js/caml_option.js"); +let Js_null_undefined = require("../../lib/js/js_null_undefined.js"); -var suites_0 = [ +let suites_0 = [ "toOption - null", (function (param) { return { @@ -16,7 +16,7 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "toOption - undefined", (function (param) { @@ -160,7 +160,7 @@ var suites_1 = { hd: [ "iter - null", (function (param) { - var hit = { + let hit = { contents: false }; Js_null_undefined.iter(null, (function (param) { @@ -177,7 +177,7 @@ var suites_1 = { hd: [ "iter - undefined", (function (param) { - var hit = { + let hit = { contents: false }; Js_null_undefined.iter(undefined, (function (param) { @@ -194,7 +194,7 @@ var suites_1 = { hd: [ "iter - empty", (function (param) { - var hit = { + let hit = { contents: false }; Js_null_undefined.iter(undefined, (function (param) { @@ -211,7 +211,7 @@ var suites_1 = { hd: [ "iter - 'a", (function (param) { - var hit = { + let hit = { contents: 0 }; Js_null_undefined.iter(2, (function (v) { @@ -310,7 +310,7 @@ var suites_1 = { } }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/js_nullable_test.js b/jscomp/test/js_nullable_test.js index bae3a4ede4..a8534460eb 100644 --- a/jscomp/test/js_nullable_test.js +++ b/jscomp/test/js_nullable_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -29,7 +29,7 @@ function eq(loc, x, y) { } function test(dom) { - var elem = dom.getElementById("haha"); + let elem = dom.getElementById("haha"); if (elem == null) { return 1; } else { diff --git a/jscomp/test/js_obj_test.js b/jscomp/test/js_obj_test.js index eb5bc3c44d..8b535ae7a5 100644 --- a/jscomp/test/js_obj_test.js +++ b/jscomp/test/js_obj_test.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites_0 = [ +let suites_0 = [ "empty", (function (param) { return { @@ -14,7 +14,7 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "assign", (function (param) { @@ -32,7 +32,7 @@ var suites_1 = { tl: /* [] */0 }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/js_option_test.js b/jscomp/test/js_option_test.js index bd9519ae5c..1159c4c2fd 100644 --- a/jscomp/test/js_option_test.js +++ b/jscomp/test/js_option_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Js_option = require("../../lib/js/js_option.js"); +let Mt = require("./mt.js"); +let Js_option = require("../../lib/js/js_option.js"); function simpleEq(a, b) { return a === b; } -var option_suites_0 = [ +let option_suites_0 = [ "option_isSome_Some", (function (param) { return { @@ -19,7 +19,7 @@ var option_suites_0 = [ }) ]; -var option_suites_1 = { +let option_suites_1 = { hd: [ "option_isSome_None", (function (param) { @@ -299,7 +299,7 @@ var option_suites_1 = { } }; -var option_suites = { +let option_suites = { hd: option_suites_0, tl: option_suites_1 }; diff --git a/jscomp/test/js_re_test.js b/jscomp/test/js_re_test.js index 42e43e99c6..e2c90977b5 100644 --- a/jscomp/test/js_re_test.js +++ b/jscomp/test/js_re_test.js @@ -1,23 +1,23 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_array = require("../../lib/js/caml_array.js"); -var Caml_option = require("../../lib/js/caml_option.js"); +let Mt = require("./mt.js"); +let Caml_array = require("../../lib/js/caml_array.js"); +let Caml_option = require("../../lib/js/caml_option.js"); -var suites_0 = [ +let suites_0 = [ "captures", (function (param) { - var re = /(\d+)-(?:(\d+))?/g; - var result = re.exec("3-"); + let re = /(\d+)-(?:(\d+))?/g; + let result = re.exec("3-"); if (result === null) { return { TAG: "Fail", _0: undefined }; } - var defined = Caml_array.get(result, 1); - var $$undefined = Caml_array.get(result, 2); + let defined = Caml_array.get(result, 1); + let $$undefined = Caml_array.get(result, 2); return { TAG: "Eq", _0: [ @@ -32,12 +32,12 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "fromString", (function (param) { - var contentOf = function (tag, xmlString) { - var x = new RegExp("<" + (tag + (">(.*?)<\\/" + (tag + ">")))).exec(xmlString); + let contentOf = function (tag, xmlString) { + let x = new RegExp("<" + (tag + (">(.*?)<\\/" + (tag + ">")))).exec(xmlString); if (x !== null) { return Caml_option.nullable_to_opt(Caml_array.get(x, 1)); } @@ -54,7 +54,7 @@ var suites_1 = { hd: [ "exec_literal", (function (param) { - var res = /[^.]+/.exec("http://xxx.domain.com"); + let res = /[^.]+/.exec("http://xxx.domain.com"); if (res !== null) { return { TAG: "Eq", @@ -73,7 +73,7 @@ var suites_1 = { hd: [ "exec_no_match", (function (param) { - var match = /https:\/\/(.*)/.exec("http://xxx.domain.com"); + let match = /https:\/\/(.*)/.exec("http://xxx.domain.com"); if (match !== null) { return { TAG: "FailWith", @@ -91,7 +91,7 @@ var suites_1 = { hd: [ "test_str", (function (param) { - var res = new RegExp("foo").test("#foo#"); + let res = new RegExp("foo").test("#foo#"); return { TAG: "Eq", _0: true, @@ -103,7 +103,7 @@ var suites_1 = { hd: [ "fromStringWithFlags", (function (param) { - var res = new RegExp("foo", "g"); + let res = new RegExp("foo", "g"); return { TAG: "Eq", _0: true, @@ -115,7 +115,7 @@ var suites_1 = { hd: [ "result_index", (function (param) { - var res = new RegExp("zbar").exec("foobarbazbar"); + let res = new RegExp("zbar").exec("foobarbazbar"); if (res !== null) { return { TAG: "Eq", @@ -134,8 +134,8 @@ var suites_1 = { hd: [ "result_input", (function (param) { - var input = "foobar"; - var res = /foo/g.exec(input); + let input = "foobar"; + let res = /foo/g.exec(input); if (res !== null) { return { TAG: "Eq", @@ -187,7 +187,7 @@ var suites_1 = { hd: [ "t_lastIndex", (function (param) { - var re = /na/g; + let re = /na/g; re.exec("banana"); return { TAG: "Eq", @@ -200,10 +200,10 @@ var suites_1 = { hd: [ "t_setLastIndex", (function (param) { - var re = /na/g; - var before = re.lastIndex; + let re = /na/g; + let before = re.lastIndex; re.lastIndex = 42; - var after = re.lastIndex; + let after = re.lastIndex; return { TAG: "Eq", _0: [ @@ -279,7 +279,7 @@ var suites_1 = { } }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/js_string_test.js b/jscomp/test/js_string_test.js index 64a8eff69b..5531abd586 100644 --- a/jscomp/test/js_string_test.js +++ b/jscomp/test/js_string_test.js @@ -1,11 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Belt_Option = require("../../lib/js/belt_Option.js"); -var Caml_option = require("../../lib/js/caml_option.js"); +let Mt = require("./mt.js"); +let Belt_Option = require("../../lib/js/belt_Option.js"); +let Caml_option = require("../../lib/js/caml_option.js"); -var suites_0 = [ +let suites_0 = [ "make", (function (param) { return { @@ -16,7 +16,7 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "fromCharCode", (function (param) { @@ -347,7 +347,7 @@ var suites_1 = { hd: [ "unsafeReplaceBy0", (function (param) { - var replace = function (whole, offset, s) { + let replace = function (whole, offset, s) { if (whole === "bar") { return "BORK"; } else { @@ -365,7 +365,7 @@ var suites_1 = { hd: [ "unsafeReplaceBy1", (function (param) { - var replace = function (whole, p1, offset, s) { + let replace = function (whole, p1, offset, s) { if (whole === "bar") { return "BORK"; } else { @@ -383,7 +383,7 @@ var suites_1 = { hd: [ "unsafeReplaceBy2", (function (param) { - var replace = function (whole, p1, p2, offset, s) { + let replace = function (whole, p1, p2, offset, s) { if (whole === "bar") { return "BORK"; } else { @@ -401,7 +401,7 @@ var suites_1 = { hd: [ "unsafeReplaceBy3", (function (param) { - var replace = function (whole, p1, p2, p3, offset, s) { + let replace = function (whole, p1, p2, p3, offset, s) { if (whole === "bar") { return "BORK"; } else { @@ -720,7 +720,7 @@ var suites_1 = { } }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/js_typed_array_test.js b/jscomp/test/js_typed_array_test.js index ccbbab2686..1eba182c0a 100644 --- a/jscomp/test/js_typed_array_test.js +++ b/jscomp/test/js_typed_array_test.js @@ -1,10 +1,10 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var $$Array = require("../../lib/js/array.js"); -var Curry = require("../../lib/js/curry.js"); -var Js_typed_array = require("../../lib/js/js_typed_array.js"); +let Mt = require("./mt.js"); +let $$Array = require("../../lib/js/array.js"); +let Curry = require("../../lib/js/curry.js"); +let Js_typed_array = require("../../lib/js/js_typed_array.js"); function mkI8(a) { return new Int8Array(a); @@ -20,13 +20,13 @@ function viaInt8(f, arr) { }; } -var x = new Int8Array([ +let x = new Int8Array([ 1, 2, 3 ]); -var suites_0 = [ +let suites_0 = [ "array_buffer - make", (function (param) { return { @@ -37,7 +37,7 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "array_buffer - byteLength", (function (param) { @@ -91,7 +91,7 @@ var suites_1 = { hd: [ "typed_array - unsafe_set", (function (param) { - var a = new Int8Array([ + let a = new Int8Array([ 1, 2, 3, @@ -165,7 +165,7 @@ var suites_1 = { hd: [ "typed_array - setArray", (function (param) { - var f = function (a) { + let f = function (a) { Js_typed_array.$$Int8Array.setArray([ 9, 8, @@ -196,7 +196,7 @@ var suites_1 = { hd: [ "typed_array - setArrayOffset", (function (param) { - var f = function (a) { + let f = function (a) { Js_typed_array.$$Int8Array.setArrayOffset([ 9, 8, @@ -819,7 +819,7 @@ var suites_1 = { hd: [ "typed_array - forEach", (function (param) { - var sum = { + let sum = { contents: 0 }; Js_typed_array.$$Int8Array.forEach((function (n) { @@ -840,7 +840,7 @@ var suites_1 = { hd: [ "typed_array - forEachi", (function (param) { - var sum = { + let sum = { contents: 0 }; Js_typed_array.$$Int8Array.forEachi((function (param, i) { @@ -1052,7 +1052,7 @@ var suites_1 = { hd: [ "int8_array - fromBufferOffset", (function (param) { - var buffer = new ArrayBuffer(32); + let buffer = new ArrayBuffer(32); return { TAG: "Eq", _0: 24, @@ -1064,7 +1064,7 @@ var suites_1 = { hd: [ "int8_array - fromBufferRange", (function (param) { - var buffer = new ArrayBuffer(32); + let buffer = new ArrayBuffer(32); return { TAG: "Eq", _0: 2, @@ -1087,7 +1087,7 @@ var suites_1 = { hd: [ "int8_array - unsafe_set - typed_array sanity check", (function (param) { - var a = new Int8Array([ + let a = new Int8Array([ 1, 2, 3, @@ -1143,7 +1143,7 @@ var suites_1 = { hd: [ "uint8_array - fromBufferOffset", (function (param) { - var buffer = new ArrayBuffer(32); + let buffer = new ArrayBuffer(32); return { TAG: "Eq", _0: 24, @@ -1155,7 +1155,7 @@ var suites_1 = { hd: [ "uint8_array - fromBufferRange", (function (param) { - var buffer = new ArrayBuffer(32); + let buffer = new ArrayBuffer(32); return { TAG: "Eq", _0: 2, @@ -1178,7 +1178,7 @@ var suites_1 = { hd: [ "uint8_array - unsafe_set - typed_array sanity check", (function (param) { - var a = new Uint8Array([ + let a = new Uint8Array([ 1, 2, 3, @@ -1234,7 +1234,7 @@ var suites_1 = { hd: [ "uint8clamped_array - fromBufferOffset", (function (param) { - var buffer = new ArrayBuffer(32); + let buffer = new ArrayBuffer(32); return { TAG: "Eq", _0: 24, @@ -1246,7 +1246,7 @@ var suites_1 = { hd: [ "uint8clamped_array - fromBufferRange", (function (param) { - var buffer = new ArrayBuffer(32); + let buffer = new ArrayBuffer(32); return { TAG: "Eq", _0: 2, @@ -1269,7 +1269,7 @@ var suites_1 = { hd: [ "uint8clamped_array - unsafe_set - typed_array sanity check", (function (param) { - var a = new Uint8ClampedArray([ + let a = new Uint8ClampedArray([ 1, 2, 3, @@ -1325,7 +1325,7 @@ var suites_1 = { hd: [ "int16_array - fromBufferOffset", (function (param) { - var buffer = new ArrayBuffer(32); + let buffer = new ArrayBuffer(32); return { TAG: "Eq", _0: 24, @@ -1337,7 +1337,7 @@ var suites_1 = { hd: [ "int16_array - fromBufferRange", (function (param) { - var buffer = new ArrayBuffer(32); + let buffer = new ArrayBuffer(32); return { TAG: "Eq", _0: 4, @@ -1360,7 +1360,7 @@ var suites_1 = { hd: [ "int16_array - unsafe_set - typed_array sanity check", (function (param) { - var a = new Int16Array([ + let a = new Int16Array([ 1, 2, 3, @@ -1416,7 +1416,7 @@ var suites_1 = { hd: [ "uint16_array - fromBufferOffset", (function (param) { - var buffer = new ArrayBuffer(32); + let buffer = new ArrayBuffer(32); return { TAG: "Eq", _0: 24, @@ -1428,7 +1428,7 @@ var suites_1 = { hd: [ "uint16_array - fromBufferRange", (function (param) { - var buffer = new ArrayBuffer(32); + let buffer = new ArrayBuffer(32); return { TAG: "Eq", _0: 4, @@ -1451,7 +1451,7 @@ var suites_1 = { hd: [ "uint16_array - unsafe_set - typed_array sanity check", (function (param) { - var a = new Uint16Array([ + let a = new Uint16Array([ 1, 2, 3, @@ -1509,7 +1509,7 @@ var suites_1 = { hd: [ "int32_array - fromBufferOffset", (function (param) { - var buffer = new ArrayBuffer(32); + let buffer = new ArrayBuffer(32); return { TAG: "Eq", _0: 24, @@ -1521,7 +1521,7 @@ var suites_1 = { hd: [ "int32_array - fromBufferRange", (function (param) { - var buffer = new ArrayBuffer(32); + let buffer = new ArrayBuffer(32); return { TAG: "Eq", _0: 8, @@ -1544,7 +1544,7 @@ var suites_1 = { hd: [ "int32_array - unsafe_set - typed_array sanity check", (function (param) { - var a = new Int32Array($$Array.map((function (prim) { + let a = new Int32Array($$Array.map((function (prim) { return prim; }), [ 1, @@ -1602,7 +1602,7 @@ var suites_1 = { hd: [ "uint32_array - fromBufferOffset", (function (param) { - var buffer = new ArrayBuffer(32); + let buffer = new ArrayBuffer(32); return { TAG: "Eq", _0: 24, @@ -1614,7 +1614,7 @@ var suites_1 = { hd: [ "uint32_array - fromBufferRange", (function (param) { - var buffer = new ArrayBuffer(32); + let buffer = new ArrayBuffer(32); return { TAG: "Eq", _0: 8, @@ -1637,7 +1637,7 @@ var suites_1 = { hd: [ "uint32_array - unsafe_set - typed_array sanity check", (function (param) { - var a = new Uint32Array([ + let a = new Uint32Array([ 1, 2, 3, @@ -1693,7 +1693,7 @@ var suites_1 = { hd: [ "float32_array - fromBufferOffset", (function (param) { - var buffer = new ArrayBuffer(32); + let buffer = new ArrayBuffer(32); return { TAG: "Eq", _0: 24, @@ -1705,7 +1705,7 @@ var suites_1 = { hd: [ "float32_array - fromBufferRange", (function (param) { - var buffer = new ArrayBuffer(32); + let buffer = new ArrayBuffer(32); return { TAG: "Eq", _0: 8, @@ -1728,7 +1728,7 @@ var suites_1 = { hd: [ "float32_array - unsafe_set - typed_array sanity check", (function (param) { - var a = new Float32Array([ + let a = new Float32Array([ 1, 2, 3, @@ -1784,7 +1784,7 @@ var suites_1 = { hd: [ "float64_array - fromBufferOffset", (function (param) { - var buffer = new ArrayBuffer(32); + let buffer = new ArrayBuffer(32); return { TAG: "Eq", _0: 24, @@ -1796,7 +1796,7 @@ var suites_1 = { hd: [ "float64_array - fromBufferRange", (function (param) { - var buffer = new ArrayBuffer(32); + let buffer = new ArrayBuffer(32); return { TAG: "Eq", _0: 16, @@ -1819,7 +1819,7 @@ var suites_1 = { hd: [ "float64_array - unsafe_set - typed_array sanity check", (function (param) { - var a = new Float64Array([ + let a = new Float64Array([ 1, 2, 3, @@ -1860,7 +1860,7 @@ var suites_1 = { hd: [ "DataView - fromBufferOffset", (function (param) { - var buffer = new ArrayBuffer(32); + let buffer = new ArrayBuffer(32); return { TAG: "Eq", _0: 24, @@ -1872,7 +1872,7 @@ var suites_1 = { hd: [ "DataView - fromBufferRange", (function (param) { - var buffer = new ArrayBuffer(32); + let buffer = new ArrayBuffer(32); return { TAG: "Eq", _0: 4, @@ -1884,7 +1884,7 @@ var suites_1 = { hd: [ "DataView - buffer", (function (param) { - var buffer = new ArrayBuffer(32); + let buffer = new ArrayBuffer(32); return { TAG: "Eq", _0: buffer, @@ -1896,7 +1896,7 @@ var suites_1 = { hd: [ "DataView - byteOffset", (function (param) { - var buffer = new ArrayBuffer(32); + let buffer = new ArrayBuffer(32); return { TAG: "Eq", _0: 8, @@ -1908,8 +1908,8 @@ var suites_1 = { hd: [ "DataView - setInt8, getInt8", (function (param) { - var buffer = new ArrayBuffer(8); - var view = new DataView(buffer); + let buffer = new ArrayBuffer(8); + let view = new DataView(buffer); view.setInt8(0, 1); return { TAG: "Eq", @@ -1922,8 +1922,8 @@ var suites_1 = { hd: [ "DataView - setUint8, getUint8", (function (param) { - var buffer = new ArrayBuffer(8); - var view = new DataView(buffer); + let buffer = new ArrayBuffer(8); + let view = new DataView(buffer); view.setUint8(0, 128); return { TAG: "Eq", @@ -1936,8 +1936,8 @@ var suites_1 = { hd: [ "DataView - setInt16, getInt16", (function (param) { - var buffer = new ArrayBuffer(8); - var view = new DataView(buffer); + let buffer = new ArrayBuffer(8); + let view = new DataView(buffer); view.setInt16(0, 257); return { TAG: "Eq", @@ -1950,8 +1950,8 @@ var suites_1 = { hd: [ "DataView - getInt16LittleEndian", (function (param) { - var buffer = new ArrayBuffer(8); - var view = new DataView(buffer); + let buffer = new ArrayBuffer(8); + let view = new DataView(buffer); view.setInt16(0, 25000, 1); return { TAG: "Eq", @@ -1964,8 +1964,8 @@ var suites_1 = { hd: [ "DataView - setInt16LittleEndian", (function (param) { - var buffer = new ArrayBuffer(8); - var view = new DataView(buffer); + let buffer = new ArrayBuffer(8); + let view = new DataView(buffer); view.setInt16(0, 25000, 1); return { TAG: "Eq", @@ -1978,8 +1978,8 @@ var suites_1 = { hd: [ "DataView - setUint16, getUint16", (function (param) { - var buffer = new ArrayBuffer(8); - var view = new DataView(buffer); + let buffer = new ArrayBuffer(8); + let view = new DataView(buffer); view.setUint16(0, 32768); return { TAG: "Eq", @@ -1992,8 +1992,8 @@ var suites_1 = { hd: [ "DataView - getUint16LittleEndian", (function (param) { - var buffer = new ArrayBuffer(8); - var view = new DataView(buffer); + let buffer = new ArrayBuffer(8); + let view = new DataView(buffer); view.setUint16(0, 32768, 1); return { TAG: "Eq", @@ -2006,8 +2006,8 @@ var suites_1 = { hd: [ "DataView - setUint16LittleEndian", (function (param) { - var buffer = new ArrayBuffer(8); - var view = new DataView(buffer); + let buffer = new ArrayBuffer(8); + let view = new DataView(buffer); view.setUint16(0, 32768, 1); return { TAG: "Eq", @@ -2020,8 +2020,8 @@ var suites_1 = { hd: [ "DataView - setInt32, getInt32", (function (param) { - var buffer = new ArrayBuffer(8); - var view = new DataView(buffer); + let buffer = new ArrayBuffer(8); + let view = new DataView(buffer); view.setInt32(0, 65537); return { TAG: "Eq", @@ -2034,8 +2034,8 @@ var suites_1 = { hd: [ "DataView - getInt32LittleEndian", (function (param) { - var buffer = new ArrayBuffer(8); - var view = new DataView(buffer); + let buffer = new ArrayBuffer(8); + let view = new DataView(buffer); view.setInt32(0, 65537, 1); return { TAG: "Eq", @@ -2048,8 +2048,8 @@ var suites_1 = { hd: [ "DataView - setInt32LittleEndian", (function (param) { - var buffer = new ArrayBuffer(8); - var view = new DataView(buffer); + let buffer = new ArrayBuffer(8); + let view = new DataView(buffer); view.setInt32(0, 65537, 1); return { TAG: "Eq", @@ -2062,8 +2062,8 @@ var suites_1 = { hd: [ "DataView - setUint32, getUint32", (function (param) { - var buffer = new ArrayBuffer(8); - var view = new DataView(buffer); + let buffer = new ArrayBuffer(8); + let view = new DataView(buffer); view.setUint32(0, 65537); return { TAG: "Eq", @@ -2076,8 +2076,8 @@ var suites_1 = { hd: [ "DataView - getUint32LittleEndian", (function (param) { - var buffer = new ArrayBuffer(8); - var view = new DataView(buffer); + let buffer = new ArrayBuffer(8); + let view = new DataView(buffer); view.setUint32(0, 65537, 1); return { TAG: "Eq", @@ -2090,8 +2090,8 @@ var suites_1 = { hd: [ "DataView - setUint32LittleEndian", (function (param) { - var buffer = new ArrayBuffer(8); - var view = new DataView(buffer); + let buffer = new ArrayBuffer(8); + let view = new DataView(buffer); view.setUint32(0, 65537, 1); return { TAG: "Eq", @@ -2104,8 +2104,8 @@ var suites_1 = { hd: [ "DataView - setFloat32, getFloat32", (function (param) { - var buffer = new ArrayBuffer(8); - var view = new DataView(buffer); + let buffer = new ArrayBuffer(8); + let view = new DataView(buffer); view.setFloat32(0, 65537.0); return { TAG: "Eq", @@ -2118,8 +2118,8 @@ var suites_1 = { hd: [ "DataView - getFloat32LittleEndian", (function (param) { - var buffer = new ArrayBuffer(8); - var view = new DataView(buffer); + let buffer = new ArrayBuffer(8); + let view = new DataView(buffer); view.setFloat32(0, 65537.0, 1); return { TAG: "Eq", @@ -2132,8 +2132,8 @@ var suites_1 = { hd: [ "DataView - setFloat32LittleEndian", (function (param) { - var buffer = new ArrayBuffer(8); - var view = new DataView(buffer); + let buffer = new ArrayBuffer(8); + let view = new DataView(buffer); view.setFloat32(0, 1.0, 1); return { TAG: "Eq", @@ -2146,8 +2146,8 @@ var suites_1 = { hd: [ "DataView - setFloat64, getFloat64", (function (param) { - var buffer = new ArrayBuffer(8); - var view = new DataView(buffer); + let buffer = new ArrayBuffer(8); + let view = new DataView(buffer); view.setFloat64(0, 1e200); return { TAG: "Eq", @@ -2160,8 +2160,8 @@ var suites_1 = { hd: [ "DataView - getFloat64LittleEndian", (function (param) { - var buffer = new ArrayBuffer(8); - var view = new DataView(buffer); + let buffer = new ArrayBuffer(8); + let view = new DataView(buffer); view.setFloat64(0, 1e200, 1); return { TAG: "Eq", @@ -2174,8 +2174,8 @@ var suites_1 = { hd: [ "DataView - setFloat64LittleEndian", (function (param) { - var buffer = new ArrayBuffer(8); - var view = new DataView(buffer); + let buffer = new ArrayBuffer(8); + let view = new DataView(buffer); view.setFloat64(0, 1.0, 1); return { TAG: "Eq", @@ -2327,7 +2327,7 @@ var suites_1 = { } }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/js_undefined_test.js b/jscomp/test/js_undefined_test.js index eebbe8f6b4..317c5604b6 100644 --- a/jscomp/test/js_undefined_test.js +++ b/jscomp/test/js_undefined_test.js @@ -1,11 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_option = require("../../lib/js/caml_option.js"); -var Js_undefined = require("../../lib/js/js_undefined.js"); +let Mt = require("./mt.js"); +let Caml_option = require("../../lib/js/caml_option.js"); +let Js_undefined = require("../../lib/js/js_undefined.js"); -var suites_0 = [ +let suites_0 = [ "toOption - empty", (function (param) { return { @@ -16,7 +16,7 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "File \"js_undefined_test.res\", line 7, characters 5-12", (function (param) { @@ -90,7 +90,7 @@ var suites_1 = { hd: [ "iter - empty", (function (param) { - var hit = { + let hit = { contents: false }; Js_undefined.iter(undefined, (function (param) { @@ -107,7 +107,7 @@ var suites_1 = { hd: [ "iter - 'a", (function (param) { - var hit = { + let hit = { contents: 0 }; Js_undefined.iter(2, (function (v) { @@ -154,7 +154,7 @@ var suites_1 = { } }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/js_val.js b/jscomp/test/js_val.js index c614a20532..8f90618909 100644 --- a/jscomp/test/js_val.js +++ b/jscomp/test/js_val.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var X = require("x"); +let X = require("x"); -var h = u; +let h = u; -var hh = X.vv; +let hh = X.vv; -var hhh = X.vv; +let hhh = X.vv; -var hhhh = X.vvvv; +let hhhh = X.vvvv; exports.h = h; exports.hh = hh; diff --git a/jscomp/test/jsoo_400_test.js b/jscomp/test/jsoo_400_test.js index f71bc40306..9d9e93d5f3 100644 --- a/jscomp/test/jsoo_400_test.js +++ b/jscomp/test/jsoo_400_test.js @@ -1,11 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_int32 = require("../../lib/js/caml_int32.js"); +let Mt = require("./mt.js"); +let Caml_int32 = require("../../lib/js/caml_int32.js"); function u(param) { - var n; + let n; try { n = "123".length; } diff --git a/jscomp/test/jsxv4_newtype.js b/jscomp/test/jsxv4_newtype.js index 3889299378..89350fee88 100644 --- a/jscomp/test/jsxv4_newtype.js +++ b/jscomp/test/jsxv4_newtype.js @@ -6,7 +6,7 @@ function Jsxv4_newtype$V4A(props) { return null; } -var V4A = { +let V4A = { make: Jsxv4_newtype$V4A }; @@ -14,7 +14,7 @@ function Jsxv4_newtype$V4A1(props) { return null; } -var V4A1 = { +let V4A1 = { make: Jsxv4_newtype$V4A1 }; @@ -22,7 +22,7 @@ function Jsxv4_newtype$V4A2(props) { return null; } -var V4A2 = { +let V4A2 = { make: Jsxv4_newtype$V4A2 }; @@ -30,7 +30,7 @@ function Jsxv4_newtype$V4A3(props) { return props.foo; } -var V4A3 = { +let V4A3 = { make: Jsxv4_newtype$V4A3 }; diff --git a/jscomp/test/key_word_property.js b/jscomp/test/key_word_property.js index e9e6493228..23bb343a31 100644 --- a/jscomp/test/key_word_property.js +++ b/jscomp/test/key_word_property.js @@ -1,21 +1,21 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Vscode = require("vscode"); -var SomeEs6Module = require("some-es6-module"); -var SomeEs6Module$1 = require("some-es6-module").default; -var OmeEs6Module = require("./ome-es6-module").default; -var OmeEs6Module$1 = require("./ome-es6-module"); +let Vscode = require("vscode"); +let SomeEs6Module = require("some-es6-module"); +let SomeEs6Module$1 = require("some-es6-module").default; +let OmeEs6Module = require("./ome-es6-module").default; +let OmeEs6Module$1 = require("./ome-es6-module"); -var $$default = SomeEs6Module$1; +let $$default = SomeEs6Module$1; -var default2 = SomeEs6Module.default2; +let default2 = SomeEs6Module.default2; -var oefault = OmeEs6Module; +let oefault = OmeEs6Module; -var oefault2 = OmeEs6Module$1.default2; +let oefault2 = OmeEs6Module$1.default2; -var $$window = Vscode.window; +let $$window = Vscode.window; function mk($$window, $$default) { return { @@ -41,7 +41,7 @@ function des(v) { }; } -var test = { +let test = { case: 3, window: 3 }; @@ -50,7 +50,7 @@ function u(param) { return $$window.switch(); } -var $$case = 3; +let $$case = 3; exports.default = $$default; exports.__esModule = true; diff --git a/jscomp/test/key_word_property2.js b/jscomp/test/key_word_property2.js index b2b1596e61..a11df10346 100644 --- a/jscomp/test/key_word_property2.js +++ b/jscomp/test/key_word_property2.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Export_keyword = require("./export_keyword.js"); +let Export_keyword = require("./export_keyword.js"); function test2(v) { return { @@ -17,11 +17,11 @@ function test(p) { ]; } -var $$case = Export_keyword.$$case; +let $$case = Export_keyword.$$case; -var $$window = Export_keyword.$$window; +let $$window = Export_keyword.$$window; -var $$switch = Export_keyword.$$switch; +let $$switch = Export_keyword.$$switch; exports.test2 = test2; exports.test = test; diff --git a/jscomp/test/key_word_property_plus_test.js b/jscomp/test/key_word_property_plus_test.js index fe65523bd2..c40d94c062 100644 --- a/jscomp/test/key_word_property_plus_test.js +++ b/jscomp/test/key_word_property_plus_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Global_mangles = require("./global_mangles.js"); +let Mt = require("./mt.js"); +let Global_mangles = require("./global_mangles.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; diff --git a/jscomp/test/label_uncurry.js b/jscomp/test/label_uncurry.js index 36ca0167bf..fcfa996b3e 100644 --- a/jscomp/test/label_uncurry.js +++ b/jscomp/test/label_uncurry.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_format = require("../../lib/js/caml_format.js"); +let Caml_format = require("../../lib/js/caml_format.js"); function f(x) { return x; @@ -20,7 +20,7 @@ function h(x) { return 3; } -var a = u1(u); +let a = u1(u); exports.f = f; exports.u = u; diff --git a/jscomp/test/large_record_duplication_test.js b/jscomp/test/large_record_duplication_test.js index 2f23480cd8..bee19e3350 100644 --- a/jscomp/test/large_record_duplication_test.js +++ b/jscomp/test/large_record_duplication_test.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Mt = require("./mt.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -18,12 +18,12 @@ function eq(loc, x, y) { } function f0(x) { - var newrecord = Caml_obj.obj_dup(x); + let newrecord = Caml_obj.obj_dup(x); newrecord.x0 = 1; return newrecord; } -var Small = /* @__PURE__ */Caml_exceptions.create("Large_record_duplication_test.Small"); +let Small = /* @__PURE__ */Caml_exceptions.create("Large_record_duplication_test.Small"); function f_small(x) { if (x.RE_EXN_ID === Small) { @@ -39,7 +39,7 @@ function f_small(x) { } } -var h = { +let h = { RE_EXN_ID: Small, x: 1, y: "" @@ -57,7 +57,7 @@ eq("File \"large_record_duplication_test.res\", line 72, characters 3-10", Caml_ y: "" }), false); -var v1 = { +let v1 = { TAG: "A0", x0: 9, x1: 9, @@ -96,14 +96,14 @@ function f1(x) { if (typeof x !== "object") { return "A1"; } - var newrecord = Caml_obj.obj_dup(x); + let newrecord = Caml_obj.obj_dup(x); newrecord.x0 = 1; return newrecord; } eq("File \"large_record_duplication_test.res\", line 140, characters 3-10", get_x0(f1(v1)), 1); -var v2 = { +let v2 = { TAG: "A0", x0: 9, x1: 9, @@ -141,20 +141,20 @@ function f2(x) { if (x.TAG !== "A0") { return x; } - var newrecord = Caml_obj.obj_dup(x); + let newrecord = Caml_obj.obj_dup(x); newrecord.x0 = 1; return newrecord; } eq("File \"large_record_duplication_test.res\", line 208, characters 3-10", get_x0$1(f2(v2)), 1); -var A0 = /* @__PURE__ */Caml_exceptions.create("Large_record_duplication_test.A0"); +let A0 = /* @__PURE__ */Caml_exceptions.create("Large_record_duplication_test.A0"); function f3(x) { if (x.RE_EXN_ID !== A0) { return x; } - var newrecord = Caml_obj.obj_dup(x); + let newrecord = Caml_obj.obj_dup(x); newrecord.x0 = 1; return newrecord; } @@ -166,7 +166,7 @@ function get_x0$2(x) { } -var v3 = { +let v3 = { RE_EXN_ID: A0, x0: 9, x1: 9, @@ -203,7 +203,7 @@ eq("File \"large_record_duplication_test.res\", line 277, characters 3-10", get_ Mt.from_pair_suites("Large_record_duplication_test", suites.contents); -var v0 = { +let v0 = { x0: 9, x1: 9, x2: 9, diff --git a/jscomp/test/largest_int_flow.js b/jscomp/test/largest_int_flow.js index 16104d4181..983d4c7db5 100644 --- a/jscomp/test/largest_int_flow.js +++ b/jscomp/test/largest_int_flow.js @@ -2,7 +2,7 @@ 'use strict'; -var x = 272872590; +let x = 272872590; exports.x = x; /* No side effect */ diff --git a/jscomp/test/lazy_demo.js b/jscomp/test/lazy_demo.js index f8b7c08c49..1d4fa28466 100644 --- a/jscomp/test/lazy_demo.js +++ b/jscomp/test/lazy_demo.js @@ -1,22 +1,22 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var CamlinternalLazy = require("../../lib/js/camlinternalLazy.js"); +let CamlinternalLazy = require("../../lib/js/camlinternalLazy.js"); -var lazy1 = CamlinternalLazy.from_fun(function () { +let lazy1 = CamlinternalLazy.from_fun(function () { console.log("Hello, lazy"); return 1; }); -var lazy2 = CamlinternalLazy.from_fun(function () { +let lazy2 = CamlinternalLazy.from_fun(function () { return 3; }); console.log(lazy1, lazy2); -var la = CamlinternalLazy.force(lazy1); +let la = CamlinternalLazy.force(lazy1); -var lb = CamlinternalLazy.force(lazy2); +let lb = CamlinternalLazy.force(lazy2); console.log(la, lb); diff --git a/jscomp/test/lazy_test.js b/jscomp/test/lazy_test.js index d8482e6545..f1a95a5a14 100644 --- a/jscomp/test/lazy_test.js +++ b/jscomp/test/lazy_test.js @@ -1,68 +1,68 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Lazy = require("../../lib/js/lazy.js"); -var CamlinternalLazy = require("../../lib/js/camlinternalLazy.js"); +let Mt = require("./mt.js"); +let Lazy = require("../../lib/js/lazy.js"); +let CamlinternalLazy = require("../../lib/js/camlinternalLazy.js"); -var u = { +let u = { contents: 3 }; -var v = CamlinternalLazy.from_fun(function () { +let v = CamlinternalLazy.from_fun(function () { u.contents = 32; }); function lazy_test(param) { - var h = u.contents; + let h = u.contents; CamlinternalLazy.force(v); - var g = u.contents; + let g = u.contents; return [ h, g ]; } -var u_v = { +let u_v = { contents: 0 }; -var u$1 = CamlinternalLazy.from_fun(function () { +let u$1 = CamlinternalLazy.from_fun(function () { u_v.contents = 2; }); CamlinternalLazy.force(u$1); -var exotic = CamlinternalLazy.force; +let exotic = CamlinternalLazy.force; -var l_from_fun = CamlinternalLazy.from_fun(function () { +let l_from_fun = CamlinternalLazy.from_fun(function () { return 3; }); -var forward_test = CamlinternalLazy.from_fun(function () { - var u = 3; +let forward_test = CamlinternalLazy.from_fun(function () { + let u = 3; u = u + 1 | 0; return u; }); -var f005 = CamlinternalLazy.from_fun(function () { +let f005 = CamlinternalLazy.from_fun(function () { return 6; }); -var f006 = CamlinternalLazy.from_fun(function () { +let f006 = CamlinternalLazy.from_fun(function () { return function (param) { return 3; }; }); -var f007 = CamlinternalLazy.from_fun(function () { +let f007 = CamlinternalLazy.from_fun(function () { throw { RE_EXN_ID: "Not_found", Error: new Error() }; }); -var f008 = CamlinternalLazy.from_fun(function () { +let f008 = CamlinternalLazy.from_fun(function () { console.log("hi"); throw { RE_EXN_ID: "Not_found", @@ -70,19 +70,19 @@ var f008 = CamlinternalLazy.from_fun(function () { }; }); -var a2 = CamlinternalLazy.from_val; +let a2 = CamlinternalLazy.from_val; -var a3 = CamlinternalLazy.from_val(3); +let a3 = CamlinternalLazy.from_val(3); -var a4 = CamlinternalLazy.from_val(3); +let a4 = CamlinternalLazy.from_val(3); -var a5 = CamlinternalLazy.from_val(undefined); +let a5 = CamlinternalLazy.from_val(undefined); -var a6 = CamlinternalLazy.from_val(); +let a6 = CamlinternalLazy.from_val(); -var a7 = CamlinternalLazy.force(a5); +let a7 = CamlinternalLazy.force(a5); -var a8 = CamlinternalLazy.force(a6); +let a8 = CamlinternalLazy.force(a6); Mt.from_pair_suites("Lazy_test", { hd: [ diff --git a/jscomp/test/lib_js_test.js b/jscomp/test/lib_js_test.js index a89af4d7b7..b392b3d7c4 100644 --- a/jscomp/test/lib_js_test.js +++ b/jscomp/test/lib_js_test.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); console.log(JSON.stringify({ hd: 1, @@ -16,7 +16,7 @@ console.log(JSON.stringify({ console.log("hey"); -var suites_0 = [ +let suites_0 = [ "anything_to_string", (function (param) { return { @@ -27,7 +27,7 @@ var suites_0 = [ }) ]; -var suites = { +let suites = { hd: suites_0, tl: /* [] */0 }; diff --git a/jscomp/test/libarg_test.js b/jscomp/test/libarg_test.js index 090217494c..39c867d552 100644 --- a/jscomp/test/libarg_test.js +++ b/jscomp/test/libarg_test.js @@ -1,16 +1,16 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Arg = require("../../lib/js/arg.js"); -var List = require("../../lib/js/list.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); +let Mt = require("./mt.js"); +let Arg = require("../../lib/js/arg.js"); +let List = require("../../lib/js/list.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); -var current = { +let current = { contents: 0 }; -var accum = { +let accum = { contents: /* [] */0 }; @@ -29,11 +29,11 @@ function f_bool(b) { record("bool(" + b + ")"); } -var r_set = { +let r_set = { contents: false }; -var r_clear = { +let r_clear = { contents: true }; @@ -41,7 +41,7 @@ function f_string(s) { record("string(" + s + ")"); } -var r_string = { +let r_string = { contents: "" }; @@ -49,7 +49,7 @@ function f_int(i) { record("int(" + i + ")"); } -var r_int = { +let r_int = { contents: 0 }; @@ -57,7 +57,7 @@ function f_float(f) { record("float(" + f + ")"); } -var r_float = { +let r_float = { contents: 0.0 }; @@ -73,7 +73,7 @@ function f_anon(s) { record("anon(" + s + ")"); } -var spec_0 = [ +let spec_0 = [ "-u", { TAG: "Unit", @@ -82,7 +82,7 @@ var spec_0 = [ "Unit (0)" ]; -var spec_1 = { +let spec_1 = { hd: [ "-b", { @@ -232,12 +232,12 @@ var spec_1 = { } }; -var spec = { +let spec = { hd: spec_0, tl: spec_1 }; -var args1 = [ +let args1 = [ "prog", "anon1", "-u", @@ -271,7 +271,7 @@ var args1 = [ "r2" ]; -var args2 = [ +let args2 = [ "prog", "anon1", "-u", @@ -317,8 +317,8 @@ function test(argv) { r_float.contents = 0.0; accum.contents = /* [] */0; Arg.parse_argv(current, argv, spec, f_anon, "usage"); - var result = List.rev(accum.contents); - var reference = { + let result = List.rev(accum.contents); + let reference = { hd: "anon(anon1)", tl: { hd: "unit()", @@ -365,7 +365,7 @@ function test(argv) { } }; if (Caml_obj.notequal(result, reference)) { - var f = function (x, y) { + let f = function (x, y) { console.log(x, y); }; List.iter2(f, result, reference); @@ -383,7 +383,7 @@ test(args2); Mt.from_pair_suites("Libarg_test", /* [] */0); -var suites = /* [] */0; +let suites = /* [] */0; exports.current = current; exports.accum = accum; diff --git a/jscomp/test/libqueue_test.js b/jscomp/test/libqueue_test.js index 194fb555f8..8f7b41e660 100644 --- a/jscomp/test/libqueue_test.js +++ b/jscomp/test/libqueue_test.js @@ -1,11 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var List = require("../../lib/js/list.js"); -var Curry = require("../../lib/js/curry.js"); -var Queue = require("../../lib/js/queue.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let List = require("../../lib/js/list.js"); +let Curry = require("../../lib/js/curry.js"); +let Queue = require("../../lib/js/queue.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); function to_list(q) { return List.rev(Queue.fold((function (l, x) { @@ -16,7 +16,7 @@ function to_list(q) { }), /* [] */0, q)); } -var Q = { +let Q = { Empty: Queue.Empty, create: Queue.create, add: Queue.add, @@ -41,7 +41,7 @@ function does_raise(f, q) { return false; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === Queue.Empty) { return true; } @@ -49,7 +49,7 @@ function does_raise(f, q) { } } -var q = { +let q = { length: 0, first: "Nil", last: "Nil" @@ -279,7 +279,7 @@ if (!does_raise(Queue.take, q)) { }; } -var q$1 = { +let q$1 = { length: 0, first: "Nil", last: "Nil" @@ -349,7 +349,7 @@ if (q$1.length !== 0) { }; } -var q$2 = { +let q$2 = { length: 0, first: "Nil", last: "Nil" @@ -493,13 +493,13 @@ if (!does_raise(Queue.peek, q$2)) { }; } -var q$3 = { +let q$3 = { length: 0, first: "Nil", last: "Nil" }; -for(var i = 1; i <= 10; ++i){ +for(let i = 1; i <= 10; ++i){ Queue.add(i, q$3); } @@ -559,17 +559,17 @@ if (Queue.take(q$3) !== 42) { }; } -var q1 = { +let q1 = { length: 0, first: "Nil", last: "Nil" }; -for(var i$1 = 1; i$1 <= 10; ++i$1){ +for(let i$1 = 1; i$1 <= 10; ++i$1){ Queue.add(i$1, q1); } -var q2 = Queue.copy(q1); +let q2 = Queue.copy(q1); if (!Caml_obj.equal(to_list(q1), { hd: 1, @@ -679,7 +679,7 @@ if (q2.length !== 10) { }; } -for(var i$2 = 1; i$2 <= 10; ++i$2){ +for(let i$2 = 1; i$2 <= 10; ++i$2){ if (Queue.take(q1) !== i$2) { throw { RE_EXN_ID: "Assert_failure", @@ -694,7 +694,7 @@ for(var i$2 = 1; i$2 <= 10; ++i$2){ } -for(var i$3 = 1; i$3 <= 10; ++i$3){ +for(let i$3 = 1; i$3 <= 10; ++i$3){ if (Queue.take(q2) !== i$3) { throw { RE_EXN_ID: "Assert_failure", @@ -709,7 +709,7 @@ for(var i$3 = 1; i$3 <= 10; ++i$3){ } -var q$4 = { +let q$4 = { length: 0, first: "Nil", last: "Nil" @@ -727,7 +727,7 @@ if (q$4.length !== 0) { }; } -for(var i$4 = 1; i$4 <= 10; ++i$4){ +for(let i$4 = 1; i$4 <= 10; ++i$4){ Queue.add(i$4, q$4); if (q$4.length !== i$4) { throw { @@ -754,7 +754,7 @@ for(var i$4 = 1; i$4 <= 10; ++i$4){ } -for(var i$5 = 10; i$5 >= 1; --i$5){ +for(let i$5 = 10; i$5 >= 1; --i$5){ if (q$4.length !== i$5) { throw { RE_EXN_ID: "Assert_failure", @@ -804,17 +804,17 @@ if (q$4.length !== 0) { }; } -var q$5 = { +let q$5 = { length: 0, first: "Nil", last: "Nil" }; -for(var i$6 = 1; i$6 <= 10; ++i$6){ +for(let i$6 = 1; i$6 <= 10; ++i$6){ Queue.add(i$6, q$5); } -var i$7 = { +let i$7 = { contents: 1 }; @@ -833,13 +833,13 @@ Queue.iter((function (j) { i$7.contents = i$7.contents + 1 | 0; }), q$5); -var q1$1 = { +let q1$1 = { length: 0, first: "Nil", last: "Nil" }; -var q2$1 = { +let q2$1 = { length: 0, first: "Nil", last: "Nil" @@ -943,19 +943,19 @@ if (to_list(q2$1) !== /* [] */0) { }; } -var q1$2 = { +let q1$2 = { length: 0, first: "Nil", last: "Nil" }; -var q2$2 = { +let q2$2 = { length: 0, first: "Nil", last: "Nil" }; -for(var i$8 = 1; i$8 <= 4; ++i$8){ +for(let i$8 = 1; i$8 <= 4; ++i$8){ Queue.add(i$8, q1$2); } @@ -1081,19 +1081,19 @@ if (!Caml_obj.equal(to_list(q2$2), { }; } -var q1$3 = { +let q1$3 = { length: 0, first: "Nil", last: "Nil" }; -var q2$3 = { +let q2$3 = { length: 0, first: "Nil", last: "Nil" }; -for(var i$9 = 5; i$9 <= 8; ++i$9){ +for(let i$9 = 5; i$9 <= 8; ++i$9){ Queue.add(i$9, q2$3); } @@ -1219,23 +1219,23 @@ if (!Caml_obj.equal(to_list(q2$3), { }; } -var q1$4 = { +let q1$4 = { length: 0, first: "Nil", last: "Nil" }; -var q2$4 = { +let q2$4 = { length: 0, first: "Nil", last: "Nil" }; -for(var i$10 = 1; i$10 <= 4; ++i$10){ +for(let i$10 = 1; i$10 <= 4; ++i$10){ Queue.add(i$10, q1$4); } -for(var i$11 = 5; i$11 <= 8; ++i$11){ +for(let i$11 = 5; i$11 <= 8; ++i$11){ Queue.add(i$11, q2$4); } diff --git a/jscomp/test/limits_test.js b/jscomp/test/limits_test.js index 9c0d83e7da..6851483919 100644 --- a/jscomp/test/limits_test.js +++ b/jscomp/test/limits_test.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Int32 = require("../../lib/js/int32.js"); -var Pervasives = require("../../lib/js/pervasives.js"); +let Mt = require("./mt.js"); +let Int32 = require("../../lib/js/int32.js"); +let Pervasives = require("../../lib/js/pervasives.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; diff --git a/jscomp/test/list_stack.js b/jscomp/test/list_stack.js index 4a4d6ca861..33c026664a 100644 --- a/jscomp/test/list_stack.js +++ b/jscomp/test/list_stack.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var List = require("../../lib/js/list.js"); +let List = require("../../lib/js/list.js"); List.find((function (x) { return x > 3; diff --git a/jscomp/test/list_test.js b/jscomp/test/list_test.js index e71eb7cb88..fb69b118b6 100644 --- a/jscomp/test/list_test.js +++ b/jscomp/test/list_test.js @@ -1,12 +1,12 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml = require("../../lib/js/caml.js"); -var List = require("../../lib/js/list.js"); -var $$Array = require("../../lib/js/array.js"); +let Mt = require("./mt.js"); +let Caml = require("../../lib/js/caml.js"); +let List = require("../../lib/js/list.js"); +let $$Array = require("../../lib/js/array.js"); -var list_suites_0 = [ +let list_suites_0 = [ "length", (function (param) { return { @@ -26,7 +26,7 @@ var list_suites_0 = [ }) ]; -var list_suites_1 = { +let list_suites_1 = { hd: [ "length2", (function (param) { @@ -171,7 +171,7 @@ var list_suites_1 = { } }; -var list_suites = { +let list_suites = { hd: list_suites_0, tl: list_suites_1 }; diff --git a/jscomp/test/local_exception_test.js b/jscomp/test/local_exception_test.js index 925c518fdc..702e86d985 100644 --- a/jscomp/test/local_exception_test.js +++ b/jscomp/test/local_exception_test.js @@ -1,25 +1,25 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var A = /* @__PURE__ */Caml_exceptions.create("Local_exception_test.A"); +let A = /* @__PURE__ */Caml_exceptions.create("Local_exception_test.A"); -var v = { +let v = { RE_EXN_ID: A, _1: 3, _2: true }; -var B = /* @__PURE__ */Caml_exceptions.create("Local_exception_test.B"); +let B = /* @__PURE__ */Caml_exceptions.create("Local_exception_test.B"); -var u = { +let u = { RE_EXN_ID: B }; -var D = /* @__PURE__ */Caml_exceptions.create("Local_exception_test.D"); +let D = /* @__PURE__ */Caml_exceptions.create("Local_exception_test.D"); -var d = { +let d = { RE_EXN_ID: D, _1: 3 }; diff --git a/jscomp/test/loop_regression_test.js b/jscomp/test/loop_regression_test.js index 50eec06a95..099baad7b1 100644 --- a/jscomp/test/loop_regression_test.js +++ b/jscomp/test/loop_regression_test.js @@ -1,16 +1,16 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); function f(param) { - var v = { + let v = { contents: 0 }; - var acc = { + let acc = { contents: 0 }; - var n = 10; + let n = 10; while(true) { if (v.contents > n) { return acc.contents; @@ -21,7 +21,7 @@ function f(param) { }; } -var suites_0 = [ +let suites_0 = [ "sum", (function (param) { return { @@ -32,7 +32,7 @@ var suites_0 = [ }) ]; -var suites = { +let suites = { hd: suites_0, tl: /* [] */0 }; diff --git a/jscomp/test/loop_suites_test.js b/jscomp/test/loop_suites_test.js index b3d046c5e6..cb39bae90f 100644 --- a/jscomp/test/loop_suites_test.js +++ b/jscomp/test/loop_suites_test.js @@ -1,8 +1,8 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var For_loop_test = require("./for_loop_test.js"); +let Mt = require("./mt.js"); +let For_loop_test = require("./for_loop_test.js"); Mt.from_pair_suites("for_loop_test", For_loop_test.suites); diff --git a/jscomp/test/map_find_test.js b/jscomp/test/map_find_test.js index f439a6a56a..4bf1f1c25c 100644 --- a/jscomp/test/map_find_test.js +++ b/jscomp/test/map_find_test.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml = require("../../lib/js/caml.js"); -var List = require("../../lib/js/list.js"); +let Mt = require("./mt.js"); +let Caml = require("../../lib/js/caml.js"); +let List = require("../../lib/js/list.js"); function height(param) { if (typeof param !== "object") { @@ -14,8 +14,8 @@ function height(param) { } function create(l, x, d, r) { - var hl = height(l); - var hr = height(r); + let hl = height(l); + let hr = height(r); return { TAG: "Node", l: l, @@ -27,9 +27,9 @@ function create(l, x, d, r) { } function bal(l, x, d, r) { - var hl; + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -39,10 +39,10 @@ function bal(l, x, d, r) { Error: new Error() }; } - var lr = l.r; - var ld = l.d; - var lv = l.v; - var ll = l.l; + let lr = l.r; + let ld = l.d; + let lv = l.v; + let ll = l.l; if (height(ll) >= height(lr)) { return create(ll, lv, ld, create(lr, x, d, r)); } @@ -72,10 +72,10 @@ function bal(l, x, d, r) { Error: new Error() }; } - var rr = r.r; - var rd = r.d; - var rv = r.v; - var rl = r.l; + let rr = r.r; + let rd = r.d; + let rv = r.v; + let rl = r.l; if (height(rr) >= height(rl)) { return create(create(l, x, d, rl), rv, rd, rr); } @@ -100,11 +100,11 @@ function add(x, data, param) { h: 1 }; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Caml.int_compare(x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Caml.int_compare(x, v); if (c === 0) { if (d === data) { return param; @@ -120,14 +120,14 @@ function add(x, data, param) { } } if (c < 0) { - var ll = add(x, data, l); + let ll = add(x, data, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = add(x, data, r); + let rr = add(x, data, r); if (r === rr) { return param; } else { @@ -137,14 +137,14 @@ function add(x, data, param) { function find(x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var c = Caml.int_compare(x, param.v); + let c = Caml.int_compare(x, param.v); if (c === 0) { return param.d; } @@ -153,7 +153,7 @@ function find(x, _param) { }; } -var m = List.fold_left((function (acc, param) { +let m = List.fold_left((function (acc, param) { return add(param[0], param[1], acc); }), "Empty", { hd: [ @@ -190,8 +190,8 @@ function height$1(param) { } function create$1(l, x, d, r) { - var hl = height$1(l); - var hr = height$1(r); + let hl = height$1(l); + let hr = height$1(r); return { TAG: "Node", l: l, @@ -203,9 +203,9 @@ function create$1(l, x, d, r) { } function bal$1(l, x, d, r) { - var hl; + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -215,10 +215,10 @@ function bal$1(l, x, d, r) { Error: new Error() }; } - var lr = l.r; - var ld = l.d; - var lv = l.v; - var ll = l.l; + let lr = l.r; + let ld = l.d; + let lv = l.v; + let ll = l.l; if (height$1(ll) >= height$1(lr)) { return create$1(ll, lv, ld, create$1(lr, x, d, r)); } @@ -248,10 +248,10 @@ function bal$1(l, x, d, r) { Error: new Error() }; } - var rr = r.r; - var rd = r.d; - var rv = r.v; - var rl = r.l; + let rr = r.r; + let rd = r.d; + let rv = r.v; + let rl = r.l; if (height$1(rr) >= height$1(rl)) { return create$1(create$1(l, x, d, rl), rv, rd, rr); } @@ -276,11 +276,11 @@ function add$1(x, data, param) { h: 1 }; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Caml.string_compare(x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Caml.string_compare(x, v); if (c === 0) { if (d === data) { return param; @@ -296,14 +296,14 @@ function add$1(x, data, param) { } } if (c < 0) { - var ll = add$1(x, data, l); + let ll = add$1(x, data, l); if (l === ll) { return param; } else { return bal$1(ll, v, d, r); } } - var rr = add$1(x, data, r); + let rr = add$1(x, data, r); if (r === rr) { return param; } else { @@ -313,14 +313,14 @@ function add$1(x, data, param) { function find$1(x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var c = Caml.string_compare(x, param.v); + let c = Caml.string_compare(x, param.v); if (c === 0) { return param.d; } @@ -329,7 +329,7 @@ function find$1(x, _param) { }; } -var s = List.fold_left((function (acc, param) { +let s = List.fold_left((function (acc, param) { return add$1(param[0], param[1], acc); }), "Empty", { hd: [ diff --git a/jscomp/test/map_test.js b/jscomp/test/map_test.js index 46215b77cf..df4d585d82 100644 --- a/jscomp/test/map_test.js +++ b/jscomp/test/map_test.js @@ -1,10 +1,10 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml = require("../../lib/js/caml.js"); -var List = require("../../lib/js/list.js"); -var Curry = require("../../lib/js/curry.js"); +let Mt = require("./mt.js"); +let Caml = require("../../lib/js/caml.js"); +let List = require("../../lib/js/list.js"); +let Curry = require("../../lib/js/curry.js"); function height(param) { if (typeof param !== "object") { @@ -15,8 +15,8 @@ function height(param) { } function create(l, x, d, r) { - var hl = height(l); - var hr = height(r); + let hl = height(l); + let hr = height(r); return { TAG: "Node", l: l, @@ -28,9 +28,9 @@ function create(l, x, d, r) { } function bal(l, x, d, r) { - var hl; + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -40,10 +40,10 @@ function bal(l, x, d, r) { Error: new Error() }; } - var lr = l.r; - var ld = l.d; - var lv = l.v; - var ll = l.l; + let lr = l.r; + let ld = l.d; + let lv = l.v; + let ll = l.l; if (height(ll) >= height(lr)) { return create(ll, lv, ld, create(lr, x, d, r)); } @@ -73,10 +73,10 @@ function bal(l, x, d, r) { Error: new Error() }; } - var rr = r.r; - var rd = r.d; - var rv = r.v; - var rl = r.l; + let rr = r.r; + let rd = r.d; + let rv = r.v; + let rl = r.l; if (height(rr) >= height(rl)) { return create(create(l, x, d, rl), rv, rd, rr); } @@ -101,11 +101,11 @@ function add(x, data, param) { h: 1 }; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Caml.int_compare(x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Caml.int_compare(x, v); if (c === 0) { if (d === data) { return param; @@ -121,14 +121,14 @@ function add(x, data, param) { } } if (c < 0) { - var ll = add(x, data, l); + let ll = add(x, data, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = add(x, data, r); + let rr = add(x, data, r); if (r === rr) { return param; } else { @@ -138,8 +138,8 @@ function add(x, data, param) { function cons_enum(_m, _e) { while(true) { - var e = _e; - var m = _m; + let e = _e; + let m = _m; if (typeof m !== "object") { return e; } @@ -156,11 +156,11 @@ function cons_enum(_m, _e) { } function compare(cmp, m1, m2) { - var _e1 = cons_enum(m1, "End"); - var _e2 = cons_enum(m2, "End"); + let _e1 = cons_enum(m1, "End"); + let _e2 = cons_enum(m2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return 0; @@ -171,11 +171,11 @@ function compare(cmp, m1, m2) { if (typeof e2 !== "object") { return 1; } - var c = Caml.int_compare(e1._0, e2._0); + let c = Caml.int_compare(e1._0, e2._0); if (c !== 0) { return c; } - var c$1 = Curry._2(cmp, e1._1, e2._1); + let c$1 = Curry._2(cmp, e1._1, e2._1); if (c$1 !== 0) { return c$1; } @@ -186,11 +186,11 @@ function compare(cmp, m1, m2) { } function equal(cmp, m1, m2) { - var _e1 = cons_enum(m1, "End"); - var _e2 = cons_enum(m2, "End"); + let _e1 = cons_enum(m1, "End"); + let _e2 = cons_enum(m2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return true; @@ -230,8 +230,8 @@ function height$1(param) { } function create$1(l, x, d, r) { - var hl = height$1(l); - var hr = height$1(r); + let hl = height$1(l); + let hr = height$1(r); return { TAG: "Node", l: l, @@ -243,9 +243,9 @@ function create$1(l, x, d, r) { } function bal$1(l, x, d, r) { - var hl; + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -255,10 +255,10 @@ function bal$1(l, x, d, r) { Error: new Error() }; } - var lr = l.r; - var ld = l.d; - var lv = l.v; - var ll = l.l; + let lr = l.r; + let ld = l.d; + let lv = l.v; + let ll = l.l; if (height$1(ll) >= height$1(lr)) { return create$1(ll, lv, ld, create$1(lr, x, d, r)); } @@ -288,10 +288,10 @@ function bal$1(l, x, d, r) { Error: new Error() }; } - var rr = r.r; - var rd = r.d; - var rv = r.v; - var rl = r.l; + let rr = r.r; + let rd = r.d; + let rv = r.v; + let rl = r.l; if (height$1(rr) >= height$1(rl)) { return create$1(create$1(l, x, d, rl), rv, rd, rr); } @@ -316,11 +316,11 @@ function add$1(x, data, param) { h: 1 }; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Caml.string_compare(x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Caml.string_compare(x, v); if (c === 0) { if (d === data) { return param; @@ -336,14 +336,14 @@ function add$1(x, data, param) { } } if (c < 0) { - var ll = add$1(x, data, l); + let ll = add$1(x, data, l); if (l === ll) { return param; } else { return bal$1(ll, v, d, r); } } - var rr = add$1(x, data, r); + let rr = add$1(x, data, r); if (r === rr) { return param; } else { @@ -353,14 +353,14 @@ function add$1(x, data, param) { function find(x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var c = Caml.string_compare(x, param.v); + let c = Caml.string_compare(x, param.v); if (c === 0) { return param.d; } @@ -375,10 +375,10 @@ function of_list(kvs) { }), "Empty", kvs); } -var int_map_suites_0 = [ +let int_map_suites_0 = [ "add", (function (param) { - var v = of_list({ + let v = of_list({ hd: [ 1, /* '1' */49 @@ -405,11 +405,11 @@ var int_map_suites_0 = [ }) ]; -var int_map_suites_1 = { +let int_map_suites_1 = { hd: [ "equal", (function (param) { - var v = of_list({ + let v = of_list({ hd: [ 1, /* '1' */49 @@ -428,7 +428,7 @@ var int_map_suites_1 = { } } }); - var u = of_list({ + let u = of_list({ hd: [ 2, /* '3' */51 @@ -458,7 +458,7 @@ var int_map_suites_1 = { hd: [ "equal2", (function (param) { - var v = of_list({ + let v = of_list({ hd: [ 1, /* '1' */49 @@ -477,7 +477,7 @@ var int_map_suites_1 = { } } }); - var u = of_list({ + let u = of_list({ hd: [ 2, /* '3' */51 @@ -509,12 +509,12 @@ var int_map_suites_1 = { hd: [ "iteration", (function (param) { - var m = "Empty"; - for(var i = 0; i <= 10000; ++i){ + let m = "Empty"; + for(let i = 0; i <= 10000; ++i){ m = add$1(String(i), String(i), m); } - var v = -1; - for(var i$1 = 0; i$1 <= 10000; ++i$1){ + let v = -1; + for(let i$1 = 0; i$1 <= 10000; ++i$1){ if (find(String(i$1), m) !== String(i$1)) { v = i$1; } @@ -532,7 +532,7 @@ var int_map_suites_1 = { } }; -var int_map_suites = { +let int_map_suites = { hd: int_map_suites_0, tl: int_map_suites_1 }; diff --git a/jscomp/test/mario_game.js b/jscomp/test/mario_game.js index 77d3a6bbfd..ca495da6e8 100644 --- a/jscomp/test/mario_game.js +++ b/jscomp/test/mario_game.js @@ -1,34 +1,34 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml = require("../../lib/js/caml.js"); -var List = require("../../lib/js/list.js"); -var Curry = require("../../lib/js/curry.js"); -var Random = require("../../lib/js/random.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Caml_int32 = require("../../lib/js/caml_int32.js"); -var Pervasives = require("../../lib/js/pervasives.js"); -var Caml_option = require("../../lib/js/caml_option.js"); +let Caml = require("../../lib/js/caml.js"); +let List = require("../../lib/js/list.js"); +let Curry = require("../../lib/js/curry.js"); +let Random = require("../../lib/js/random.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Caml_int32 = require("../../lib/js/caml_int32.js"); +let Pervasives = require("../../lib/js/pervasives.js"); +let Caml_option = require("../../lib/js/caml_option.js"); -var Actors = {}; +let Actors = {}; -var Dom_html = {}; +let Dom_html = {}; function setup_sprite(loopOpt, bbox_offsetOpt, bbox_sizeOpt, img_src, max_frames, max_ticks, frame_size, src_offset) { - var loop = loopOpt !== undefined ? loopOpt : true; - var bbox_offset = bbox_offsetOpt !== undefined ? bbox_offsetOpt : [ + let loop = loopOpt !== undefined ? loopOpt : true; + let bbox_offset = bbox_offsetOpt !== undefined ? bbox_offsetOpt : [ 0, 0 ]; - var bbox_size = bbox_sizeOpt !== undefined ? bbox_sizeOpt : [ + let bbox_size = bbox_sizeOpt !== undefined ? bbox_sizeOpt : [ 0, 0 ]; - var bbox_size$1 = Caml_obj.equal(bbox_size, [ + let bbox_size$1 = Caml_obj.equal(bbox_size, [ 0, 0 ]) ? frame_size : bbox_size; - var img_src$1 = "./sprites/" + img_src; + let img_src$1 = "./sprites/" + img_src; return { max_frames: max_frames, max_ticks: max_ticks, @@ -42,7 +42,7 @@ function setup_sprite(loopOpt, bbox_offsetOpt, bbox_sizeOpt, img_src, max_frames } function make_enemy(param) { - var dir = param[1]; + let dir = param[1]; switch (param[0]) { case "Goomba" : return setup_sprite(undefined, [ @@ -247,13 +247,13 @@ function make_particle(x) { function make_type(typ, dir) { switch (typ.TAG) { case "SPlayer" : - var pt = typ._0; - var spr_type = [ + let pt = typ._0; + let spr_type = [ typ._1, dir ]; if (pt === "BigM") { - var typ$1 = spr_type[0]; + let typ$1 = spr_type[0]; if (spr_type[1] === "Left") { switch (typ$1) { case "Standing" : @@ -376,7 +376,7 @@ function make_type(typ, dir) { } } } else { - var typ$2 = spr_type[0]; + let typ$2 = spr_type[0]; if (spr_type[1] === "Left") { switch (typ$2) { case "Standing" : @@ -505,7 +505,7 @@ function make_type(typ, dir) { dir ]); case "SItem" : - var x = typ._0; + let x = typ._0; switch (x) { case "Mushroom" : return setup_sprite(undefined, [ @@ -554,7 +554,7 @@ function make_type(typ, dir) { } case "SBlock" : - var x$1 = typ._0; + let x$1 = typ._0; if (typeof x$1 === "object") { return setup_sprite(undefined, undefined, undefined, "blocks.png", 4, 15, [ 16, @@ -620,7 +620,7 @@ function make_type(typ, dir) { } function make_from_params(params, context) { - var img = document.createElement("img"); + let img = document.createElement("img"); img.src = params.img_src; return { params: params, @@ -636,12 +636,12 @@ function make_from_params(params, context) { } function make(spawn, dir, context) { - var params = make_type(spawn, dir); + let params = make_type(spawn, dir); return make_from_params(params, context); } function make_bgd(context) { - var params = setup_sprite(undefined, undefined, undefined, "bgd-1.png", 1, 0, [ + let params = setup_sprite(undefined, undefined, undefined, "bgd-1.png", 1, 0, [ 512, 256 ], [ @@ -652,23 +652,23 @@ function make_bgd(context) { } function make_particle$1(ptyp, context) { - var params = make_particle(ptyp); + let params = make_particle(ptyp); return make_from_params(params, context); } function transform_enemy(enemy_typ, spr, dir) { - var params = make_enemy([ + let params = make_enemy([ enemy_typ, dir ]); - var img = document.createElement("img"); + let img = document.createElement("img"); img.src = params.img_src; spr.params = params; spr.img = img; } function update_animation(spr) { - var curr_ticks = spr.ticks.contents; + let curr_ticks = spr.ticks.contents; if (curr_ticks >= spr.params.max_ticks) { spr.ticks.contents = 0; if (spr.params.loop) { @@ -683,7 +683,7 @@ function update_animation(spr) { } } -var Sprite = { +let Sprite = { setup_sprite: setup_sprite, make: make, make_bgd: make_bgd, @@ -718,18 +718,18 @@ function make_type$1(typ, ctx) { } function make$1(velOpt, accOpt, part_type, pos, ctx) { - var vel = velOpt !== undefined ? velOpt : [ + let vel = velOpt !== undefined ? velOpt : [ 0, 0 ]; - var acc = accOpt !== undefined ? accOpt : [ + let acc = accOpt !== undefined ? accOpt : [ 0, 0 ]; - var params = make_type$1(part_type, ctx); - var pos$1 = pair_to_xy(pos); - var vel$1 = pair_to_xy(vel); - var acc$1 = pair_to_xy(acc); + let params = make_type$1(part_type, ctx); + let pos$1 = pair_to_xy(pos); + let vel$1 = pair_to_xy(vel); + let acc$1 = pair_to_xy(acc); return { params: params, part_type: part_type, @@ -742,7 +742,7 @@ function make$1(velOpt, accOpt, part_type, pos, ctx) { } function make_score(score, pos, ctx) { - var t = score >= 801 ? ( + let t = score >= 801 ? ( score >= 2001 ? ( score !== 4000 ? ( score !== 8000 ? "Score100" : "Score8000" @@ -782,19 +782,19 @@ function $$process(part) { part.pos.y = part.vel.y + part.pos.y; } -var Particle = { +let Particle = { make: make$1, make_score: make_score, $$process: $$process }; -var id_counter = { +let id_counter = { contents: Pervasives.min_int }; function setup_obj(has_gravityOpt, speedOpt, param) { - var has_gravity = has_gravityOpt !== undefined ? has_gravityOpt : true; - var speed = speedOpt !== undefined ? speedOpt : 1; + let has_gravity = has_gravityOpt !== undefined ? has_gravityOpt : true; + let speed = speedOpt !== undefined ? speedOpt : 1; return { has_gravity: has_gravity, speed: speed @@ -802,8 +802,8 @@ function setup_obj(has_gravityOpt, speedOpt, param) { } function set_vel_to_speed(obj) { - var speed = obj.params.speed; - var match = obj.dir; + let speed = obj.params.speed; + let match = obj.dir; if (match === "Left") { obj.vel.x = - speed; } else { @@ -816,7 +816,7 @@ function make_type$2(x) { case "SPlayer" : return setup_obj(undefined, 2.8, undefined); case "SEnemy" : - var x$1 = x._0; + let x$1 = x._0; switch (x$1) { case "GKoopaShell" : case "RKoopaShell" : @@ -825,7 +825,7 @@ function make_type$2(x) { return setup_obj(undefined, undefined, undefined); } case "SItem" : - var x$2 = x._0; + let x$2 = x._0; if (x$2 === "Coin") { return setup_obj(false, undefined, undefined); } else { @@ -843,12 +843,12 @@ function new_id(param) { } function make$2($staropt$star, $staropt$star$1, spawnable, context, param) { - var id = $staropt$star !== undefined ? Caml_option.valFromOption($staropt$star) : undefined; - var dir = $staropt$star$1 !== undefined ? $staropt$star$1 : "Left"; - var spr = make(spawnable, dir, context); - var params = make_type$2(spawnable); - var id$1 = id !== undefined ? id : new_id(); - var obj = { + let id = $staropt$star !== undefined ? Caml_option.valFromOption($staropt$star) : undefined; + let dir = $staropt$star$1 !== undefined ? $staropt$star$1 : "Left"; + let spr = make(spawnable, dir, context); + let params = make_type$2(spawnable); + let id$1 = id !== undefined ? id : new_id(); + let obj = { params: params, pos: { x: param[0], @@ -875,12 +875,12 @@ function make$2($staropt$star, $staropt$star$1, spawnable, context, param) { } function spawn(spawnable, context, param) { - var match = make$2(undefined, undefined, spawnable, context, [ + let match = make$2(undefined, undefined, spawnable, context, [ param[0], param[1] ]); - var obj = match[1]; - var spr = match[0]; + let obj = match[1]; + let spr = match[0]; switch (spawnable.TAG) { case "SPlayer" : return { @@ -944,20 +944,20 @@ function equals(col1, col2) { } function normalize_pos(pos, p1, p2) { - var match = p1.bbox_offset; - var match$1 = p2.bbox_offset; - var match$2 = p1.bbox_size; - var match$3 = p2.bbox_size; + let match = p1.bbox_offset; + let match$1 = p2.bbox_offset; + let match$2 = p1.bbox_size; + let match$3 = p2.bbox_size; pos.x = pos.x - (match$3[0] + match$1[0]) + (match$2[0] + match[0]); pos.y = pos.y - (match$3[1] + match$1[1]) + (match$2[1] + match[1]); } function update_player(player, keys, context) { - var prev_jumping = player.jumping; - var prev_dir = player.dir; - var prev_vx = Math.abs(player.vel.x); + let prev_jumping = player.jumping; + let prev_dir = player.dir; + let prev_vx = Math.abs(player.vel.x); List.iter((function (param) { - var lr_acc = player.vel.x * 0.2; + let lr_acc = player.vel.x * 0.2; switch (param) { case "CLeft" : if (!player.crouch) { @@ -998,10 +998,10 @@ function update_player(player, keys, context) { } }), keys); - var v = player.vel.x * 0.9; - var vel_damped = Math.abs(v) < 0.1 ? 0 : v; + let v = player.vel.x * 0.9; + let vel_damped = Math.abs(v) < 0.1 ? 0 : v; player.vel.x = vel_damped; - var pl_typ = player.health <= 1 ? "SmallM" : "BigM"; + let pl_typ = player.health <= 1 ? "SmallM" : "BigM"; if (!prev_jumping && player.jumping) { return [ pl_typ, @@ -1084,15 +1084,15 @@ function process_obj(obj, mapy) { } function normalize_origin(pos, spr) { - var p = spr.params; - var match = p.bbox_offset; - var match$1 = p.bbox_size; + let p = spr.params; + let match = p.bbox_offset; + let match$1 = p.bbox_size; pos.x = pos.x - match[0]; pos.y = pos.y - (match[1] + match$1[1]); } function collide_block(check_xOpt, dir, obj) { - var check_x = check_xOpt !== undefined ? check_xOpt : true; + let check_x = check_xOpt !== undefined ? check_xOpt : true; switch (dir) { case "North" : obj.vel.y = -0.001; @@ -1133,15 +1133,15 @@ function evolve_enemy(player_dir, typ, spr, obj, context) { obj.kill = true; return; case "GKoopa" : - var match = make$2(undefined, obj.dir, { + let match = make$2(undefined, obj.dir, { TAG: "SEnemy", _0: "GKoopaShell" }, context, [ obj.pos.x, obj.pos.y ]); - var new_obj = match[1]; - var new_spr = match[0]; + let new_obj = match[1]; + let new_spr = match[0]; normalize_pos(new_obj.pos, spr.params, new_spr.params); return { TAG: "Enemy", @@ -1150,15 +1150,15 @@ function evolve_enemy(player_dir, typ, spr, obj, context) { _2: new_obj }; case "RKoopa" : - var match$1 = make$2(undefined, obj.dir, { + let match$1 = make$2(undefined, obj.dir, { TAG: "SEnemy", _0: "RKoopaShell" }, context, [ obj.pos.x, obj.pos.y ]); - var new_obj$1 = match$1[1]; - var new_spr$1 = match$1[0]; + let new_obj$1 = match$1[1]; + let new_spr$1 = match$1[0]; normalize_pos(new_obj$1.pos, spr.params, new_spr$1.params); return { TAG: "Enemy", @@ -1181,13 +1181,13 @@ function evolve_enemy(player_dir, typ, spr, obj, context) { function rev_dir(o, t, s) { reverse_left_right(o); - var old_params = s.params; + let old_params = s.params; transform_enemy(t, s, o.dir); normalize_pos(o.pos, old_params, s.params); } function dec_health(obj) { - var health = obj.health - 1 | 0; + let health = obj.health - 1 | 0; if (health === 0) { obj.kill = true; return; @@ -1201,7 +1201,7 @@ function dec_health(obj) { function evolve_block(obj, context) { dec_health(obj); - var match = make$2(undefined, undefined, { + let match = make$2(undefined, undefined, { TAG: "SBlock", _0: "QBlockUsed" }, context, [ @@ -1217,14 +1217,14 @@ function evolve_block(obj, context) { } function spawn_above(player_dir, obj, typ, context) { - var item = spawn({ + let item = spawn({ TAG: "SItem", _0: typ }, context, [ obj.pos.x, obj.pos.y ]); - var item_obj = item._2; + let item_obj = item._2; item_obj.pos.y = item_obj.pos.y - item._1.params.frame_size[1]; item_obj.dir = opposite_dir(player_dir); set_vel_to_speed(item_obj); @@ -1232,14 +1232,14 @@ function spawn_above(player_dir, obj, typ, context) { } function get_aabb(obj) { - var spr = obj._1.params; - var obj$1 = obj._2; - var match = spr.bbox_offset; - var box = obj$1.pos.x + match[0]; - var boy = obj$1.pos.y + match[1]; - var match$1 = spr.bbox_size; - var sy = match$1[1]; - var sx = match$1[0]; + let spr = obj._1.params; + let obj$1 = obj._2; + let match = spr.bbox_offset; + let box = obj$1.pos.x + match[0]; + let boy = obj$1.pos.y + match[1]; + let match$1 = spr.bbox_size; + let sy = match$1[1]; + let sx = match$1[0]; return { center: { x: box + sx / 2, @@ -1253,9 +1253,9 @@ function get_aabb(obj) { } function col_bypass(c1, c2) { - var o1 = c1._2; - var o2 = c2._2; - var ctypes; + let o1 = c1._2; + let o2 = c2._2; + let ctypes; switch (c1.TAG) { case "Player" : ctypes = c2.TAG === "Enemy" ? c1._2.invuln > 0 : false; @@ -1289,21 +1289,21 @@ function col_bypass(c1, c2) { } function check_collision(c1, c2) { - var b1 = get_aabb(c1); - var b2 = get_aabb(c2); - var o1 = c1._2; + let b1 = get_aabb(c1); + let b2 = get_aabb(c2); + let o1 = c1._2; if (col_bypass(c1, c2)) { return; } - var vx = b1.center.x - b2.center.x; - var vy = b1.center.y - b2.center.y; - var hwidths = b1.half.x + b2.half.x; - var hheights = b1.half.y + b2.half.y; + let vx = b1.center.x - b2.center.x; + let vy = b1.center.y - b2.center.y; + let hwidths = b1.half.x + b2.half.x; + let hheights = b1.half.y + b2.half.y; if (!(Math.abs(vx) < hwidths && Math.abs(vy) < hheights)) { return; } - var ox = hwidths - Math.abs(vx); - var oy = hheights - Math.abs(vy); + let ox = hwidths - Math.abs(vx); + let oy = hheights - Math.abs(vy); if (ox >= oy) { if (vy > 0) { o1.pos.y = o1.pos.y + oy; @@ -1326,25 +1326,25 @@ function kill(collid, ctx) { case "Player" : return /* [] */0; case "Enemy" : - var o = collid._2; - var pos_0 = o.pos.x; - var pos_1 = o.pos.y; - var pos = [ + let o = collid._2; + let pos_0 = o.pos.x; + let pos_1 = o.pos.y; + let pos = [ pos_0, pos_1 ]; - var score = o.score > 0 ? ({ + let score = o.score > 0 ? ({ hd: make_score(o.score, pos, ctx), tl: /* [] */0 }) : /* [] */0; - var remains; + let remains; remains = collid._0 === "Goomba" ? ({ hd: make$1(undefined, undefined, "GoombaSquish", pos, ctx), tl: /* [] */0 }) : /* [] */0; return Pervasives.$at(score, remains); case "Item" : - var o$1 = collid._2; + let o$1 = collid._2; if (collid._0 === "Mushroom") { return { hd: make_score(o$1.score, [ @@ -1357,42 +1357,42 @@ function kill(collid, ctx) { return /* [] */0; } case "Block" : - var o$2 = collid._2; - var tmp = collid._0; + let o$2 = collid._2; + let tmp = collid._0; if (typeof tmp === "object") { return /* [] */0; } if (tmp !== "Brick") { return /* [] */0; } - var pos_0$1 = o$2.pos.x; - var pos_1$1 = o$2.pos.y; - var pos$1 = [ + let pos_0$1 = o$2.pos.x; + let pos_1$1 = o$2.pos.y; + let pos$1 = [ pos_0$1, pos_1$1 ]; - var p1 = make$1([ + let p1 = make$1([ -5, -5 ], [ 0, 0.2 ], "BrickChunkL", pos$1, ctx); - var p2 = make$1([ + let p2 = make$1([ -3, -4 ], [ 0, 0.2 ], "BrickChunkL", pos$1, ctx); - var p3 = make$1([ + let p3 = make$1([ 3, -4 ], [ 0, 0.2 ], "BrickChunkR", pos$1, ctx); - var p4 = make$1([ + let p4 = make$1([ 5, -5 ], [ @@ -1416,7 +1416,7 @@ function kill(collid, ctx) { } } -var $$Object = { +let $$Object = { invuln: 60, dampen_jump: 4, get_sprite: get_sprite, @@ -1441,20 +1441,20 @@ var $$Object = { }; function render_bbox(sprite, param) { - var context = sprite.context; - var match = sprite.params.bbox_offset; - var match$1 = sprite.params.bbox_size; + let context = sprite.context; + let match = sprite.params.bbox_offset; + let match$1 = sprite.params.bbox_size; context.strokeStyle = "#FF0000"; return Curry._4(context.strokeRect, param[0] + match[0], param[1] + match[1], match$1[0], match$1[1]); } function render(sprite, param) { - var context = sprite.context; - var match = sprite.params.src_offset; - var match$1 = sprite.params.frame_size; - var sw = match$1[0]; - var match$2 = sprite.params.frame_size; - var sx = match[0] + sprite.frame.contents * sw; + let context = sprite.context; + let match = sprite.params.src_offset; + let match$1 = sprite.params.frame_size; + let sw = match$1[0]; + let match$2 = sprite.params.frame_size; + let sx = match[0] + sprite.frame.contents * sw; return Curry.app(context.drawImage, [ sprite.img, sx, @@ -1480,24 +1480,24 @@ function draw_bgd(bgd, off_x) { } function clear_canvas(canvas) { - var context = Curry._1(canvas.getContext, "2d"); - var cwidth = canvas.width; - var cheight = canvas.height; + let context = Curry._1(canvas.getContext, "2d"); + let cwidth = canvas.width; + let cheight = canvas.height; Curry._4(context.clearRect, 0, 0, cwidth, cheight); } function hud(canvas, score, coins) { - var score_string = String(score); - var coin_string = String(coins); - var context = Curry._1(canvas.getContext, "2d"); + let score_string = String(score); + let coin_string = String(coins); + let context = Curry._1(canvas.getContext, "2d"); context.font = "10px 'Press Start 2P'"; Curry._3(context.fillText, "Score: " + score_string, canvas.width - 140, 18); Curry._3(context.fillText, "Coins: " + coin_string, 120, 18); } function fps(canvas, fps_val) { - var fps_str = String(fps_val | 0); - var context = Curry._1(canvas.getContext, "2d"); + let fps_str = String(fps_val | 0); + let context = Curry._1(canvas.getContext, "2d"); Curry._3(context.fillText, fps_str, 10, 18); } @@ -1529,7 +1529,7 @@ function game_loss(ctx) { }; } -var Draw = { +let Draw = { render: render, clear_canvas: clear_canvas, draw_bgd: draw_bgd, @@ -1558,17 +1558,17 @@ function make$3(param, param$1) { } function calc_viewport_point(cc, vc, mc) { - var vc_half = vc / 2; + let vc_half = vc / 2; return Caml.float_min(Caml.float_max(cc - vc_half, 0), Caml.float_min(mc - vc, Math.abs(cc - vc_half))); } function in_viewport(v, pos) { - var v_min_x = v.pos.x - 32; - var v_max_x = v.pos.x + v.v_dim.x; - var v_min_y = v.pos.y - 32; - var v_max_y = v.pos.y + v.v_dim.y; - var x = pos.x; - var y = pos.y; + let v_min_x = v.pos.x - 32; + let v_max_x = v.pos.x + v.v_dim.x; + let v_min_y = v.pos.y - 32; + let v_max_y = v.pos.y + v.v_dim.y; + let x = pos.x; + let y = pos.y; if (x >= v_min_x && x <= v_max_x && y >= v_min_y) { return y <= v_max_y; } else { @@ -1577,7 +1577,7 @@ function in_viewport(v, pos) { } function out_of_viewport_below(v, y) { - var v_max_y = v.pos.y + v.v_dim.y; + let v_max_y = v.pos.y + v.v_dim.y; return y >= v_max_y; } @@ -1589,9 +1589,9 @@ function coord_to_viewport(viewport, coord) { } function update(vpt, ctr) { - var new_x = calc_viewport_point(ctr.x, vpt.v_dim.x, vpt.m_dim.x); - var new_y = calc_viewport_point(ctr.y, vpt.v_dim.y, vpt.m_dim.y); - var pos = { + let new_x = calc_viewport_point(ctr.x, vpt.v_dim.x, vpt.m_dim.x); + let new_y = calc_viewport_point(ctr.y, vpt.v_dim.y, vpt.m_dim.y); + let pos = { x: new_x, y: new_y }; @@ -1602,7 +1602,7 @@ function update(vpt, ctr) { }; } -var Viewport = { +let Viewport = { make: make$3, calc_viewport_point: calc_viewport_point, in_viewport: in_viewport, @@ -1611,7 +1611,7 @@ var Viewport = { update: update }; -var pressed_keys = { +let pressed_keys = { left: false, right: false, up: false, @@ -1619,20 +1619,20 @@ var pressed_keys = { bbox: 0 }; -var collid_objs = { +let collid_objs = { contents: /* [] */0 }; -var particles = { +let particles = { contents: /* [] */0 }; -var last_time = { +let last_time = { contents: 0 }; function calc_fps(t0, t1) { - var delta = (t1 - t0) / 1000; + let delta = (t1 - t0) / 1000; return 1 / delta; } @@ -1641,25 +1641,25 @@ function update_score(state, i) { } function process_collision(dir, c1, c2, state) { - var context = state.ctx; - var exit = 0; - var s1; - var o1; - var typ; - var s2; - var o2; - var s1$1; - var o1$1; - var t2; - var s2$1; - var o2$1; - var o1$2; - var t2$1; - var o2$2; + let context = state.ctx; + let exit = 0; + let s1; + let o1; + let typ; + let s2; + let o2; + let s1$1; + let o1$1; + let t2; + let s2$1; + let o2$1; + let o1$2; + let t2$1; + let o2$2; switch (c1.TAG) { case "Player" : - var o1$3 = c1._2; - var s1$2 = c1._1; + let o1$3 = c1._2; + let s1$2 = c1._1; switch (c2.TAG) { case "Player" : return [ @@ -1667,9 +1667,9 @@ function process_collision(dir, c1, c2, state) { undefined ]; case "Enemy" : - var o2$3 = c2._2; - var s2$2 = c2._1; - var typ$1 = c2._0; + let o2$3 = c2._2; + let s2$2 = c2._1; + let typ$1 = c2._0; if (dir === "South") { s1 = s1$2; o1 = o1$3; @@ -1693,8 +1693,8 @@ function process_collision(dir, c1, c2, state) { exit = 3; break; case "Block" : - var o2$4 = c2._2; - var t = c2._0; + let o2$4 = c2._2; + let t = c2._0; if (dir === "North") { if (typeof t !== "object") { switch (t) { @@ -1727,8 +1727,8 @@ function process_collision(dir, c1, c2, state) { ]; } } else { - var updated_block = evolve_block(o2$4, context); - var spawned_item = spawn_above(o1$3.dir, o2$4, t._0, context); + let updated_block = evolve_block(o2$4, context); + let spawned_item = spawn_above(o1$3.dir, o2$4, t._0, context); collide_block(undefined, dir, o1$3); return [ spawned_item, @@ -1736,7 +1736,7 @@ function process_collision(dir, c1, c2, state) { ]; } } else { - var exit$1 = 0; + let exit$1 = 0; if (typeof t !== "object") { if (t === "Panel") { game_win(state.ctx); @@ -1771,13 +1771,13 @@ function process_collision(dir, c1, c2, state) { } break; case "Enemy" : - var o1$4 = c1._2; - var s1$3 = c1._1; - var t1 = c1._0; + let o1$4 = c1._2; + let s1$3 = c1._1; + let t1 = c1._0; switch (c2.TAG) { case "Player" : - var o1$5 = c2._2; - var s1$4 = c2._1; + let o1$5 = c2._2; + let s1$4 = c2._1; if (dir === "North") { s1 = s1$4; o1 = o1$5; @@ -1795,10 +1795,10 @@ function process_collision(dir, c1, c2, state) { } break; case "Enemy" : - var t2$2 = c2._0; - var s2$3 = c2._1; - var o2$5 = c2._2; - var exit$2 = 0; + let t2$2 = c2._0; + let s2$3 = c2._1; + let o2$5 = c2._2; + let exit$2 = 0; switch (t1) { case "GKoopaShell" : switch (t2$2) { @@ -1827,7 +1827,7 @@ function process_collision(dir, c1, c2, state) { exit$2 = 3; break; default: - var exit$3 = 0; + let exit$3 = 0; switch (dir) { case "North" : case "South" : @@ -1896,9 +1896,9 @@ function process_collision(dir, c1, c2, state) { undefined ]; case "Block" : - var o2$6 = c2._2; - var t2$3 = c2._0; - var exit$4 = 0; + let o2$6 = c2._2; + let t2$3 = c2._0; + let exit$4 = 0; switch (dir) { case "North" : case "South" : @@ -1914,8 +1914,8 @@ function process_collision(dir, c1, c2, state) { } if (exit$4 === 4) { - var exit$5 = 0; - var typ$2; + let exit$5 = 0; + let typ$2; switch (t1) { case "GKoopaShell" : if (typeof t2$3 !== "object") { @@ -1960,8 +1960,8 @@ function process_collision(dir, c1, c2, state) { undefined ]; case 6 : - var updated_block$1 = evolve_block(o2$6, context); - var spawned_item$1 = spawn_above(o1$4.dir, o2$6, typ$2, context); + let updated_block$1 = evolve_block(o2$6, context); + let spawned_item$1 = spawn_above(o1$4.dir, o2$6, typ$2, context); rev_dir(o1$4, t1, s1$3); return [ updated_block$1, @@ -1975,7 +1975,7 @@ function process_collision(dir, c1, c2, state) { } break; case "Item" : - var o2$7 = c1._2; + let o2$7 = c1._2; switch (c2.TAG) { case "Player" : o1$2 = c2._2; @@ -2037,7 +2037,7 @@ function process_collision(dir, c1, c2, state) { evolve_enemy(o1.dir, typ, s2, o2, context) ]; } - var score = Math.imul(100, state.multiplier); + let score = Math.imul(100, state.multiplier); update_score(state, score); o2.score = score; state.multiplier = (state.multiplier << 1); @@ -2046,7 +2046,7 @@ function process_collision(dir, c1, c2, state) { evolve_enemy(o1.dir, typ, s2, o2, context) ]; } - var r2 = evolve_enemy(o1.dir, typ, s2, o2, context); + let r2 = evolve_enemy(o1.dir, typ, s2, o2, context); o1.vel.y = - 4; o1.pos.y = o1.pos.y - 5; return [ @@ -2066,13 +2066,13 @@ function process_collision(dir, c1, c2, state) { undefined ]; } - var r2$1 = o2$1.vel.x === 0 ? evolve_enemy(o1$1.dir, t2, s2$1, o2$1, context) : (dec_health(o1$1), o1$1.invuln = 60, undefined); + let r2$1 = o2$1.vel.x === 0 ? evolve_enemy(o1$1.dir, t2, s2$1, o2$1, context) : (dec_health(o1$1), o1$1.invuln = 60, undefined); return [ undefined, r2$1 ]; case 3 : - var exit$6 = 0; + let exit$6 = 0; switch (t2$1) { case "Mushroom" : dec_health(o2$2); @@ -2117,7 +2117,7 @@ function process_collision(dir, c1, c2, state) { } function broad_phase(collid, all_collids, state) { - var obj = collid._2; + let obj = collid._2; return List.filter(function (c) { if (in_viewport(state.vpt, obj.pos) || is_player(collid)) { return true; @@ -2131,34 +2131,34 @@ function check_collisions(collid, all_collids, state) { if (collid.TAG === "Block") { return /* [] */0; } - var broad = broad_phase(collid, all_collids, state); - var _cs = broad; - var _acc = /* [] */0; + let broad = broad_phase(collid, all_collids, state); + let _cs = broad; + let _acc = /* [] */0; while(true) { - var acc = _acc; - var cs = _cs; + let acc = _acc; + let cs = _cs; if (!cs) { return acc; } - var h = cs.hd; - var c_obj = collid._2; - var new_objs; + let h = cs.hd; + let c_obj = collid._2; + let new_objs; if (equals(collid, h)) { new_objs = [ undefined, undefined ]; } else { - var dir = check_collision(collid, h); + let dir = check_collision(collid, h); new_objs = dir !== undefined && h._2.id !== c_obj.id ? process_collision(dir, collid, h, state) : [ undefined, undefined ]; } - var o = new_objs[0]; - var acc$1; + let o = new_objs[0]; + let acc$1; if (o !== undefined) { - var o2 = new_objs[1]; + let o2 = new_objs[1]; acc$1 = o2 !== undefined ? ({ hd: o, tl: { @@ -2170,7 +2170,7 @@ function check_collisions(collid, all_collids, state) { tl: acc }); } else { - var o$1 = new_objs[1]; + let o$1 = new_objs[1]; acc$1 = o$1 !== undefined ? ({ hd: o$1, tl: acc @@ -2183,17 +2183,17 @@ function check_collisions(collid, all_collids, state) { } function update_collidable(state, collid, all_collids) { - var obj = collid._2; - var spr = collid._1; + let obj = collid._2; + let spr = collid._1; obj.invuln = obj.invuln > 0 ? obj.invuln - 1 | 0 : 0; - var viewport_filter = in_viewport(state.vpt, obj.pos) || is_player(collid) || out_of_viewport_below(state.vpt, obj.pos.y); + let viewport_filter = in_viewport(state.vpt, obj.pos) || is_player(collid) || out_of_viewport_below(state.vpt, obj.pos.y); if (!(!obj.kill && viewport_filter)) { return /* [] */0; } obj.grounded = false; process_obj(obj, state.map); - var evolved = check_collisions(collid, all_collids, state); - var vpt_adj_xy = coord_to_viewport(state.vpt, obj.pos); + let evolved = check_collisions(collid, all_collids, state); + let vpt_adj_xy = coord_to_viewport(state.vpt, obj.pos); render(spr, [ vpt_adj_xy.x, vpt_adj_xy.y @@ -2211,11 +2211,11 @@ function update_collidable(state, collid, all_collids) { } function translate_keys(param) { - var ctrls_0 = [ + let ctrls_0 = [ pressed_keys.left, "CLeft" ]; - var ctrls_1 = { + let ctrls_1 = { hd: [ pressed_keys.right, "CRight" @@ -2234,7 +2234,7 @@ function translate_keys(param) { } } }; - var ctrls = { + let ctrls = { hd: ctrls_0, tl: ctrls_1 }; @@ -2252,13 +2252,13 @@ function translate_keys(param) { function run_update_collid(state, collid, all_collids) { if (collid.TAG === "Player") { - var o = collid._2; - var keys = translate_keys(); + let o = collid._2; + let keys = translate_keys(); o.crouch = false; - var match = update_player(o, keys, state.ctx); - var player; + let match = update_player(o, keys, state.ctx); + let player; if (match !== undefined) { - var new_spr = match[1]; + let new_spr = match[1]; normalize_pos(o.pos, collid._1.params, new_spr.params); player = { TAG: "Player", @@ -2269,33 +2269,33 @@ function run_update_collid(state, collid, all_collids) { } else { player = collid; } - var evolved = update_collidable(state, player, all_collids); + let evolved = update_collidable(state, player, all_collids); collid_objs.contents = Pervasives.$at(collid_objs.contents, evolved); return player; } - var obj = collid._2; - var evolved$1 = update_collidable(state, collid, all_collids); + let obj = collid._2; + let evolved$1 = update_collidable(state, collid, all_collids); if (!obj.kill) { collid_objs.contents = { hd: collid, tl: Pervasives.$at(collid_objs.contents, evolved$1) }; } - var new_parts = obj.kill ? kill(collid, state.ctx) : /* [] */0; + let new_parts = obj.kill ? kill(collid, state.ctx) : /* [] */0; particles.contents = Pervasives.$at(particles.contents, new_parts); return collid; } function update_loop(canvas, param, map_dim) { - var player = param[0]; - var ctx = Curry._1(canvas.getContext, "2d"); - var cwidth = canvas.width / 1; - var cheight = canvas.height / 1; - var viewport = make$3([ + let player = param[0]; + let ctx = Curry._1(canvas.getContext, "2d"); + let cwidth = canvas.width / 1; + let cheight = canvas.height / 1; + let viewport = make$3([ cwidth, cheight ], map_dim); - var state = { + let state = { bgd: make_bgd(ctx), ctx: ctx, vpt: update(viewport, player._2.pos), @@ -2306,23 +2306,23 @@ function update_loop(canvas, param, map_dim) { game_over: false }; Curry._2(state.ctx.scale, 1, 1); - var update_helper = function (time, state, player, objs, parts) { + let update_helper = function (time, state, player, objs, parts) { if (state.game_over === true) { return game_win(state.ctx); } collid_objs.contents = /* [] */0; particles.contents = /* [] */0; - var fps$1 = calc_fps(last_time.contents, time); + let fps$1 = calc_fps(last_time.contents, time); last_time.contents = time; clear_canvas(canvas); - var vpos_x_int = state.vpt.pos.x / 5 | 0; - var bgd_width = state.bgd.params.frame_size[0] | 0; + let vpos_x_int = state.vpt.pos.x / 5 | 0; + let bgd_width = state.bgd.params.frame_size[0] | 0; draw_bgd(state.bgd, Caml_int32.mod_(vpos_x_int, bgd_width)); - var player$1 = run_update_collid(state, player, objs); + let player$1 = run_update_collid(state, player, objs); if (player$1._2.kill === true) { return game_loss(state.ctx); } - var state$1 = { + let state$1 = { bgd: state.bgd, ctx: state.ctx, vpt: update(state.vpt, player$1._2.pos), @@ -2337,8 +2337,8 @@ function update_loop(canvas, param, map_dim) { }), objs); List.iter((function (part) { $$process(part); - var x = part.pos.x - state$1.vpt.pos.x; - var y = part.pos.y - state$1.vpt.pos.y; + let x = part.pos.x - state$1.vpt.pos.x; + let y = part.pos.y - state$1.vpt.pos.y; render(part.params.sprite, [ x, y @@ -2362,7 +2362,7 @@ function update_loop(canvas, param, map_dim) { } function keydown(evt) { - var match = evt.keyCode; + let match = evt.keyCode; if (match >= 41) { switch (match) { case 65 : @@ -2410,7 +2410,7 @@ function keydown(evt) { } function keyup(evt) { - var match = evt.keyCode; + let match = evt.keyCode; if (match >= 68) { if (match !== 83) { if (match !== 87) { @@ -2457,7 +2457,7 @@ function keyup(evt) { return true; } -var Director = { +let Director = { update_loop: update_loop, keydown: keydown, keyup: keyup @@ -2465,7 +2465,7 @@ var Director = { function mem_loc(checkloc, _loclist) { while(true) { - var loclist = _loclist; + let loclist = _loclist; if (!loclist) { return false; } @@ -2481,7 +2481,7 @@ function convert_list(lst) { if (!lst) { return /* [] */0; } - var h = lst.hd; + let h = lst.hd; return Pervasives.$at({ hd: [ h[0], @@ -2537,12 +2537,12 @@ function choose_sblock_typ(typ) { function avoid_overlap(_lst, currentLst) { while(true) { - var lst = _lst; + let lst = _lst; if (!lst) { return /* [] */0; } - var t = lst.tl; - var h = lst.hd; + let t = lst.tl; + let h = lst.hd; if (!mem_loc(h[1], currentLst)) { return Pervasives.$at({ hd: h, @@ -2556,16 +2556,16 @@ function avoid_overlap(_lst, currentLst) { function trim_edges(_lst, blockw, blockh) { while(true) { - var lst = _lst; + let lst = _lst; if (!lst) { return /* [] */0; } - var t = lst.tl; - var h = lst.hd; - var cx = h[1][0]; - var cy = h[1][1]; - var pixx = blockw * 16; - var pixy = blockh * 16; + let t = lst.tl; + let h = lst.hd; + let cx = h[1][0]; + let cy = h[1][1]; + let pixx = blockw * 16; + let pixy = blockh * 16; if (!(cx < 128 || pixx - cx < 528 || cy === 0 || pixy - cy < 48)) { return Pervasives.$at({ hd: h, @@ -2596,16 +2596,16 @@ function generate_clouds(cbx, cby, typ, num) { function generate_coins(_block_coord) { while(true) { - var block_coord = _block_coord; - var place_coin = Random.$$int(2); + let block_coord = _block_coord; + let place_coin = Random.$$int(2); if (!block_coord) { return /* [] */0; } - var t = block_coord.tl; - var h = block_coord.hd; + let t = block_coord.tl; + let h = block_coord.hd; if (place_coin === 0) { - var xc = h[1][0]; - var yc = h[1][1]; + let xc = h[1][0]; + let yc = h[1][1]; return Pervasives.$at({ hd: [ 0, @@ -2626,10 +2626,10 @@ function choose_block_pattern(blockw, blockh, cbx, cby, prob) { if (cbx > blockw || cby > blockh) { return /* [] */0; } - var block_typ = Random.$$int(4); - var stair_typ = Random.$$int(2); - var life_block_chance = Random.$$int(5); - var middle_block = life_block_chance === 0 ? 3 : stair_typ; + let block_typ = Random.$$int(4); + let stair_typ = Random.$$int(2); + let life_block_chance = Random.$$int(5); + let middle_block = life_block_chance === 0 ? 3 : stair_typ; switch (prob) { case 0 : if (blockw - cbx > 2) { @@ -2694,7 +2694,7 @@ function choose_block_pattern(blockw, blockh, cbx, cby, prob) { }; } case 1 : - var num_clouds = Random.$$int(5) + 5 | 0; + let num_clouds = Random.$$int(5) + 5 | 0; if (cby < 5) { return generate_clouds(cbx, cby, 2, num_clouds); } else { @@ -2702,14 +2702,14 @@ function choose_block_pattern(blockw, blockh, cbx, cby, prob) { } case 2 : if (blockh - cby === 1) { - var four_0 = [ + let four_0 = [ stair_typ, [ cbx, cby ] ]; - var four_1 = { + let four_1 = { hd: [ stair_typ, [ @@ -2737,18 +2737,18 @@ function choose_block_pattern(blockw, blockh, cbx, cby, prob) { } } }; - var four = { + let four = { hd: four_0, tl: four_1 }; - var three_0 = [ + let three_0 = [ stair_typ, [ cbx + 1, cby - 1 ] ]; - var three_1 = { + let three_1 = { hd: [ stair_typ, [ @@ -2767,18 +2767,18 @@ function choose_block_pattern(blockw, blockh, cbx, cby, prob) { tl: /* [] */0 } }; - var three = { + let three = { hd: three_0, tl: three_1 }; - var two_0 = [ + let two_0 = [ stair_typ, [ cbx + 2, cby - 2 ] ]; - var two_1 = { + let two_1 = { hd: [ stair_typ, [ @@ -2788,18 +2788,18 @@ function choose_block_pattern(blockw, blockh, cbx, cby, prob) { ], tl: /* [] */0 }; - var two = { + let two = { hd: two_0, tl: two_1 }; - var one_0 = [ + let one_0 = [ stair_typ, [ cbx + 3, cby - 3 ] ]; - var one = { + let one = { hd: one_0, tl: /* [] */0 }; @@ -2809,14 +2809,14 @@ function choose_block_pattern(blockw, blockh, cbx, cby, prob) { } case 3 : if (stair_typ === 0 && blockh - cby > 3) { - var three_0$1 = [ + let three_0$1 = [ stair_typ, [ cbx, cby ] ]; - var three_1$1 = { + let three_1$1 = { hd: [ stair_typ, [ @@ -2835,18 +2835,18 @@ function choose_block_pattern(blockw, blockh, cbx, cby, prob) { tl: /* [] */0 } }; - var three$1 = { + let three$1 = { hd: three_0$1, tl: three_1$1 }; - var two_0$1 = [ + let two_0$1 = [ stair_typ, [ cbx + 2, cby + 1 ] ]; - var two_1$1 = { + let two_1$1 = { hd: [ stair_typ, [ @@ -2856,18 +2856,18 @@ function choose_block_pattern(blockw, blockh, cbx, cby, prob) { ], tl: /* [] */0 }; - var two$1 = { + let two$1 = { hd: two_0$1, tl: two_1$1 }; - var one_0$1 = [ + let one_0$1 = [ stair_typ, [ cbx + 5, cby + 2 ] ]; - var one_1 = { + let one_1 = { hd: [ stair_typ, [ @@ -2877,20 +2877,20 @@ function choose_block_pattern(blockw, blockh, cbx, cby, prob) { ], tl: /* [] */0 }; - var one$1 = { + let one$1 = { hd: one_0$1, tl: one_1 }; return Pervasives.$at(three$1, Pervasives.$at(two$1, one$1)); } else if (blockh - cby > 2) { - var one_0$2 = [ + let one_0$2 = [ stair_typ, [ cbx, cby ] ]; - var one_1$1 = { + let one_1$1 = { hd: [ stair_typ, [ @@ -2900,18 +2900,18 @@ function choose_block_pattern(blockw, blockh, cbx, cby, prob) { ], tl: /* [] */0 }; - var one$2 = { + let one$2 = { hd: one_0$2, tl: one_1$1 }; - var two_0$2 = [ + let two_0$2 = [ stair_typ, [ cbx + 3, cby - 1 ] ]; - var two_1$2 = { + let two_1$2 = { hd: [ stair_typ, [ @@ -2921,18 +2921,18 @@ function choose_block_pattern(blockw, blockh, cbx, cby, prob) { ], tl: /* [] */0 }; - var two$2 = { + let two$2 = { hd: two_0$2, tl: two_1$2 }; - var three_0$2 = [ + let three_0$2 = [ stair_typ, [ cbx + 4, cby - 2 ] ]; - var three_1$2 = { + let three_1$2 = { hd: [ stair_typ, [ @@ -2951,7 +2951,7 @@ function choose_block_pattern(blockw, blockh, cbx, cby, prob) { tl: /* [] */0 } }; - var three$2 = { + let three$2 = { hd: three_0$2, tl: three_1$2 }; @@ -3052,8 +3052,8 @@ function choose_block_pattern(blockw, blockh, cbx, cby, prob) { function generate_enemies(blockw, blockh, _cbx, _cby, acc) { while(true) { - var cby = _cby; - var cbx = _cbx; + let cby = _cby; + let cbx = _cbx; if (cbx > blockw - 32) { return /* [] */0; } @@ -3069,16 +3069,16 @@ function generate_enemies(blockw, blockh, _cbx, _cby, acc) { _cby = cby + 1; continue ; } - var prob = Random.$$int(30); + let prob = Random.$$int(30); if (prob < 3 && blockh - 1 === cby) { - var enemy_0 = [ + let enemy_0 = [ prob, [ cbx * 16, cby * 16 ] ]; - var enemy = { + let enemy = { hd: enemy_0, tl: /* [] */0 }; @@ -3091,17 +3091,17 @@ function generate_enemies(blockw, blockh, _cbx, _cby, acc) { function generate_block_enemies(_block_coord) { while(true) { - var block_coord = _block_coord; - var place_enemy = Random.$$int(20); - var enemy_typ = Random.$$int(3); + let block_coord = _block_coord; + let place_enemy = Random.$$int(20); + let enemy_typ = Random.$$int(3); if (!block_coord) { return /* [] */0; } - var t = block_coord.tl; - var h = block_coord.hd; + let t = block_coord.tl; + let h = block_coord.hd; if (place_enemy === 0) { - var xc = h[1][0]; - var yc = h[1][1]; + let xc = h[1][0]; + let yc = h[1][1]; return Pervasives.$at({ hd: [ enemy_typ, @@ -3120,9 +3120,9 @@ function generate_block_enemies(_block_coord) { function generate_block_locs(blockw, blockh, _cbx, _cby, _acc) { while(true) { - var acc = _acc; - var cby = _cby; - var cbx = _cbx; + let acc = _acc; + let cby = _cby; + let cbx = _cbx; if (blockw - cbx < 33) { return acc; } @@ -3138,11 +3138,11 @@ function generate_block_locs(blockw, blockh, _cbx, _cby, _acc) { _cby = cby + 1; continue ; } - var prob = Random.$$int(100); + let prob = Random.$$int(100); if (prob < 5) { - var newacc = choose_block_pattern(blockw, blockh, cbx, cby, prob); - var undup_lst = avoid_overlap(newacc, acc); - var called_acc = Pervasives.$at(acc, undup_lst); + let newacc = choose_block_pattern(blockw, blockh, cbx, cby, prob); + let undup_lst = avoid_overlap(newacc, acc); + let called_acc = Pervasives.$at(acc, undup_lst); _acc = called_acc; _cby = cby + 1; continue ; @@ -3164,14 +3164,14 @@ function generate_panel(context, blockw, blockh) { function generate_ground(blockw, blockh, _inc, _acc) { while(true) { - var acc = _acc; - var inc = _inc; + let acc = _acc; + let inc = _inc; if (inc > blockw) { return acc; } if (inc > 10) { - var skip = Random.$$int(10); - var newacc = Pervasives.$at(acc, { + let skip = Random.$$int(10); + let newacc = Pervasives.$at(acc, { hd: [ 4, [ @@ -3189,7 +3189,7 @@ function generate_ground(blockw, blockh, _inc, _acc) { _inc = inc + 1; continue ; } - var newacc$1 = Pervasives.$at(acc, { + let newacc$1 = Pervasives.$at(acc, { hd: [ 4, [ @@ -3209,9 +3209,9 @@ function convert_to_block_obj(lst, context) { if (!lst) { return /* [] */0; } - var h = lst.hd; - var sblock_typ = choose_sblock_typ(h[0]); - var ob = spawn({ + let h = lst.hd; + let sblock_typ = choose_sblock_typ(h[0]); + let ob = spawn({ TAG: "SBlock", _0: sblock_typ }, context, h[1]); @@ -3225,9 +3225,9 @@ function convert_to_enemy_obj(lst, context) { if (!lst) { return /* [] */0; } - var h = lst.hd; - var senemy_typ = choose_enemy_typ(h[0]); - var ob = spawn({ + let h = lst.hd; + let senemy_typ = choose_enemy_typ(h[0]); + let ob = spawn({ TAG: "SEnemy", _0: senemy_typ }, context, h[1]); @@ -3241,7 +3241,7 @@ function convert_to_coin_obj(lst, context) { if (!lst) { return /* [] */0; } - var ob = spawn({ + let ob = spawn({ TAG: "SItem", _0: "Coin" }, context, lst.hd[1]); @@ -3252,23 +3252,23 @@ function convert_to_coin_obj(lst, context) { } function generate_helper(blockw, blockh, cx, cy, context) { - var block_locs = generate_block_locs(blockw, blockh, 0, 0, /* [] */0); - var converted_block_locs = trim_edges(convert_list(block_locs), blockw, blockh); - var obj_converted_block_locs = convert_to_block_obj(converted_block_locs, context); - var ground_blocks = generate_ground(blockw, blockh, 0, /* [] */0); - var obj_converted_ground_blocks = convert_to_block_obj(ground_blocks, context); - var block_locations = Pervasives.$at(block_locs, ground_blocks); - var all_blocks = Pervasives.$at(obj_converted_block_locs, obj_converted_ground_blocks); - var enemy_locs = generate_enemies(blockw, blockh, 0, 0, block_locations); - var obj_converted_enemies = convert_to_enemy_obj(enemy_locs, context); - var coin_locs = generate_coins(converted_block_locs); - var undup_coin_locs = trim_edges(avoid_overlap(coin_locs, converted_block_locs), blockw, blockh); - var converted_block_coin_locs = Pervasives.$at(converted_block_locs, coin_locs); - var enemy_block_locs = generate_block_enemies(converted_block_locs); - var undup_enemy_block_locs = avoid_overlap(enemy_block_locs, converted_block_coin_locs); - var obj_enemy_blocks = convert_to_enemy_obj(undup_enemy_block_locs, context); - var coin_objects = convert_to_coin_obj(undup_coin_locs, context); - var obj_panel = generate_panel(context, blockw, blockh); + let block_locs = generate_block_locs(blockw, blockh, 0, 0, /* [] */0); + let converted_block_locs = trim_edges(convert_list(block_locs), blockw, blockh); + let obj_converted_block_locs = convert_to_block_obj(converted_block_locs, context); + let ground_blocks = generate_ground(blockw, blockh, 0, /* [] */0); + let obj_converted_ground_blocks = convert_to_block_obj(ground_blocks, context); + let block_locations = Pervasives.$at(block_locs, ground_blocks); + let all_blocks = Pervasives.$at(obj_converted_block_locs, obj_converted_ground_blocks); + let enemy_locs = generate_enemies(blockw, blockh, 0, 0, block_locations); + let obj_converted_enemies = convert_to_enemy_obj(enemy_locs, context); + let coin_locs = generate_coins(converted_block_locs); + let undup_coin_locs = trim_edges(avoid_overlap(coin_locs, converted_block_locs), blockw, blockh); + let converted_block_coin_locs = Pervasives.$at(converted_block_locs, coin_locs); + let enemy_block_locs = generate_block_enemies(converted_block_locs); + let undup_enemy_block_locs = avoid_overlap(enemy_block_locs, converted_block_coin_locs); + let obj_enemy_blocks = convert_to_enemy_obj(undup_enemy_block_locs, context); + let coin_objects = convert_to_coin_obj(undup_coin_locs, context); + let obj_panel = generate_panel(context, blockw, blockh); return Pervasives.$at(all_blocks, Pervasives.$at(obj_converted_enemies, Pervasives.$at(coin_objects, Pervasives.$at(obj_enemy_blocks, { hd: obj_panel, tl: /* [] */0 @@ -3276,10 +3276,10 @@ function generate_helper(blockw, blockh, cx, cy, context) { } function generate(w, h, context) { - var blockw = w / 16; - var blockh = h / 16 - 1; - var collide_list = generate_helper(blockw, blockh, 0, 0, context); - var player = spawn({ + let blockw = w / 16; + let blockh = h / 16 - 1; + let collide_list = generate_helper(blockw, blockh, 0, 0, context); + let player = spawn({ TAG: "SPlayer", _0: "SmallM", _1: "Standing" @@ -3297,20 +3297,20 @@ function init(param) { Random.self_init(); } -var Procedural_generator = { +let Procedural_generator = { init: init, generate: generate }; -var loadCount = { +let loadCount = { contents: 0 }; function load(param) { Random.self_init(); - var canvas_id = "canvas"; - var el = document.getElementById(canvas_id); - var canvas; + let canvas_id = "canvas"; + let el = document.getElementById(canvas_id); + let canvas; if (el !== null) { canvas = el; } else { @@ -3321,7 +3321,7 @@ function load(param) { Error: new Error() }; } - var context = Curry._1(canvas.getContext, "2d"); + let context = Curry._1(canvas.getContext, "2d"); document.addEventListener("keydown", keydown, true); document.addEventListener("keyup", keyup, true); Random.self_init(); @@ -3342,8 +3342,8 @@ function inc_counter(param) { function preload(param) { return List.map((function (img_src) { - var img_src$1 = "sprites/" + img_src; - var img = document.createElement("img"); + let img_src$1 = "sprites/" + img_src; + let img = document.createElement("img"); img.src = img_src$1; img.addEventListener("load", (function (ev) { inc_counter(); @@ -3369,7 +3369,7 @@ window.onload = (function (param) { return true; }); -var Main = { +let Main = { Html: undefined, Pg: undefined, loadCount: loadCount, diff --git a/jscomp/test/marshal.js b/jscomp/test/marshal.js index 45d6433826..1b044bd79c 100644 --- a/jscomp/test/marshal.js +++ b/jscomp/test/marshal.js @@ -1,8 +1,8 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Bytes = require("../../lib/js/bytes.js"); -var Caml_external_polyfill = require("../../lib/js/caml_external_polyfill.js"); +let Bytes = require("../../lib/js/bytes.js"); +let Caml_external_polyfill = require("../../lib/js/caml_external_polyfill.js"); function to_buffer(buff, ofs, len, v, flags) { if (ofs < 0 || len < 0 || ofs > (buff.length - len | 0)) { @@ -38,7 +38,7 @@ function from_bytes(buff, ofs) { Error: new Error() }; } - var len = Caml_external_polyfill.resolve("marshal_data_size")(buff, ofs); + let len = Caml_external_polyfill.resolve("marshal_data_size")(buff, ofs); if (ofs > (buff.length - (20 + len | 0) | 0)) { throw { RE_EXN_ID: "Invalid_argument", @@ -53,7 +53,7 @@ function from_string(buff, ofs) { return from_bytes(Bytes.unsafe_of_string(buff), ofs); } -var header_size = 20; +let header_size = 20; exports.to_buffer = to_buffer; exports.header_size = header_size; diff --git a/jscomp/test/method_name_test.js b/jscomp/test/method_name_test.js index 3a365a54d4..4d0850373d 100644 --- a/jscomp/test/method_name_test.js +++ b/jscomp/test/method_name_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Curry = require("../../lib/js/curry.js"); +let Mt = require("./mt.js"); +let Curry = require("../../lib/js/curry.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -44,11 +44,11 @@ function ff(x, i, v) { return Curry._1(x._open__, 3); } -var u = { +let u = { "_Content'type": "x" }; -var h = { +let h = { _open: 3, _end: 32 }; diff --git a/jscomp/test/method_string_name.js b/jscomp/test/method_string_name.js index 2f9a024f57..96e725df69 100644 --- a/jscomp/test/method_string_name.js +++ b/jscomp/test/method_string_name.js @@ -2,7 +2,7 @@ 'use strict'; -var f = { +let f = { "Content-Type": 3 }; diff --git a/jscomp/test/minimal_test.js b/jscomp/test/minimal_test.js index b3b5967bb1..ed66ae46d2 100644 --- a/jscomp/test/minimal_test.js +++ b/jscomp/test/minimal_test.js @@ -2,7 +2,7 @@ 'use strict'; -var fake_y = { +let fake_y = { hd: 2, tl: { hd: 3, @@ -10,7 +10,7 @@ var fake_y = { } }; -var fake_z = { +let fake_z = { hd: 1, tl: fake_y }; diff --git a/jscomp/test/miss_colon_test.js b/jscomp/test/miss_colon_test.js index 12da39d9ac..f70c7122f5 100644 --- a/jscomp/test/miss_colon_test.js +++ b/jscomp/test/miss_colon_test.js @@ -4,10 +4,10 @@ function $plus$colon(_f, _g) { while(true) { - var g = _g; - var f = _f; + let g = _g; + let f = _f; if (f.TAG === "Int") { - var n = f._0; + let n = f._0; if (g.TAG === "Int") { return { TAG: "Int", @@ -48,12 +48,12 @@ function $plus$colon(_f, _g) { function $star$colon(_f, _g) { while(true) { - var g = _g; - var f = _f; - var exit = 0; - var exit$1 = 0; + let g = _g; + let f = _f; + let exit = 0; + let exit$1 = 0; if (f.TAG === "Int") { - var n = f._0; + let n = f._0; if (g.TAG === "Int") { return { TAG: "Int", diff --git a/jscomp/test/mock_mt.js b/jscomp/test/mock_mt.js index 39e1bd2b0a..3fed04d922 100644 --- a/jscomp/test/mock_mt.js +++ b/jscomp/test/mock_mt.js @@ -1,8 +1,8 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var List = require("../../lib/js/list.js"); -var Curry = require("../../lib/js/curry.js"); +let List = require("../../lib/js/list.js"); +let Curry = require("../../lib/js/curry.js"); function from_pair_suites(name, suites) { console.log([ @@ -10,8 +10,8 @@ function from_pair_suites(name, suites) { "testing" ]); List.iter((function (param) { - var name = param[0]; - var fn = Curry._1(param[1], undefined); + let name = param[0]; + let fn = Curry._1(param[1], undefined); switch (fn.TAG) { case "Eq" : console.log([ diff --git a/jscomp/test/module_alias_test.js b/jscomp/test/module_alias_test.js index c1f9755f35..73cc0d9ee9 100644 --- a/jscomp/test/module_alias_test.js +++ b/jscomp/test/module_alias_test.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var List = require("../../lib/js/list.js"); -var Curry = require("../../lib/js/curry.js"); +let Mt = require("./mt.js"); +let List = require("../../lib/js/list.js"); +let Curry = require("../../lib/js/curry.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -36,9 +36,9 @@ function f(x) { return List; } -var h = f(/* [] */0); +let h = f(/* [] */0); -var a = Curry._1(h.length, { +let a = Curry._1(h.length, { hd: 1, tl: { hd: 2, @@ -53,11 +53,11 @@ eq("File \"module_alias_test.res\", line 30, characters 3-10", a, 3); Mt.from_pair_suites("Module_alias_test", suites.contents); -var N; +let N; -var V; +let V; -var J; +let J; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/module_as_class_ffi.js b/jscomp/test/module_as_class_ffi.js index 9452d53088..5e45174035 100644 --- a/jscomp/test/module_as_class_ffi.js +++ b/jscomp/test/module_as_class_ffi.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Foo_class = require("xx/foo_class"); +let Foo_class = require("xx/foo_class"); function f(param) { return new Foo_class(3); diff --git a/jscomp/test/module_as_function.js b/jscomp/test/module_as_function.js index 622cb03997..2ee8e65ede 100644 --- a/jscomp/test/module_as_function.js +++ b/jscomp/test/module_as_function.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Nightmare = require("nightmare"); +let Nightmare = require("nightmare"); -var v = Nightmare({ +let v = Nightmare({ show: true }); diff --git a/jscomp/test/module_missing_conversion.js b/jscomp/test/module_missing_conversion.js index dfff882be9..7ff3d52b5e 100644 --- a/jscomp/test/module_missing_conversion.js +++ b/jscomp/test/module_missing_conversion.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var $$Array = require("../../lib/js/array.js"); -var $$String = require("../../lib/js/string.js"); -var MoreLabels = require("../../lib/js/moreLabels.js"); +let $$Array = require("../../lib/js/array.js"); +let $$String = require("../../lib/js/string.js"); +let MoreLabels = require("../../lib/js/moreLabels.js"); function f(x) { return x; } -var XX = { +let XX = { make_float: $$Array.make_float, init: $$Array.init, make_matrix: $$Array.make_matrix, @@ -41,11 +41,11 @@ var XX = { f: f }; -var u = [$$String]; +let u = [$$String]; -var hh = "x".length; +let hh = "x".length; -var ghh = MoreLabels.Hashtbl.create(undefined, 30); +let ghh = MoreLabels.Hashtbl.create(undefined, 30); exports.XX = XX; exports.u = u; diff --git a/jscomp/test/module_parameter_test.js b/jscomp/test/module_parameter_test.js index 313ee6ec8a..226fa02a6d 100644 --- a/jscomp/test/module_parameter_test.js +++ b/jscomp/test/module_parameter_test.js @@ -1,26 +1,26 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var $$String = require("../../lib/js/string.js"); +let Mt = require("./mt.js"); +let $$String = require("../../lib/js/string.js"); function u(v) { return v; } -var s = $$String; +let s = $$String; -var N = { +let N = { s: s }; -var v0 = "x".length; +let v0 = "x".length; function v(x) { return x.length; } -var suites_0 = [ +let suites_0 = [ "const", (function (param) { return { @@ -31,7 +31,7 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "other", (function (param) { @@ -45,7 +45,7 @@ var suites_1 = { tl: /* [] */0 }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/module_splice_test.js b/jscomp/test/module_splice_test.js index 29087fe127..7cf9fec71f 100644 --- a/jscomp/test/module_splice_test.js +++ b/jscomp/test/module_splice_test.js @@ -1,21 +1,21 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var JoinClasses = require("./joinClasses"); -var Caml_splice_call = require("../../lib/js/caml_splice_call.js"); +let Mt = require("./mt.js"); +let JoinClasses = require("./joinClasses"); +let Caml_splice_call = require("../../lib/js/caml_splice_call.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; function eq(loc, param) { - var y = param[1]; - var x = param[0]; + let y = param[1]; + let x = param[0]; test_id.contents = test_id.contents + 1 | 0; suites.contents = { hd: [ @@ -36,9 +36,9 @@ function joinClasses(prim) { return Caml_splice_call.spliceApply(JoinClasses, [prim]); } -var a = JoinClasses(1, 2, 3); +let a = JoinClasses(1, 2, 3); -var pair = [ +let pair = [ a, 6 ]; diff --git a/jscomp/test/more_poly_variant_test.js b/jscomp/test/more_poly_variant_test.js index 27ae52ec7f..6d3fafdad8 100644 --- a/jscomp/test/more_poly_variant_test.js +++ b/jscomp/test/more_poly_variant_test.js @@ -6,7 +6,7 @@ function map(f, x) { if (typeof x !== "object") { return "Nil"; } - var match = x.VAL; + let match = x.VAL; return { NAME: "Cons", VAL: [ diff --git a/jscomp/test/mpr_6033_test.js b/jscomp/test/mpr_6033_test.js index d302548aef..0aa8eb3024 100644 --- a/jscomp/test/mpr_6033_test.js +++ b/jscomp/test/mpr_6033_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var CamlinternalLazy = require("../../lib/js/camlinternalLazy.js"); +let Mt = require("./mt.js"); +let CamlinternalLazy = require("../../lib/js/camlinternalLazy.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -33,13 +33,13 @@ function f(x) { return CamlinternalLazy.force(x) + "abc"; } -var x = CamlinternalLazy.from_fun(function () { +let x = CamlinternalLazy.from_fun(function () { return "def"; }); CamlinternalLazy.force(x); -var u = CamlinternalLazy.force(x) + "abc"; +let u = CamlinternalLazy.force(x) + "abc"; eq("File \"mpr_6033_test.res\", line 20, characters 3-10", u, "defabc"); diff --git a/jscomp/test/mt.js b/jscomp/test/mt.js index 0fef5a3df4..a49dfbd4fe 100644 --- a/jscomp/test/mt.js +++ b/jscomp/test/mt.js @@ -1,27 +1,27 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var List = require("../../lib/js/list.js"); -var Path = require("path"); -var $$Array = require("../../lib/js/array.js"); -var Curry = require("../../lib/js/curry.js"); -var Assert = require("assert"); -var Process = require("process"); +let List = require("../../lib/js/list.js"); +let Path = require("path"); +let $$Array = require("../../lib/js/array.js"); +let Curry = require("../../lib/js/curry.js"); +let Assert = require("assert"); +let Process = require("process"); function assert_fail(msg) { Assert.fail(undefined, undefined, msg, ""); } function is_mocha(param) { - var match = $$Array.to_list(Process.argv); + let match = $$Array.to_list(Process.argv); if (!match) { return false; } - var match$1 = match.tl; + let match$1 = match.tl; if (!match$1) { return false; } - var exec = Path.basename(match$1.hd); + let exec = Path.basename(match$1.hd); if (exec === "mocha") { return true; } else { @@ -29,7 +29,7 @@ function is_mocha(param) { } } -var from_suites = (function from_suites(name, suite) { +let from_suites = (function from_suites(name, suite) { var match = $$Array.to_list(Process.argv); if (match && is_mocha(undefined)) { describe(name, (function () { @@ -46,7 +46,7 @@ var from_suites = (function from_suites(name, suite) { }); function close_enough(thresholdOpt, a, b) { - var threshold = thresholdOpt !== undefined ? thresholdOpt : 0.0000001; + let threshold = thresholdOpt !== undefined ? thresholdOpt : 0.0000001; return Math.abs(a - b) < threshold; } @@ -68,8 +68,8 @@ function handleCode(spec) { Assert.ok(spec._0); return; case "Approx" : - var b = spec._1; - var a = spec._0; + let b = spec._1; + let a = spec._0; if (!close_enough(undefined, a, b)) { Assert.deepEqual(a, b); return; @@ -77,8 +77,8 @@ function handleCode(spec) { return; } case "ApproxThreshold" : - var b$1 = spec._2; - var a$1 = spec._1; + let b$1 = spec._2; + let a$1 = spec._1; if (!close_enough(spec._0, a$1, b$1)) { Assert.deepEqual(a$1, b$1); return; @@ -105,7 +105,7 @@ function force_curry(x) { return Curry._1(x, undefined); } -var from_pair_suites = (function from_pair_suites(name, suites) { +let from_pair_suites = (function from_pair_suites(name, suites) { var match = $$Array.to_list(Process.argv); if (match) { if (is_mocha(undefined)) { @@ -201,9 +201,9 @@ var from_pair_suites = (function from_pair_suites(name, suites) { }); -var val_unit = Promise.resolve(); +let val_unit = Promise.resolve(); -var from_promise_suites = (function from_promise_suites(name, suites) { +let from_promise_suites = (function from_promise_suites(name, suites) { var match = $$Array.to_list(Process.argv); if (match) { if (is_mocha(undefined)) { @@ -228,14 +228,14 @@ var from_promise_suites = (function from_promise_suites(name, suites) { }); function old_from_promise_suites_donotuse(name, suites) { - var match = $$Array.to_list(Process.argv); + let match = $$Array.to_list(Process.argv); if (match) { if (is_mocha()) { describe(name, (function () { List.iter((function (param) { - var code = param[1]; + let code = param[1]; it(param[0], (function (param) { - var arg1 = function (x) { + let arg1 = function (x) { handleCode(x); return val_unit; }; diff --git a/jscomp/test/mutable_uncurry_test.js b/jscomp/test/mutable_uncurry_test.js index 92d1834244..2889661fd4 100644 --- a/jscomp/test/mutable_uncurry_test.js +++ b/jscomp/test/mutable_uncurry_test.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Curry = require("../../lib/js/curry.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); +let Mt = require("./mt.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -18,13 +18,13 @@ function eqs(loc, x, y) { } function eq(param, param$1) { - var x = param.contents; - var y = param$1.contents; + let x = param.contents; + let y = param$1.contents; return x === y; } function eq2(x, param) { - var y = param.contents; + let y = param.contents; return Caml_obj.equal(x.contents, y); } @@ -41,9 +41,9 @@ eqs("File \"mutable_uncurry_test.res\", line 16, characters 4-11", true, eq({ })); function ut3(param, param$1, param$2) { - var x0 = param.contents; - var x1 = param$1.contents; - var x2 = param$2.contents; + let x0 = param.contents; + let x1 = param$1.contents; + let x2 = param$2.contents; return [ x0, x1, @@ -52,11 +52,11 @@ function ut3(param, param$1, param$2) { } function t3(param) { - var x0 = param.contents; + let x0 = param.contents; return function (param) { - var x1 = param.contents; + let x1 = param.contents; return function (param) { - var x2 = param.contents; + let x2 = param.contents; return [ x0, x1, @@ -67,12 +67,12 @@ function t3(param) { } function ut4(param, param$1, param$2, param$3) { - var x0 = param.contents; - var x1 = param$1.contents; + let x0 = param.contents; + let x1 = param$1.contents; return Curry._2((function (param) { - var x2 = param.contents; + let x2 = param.contents; return function (param) { - var x3 = param.contents; + let x3 = param.contents; return [ x0, x1, @@ -84,13 +84,13 @@ function ut4(param, param$1, param$2, param$3) { } function t4(param) { - var x0 = param.contents; + let x0 = param.contents; return function (param) { - var x1 = param.contents; + let x1 = param.contents; return function (param) { - var x2 = param.contents; + let x2 = param.contents; return function (param) { - var x3 = param.contents; + let x3 = param.contents; return [ x0, x1, @@ -103,14 +103,14 @@ function t4(param) { } function ut5(param, param$1, param$2, param$3, param$4) { - var x0 = param.contents; - var x1 = param$1.contents; + let x0 = param.contents; + let x1 = param$1.contents; return Curry._3((function (param) { - var x2 = param.contents; + let x2 = param.contents; return function (param) { - var x3 = param.contents; + let x3 = param.contents; return function (param) { - var x4 = param.contents; + let x4 = param.contents; return [ x0, x1, @@ -124,15 +124,15 @@ function ut5(param, param$1, param$2, param$3, param$4) { } function t5(param) { - var x0 = param.contents; + let x0 = param.contents; return function (param) { - var x1 = param.contents; + let x1 = param.contents; return function (param) { - var x2 = param.contents; + let x2 = param.contents; return function (param) { - var x3 = param.contents; + let x3 = param.contents; return function (param) { - var x4 = param.contents; + let x4 = param.contents; return [ x0, x1, @@ -147,16 +147,16 @@ function t5(param) { } function nested0(param, param$1, param$2) { - var x0 = param.contents; - var x1 = param$1.contents; - var x2 = param$2.contents; - var a = (x0 + x1 | 0) + x2 | 0; + let x0 = param.contents; + let x1 = param$1.contents; + let x2 = param$2.contents; + let a = (x0 + x1 | 0) + x2 | 0; return function (param) { - var x0 = param.contents; + let x0 = param.contents; return function (param) { - var x1 = param.contents; + let x1 = param.contents; return function (param) { - var x2 = param.contents; + let x2 = param.contents; return ((a + x0 | 0) + x1 | 0) + x2 | 0; }; }; @@ -164,16 +164,16 @@ function nested0(param, param$1, param$2) { } function nested1(param) { - var x0 = param.contents; + let x0 = param.contents; return function (param) { - var x1 = param.contents; + let x1 = param.contents; return function (param) { - var x2 = param.contents; - var a = (x0 + x1 | 0) + x2 | 0; + let x2 = param.contents; + let a = (x0 + x1 | 0) + x2 | 0; return function (param, param$1, param$2) { - var x0 = param.contents; - var x1 = param$1.contents; - var x2 = param$2.contents; + let x0 = param.contents; + let x1 = param$1.contents; + let x2 = param$2.contents; return ((a + x0 | 0) + x1 | 0) + x2 | 0; }; }; diff --git a/jscomp/test/mutual_non_recursive_type.js b/jscomp/test/mutual_non_recursive_type.js index e8d6f3d70c..adb7f2d4ba 100644 --- a/jscomp/test/mutual_non_recursive_type.js +++ b/jscomp/test/mutual_non_recursive_type.js @@ -6,11 +6,11 @@ function f(x) { return x; } -var U = { +let U = { f: f }; -var v = { +let v = { TAG: "H", _0: "OT" }; diff --git a/jscomp/test/name_mangle_test.js b/jscomp/test/name_mangle_test.js index 4ff9eda7d9..0bf576ce7f 100644 --- a/jscomp/test/name_mangle_test.js +++ b/jscomp/test/name_mangle_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -29,79 +29,79 @@ function eq(loc, x, y) { } function f0(x) { - var old = x._open; + let old = x._open; x._open = old + 1 | 0; return x._open; } function f1(x) { - var old = x._in; + let old = x._in; x._in = old + 1 | 0; return x._in; } function f2(x) { - var old = x._MAX_LENGTH; + let old = x._MAX_LENGTH; x._MAX_LENGTH = old + 1 | 0; return x._MAX_LENGTH; } function f3(x) { - var old = x._Capital; + let old = x._Capital; x._Capital = old + 1 | 0; return x._Capital; } function f4(x) { - var old = x._open__; + let old = x._open__; x._open__ = old + 1 | 0; return x._open__; } function f5(x) { - var old = x.open__; + let old = x.open__; x.open__ = old + 1 | 0; return x.open__; } function f6(x) { - var old = x["_'x"]; + let old = x["_'x"]; x["_'x"] = old + 1 | 0; return x["_'x"]; } function f7(x) { - var old = x._Capital__; + let old = x._Capital__; x._Capital__ = old + 1 | 0; return x._Capital__; } function f8(x) { - var old = x._MAX__; + let old = x._MAX__; x._MAX__ = old + 1 | 0; return x._MAX__; } function f9(x) { - var old = x.__; + let old = x.__; x.__ = old + 1 | 0; return x.__; } function f10(x) { - var old = x.__x; + let old = x.__x; x.__x = old + 1 | 0; return x.__x; } function f11(x) { - var old = x.___; + let old = x.___; x.___ = old + 1 | 0; return x.___; } function f12(x) { - var old = x.____; + let old = x.____; x.____ = old + 1 | 0; return x.____; } diff --git a/jscomp/test/nested_module_alias.js b/jscomp/test/nested_module_alias.js index 0001c46efe..b55b38f628 100644 --- a/jscomp/test/nested_module_alias.js +++ b/jscomp/test/nested_module_alias.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var List = require("../../lib/js/list.js"); +let List = require("../../lib/js/list.js"); function v(x) { return [ @@ -10,7 +10,7 @@ function v(x) { ]; } -var L; +let L; exports.L = L; exports.v = v; diff --git a/jscomp/test/nested_obj_literal.js b/jscomp/test/nested_obj_literal.js index 3549600cc9..a6b2f626cb 100644 --- a/jscomp/test/nested_obj_literal.js +++ b/jscomp/test/nested_obj_literal.js @@ -2,7 +2,7 @@ 'use strict'; -var structural_obj = { +let structural_obj = { x: { y: { z: 3 @@ -10,7 +10,7 @@ var structural_obj = { } }; -var f_record = { +let f_record = { x: { y: { z: 3 diff --git a/jscomp/test/nested_obj_test.js b/jscomp/test/nested_obj_test.js index cbbee0c82f..c10b05ba77 100644 --- a/jscomp/test/nested_obj_test.js +++ b/jscomp/test/nested_obj_test.js @@ -2,7 +2,7 @@ 'use strict'; -var f = { +let f = { x: { y: { z: 3 @@ -10,7 +10,7 @@ var f = { } }; -var f2_0 = { +let f2_0 = { hd: { x: { y: { @@ -30,7 +30,7 @@ var f2_0 = { } }; -var f2_1 = [ +let f2_1 = [ { x: { y: { @@ -47,12 +47,12 @@ var f2_1 = [ } ]; -var f2 = [ +let f2 = [ f2_0, f2_1 ]; -var f3 = { +let f3 = { x: { y: { z: 3 @@ -60,7 +60,7 @@ var f3 = { } }; -var f_record = { +let f_record = { x: { y: { z: 3 diff --git a/jscomp/test/nested_pattern_match_test.js b/jscomp/test/nested_pattern_match_test.js index 6f74ac7747..934a4e028b 100644 --- a/jscomp/test/nested_pattern_match_test.js +++ b/jscomp/test/nested_pattern_match_test.js @@ -6,23 +6,23 @@ function f_list(x) { if (!x) { return 0; } - var match = x.tl; + let match = x.tl; if (!match) { return 0; } - var match$1 = match.tl; + let match$1 = match.tl; if (!match$1) { return 0; } - var match$2 = match$1.tl; + let match$2 = match$1.tl; if (!match$2) { return 0; } - var match$3 = match$2.tl; + let match$3 = match$2.tl; if (!match$3) { return 0; } - var match$4 = match$3.tl; + let match$4 = match$3.tl; if (match$4) { return ((((x.hd + match.hd | 0) + match$1.hd | 0) + match$2.hd | 0) + match$3.hd | 0) + match$4.hd | 0; } else { @@ -34,101 +34,101 @@ function f_arr(x) { if (x.length !== 6) { return 0; } - var a0 = x[0]; - var a1 = x[1]; - var a2 = x[2]; - var a3 = x[3]; - var a4 = x[4]; - var a5 = x[5]; + let a0 = x[0]; + let a1 = x[1]; + let a2 = x[2]; + let a3 = x[3]; + let a4 = x[4]; + let a5 = x[5]; return ((((a0 + a1 | 0) + a2 | 0) + a3 | 0) + a4 | 0) + a5 | 0; } function f_opion(x) { - var match = x.hi; + let match = x.hi; if (match !== 2) { if (match !== 3) { return 0; } - var match$1 = x.lo; + let match$1 = x.lo; if (!match$1) { return 0; } if (match$1.hd !== undefined) { return 0; } - var match$2 = match$1.tl; + let match$2 = match$1.tl; if (!match$2) { return 0; } if (match$2.hd !== undefined) { return 0; } - var match$3 = match$2.tl; + let match$3 = match$2.tl; if (!match$3) { return 0; } - var match$4 = match$3.hd; + let match$4 = match$3.hd; if (match$4 === undefined) { return 0; } if (match$4 !== 2) { return 0; } - var match$5 = match$3.tl; + let match$5 = match$3.tl; if (!match$5) { return 0; } - var match$6 = match$5.hd; + let match$6 = match$5.hd; if (match$6 === undefined) { return 0; } if (match$6 !== 1) { return 0; } - var match$7 = match$5.tl; + let match$7 = match$5.tl; if (match$7 && match$7.hd !== undefined) { return 2; } else { return 0; } } - var match$8 = x.lo; + let match$8 = x.lo; if (!match$8) { return 0; } if (match$8.hd !== undefined) { return 0; } - var match$9 = match$8.tl; + let match$9 = match$8.tl; if (!match$9) { return 0; } if (match$9.hd !== undefined) { return 0; } - var match$10 = match$9.tl; + let match$10 = match$9.tl; if (!match$10) { return 0; } - var match$11 = match$10.hd; + let match$11 = match$10.hd; if (match$11 === undefined) { return 0; } if (match$11 !== 2) { return 0; } - var match$12 = match$10.tl; + let match$12 = match$10.tl; if (!match$12) { return 0; } - var match$13 = match$12.hd; + let match$13 = match$12.hd; if (match$13 === undefined) { return 0; } if (match$13 !== 1) { return 0; } - var match$14 = match$12.tl; + let match$14 = match$12.tl; if (match$14 && match$14.hd !== undefined) { return 3; } else { diff --git a/jscomp/test/node_path_test.js b/jscomp/test/node_path_test.js index a90d6ca929..f836175860 100644 --- a/jscomp/test/node_path_test.js +++ b/jscomp/test/node_path_test.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Path = require("path"); +let Path = require("path"); console.log(Path.join(".", "Node_path_test")); diff --git a/jscomp/test/number_lexer.js b/jscomp/test/number_lexer.js index 9482a28512..dd30c3ec22 100644 --- a/jscomp/test/number_lexer.js +++ b/jscomp/test/number_lexer.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); -var Lexing = require("../../lib/js/lexing.js"); +let Curry = require("../../lib/js/curry.js"); +let Lexing = require("../../lib/js/lexing.js"); function l(prim) { console.log(prim); } -var __ocaml_lex_tables = { +let __ocaml_lex_tables = { lex_base: "\x00\x00\xf6\xff\xf7\xff\xf8\xff\xf9\xff\xfa\xff\xfb\xff\xfc\xff\ \x3a\x00\x85\x00\xff\xff", lex_backtrk: "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\ @@ -123,8 +123,8 @@ var __ocaml_lex_tables = { function __ocaml_lex_token_rec(l, lexbuf, ___ocaml_lex_state) { while(true) { - var __ocaml_lex_state = ___ocaml_lex_state; - var __ocaml_lex_state$1 = Lexing.engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf); + let __ocaml_lex_state = ___ocaml_lex_state; + let __ocaml_lex_state$1 = Lexing.engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf); switch (__ocaml_lex_state$1) { case 0 : Curry._1(l, "new line"); diff --git a/jscomp/test/obj_literal_ppx.js b/jscomp/test/obj_literal_ppx.js index ae45748c70..c04893eba3 100644 --- a/jscomp/test/obj_literal_ppx.js +++ b/jscomp/test/obj_literal_ppx.js @@ -2,12 +2,12 @@ 'use strict'; -var a = { +let a = { x: 3, y: [1] }; -var b = { +let b = { x: 3, y: [1], z: 3, @@ -20,9 +20,9 @@ function f(obj) { return obj.x + obj.y.length | 0; } -var u = f(a); +let u = f(a); -var v = f(b); +let v = f(b); exports.a = a; exports.b = b; diff --git a/jscomp/test/obj_literal_ppx_test.js b/jscomp/test/obj_literal_ppx_test.js index 3006a3944a..b71026113e 100644 --- a/jscomp/test/obj_literal_ppx_test.js +++ b/jscomp/test/obj_literal_ppx_test.js @@ -2,7 +2,7 @@ 'use strict'; -var a = { +let a = { x: 3, y: { hd: 1, diff --git a/jscomp/test/obj_magic_test.js b/jscomp/test/obj_magic_test.js index a9715f75f5..1f4ad65e35 100644 --- a/jscomp/test/obj_magic_test.js +++ b/jscomp/test/obj_magic_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); function is_block(x) { return typeof x !== "number"; } -var suites_0 = [ +let suites_0 = [ "is_block_test1", (function (param) { return { @@ -18,7 +18,7 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "is_block_test2", (function (param) { @@ -59,7 +59,7 @@ var suites_1 = { } }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/ocaml_re_test.js b/jscomp/test/ocaml_re_test.js index 81e3749f4b..e56c8c5f38 100644 --- a/jscomp/test/ocaml_re_test.js +++ b/jscomp/test/ocaml_re_test.js @@ -1,29 +1,29 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml = require("../../lib/js/caml.js"); -var Char = require("../../lib/js/char.js"); -var List = require("../../lib/js/list.js"); -var $$Array = require("../../lib/js/array.js"); -var Bytes = require("../../lib/js/bytes.js"); -var Curry = require("../../lib/js/curry.js"); -var $$String = require("../../lib/js/string.js"); -var Hashtbl = require("../../lib/js/hashtbl.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Caml_array = require("../../lib/js/caml_array.js"); -var Caml_bytes = require("../../lib/js/caml_bytes.js"); -var Pervasives = require("../../lib/js/pervasives.js"); -var Caml_option = require("../../lib/js/caml_option.js"); -var Caml_string = require("../../lib/js/caml_string.js"); -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); - -var suites = { +let Mt = require("./mt.js"); +let Caml = require("../../lib/js/caml.js"); +let Char = require("../../lib/js/char.js"); +let List = require("../../lib/js/list.js"); +let $$Array = require("../../lib/js/array.js"); +let Bytes = require("../../lib/js/bytes.js"); +let Curry = require("../../lib/js/curry.js"); +let $$String = require("../../lib/js/string.js"); +let Hashtbl = require("../../lib/js/hashtbl.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Caml_array = require("../../lib/js/caml_array.js"); +let Caml_bytes = require("../../lib/js/caml_bytes.js"); +let Pervasives = require("../../lib/js/pervasives.js"); +let Caml_option = require("../../lib/js/caml_option.js"); +let Caml_string = require("../../lib/js/caml_string.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); + +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -46,22 +46,22 @@ function eq(loc, x, y) { function union(_l, _l$p) { while(true) { - var l$p = _l$p; - var l = _l; + let l$p = _l$p; + let l = _l; if (!l$p) { return l; } if (!l) { return l$p; } - var r$p = l$p.tl; - var match = l$p.hd; - var c2$p = match[1]; - var c1$p = match[0]; - var r = l.tl; - var match$1 = l.hd; - var c2 = match$1[1]; - var c1 = match$1[0]; + let r$p = l$p.tl; + let match = l$p.hd; + let c2$p = match[1]; + let c1$p = match[0]; + let r = l.tl; + let match$1 = l.hd; + let c2 = match$1[1]; + let c1 = match$1[0]; if ((c2 + 1 | 0) < c1$p) { return { hd: [ @@ -105,22 +105,22 @@ function union(_l, _l$p) { function inter(_l, _l$p) { while(true) { - var l$p = _l$p; - var l = _l; + let l$p = _l$p; + let l = _l; if (!l$p) { return /* [] */0; } if (!l) { return /* [] */0; } - var r$p = l$p.tl; - var match = l$p.hd; - var c2$p = match[1]; - var c1$p = match[0]; - var r = l.tl; - var match$1 = l.hd; - var c2 = match$1[1]; - var c1 = match$1[0]; + let r$p = l$p.tl; + let match = l$p.hd; + let c2$p = match[1]; + let c1$p = match[0]; + let r = l.tl; + let match$1 = l.hd; + let c2 = match$1[1]; + let c1 = match$1[0]; if (Caml_obj.lessthan(c2, c1$p)) { _l = r; continue ; @@ -151,22 +151,22 @@ function inter(_l, _l$p) { function diff(_l, _l$p) { while(true) { - var l$p = _l$p; - var l = _l; + let l$p = _l$p; + let l = _l; if (!l$p) { return l; } if (!l) { return /* [] */0; } - var r$p = l$p.tl; - var match = l$p.hd; - var c2$p = match[1]; - var c1$p = match[0]; - var r = l.tl; - var match$1 = l.hd; - var c2 = match$1[1]; - var c1 = match$1[0]; + let r$p = l$p.tl; + let match = l$p.hd; + let c2$p = match[1]; + let c1$p = match[0]; + let r = l.tl; + let match$1 = l.hd; + let c2 = match$1[1]; + let c1 = match$1[0]; if (c2 < c1$p) { return { hd: [ @@ -180,7 +180,7 @@ function diff(_l, _l$p) { _l$p = r$p; continue ; } - var r$p$p = c2$p < c2 ? ({ + let r$p$p = c2$p < c2 ? ({ hd: [ c2$p + 1 | 0, c2 @@ -236,7 +236,7 @@ function offset(o, l) { if (!l) { return /* [] */0; } - var match = l.hd; + let match = l.hd; return { hd: [ match[0] + o | 0, @@ -248,11 +248,11 @@ function offset(o, l) { function mem(c, _s) { while(true) { - var s = _s; + let s = _s; if (!s) { return false; } - var match = s.hd; + let match = s.hd; if (c <= match[1]) { return c >= match[0]; } @@ -265,7 +265,7 @@ function hash_rec(x) { if (!x) { return 0; } - var match = x.hd; + let match = x.hd; return (match[0] + Math.imul(13, match[1]) | 0) + Math.imul(257, hash_rec(x.tl)) | 0; } @@ -276,8 +276,8 @@ function one_char(x) { if (x.tl) { return; } - var match = x.hd; - var i = match[0]; + let match = x.hd; + let i = match[0]; if (Caml_obj.equal(i, match[1])) { return Caml_option.some(i); } @@ -285,7 +285,7 @@ function one_char(x) { } function compare(param, param$1) { - var c = Caml_obj.compare(param[0], param$1[0]); + let c = Caml_obj.compare(param[0], param$1[0]); if (c !== 0) { return c; } else { @@ -302,8 +302,8 @@ function height(param) { } function create(l, x, d, r) { - var hl = height(l); - var hr = height(r); + let hl = height(l); + let hr = height(r); return { TAG: "Node", l: l, @@ -315,9 +315,9 @@ function create(l, x, d, r) { } function bal(l, x, d, r) { - var hl; + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -327,10 +327,10 @@ function bal(l, x, d, r) { Error: new Error() }; } - var lr = l.r; - var ld = l.d; - var lv = l.v; - var ll = l.l; + let lr = l.r; + let ld = l.d; + let lv = l.v; + let ll = l.l; if (height(ll) >= height(lr)) { return create(ll, lv, ld, create(lr, x, d, r)); } @@ -360,10 +360,10 @@ function bal(l, x, d, r) { Error: new Error() }; } - var rr = r.r; - var rd = r.d; - var rv = r.v; - var rl = r.l; + let rr = r.r; + let rd = r.d; + let rv = r.v; + let rl = r.l; if (height(rr) >= height(rl)) { return create(create(l, x, d, rl), rv, rd, rr); } @@ -388,11 +388,11 @@ function add(x, data, param) { h: 1 }; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = compare(x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = compare(x, v); if (c === 0) { if (d === data) { return param; @@ -408,14 +408,14 @@ function add(x, data, param) { } } if (c < 0) { - var ll = add(x, data, l); + let ll = add(x, data, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = add(x, data, r); + let rr = add(x, data, r); if (r === rr) { return param; } else { @@ -423,7 +423,7 @@ function add(x, data, param) { } } -var cany = { +let cany = { hd: [ 0, 255 @@ -498,9 +498,9 @@ function height$1(param) { } function create$1(l, v, r) { - var hl; + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; return { TAG: "Node", @@ -512,9 +512,9 @@ function create$1(l, v, r) { } function bal$1(l, v, r) { - var hl; + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -524,9 +524,9 @@ function bal$1(l, v, r) { Error: new Error() }; } - var lr = l.r; - var lv = l.v; - var ll = l.l; + let lr = l.r; + let lv = l.v; + let ll = l.l; if (height$1(ll) >= height$1(lr)) { return create$1(ll, lv, create$1(lr, v, r)); } @@ -555,9 +555,9 @@ function bal$1(l, v, r) { Error: new Error() }; } - var rr = r.r; - var rv = r.v; - var rl = r.l; + let rr = r.r; + let rv = r.v; + let rl = r.l; if (height$1(rr) >= height$1(rl)) { return create$1(create$1(l, v, rl), rv, rr); } @@ -581,22 +581,22 @@ function add$1(x, param) { h: 1 }; } - var r = param.r; - var v = param.v; - var l = param.l; - var c = Caml.int_compare(x, v); + let r = param.r; + let v = param.v; + let l = param.l; + let c = Caml.int_compare(x, v); if (c === 0) { return param; } if (c < 0) { - var ll = add$1(x, l); + let ll = add$1(x, l); if (l === ll) { return param; } else { return bal$1(ll, v, r); } } - var rr = add$1(x, r); + let rr = add$1(x, r); if (r === rr) { return param; } else { @@ -608,21 +608,21 @@ function hash_combine(h, accu) { return Math.imul(accu, 65599) + h | 0; } -var empty = { +let empty = { marks: /* [] */0, pmarks: "Empty" }; function hash(m, accu) { - var _l = m.marks; - var _accu = hash_combine(Hashtbl.hash(m.pmarks), accu); + let _l = m.marks; + let _accu = hash_combine(Hashtbl.hash(m.pmarks), accu); while(true) { - var accu$1 = _accu; - var l = _l; + let accu$1 = _accu; + let l = _l; if (!l) { return accu$1; } - var match = l.hd; + let match = l.hd; _accu = hash_combine(match[0], hash_combine(match[1], accu$1)); _l = l.tl; continue ; @@ -633,7 +633,7 @@ function marks_set_idx(idx, x) { if (!x) { return x; } - var match = x.hd; + let match = x.hd; if (match[1] !== -1) { return x; } else { @@ -656,11 +656,11 @@ function marks_set_idx$1(marks, idx) { function first(f, _x) { while(true) { - var x = _x; + let x = _x; if (!x) { return; } - var res = Curry._1(f, x.hd); + let res = Curry._1(f, x.hd); if (res !== undefined) { return res; } @@ -669,7 +669,7 @@ function first(f, _x) { }; } -var eps_expr = { +let eps_expr = { id: 0, def: "Eps" }; @@ -715,9 +715,9 @@ function alt(ids, x) { } function seq$1(ids, kind, x, y) { - var match = x.def; - var match$1 = y.def; - var exit = 0; + let match = x.def; + let match$1 = y.def; + let exit = 0; if (typeof match !== "object") { return y; } @@ -749,7 +749,7 @@ function seq$1(ids, kind, x, y) { } function is_eps(expr) { - var match = expr.def; + let match = expr.def; if (typeof match !== "object") { return true; } else { @@ -775,7 +775,7 @@ function erase(ids, m, m$p) { } function rename(ids, x) { - var l = x.def; + let l = x.def; if (typeof l !== "object") { return mk_expr(ids, x.def); } @@ -808,8 +808,8 @@ function rename(ids, x) { function equal(_l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { if (l2) { return false; @@ -817,13 +817,13 @@ function equal(_l1, _l2) { return true; } } - var marks1 = l1.hd; + let marks1 = l1.hd; switch (marks1.TAG) { case "TSeq" : if (!l2) { return false; } - var match = l2.hd; + let match = l2.hd; switch (match.TAG) { case "TSeq" : if (marks1._1.id !== match._1.id) { @@ -844,7 +844,7 @@ function equal(_l1, _l2) { if (!l2) { return false; } - var match$1 = l2.hd; + let match$1 = l2.hd; switch (match$1.TAG) { case "TExp" : if (marks1._1.id !== match$1._1.id) { @@ -865,7 +865,7 @@ function equal(_l1, _l2) { if (!l2) { return false; } - var marks2 = l2.hd; + let marks2 = l2.hd; switch (marks2.TAG) { case "TSeq" : case "TExp" : @@ -886,12 +886,12 @@ function equal(_l1, _l2) { function hash$1(_l, _accu) { while(true) { - var accu = _accu; - var l = _l; + let accu = _accu; + let l = _l; if (!l) { return accu; } - var marks = l.hd; + let marks = l.hd; switch (marks.TAG) { case "TSeq" : _accu = hash_combine(388635598, hash_combine(marks._1.id, hash$1(marks._0, accu))); @@ -914,10 +914,10 @@ function tseq(kind, x, y, rem) { if (!x) { return rem; } - var match = x.hd; + let match = x.hd; switch (match.TAG) { case "TExp" : - var tmp = match._1.def; + let tmp = match._1.def; if (typeof tmp !== "object" && !x.tl) { return { hd: { @@ -945,7 +945,7 @@ function tseq(kind, x, y, rem) { }; } -var dummy = { +let dummy = { idx: -1, category: -1, desc: /* [] */0, @@ -990,7 +990,7 @@ function hash$3(t) { return t.hash; } -var Table = Hashtbl.Make({ +let Table = Hashtbl.Make({ equal: equal$1, hash: hash$3 }); @@ -1011,7 +1011,7 @@ function mark_used_indices(tbl) { } List.iter((function (param) { - var i = param[1]; + let i = param[1]; if (i >= 0) { return Caml_array.set(tbl, i, true); } @@ -1023,7 +1023,7 @@ function mark_used_indices(tbl) { function find_free(tbl, _idx, len) { while(true) { - var idx = _idx; + let idx = _idx; if (idx === len || !Caml_array.get(tbl, idx)) { return idx; } @@ -1033,18 +1033,18 @@ function find_free(tbl, _idx, len) { } function free_index(tbl_ref, l) { - var tbl = tbl_ref.contents; + let tbl = tbl_ref.contents; reset_table(tbl); mark_used_indices(tbl)(l); - var len = tbl.length; - var idx = find_free(tbl, 0, len); + let len = tbl.length; + let idx = find_free(tbl, 0, len); if (idx === len) { tbl_ref.contents = Caml_array.make((len << 1), false); } return idx; } -var remove_matches = List.filter(function (x) { +let remove_matches = List.filter(function (x) { switch (x.TAG) { case "TSeq" : case "TExp" : @@ -1057,10 +1057,10 @@ var remove_matches = List.filter(function (x) { function split_at_match_rec(_l$p, _x) { while(true) { - var x = _x; - var l$p = _l$p; + let x = _x; + let l$p = _l$p; if (x) { - var x$1 = x.hd; + let x$1 = x.hd; switch (x$1.TAG) { case "TSeq" : case "TExp" : @@ -1093,33 +1093,33 @@ function split_at_match_rec(_l$p, _x) { function remove_duplicates(prev, _l, y) { while(true) { - var l = _l; + let l = _l; if (!l) { return [ /* [] */0, prev ]; } - var x = l.hd; + let x = l.hd; switch (x.TAG) { case "TSeq" : - var x$1 = x._1; - var match = remove_duplicates(prev, x._0, x$1); - var match$1 = remove_duplicates(match[1], l.tl, y); + let x$1 = x._1; + let match = remove_duplicates(prev, x._0, x$1); + let match$1 = remove_duplicates(match[1], l.tl, y); return [ tseq(x._2, match[0], x$1, match$1[0]), match$1[1] ]; case "TExp" : - var x$2 = x._1; - var tmp = x$2.def; + let x$2 = x._1; + let tmp = x$2.def; if (typeof tmp !== "object") { - var r = l.tl; + let r = l.tl; if (List.memq(y.id, prev)) { _l = r; continue ; } - var match$2 = remove_duplicates({ + let match$2 = remove_duplicates({ hd: y.id, tl: prev }, r, y); @@ -1131,12 +1131,12 @@ function remove_duplicates(prev, _l, y) { match$2[1] ]; } - var r$1 = l.tl; + let r$1 = l.tl; if (List.memq(x$2.id, prev)) { _l = r$1; continue ; } - var match$3 = remove_duplicates({ + let match$3 = remove_duplicates({ hd: x$2.id, tl: prev }, r$1, y); @@ -1164,7 +1164,7 @@ function set_idx(idx, x) { if (!x) { return /* [] */0; } - var marks = x.hd; + let marks = x.hd; switch (marks.TAG) { case "TSeq" : return { @@ -1200,7 +1200,7 @@ function set_idx(idx, x) { function filter_marks(b, e, marks) { return { marks: List.filter(function (param) { - var i = param[0]; + let i = param[0]; if (i < b) { return true; } else { @@ -1212,7 +1212,7 @@ function filter_marks(b, e, marks) { } function delta_1(marks, c, next_cat, prev_cat, x, rem) { - var s = x.def; + let s = x.def; if (typeof s !== "object") { return { hd: { @@ -1239,12 +1239,12 @@ function delta_1(marks, c, next_cat, prev_cat, x, rem) { case "Alt" : return delta_2(marks, c, next_cat, prev_cat, s._0, rem); case "Seq" : - var y$p = delta_1(marks, c, next_cat, prev_cat, s._1, /* [] */0); + let y$p = delta_1(marks, c, next_cat, prev_cat, s._1, /* [] */0); return delta_seq(c, next_cat, prev_cat, s._0, y$p, s._2, rem); case "Rep" : - var kind = s._1; - var y$p$1 = delta_1(marks, c, next_cat, prev_cat, s._2, /* [] */0); - var marks$p = first((function (x) { + let kind = s._1; + let y$p$1 = delta_1(marks, c, next_cat, prev_cat, s._2, /* [] */0); + let marks$p = first((function (x) { switch (x.TAG) { case "TSeq" : case "TExp" : @@ -1254,14 +1254,14 @@ function delta_1(marks, c, next_cat, prev_cat, x, rem) { } }), y$p$1); - var match = marks$p !== undefined ? [ + let match = marks$p !== undefined ? [ Curry._1(remove_matches, y$p$1), marks$p ] : [ y$p$1, marks ]; - var y$p$p = match[0]; + let y$p$p = match[0]; if (s._0 === "Non_greedy") { return { hd: { @@ -1280,16 +1280,16 @@ function delta_1(marks, c, next_cat, prev_cat, x, rem) { }); } case "Mark" : - var i = s._0; - var marks_marks = { + let i = s._0; + let marks_marks = { hd: [ i, -1 ], tl: List.remove_assq(i, marks.marks) }; - var marks_pmarks = marks.pmarks; - var marks$1 = { + let marks_pmarks = marks.pmarks; + let marks$1 = { marks: marks_marks, pmarks: marks_pmarks }; @@ -1333,9 +1333,9 @@ function delta_1(marks, c, next_cat, prev_cat, x, rem) { return rem; } case "Pmark" : - var marks_marks$1 = marks.marks; - var marks_pmarks$1 = add$1(s._0, marks.pmarks); - var marks$2 = { + let marks_marks$1 = marks.marks; + let marks_pmarks$1 = add$1(s._0, marks.pmarks); + let marks$2 = { marks: marks_marks$1, pmarks: marks_pmarks$1 }; @@ -1359,7 +1359,7 @@ function delta_2(marks, c, next_cat, prev_cat, l, rem) { } function delta_seq(c, next_cat, prev_cat, kind, y, z, rem) { - var marks = first((function (x) { + let marks = first((function (x) { switch (x.TAG) { case "TSeq" : case "TExp" : @@ -1378,17 +1378,17 @@ function delta_seq(c, next_cat, prev_cat, kind, y, z, rem) { if (kind !== "First") { return delta_1(marks, c, next_cat, prev_cat, z, tseq(kind, Curry._1(remove_matches, y), z, rem)); } - var match = split_at_match_rec(/* [] */0, y); + let match = split_at_match_rec(/* [] */0, y); return tseq(kind, match[0], z, delta_1(marks, c, next_cat, prev_cat, z, tseq(kind, match[1], z, rem))); } function delta_4(c, next_cat, prev_cat, l, rem) { if (l) { - var x = l.hd; - var rem$1 = delta_4(c, next_cat, prev_cat, l.tl, rem); + let x = l.hd; + let rem$1 = delta_4(c, next_cat, prev_cat, l.tl, rem); switch (x.TAG) { case "TSeq" : - var y$p = delta_4(c, next_cat, prev_cat, x._0, /* [] */0); + let y$p = delta_4(c, next_cat, prev_cat, x._0, /* [] */0); return delta_seq(c, next_cat, prev_cat, x._2, y$p, x._1, rem$1); case "TExp" : return delta_1(x._0, c, next_cat, prev_cat, x._1, rem$1); @@ -1405,19 +1405,19 @@ function delta_4(c, next_cat, prev_cat, l, rem) { } function delta(tbl_ref, next_cat, $$char, st) { - var prev_cat = st.category; - var match = remove_duplicates(/* [] */0, delta_4($$char, next_cat, prev_cat, st.desc, /* [] */0), eps_expr); - var expr$p = match[0]; - var idx = free_index(tbl_ref, expr$p); - var expr$p$p = set_idx(idx, expr$p); + let prev_cat = st.category; + let match = remove_duplicates(/* [] */0, delta_4($$char, next_cat, prev_cat, st.desc, /* [] */0), eps_expr); + let expr$p = match[0]; + let idx = free_index(tbl_ref, expr$p); + let expr$p$p = set_idx(idx, expr$p); return mk(idx, next_cat, expr$p$p); } function flatten_match(m) { - var ma = List.fold_left((function (ma, param) { + let ma = List.fold_left((function (ma, param) { return Caml.int_max(ma, param[0]); }), -1, m); - var res = Caml_array.make(ma + 1 | 0, -1); + let res = Caml_array.make(ma + 1 | 0, -1); List.iter((function (param) { Caml_array.set(res, param[0], param[1]); }), m); @@ -1425,21 +1425,21 @@ function flatten_match(m) { } function status(s) { - var st = s.status; + let st = s.status; if (st !== undefined) { return st; } - var match = s.desc; - var st$1; + let match = s.desc; + let st$1; if (match) { - var m = match.hd; + let m = match.hd; switch (m.TAG) { case "TSeq" : case "TExp" : st$1 = "Running"; break; case "TMatch" : - var m$1 = m._0; + let m$1 = m._0; st$1 = { TAG: "Match", _0: flatten_match(m$1.marks), @@ -1455,7 +1455,7 @@ function status(s) { return st$1; } -var Re_automata_Category = { +let Re_automata_Category = { $plus$plus: $plus$plus, from_char: from_char, inexistant: 1, @@ -1466,7 +1466,7 @@ var Re_automata_Category = { search_boundary: 32 }; -var Re_automata_State = { +let Re_automata_State = { dummy: dummy, create: create$2, Table: Table @@ -1474,8 +1474,8 @@ var Re_automata_State = { function iter(_n, f, _v) { while(true) { - var v = _v; - var n = _n; + let v = _v; + let n = _n; if (n === 0) { return v; } @@ -1495,9 +1495,9 @@ function category(re, c) { } } -var dummy_next = []; +let dummy_next = []; -var unknown_state = { +let unknown_state = { idx: -2, real_idx: 0, next: dummy_next, @@ -1506,8 +1506,8 @@ var unknown_state = { }; function mk_state(ncol, desc) { - var match = status(desc); - var break_state; + let match = status(desc); + let break_state; break_state = typeof match !== "object" && match !== "Failed" ? false : true; return { idx: break_state ? -3 : desc.idx, @@ -1523,9 +1523,9 @@ function find_state(re, desc) { return Curry._2(Re_automata_State.Table.find, re.states, desc); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { - var st = mk_state(re.ncol, desc); + let st = mk_state(re.ncol, desc); Curry._3(Re_automata_State.Table.add, re.states, desc, st); return st; } @@ -1534,10 +1534,10 @@ function find_state(re, desc) { } function delta$1(info, cat, c, st) { - var desc = delta(info.re.tbl, cat, c, st.desc); - var len = info.positions.length; + let desc = delta(info.re.tbl, cat, c, st.desc); + let len = info.positions.length; if (desc.idx === len && len > 0) { - var pos = info.positions; + let pos = info.positions; info.positions = Caml_array.make((len << 1), 0); $$Array.blit(pos, 0, info.positions, 0, len); } @@ -1545,10 +1545,10 @@ function delta$1(info, cat, c, st) { } function validate(info, s, pos, st) { - var c = Caml_bytes.get(info.i_cols, Caml_string.get(s, pos)); - var cat = category(info.re, c); - var desc$p = delta$1(info, cat, c, st); - var st$p = find_state(info.re, desc$p); + let c = Caml_bytes.get(info.i_cols, Caml_string.get(s, pos)); + let cat = category(info.re, c); + let desc$p = delta$1(info, cat, c, st); + let st$p = find_state(info.re, desc$p); Caml_array.set(st.next, c, st$p); } @@ -1556,14 +1556,14 @@ function loop(info, s, pos, st) { if (pos >= info.last) { return st; } - var st$p = Caml_array.get(st.next, Caml_bytes.get(info.i_cols, Caml_string.get(s, pos))); - var _pos = pos; - var _st = st; - var _st$p = st$p; + let st$p = Caml_array.get(st.next, Caml_bytes.get(info.i_cols, Caml_string.get(s, pos))); + let _pos = pos; + let _st = st; + let _st$p = st$p; while(true) { - var st$p$1 = _st$p; - var st$1 = _st; - var pos$1 = _pos; + let st$p$1 = _st$p; + let st$1 = _st; + let pos$1 = _pos; if (st$p$1.idx < 0) { if (st$p$1.idx === -3) { Caml_array.set(info.positions, st$p$1.real_idx, pos$1 + 1 | 0); @@ -1573,9 +1573,9 @@ function loop(info, s, pos, st) { return loop(info, s, pos$1, st$1); } } - var pos$2 = pos$1 + 1 | 0; + let pos$2 = pos$1 + 1 | 0; if (pos$2 < info.last) { - var st$p$p = Caml_array.get(st$p$1.next, Caml_bytes.get(info.i_cols, Caml_string.get(s, pos$2))); + let st$p$p = Caml_array.get(st$p$1.next, Caml_bytes.get(info.i_cols, Caml_string.get(s, pos$2))); Caml_array.set(info.positions, st$p$1.idx, pos$2); _st$p = st$p$p; _st = st$p$1; @@ -1592,12 +1592,12 @@ function $$final(info, st, cat) { return List.assq(cat, st.final); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { - var st$p = delta$1(info, cat, -1, st); - var res_0 = st$p.idx; - var res_1 = status(st$p); - var res = [ + let st$p = delta$1(info, cat, -1, st); + let res_0 = st$p.idx; + let res_1 = status(st$p); + let res = [ res_0, res_1 ]; @@ -1619,9 +1619,9 @@ function find_initial_state(re, cat) { return List.assq(cat, re.initial_states); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { - var st = find_state(re, Curry._2(Re_automata_State.create, cat, re.initial)); + let st = find_state(re, Curry._2(Re_automata_State.create, cat, re.initial)); re.initial_states = { hd: [ cat, @@ -1639,7 +1639,7 @@ function get_color(re, s, pos) { if (pos < 0) { return -1; } - var slen = s.length; + let slen = s.length; if (pos >= slen) { return -1; } else if (pos === (slen - 1 | 0) && re.lnl !== -1 && Caml_string.get(s, pos) === /* '\n' */10) { @@ -1650,21 +1650,21 @@ function get_color(re, s, pos) { } function scan_str(info, s, initial_state, groups) { - var pos = info.pos; - var last = info.last; + let pos = info.pos; + let last = info.last; if (!(last === s.length && info.re.lnl !== -1 && last > pos && Caml_string.get(s, last - 1 | 0) === /* '\n' */10)) { if (groups) { return loop(info, s, pos, initial_state); } else { - var _pos = pos; - var _st = initial_state; + let _pos = pos; + let _st = initial_state; while(true) { - var st = _st; - var pos$1 = _pos; + let st = _st; + let pos$1 = _pos; if (pos$1 >= last) { return st; } - var st$p = Caml_array.get(st.next, Caml_bytes.get(info.i_cols, Caml_string.get(s, pos$1))); + let st$p = Caml_array.get(st.next, Caml_bytes.get(info.i_cols, Caml_string.get(s, pos$1))); if (st$p.idx >= 0) { _st = st$p; _pos = pos$1 + 1 | 0; @@ -1678,20 +1678,20 @@ function scan_str(info, s, initial_state, groups) { }; } } - var info$1 = { + let info$1 = { re: info.re, i_cols: info.i_cols, positions: info.positions, pos: info.pos, last: last - 1 | 0 }; - var st$1 = scan_str(info$1, s, initial_state, groups); + let st$1 = scan_str(info$1, s, initial_state, groups); if (st$1.idx === -3) { return st$1; } else { - var pos$2 = last - 1 | 0; + let pos$2 = last - 1 | 0; while(true) { - var st$p$1 = Caml_array.get(st$1.next, info$1.re.lnl); + let st$p$1 = Caml_array.get(st$1.next, info$1.re.lnl); if (st$p$1.idx >= 0) { if (groups) { Caml_array.set(info$1.positions, st$p$1.idx, pos$2 + 1 | 0); @@ -1704,11 +1704,11 @@ function scan_str(info, s, initial_state, groups) { } return st$p$1; } - var c = info$1.re.lnl; - var real_c = Caml_bytes.get(info$1.i_cols, /* '\n' */10); - var cat = category(info$1.re, c); - var desc$p = delta$1(info$1, cat, real_c, st$1); - var st$p$2 = find_state(info$1.re, desc$p); + let c = info$1.re.lnl; + let real_c = Caml_bytes.get(info$1.i_cols, /* '\n' */10); + let cat = category(info$1.re, c); + let desc$p = delta$1(info$1, cat, real_c, st$1); + let st$p$2 = find_state(info$1.re, desc$p); Caml_array.set(st$1.next, c, st$p$2); continue ; }; @@ -1720,26 +1720,26 @@ function cadd(c, s) { } function trans_set(cache, cm, s) { - var i = one_char(s); + let i = one_char(s); if (i !== undefined) { return single(Caml_bytes.get(cm, i)); } - var v_0 = hash_rec(s); - var v = [ + let v_0 = hash_rec(s); + let v = [ v_0, s ]; try { - var _param = cache.contents; + let _param = cache.contents; while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var c = compare(v, param.v); + let c = compare(v, param.v); if (c === 0) { return param.d; } @@ -1748,9 +1748,9 @@ function trans_set(cache, cm, s) { }; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { - var l = List.fold_right((function (param, l) { + let l = List.fold_right((function (param, l) { return union(seq(Caml_bytes.get(cm, param[0]), Caml_bytes.get(cm, param[1])), l); }), s, /* [] */0); cache.contents = add(v, l, cache.contents); @@ -1762,7 +1762,7 @@ function trans_set(cache, cm, s) { function is_charset(_x) { while(true) { - var x = _x; + let x = _x; if (typeof x !== "object") { return false; } @@ -1795,28 +1795,28 @@ function is_charset(_x) { } function split(s, cm) { - var _t = s; - var f = function (i, j) { + let _t = s; + let f = function (i, j) { Caml_bytes.set(cm, i, /* '\001' */1); Caml_bytes.set(cm, j + 1 | 0, /* '\001' */1); }; while(true) { - var t = _t; + let t = _t; if (!t) { return; } - var match = t.hd; + let match = t.hd; Curry._2(f, match[0], match[1]); _t = t.tl; continue ; }; } -var cupper = union(seq(/* 'A' */65, /* 'Z' */90), union(seq(/* '\192' */192, /* '\214' */214), seq(/* '\216' */216, /* '\222' */222))); +let cupper = union(seq(/* 'A' */65, /* 'Z' */90), union(seq(/* '\192' */192, /* '\214' */214), seq(/* '\216' */216, /* '\222' */222))); -var clower = offset(32, cupper); +let clower = offset(32, cupper); -var calpha = List.fold_right(cadd, { +let calpha = List.fold_right(cadd, { hd: /* '\170' */170, tl: { hd: /* '\181' */181, @@ -1833,11 +1833,11 @@ var calpha = List.fold_right(cadd, { } }, union(clower, cupper)); -var cdigit = seq(/* '0' */48, /* '9' */57); +let cdigit = seq(/* '0' */48, /* '9' */57); -var calnum = union(calpha, cdigit); +let calnum = union(calpha, cdigit); -var cword = union({ +let cword = union({ hd: [ /* '_' */95, /* '_' */95 @@ -1846,12 +1846,12 @@ var cword = union({ }, calnum); function colorize(c, regexp) { - var lnl = { + let lnl = { contents: false }; - var colorize$1 = function (_regexp) { + let colorize$1 = function (_regexp) { while(true) { - var regexp = _regexp; + let regexp = _regexp; if (typeof regexp !== "object") { switch (regexp) { case "Beg_of_line" : @@ -1914,12 +1914,12 @@ function colorize(c, regexp) { } function flatten_cmap(cm) { - var c = Caml_bytes.create(256); - var col_repr = Caml_bytes.create(256); - var v = 0; + let c = Caml_bytes.create(256); + let col_repr = Caml_bytes.create(256); + let v = 0; Caml_bytes.set(c, 0, /* '\000' */0); Caml_bytes.set(col_repr, 0, /* '\000' */0); - for(var i = 1; i <= 255; ++i){ + for(let i = 1; i <= 255; ++i){ if (Caml_bytes.get(cm, i) !== /* '\000' */0) { v = v + 1 | 0; } @@ -1935,8 +1935,8 @@ function flatten_cmap(cm) { function equal$2(_x1, _x2) { while(true) { - var x2 = _x2; - var x1 = _x1; + let x2 = _x2; + let x1 = _x1; if (typeof x1 !== "object") { switch (x1) { case "Beg_of_line" : @@ -2151,8 +2151,8 @@ function equal$2(_x1, _x2) { function eq_list(_l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { if (l2) { return false; @@ -2185,26 +2185,26 @@ function sequence(x) { function merge_sequences(_x) { while(true) { - var x = _x; + let x = _x; if (!x) { return /* [] */0; } - var l$p = x.hd; + let l$p = x.hd; if (typeof l$p === "object") { switch (l$p.TAG) { case "Sequence" : - var match = l$p._0; + let match = l$p._0; if (match) { - var y = match.tl; - var x$1 = match.hd; - var r$p = merge_sequences(x.tl); - var exit = 0; + let y = match.tl; + let x$1 = match.hd; + let r$p = merge_sequences(x.tl); + let exit = 0; if (r$p) { - var match$1 = r$p.hd; + let match$1 = r$p.hd; if (typeof match$1 !== "object" || match$1.TAG !== "Sequence") { exit = 2; } else { - var match$2 = match$1._0; + let match$2 = match$1._0; if (match$2) { if (equal$2(x$1, match$2.hd)) { return { @@ -2277,13 +2277,13 @@ function enforce_kind(ids, kind, kind$p, cr) { function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _x) { while(true) { - var x = _x; - var greedy = _greedy; - var ign_group = _ign_group; + let x = _x; + let greedy = _greedy; + let ign_group = _ign_group; if (typeof x !== "object") { switch (x) { case "Beg_of_line" : - var c$1 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.newline); + let c$1 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.newline); return [ mk_expr(ids, { TAG: "After", @@ -2292,7 +2292,7 @@ function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _x) kind ]; case "End_of_line" : - var c$2 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.newline); + let c$2 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.newline); return [ mk_expr(ids, { TAG: "Before", @@ -2301,8 +2301,8 @@ function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _x) kind ]; case "Beg_of_word" : - var c$3 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.not_letter); - var c$4 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.letter); + let c$3 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.not_letter); + let c$4 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.letter); return [ seq$1(ids, "First", mk_expr(ids, { TAG: "After", @@ -2314,8 +2314,8 @@ function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _x) kind ]; case "End_of_word" : - var c$5 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.letter); - var c$6 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.not_letter); + let c$5 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.letter); + let c$6 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.not_letter); return [ seq$1(ids, "First", mk_expr(ids, { TAG: "After", @@ -2366,7 +2366,7 @@ function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _x) kind ]; case "Last_end_of_line" : - var c$7 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.lastnewline); + let c$7 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.lastnewline); return [ mk_expr(ids, { TAG: "Before", @@ -2405,9 +2405,9 @@ function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _x) kind ]; case "Alternative" : - var merged_sequences = merge_sequences(x._0); + let merged_sequences = merge_sequences(x._0); if (merged_sequences && !merged_sequences.tl) { - var match = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, merged_sequences.hd); + let match = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, merged_sequences.hd); return [ enforce_kind(ids, kind, match[1], match[0]), kind @@ -2416,21 +2416,21 @@ function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _x) return [ alt(ids, List.map((function(ign_group,greedy){ return function (r$p) { - var match = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, r$p); + let match = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, r$p); return enforce_kind(ids, kind, match[1], match[0]); } }(ign_group,greedy)), merged_sequences)), kind ]; case "Repeat" : - var j = x._2; - var i = x._1; - var match$1 = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, x._0); - var kind$p = match$1[1]; - var cr = match$1[0]; - var rem; + let j = x._2; + let i = x._1; + let match$1 = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, x._0); + let kind$p = match$1[1]; + let cr = match$1[0]; + let rem; if (j !== undefined) { - var f = greedy === "Non_greedy" ? (function(cr,kind$p){ + let f = greedy === "Non_greedy" ? (function(cr,kind$p){ return function (rem) { return alt(ids, { hd: mk_expr(ids, "Eps"), @@ -2464,8 +2464,8 @@ function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _x) kind ]; case "Sem" : - var kind$p$1 = x._0; - var match$2 = translate(ids, kind$p$1, ign_group, ign_case, greedy, pos, cache, c, x._1); + let kind$p$1 = x._0; + let match$2 = translate(ids, kind$p$1, ign_group, ign_case, greedy, pos, cache, c, x._1); return [ enforce_kind(ids, kind$p$1, match$2[1], match$2[0]), kind$p$1 @@ -2475,14 +2475,14 @@ function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _x) _greedy = x._0; continue ; case "Group" : - var r$p = x._0; + let r$p = x._0; if (ign_group) { _x = r$p; continue ; } - var p = pos.contents; + let p = pos.contents; pos.contents = pos.contents + 2 | 0; - var match$3 = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, r$p); + let match$3 = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, r$p); return [ seq$1(ids, "First", mk_expr(ids, { TAG: "Mark", @@ -2498,11 +2498,11 @@ function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _x) _ign_group = true; continue ; case "Nest" : - var b = pos.contents; - var match$4 = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, x._0); - var kind$p$2 = match$4[1]; - var cr$1 = match$4[0]; - var e = pos.contents - 1 | 0; + let b = pos.contents; + let match$4 = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, x._0); + let kind$p$2 = match$4[1]; + let cr$1 = match$4[0]; + let e = pos.contents - 1 | 0; if (e < b) { return [ cr$1, @@ -2515,7 +2515,7 @@ function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _x) ]; } case "Pmark" : - var match$5 = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, x._1); + let match$5 = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, x._1); return [ seq$1(ids, "First", mk_expr(ids, { TAG: "Pmark", @@ -2542,12 +2542,12 @@ function trans_seq(ids, kind, ign_group, ign_case, greedy, pos, cache, c, x) { if (!x) { return mk_expr(ids, "Eps"); } - var rem = x.tl; - var r = x.hd; + let rem = x.tl; + let r = x.hd; if (rem) { - var match = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, r); - var cr$p = match[0]; - var cr$p$p = trans_seq(ids, kind, ign_group, ign_case, greedy, pos, cache, c, rem); + let match = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, r); + let cr$p = match[0]; + let cr$p$p = trans_seq(ids, kind, ign_group, ign_case, greedy, pos, cache, c, rem); if (is_eps(cr$p$p)) { return cr$p; } else if (is_eps(cr$p)) { @@ -2556,7 +2556,7 @@ function trans_seq(ids, kind, ign_group, ign_case, greedy, pos, cache, c, x) { return seq$1(ids, match[1], cr$p, cr$p$p); } } - var match$1 = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, r); + let match$1 = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, r); return enforce_kind(ids, kind, match$1[1], match$1[0]); } @@ -2592,14 +2592,14 @@ function as_set(x) { function handle_case(_ign_case, _x) { while(true) { - var x = _x; - var ign_case = _ign_case; + let x = _x; + let ign_case = _ign_case; if (typeof x !== "object") { return x; } switch (x.TAG) { case "Set" : - var s = x._0; + let s = x._0; return { TAG: "Set", _0: ign_case ? case_insens(s) : s @@ -2614,7 +2614,7 @@ function handle_case(_ign_case, _x) { }(ign_case)), x._0) }; case "Alternative" : - var l$p = List.map((function(ign_case){ + let l$p = List.map((function(ign_case){ return function (param) { return handle_case(ign_case, param); } @@ -2643,7 +2643,7 @@ function handle_case(_ign_case, _x) { _2: x._2 }; case "Sem" : - var r$p = handle_case(ign_case, x._1); + let r$p = handle_case(ign_case, x._1); if (is_charset(r$p)) { return r$p; } else { @@ -2654,7 +2654,7 @@ function handle_case(_ign_case, _x) { }; } case "Sem_greedy" : - var r$p$1 = handle_case(ign_case, x._1); + let r$p$1 = handle_case(ign_case, x._1); if (is_charset(r$p$1)) { return r$p$1; } else { @@ -2670,7 +2670,7 @@ function handle_case(_ign_case, _x) { _0: handle_case(ign_case, x._0) }; case "No_group" : - var r$p$2 = handle_case(ign_case, x._0); + let r$p$2 = handle_case(ign_case, x._0); if (is_charset(r$p$2)) { return r$p$2; } else { @@ -2680,7 +2680,7 @@ function handle_case(_ign_case, _x) { }; } case "Nest" : - var r$p$3 = handle_case(ign_case, x._0); + let r$p$3 = handle_case(ign_case, x._0); if (is_charset(r$p$3)) { return r$p$3; } else { @@ -2698,7 +2698,7 @@ function handle_case(_ign_case, _x) { _ign_case = true; continue ; case "Intersection" : - var l$p$1 = List.map((function(ign_case){ + let l$p$1 = List.map((function(ign_case){ return function (r) { return handle_case(ign_case, r); } @@ -2710,7 +2710,7 @@ function handle_case(_ign_case, _x) { }), cany, l$p$1) }; case "Complement" : - var l$p$2 = List.map((function(ign_case){ + let l$p$2 = List.map((function(ign_case){ return function (r) { return handle_case(ign_case, r); } @@ -2739,7 +2739,7 @@ function handle_case(_ign_case, _x) { function anchored(_x) { while(true) { - var x = _x; + let x = _x; if (typeof x !== "object") { switch (x) { case "Beg_of_str" : @@ -2801,7 +2801,7 @@ function seq$2(x) { } } -var epsilon = { +let epsilon = { TAG: "Sequence", _0: /* [] */0 }; @@ -2830,8 +2830,8 @@ function repn(r, i, j) { } function set(str) { - var s = /* [] */0; - for(var i = 0 ,i_finish = str.length; i < i_finish; ++i){ + let s = /* [] */0; + for(let i = 0 ,i_finish = str.length; i < i_finish; ++i){ s = union(single(Caml_string.get(str, i)), s); } return { @@ -2841,7 +2841,7 @@ function set(str) { } function compl(l) { - var r = { + let r = { TAG: "Complement", _0: l }; @@ -2855,12 +2855,12 @@ function compl(l) { }; } -var any = { +let any = { TAG: "Set", _0: cany }; -var notnl = { +let notnl = { TAG: "Set", _0: diff(cany, { hd: [ @@ -2871,7 +2871,7 @@ var notnl = { }) }; -var lower = alt$1({ +let lower = alt$1({ hd: { TAG: "Set", _0: seq(/* 'a' */97, /* 'z' */122) @@ -2903,7 +2903,7 @@ var lower = alt$1({ } }); -var upper = alt$1({ +let upper = alt$1({ hd: { TAG: "Set", _0: seq(/* 'A' */65, /* 'Z' */90) @@ -2923,7 +2923,7 @@ var upper = alt$1({ } }); -var alpha = alt$1({ +let alpha = alt$1({ hd: lower, tl: { hd: upper, @@ -2955,12 +2955,12 @@ var alpha = alt$1({ } }); -var digit = { +let digit = { TAG: "Set", _0: seq(/* '0' */48, /* '9' */57) }; -var alnum = alt$1({ +let alnum = alt$1({ hd: alpha, tl: { hd: digit, @@ -2968,7 +2968,7 @@ var alnum = alt$1({ } }); -var wordc = alt$1({ +let wordc = alt$1({ hd: alnum, tl: { hd: { @@ -2985,14 +2985,14 @@ var wordc = alt$1({ } }); -var ascii = { +let ascii = { TAG: "Set", _0: seq(/* '\000' */0, /* '\127' */127) }; -var blank = set("\t "); +let blank = set("\t "); -var cntrl = alt$1({ +let cntrl = alt$1({ hd: { TAG: "Set", _0: seq(/* '\000' */0, /* '\031' */31) @@ -3006,7 +3006,7 @@ var cntrl = alt$1({ } }); -var graph = alt$1({ +let graph = alt$1({ hd: { TAG: "Set", _0: seq(/* '!' */33, /* '~' */126) @@ -3020,7 +3020,7 @@ var graph = alt$1({ } }); -var print = alt$1({ +let print = alt$1({ hd: { TAG: "Set", _0: seq(/* ' ' */32, /* '~' */126) @@ -3034,7 +3034,7 @@ var print = alt$1({ } }); -var punct = alt$1({ +let punct = alt$1({ hd: { TAG: "Set", _0: seq(/* '!' */33, /* '/' */47) @@ -3108,7 +3108,7 @@ var punct = alt$1({ } }); -var space = alt$1({ +let space = alt$1({ hd: { TAG: "Set", _0: { @@ -3128,7 +3128,7 @@ var space = alt$1({ } }); -var xdigit = alt$1({ +let xdigit = alt$1({ hd: digit, tl: { hd: { @@ -3146,7 +3146,7 @@ var xdigit = alt$1({ }); function compile(r) { - var regexp = anchored(r) ? ({ + let regexp = anchored(r) ? ({ TAG: "Group", _0: r }) : seq$2({ @@ -3163,26 +3163,26 @@ function compile(r) { tl: /* [] */0 } }); - var regexp$1 = handle_case(false, regexp); - var c = Bytes.make(257, /* '\000' */0); - var need_lnl = colorize(c, regexp$1); - var match = flatten_cmap(c); - var ncol = match[2]; - var col = match[0]; - var lnl = need_lnl ? ncol : -1; - var ncol$1 = need_lnl ? ncol + 1 | 0 : ncol; - var ids = { + let regexp$1 = handle_case(false, regexp); + let c = Bytes.make(257, /* '\000' */0); + let need_lnl = colorize(c, regexp$1); + let match = flatten_cmap(c); + let ncol = match[2]; + let col = match[0]; + let lnl = need_lnl ? ncol : -1; + let ncol$1 = need_lnl ? ncol + 1 | 0 : ncol; + let ids = { contents: 0 }; - var pos = { + let pos = { contents: 0 }; - var match$1 = translate(ids, "First", false, false, "Greedy", pos, { + let match$1 = translate(ids, "First", false, false, "Greedy", pos, { contents: "Empty" }, col, regexp$1); - var r$1 = enforce_kind(ids, "First", match$1[1], match$1[0]); - var col_repr = match[1]; - var group_count = pos.contents / 2 | 0; + let r$1 = enforce_kind(ids, "First", match$1[1], match$1[0]); + let col_repr = match[1]; + let group_count = pos.contents / 2 | 0; return { initial: r$1, initial_states: /* [] */0, @@ -3199,8 +3199,8 @@ function compile(r) { } function exec_internal(name, posOpt, lenOpt, groups, re, s) { - var pos = posOpt !== undefined ? posOpt : 0; - var len = lenOpt !== undefined ? lenOpt : -1; + let pos = posOpt !== undefined ? posOpt : 0; + let len = lenOpt !== undefined ? lenOpt : -1; if (pos < 0 || len < -1 || (pos + len | 0) > s.length) { throw { RE_EXN_ID: "Invalid_argument", @@ -3208,12 +3208,12 @@ function exec_internal(name, posOpt, lenOpt, groups, re, s) { Error: new Error() }; } - var partial = false; - var slen = s.length; - var last = len === -1 ? slen : pos + len | 0; - var tmp; + let partial = false; + let slen = s.length; + let last = len === -1 ? slen : pos + len | 0; + let tmp; if (groups) { - var n = re.tbl.contents.length + 1 | 0; + let n = re.tbl.contents.length + 1 | 0; tmp = n <= 10 ? [ 0, 0, @@ -3229,22 +3229,22 @@ function exec_internal(name, posOpt, lenOpt, groups, re, s) { } else { tmp = []; } - var info = { + let info = { re: re, i_cols: re.cols, positions: tmp, pos: pos, last: last }; - var initial_cat = pos === 0 ? Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.search_boundary, Re_automata_Category.inexistant) : Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.search_boundary, category(re, get_color(re, s, pos - 1 | 0))); - var initial_state = find_initial_state(re, initial_cat); - var st = scan_str(info, s, initial_state, groups); - var res; + let initial_cat = pos === 0 ? Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.search_boundary, Re_automata_Category.inexistant) : Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.search_boundary, category(re, get_color(re, s, pos - 1 | 0))); + let initial_state = find_initial_state(re, initial_cat); + let st = scan_str(info, s, initial_state, groups); + let res; if (st.idx === -3 || partial) { res = status(st.desc); } else { - var final_cat = last === slen ? Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.search_boundary, Re_automata_Category.inexistant) : Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.search_boundary, category(re, get_color(re, s, last))); - var match = $$final(info, st, final_cat); + let final_cat = last === slen ? Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.search_boundary, Re_automata_Category.inexistant) : Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.search_boundary, category(re, get_color(re, s, last))); + let match = $$final(info, st, final_cat); if (groups) { Caml_array.set(info.positions, match[0], last + 1 | 0); } @@ -3277,15 +3277,15 @@ function offset$1(t, i) { Error: new Error() }; } - var m1 = Caml_array.get(t.marks, (i << 1)); + let m1 = Caml_array.get(t.marks, (i << 1)); if (m1 === -1) { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var p1 = Caml_array.get(t.gpos, m1) - 1 | 0; - var p2 = Caml_array.get(t.gpos, Caml_array.get(t.marks, (i << 1) + 1 | 0)) - 1 | 0; + let p1 = Caml_array.get(t.gpos, m1) - 1 | 0; + let p2 = Caml_array.get(t.gpos, Caml_array.get(t.marks, (i << 1) + 1 | 0)) - 1 | 0; return [ p1, p2 @@ -3293,14 +3293,14 @@ function offset$1(t, i) { } function get(t, i) { - var match = offset$1(t, i); - var p1 = match[0]; + let match = offset$1(t, i); + let p1 = match[0]; return $$String.sub(t.s, p1, match[1] - p1 | 0); } -var Parse_error = /* @__PURE__ */Caml_exceptions.create("Parse_error"); +let Parse_error = /* @__PURE__ */Caml_exceptions.create("Parse_error"); -var Not_supported = /* @__PURE__ */Caml_exceptions.create("Not_supported"); +let Not_supported = /* @__PURE__ */Caml_exceptions.create("Not_supported"); function posix_class_of_string(x) { switch (x) { @@ -3331,7 +3331,7 @@ function posix_class_of_string(x) { case "xdigit" : return xdigit; default: - var s = "Invalid pcre class: " + x; + let s = "Invalid pcre class: " + x; throw { RE_EXN_ID: "Invalid_argument", _1: s, @@ -3341,28 +3341,28 @@ function posix_class_of_string(x) { } function parse(multiline, dollar_endonly, dotall, ungreedy, s) { - var i = { + let i = { contents: 0 }; - var l = s.length; - var test = function (c) { + let l = s.length; + let test = function (c) { if (i.contents !== l) { return Caml_string.get(s, i.contents) === c; } else { return false; } }; - var accept = function (c) { - var r = test(c); + let accept = function (c) { + let r = test(c); if (r) { i.contents = i.contents + 1 | 0; } return r; }; - var accept_s = function (s$p) { - var len = s$p.length; + let accept_s = function (s$p) { + let len = s$p.length; try { - for(var j = 0; j < len; ++j){ + for(let j = 0; j < len; ++j){ try { if (Caml_string.get(s$p, j) !== Caml_string.get(s, i.contents + j | 0)) { throw { @@ -3383,21 +3383,21 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { return true; } catch (raw_exn){ - var exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn$1.RE_EXN_ID === Pervasives.Exit) { return false; } throw exn$1; } }; - var get = function (param) { - var r = Caml_string.get(s, i.contents); + let get = function (param) { + let r = Caml_string.get(s, i.contents); i.contents = i.contents + 1 | 0; return r; }; - var greedy_mod = function (r) { - var gr = accept(/* '?' */63); - var gr$1 = ungreedy ? !gr : gr; + let greedy_mod = function (r) { + let gr = accept(/* '?' */63); + let gr$1 = ungreedy ? !gr : gr; if (gr$1) { return { TAG: "Sem_greedy", @@ -3412,7 +3412,7 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { }; } }; - var atom = function (param) { + let atom = function (param) { if (accept(/* '.' */46)) { if (dotall) { return any; @@ -3423,7 +3423,7 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { if (accept(/* '(' */40)) { if (accept(/* '?' */63)) { if (accept(/* ':' */58)) { - var r = regexp$p(branch$p(/* [] */0)); + let r = regexp$p(branch$p(/* [] */0)); if (!accept(/* ')' */41)) { throw { RE_EXN_ID: Parse_error, @@ -3433,7 +3433,7 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { return r; } if (accept(/* '#' */35)) { - var _param; + let _param; while(true) { if (accept(/* ')' */41)) { return epsilon; @@ -3448,7 +3448,7 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { Error: new Error() }; } - var r$1 = regexp$p(branch$p(/* [] */0)); + let r$1 = regexp$p(branch$p(/* [] */0)); if (!accept(/* ')' */41)) { throw { RE_EXN_ID: Parse_error, @@ -3490,7 +3490,7 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { Error: new Error() }; } - var c = get(); + let c = get(); switch (c) { case 48 : case 49 : @@ -3629,7 +3629,7 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { Error: new Error() }; } - var c$1 = get(); + let c$1 = get(); if (c$1 >= 64) { if (c$1 !== 92) { if (c$1 !== 123) { @@ -3672,27 +3672,27 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { }; } }; - var integer = function (param) { + let integer = function (param) { if (i.contents === l) { return; } - var d = get(); + let d = get(); if (d > 57 || d < 48) { i.contents = i.contents - 1 | 0; return; } else { - var _i = d - /* '0' */48 | 0; + let _i = d - /* '0' */48 | 0; while(true) { - var i$1 = _i; + let i$1 = _i; if (i.contents === l) { return i$1; } - var d$1 = get(); + let d$1 = get(); if (d$1 > 57 || d$1 < 48) { i.contents = i.contents - 1 | 0; return i$1; } - var i$p = Math.imul(10, i$1) + (d$1 - /* '0' */48 | 0) | 0; + let i$p = Math.imul(10, i$1) + (d$1 - /* '0' */48 | 0) | 0; if (i$p < i$1) { throw { RE_EXN_ID: Parse_error, @@ -3704,14 +3704,14 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { }; } }; - var $$char = function (param) { + let $$char = function (param) { if (i.contents === l) { throw { RE_EXN_ID: Parse_error, Error: new Error() }; } - var c = get(); + let c = get(); if (c === /* '[' */91) { if (accept(/* '=' */61)) { throw { @@ -3720,8 +3720,8 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { }; } if (accept(/* ':' */58)) { - var compl$1 = accept(/* '^' */94); - var cls; + let compl$1 = accept(/* '^' */94); + let cls; try { cls = List.find(accept_s, { hd: "alnum", @@ -3765,7 +3765,7 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { }); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { throw { RE_EXN_ID: Parse_error, @@ -3780,8 +3780,8 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { Error: new Error() }; } - var posix_class = posix_class_of_string(cls); - var re = compl$1 ? compl({ + let posix_class = posix_class_of_string(cls); + let re = compl$1 ? compl({ hd: posix_class, tl: /* [] */0 }) : posix_class; @@ -3802,7 +3802,7 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { Error: new Error() }; } - var c$1 = get(); + let c$1 = get(); if (!accept(/* '.' */46)) { throw { RE_EXN_ID: Not_supported, @@ -3826,7 +3826,7 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { VAL: c }; } - var c$2 = get(); + let c$2 = get(); if (c$2 >= 58) { if (c$2 >= 123) { return { @@ -3999,15 +3999,15 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { }; } }; - var bracket = function (_s) { + let bracket = function (_s) { while(true) { - var s = _s; + let s = _s; if (s !== /* [] */0 && accept(/* ']' */93)) { return s; } - var match = $$char(); + let match = $$char(); if (match.NAME === "Char") { - var c = match.VAL; + let c = match.VAL; if (accept(/* '-' */45)) { if (accept(/* ']' */93)) { return { @@ -4030,7 +4030,7 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { } }; } - var match$1 = $$char(); + let match$1 = $$char(); if (match$1.NAME !== "Char") { return { hd: { @@ -4080,8 +4080,8 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { continue ; }; }; - var piece = function (param) { - var r = atom(); + let piece = function (param) { + let r = atom(); if (accept(/* '*' */42)) { return greedy_mod(repn(r, 0, undefined)); } @@ -4094,9 +4094,9 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { if (!accept(/* '{' */123)) { return r; } - var i$1 = integer(); + let i$1 = integer(); if (i$1 !== undefined) { - var j = accept(/* ',' */44) ? integer() : i$1; + let j = accept(/* ',' */44) ? integer() : i$1; if (!accept(/* '}' */125)) { throw { RE_EXN_ID: Parse_error, @@ -4114,9 +4114,9 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { i.contents = i.contents - 1 | 0; return r; }; - var branch$p = function (_left) { + let branch$p = function (_left) { while(true) { - var left = _left; + let left = _left; if (i.contents === l || test(/* '|' */124) || test(/* ')' */41)) { return seq$2(List.rev(left)); } @@ -4127,9 +4127,9 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { continue ; }; }; - var regexp$p = function (_left) { + let regexp$p = function (_left) { while(true) { - var left = _left; + let left = _left; if (!accept(/* '|' */124)) { return left; } @@ -4143,7 +4143,7 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { continue ; }; }; - var res = regexp$p(branch$p(/* [] */0)); + let res = regexp$p(branch$p(/* [] */0)); if (i.contents !== l) { throw { RE_EXN_ID: Parse_error, @@ -4154,8 +4154,8 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { } function re(flagsOpt, pat) { - var flags = flagsOpt !== undefined ? flagsOpt : /* [] */0; - var opts = List.map((function (x) { + let flags = flagsOpt !== undefined ? flagsOpt : /* [] */0; + let opts = List.map((function (x) { if (x === "CASELESS") { return "Caseless"; } else if (x === "ANCHORED") { @@ -4164,10 +4164,10 @@ function re(flagsOpt, pat) { return "Multiline"; } }), flags); - var optsOpt = opts; - var opts$1 = optsOpt !== undefined ? optsOpt : /* [] */0; - var r = parse(List.memq("Multiline", opts$1), List.memq("Dollar_endonly", opts$1), List.memq("Dotall", opts$1), List.memq("Ungreedy", opts$1), pat); - var r$1 = List.memq("Anchored", opts$1) ? seq$2({ + let optsOpt = opts; + let opts$1 = optsOpt !== undefined ? optsOpt : /* [] */0; + let r = parse(List.memq("Multiline", opts$1), List.memq("Dollar_endonly", opts$1), List.memq("Dotall", opts$1), List.memq("Ungreedy", opts$1), pat); + let r$1 = List.memq("Anchored", opts$1) ? seq$2({ hd: "Start", tl: { hd: r, @@ -4185,8 +4185,8 @@ function re(flagsOpt, pat) { } function exec(rex, pos, s) { - var len; - var substr = exec_internal("Re.exec", pos, len, true, rex, s); + let len; + let substr = exec_internal("Re.exec", pos, len, true, rex, s); if (typeof substr === "object") { return substr._0; } @@ -4202,7 +4202,7 @@ function exec(rex, pos, s) { }; } -var s = "a".repeat(1048575) + "b"; +let s = "a".repeat(1048575) + "b"; eq("File \"ocaml_re_test.res\", line 3843, characters 7-14", get(exec(compile(re(undefined, "aa?b")), undefined, s), 0), "aab"); diff --git a/jscomp/test/of_string_test.js b/jscomp/test/of_string_test.js index a3720b0cbf..fffd6400b2 100644 --- a/jscomp/test/of_string_test.js +++ b/jscomp/test/of_string_test.js @@ -1,10 +1,10 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Pervasives = require("../../lib/js/pervasives.js"); +let Mt = require("./mt.js"); +let Pervasives = require("../../lib/js/pervasives.js"); -var suites_0 = [ +let suites_0 = [ "string_of_float_1", (function (param) { return { @@ -15,7 +15,7 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "string_of_int", (function (param) { @@ -41,7 +41,7 @@ var suites_1 = { } }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/offset.js b/jscomp/test/offset.js index 78ca7f269c..0df3665c23 100644 --- a/jscomp/test/offset.js +++ b/jscomp/test/offset.js @@ -1,11 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml = require("../../lib/js/caml.js"); -var List = require("../../lib/js/list.js"); -var Curry = require("../../lib/js/curry.js"); -var $$String = require("../../lib/js/string.js"); -var Caml_option = require("../../lib/js/caml_option.js"); +let Caml = require("../../lib/js/caml.js"); +let List = require("../../lib/js/list.js"); +let Curry = require("../../lib/js/curry.js"); +let $$String = require("../../lib/js/string.js"); +let Caml_option = require("../../lib/js/caml_option.js"); function height(param) { if (typeof param !== "object") { @@ -16,9 +16,9 @@ function height(param) { } function create(l, v, r) { - var hl; + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; return { TAG: "Node", @@ -30,9 +30,9 @@ function create(l, v, r) { } function bal(l, v, r) { - var hl; + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -42,9 +42,9 @@ function bal(l, v, r) { Error: new Error() }; } - var lr = l.r; - var lv = l.v; - var ll = l.l; + let lr = l.r; + let lv = l.v; + let ll = l.l; if (height(ll) >= height(lr)) { return create(ll, lv, create(lr, v, r)); } @@ -73,9 +73,9 @@ function bal(l, v, r) { Error: new Error() }; } - var rr = r.r; - var rv = r.v; - var rl = r.l; + let rr = r.r; + let rv = r.v; + let rl = r.l; if (height(rr) >= height(rl)) { return create(create(l, v, rl), rv, rr); } @@ -99,22 +99,22 @@ function add(x, param) { h: 1 }; } - var r = param.r; - var v = param.v; - var l = param.l; - var c = Caml.string_compare(x, v); + let r = param.r; + let v = param.v; + let l = param.l; + let c = Caml.string_compare(x, v); if (c === 0) { return param; } if (c < 0) { - var ll = add(x, l); + let ll = add(x, l); if (l === ll) { return param; } else { return bal(ll, v, r); } } - var rr = add(x, r); + let rr = add(x, r); if (r === rr) { return param; } else { @@ -152,11 +152,11 @@ function join(l, v, r) { if (typeof l !== "object") { return add_min_element(v, r); } - var lh = l.h; + let lh = l.h; if (typeof r !== "object") { return add_max_element(v, l); } - var rh = r.h; + let rh = r.h; if (lh > (rh + 2 | 0)) { return bal(l.l, l.v, join(l.r, v, r)); } else if (rh > (lh + 2 | 0)) { @@ -168,14 +168,14 @@ function join(l, v, r) { function min_elt(_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return param.v; } @@ -186,11 +186,11 @@ function min_elt(_param) { function min_elt_opt(_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return Caml_option.some(param.v); } @@ -201,14 +201,14 @@ function min_elt_opt(_param) { function max_elt(_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return param.v; } @@ -219,11 +219,11 @@ function max_elt(_param) { function max_elt_opt(_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return Caml_option.some(param.v); } @@ -240,7 +240,7 @@ function remove_min_elt(param) { Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return param.r; } else { @@ -266,10 +266,10 @@ function split(x, param) { "Empty" ]; } - var r = param.r; - var v = param.v; - var l = param.l; - var c = Caml.string_compare(x, v); + let r = param.r; + let v = param.v; + let l = param.l; + let c = Caml.string_compare(x, v); if (c === 0) { return [ l, @@ -278,14 +278,14 @@ function split(x, param) { ]; } if (c < 0) { - var match = split(x, l); + let match = split(x, l); return [ match[0], match[1], join(match[2], v, r) ]; } - var match$1 = split(x, r); + let match$1 = split(x, r); return [ join(l, v, match$1[0]), match$1[1], @@ -303,11 +303,11 @@ function is_empty(param) { function mem(x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } - var c = Caml.string_compare(x, param.v); + let c = Caml.string_compare(x, param.v); if (c === 0) { return true; } @@ -320,10 +320,10 @@ function remove(x, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var v = param.v; - var l = param.l; - var c = Caml.string_compare(x, v); + let r = param.r; + let v = param.v; + let l = param.l; + let c = Caml.string_compare(x, v); if (c === 0) { if (typeof l !== "object") { return r; @@ -334,14 +334,14 @@ function remove(x, param) { } } if (c < 0) { - var ll = remove(x, l); + let ll = remove(x, l); if (l === ll) { return param; } else { return bal(ll, v, r); } } - var rr = remove(x, r); + let rr = remove(x, r); if (r === rr) { return param; } else { @@ -353,24 +353,24 @@ function union(s1, s2) { if (typeof s1 !== "object") { return s2; } - var h1 = s1.h; - var v1 = s1.v; + let h1 = s1.h; + let v1 = s1.v; if (typeof s2 !== "object") { return s1; } - var h2 = s2.h; - var v2 = s2.v; + let h2 = s2.h; + let v2 = s2.v; if (h1 >= h2) { if (h2 === 1) { return add(v2, s1); } - var match = split(v1, s2); + let match = split(v1, s2); return join(union(s1.l, match[0]), v1, union(s1.r, match[2])); } if (h1 === 1) { return add(v1, s2); } - var match$1 = split(v2, s1); + let match$1 = split(v2, s1); return join(union(match$1[0], s2.l), v2, union(match$1[2], s2.r)); } @@ -381,11 +381,11 @@ function inter(s1, s2) { if (typeof s2 !== "object") { return "Empty"; } - var r1 = s1.r; - var v1 = s1.v; - var l1 = s1.l; - var match = split(v1, s2); - var l2 = match[0]; + let r1 = s1.r; + let v1 = s1.v; + let l1 = s1.l; + let match = split(v1, s2); + let l2 = match[0]; if (match[1]) { return join(inter(l1, l2), v1, inter(r1, match[2])); } else { @@ -400,11 +400,11 @@ function diff(s1, s2) { if (typeof s2 !== "object") { return s1; } - var r1 = s1.r; - var v1 = s1.v; - var l1 = s1.l; - var match = split(v1, s2); - var l2 = match[0]; + let r1 = s1.r; + let v1 = s1.v; + let l1 = s1.l; + let match = split(v1, s2); + let l2 = match[0]; if (match[1]) { return concat(diff(l1, l2), diff(r1, match[2])); } else { @@ -414,8 +414,8 @@ function diff(s1, s2) { function cons_enum(_s, _e) { while(true) { - var e = _e; - var s = _s; + let e = _e; + let s = _s; if (typeof s !== "object") { return e; } @@ -431,11 +431,11 @@ function cons_enum(_s, _e) { } function compare(s1, s2) { - var _e1 = cons_enum(s1, "End"); - var _e2 = cons_enum(s2, "End"); + let _e1 = cons_enum(s1, "End"); + let _e2 = cons_enum(s2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return 0; @@ -446,7 +446,7 @@ function compare(s1, s2) { if (typeof e2 !== "object") { return 1; } - var c = Caml.string_compare(e1._0, e2._0); + let c = Caml.string_compare(e1._0, e2._0); if (c !== 0) { return c; } @@ -462,20 +462,20 @@ function equal(s1, s2) { function subset(_s1, _s2) { while(true) { - var s2 = _s2; - var s1 = _s1; + let s2 = _s2; + let s1 = _s1; if (typeof s1 !== "object") { return true; } - var r1 = s1.r; - var v1 = s1.v; - var l1 = s1.l; + let r1 = s1.r; + let v1 = s1.v; + let l1 = s1.l; if (typeof s2 !== "object") { return false; } - var r2 = s2.r; - var l2 = s2.l; - var c = Caml.string_compare(v1, s2.v); + let r2 = s2.r; + let l2 = s2.l; + let c = Caml.string_compare(v1, s2.v); if (c === 0) { if (!subset(l1, l2)) { return false; @@ -513,7 +513,7 @@ function subset(_s1, _s2) { function iter(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } @@ -526,8 +526,8 @@ function iter(f, _param) { function fold(f, _s, _accu) { while(true) { - var accu = _accu; - var s = _s; + let accu = _accu; + let s = _s; if (typeof s !== "object") { return accu; } @@ -539,7 +539,7 @@ function fold(f, _s, _accu) { function for_all(p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return true; } @@ -556,7 +556,7 @@ function for_all(p, _param) { function exists(p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } @@ -575,12 +575,12 @@ function filter(p, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var v = param.v; - var l = param.l; - var l$p = filter(p, l); - var pv = Curry._1(p, v); - var r$p = filter(p, r); + let r = param.r; + let v = param.v; + let l = param.l; + let l$p = filter(p, l); + let pv = Curry._1(p, v); + let r$p = filter(p, r); if (pv) { if (l === l$p && r === r$p) { return param; @@ -599,14 +599,14 @@ function partition(p, param) { "Empty" ]; } - var v = param.v; - var match = partition(p, param.l); - var lf = match[1]; - var lt = match[0]; - var pv = Curry._1(p, v); - var match$1 = partition(p, param.r); - var rf = match$1[1]; - var rt = match$1[0]; + let v = param.v; + let match = partition(p, param.l); + let lf = match[1]; + let lt = match[0]; + let pv = Curry._1(p, v); + let match$1 = partition(p, param.r); + let rf = match$1[1]; + let rt = match$1[0]; if (pv) { return [ join(lt, v, rt), @@ -630,8 +630,8 @@ function cardinal(param) { function elements_aux(_accu, _param) { while(true) { - var param = _param; - var accu = _accu; + let param = _param; + let accu = _accu; if (typeof param !== "object") { return accu; } @@ -650,15 +650,15 @@ function elements(s) { function find(x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; - var c = Caml.string_compare(x, v); + let v = param.v; + let c = Caml.string_compare(x, v); if (c === 0) { return v; } @@ -669,24 +669,24 @@ function find(x, _param) { function find_first(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _param$1 = param.l; + let _v0 = v; + let _param$1 = param.l; while(true) { - var param$1 = _param$1; - var v0 = _v0; + let param$1 = _param$1; + let v0 = _v0; if (typeof param$1 !== "object") { return v0; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.l; _v0 = v$1; @@ -703,21 +703,21 @@ function find_first(f, _param) { function find_first_opt(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _param$1 = param.l; + let _v0 = v; + let _param$1 = param.l; while(true) { - var param$1 = _param$1; - var v0 = _v0; + let param$1 = _param$1; + let v0 = _v0; if (typeof param$1 !== "object") { return Caml_option.some(v0); } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.l; _v0 = v$1; @@ -734,24 +734,24 @@ function find_first_opt(f, _param) { function find_last(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _param$1 = param.r; + let _v0 = v; + let _param$1 = param.r; while(true) { - var param$1 = _param$1; - var v0 = _v0; + let param$1 = _param$1; + let v0 = _v0; if (typeof param$1 !== "object") { return v0; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.r; _v0 = v$1; @@ -768,21 +768,21 @@ function find_last(f, _param) { function find_last_opt(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _param$1 = param.r; + let _v0 = v; + let _param$1 = param.r; while(true) { - var param$1 = _param$1; - var v0 = _v0; + let param$1 = _param$1; + let v0 = _v0; if (typeof param$1 !== "object") { return Caml_option.some(v0); } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.r; _v0 = v$1; @@ -799,12 +799,12 @@ function find_last_opt(f, _param) { function find_opt(x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; - var c = Caml.string_compare(x, v); + let v = param.v; + let c = Caml.string_compare(x, v); if (c === 0) { return Caml_option.some(v); } @@ -817,12 +817,12 @@ function map(f, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var v = param.v; - var l = param.l; - var l$p = map(f, l); - var v$p = Curry._1(f, v); - var r$p = map(f, r); + let r = param.r; + let v = param.v; + let l = param.l; + let l$p = map(f, l); + let v$p = Curry._1(f, v); + let r$p = map(f, r); if (l === l$p && v === v$p && r === r$p) { return param; } else if ((l$p === "Empty" || Caml.string_compare(max_elt(l$p), v$p) < 0) && (r$p === "Empty" || Caml.string_compare(v$p, min_elt(r$p)) < 0)) { @@ -836,27 +836,27 @@ function of_list(l) { if (!l) { return "Empty"; } - var match = l.tl; - var x0 = l.hd; + let match = l.tl; + let x0 = l.hd; if (!match) { return singleton(x0); } - var match$1 = match.tl; - var x1 = match.hd; + let match$1 = match.tl; + let x1 = match.hd; if (!match$1) { return add(x1, singleton(x0)); } - var match$2 = match$1.tl; - var x2 = match$1.hd; + let match$2 = match$1.tl; + let x2 = match$1.hd; if (!match$2) { return add(x2, add(x1, singleton(x0))); } - var match$3 = match$2.tl; - var x3 = match$2.hd; + let match$3 = match$2.tl; + let x3 = match$2.hd; if (match$3) { if (match$3.tl) { - var l$1 = List.sort_uniq($$String.compare, l); - var sub = function (n, l) { + let l$1 = List.sort_uniq($$String.compare, l); + let sub = function (n, l) { switch (n) { case 0 : return [ @@ -879,7 +879,7 @@ function of_list(l) { break; case 2 : if (l) { - var match = l.tl; + let match = l.tl; if (match) { return [ { @@ -903,9 +903,9 @@ function of_list(l) { break; case 3 : if (l) { - var match$1 = l.tl; + let match$1 = l.tl; if (match$1) { - var match$2 = match$1.tl; + let match$2 = match$1.tl; if (match$2) { return [ { @@ -938,11 +938,11 @@ function of_list(l) { default: } - var nl = n / 2 | 0; - var match$3 = sub(nl, l); - var l$1 = match$3[1]; + let nl = n / 2 | 0; + let match$3 = sub(nl, l); + let l$1 = match$3[1]; if (l$1) { - var match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl); + let match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl); return [ create(match$3[0], l$1.hd, match$4[0]), match$4[1] @@ -967,7 +967,7 @@ function of_list(l) { } } -var $$Set = { +let $$Set = { empty: "Empty", is_empty: is_empty, mem: mem, @@ -1005,12 +1005,12 @@ var $$Set = { of_list: of_list }; -var M = { +let M = { x: 1, $$Set: $$Set }; -var x = 1; +let x = 1; exports.M = M; exports.x = x; diff --git a/jscomp/test/omit_trailing_undefined_in_external_calls.js b/jscomp/test/omit_trailing_undefined_in_external_calls.js index 4966d21d62..39d603cf54 100644 --- a/jscomp/test/omit_trailing_undefined_in_external_calls.js +++ b/jscomp/test/omit_trailing_undefined_in_external_calls.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var SomeModule = require("SomeModule"); +let SomeModule = require("SomeModule"); SomeModule.formatDate(new Date()); @@ -13,7 +13,7 @@ SomeModule.formatDate(new Date(), undefined, true); (42).toString(); -var x = new RegExp("ab+c"); +let x = new RegExp("ab+c"); exports.x = x; /* Not a pure module */ diff --git a/jscomp/test/option_encoding_test.js b/jscomp/test/option_encoding_test.js index 20da98c46e..b4a64b646b 100644 --- a/jscomp/test/option_encoding_test.js +++ b/jscomp/test/option_encoding_test.js @@ -2,14 +2,14 @@ 'use strict'; -var N = {}; +let N = {}; -var u = [ +let u = [ undefined, 3 ]; -var h; +let h; exports.N = N; exports.u = u; diff --git a/jscomp/test/option_repr_test.js b/jscomp/test/option_repr_test.js index a3d8418e18..192d824106 100644 --- a/jscomp/test/option_repr_test.js +++ b/jscomp/test/option_repr_test.js @@ -1,16 +1,16 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Belt_List = require("../../lib/js/belt_List.js"); -var Caml_option = require("../../lib/js/caml_option.js"); +let Mt = require("./mt.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Belt_List = require("../../lib/js/belt_List.js"); +let Caml_option = require("../../lib/js/caml_option.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -23,7 +23,7 @@ function b(loc, v) { } function f0(x) { - var match = x[1]; + let match = x[1]; if (match !== undefined && match) { return 1; } else { @@ -40,7 +40,7 @@ function f1(u) { } function f2(x, y, zOpt, param) { - var z = zOpt !== undefined ? zOpt : 3; + let z = zOpt !== undefined ? zOpt : 3; console.log(x); if (y !== undefined) { return y + z | 0; @@ -73,16 +73,16 @@ function f6(a) { return true; } -var f10 = Caml_option.some(Caml_option.some(Caml_option.some(Caml_option.some(undefined)))); +let f10 = Caml_option.some(Caml_option.some(Caml_option.some(Caml_option.some(undefined)))); -var f11 = Caml_option.some(f10); +let f11 = Caml_option.some(f10); -var randomized = { +let randomized = { contents: false }; function create(randomOpt, param) { - var random = randomOpt !== undefined ? randomOpt : randomized.contents; + let random = randomOpt !== undefined ? randomOpt : randomized.contents; if (random) { return 2; } else { @@ -90,25 +90,25 @@ function create(randomOpt, param) { } } -var ff = create(false, undefined); +let ff = create(false, undefined); function f13(xOpt, yOpt, param) { - var x = xOpt !== undefined ? xOpt : 3; - var y = yOpt !== undefined ? yOpt : 4; + let x = xOpt !== undefined ? xOpt : 3; + let y = yOpt !== undefined ? yOpt : 4; return x + y | 0; } -var a = f13(2, undefined, undefined); +let a = f13(2, undefined, undefined); function f12(x) { return x; } -var length_8_id = Belt_List.makeBy(8, (function (x) { +let length_8_id = Belt_List.makeBy(8, (function (x) { return x; })); -var length_10_id = Belt_List.makeBy(10, (function (x) { +let length_10_id = Belt_List.makeBy(10, (function (x) { return x; })); @@ -175,9 +175,9 @@ function all_true(xs) { })); } -var xs_0 = gtx(Caml_option.some(null), Caml_option.some(undefined)); +let xs_0 = gtx(Caml_option.some(null), Caml_option.some(undefined)); -var xs = { +let xs = { hd: xs_0, tl: /* [] */0 }; @@ -186,9 +186,9 @@ b("File \"option_repr_test.res\", line 125, characters 8-15", Belt_List.every(xs return x; }))); -var xs_0$1 = ltx(Caml_option.some(undefined), 3); +let xs_0$1 = ltx(Caml_option.some(undefined), 3); -var xs_1 = { +let xs_1 = { hd: ltx(Caml_option.some(undefined), Caml_option.some(Caml_option.some(undefined))), tl: { hd: ltx(Caml_option.some(undefined), "3"), @@ -222,7 +222,7 @@ var xs_1 = { } }; -var xs$1 = { +let xs$1 = { hd: xs_0$1, tl: xs_1 }; @@ -231,9 +231,9 @@ b("File \"option_repr_test.res\", line 128, characters 4-11", Belt_List.every(xs return x; }))); -var xs_0$2 = eqx(undefined, undefined); +let xs_0$2 = eqx(undefined, undefined); -var xs_1$1 = { +let xs_1$1 = { hd: neqx(undefined, null), tl: { hd: eqx(Caml_option.some(undefined), Caml_option.some(undefined)), @@ -247,7 +247,7 @@ var xs_1$1 = { } }; -var xs$2 = { +let xs$2 = { hd: xs_0$2, tl: xs_1$1 }; @@ -264,22 +264,22 @@ function v0(x) { return x; } -var N0 = { +let N0 = { v: v, v0: v0 }; Mt.from_pair_suites("Option_repr_test", suites.contents); -var f7; +let f7; -var f8 = Caml_option.some(undefined); +let f8 = Caml_option.some(undefined); -var f9 = Caml_option.some(Caml_option.some(undefined)); +let f9 = Caml_option.some(Caml_option.some(undefined)); -var N; +let N; -var none_arg; +let none_arg; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/optional_ffi_test.js b/jscomp/test/optional_ffi_test.js index a376360e88..5e5be366e6 100644 --- a/jscomp/test/optional_ffi_test.js +++ b/jscomp/test/optional_ffi_test.js @@ -1,20 +1,20 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_option = require("../../lib/js/caml_option.js"); +let Mt = require("./mt.js"); +let Caml_option = require("../../lib/js/caml_option.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; function eq(loc, param) { - var y = param[1]; - var x = param[0]; + let y = param[1]; + let x = param[0]; test_id.contents = test_id.contents + 1 | 0; suites.contents = { hd: [ @@ -37,9 +37,9 @@ function hey(x, y) { } ; -var u = hey(undefined, 3); +let u = hey(undefined, 3); -var z = hey(5, 3); +let z = hey(5, 3); eq("File \"optional_ffi_test.res\", line 21, characters 12-19", [ [ @@ -52,7 +52,7 @@ eq("File \"optional_ffi_test.res\", line 21, characters 12-19", [ ] ]); -var counter = { +let counter = { contents: 0 }; @@ -69,7 +69,7 @@ function bug_to_fix2(f, x) { return hey(Caml_option.option_get(f(x)), 3); } -var counter2 = { +let counter2 = { contents: 0 }; @@ -78,36 +78,36 @@ function side_effect2(x) { return x.contents; } -var v = bug_to_fix(side_effect, counter); +let v = bug_to_fix(side_effect, counter); -var pair_0 = [ +let pair_0 = [ v, counter.contents ]; -var pair_1 = [ +let pair_1 = [ 4, 1 ]; -var pair = [ +let pair = [ pair_0, pair_1 ]; -var v2 = bug_to_fix2(side_effect2, counter2); +let v2 = bug_to_fix2(side_effect2, counter2); -var pair2_0 = [ +let pair2_0 = [ v2, counter.contents ]; -var pair2_1 = [ +let pair2_1 = [ 4, 1 ]; -var pair2 = [ +let pair2 = [ pair2_0, pair2_1 ]; @@ -122,9 +122,9 @@ function heystr(x, y) { } ; -var pair_1$1 = heystr("name", "4"); +let pair_1$1 = heystr("name", "4"); -var pair$1 = [ +let pair$1 = [ "name4", pair_1$1 ]; diff --git a/jscomp/test/optional_regression_test.js b/jscomp/test/optional_regression_test.js index fb5131a3f3..cee1c0b3fc 100644 --- a/jscomp/test/optional_regression_test.js +++ b/jscomp/test/optional_regression_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_option = require("../../lib/js/caml_option.js"); +let Mt = require("./mt.js"); +let Caml_option = require("../../lib/js/caml_option.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -18,7 +18,7 @@ function eq(loc, x, y) { function make(s, b, i) { return function (param) { - var tmp = {}; + let tmp = {}; if (s !== undefined) { tmp.s = Caml_option.valFromOption(s); } @@ -32,7 +32,7 @@ function make(s, b, i) { }; } -var hh = { +let hh = { s: "", b: false, i: 0 diff --git a/jscomp/test/pipe_syntax.js b/jscomp/test/pipe_syntax.js index 867f7cdf86..2341470fb0 100644 --- a/jscomp/test/pipe_syntax.js +++ b/jscomp/test/pipe_syntax.js @@ -1,8 +1,8 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); -var Caml_option = require("../../lib/js/caml_option.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_option = require("../../lib/js/caml_option.js"); function t0(x, f) { return Curry._1(f, Curry._1(f, Curry._1(f, x))); @@ -28,7 +28,7 @@ function f(a, b, c) { } function f1(a, b, c, d) { - var __ocaml_internal_obj = Curry._1(a, b); + let __ocaml_internal_obj = Curry._1(a, b); return [ Curry._1(c, __ocaml_internal_obj), Curry._1(d, __ocaml_internal_obj) @@ -36,17 +36,17 @@ function f1(a, b, c, d) { } function f2(a, b, c, d) { - var __ocaml_internal_obj = Curry._1(a, b); - var u = Curry._1(c, __ocaml_internal_obj); - var v = Curry._1(d, __ocaml_internal_obj); + let __ocaml_internal_obj = Curry._1(a, b); + let u = Curry._1(c, __ocaml_internal_obj); + let v = Curry._1(d, __ocaml_internal_obj); return u + v | 0; } function f3(a, b, c, d, e) { - var __ocaml_internal_obj = Curry._1(a, b); - var u = Curry._2(c, __ocaml_internal_obj, d); - var v = Curry._3(d, __ocaml_internal_obj, 1, 2); - var h = Curry._1(e, __ocaml_internal_obj); + let __ocaml_internal_obj = Curry._1(a, b); + let u = Curry._2(c, __ocaml_internal_obj, d); + let v = Curry._3(d, __ocaml_internal_obj, 1, 2); + let h = Curry._1(e, __ocaml_internal_obj); return (u + v | 0) + h | 0; } @@ -58,9 +58,9 @@ function f4(a, b, c) { } function f5(a, b, c, d) { - var v0 = Curry._3(b, a, c, c); - var v1 = Curry._3(b, a, c, c); - var v2 = Curry._3(b, a, d, d); + let v0 = Curry._3(b, a, c, c); + let v1 = Curry._3(b, a, c, c); + let v2 = Curry._3(b, a, d, d); return (v0 + v1 | 0) + v2 | 0; } @@ -80,7 +80,7 @@ function f8(a) { return Caml_option.some(Caml_option.some(a)); } -var with_poly = { +let with_poly = { NAME: "Foo", VAL: 1 }; diff --git a/jscomp/test/poly_empty_array.js b/jscomp/test/poly_empty_array.js index 684dd92c5b..0427c97349 100644 --- a/jscomp/test/poly_empty_array.js +++ b/jscomp/test/poly_empty_array.js @@ -2,7 +2,7 @@ 'use strict'; -var a = []; +let a = []; exports.a = a; /* No side effect */ diff --git a/jscomp/test/poly_variant_test.js b/jscomp/test/poly_variant_test.js index 0e81428667..f985052b39 100644 --- a/jscomp/test/poly_variant_test.js +++ b/jscomp/test/poly_variant_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -48,13 +48,13 @@ function hey_int (option){ } ; -var uu = [ +let uu = [ hey_string("on_open"), hey_string("on_closed"), hey_string("in") ]; -var vv = [ +let vv = [ hey_int(3), hey_int(0), hey_int(4) diff --git a/jscomp/test/polymorphic_raw_test.js b/jscomp/test/polymorphic_raw_test.js index 0a05ae61e8..def11e6cf2 100644 --- a/jscomp/test/polymorphic_raw_test.js +++ b/jscomp/test/polymorphic_raw_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -28,11 +28,11 @@ function eq(loc, x, y) { }; } -var f = ((a) => typeof a); +let f = ((a) => typeof a); -var a = f(3); +let a = f(3); -var b = f("3"); +let b = f("3"); eq("File \"polymorphic_raw_test.res\", line 18, characters 3-10", a, "number"); diff --git a/jscomp/test/polymorphism_test.js b/jscomp/test/polymorphism_test.js index 70bd4fe1b1..040ba393b5 100644 --- a/jscomp/test/polymorphism_test.js +++ b/jscomp/test/polymorphism_test.js @@ -6,7 +6,7 @@ function map(f, x) { if (!x) { return /* [] */0; } - var r = f(x.hd); + let r = f(x.hd); return { hd: r, tl: map(f, x.tl) diff --git a/jscomp/test/polyvar_convert.js b/jscomp/test/polyvar_convert.js index 2ea6162f01..3d1411fe6a 100644 --- a/jscomp/test/polyvar_convert.js +++ b/jscomp/test/polyvar_convert.js @@ -2,9 +2,9 @@ 'use strict'; -var revData = {"x":"a","b":"b"}; +let revData = {"x":"a","b":"b"}; -var data = {"a":"x","b":"b"}; +let data = {"a":"x","b":"b"}; function tToJs(x) { return data[x]; diff --git a/jscomp/test/polyvar_test.js b/jscomp/test/polyvar_test.js index 743919eca0..605ddcd972 100644 --- a/jscomp/test/polyvar_test.js +++ b/jscomp/test/polyvar_test.js @@ -2,7 +2,7 @@ 'use strict'; -var ff = "B"; +let ff = "B"; console.log([ "A", diff --git a/jscomp/test/ppx_apply_test.js b/jscomp/test/ppx_apply_test.js index dd2ca6aa5b..94825eedd4 100644 --- a/jscomp/test/ppx_apply_test.js +++ b/jscomp/test/ppx_apply_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -28,7 +28,7 @@ function eq(loc, x, y) { }; } -var u = 3; +let u = 3; function nullary() { return 3; @@ -38,7 +38,7 @@ function unary(a) { return a + 3 | 0; } -var xx = 6; +let xx = 6; eq("File \"ppx_apply_test.res\", line 16, characters 12-19", u, 3); diff --git a/jscomp/test/pq_test.js b/jscomp/test/pq_test.js index ca45269176..ef55e96787 100644 --- a/jscomp/test/pq_test.js +++ b/jscomp/test/pq_test.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); function insert(queue, prio, elt) { if (typeof queue !== "object") { @@ -13,10 +13,10 @@ function insert(queue, prio, elt) { _3: "Empty" }; } - var right = queue._3; - var left = queue._2; - var e = queue._1; - var p = queue._0; + let right = queue._3; + let left = queue._2; + let e = queue._1; + let p = queue._0; if (prio <= p) { return { TAG: "Node", @@ -36,7 +36,7 @@ function insert(queue, prio, elt) { } } -var Queue_is_empty = /* @__PURE__ */Caml_exceptions.create("Pq_test.PrioQueue.Queue_is_empty"); +let Queue_is_empty = /* @__PURE__ */Caml_exceptions.create("Pq_test.PrioQueue.Queue_is_empty"); function remove_top(x) { if (typeof x !== "object") { @@ -45,17 +45,17 @@ function remove_top(x) { Error: new Error() }; } - var left = x._2; - var tmp = x._3; + let left = x._2; + let tmp = x._3; if (typeof tmp !== "object") { return left; } if (typeof left !== "object") { return x._3; } - var right = x._3; - var rprio = right._0; - var lprio = left._0; + let right = x._3; + let rprio = right._0; + let lprio = left._0; if (lprio <= rprio) { return { TAG: "Node", @@ -89,7 +89,7 @@ function extract(x) { }; } -var PrioQueue = { +let PrioQueue = { empty: "Empty", insert: insert, Queue_is_empty: Queue_is_empty, diff --git a/jscomp/test/pr6726.js b/jscomp/test/pr6726.js index 852f7390e0..9ef4d9b9f8 100644 --- a/jscomp/test/pr6726.js +++ b/jscomp/test/pr6726.js @@ -6,15 +6,15 @@ function get_uint8(str, off) { return 33; } -var BigEndian = { +let BigEndian = { get_uint8: get_uint8 }; -var ExtUnixAll = { +let ExtUnixAll = { BigEndian: BigEndian }; -var ExtUnix = { +let ExtUnix = { All: undefined }; @@ -22,9 +22,9 @@ function test_endian_string(x) { return 33; } -var v = 33; +let v = 33; -var Test = { +let Test = { test_endian_string: test_endian_string, v: v }; diff --git a/jscomp/test/pr_regression_test.js b/jscomp/test/pr_regression_test.js index 11cdf7b06b..225d41acc7 100644 --- a/jscomp/test/pr_regression_test.js +++ b/jscomp/test/pr_regression_test.js @@ -1,16 +1,16 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Curry = require("../../lib/js/curry.js"); +let Mt = require("./mt.js"); +let Curry = require("../../lib/js/curry.js"); -var v = { +let v = { contents: 3 }; function f(h) { v.contents = v.contents + 1 | 0; - var partial_arg = 3; + let partial_arg = 3; return function (param) { return Curry._2(h, partial_arg, param); }; @@ -24,15 +24,15 @@ f(function (prim0, prim1) { return prim0 + prim1 | 0; }); -var a = v.contents; +let a = v.contents; -var v$1 = { +let v$1 = { contents: 3 }; function f$1(h) { v$1.contents = v$1.contents + 1 | 0; - var partial_arg = 3; + let partial_arg = 3; return function (param) { return Curry._2(h, partial_arg, param); }; @@ -46,9 +46,9 @@ f$1(function (prim0, prim1) { return prim0 + prim1 | 0; }); -var b = v$1.contents; +let b = v$1.contents; -var v$2 = { +let v$2 = { contents: 3 }; @@ -64,15 +64,15 @@ f$2(function (prim0, prim1) { return prim0 + prim1 | 0; }); -var c = v$2.contents; +let c = v$2.contents; -var v$3 = { +let v$3 = { contents: 3 }; function f$3(h, g) { v$3.contents = v$3.contents + 1 | 0; - var partial_arg = 9; + let partial_arg = 9; return function (param) { return Curry._2(h, partial_arg, param); }; @@ -86,7 +86,7 @@ f$3((function (prim0, prim1) { return prim0 + prim1 | 0; }), 3); -var d = v$3.contents; +let d = v$3.contents; Mt.from_pair_suites("Pr_regression_test", { hd: [ diff --git a/jscomp/test/prepend_data_ffi.js b/jscomp/test/prepend_data_ffi.js index d6dbe6c452..3da0ea93e7 100644 --- a/jscomp/test/prepend_data_ffi.js +++ b/jscomp/test/prepend_data_ffi.js @@ -2,12 +2,12 @@ 'use strict'; -var v1 = { +let v1 = { stdio: "inherit", v: 3 }; -var v2 = { +let v2 = { stdio: 1, v: 2 }; @@ -56,7 +56,7 @@ function register(p) { })); } -var config = { +let config = { stdio: "inherit", cwd: "." }; diff --git a/jscomp/test/print_alpha_test.js b/jscomp/test/print_alpha_test.js index deb33dd711..277d9a78ab 100644 --- a/jscomp/test/print_alpha_test.js +++ b/jscomp/test/print_alpha_test.js @@ -1,8 +1,8 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Curry = require("../../lib/js/curry.js"); +let Mt = require("./mt.js"); +let Curry = require("../../lib/js/curry.js"); function f(h, param) { console.log(3); diff --git a/jscomp/test/queue_402.js b/jscomp/test/queue_402.js index 487f89ac01..48e522181b 100644 --- a/jscomp/test/queue_402.js +++ b/jscomp/test/queue_402.js @@ -1,11 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var Empty = /* @__PURE__ */Caml_exceptions.create("Queue_402.Empty"); +let Empty = /* @__PURE__ */Caml_exceptions.create("Queue_402.Empty"); function create(param) { return { @@ -21,16 +21,16 @@ function clear(q) { function add(x, q) { if (q.length === 0) { - var cell = {}; + let cell = {}; cell.content = x; cell.next = cell; q.length = 1; q.tail = cell; return; } - var tail = q.tail; - var head = tail.next; - var cell$1 = { + let tail = q.tail; + let head = tail.next; + let cell$1 = { content: x, next: head }; @@ -57,8 +57,8 @@ function take(q) { }; } q.length = q.length - 1 | 0; - var tail = q.tail; - var head = tail.next; + let tail = q.tail; + let head = tail.next; if (head === tail) { q.tail = undefined; } else { @@ -74,20 +74,20 @@ function copy(q) { tail: undefined }; } - var tail = q.tail; - var tail$p = {}; + let tail = q.tail; + let tail$p = {}; Caml_obj.update_dummy(tail$p, { content: tail.content, next: tail$p }); - var copy$1 = function (_prev, _cell) { + let copy$1 = function (_prev, _cell) { while(true) { - var cell = _cell; - var prev = _prev; + let cell = _cell; + let prev = _prev; if (cell === tail) { return; } - var res = { + let res = { content: cell.content, next: tail$p }; @@ -116,10 +116,10 @@ function iter(f, q) { if (q.length <= 0) { return; } - var tail = q.tail; - var _cell = tail.next; + let tail = q.tail; + let _cell = tail.next; while(true) { - var cell = _cell; + let cell = _cell; Curry._1(f, cell.content); if (cell === tail) { return; @@ -133,13 +133,13 @@ function fold(f, accu, q) { if (q.length === 0) { return accu; } - var tail = q.tail; - var _accu = accu; - var _cell = tail.next; + let tail = q.tail; + let _accu = accu; + let _cell = tail.next; while(true) { - var cell = _cell; - var accu$1 = _accu; - var accu$2 = Curry._2(f, accu$1, cell.content); + let cell = _cell; + let accu$1 = _accu; + let accu$2 = Curry._2(f, accu$1, cell.content); if (cell === tail) { return accu$2; } @@ -150,16 +150,16 @@ function fold(f, accu, q) { } function transfer(q1, q2) { - var length1 = q1.length; + let length1 = q1.length; if (length1 <= 0) { return; } - var tail1 = q1.tail; + let tail1 = q1.tail; clear(q1); if (q2.length > 0) { - var tail2 = q2.tail; - var head1 = tail1.next; - var head2 = tail2.next; + let tail2 = q2.tail; + let head1 = tail1.next; + let head2 = tail2.next; tail1.next = head2; tail2.next = head1; } @@ -167,11 +167,11 @@ function transfer(q1, q2) { q2.tail = tail1; } -var push = add; +let push = add; -var top = peek; +let top = peek; -var pop = take; +let pop = take; exports.Empty = Empty; exports.create = create; diff --git a/jscomp/test/queue_test.js b/jscomp/test/queue_test.js index 8e8dd80f11..1671b5341b 100644 --- a/jscomp/test/queue_test.js +++ b/jscomp/test/queue_test.js @@ -1,24 +1,24 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var $$Array = require("../../lib/js/array.js"); -var Curry = require("../../lib/js/curry.js"); -var Queue = require("../../lib/js/queue.js"); -var Queue_402 = require("./queue_402.js"); -var Caml_array = require("../../lib/js/caml_array.js"); +let Mt = require("./mt.js"); +let $$Array = require("../../lib/js/array.js"); +let Curry = require("../../lib/js/curry.js"); +let Queue = require("../../lib/js/queue.js"); +let Queue_402 = require("./queue_402.js"); +let Caml_array = require("../../lib/js/caml_array.js"); function Test(Queue) { - var to_array = function (q) { - var v = Caml_array.make(Curry._1(Queue.length, q), 0); + let to_array = function (q) { + let v = Caml_array.make(Curry._1(Queue.length, q), 0); Curry._3(Queue.fold, (function (i, e) { Caml_array.set(v, i, e); return i + 1 | 0; }), 0, q); return v; }; - var queue_1 = function (x) { - var q = Curry._1(Queue.create, undefined); + let queue_1 = function (x) { + let q = Curry._1(Queue.create, undefined); $$Array.iter((function (x) { Curry._2(Queue.add, x, q); }), x); @@ -31,7 +31,7 @@ function Test(Queue) { } function to_array(q) { - var v = Caml_array.make(q.length, 0); + let v = Caml_array.make(q.length, 0); Queue.fold((function (i, e) { Caml_array.set(v, i, e); return i + 1 | 0; @@ -40,7 +40,7 @@ function to_array(q) { } function queue_1(x) { - var q = { + let q = { length: 0, first: "Nil", last: "Nil" @@ -51,13 +51,13 @@ function queue_1(x) { return to_array(q); } -var T1 = { +let T1 = { to_array: to_array, queue_1: queue_1 }; function to_array$1(q) { - var v = Caml_array.make(q.length, 0); + let v = Caml_array.make(q.length, 0); Queue_402.fold((function (i, e) { Caml_array.set(v, i, e); return i + 1 | 0; @@ -66,7 +66,7 @@ function to_array$1(q) { } function queue_1$1(x) { - var q = { + let q = { length: 0, tail: undefined }; @@ -76,15 +76,15 @@ function queue_1$1(x) { return to_array$1(q); } -var T2 = { +let T2 = { to_array: to_array$1, queue_1: queue_1$1 }; -var suites_0 = [ +let suites_0 = [ "File \"queue_test.res\", line 34, characters 6-13", (function (param) { - var x = [ + let x = [ 3, 4, 5, @@ -98,11 +98,11 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "File \"queue_test.res\", line 41, characters 6-13", (function (param) { - var x = [ + let x = [ 3, 4, 5, @@ -118,7 +118,7 @@ var suites_1 = { tl: /* [] */0 }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/random_test.js b/jscomp/test/random_test.js index aca1f2aa7e..be7890cc8d 100644 --- a/jscomp/test/random_test.js +++ b/jscomp/test/random_test.js @@ -1,17 +1,17 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Int64 = require("../../lib/js/int64.js"); -var Random = require("../../lib/js/random.js"); -var Mt_global = require("./mt_global.js"); -var Caml_array = require("../../lib/js/caml_array.js"); +let Mt = require("./mt.js"); +let Int64 = require("../../lib/js/int64.js"); +let Random = require("../../lib/js/random.js"); +let Mt_global = require("./mt_global.js"); +let Caml_array = require("../../lib/js/caml_array.js"); -var id = { +let id = { contents: 0 }; -var suites = { +let suites = { contents: /* [] */0 }; @@ -37,9 +37,9 @@ Mt_global.collect_neq(id, suites, "File \"random_test.res\", line 9, characters Random.init(0); -var v = Caml_array.make(10, false); +let v = Caml_array.make(10, false); -for(var i = 0; i <= 9; ++i){ +for(let i = 0; i <= 9; ++i){ Caml_array.set(v, i, Random.bool()); } @@ -56,18 +56,18 @@ Mt_global.collect_eq(id, suites, "File \"random_test.res\", line 28, characters false ]); -var f = Random.int64(Int64.max_int); +let f = Random.int64(Int64.max_int); -var h = Random.int64([ +let h = Random.int64([ 0, 3 ]); -var vv = Random.bits(); +let vv = Random.bits(); -var xx = Random.$$float(3.0); +let xx = Random.$$float(3.0); -var xxx = Random.int32(103); +let xxx = Random.int32(103); Mt.from_pair_suites("Random_test", suites.contents); diff --git a/jscomp/test/raw_hash_tbl_bench.js b/jscomp/test/raw_hash_tbl_bench.js index 907084a9ac..bb3b40f429 100644 --- a/jscomp/test/raw_hash_tbl_bench.js +++ b/jscomp/test/raw_hash_tbl_bench.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Hashtbl = require("../../lib/js/hashtbl.js"); +let Hashtbl = require("../../lib/js/hashtbl.js"); function bench(param) { - var table = Hashtbl.create(undefined, 1000000); - for(var i = 0; i <= 1000000; ++i){ + let table = Hashtbl.create(undefined, 1000000); + for(let i = 0; i <= 1000000; ++i){ Hashtbl.add(table, i, i); } - for(var i$1 = 0; i$1 <= 1000000; ++i$1){ + for(let i$1 = 0; i$1 <= 1000000; ++i$1){ if (!Hashtbl.mem(table, i$1)) { throw { RE_EXN_ID: "Assert_failure", @@ -22,14 +22,14 @@ function bench(param) { } } - for(var i$2 = 0; i$2 <= 1000000; ++i$2){ + for(let i$2 = 0; i$2 <= 1000000; ++i$2){ Hashtbl.remove(table, i$2); } } bench(); -var count = 1000000; +let count = 1000000; exports.count = count; exports.bench = bench; diff --git a/jscomp/test/raw_output_test.js b/jscomp/test/raw_output_test.js index e185759e2a..d236b9b48b 100644 --- a/jscomp/test/raw_output_test.js +++ b/jscomp/test/raw_output_test.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); function mk(fn) { return Curry._1(fn, undefined); diff --git a/jscomp/test/raw_pure_test.js b/jscomp/test/raw_pure_test.js index 23f53d8346..d25fdd6914 100644 --- a/jscomp/test/raw_pure_test.js +++ b/jscomp/test/raw_pure_test.js @@ -5,13 +5,13 @@ // hello 'use strict'; -var List = require("../../lib/js/list.js"); +let List = require("../../lib/js/list.js"); -var x0 = null; +let x0 = null; -var x2 = "荷兰"; +let x2 = "荷兰"; -var x3 = /ghoghos/; +let x3 = /ghoghos/; /** * copyright @@ -23,7 +23,7 @@ function f(x) { return x; } -var hh = List.length; +let hh = List.length; exports.x0 = x0; exports.x2 = x2; diff --git a/jscomp/test/rbset.js b/jscomp/test/rbset.js index c8e5ea0107..28f57f121f 100644 --- a/jscomp/test/rbset.js +++ b/jscomp/test/rbset.js @@ -32,11 +32,11 @@ function is_empty(x) { function mem(x, _x_) { while(true) { - var x_ = _x_; + let x_ = _x_; if (typeof x_ !== "object") { return false; } - var y = x_._2; + let y = x_._2; if (x === y) { return true; } @@ -50,19 +50,19 @@ function mem(x, _x_) { } function balance_left(l, x, r) { - var exit = 0; - var a; - var x$1; - var b; - var y; - var c; - var z; - var d; + let exit = 0; + let a; + let x$1; + let b; + let y; + let c; + let z; + let d; if (typeof l !== "object" || l._0 === "Black") { exit = 1; } else { - var a$1 = l._1; - var exit$1 = 0; + let a$1 = l._1; + let exit$1 = 0; if (typeof a$1 !== "object" || a$1._0 === "Black") { exit$1 = 3; } else { @@ -76,7 +76,7 @@ function balance_left(l, x, r) { exit = 2; } if (exit$1 === 3) { - var match = l._3; + let match = l._3; if (typeof match !== "object" || match._0 === "Black") { exit = 1; } else { @@ -126,19 +126,19 @@ function balance_left(l, x, r) { } function balance_right(l, x, r) { - var exit = 0; - var a; - var x$1; - var b; - var y; - var c; - var z; - var d; + let exit = 0; + let a; + let x$1; + let b; + let y; + let c; + let z; + let d; if (typeof r !== "object" || r._0 === "Black") { exit = 1; } else { - var b$1 = r._1; - var exit$1 = 0; + let b$1 = r._1; + let exit$1 = 0; if (typeof b$1 !== "object" || b$1._0 === "Black") { exit$1 = 3; } else { @@ -152,7 +152,7 @@ function balance_right(l, x, r) { exit = 2; } if (exit$1 === 3) { - var match = r._3; + let match = r._3; if (typeof match !== "object" || match._0 === "Black") { exit = 1; } else { @@ -214,7 +214,7 @@ function singleton(x) { function unbalanced_left(x) { if (typeof x === "object") { if (x._0 === "Black") { - var match = x._1; + let match = x._1; if (typeof match === "object") { if (match._0 === "Black") { return [ @@ -228,7 +228,7 @@ function unbalanced_left(x) { true ]; } - var match$1 = match._3; + let match$1 = match._3; if (typeof match$1 === "object" && match$1._0 === "Black") { return [ { @@ -251,7 +251,7 @@ function unbalanced_left(x) { } } else { - var match$2 = x._1; + let match$2 = x._1; if (typeof match$2 === "object" && match$2._0 === "Black") { return [ balance_left({ @@ -281,9 +281,9 @@ function unbalanced_left(x) { function unbalanced_right(x) { if (typeof x === "object") { if (x._0 === "Black") { - var match = x._3; - var x$1 = x._2; - var a = x._1; + let match = x._3; + let x$1 = x._2; + let a = x._1; if (typeof match === "object") { if (match._0 === "Black") { return [ @@ -297,7 +297,7 @@ function unbalanced_right(x) { true ]; } - var match$1 = match._1; + let match$1 = match._1; if (typeof match$1 === "object" && match$1._0 === "Black") { return [ { @@ -320,7 +320,7 @@ function unbalanced_right(x) { } } else { - var match$2 = x._3; + let match$2 = x._3; if (typeof match$2 === "object" && match$2._0 === "Black") { return [ balance_right(x._1, x._2, { @@ -366,8 +366,8 @@ function lbalance(x1, x2, x3) { _3: x3 }; } - var r = x1._3; - var l = x1._1; + let r = x1._3; + let l = x1._1; if (typeof l === "object" && l._0 !== "Black") { return { TAG: "Node", @@ -407,7 +407,7 @@ function lbalance(x1, x2, x3) { _3: x3 }; } - var y = r._2; + let y = r._2; return { TAG: "Node", _0: "Red", @@ -431,8 +431,8 @@ function lbalance(x1, x2, x3) { function rbalance(x1, x2, x3) { if (typeof x3 === "object" && x3._0 !== "Black") { - var b = x3._1; - var exit = 0; + let b = x3._1; + let exit = 0; if (typeof b !== "object") { exit = 2; } else { @@ -460,7 +460,7 @@ function rbalance(x1, x2, x3) { exit = 2; } if (exit === 2) { - var match = x3._3; + let match = x3._3; if (typeof match === "object" && match._0 !== "Black") { return { TAG: "Node", @@ -506,24 +506,24 @@ function ins(x, x_) { }; } if (x_._0 === "Black") { - var y = x_._2; + let y = x_._2; if (x === y) { return x_; } - var b = x_._3; - var a = x_._1; + let b = x_._3; + let a = x_._1; if (x < y) { return lbalance(ins(x, a), y, b); } else { return rbalance(a, y, ins(x, b)); } } - var y$1 = x_._2; + let y$1 = x_._2; if (x === y$1) { return x_; } - var b$1 = x_._3; - var a$1 = x_._1; + let b$1 = x_._3; + let a$1 = x_._1; if (x < y$1) { return { TAG: "Node", @@ -544,7 +544,7 @@ function ins(x, x_) { } function add(x, s) { - var s$1 = ins(x, s); + let s$1 = ins(x, s); if (typeof s$1 !== "object" || s$1._0 === "Black") { return s$1; } else { @@ -570,12 +570,12 @@ function remove_min(x) { Error: new Error() }; } - var c = x._0; + let c = x._0; if (c === "Black") { - var tmp = x._1; + let tmp = x._1; if (typeof tmp !== "object") { - var match = x._3; - var x$1 = x._2; + let match = x._3; + let x$1 = x._2; if (typeof match !== "object") { return [ "Empty", @@ -608,7 +608,7 @@ function remove_min(x) { } } else { - var tmp$1 = x._1; + let tmp$1 = x._1; if (typeof tmp$1 !== "object") { return [ x._3, @@ -618,12 +618,12 @@ function remove_min(x) { } } - var match$1 = remove_min(x._1); - var y = match$1[1]; - var s_1 = match$1[0]; - var s_2 = x._2; - var s_3 = x._3; - var s = { + let match$1 = remove_min(x._1); + let y = match$1[1]; + let s_1 = match$1[0]; + let s_2 = x._2; + let s_3 = x._3; + let s = { TAG: "Node", _0: c, _1: s_1, @@ -637,7 +637,7 @@ function remove_min(x) { false ]; } - var match$2 = unbalanced_right(s); + let match$2 = unbalanced_right(s); return [ match$2[0], y, @@ -652,10 +652,10 @@ function remove_aux(x, n) { false ]; } - var r = n._3; - var y = n._2; - var l = n._1; - var c = n._0; + let r = n._3; + let y = n._2; + let l = n._1; + let c = n._0; if (x === y) { if (typeof r !== "object") { if (c === "Red") { @@ -667,10 +667,10 @@ function remove_aux(x, n) { return blackify(l); } } - var match = remove_min(r); - var n_2 = match[1]; - var n_3 = match[0]; - var n$1 = { + let match = remove_min(r); + let n_2 = match[1]; + let n_3 = match[0]; + let n$1 = { TAG: "Node", _0: c, _1: l, @@ -687,9 +687,9 @@ function remove_aux(x, n) { } } if (x < y) { - var match$1 = remove_aux(x, l); - var n_1 = match$1[0]; - var n$2 = { + let match$1 = remove_aux(x, l); + let n_1 = match$1[0]; + let n$2 = { TAG: "Node", _0: c, _1: n_1, @@ -705,9 +705,9 @@ function remove_aux(x, n) { ]; } } - var match$2 = remove_aux(x, r); - var n_3$1 = match$2[0]; - var n$3 = { + let match$2 = remove_aux(x, r); + let n_3$1 = match$2[0]; + let n$3 = { TAG: "Node", _0: c, _1: l, @@ -736,7 +736,7 @@ function cardinal(x) { } } -var empty = "Empty"; +let empty = "Empty"; exports.blackify = blackify; exports.empty = empty; diff --git a/jscomp/test/react.js b/jscomp/test/react.js index 88fd49d834..cfc2f2da1d 100644 --- a/jscomp/test/react.js +++ b/jscomp/test/react.js @@ -2,19 +2,19 @@ 'use strict'; -var Ref = {}; +let Ref = {}; -var Children = {}; +let Children = {}; -var Context = {}; +let Context = {}; -var Fragment = {}; +let Fragment = {}; -var StrictMode = {}; +let StrictMode = {}; -var Suspense = {}; +let Suspense = {}; -var SuspenseList = {}; +let SuspenseList = {}; exports.Ref = Ref; exports.Children = Children; diff --git a/jscomp/test/reactDOMRe.js b/jscomp/test/reactDOMRe.js index 9bdc80bab6..dee8919f57 100644 --- a/jscomp/test/reactDOMRe.js +++ b/jscomp/test/reactDOMRe.js @@ -1,11 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var React = require("react"); -var ReactDom = require("react-dom"); +let React = require("react"); +let ReactDom = require("react-dom"); function renderToElementWithClassName(reactElement, className) { - var elements = document.getElementsByClassName(className); + let elements = document.getElementsByClassName(className); if (elements.length !== 0) { ReactDom.render(reactElement, elements[0]); } else { @@ -14,7 +14,7 @@ function renderToElementWithClassName(reactElement, className) { } function renderToElementWithId(reactElement, id) { - var element = document.getElementById(id); + let element = document.getElementById(id); if (element == null) { console.error("ReactDOMRe.renderToElementWithId : no element of id " + (id + " found in the HTML.")); } else { @@ -23,7 +23,7 @@ function renderToElementWithId(reactElement, id) { } function createRootWithClassName(className) { - var elements = document.getElementsByClassName(className); + let elements = document.getElementsByClassName(className); if (elements.length !== 0) { return { TAG: "Ok", @@ -38,7 +38,7 @@ function createRootWithClassName(className) { } function createRootWithId(id) { - var element = document.getElementById(id); + let element = document.getElementById(id); if (element == null) { return { TAG: "Error", @@ -52,13 +52,13 @@ function createRootWithId(id) { } } -var Experimental = { +let Experimental = { createRootWithClassName: createRootWithClassName, createRootWithId: createRootWithId }; function hydrateToElementWithClassName(reactElement, className) { - var elements = document.getElementsByClassName(className); + let elements = document.getElementsByClassName(className); if (elements.length !== 0) { ReactDom.hydrate(reactElement, elements[0]); } else { @@ -67,7 +67,7 @@ function hydrateToElementWithClassName(reactElement, className) { } function hydrateToElementWithId(reactElement, id) { - var element = document.getElementById(id); + let element = document.getElementById(id); if (element == null) { throw { RE_EXN_ID: "Invalid_argument", @@ -78,10 +78,10 @@ function hydrateToElementWithId(reactElement, id) { ReactDom.hydrate(reactElement, element); } -var Ref = {}; +let Ref = {}; function createElementVariadic(domClassName, props, children) { - var variadicArguments = [ + let variadicArguments = [ domClassName, props ].concat(children); @@ -89,12 +89,12 @@ function createElementVariadic(domClassName, props, children) { } function unsafeAddProp(style, key, value) { - var dict = {}; + let dict = {}; dict[key] = value; return Object.assign({}, style, dict); } -var Style = { +let Style = { unsafeAddProp: unsafeAddProp }; diff --git a/jscomp/test/reactEvent.js b/jscomp/test/reactEvent.js index 91d374a8ea..9448ed898f 100644 --- a/jscomp/test/reactEvent.js +++ b/jscomp/test/reactEvent.js @@ -2,35 +2,35 @@ 'use strict'; -var Synthetic = {}; +let Synthetic = {}; -var Clipboard = {}; +let Clipboard = {}; -var Composition = {}; +let Composition = {}; -var Keyboard = {}; +let Keyboard = {}; -var Focus = {}; +let Focus = {}; -var Form = {}; +let Form = {}; -var Mouse = {}; +let Mouse = {}; -var $$Selection = {}; +let $$Selection = {}; -var $$Touch = {}; +let $$Touch = {}; -var UI = {}; +let UI = {}; -var Wheel = {}; +let Wheel = {}; -var Media = {}; +let Media = {}; -var $$Image = {}; +let $$Image = {}; -var $$Animation = {}; +let $$Animation = {}; -var Transition = {}; +let Transition = {}; exports.Synthetic = Synthetic; exports.Clipboard = Clipboard; diff --git a/jscomp/test/reactTestUtils.js b/jscomp/test/reactTestUtils.js index c5f06d9b94..dca2fa6dfb 100644 --- a/jscomp/test/reactTestUtils.js +++ b/jscomp/test/reactTestUtils.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); -var Belt_Array = require("../../lib/js/belt_Array.js"); -var Belt_Option = require("../../lib/js/belt_Option.js"); -var Caml_option = require("../../lib/js/caml_option.js"); -var TestUtils = require("react-dom/test-utils"); +let Curry = require("../../lib/js/curry.js"); +let Belt_Array = require("../../lib/js/belt_Array.js"); +let Belt_Option = require("../../lib/js/belt_Option.js"); +let Caml_option = require("../../lib/js/caml_option.js"); +let TestUtils = require("react-dom/test-utils"); function act(func) { - var reactFunc = function () { + let reactFunc = function () { Curry._1(func, undefined); }; TestUtils.act(reactFunc); @@ -21,7 +21,7 @@ function actAsync(func) { } function changeWithValue(element, value) { - var $$event = { + let $$event = { target: { value: value } @@ -30,7 +30,7 @@ function changeWithValue(element, value) { } function changeWithChecked(element, value) { - var $$event = { + let $$event = { target: { checked: value } @@ -38,7 +38,7 @@ function changeWithChecked(element, value) { TestUtils.Simulate.change(element, $$event); } -var Simulate = { +let Simulate = { changeWithValue: changeWithValue, changeWithChecked: changeWithChecked }; @@ -63,7 +63,7 @@ function findBySelectorAndPartialTextContent(element, selector, content) { })); } -var DOM = { +let DOM = { findBySelector: findBySelector, findByAllSelector: findByAllSelector, findBySelectorAndTextContent: findBySelectorAndTextContent, @@ -71,7 +71,7 @@ var DOM = { }; function prepareContainer(container, param) { - var containerElement = document.createElement("div"); + let containerElement = document.createElement("div"); Belt_Option.map(document.body, (function (body) { return body.appendChild(containerElement); })); diff --git a/jscomp/test/reasonReact.js b/jscomp/test/reasonReact.js index 457528f13f..55c86ce840 100644 --- a/jscomp/test/reasonReact.js +++ b/jscomp/test/reasonReact.js @@ -1,11 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); -var React = require("react"); +let Curry = require("../../lib/js/curry.js"); +let React = require("react"); function createDomElement(s, props, children) { - var vararg = [ + let vararg = [ s, props ].concat(children); @@ -57,22 +57,22 @@ function basicComponent(debugName) { }; } -var statelessComponent = basicComponent; +let statelessComponent = basicComponent; -var statelessComponentWithRetainedProps = basicComponent; +let statelessComponentWithRetainedProps = basicComponent; -var reducerComponent = basicComponent; +let reducerComponent = basicComponent; -var reducerComponentWithRetainedProps = basicComponent; +let reducerComponentWithRetainedProps = basicComponent; function element(keyOpt, refOpt, component) { - var key = keyOpt !== undefined ? keyOpt : undefined; - var ref = refOpt !== undefined ? refOpt : undefined; - var element$1 = { + let key = keyOpt !== undefined ? keyOpt : undefined; + let ref = refOpt !== undefined ? refOpt : undefined; + let element$1 = { TAG: "Element", _0: component }; - var jsElementWrapped = component.jsElementWrapped; + let jsElementWrapped = component.jsElementWrapped; if (jsElementWrapped !== undefined) { return Curry._2(jsElementWrapped, key, ref); } else { @@ -85,20 +85,20 @@ function element(keyOpt, refOpt, component) { } function wrapReasonForJs(component, jsPropsToReason) { - var uncurriedJsPropsToReason = Curry.__1(jsPropsToReason); + let uncurriedJsPropsToReason = Curry.__1(jsPropsToReason); component.reactClassInternal.prototype.jsPropsToReason = uncurriedJsPropsToReason; return component.reactClassInternal; } -var dummyInteropComponent = basicComponent("interop"); +let dummyInteropComponent = basicComponent("interop"); function wrapJsForReason(reactClass, props, children) { - var jsElementWrapped = (function (param, param$1) { - var props$1 = Object.assign(Object.assign({}, props), { + let jsElementWrapped = (function (param, param$1) { + let props$1 = Object.assign(Object.assign({}, props), { ref: param$1, key: param }); - var varargs = [ + let varargs = [ reactClass, props$1 ].concat(children); @@ -122,7 +122,7 @@ function wrapJsForReason(reactClass, props, children) { }; } -var Router; +let Router; exports.statelessComponent = statelessComponent; exports.statelessComponentWithRetainedProps = statelessComponentWithRetainedProps; diff --git a/jscomp/test/reasonReactCompat.js b/jscomp/test/reasonReactCompat.js index f95760ff7d..43f178a76d 100644 --- a/jscomp/test/reasonReactCompat.js +++ b/jscomp/test/reasonReactCompat.js @@ -1,11 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var ReasonReact = require("./reasonReact.js"); +let ReasonReact = require("./reasonReact.js"); -var wrapReactForReasonReact = ReasonReact.wrapJsForReason; +let wrapReactForReasonReact = ReasonReact.wrapJsForReason; -var wrapReasonReactForReact = ReasonReact.wrapReasonForJs; +let wrapReasonReactForReact = ReasonReact.wrapReasonForJs; exports.wrapReactForReasonReact = wrapReactForReasonReact; exports.wrapReasonReactForReact = wrapReasonReactForReact; diff --git a/jscomp/test/reasonReactOptimizedCreateClass.js b/jscomp/test/reasonReactOptimizedCreateClass.js index 22bc3fa930..0502aed5a9 100644 --- a/jscomp/test/reasonReactOptimizedCreateClass.js +++ b/jscomp/test/reasonReactOptimizedCreateClass.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var React = require("react"); +let React = require("react"); function _assign(prim0, prim1) { return Object.assign(prim0, prim1); } -var emptyObject = {}; +let emptyObject = {}; /** * Copyright 2013-present, Facebook, Inc. @@ -50,7 +50,7 @@ var ReactPropTypeLocationNames; // } ; -var factory = (function factory(ReactComponent, isValidElement, ReactNoopUpdateQueue) { +let factory = (function factory(ReactComponent, isValidElement, ReactNoopUpdateQueue) { /** * Policies that describe methods in \`ReactClassInterface\`. */ @@ -881,9 +881,9 @@ var factory = (function factory(ReactComponent, isValidElement, ReactNoopUpdateQ return createClass; }); -var reactNoopUpdateQueue = new React.Component().updater; +let reactNoopUpdateQueue = new React.Component().updater; -var createClass = factory(React.Component, React.isValidElement, reactNoopUpdateQueue); +let createClass = factory(React.Component, React.isValidElement, reactNoopUpdateQueue); exports._assign = _assign; exports.emptyObject = emptyObject; diff --git a/jscomp/test/reasonReactRouter.js b/jscomp/test/reasonReactRouter.js index 980ad043b3..2773726ada 100644 --- a/jscomp/test/reasonReactRouter.js +++ b/jscomp/test/reasonReactRouter.js @@ -1,38 +1,38 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); -var React = require("react"); +let Curry = require("../../lib/js/curry.js"); +let React = require("react"); function safeMakeEvent(eventName) { if (typeof Event === "function") { return new Event(eventName); } - var $$event = document.createEvent("Event"); + let $$event = document.createEvent("Event"); $$event.initEvent(eventName, true, true); return $$event; } function path(param) { - var $$window = typeof window === "undefined" ? undefined : window; + let $$window = typeof window === "undefined" ? undefined : window; if ($$window === undefined) { return /* [] */0; } - var raw = $$window.location.pathname; + let raw = $$window.location.pathname; switch (raw) { case "" : case "/" : return /* [] */0; default: - var raw$1 = raw.slice(1); - var match = raw$1[raw$1.length - 1 | 0]; - var raw$2 = match === "/" ? raw$1.slice(0, -1) : raw$1; - var a = raw$2.split("/"); - var _i = a.length - 1 | 0; - var _res = /* [] */0; + let raw$1 = raw.slice(1); + let match = raw$1[raw$1.length - 1 | 0]; + let raw$2 = match === "/" ? raw$1.slice(0, -1) : raw$1; + let a = raw$2.split("/"); + let _i = a.length - 1 | 0; + let _res = /* [] */0; while(true) { - var res = _res; - var i = _i; + let res = _res; + let i = _i; if (i < 0) { return res; } @@ -47,11 +47,11 @@ function path(param) { } function hash(param) { - var $$window = typeof window === "undefined" ? undefined : window; + let $$window = typeof window === "undefined" ? undefined : window; if ($$window === undefined) { return ""; } - var raw = $$window.location.hash; + let raw = $$window.location.hash; switch (raw) { case "" : case "#" : @@ -62,11 +62,11 @@ function hash(param) { } function search(param) { - var $$window = typeof window === "undefined" ? undefined : window; + let $$window = typeof window === "undefined" ? undefined : window; if ($$window === undefined) { return ""; } - var raw = $$window.location.search; + let raw = $$window.location.search; switch (raw) { case "" : case "?" : @@ -77,8 +77,8 @@ function search(param) { } function push(path) { - var match = typeof history === "undefined" ? undefined : history; - var match$1 = typeof window === "undefined" ? undefined : window; + let match = typeof history === "undefined" ? undefined : history; + let match$1 = typeof window === "undefined" ? undefined : window; if (match !== undefined && match$1 !== undefined) { match.pushState(null, "", path); match$1.dispatchEvent(safeMakeEvent("popstate")); @@ -88,8 +88,8 @@ function push(path) { } function replace(path) { - var match = typeof history === "undefined" ? undefined : history; - var match$1 = typeof window === "undefined" ? undefined : window; + let match = typeof history === "undefined" ? undefined : history; + let match$1 = typeof window === "undefined" ? undefined : window; if (match !== undefined && match$1 !== undefined) { match.replaceState(null, "", path); match$1.dispatchEvent(safeMakeEvent("popstate")); @@ -102,11 +102,11 @@ function urlNotEqual(a, b) { if (a.hash !== b.hash || a.search !== b.search) { return true; } else { - var _aList = a.path; - var _bList = b.path; + let _aList = a.path; + let _bList = b.path; while(true) { - var bList = _bList; - var aList = _aList; + let bList = _bList; + let aList = _aList; if (!aList) { if (bList) { return true; @@ -136,13 +136,13 @@ function url(param) { } function watchUrl(callback) { - var $$window = typeof window === "undefined" ? undefined : window; + let $$window = typeof window === "undefined" ? undefined : window; if ($$window === undefined) { return function (param) { }; } - var watcherID = function (param) { + let watcherID = function (param) { Curry._1(callback, url()); }; $$window.addEventListener("popstate", watcherID); @@ -150,7 +150,7 @@ function watchUrl(callback) { } function unwatchUrl(watcherID) { - var $$window = typeof window === "undefined" ? undefined : window; + let $$window = typeof window === "undefined" ? undefined : window; if ($$window !== undefined) { $$window.removeEventListener("popstate", watcherID); return; @@ -159,22 +159,22 @@ function unwatchUrl(watcherID) { } function useUrl(serverUrl, param) { - var match = React.useState(function (param) { + let match = React.useState(function (param) { if (serverUrl !== undefined) { return serverUrl; } else { return url(); } }); - var setUrl = match[1]; - var url$1 = match[0]; + let setUrl = match[1]; + let url$1 = match[0]; React.useEffect((function (param) { - var watcherId = watchUrl(function (url) { + let watcherId = watchUrl(function (url) { Curry._1(setUrl, (function (param) { return url; })); }); - var newUrl = url(); + let newUrl = url(); if (urlNotEqual(newUrl, url$1)) { Curry._1(setUrl, (function (param) { return newUrl; @@ -187,7 +187,7 @@ function useUrl(serverUrl, param) { return url$1; } -var dangerouslyGetInitialUrl = url; +let dangerouslyGetInitialUrl = url; exports.push = push; exports.replace = replace; diff --git a/jscomp/test/rebind_module.js b/jscomp/test/rebind_module.js index 2337c913aa..0c9c8b6925 100644 --- a/jscomp/test/rebind_module.js +++ b/jscomp/test/rebind_module.js @@ -1,11 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var A = /* @__PURE__ */Caml_exceptions.create("Rebind_module.A"); +let A = /* @__PURE__ */Caml_exceptions.create("Rebind_module.A"); -var AA = /* @__PURE__ */Caml_exceptions.create("Rebind_module.AA"); +let AA = /* @__PURE__ */Caml_exceptions.create("Rebind_module.AA"); exports.A = A; exports.AA = AA; diff --git a/jscomp/test/rebind_module_test.js b/jscomp/test/rebind_module_test.js index 71f1f9554c..5e0744b7f3 100644 --- a/jscomp/test/rebind_module_test.js +++ b/jscomp/test/rebind_module_test.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Rebind_module = require("./rebind_module.js"); +let Rebind_module = require("./rebind_module.js"); function x(v) { if (v.RE_EXN_ID === Rebind_module.AA) { diff --git a/jscomp/test/rec_array_test.js b/jscomp/test/rec_array_test.js index d79b26c073..24b46d28c4 100644 --- a/jscomp/test/rec_array_test.js +++ b/jscomp/test/rec_array_test.js @@ -1,11 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../../lib/js/caml_obj.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); -var vicky = {}; +let vicky = {}; -var teacher = {}; +let teacher = {}; Caml_obj.update_dummy(vicky, { taughtBy: teacher diff --git a/jscomp/test/rec_fun_test.js b/jscomp/test/rec_fun_test.js index f97cb953f0..558627d5dd 100644 --- a/jscomp/test/rec_fun_test.js +++ b/jscomp/test/rec_fun_test.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Curry = require("../../lib/js/curry.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); +let Mt = require("./mt.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -30,13 +30,13 @@ function eq(loc, x, y) { }; } -var called = { +let called = { contents: 0 }; function g(param) { - var v = {}; - var next = function (i, b) { + let v = {}; + let next = function (i, b) { called.contents = called.contents + 1 | 0; if (b) { Curry._2(v.contents, i, false); @@ -51,9 +51,9 @@ function g(param) { g(); -var x = {}; +let x = {}; -var y = {}; +let y = {}; Caml_obj.update_dummy(x, { hd: 1, diff --git a/jscomp/test/rec_module_opt.js b/jscomp/test/rec_module_opt.js index 6b5d737136..ac331de436 100644 --- a/jscomp/test/rec_module_opt.js +++ b/jscomp/test/rec_module_opt.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var $$Set = require("../../lib/js/set.js"); -var Caml = require("../../lib/js/caml.js"); -var Curry = require("../../lib/js/curry.js"); +let $$Set = require("../../lib/js/set.js"); +let Caml = require("../../lib/js/caml.js"); +let Curry = require("../../lib/js/curry.js"); function compare(t1, t2) { if (t1.TAG === "Leaf") { @@ -19,21 +19,21 @@ function compare(t1, t2) { } } -var A = { +let A = { compare: compare }; -var ASet = $$Set.Make(A); +let ASet = $$Set.Make(A); -var X0 = {}; +let X0 = {}; -var Y0 = {}; +let Y0 = {}; function f(x) { return x + 1 | 0; } -var X1 = { +let X1 = { f: f }; @@ -41,11 +41,11 @@ function f$1(x) { return x + 2 | 0; } -var Y1 = { +let Y1 = { f: f$1 }; -var X; +let X; exports.A = A; exports.ASet = ASet; diff --git a/jscomp/test/rec_module_test.js b/jscomp/test/rec_module_test.js index 49fa9062c0..f7a673aa64 100644 --- a/jscomp/test/rec_module_test.js +++ b/jscomp/test/rec_module_test.js @@ -1,11 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml = require("../../lib/js/caml.js"); -var List = require("../../lib/js/list.js"); -var Curry = require("../../lib/js/curry.js"); -var Caml_option = require("../../lib/js/caml_option.js"); +let Mt = require("./mt.js"); +let Caml = require("../../lib/js/caml.js"); +let List = require("../../lib/js/list.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_option = require("../../lib/js/caml_option.js"); function even(n) { if (n === 0) { @@ -17,7 +17,7 @@ function even(n) { } } -var A = { +let A = { even: even }; @@ -31,7 +31,7 @@ function odd(n) { } } -var B = { +let B = { odd: odd }; @@ -49,7 +49,7 @@ function x(param) { return Curry._1(BB.y, undefined) + 3 | 0; } -var AA = { +let AA = { even: even$1, x: x }; @@ -68,14 +68,14 @@ function y(param) { return 32; } -var BB = { +let BB = { odd: odd$1, y: y }; -var Even = {}; +let Even = {}; -var Odd = {}; +let Odd = {}; function compare(t1, t2) { if (t1.TAG === "Leaf") { @@ -91,7 +91,7 @@ function compare(t1, t2) { } } -var AAA = { +let AAA = { compare: compare }; @@ -104,9 +104,9 @@ function height(param) { } function create(l, v, r) { - var hl; + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; return { TAG: "Node", @@ -118,9 +118,9 @@ function create(l, v, r) { } function bal(l, v, r) { - var hl; + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -130,9 +130,9 @@ function bal(l, v, r) { Error: new Error() }; } - var lr = l.r; - var lv = l.v; - var ll = l.l; + let lr = l.r; + let lv = l.v; + let ll = l.l; if (height(ll) >= height(lr)) { return create(ll, lv, create(lr, v, r)); } @@ -161,9 +161,9 @@ function bal(l, v, r) { Error: new Error() }; } - var rr = r.r; - var rv = r.v; - var rl = r.l; + let rr = r.r; + let rv = r.v; + let rl = r.l; if (height(rr) >= height(rl)) { return create(create(l, v, rl), rv, rr); } @@ -187,22 +187,22 @@ function add(x, param) { h: 1 }; } - var r = param.r; - var v = param.v; - var l = param.l; - var c = Curry._2(AAA.compare, x, v); + let r = param.r; + let v = param.v; + let l = param.l; + let c = Curry._2(AAA.compare, x, v); if (c === 0) { return param; } if (c < 0) { - var ll = add(x, l); + let ll = add(x, l); if (l === ll) { return param; } else { return bal(ll, v, r); } } - var rr = add(x, r); + let rr = add(x, r); if (r === rr) { return param; } else { @@ -240,11 +240,11 @@ function join(l, v, r) { if (typeof l !== "object") { return add_min_element(v, r); } - var lh = l.h; + let lh = l.h; if (typeof r !== "object") { return add_max_element(v, l); } - var rh = r.h; + let rh = r.h; if (lh > (rh + 2 | 0)) { return bal(l.l, l.v, join(l.r, v, r)); } else if (rh > (lh + 2 | 0)) { @@ -256,14 +256,14 @@ function join(l, v, r) { function min_elt(_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return param.v; } @@ -274,11 +274,11 @@ function min_elt(_param) { function min_elt_opt(_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return Caml_option.some(param.v); } @@ -289,14 +289,14 @@ function min_elt_opt(_param) { function max_elt(_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return param.v; } @@ -307,11 +307,11 @@ function max_elt(_param) { function max_elt_opt(_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return Caml_option.some(param.v); } @@ -328,7 +328,7 @@ function remove_min_elt(param) { Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return param.r; } else { @@ -354,10 +354,10 @@ function split(x, param) { "Empty" ]; } - var r = param.r; - var v = param.v; - var l = param.l; - var c = Curry._2(AAA.compare, x, v); + let r = param.r; + let v = param.v; + let l = param.l; + let c = Curry._2(AAA.compare, x, v); if (c === 0) { return [ l, @@ -366,14 +366,14 @@ function split(x, param) { ]; } if (c < 0) { - var match = split(x, l); + let match = split(x, l); return [ match[0], match[1], join(match[2], v, r) ]; } - var match$1 = split(x, r); + let match$1 = split(x, r); return [ join(l, v, match$1[0]), match$1[1], @@ -391,11 +391,11 @@ function is_empty(param) { function mem(x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } - var c = Curry._2(AAA.compare, x, param.v); + let c = Curry._2(AAA.compare, x, param.v); if (c === 0) { return true; } @@ -408,10 +408,10 @@ function remove(x, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var v = param.v; - var l = param.l; - var c = Curry._2(AAA.compare, x, v); + let r = param.r; + let v = param.v; + let l = param.l; + let c = Curry._2(AAA.compare, x, v); if (c === 0) { if (typeof l !== "object") { return r; @@ -422,14 +422,14 @@ function remove(x, param) { } } if (c < 0) { - var ll = remove(x, l); + let ll = remove(x, l); if (l === ll) { return param; } else { return bal(ll, v, r); } } - var rr = remove(x, r); + let rr = remove(x, r); if (r === rr) { return param; } else { @@ -441,24 +441,24 @@ function union(s1, s2) { if (typeof s1 !== "object") { return s2; } - var h1 = s1.h; - var v1 = s1.v; + let h1 = s1.h; + let v1 = s1.v; if (typeof s2 !== "object") { return s1; } - var h2 = s2.h; - var v2 = s2.v; + let h2 = s2.h; + let v2 = s2.v; if (h1 >= h2) { if (h2 === 1) { return add(v2, s1); } - var match = split(v1, s2); + let match = split(v1, s2); return join(union(s1.l, match[0]), v1, union(s1.r, match[2])); } if (h1 === 1) { return add(v1, s2); } - var match$1 = split(v2, s1); + let match$1 = split(v2, s1); return join(union(match$1[0], s2.l), v2, union(match$1[2], s2.r)); } @@ -469,11 +469,11 @@ function inter(s1, s2) { if (typeof s2 !== "object") { return "Empty"; } - var r1 = s1.r; - var v1 = s1.v; - var l1 = s1.l; - var match = split(v1, s2); - var l2 = match[0]; + let r1 = s1.r; + let v1 = s1.v; + let l1 = s1.l; + let match = split(v1, s2); + let l2 = match[0]; if (match[1]) { return join(inter(l1, l2), v1, inter(r1, match[2])); } else { @@ -488,11 +488,11 @@ function diff(s1, s2) { if (typeof s2 !== "object") { return s1; } - var r1 = s1.r; - var v1 = s1.v; - var l1 = s1.l; - var match = split(v1, s2); - var l2 = match[0]; + let r1 = s1.r; + let v1 = s1.v; + let l1 = s1.l; + let match = split(v1, s2); + let l2 = match[0]; if (match[1]) { return concat(diff(l1, l2), diff(r1, match[2])); } else { @@ -502,8 +502,8 @@ function diff(s1, s2) { function cons_enum(_s, _e) { while(true) { - var e = _e; - var s = _s; + let e = _e; + let s = _s; if (typeof s !== "object") { return e; } @@ -519,11 +519,11 @@ function cons_enum(_s, _e) { } function compare$1(s1, s2) { - var _e1 = cons_enum(s1, "End"); - var _e2 = cons_enum(s2, "End"); + let _e1 = cons_enum(s1, "End"); + let _e2 = cons_enum(s2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return 0; @@ -534,7 +534,7 @@ function compare$1(s1, s2) { if (typeof e2 !== "object") { return 1; } - var c = Curry._2(AAA.compare, e1._0, e2._0); + let c = Curry._2(AAA.compare, e1._0, e2._0); if (c !== 0) { return c; } @@ -550,20 +550,20 @@ function equal(s1, s2) { function subset(_s1, _s2) { while(true) { - var s2 = _s2; - var s1 = _s1; + let s2 = _s2; + let s1 = _s1; if (typeof s1 !== "object") { return true; } - var r1 = s1.r; - var v1 = s1.v; - var l1 = s1.l; + let r1 = s1.r; + let v1 = s1.v; + let l1 = s1.l; if (typeof s2 !== "object") { return false; } - var r2 = s2.r; - var l2 = s2.l; - var c = Curry._2(AAA.compare, v1, s2.v); + let r2 = s2.r; + let l2 = s2.l; + let c = Curry._2(AAA.compare, v1, s2.v); if (c === 0) { if (!subset(l1, l2)) { return false; @@ -601,7 +601,7 @@ function subset(_s1, _s2) { function iter(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } @@ -614,8 +614,8 @@ function iter(f, _param) { function fold(f, _s, _accu) { while(true) { - var accu = _accu; - var s = _s; + let accu = _accu; + let s = _s; if (typeof s !== "object") { return accu; } @@ -627,7 +627,7 @@ function fold(f, _s, _accu) { function for_all(p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return true; } @@ -644,7 +644,7 @@ function for_all(p, _param) { function exists(p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } @@ -663,12 +663,12 @@ function filter(p, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var v = param.v; - var l = param.l; - var l$p = filter(p, l); - var pv = Curry._1(p, v); - var r$p = filter(p, r); + let r = param.r; + let v = param.v; + let l = param.l; + let l$p = filter(p, l); + let pv = Curry._1(p, v); + let r$p = filter(p, r); if (pv) { if (l === l$p && r === r$p) { return param; @@ -687,14 +687,14 @@ function partition(p, param) { "Empty" ]; } - var v = param.v; - var match = partition(p, param.l); - var lf = match[1]; - var lt = match[0]; - var pv = Curry._1(p, v); - var match$1 = partition(p, param.r); - var rf = match$1[1]; - var rt = match$1[0]; + let v = param.v; + let match = partition(p, param.l); + let lf = match[1]; + let lt = match[0]; + let pv = Curry._1(p, v); + let match$1 = partition(p, param.r); + let rf = match$1[1]; + let rt = match$1[0]; if (pv) { return [ join(lt, v, rt), @@ -718,8 +718,8 @@ function cardinal(param) { function elements_aux(_accu, _param) { while(true) { - var param = _param; - var accu = _accu; + let param = _param; + let accu = _accu; if (typeof param !== "object") { return accu; } @@ -738,15 +738,15 @@ function elements(s) { function find(x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; - var c = Curry._2(AAA.compare, x, v); + let v = param.v; + let c = Curry._2(AAA.compare, x, v); if (c === 0) { return v; } @@ -757,24 +757,24 @@ function find(x, _param) { function find_first(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _param$1 = param.l; + let _v0 = v; + let _param$1 = param.l; while(true) { - var param$1 = _param$1; - var v0 = _v0; + let param$1 = _param$1; + let v0 = _v0; if (typeof param$1 !== "object") { return v0; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.l; _v0 = v$1; @@ -791,21 +791,21 @@ function find_first(f, _param) { function find_first_opt(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _param$1 = param.l; + let _v0 = v; + let _param$1 = param.l; while(true) { - var param$1 = _param$1; - var v0 = _v0; + let param$1 = _param$1; + let v0 = _v0; if (typeof param$1 !== "object") { return Caml_option.some(v0); } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.l; _v0 = v$1; @@ -822,24 +822,24 @@ function find_first_opt(f, _param) { function find_last(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _param$1 = param.r; + let _v0 = v; + let _param$1 = param.r; while(true) { - var param$1 = _param$1; - var v0 = _v0; + let param$1 = _param$1; + let v0 = _v0; if (typeof param$1 !== "object") { return v0; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.r; _v0 = v$1; @@ -856,21 +856,21 @@ function find_last(f, _param) { function find_last_opt(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _param$1 = param.r; + let _v0 = v; + let _param$1 = param.r; while(true) { - var param$1 = _param$1; - var v0 = _v0; + let param$1 = _param$1; + let v0 = _v0; if (typeof param$1 !== "object") { return Caml_option.some(v0); } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.r; _v0 = v$1; @@ -887,12 +887,12 @@ function find_last_opt(f, _param) { function find_opt(x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; - var c = Curry._2(AAA.compare, x, v); + let v = param.v; + let c = Curry._2(AAA.compare, x, v); if (c === 0) { return Caml_option.some(v); } @@ -905,12 +905,12 @@ function map(f, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var v = param.v; - var l = param.l; - var l$p = map(f, l); - var v$p = Curry._1(f, v); - var r$p = map(f, r); + let r = param.r; + let v = param.v; + let l = param.l; + let l$p = map(f, l); + let v$p = Curry._1(f, v); + let r$p = map(f, r); if (l === l$p && v === v$p && r === r$p) { return param; } else if ((l$p === "Empty" || Curry._2(AAA.compare, max_elt(l$p), v$p) < 0) && (r$p === "Empty" || Curry._2(AAA.compare, v$p, min_elt(r$p)) < 0)) { @@ -924,27 +924,27 @@ function of_list(l) { if (!l) { return "Empty"; } - var match = l.tl; - var x0 = l.hd; + let match = l.tl; + let x0 = l.hd; if (!match) { return singleton(x0); } - var match$1 = match.tl; - var x1 = match.hd; + let match$1 = match.tl; + let x1 = match.hd; if (!match$1) { return add(x1, singleton(x0)); } - var match$2 = match$1.tl; - var x2 = match$1.hd; + let match$2 = match$1.tl; + let x2 = match$1.hd; if (!match$2) { return add(x2, add(x1, singleton(x0))); } - var match$3 = match$2.tl; - var x3 = match$2.hd; + let match$3 = match$2.tl; + let x3 = match$2.hd; if (match$3) { if (match$3.tl) { - var l$1 = List.sort_uniq(AAA.compare, l); - var sub = function (n, l) { + let l$1 = List.sort_uniq(AAA.compare, l); + let sub = function (n, l) { switch (n) { case 0 : return [ @@ -967,7 +967,7 @@ function of_list(l) { break; case 2 : if (l) { - var match = l.tl; + let match = l.tl; if (match) { return [ { @@ -991,9 +991,9 @@ function of_list(l) { break; case 3 : if (l) { - var match$1 = l.tl; + let match$1 = l.tl; if (match$1) { - var match$2 = match$1.tl; + let match$2 = match$1.tl; if (match$2) { return [ { @@ -1026,11 +1026,11 @@ function of_list(l) { default: } - var nl = n / 2 | 0; - var match$3 = sub(nl, l); - var l$1 = match$3[1]; + let nl = n / 2 | 0; + let match$3 = sub(nl, l); + let l$1 = match$3[1]; if (l$1) { - var match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl); + let match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl); return [ create(match$3[0], l$1.hd, match$4[0]), match$4[1] @@ -1055,7 +1055,7 @@ function of_list(l) { } } -var ASet = { +let ASet = { empty: "Empty", is_empty: is_empty, mem: mem, @@ -1093,7 +1093,7 @@ var ASet = { of_list: of_list }; -var suites_0 = [ +let suites_0 = [ "test1", (function (param) { return { @@ -1114,7 +1114,7 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "test2", (function (param) { @@ -1206,7 +1206,7 @@ var suites_1 = { } }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/recmodule.js b/jscomp/test/recmodule.js index 1183ee98fb..a33e3982c2 100644 --- a/jscomp/test/recmodule.js +++ b/jscomp/test/recmodule.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); -var Caml_module = require("../../lib/js/caml_module.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_module = require("../../lib/js/caml_module.js"); -var Entity = {}; +let Entity = {}; function MakeLayer(Deps) { - var getLight = function (id) { + let getLight = function (id) { return Curry._1(Deps.presentLight, { id: id, name: "Light 1" @@ -18,15 +18,15 @@ function MakeLayer(Deps) { }; } -var UseCase = { +let UseCase = { MakeLayer: MakeLayer }; function MakeLayer$1(Deps, UC) { - var presentLight = function (light) { + let presentLight = function (light) { return Curry._2(Deps.presentJson, light, 200); }; - var handleGetLight = function (req) { + let handleGetLight = function (req) { return Curry._1(UC.getLight, req.params.id); }; return { @@ -35,12 +35,12 @@ function MakeLayer$1(Deps, UC) { }; } -var Adapter = { +let Adapter = { MakeLayer: MakeLayer$1 }; function MakeLayer$2(Deps) { - var presentJson = function (json, status) { + let presentJson = function (json, status) { throw { RE_EXN_ID: "Assert_failure", _1: [ @@ -51,7 +51,7 @@ function MakeLayer$2(Deps) { Error: new Error() }; }; - var routes = function (param) { + let routes = function (param) { return [[ "/lights", Deps.handleGetLight @@ -63,11 +63,11 @@ function MakeLayer$2(Deps) { }; } -var Infra = { +let Infra = { MakeLayer: MakeLayer$2 }; -var I = Caml_module.init_mod([ +let I = Caml_module.init_mod([ "recmodule.res", 67, 30 @@ -85,7 +85,7 @@ var I = Caml_module.init_mod([ ] }); -var A = Caml_module.init_mod([ +let A = Caml_module.init_mod([ "recmodule.res", 68, 25 @@ -103,7 +103,7 @@ var A = Caml_module.init_mod([ ] }); -var U = Caml_module.init_mod([ +let U = Caml_module.init_mod([ "recmodule.res", 69, 25 @@ -193,7 +193,7 @@ Caml_module.update_mod({ getLight: getLight }); -var App = { +let App = { I: I, A: A, U: U diff --git a/jscomp/test/record_debug_test.js b/jscomp/test/record_debug_test.js index 3d6e6ae6d9..c1591413b6 100644 --- a/jscomp/test/record_debug_test.js +++ b/jscomp/test/record_debug_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Mt = require("./mt.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -16,7 +16,7 @@ function eq(loc, x, y) { Mt.eq_suites(test_id, suites, loc, x, y); } -var v = { +let v = { a: 3, b: { xx: 2, @@ -24,34 +24,34 @@ var v = { } }; -var u_a = 2; +let u_a = 2; -var u_b = { +let u_b = { xx: 2, yy: 3 }; -var u = { +let u = { a: u_a, b: u_b }; -var A = /* @__PURE__ */Caml_exceptions.create("Record_debug_test.A"); +let A = /* @__PURE__ */Caml_exceptions.create("Record_debug_test.A"); -var B = /* @__PURE__ */Caml_exceptions.create("Record_debug_test.B"); +let B = /* @__PURE__ */Caml_exceptions.create("Record_debug_test.B"); -var v0 = { +let v0 = { RE_EXN_ID: A, _1: 3 }; -var v1 = { +let v1 = { RE_EXN_ID: B, _1: 3, _2: 2 }; -var N = { +let N = { a: 0, b: 1 }; @@ -60,7 +60,7 @@ function N0_f(prim) { return prim; } -var N0 = { +let N0 = { a: 0, b: 1, f: N0_f @@ -68,7 +68,7 @@ var N0 = { console.log("hei", v); -var a = [ +let a = [ 1, 2, 2, @@ -76,7 +76,7 @@ var a = [ 3 ]; -var c = [ +let c = [ 1, 2, 3, @@ -96,7 +96,7 @@ eq("File \"record_debug_test.res\", line 58, characters 3-10", [ Mt.from_pair_suites("record_debug_test.res", suites.contents); -var h = { +let h = { hd: 1, tl: { hd: 2, @@ -110,12 +110,12 @@ var h = { } }; -var v2 = { +let v2 = { NAME: "C", VAL: 2 }; -var v3 = { +let v3 = { NAME: "C", VAL: [ 2, diff --git a/jscomp/test/record_extension_test.js b/jscomp/test/record_extension_test.js index 4db5bb1190..9e6b29e605 100644 --- a/jscomp/test/record_extension_test.js +++ b/jscomp/test/record_extension_test.js @@ -1,17 +1,17 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Curry = require("../../lib/js/curry.js"); -var Caml_format = require("../../lib/js/caml_format.js"); -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let Mt = require("./mt.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_format = require("../../lib/js/caml_format.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -19,7 +19,7 @@ function eq(loc, x, y) { Mt.eq_suites(test_id, suites, loc, x, y); } -var Inline_record = /* @__PURE__ */Caml_exceptions.create("Record_extension_test.Inline_record"); +let Inline_record = /* @__PURE__ */Caml_exceptions.create("Record_extension_test.Inline_record"); function f(x) { if (x.RE_EXN_ID === Inline_record) { @@ -28,7 +28,7 @@ function f(x) { } -var v0 = { +let v0 = { RE_EXN_ID: Inline_record, x: 3, y: "4" @@ -56,18 +56,18 @@ function f2_with(x) { } } -var A = /* @__PURE__ */Caml_exceptions.create("Record_extension_test.A"); +let A = /* @__PURE__ */Caml_exceptions.create("Record_extension_test.A"); -var B = /* @__PURE__ */Caml_exceptions.create("Record_extension_test.B"); +let B = /* @__PURE__ */Caml_exceptions.create("Record_extension_test.B"); -var C = /* @__PURE__ */Caml_exceptions.create("Record_extension_test.C"); +let C = /* @__PURE__ */Caml_exceptions.create("Record_extension_test.C"); function u(f) { try { return Curry._1(f, undefined); } catch (raw_x){ - var x = Caml_js_exceptions.internalToOCamlException(raw_x); + let x = Caml_js_exceptions.internalToOCamlException(raw_x); if (x.RE_EXN_ID === A) { return x.name + x.x | 0; } else if (x.RE_EXN_ID === B) { diff --git a/jscomp/test/record_regression.js b/jscomp/test/record_regression.js index 0d52a0f326..bc1e9d736e 100644 --- a/jscomp/test/record_regression.js +++ b/jscomp/test/record_regression.js @@ -1,57 +1,57 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Caml_option = require("../../lib/js/caml_option.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Caml_option = require("../../lib/js/caml_option.js"); -var f1 = { +let f1 = { x: 3, z: 2 }; -var newrecord = Caml_obj.obj_dup(f1); +let newrecord = Caml_obj.obj_dup(f1); newrecord.y = 3; -var newrecord$1 = Caml_obj.obj_dup(newrecord); +let newrecord$1 = Caml_obj.obj_dup(newrecord); newrecord$1.yy = Caml_option.some(undefined); -var theseTwoShouldBeIdentical = [ +let theseTwoShouldBeIdentical = [ newrecord$1.yy, Caml_option.some(undefined) ]; -var v = { +let v = { x: 2, z: 3 }; -var newrecord$2 = Caml_obj.obj_dup(v); +let newrecord$2 = Caml_obj.obj_dup(v); newrecord$2.y1 = 22; -var v1 = { +let v1 = { x: 2, z: 3 }; -var newrecord$3 = Caml_obj.obj_dup(v1); +let newrecord$3 = Caml_obj.obj_dup(v1); newrecord$3.y1 = 22; function h11(v1) { - var newrecord = Caml_obj.obj_dup(v1); + let newrecord = Caml_obj.obj_dup(v1); newrecord.y1 = 22; return newrecord; } -var po = { +let po = { aa: 3, bb: 4 }; -var newrecord$4 = Caml_obj.obj_dup(po); +let newrecord$4 = Caml_obj.obj_dup(po); newrecord$4.aa = undefined; @@ -61,20 +61,20 @@ function setAA(ao) { }; } -var ir0 = { +let ir0 = { TAG: "V0", x0: "v0", x3: 3 }; -var ir1 = { +let ir1 = { TAG: "V0", x0: "v0", x1: "v1", x3: 3 }; -var ir2 = { +let ir2 = { TAG: "V0", x0: "v0", x1: "v1", @@ -82,13 +82,13 @@ var ir2 = { x3: 3 }; -var ir3 = { +let ir3 = { TAG: "V1", y0: "v0", y1: 1 }; -var pm0; +let pm0; pm0 = ir0.TAG === "V0" ? [ "v0", @@ -98,11 +98,11 @@ pm0 = ir0.TAG === "V0" ? [ undefined ]; -var pm1; +let pm1; if (ir1.TAG === "V0") { - var x1 = "v1"; - var x0 = "v0"; + let x1 = "v1"; + let x0 = "v0"; pm1 = x1 !== undefined ? [ x0, x1, @@ -120,13 +120,13 @@ if (ir1.TAG === "V0") { ]; } -var pm2; +let pm2; if (ir2.TAG === "V0") { - var x1$1 = "v1"; - var x0$1 = "v0"; + let x1$1 = "v1"; + let x0$1 = "v0"; if (x1$1 !== undefined) { - var x2 = 2; + let x2 = 2; pm2 = x2 !== undefined ? [ x0$1, x1$1, @@ -139,7 +139,7 @@ if (ir2.TAG === "V0") { 3 ]; } else { - var x2$1 = 2; + let x2$1 = 2; pm2 = x2$1 !== undefined ? [ x0$1, "n/a", @@ -170,12 +170,12 @@ function inlinedRecord(ir) { ir.y1 ]; } - var x1 = ir.x1; - var x0 = ir.x0; + let x1 = ir.x1; + let x0 = ir.x0; if (x1 !== undefined) { switch (x1) { case "x1" : - var x2 = ir.x2; + let x2 = ir.x2; if (x2 !== undefined) { return [ x0, @@ -186,7 +186,7 @@ function inlinedRecord(ir) { } break; case "xx1" : - var x2$1 = ir.x2; + let x2$1 = ir.x2; if (x2$1 !== undefined) { return [ x0, @@ -199,7 +199,7 @@ function inlinedRecord(ir) { default: } - var x2$2 = ir.x2; + let x2$2 = ir.x2; if (x2$2 !== undefined) { return [ x0, @@ -216,7 +216,7 @@ function inlinedRecord(ir) { ]; } } - var x2$3 = ir.x2; + let x2$3 = ir.x2; if (x2$3 !== undefined) { return [ x0, @@ -234,36 +234,36 @@ function inlinedRecord(ir) { } } -var pm3 = inlinedRecord(ir2); +let pm3 = inlinedRecord(ir2); -var pm4 = inlinedRecord(ir3); +let pm4 = inlinedRecord(ir3); -var f2 = { +let f2 = { x: 3, y: 3, z: 3 }; -var f3 = newrecord; +let f3 = newrecord; -var f4 = newrecord$1; +let f4 = newrecord$1; -var v2 = { +let v2 = { x: 3, y: undefined, z: 2 }; -var h = newrecord$2; +let h = newrecord$2; -var h10 = newrecord$3; +let h10 = newrecord$3; -var ir4 = { +let ir4 = { TAG: "V0", x: 3 }; -var ir5 = { +let ir5 = { TAG: "V0" }; diff --git a/jscomp/test/record_type_spread.js b/jscomp/test/record_type_spread.js index 7f0c61958c..3a024b12e2 100644 --- a/jscomp/test/record_type_spread.js +++ b/jscomp/test/record_type_spread.js @@ -10,7 +10,7 @@ function getX(v) { return v.x; } -var DeepSub = { +let DeepSub = { d: { x: { TAG: "Ok", @@ -23,12 +23,12 @@ var DeepSub = { } }; -var v = { +let v = { y: 3, x: 3 }; -var d = { +let d = { a: "", b: 1, c: undefined, @@ -38,7 +38,7 @@ var d = { } }; -var x = { +let x = { c: "hello" }; diff --git a/jscomp/test/record_with_test.js b/jscomp/test/record_with_test.js index 99d0b9e295..c1cadd2cad 100644 --- a/jscomp/test/record_with_test.js +++ b/jscomp/test/record_with_test.js @@ -1,10 +1,10 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Curry = require("../../lib/js/curry.js"); +let Mt = require("./mt.js"); +let Curry = require("../../lib/js/curry.js"); -var v = { +let v = { syntax: undefined, imports: 0, file_options: 0, @@ -14,7 +14,7 @@ var v = { extends: 0 }; -var u_v = { +let u_v = { syntax: undefined, imports: 0, file_options: 0, @@ -25,7 +25,7 @@ var u_v = { }; function f(g, h) { - var init = Curry._1(g, h); + let init = Curry._1(g, h); return { syntax: init.syntax, imports: 0, @@ -37,7 +37,7 @@ function f(g, h) { }; } -var suites_0 = [ +let suites_0 = [ "eq_with", (function (param) { return { @@ -48,14 +48,14 @@ var suites_0 = [ }) ]; -var suites = { +let suites = { hd: suites_0, tl: /* [] */0 }; Mt.from_pair_suites("Record_with_test", suites); -var uv = { +let uv = { syntax: undefined, imports: 1, file_options: 0, diff --git a/jscomp/test/recursive_module.js b/jscomp/test/recursive_module.js index 9c1d1f8045..583a1d11ae 100644 --- a/jscomp/test/recursive_module.js +++ b/jscomp/test/recursive_module.js @@ -1,19 +1,19 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Lazy = require("../../lib/js/lazy.js"); -var Curry = require("../../lib/js/curry.js"); -var Caml_module = require("../../lib/js/caml_module.js"); -var CamlinternalLazy = require("../../lib/js/camlinternalLazy.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); -var Caml_external_polyfill = require("../../lib/js/caml_external_polyfill.js"); - -var suites = { +let Mt = require("./mt.js"); +let Lazy = require("../../lib/js/lazy.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_module = require("../../lib/js/caml_module.js"); +let CamlinternalLazy = require("../../lib/js/camlinternalLazy.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let Caml_external_polyfill = require("../../lib/js/caml_external_polyfill.js"); + +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -21,13 +21,13 @@ function eq(loc, x, y) { Mt.eq_suites(test_id, suites, loc, x, y); } -var Xx = { +let Xx = { f: (function (prim0, prim1) { return Caml_external_polyfill.resolve("hfiehi")(prim0, prim1); }) }; -var Int3 = Caml_module.init_mod([ +let Int3 = Caml_module.init_mod([ "recursive_module.res", 25, 4 @@ -47,7 +47,7 @@ Caml_module.update_mod({ ]] }, Int3, Int3); -var Inta = Caml_module.init_mod([ +let Inta = Caml_module.init_mod([ "recursive_module.res", 29, 4 @@ -59,7 +59,7 @@ var Inta = Caml_module.init_mod([ ]] }); -var Intb = Caml_module.init_mod([ +let Intb = Caml_module.init_mod([ "recursive_module.res", 34, 4 @@ -71,7 +71,7 @@ var Intb = Caml_module.init_mod([ ]] }); -var a = CamlinternalLazy.from_fun(function () { +let a = CamlinternalLazy.from_fun(function () { return CamlinternalLazy.force(Intb.a); }); @@ -85,7 +85,7 @@ Caml_module.update_mod({ a: a }); -var a$1 = CamlinternalLazy.from_fun(function () { +let a$1 = CamlinternalLazy.from_fun(function () { return CamlinternalLazy.force(Inta.a) + 1 | 0; }); @@ -99,13 +99,13 @@ Caml_module.update_mod({ a: a$1 }); -var tmp; +let tmp; try { tmp = CamlinternalLazy.force(Intb.a); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === Lazy.Undefined) { tmp = -1; } else { @@ -115,7 +115,7 @@ catch (raw_exn){ eq("File \"recursive_module.res\", line 39, characters 2-9", -1, tmp); -var Inta$1 = Caml_module.init_mod([ +let Inta$1 = Caml_module.init_mod([ "recursive_module.res", 49, 6 @@ -127,7 +127,7 @@ var Inta$1 = Caml_module.init_mod([ ]] }); -var Intb$1 = Caml_module.init_mod([ +let Intb$1 = Caml_module.init_mod([ "recursive_module.res", 54, 6 @@ -139,7 +139,7 @@ var Intb$1 = Caml_module.init_mod([ ]] }); -var a$2 = CamlinternalLazy.from_fun(function () { +let a$2 = CamlinternalLazy.from_fun(function () { return CamlinternalLazy.force(Intb$1.a) + 1 | 0; }); @@ -153,7 +153,7 @@ Caml_module.update_mod({ a: a$2 }); -var a$3 = CamlinternalLazy.from_fun(function () { +let a$3 = CamlinternalLazy.from_fun(function () { return 2; }); @@ -167,21 +167,21 @@ Caml_module.update_mod({ a: a$3 }); -var A = { +let A = { Inta: Inta$1, Intb: Intb$1 }; eq("File \"recursive_module.res\", line 59, characters 3-10", CamlinternalLazy.force(Inta$1.a), 3); -var tmp$1; +let tmp$1; try { Curry._1(Int3.u, 3); tmp$1 = 3; } catch (raw_exn$1){ - var exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1); + let exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1); if (exn$1.RE_EXN_ID === "Undefined_recursive_module") { tmp$1 = 4; } else { @@ -193,9 +193,9 @@ eq("File \"recursive_module.res\", line 62, characters 2-9", 4, tmp$1); Mt.from_pair_suites("Recursive_module", suites.contents); -var Int32; +let Int32; -var uuu = Xx.f; +let uuu = Xx.f; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/recursive_module_test.js b/jscomp/test/recursive_module_test.js index 100cc75c64..9a75930356 100644 --- a/jscomp/test/recursive_module_test.js +++ b/jscomp/test/recursive_module_test.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Curry = require("../../lib/js/curry.js"); -var Caml_module = require("../../lib/js/caml_module.js"); +let Mt = require("./mt.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_module = require("../../lib/js/caml_module.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -37,7 +37,7 @@ function add(suite) { }; } -var Int3 = Caml_module.init_mod([ +let Int3 = Caml_module.init_mod([ "recursive_module_test.res", 12, 4 @@ -65,13 +65,13 @@ function fact(n) { } } -var M = { +let M = { fact: fact }; -var fact$1 = M.fact; +let fact$1 = M.fact; -var Fact = { +let Fact = { M: M, fact: fact$1 }; diff --git a/jscomp/test/recursive_react_component.js b/jscomp/test/recursive_react_component.js index b8e5845630..4753217ff2 100644 --- a/jscomp/test/recursive_react_component.js +++ b/jscomp/test/recursive_react_component.js @@ -1,10 +1,10 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var React = require("react"); +let React = require("react"); function make(Props) { - var foo = Props.foo; + let foo = Props.foo; return React.createElement(make, { foo: foo }); diff --git a/jscomp/test/recursive_records_test.js b/jscomp/test/recursive_records_test.js index 45121866dc..20b542d691 100644 --- a/jscomp/test/recursive_records_test.js +++ b/jscomp/test/recursive_records_test.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var List = require("../../lib/js/list.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); +let Mt = require("./mt.js"); +let List = require("../../lib/js/list.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -17,14 +17,14 @@ function eq(loc, x, y) { Mt.eq_suites(test_id, suites, loc, x, y); } -var rec_cell = {}; +let rec_cell = {}; rec_cell.content = 3; rec_cell.next = rec_cell; function f0(x) { - var rec_cell = {}; + let rec_cell = {}; Caml_obj.update_dummy(rec_cell, { content: Math.imul(x, x) - 6 | 0, next: rec_cell @@ -40,14 +40,14 @@ eq("File \"recursive_records_test.res\", line 26, characters 5-12", a0(rec_cell) eq("File \"recursive_records_test.res\", line 27, characters 5-12", a0(f0(3)), 9); -var rec_cell2 = {}; +let rec_cell2 = {}; rec_cell2.content = 3; rec_cell2.next = rec_cell2; function f2(x) { - var rec_cell2 = {}; + let rec_cell2 = {}; Caml_obj.update_dummy(rec_cell2, { TAG: "Cons", content: Math.imul(x, x) - 6 | 0, @@ -81,18 +81,18 @@ function tl_exn(x) { eq("File \"recursive_records_test.res\", line 54, characters 5-12", (hd(rec_cell2) + hd(tl_exn(rec_cell2)) | 0) + hd(tl_exn(tl_exn(rec_cell2))) | 0, 9); -var rec_cell2$1 = f2(3); +let rec_cell2$1 = f2(3); eq("File \"recursive_records_test.res\", line 56, characters 5-12", (hd(rec_cell2$1) + hd(tl_exn(rec_cell2$1)) | 0) + hd(tl_exn(tl_exn(rec_cell2$1))) | 0, 9); -var rec_cell3 = {}; +let rec_cell3 = {}; rec_cell3.hd = 3; rec_cell3.tl = rec_cell3; function f3(x) { - var rec_cell3 = {}; + let rec_cell3 = {}; Caml_obj.update_dummy(rec_cell3, { hd: Math.imul(x, x) - 6 | 0, tl: rec_cell3 @@ -102,7 +102,7 @@ function f3(x) { eq("File \"recursive_records_test.res\", line 68, characters 4-11", (List.hd(rec_cell3) + List.hd(List.tl(rec_cell3)) | 0) + List.hd(List.tl(List.tl(rec_cell3))) | 0, 9); -var rec_cell3$1 = f3(3); +let rec_cell3$1 = f3(3); eq("File \"recursive_records_test.res\", line 77, characters 4-11", (List.hd(rec_cell3$1) + List.hd(List.tl(rec_cell3$1)) | 0) + List.hd(List.tl(List.tl(rec_cell3$1))) | 0, 9); diff --git a/jscomp/test/recursive_unbound_module_test.js b/jscomp/test/recursive_unbound_module_test.js index 48df7db9c3..4cea961e3c 100644 --- a/jscomp/test/recursive_unbound_module_test.js +++ b/jscomp/test/recursive_unbound_module_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_module = require("../../lib/js/caml_module.js"); +let Caml_module = require("../../lib/js/caml_module.js"); function Make(X) { - var f = function (param) { + let f = function (param) { }; - var M = { + let M = { f: f }; return { @@ -15,7 +15,7 @@ function Make(X) { }; } -var B = Caml_module.init_mod([ +let B = Caml_module.init_mod([ "recursive_unbound_module_test.res", 14, 11 @@ -37,7 +37,7 @@ function f(param) { } -var M = { +let M = { f: f }; @@ -57,7 +57,7 @@ Caml_module.update_mod({ M: M }); -var A; +let A; exports.Make = Make; exports.A = A; diff --git a/jscomp/test/relative_path.js b/jscomp/test/relative_path.js index aee00122b1..abb04a0a8f 100644 --- a/jscomp/test/relative_path.js +++ b/jscomp/test/relative_path.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var FileJs = require("./File.js"); +let FileJs = require("./File.js"); -var foo = FileJs.foo; +let foo = FileJs.foo; function foo2(prim) { return FileJs.foo2(prim); } -var bar = foo; +let bar = foo; exports.foo = foo; exports.foo2 = foo2; diff --git a/jscomp/test/res_debug.js b/jscomp/test/res_debug.js index 3787871d02..19e1fd8326 100644 --- a/jscomp/test/res_debug.js +++ b/jscomp/test/res_debug.js @@ -1,25 +1,25 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Caml_option = require("../../lib/js/caml_option.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Caml_option = require("../../lib/js/caml_option.js"); function f($$window, a, b) { return $$window.location(a, b); } -var v0 = { +let v0 = { x: 3, z: 2 }; -var newrecord = Caml_obj.obj_dup(v0); +let newrecord = Caml_obj.obj_dup(v0); newrecord.x = 3; function testMatch(v) { - var y = v.y; + let y = v.y; if (y !== undefined) { return y; } else { @@ -34,19 +34,19 @@ function optionMap(x, f) { } -var ok_name = optionMap(undefined, (function (x) { +let ok_name = optionMap(undefined, (function (x) { return x; })); -var ok = { +let ok = { name: ok_name }; -var bad_name = optionMap(undefined, (function (x) { +let bad_name = optionMap(undefined, (function (x) { return x; })); -var bad = { +let bad = { name: bad_name }; @@ -54,28 +54,28 @@ function identity(x) { return x; } -var name1 = "ReScript"; +let name1 = "ReScript"; -var ok1 = { +let ok1 = { name: name1 }; -var bad1 = { +let bad1 = { name: name1 }; -var v2 = newrecord; +let v2 = newrecord; -var v1 = { +let v1 = { x: 3, z: 3 }; -var h = /* '😊' */128522; +let h = /* '😊' */128522; -var hey = "hello, 世界"; +let hey = "hello, 世界"; -var name; +let name; exports.f = f; exports.v0 = v0; diff --git a/jscomp/test/return_check.js b/jscomp/test/return_check.js index c687f35716..44cc027ead 100644 --- a/jscomp/test/return_check.js +++ b/jscomp/test/return_check.js @@ -1,10 +1,10 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_option = require("../../lib/js/caml_option.js"); +let Caml_option = require("../../lib/js/caml_option.js"); function test(dom) { - var elem = dom.getElementById("haha"); + let elem = dom.getElementById("haha"); if (elem !== null) { console.log(elem); return 2; @@ -14,7 +14,7 @@ function test(dom) { } function f_undefined(xs, i) { - var k = xs[i]; + let k = xs[i]; if (k !== undefined) { return k; } @@ -30,7 +30,7 @@ function f_undefined(xs, i) { } function f_escaped_not(xs, i) { - var x = xs[i]; + let x = xs[i]; console.log("hei"); if (x !== undefined) { return x; @@ -40,7 +40,7 @@ function f_escaped_not(xs, i) { } function f_escaped_1(xs, i) { - var x = xs[i]; + let x = xs[i]; return function (param) { if (x !== undefined) { return x; @@ -55,7 +55,7 @@ function f_escaped_2(xs, i) { } function f_null(xs, i) { - var k = xs[i]; + let k = xs[i]; if (k !== null) { return k; } @@ -71,7 +71,7 @@ function f_null(xs, i) { } function f_null_undefined(xs, i) { - var k = xs[i]; + let k = xs[i]; if (!(k == null)) { return k; } diff --git a/jscomp/test/runtime_encoding_test.js b/jscomp/test/runtime_encoding_test.js index e957e5f1e4..f466a374c3 100644 --- a/jscomp/test/runtime_encoding_test.js +++ b/jscomp/test/runtime_encoding_test.js @@ -2,7 +2,7 @@ 'use strict'; -var v = [ +let v = [ 0, 1 ]; diff --git a/jscomp/test/set_annotation.js b/jscomp/test/set_annotation.js index 7d936683e1..ac80862af3 100644 --- a/jscomp/test/set_annotation.js +++ b/jscomp/test/set_annotation.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var MyJSFile = require("MyJSFile"); +let MyJSFile = require("MyJSFile"); MyJSFile.student1.name = "Mary"; diff --git a/jscomp/test/set_gen.js b/jscomp/test/set_gen.js index 392cab2bd8..6e5c5904bd 100644 --- a/jscomp/test/set_gen.js +++ b/jscomp/test/set_gen.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var List = require("../../lib/js/list.js"); -var Curry = require("../../lib/js/curry.js"); -var Pervasives = require("../../lib/js/pervasives.js"); -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let List = require("../../lib/js/list.js"); +let Curry = require("../../lib/js/curry.js"); +let Pervasives = require("../../lib/js/pervasives.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); function cons_enum(_s, _e) { while(true) { - var e = _e; - var s = _s; + let e = _e; + let s = _s; if (typeof s !== "object") { return e; } @@ -34,14 +34,14 @@ function height(x) { function min_elt(_x) { while(true) { - var x = _x; + let x = _x; if (typeof x !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var l = x._0; + let l = x._0; if (typeof l !== "object") { return x._1; } @@ -52,14 +52,14 @@ function min_elt(_x) { function max_elt(_x) { while(true) { - var x = _x; + let x = _x; if (typeof x !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var r = x._2; + let r = x._2; if (typeof r !== "object") { return x._1; } @@ -78,8 +78,8 @@ function is_empty(x) { function cardinal_aux(_acc, _x) { while(true) { - var x = _x; - var acc = _acc; + let x = _x; + let acc = _acc; if (typeof x !== "object") { return acc; } @@ -95,8 +95,8 @@ function cardinal(s) { function elements_aux(_accu, _x) { while(true) { - var x = _x; - var accu = _accu; + let x = _x; + let accu = _accu; if (typeof x !== "object") { return accu; } @@ -115,7 +115,7 @@ function elements(s) { function iter(f, _x) { while(true) { - var x = _x; + let x = _x; if (typeof x !== "object") { return; } @@ -128,8 +128,8 @@ function iter(f, _x) { function fold(f, _s, _accu) { while(true) { - var accu = _accu; - var s = _s; + let accu = _accu; + let s = _s; if (typeof s !== "object") { return accu; } @@ -141,7 +141,7 @@ function fold(f, _s, _accu) { function for_all(p, _x) { while(true) { - var x = _x; + let x = _x; if (typeof x !== "object") { return true; } @@ -158,7 +158,7 @@ function for_all(p, _x) { function exists(p, _x) { while(true) { - var x = _x; + let x = _x; if (typeof x !== "object") { return false; } @@ -195,24 +195,24 @@ function max_int_2(a, b) { } } -var Height_invariant_broken = /* @__PURE__ */Caml_exceptions.create("Set_gen.Height_invariant_broken"); +let Height_invariant_broken = /* @__PURE__ */Caml_exceptions.create("Set_gen.Height_invariant_broken"); -var Height_diff_borken = /* @__PURE__ */Caml_exceptions.create("Set_gen.Height_diff_borken"); +let Height_diff_borken = /* @__PURE__ */Caml_exceptions.create("Set_gen.Height_diff_borken"); function check_height_and_diff(x) { if (typeof x !== "object") { return 0; } - var h = x._3; - var hl = check_height_and_diff(x._0); - var hr = check_height_and_diff(x._2); + let h = x._3; + let hl = check_height_and_diff(x._0); + let hr = check_height_and_diff(x._2); if (h !== (max_int_2(hl, hr) + 1 | 0)) { throw { RE_EXN_ID: Height_invariant_broken, Error: new Error() }; } - var diff = Pervasives.abs(hl - hr | 0); + let diff = Pervasives.abs(hl - hr | 0); if (diff > 2) { throw { RE_EXN_ID: Height_diff_borken, @@ -227,9 +227,9 @@ function check(tree) { } function create(l, v, r) { - var hl; + let hl; hl = typeof l !== "object" ? 0 : l._3; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r._3; return { TAG: "Node", @@ -241,9 +241,9 @@ function create(l, v, r) { } function internal_bal(l, v, r) { - var hl; + let hl; hl = typeof l !== "object" ? 0 : l._3; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r._3; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -257,9 +257,9 @@ function internal_bal(l, v, r) { Error: new Error() }; } - var lr = l._2; - var lv = l._1; - var ll = l._0; + let lr = l._2; + let lv = l._1; + let ll = l._0; if (height(ll) >= height(lr)) { return create(ll, lv, create(lr, v, r)); } @@ -296,9 +296,9 @@ function internal_bal(l, v, r) { Error: new Error() }; } - var rr = r._2; - var rv = r._1; - var rl = r._0; + let rr = r._2; + let rv = r._1; + let rl = r._0; if (height(rr) >= height(rl)) { return create(create(l, v, rl), rv, rr); } @@ -324,7 +324,7 @@ function remove_min_elt(x) { Error: new Error() }; } - var l = x._0; + let l = x._0; if (typeof l !== "object") { return x._2; } else { @@ -372,11 +372,11 @@ function internal_join(l, v, r) { if (typeof l !== "object") { return add_min_element(v, r); } - var lh = l._3; + let lh = l._3; if (typeof r !== "object") { return add_max_element(v, l); } - var rh = r._3; + let rh = r._3; if (lh > (rh + 2 | 0)) { return internal_bal(l._0, l._1, internal_join(l._2, v, r)); } else if (rh > (lh + 2 | 0)) { @@ -400,10 +400,10 @@ function filter(p, x) { if (typeof x !== "object") { return "Empty"; } - var v = x._1; - var l$p = filter(p, x._0); - var pv = Curry._1(p, v); - var r$p = filter(p, x._2); + let v = x._1; + let l$p = filter(p, x._0); + let pv = Curry._1(p, v); + let r$p = filter(p, x._2); if (pv) { return internal_join(l$p, v, r$p); } else { @@ -418,14 +418,14 @@ function partition(p, x) { "Empty" ]; } - var v = x._1; - var match = partition(p, x._0); - var lf = match[1]; - var lt = match[0]; - var pv = Curry._1(p, v); - var match$1 = partition(p, x._2); - var rf = match$1[1]; - var rt = match$1[0]; + let v = x._1; + let match = partition(p, x._0); + let lf = match[1]; + let lt = match[0]; + let pv = Curry._1(p, v); + let match$1 = partition(p, x._2); + let rf = match$1[1]; + let rt = match$1[0]; if (pv) { return [ internal_join(lt, v, rt), @@ -440,7 +440,7 @@ function partition(p, x) { } function of_sorted_list(l) { - var sub = function (n, l) { + let sub = function (n, l) { switch (n) { case 0 : return [ @@ -463,7 +463,7 @@ function of_sorted_list(l) { break; case 2 : if (l) { - var match = l.tl; + let match = l.tl; if (match) { return [ { @@ -487,9 +487,9 @@ function of_sorted_list(l) { break; case 3 : if (l) { - var match$1 = l.tl; + let match$1 = l.tl; if (match$1) { - var match$2 = match$1.tl; + let match$2 = match$1.tl; if (match$2) { return [ { @@ -522,11 +522,11 @@ function of_sorted_list(l) { default: } - var nl = n / 2 | 0; - var match$3 = sub(nl, l); - var l$1 = match$3[1]; + let nl = n / 2 | 0; + let match$3 = sub(nl, l); + let l$1 = match$3[1]; if (l$1) { - var match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl); + let match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl); return [ create(match$3[0], l$1.hd, match$4[0]), match$4[1] @@ -546,12 +546,12 @@ function of_sorted_list(l) { } function of_sorted_array(l) { - var sub = function (start, n, l) { + let sub = function (start, n, l) { if (n === 0) { return "Empty"; } if (n === 1) { - var x0 = l[start]; + let x0 = l[start]; return { TAG: "Node", _0: "Empty", @@ -561,8 +561,8 @@ function of_sorted_array(l) { }; } if (n === 2) { - var x0$1 = l[start]; - var x1 = l[start + 1 | 0]; + let x0$1 = l[start]; + let x1 = l[start + 1 | 0]; return { TAG: "Node", _0: { @@ -578,9 +578,9 @@ function of_sorted_array(l) { }; } if (n === 3) { - var x0$2 = l[start]; - var x1$1 = l[start + 1 | 0]; - var x2 = l[start + 2 | 0]; + let x0$2 = l[start]; + let x1$1 = l[start + 1 | 0]; + let x2 = l[start + 2 | 0]; return { TAG: "Node", _0: { @@ -601,29 +601,29 @@ function of_sorted_array(l) { _3: 2 }; } - var nl = n / 2 | 0; - var left = sub(start, nl, l); - var mid = start + nl | 0; - var v = l[mid]; - var right = sub(mid + 1 | 0, (n - nl | 0) - 1 | 0, l); + let nl = n / 2 | 0; + let left = sub(start, nl, l); + let mid = start + nl | 0; + let v = l[mid]; + let right = sub(mid + 1 | 0, (n - nl | 0) - 1 | 0, l); return create(left, v, right); }; return sub(0, l.length, l); } function is_ordered(cmp, tree) { - var is_ordered_min_max = function (tree) { + let is_ordered_min_max = function (tree) { if (typeof tree !== "object") { return "Empty"; } - var r = tree._2; - var v = tree._1; - var match = is_ordered_min_max(tree._0); + let r = tree._2; + let v = tree._1; + let match = is_ordered_min_max(tree._0); if (typeof match === "object") { - var match$1 = match.VAL; - var max_v = match$1[1]; - var min_v = match$1[0]; - var match$2 = is_ordered_min_max(r); + let match$1 = match.VAL; + let max_v = match$1[1]; + let min_v = match$1[0]; + let match$2 = is_ordered_min_max(r); if (typeof match$2 !== "object") { if (match$2 === "Empty" && Curry._2(cmp, max_v, v) < 0) { return { @@ -637,7 +637,7 @@ function is_ordered(cmp, tree) { return "No"; } } - var match$3 = match$2.VAL; + let match$3 = match$2.VAL; if (Curry._2(cmp, max_v, match$3[0]) < 0) { return { NAME: "V", @@ -653,7 +653,7 @@ function is_ordered(cmp, tree) { if (match !== "Empty") { return "No"; } - var match$4 = is_ordered_min_max(r); + let match$4 = is_ordered_min_max(r); if (typeof match$4 !== "object") { if (match$4 === "Empty") { return { @@ -667,7 +667,7 @@ function is_ordered(cmp, tree) { return "No"; } } - var match$5 = match$4.VAL; + let match$5 = match$4.VAL; if (Curry._2(cmp, v, match$5[0]) < 0) { return { NAME: "V", @@ -690,8 +690,8 @@ function invariant(cmp, t) { function compare_aux(cmp, _e1, _e2) { while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return 0; @@ -702,7 +702,7 @@ function compare_aux(cmp, _e1, _e2) { if (typeof e2 !== "object") { return 1; } - var c = Curry._2(cmp, e1._0, e2._0); + let c = Curry._2(cmp, e1._0, e2._0); if (c !== 0) { return c; } @@ -716,9 +716,9 @@ function compare(cmp, s1, s2) { return compare_aux(cmp, cons_enum(s1, "End"), cons_enum(s2, "End")); } -var empty = "Empty"; +let empty = "Empty"; -var choose = min_elt; +let choose = min_elt; exports.cons_enum = cons_enum; exports.height = height; diff --git a/jscomp/test/sexp.js b/jscomp/test/sexp.js index 309983f2a1..eadc66b2ac 100644 --- a/jscomp/test/sexp.js +++ b/jscomp/test/sexp.js @@ -1,19 +1,19 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var List = require("../../lib/js/list.js"); -var Curry = require("../../lib/js/curry.js"); -var Hashtbl = require("../../lib/js/hashtbl.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Pervasives = require("../../lib/js/pervasives.js"); -var Caml_format = require("../../lib/js/caml_format.js"); -var Caml_option = require("../../lib/js/caml_option.js"); +let List = require("../../lib/js/list.js"); +let Curry = require("../../lib/js/curry.js"); +let Hashtbl = require("../../lib/js/hashtbl.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Pervasives = require("../../lib/js/pervasives.js"); +let Caml_format = require("../../lib/js/caml_format.js"); +let Caml_option = require("../../lib/js/caml_option.js"); -var equal = Caml_obj.equal; +let equal = Caml_obj.equal; -var compare = Caml_obj.compare; +let compare = Caml_obj.compare; -var hash = Hashtbl.hash; +let hash = Hashtbl.hash; function of_int(x) { return { @@ -162,15 +162,15 @@ function $great$great$eq(e, f) { } function map_opt(f, l) { - var _acc = /* [] */0; - var _l = l; + let _acc = /* [] */0; + let _l = l; while(true) { - var l$1 = _l; - var acc = _acc; + let l$1 = _l; + let acc = _acc; if (!l$1) { return List.rev(acc); } - var y = Curry._1(f, l$1.hd); + let y = Curry._1(f, l$1.hd); if (y === undefined) { return; } @@ -185,13 +185,13 @@ function map_opt(f, l) { function list_any(f, e) { if (e.NAME === "List") { - var _l = e.VAL; + let _l = e.VAL; while(true) { - var l = _l; + let l = _l; if (!l) { return; } - var res = Curry._1(f, l.hd); + let res = Curry._1(f, l.hd); if (res !== undefined) { return res; } @@ -204,16 +204,16 @@ function list_any(f, e) { function list_all(f, e) { if (e.NAME === "List") { - var _acc = /* [] */0; - var _l = e.VAL; + let _acc = /* [] */0; + let _l = e.VAL; while(true) { - var l = _l; - var acc = _acc; + let l = _l; + let acc = _acc; if (!l) { return List.rev(acc); } - var tl = l.tl; - var y = Curry._1(f, l.hd); + let tl = l.tl; + let y = Curry._1(f, l.hd); if (y !== undefined) { _l = tl; _acc = { @@ -267,11 +267,11 @@ function to_pair(e) { if (e.NAME !== "List") { return; } - var match = e.VAL; + let match = e.VAL; if (!match) { return; } - var match$1 = match.tl; + let match$1 = match.tl; if (match$1 && !match$1.tl) { return [ match.hd, @@ -283,7 +283,7 @@ function to_pair(e) { function to_pair_with(f1, f2, e) { return $great$great$eq(to_pair(e), (function (param) { - var y = param[1]; + let y = param[1]; return $great$great$eq(Curry._1(f1, param[0]), (function (x) { return $great$great$eq(Curry._1(f2, y), (function (y) { return [ @@ -302,15 +302,15 @@ function to_triple(e) { if (e.NAME !== "List") { return; } - var match = e.VAL; + let match = e.VAL; if (!match) { return; } - var match$1 = match.tl; + let match$1 = match.tl; if (!match$1) { return; } - var match$2 = match$1.tl; + let match$2 = match$1.tl; if (match$2 && !match$2.tl) { return [ match.hd, @@ -323,8 +323,8 @@ function to_triple(e) { function to_triple_with(f1, f2, f3, e) { return $great$great$eq(to_triple(e), (function (param) { - var z = param[2]; - var y = param[1]; + let z = param[2]; + let y = param[1]; return $great$great$eq(Curry._1(f1, param[0]), (function (x) { return $great$great$eq(Curry._1(f2, y), (function (y) { return $great$great$eq(Curry._1(f3, z), (function (z) { @@ -355,21 +355,21 @@ function to_list_with(f, e) { function get_field(name, e) { if (e.NAME === "List") { - var _l = e.VAL; + let _l = e.VAL; while(true) { - var l = _l; + let l = _l; if (!l) { return; } - var match = l.hd; + let match = l.hd; if (typeof match === "object") { if (match.NAME === "List") { - var match$1 = match.VAL; + let match$1 = match.VAL; if (match$1) { - var match$2 = match$1.hd; + let match$2 = match$1.hd; if (typeof match$2 === "object") { if (match$2.NAME === "Atom") { - var match$3 = match$1.tl; + let match$3 = match$1.tl; if (match$3) { if (match$3.tl) { _l = l.tl; @@ -409,16 +409,16 @@ function field(name, f, e) { function _get_field_list(name, _l) { while(true) { - var l = _l; + let l = _l; if (!l) { return; } - var match = l.hd; + let match = l.hd; if (typeof match === "object") { if (match.NAME === "List") { - var match$1 = match.VAL; + let match$1 = match.VAL; if (match$1) { - var match$2 = match$1.hd; + let match$2 = match$1.hd; if (typeof match$2 === "object") { if (match$2.NAME === "Atom") { if (Caml_obj.equal(name, match$2.VAL)) { @@ -453,11 +453,11 @@ function field_list(name, f, e) { function _get_variant(s, args, _l) { while(true) { - var l = _l; + let l = _l; if (!l) { return; } - var match = l.hd; + let match = l.hd; if (Caml_obj.equal(s, match[0])) { return Curry._1(match[1], args); } @@ -470,11 +470,11 @@ function get_variant(l, e) { if (e.NAME !== "List") { return _get_variant(e.VAL, /* [] */0, l); } - var match = e.VAL; + let match = e.VAL; if (!match) { return; } - var match$1 = match.hd; + let match$1 = match.hd; if (typeof match$1 === "object" && match$1.NAME === "Atom") { return _get_variant(match$1.VAL, match.tl, l); } @@ -492,12 +492,12 @@ function get_exn(e) { }; } -var of_unit = { +let of_unit = { NAME: "List", VAL: /* [] */0 }; -var Traverse = { +let Traverse = { map_opt: map_opt, list_any: list_any, list_all: list_all, diff --git a/jscomp/test/sexpm.js b/jscomp/test/sexpm.js index 56c8fdc150..44ee8313cc 100644 --- a/jscomp/test/sexpm.js +++ b/jscomp/test/sexpm.js @@ -1,23 +1,23 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Sys = require("../../lib/js/sys.js"); -var Caml = require("../../lib/js/caml.js"); -var Char = require("../../lib/js/char.js"); -var List = require("../../lib/js/list.js"); -var Bytes = require("../../lib/js/bytes.js"); -var Curry = require("../../lib/js/curry.js"); -var $$Buffer = require("../../lib/js/buffer.js"); -var $$String = require("../../lib/js/string.js"); -var Caml_bytes = require("../../lib/js/caml_bytes.js"); -var Pervasives = require("../../lib/js/pervasives.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let Sys = require("../../lib/js/sys.js"); +let Caml = require("../../lib/js/caml.js"); +let Char = require("../../lib/js/char.js"); +let List = require("../../lib/js/list.js"); +let Bytes = require("../../lib/js/bytes.js"); +let Curry = require("../../lib/js/curry.js"); +let $$Buffer = require("../../lib/js/buffer.js"); +let $$String = require("../../lib/js/string.js"); +let Caml_bytes = require("../../lib/js/caml_bytes.js"); +let Pervasives = require("../../lib/js/pervasives.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); function _must_escape(s) { try { - for(var i = 0 ,i_finish = s.length; i < i_finish; ++i){ - var c = s.codePointAt(i); - var exit = 0; + for(let i = 0 ,i_finish = s.length; i < i_finish; ++i){ + let c = s.codePointAt(i); + let exit = 0; if (c >= 42) { if (c !== 59) { if (c !== 92) { @@ -78,7 +78,7 @@ function _must_escape(s) { return false; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === Pervasives.Exit) { return true; } @@ -88,7 +88,7 @@ function _must_escape(s) { function to_buf(b, t) { if (t.NAME === "List") { - var l = t.VAL; + let l = t.VAL; if (l) { if (l.tl) { $$Buffer.add_char(b, /* '(' */40); @@ -108,7 +108,7 @@ function to_buf(b, t) { return $$Buffer.add_string(b, "()"); } } - var s = t.VAL; + let s = t.VAL; if (_must_escape(s)) { return $$Buffer.add_string(b, "\"" + ($$String.escaped(s) + "\"")); } else { @@ -117,14 +117,14 @@ function to_buf(b, t) { } function to_string(t) { - var b = $$Buffer.create(128); + let b = $$Buffer.create(128); to_buf(b, t); return $$Buffer.contents(b); } function make(bufsizeOpt, refill) { - var bufsize = bufsizeOpt !== undefined ? bufsizeOpt : 1024; - var bufsize$1 = Caml.int_min(bufsize > 16 ? bufsize : 16, Sys.max_string_length); + let bufsize = bufsizeOpt !== undefined ? bufsizeOpt : 1024; + let bufsize$1 = Caml.int_min(bufsize > 16 ? bufsize : 16, Sys.max_string_length); return { buf: Caml_bytes.create(bufsize$1), refill: refill, @@ -145,7 +145,7 @@ function _is_digit(c) { } function _refill(t, k_succ, k_fail) { - var n = Curry._3(t.refill, t.buf, 0, t.buf.length); + let n = Curry._3(t.refill, t.buf, 0, t.buf.length); t.i = 0; t.len = n; if (n === 0) { @@ -167,7 +167,7 @@ function _get(t) { Error: new Error() }; } - var c = Caml_bytes.get(t.buf, t.i); + let c = Caml_bytes.get(t.buf, t.i); t.i = t.i + 1 | 0; if (c === /* '\n' */10) { t.col = 1; @@ -179,13 +179,13 @@ function _get(t) { } function _error(param) { - var line = param.line; - var col = param.col; + let line = param.line; + let col = param.col; return function (msg) { - var b = $$Buffer.create(32); + let b = $$Buffer.create(32); $$Buffer.add_string(b, "at " + (line + (", " + (col + ": ")))); $$Buffer.add_string(b, msg); - var msg$p = $$Buffer.contents(b); + let msg$p = $$Buffer.contents(b); return { NAME: "Error", VAL: msg$p @@ -204,7 +204,7 @@ function expr(k, t) { return expr(k, param); }), _error_eof); } - var c = _get(t); + let c = _get(t); if (c >= 11) { if (c !== 32) { return expr_starting_with(c, k, t); @@ -281,7 +281,7 @@ function expr_list(acc, k, t) { return expr_list(acc, k, param); }), _error_eof); } - var c = _get(t); + let c = _get(t); if (c > 32 || c < 9) { if (c === 41) { return Curry._2(k, undefined, { @@ -329,7 +329,7 @@ function expr_list(acc, k, t) { } function _return_atom(last, k, t) { - var s = $$Buffer.contents(t.atom); + let s = $$Buffer.contents(t.atom); t.atom.position = 0; return Curry._2(k, last, { NAME: "Atom", @@ -346,8 +346,8 @@ function atom(k, t) { return _return_atom(undefined, k, param); })); } - var c = _get(t); - var exit = 0; + let c = _get(t); + let exit = 0; if (c >= 35) { if (c >= 42) { if (c === 92) { @@ -394,7 +394,7 @@ function quoted(k, t) { return quoted(k, param); }), _error_eof); } - var c = _get(t); + let c = _get(t); if (c === 34) { return _return_atom(undefined, k, t); } @@ -415,7 +415,7 @@ function escaped(k, t) { return escaped(k, param); }), _error_eof); } - var c = _get(t); + let c = _get(t); if (c >= 92) { if (c < 117) { switch (c) { @@ -472,7 +472,7 @@ function read2int(i, k, t) { return read2int(i, k, param); }), _error_eof); } - var c = _get(t); + let c = _get(t); if (_is_digit(c)) { return read1int(Math.imul(10, i) + (c - /* '0' */48 | 0) | 0, k, t); } else { @@ -486,7 +486,7 @@ function read1int(i, k, t) { return read1int(i, k, param); }), _error_eof); } - var c = _get(t); + let c = _get(t); if (_is_digit(c)) { return Curry._1(k, Math.imul(10, i) + (c - /* '0' */48 | 0) | 0); } else { @@ -501,7 +501,7 @@ function skip_comment(k, t) { return skip_comment(k, param); }), _error_eof); } - var match = _get(t); + let match = _get(t); if (match === 10) { return Curry._2(k, undefined, undefined); } @@ -518,7 +518,7 @@ function expr_or_end(k, t) { return "End"; })); } - var c = _get(t); + let c = _get(t); if (c >= 11) { if (c !== 32) { return expr_starting_with(c, k, t); @@ -542,11 +542,11 @@ function next(t) { } function parse_string(s) { - var n = s.length; - var stop = { + let n = s.length; + let stop = { contents: false }; - var refill = function (bytes, i, _len) { + let refill = function (bytes, i, _len) { if (stop.contents) { return 0; } else { @@ -555,8 +555,8 @@ function parse_string(s) { return n; } }; - var d = make(n, refill); - var res = next(d); + let d = make(n, refill); + let res = next(d); if (typeof res === "object") { return res; } else { diff --git a/jscomp/test/sexpm_test.js b/jscomp/test/sexpm_test.js index 18b7b4b3a3..c780da38fc 100644 --- a/jscomp/test/sexpm_test.js +++ b/jscomp/test/sexpm_test.js @@ -1,20 +1,20 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Sexpm = require("./sexpm.js"); +let Mt = require("./mt.js"); +let Sexpm = require("./sexpm.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; function eq(loc, param) { - var y = param[1]; - var x = param[0]; + let y = param[1]; + let x = param[0]; test_id.contents = test_id.contents + 1 | 0; suites.contents = { hd: [ @@ -39,7 +39,7 @@ function print_or_error(x) { } } -var a = Sexpm.parse_string("(x x gh 3 3)"); +let a = Sexpm.parse_string("(x x gh 3 3)"); eq("File \"sexpm_test.res\", line 17, characters 5-12", [ { diff --git a/jscomp/test/side_effect2.js b/jscomp/test/side_effect2.js index 8f205815ab..cfedadb3f9 100644 --- a/jscomp/test/side_effect2.js +++ b/jscomp/test/side_effect2.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Belt_Array = require("../../lib/js/belt_Array.js"); +let Belt_Array = require("../../lib/js/belt_Array.js"); -var a = Belt_Array.map([1], (function (x) { +let a = Belt_Array.map([1], (function (x) { return x; })); diff --git a/jscomp/test/side_effect_free.js b/jscomp/test/side_effect_free.js index bd93031700..7a46d38e23 100644 --- a/jscomp/test/side_effect_free.js +++ b/jscomp/test/side_effect_free.js @@ -2,7 +2,7 @@ 'use strict'; -var a = 3; +let a = 3; exports.a = a; /* No side effect */ diff --git a/jscomp/test/single_module_alias.js b/jscomp/test/single_module_alias.js index efadc24570..4b4c50b69f 100644 --- a/jscomp/test/single_module_alias.js +++ b/jscomp/test/single_module_alias.js @@ -2,7 +2,7 @@ 'use strict'; -var L; +let L; exports.L = L; /* No side effect */ diff --git a/jscomp/test/singular_unit_test.js b/jscomp/test/singular_unit_test.js index 639c2d4900..90276b9545 100644 --- a/jscomp/test/singular_unit_test.js +++ b/jscomp/test/singular_unit_test.js @@ -18,7 +18,7 @@ function f3(x) { } } -var v0; +let v0; exports.f0 = f0; exports.f1 = f1; diff --git a/jscomp/test/small_inline_test.js b/jscomp/test/small_inline_test.js index 830841e616..26513a2848 100644 --- a/jscomp/test/small_inline_test.js +++ b/jscomp/test/small_inline_test.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); function $pipe$great(x, f) { return Curry._1(f, x); @@ -29,7 +29,7 @@ function hello5(y, f) { function f(_x) { while(true) { - var x = _x; + let x = _x; _x = x + 1 | 0; continue ; }; @@ -37,8 +37,8 @@ function f(_x) { function ff(_x, _y) { while(true) { - var y = _y; - var x = _x; + let y = _y; + let x = _x; _y = x + 1 | 0; _x = y; continue ; @@ -47,8 +47,8 @@ function ff(_x, _y) { function fff(_x, _y) { while(true) { - var y = _y; - var x = _x; + let y = _y; + let x = _x; _y = x; _x = y; continue ; diff --git a/jscomp/test/splice_test.js b/jscomp/test/splice_test.js index 4d9551e0c4..44d8589fa6 100644 --- a/jscomp/test/splice_test.js +++ b/jscomp/test/splice_test.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_array = require("../../lib/js/caml_array.js"); -var Caml_splice_call = require("../../lib/js/caml_splice_call.js"); +let Mt = require("./mt.js"); +let Caml_array = require("../../lib/js/caml_array.js"); +let Caml_splice_call = require("../../lib/js/caml_splice_call.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -17,7 +17,7 @@ function eq(loc, x, y) { Mt.eq_suites(test_id, suites, loc, x, y); } -var Caml_splice_call$1 = {}; +let Caml_splice_call$1 = {}; Math.max(1); @@ -25,7 +25,7 @@ function f00(a, b) { return a.send(b); } -var a = []; +let a = []; a.push(1, 2, 3, 4); @@ -37,7 +37,7 @@ eq("File \"splice_test.res\", line 23, characters 5-12", a, [ ]); function dynamic(arr) { - var a = []; + let a = []; Caml_splice_call.spliceObjApply(a, "push", [ 1, arr @@ -65,7 +65,7 @@ dynamic([ 3 ]); -var a$1 = new Array(1, 2, 3, 4); +let a$1 = new Array(1, 2, 3, 4); eq("File \"splice_test.res\", line 44, characters 5-12", a$1, [ 1, @@ -75,7 +75,7 @@ eq("File \"splice_test.res\", line 44, characters 5-12", a$1, [ ]); function dynamicNew(arr) { - var a = Caml_splice_call.spliceNewApply(Array, [ + let a = Caml_splice_call.spliceNewApply(Array, [ 1, 2, arr @@ -111,7 +111,7 @@ class Foo { } ; -var f = new Foo("a", "b", "c"); +let f = new Foo("a", "b", "c"); eq("File \"splice_test.res\", line 71, characters 5-12", f.names, [ "a", @@ -120,7 +120,7 @@ eq("File \"splice_test.res\", line 71, characters 5-12", f.names, [ ]); function dynamicFoo(arr) { - var f = Caml_splice_call.spliceNewApply(Foo, [arr]); + let f = Caml_splice_call.spliceNewApply(Foo, [arr]); eq("File \"splice_test.res\", line 76, characters 5-12", f.names, arr); } @@ -134,7 +134,7 @@ dynamicFoo([ "c" ]); -var a$2 = []; +let a$2 = []; a$2.push(1, 2, 3, 4); @@ -146,7 +146,7 @@ eq("File \"splice_test.res\", line 93, characters 7-14", a$2, [ ]); function dynamic$1(arr) { - var a = []; + let a = []; Caml_splice_call.spliceObjApply(a, "push", [ 1, arr @@ -174,7 +174,7 @@ dynamic$1([ 3 ]); -var Pipe = { +let Pipe = { dynamic: dynamic$1 }; diff --git a/jscomp/test/stack_comp_test.js b/jscomp/test/stack_comp_test.js index 39bc2a58eb..a8356ac0ee 100644 --- a/jscomp/test/stack_comp_test.js +++ b/jscomp/test/stack_comp_test.js @@ -1,19 +1,19 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var List = require("../../lib/js/list.js"); -var Curry = require("../../lib/js/curry.js"); -var Stack = require("../../lib/js/stack.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Mt_global = require("./mt_global.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); - -var suites = { +let Mt = require("./mt.js"); +let List = require("../../lib/js/list.js"); +let Curry = require("../../lib/js/curry.js"); +let Stack = require("../../lib/js/stack.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Mt_global = require("./mt_global.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); + +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -29,7 +29,7 @@ function assert_(loc, v) { } function to_list(s) { - var l = { + let l = { contents: /* [] */0 }; List.iter((function (x) { @@ -41,7 +41,7 @@ function to_list(s) { return l.contents; } -var S = { +let S = { Empty: Stack.Empty, create: Stack.create, push: Stack.push, @@ -62,7 +62,7 @@ function does_raise(f, s) { return false; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === Stack.Empty) { return true; } @@ -70,7 +70,7 @@ function does_raise(f, s) { } } -var s = { +let s = { c: /* [] */0, len: 0 }; @@ -159,7 +159,7 @@ assert_("File \"stack_comp_test.res\", line 55, characters 10-17", to_list(s) == assert_("File \"stack_comp_test.res\", line 56, characters 10-17", does_raise(Stack.pop, s)); -var s$1 = { +let s$1 = { c: /* [] */0, len: 0 }; @@ -178,7 +178,7 @@ assert_("File \"stack_comp_test.res\", line 66, characters 10-17", does_raise(St assert_("File \"stack_comp_test.res\", line 67, characters 10-17", s$1.len === 0); -var s$2 = { +let s$2 = { c: /* [] */0, len: 0 }; @@ -211,12 +211,12 @@ assert_("File \"stack_comp_test.res\", line 84, characters 10-17", does_raise(St assert_("File \"stack_comp_test.res\", line 85, characters 10-17", does_raise(Stack.top, s$2)); -var s$3 = { +let s$3 = { c: /* [] */0, len: 0 }; -for(var i = 1; i <= 10; ++i){ +for(let i = 1; i <= 10; ++i){ Stack.push(i, s$3); } @@ -235,16 +235,16 @@ Stack.push(42, s$3); assert_("File \"stack_comp_test.res\", line 98, characters 10-17", Stack.pop(s$3) === 42); -var s1 = { +let s1 = { c: /* [] */0, len: 0 }; -for(var i$1 = 1; i$1 <= 10; ++i$1){ +for(let i$1 = 1; i$1 <= 10; ++i$1){ Stack.push(i$1, s1); } -var s2 = Stack.copy(s1); +let s2 = Stack.copy(s1); assert_("File \"stack_comp_test.res\", line 107, characters 10-17", Caml_obj.equal(to_list(s1), { hd: 1, @@ -314,28 +314,28 @@ assert_("File \"stack_comp_test.res\", line 109, characters 10-17", s1.len === 1 assert_("File \"stack_comp_test.res\", line 110, characters 10-17", s2.len === 10); -for(var i$2 = 10; i$2 >= 1; --i$2){ +for(let i$2 = 10; i$2 >= 1; --i$2){ assert_("File \"stack_comp_test.res\", line 112, characters 12-19", Stack.pop(s1) === i$2); } -for(var i$3 = 10; i$3 >= 1; --i$3){ +for(let i$3 = 10; i$3 >= 1; --i$3){ assert_("File \"stack_comp_test.res\", line 115, characters 12-19", Stack.pop(s2) === i$3); } -var s$4 = { +let s$4 = { c: /* [] */0, len: 0 }; assert_("File \"stack_comp_test.res\", line 121, characters 10-17", s$4.c === /* [] */0); -for(var i$4 = 1; i$4 <= 10; ++i$4){ +for(let i$4 = 1; i$4 <= 10; ++i$4){ Stack.push(i$4, s$4); assert_("File \"stack_comp_test.res\", line 124, characters 12-19", s$4.len === i$4); assert_("File \"stack_comp_test.res\", line 125, characters 12-19", s$4.c !== /* [] */0); } -for(var i$5 = 10; i$5 >= 1; --i$5){ +for(let i$5 = 10; i$5 >= 1; --i$5){ assert_("File \"stack_comp_test.res\", line 128, characters 12-19", s$4.len === i$5); assert_("File \"stack_comp_test.res\", line 129, characters 12-19", s$4.c !== /* [] */0); Stack.pop(s$4); @@ -345,16 +345,16 @@ assert_("File \"stack_comp_test.res\", line 132, characters 10-17", s$4.len === assert_("File \"stack_comp_test.res\", line 133, characters 10-17", s$4.c === /* [] */0); -var s$5 = { +let s$5 = { c: /* [] */0, len: 0 }; -for(var i$6 = 10; i$6 >= 1; --i$6){ +for(let i$6 = 10; i$6 >= 1; --i$6){ Stack.push(i$6, s$5); } -var i$7 = { +let i$7 = { contents: 1 }; @@ -363,7 +363,7 @@ List.iter((function (j) { i$7.contents = i$7.contents + 1 | 0; }), s$5.c); -var s1$1 = { +let s1$1 = { c: /* [] */0, len: 0 }; @@ -372,7 +372,7 @@ assert_("File \"stack_comp_test.res\", line 150, characters 10-17", s1$1.len === assert_("File \"stack_comp_test.res\", line 151, characters 10-17", to_list(s1$1) === /* [] */0); -var s2$1 = Stack.copy(s1$1); +let s2$1 = Stack.copy(s1$1); assert_("File \"stack_comp_test.res\", line 153, characters 10-17", s1$1.len === 0); @@ -382,12 +382,12 @@ assert_("File \"stack_comp_test.res\", line 155, characters 10-17", s2$1.len === assert_("File \"stack_comp_test.res\", line 156, characters 10-17", to_list(s2$1) === /* [] */0); -var s1$2 = { +let s1$2 = { c: /* [] */0, len: 0 }; -for(var i$8 = 1; i$8 <= 4; ++i$8){ +for(let i$8 = 1; i$8 <= 4; ++i$8){ Stack.push(i$8, s1$2); } @@ -407,7 +407,7 @@ assert_("File \"stack_comp_test.res\", line 166, characters 10-17", Caml_obj.equ } })); -var s2$2 = Stack.copy(s1$2); +let s2$2 = Stack.copy(s1$2); assert_("File \"stack_comp_test.res\", line 168, characters 10-17", s1$2.len === 4); diff --git a/jscomp/test/stack_test.js b/jscomp/test/stack_test.js index 57d9d46d62..c4e4f0d2f3 100644 --- a/jscomp/test/stack_test.js +++ b/jscomp/test/stack_test.js @@ -1,12 +1,12 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var List = require("../../lib/js/list.js"); -var Stack = require("../../lib/js/stack.js"); +let Mt = require("./mt.js"); +let List = require("../../lib/js/list.js"); +let Stack = require("../../lib/js/stack.js"); function to_list(v) { - var acc = /* [] */0; + let acc = /* [] */0; while(v.c !== /* [] */0) { acc = { hd: Stack.pop(v), @@ -17,7 +17,7 @@ function to_list(v) { } function v(param) { - var v$1 = { + let v$1 = { c: /* [] */0, len: 0 }; @@ -27,7 +27,7 @@ function v(param) { return to_list(v$1); } -var suites_0 = [ +let suites_0 = [ "push_test", (function (param) { return { @@ -47,7 +47,7 @@ var suites_0 = [ }) ]; -var suites = { +let suites = { hd: suites_0, tl: /* [] */0 }; diff --git a/jscomp/test/stream_parser_test.js b/jscomp/test/stream_parser_test.js index eba8437b6b..e32c999a95 100644 --- a/jscomp/test/stream_parser_test.js +++ b/jscomp/test/stream_parser_test.js @@ -1,23 +1,23 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Curry = require("../../lib/js/curry.js"); -var Queue = require("../../lib/js/queue.js"); -var Genlex = require("../../lib/js/genlex.js"); -var Stream = require("../../lib/js/stream.js"); -var Caml_int32 = require("../../lib/js/caml_int32.js"); -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Mt = require("./mt.js"); +let Curry = require("../../lib/js/curry.js"); +let Queue = require("../../lib/js/queue.js"); +let Genlex = require("../../lib/js/genlex.js"); +let Stream = require("../../lib/js/stream.js"); +let Caml_int32 = require("../../lib/js/caml_int32.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var Parse_error = /* @__PURE__ */Caml_exceptions.create("Stream_parser_test.Parse_error"); +let Parse_error = /* @__PURE__ */Caml_exceptions.create("Stream_parser_test.Parse_error"); function parse(token) { - var look_ahead = { + let look_ahead = { length: 0, first: "Nil", last: "Nil" }; - var token$1 = function (param) { + let token$1 = function (param) { if (look_ahead.length !== 0) { return Queue.pop(look_ahead); } @@ -31,13 +31,13 @@ function parse(token) { }; } }; - var parse_atom = function (param) { - var n = token$1(); + let parse_atom = function (param) { + let n = token$1(); switch (n.TAG) { case "Kwd" : if (n._0 === "(") { - var v = parse_expr_aux(parse_term_aux(parse_atom())); - var match = token$1(); + let v = parse_expr_aux(parse_term_aux(parse_atom())); + let match = token$1(); if (match.TAG === "Kwd") { if (match._0 === ")") { return v; @@ -71,8 +71,8 @@ function parse(token) { }; } }; - var parse_term_aux = function (e1) { - var e = token$1(); + let parse_term_aux = function (e1) { + let e = token$1(); if (e.TAG === "Kwd") { switch (e._0) { case "*" : @@ -88,8 +88,8 @@ function parse(token) { return e1; } }; - var parse_expr_aux = function (e1) { - var e = token$1(); + let parse_expr_aux = function (e1) { + let e = token$1(); if (e.TAG === "Kwd") { switch (e._0) { case "+" : @@ -105,7 +105,7 @@ function parse(token) { return e1; } }; - var r = parse_expr_aux(parse_term_aux(parse_atom())); + let r = parse_expr_aux(parse_term_aux(parse_atom())); return [ r, Queue.fold((function (acc, x) { @@ -117,7 +117,7 @@ function parse(token) { ]; } -var lexer = Genlex.make_lexer({ +let lexer = Genlex.make_lexer({ hd: "(", tl: { hd: "*", @@ -138,19 +138,19 @@ var lexer = Genlex.make_lexer({ }); function token(chars) { - var strm = lexer(chars); + let strm = lexer(chars); return function (param) { return Stream.next(strm); }; } function l_parse(token) { - var look_ahead = { + let look_ahead = { length: 0, first: "Nil", last: "Nil" }; - var token$1 = function (param) { + let token$1 = function (param) { if (look_ahead.length !== 0) { return Queue.pop(look_ahead); } @@ -164,10 +164,10 @@ function l_parse(token) { }; } }; - var parse_f_aux = function (_a) { + let parse_f_aux = function (_a) { while(true) { - var a = _a; - var t = token$1(); + let a = _a; + let t = token$1(); if (t.TAG === "Kwd") { switch (t._0) { case "*" : @@ -186,13 +186,13 @@ function l_parse(token) { } }; }; - var parse_f = function (param) { - var i = token$1(); + let parse_f = function (param) { + let i = token$1(); switch (i.TAG) { case "Kwd" : if (i._0 === "(") { - var v = parse_t_aux(parse_f_aux(parse_f())); - var t = token$1(); + let v = parse_t_aux(parse_f_aux(parse_f())); + let t = token$1(); if (t.TAG === "Kwd") { if (t._0 === ")") { return v; @@ -224,10 +224,10 @@ function l_parse(token) { }; } }; - var parse_t_aux = function (_a) { + let parse_t_aux = function (_a) { while(true) { - var a = _a; - var t = token$1(); + let a = _a; + let t = token$1(); if (t.TAG === "Kwd") { switch (t._0) { case "+" : @@ -246,7 +246,7 @@ function l_parse(token) { } }; }; - var r = parse_t_aux(parse_f_aux(parse_f())); + let r = parse_t_aux(parse_f_aux(parse_f())); return [ r, Queue.fold((function (acc, x) { @@ -258,11 +258,11 @@ function l_parse(token) { ]; } -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -283,7 +283,7 @@ function eq(loc, x, y) { }; } -var match = parse(token(Stream.of_string("1 + 2 + (3 - 2) * 3 * 3 - 2 a"))); +let match = parse(token(Stream.of_string("1 + 2 + (3 - 2) * 3 * 3 - 2 a"))); eq("File \"stream_parser_test.res\", line 141, characters 5-12", [ match[0], diff --git a/jscomp/test/string_bound_get_test.js b/jscomp/test/string_bound_get_test.js index 6e5079da5a..9069c1c482 100644 --- a/jscomp/test/string_bound_get_test.js +++ b/jscomp/test/string_bound_get_test.js @@ -1,26 +1,26 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_bytes = require("../../lib/js/caml_bytes.js"); -var Caml_string = require("../../lib/js/caml_string.js"); +let Caml_bytes = require("../../lib/js/caml_bytes.js"); +let Caml_string = require("../../lib/js/caml_string.js"); -var v = "ghos"; +let v = "ghos"; -var u_a = Caml_string.get(v, 0); +let u_a = Caml_string.get(v, 0); function u_b(param) { return Caml_string.get(v, -1); } -var u_c = Caml_string.get("ghos", 0); +let u_c = Caml_string.get("ghos", 0); function u_d(param) { return Caml_string.get("ghos", -1); } -var u_e = Caml_bytes.create(32); +let u_e = Caml_bytes.create(32); -var u_f = Caml_bytes.get(u_e, 0); +let u_f = Caml_bytes.get(u_e, 0); function u_g(param) { return Caml_bytes.get(u_e, -1); diff --git a/jscomp/test/string_constant_compare.js b/jscomp/test/string_constant_compare.js index 453349df93..13b55015df 100644 --- a/jscomp/test/string_constant_compare.js +++ b/jscomp/test/string_constant_compare.js @@ -2,13 +2,13 @@ 'use strict'; -var a1 = true; +let a1 = true; -var a2 = false; +let a2 = false; -var a3 = "'" === "\'"; +let a3 = "'" === "\'"; -var a4 = "'" !== "\'"; +let a4 = "'" !== "\'"; exports.a1 = a1; exports.a2 = a2; diff --git a/jscomp/test/string_get_set_test.js b/jscomp/test/string_get_set_test.js index 673e49e9b0..61a871034d 100644 --- a/jscomp/test/string_get_set_test.js +++ b/jscomp/test/string_get_set_test.js @@ -1,8 +1,8 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_string = require("../../lib/js/caml_string.js"); +let Mt = require("./mt.js"); +let Caml_string = require("../../lib/js/caml_string.js"); Mt.from_pair_suites("string_get_set_test.res", { hd: [ diff --git a/jscomp/test/string_runtime_test.js b/jscomp/test/string_runtime_test.js index 74a0534644..f63935b895 100644 --- a/jscomp/test/string_runtime_test.js +++ b/jscomp/test/string_runtime_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var List = require("../../lib/js/list.js"); -var Bytes = require("../../lib/js/bytes.js"); -var Test_char = require("./test_char.js"); -var Caml_bytes = require("../../lib/js/caml_bytes.js"); +let Mt = require("./mt.js"); +let List = require("../../lib/js/list.js"); +let Bytes = require("../../lib/js/bytes.js"); +let Test_char = require("./test_char.js"); +let Caml_bytes = require("../../lib/js/caml_bytes.js"); -var suites_0 = [ +let suites_0 = [ "?is_printable", (function (param) { return { @@ -18,12 +18,12 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "?string_of_bytes", (function (param) { - var match = List.split(List.map((function (x) { - var b = Caml_bytes.create(x); + let match = List.split(List.map((function (x) { + let b = Caml_bytes.create(x); Bytes.fill(b, 0, x, /* 'c' */99); return [ Bytes.to_string(b), @@ -63,16 +63,16 @@ var suites_1 = { tl: /* [] */0 }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; Mt.from_pair_suites("String_runtime_test", suites); -var S; +let S; -var B; +let B; exports.S = S; exports.B = B; diff --git a/jscomp/test/string_set.js b/jscomp/test/string_set.js index b5f0e6b551..48ecbd3faa 100644 --- a/jscomp/test/string_set.js +++ b/jscomp/test/string_set.js @@ -1,11 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml = require("../../lib/js/caml.js"); -var List = require("../../lib/js/list.js"); -var $$Array = require("../../lib/js/array.js"); -var $$String = require("../../lib/js/string.js"); -var Set_gen = require("./set_gen.js"); +let Caml = require("../../lib/js/caml.js"); +let List = require("../../lib/js/list.js"); +let $$Array = require("../../lib/js/array.js"); +let $$String = require("../../lib/js/string.js"); +let Set_gen = require("./set_gen.js"); function split(x, tree) { if (typeof tree !== "object") { @@ -15,10 +15,10 @@ function split(x, tree) { "Empty" ]; } - var r = tree._2; - var v = tree._1; - var l = tree._0; - var c = Caml.string_compare(x, v); + let r = tree._2; + let v = tree._1; + let l = tree._0; + let c = Caml.string_compare(x, v); if (c === 0) { return [ l, @@ -27,14 +27,14 @@ function split(x, tree) { ]; } if (c < 0) { - var match = split(x, l); + let match = split(x, l); return [ match[0], match[1], Set_gen.internal_join(match[2], v, r) ]; } - var match$1 = split(x, r); + let match$1 = split(x, r); return [ Set_gen.internal_join(l, v, match$1[0]), match$1[1], @@ -52,10 +52,10 @@ function add(x, tree) { _3: 1 }; } - var r = tree._2; - var v = tree._1; - var l = tree._0; - var c = Caml.string_compare(x, v); + let r = tree._2; + let v = tree._1; + let l = tree._0; + let c = Caml.string_compare(x, v); if (c === 0) { return tree; } else if (c < 0) { @@ -69,24 +69,24 @@ function union(s1, s2) { if (typeof s1 !== "object") { return s2; } - var h1 = s1._3; - var v1 = s1._1; + let h1 = s1._3; + let v1 = s1._1; if (typeof s2 !== "object") { return s1; } - var h2 = s2._3; - var v2 = s2._1; + let h2 = s2._3; + let v2 = s2._1; if (h1 >= h2) { if (h2 === 1) { return add(v2, s1); } - var match = split(v1, s2); + let match = split(v1, s2); return Set_gen.internal_join(union(s1._0, match[0]), v1, union(s1._2, match[2])); } if (h1 === 1) { return add(v1, s2); } - var match$1 = split(v2, s1); + let match$1 = split(v2, s1); return Set_gen.internal_join(union(match$1[0], s2._0), v2, union(match$1[2], s2._2)); } @@ -97,11 +97,11 @@ function inter(s1, s2) { if (typeof s2 !== "object") { return "Empty"; } - var r1 = s1._2; - var v1 = s1._1; - var l1 = s1._0; - var match = split(v1, s2); - var l2 = match[0]; + let r1 = s1._2; + let v1 = s1._1; + let l1 = s1._0; + let match = split(v1, s2); + let l2 = match[0]; if (match[1]) { return Set_gen.internal_join(inter(l1, l2), v1, inter(r1, match[2])); } else { @@ -116,11 +116,11 @@ function diff(s1, s2) { if (typeof s2 !== "object") { return s1; } - var r1 = s1._2; - var v1 = s1._1; - var l1 = s1._0; - var match = split(v1, s2); - var l2 = match[0]; + let r1 = s1._2; + let v1 = s1._1; + let l1 = s1._0; + let match = split(v1, s2); + let l2 = match[0]; if (match[1]) { return Set_gen.internal_concat(diff(l1, l2), diff(r1, match[2])); } else { @@ -130,11 +130,11 @@ function diff(s1, s2) { function mem(x, _tree) { while(true) { - var tree = _tree; + let tree = _tree; if (typeof tree !== "object") { return false; } - var c = Caml.string_compare(x, tree._1); + let c = Caml.string_compare(x, tree._1); if (c === 0) { return true; } @@ -147,10 +147,10 @@ function remove(x, tree) { if (typeof tree !== "object") { return "Empty"; } - var r = tree._2; - var v = tree._1; - var l = tree._0; - var c = Caml.string_compare(x, v); + let r = tree._2; + let v = tree._1; + let l = tree._0; + let c = Caml.string_compare(x, v); if (c === 0) { return Set_gen.internal_merge(l, r); } else if (c < 0) { @@ -170,20 +170,20 @@ function equal(s1, s2) { function subset(_s1, _s2) { while(true) { - var s2 = _s2; - var s1 = _s1; + let s2 = _s2; + let s1 = _s1; if (typeof s1 !== "object") { return true; } - var r1 = s1._2; - var v1 = s1._1; - var l1 = s1._0; + let r1 = s1._2; + let v1 = s1._1; + let l1 = s1._0; if (typeof s2 !== "object") { return false; } - var r2 = s2._2; - var l2 = s2._0; - var c = Caml.string_compare(v1, s2._1); + let r2 = s2._2; + let l2 = s2._0; + let c = Caml.string_compare(v1, s2._1); if (c === 0) { if (!subset(l1, l2)) { return false; @@ -221,15 +221,15 @@ function subset(_s1, _s2) { function find(x, _tree) { while(true) { - var tree = _tree; + let tree = _tree; if (typeof tree !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = tree._1; - var c = Caml.string_compare(x, v); + let v = tree._1; + let c = Caml.string_compare(x, v); if (c === 0) { return v; } @@ -242,23 +242,23 @@ function of_list(l) { if (!l) { return "Empty"; } - var match = l.tl; - var x0 = l.hd; + let match = l.tl; + let x0 = l.hd; if (!match) { return Set_gen.singleton(x0); } - var match$1 = match.tl; - var x1 = match.hd; + let match$1 = match.tl; + let x1 = match.hd; if (!match$1) { return add(x1, Set_gen.singleton(x0)); } - var match$2 = match$1.tl; - var x2 = match$1.hd; + let match$2 = match$1.tl; + let x2 = match$1.hd; if (!match$2) { return add(x2, add(x1, Set_gen.singleton(x0))); } - var match$3 = match$2.tl; - var x3 = match$2.hd; + let match$3 = match$2.tl; + let x3 = match$2.hd; if (match$3) { if (match$3.tl) { return Set_gen.of_sorted_list(List.sort_uniq($$String.compare, l)); @@ -281,39 +281,39 @@ function invariant(t) { return Set_gen.is_ordered($$String.compare, t); } -var compare_elt = $$String.compare; +let compare_elt = $$String.compare; -var empty = "Empty"; +let empty = "Empty"; -var is_empty = Set_gen.is_empty; +let is_empty = Set_gen.is_empty; -var iter = Set_gen.iter; +let iter = Set_gen.iter; -var fold = Set_gen.fold; +let fold = Set_gen.fold; -var for_all = Set_gen.for_all; +let for_all = Set_gen.for_all; -var exists = Set_gen.exists; +let exists = Set_gen.exists; -var singleton = Set_gen.singleton; +let singleton = Set_gen.singleton; -var cardinal = Set_gen.cardinal; +let cardinal = Set_gen.cardinal; -var elements = Set_gen.elements; +let elements = Set_gen.elements; -var min_elt = Set_gen.min_elt; +let min_elt = Set_gen.min_elt; -var max_elt = Set_gen.max_elt; +let max_elt = Set_gen.max_elt; -var choose = Set_gen.choose; +let choose = Set_gen.choose; -var partition = Set_gen.partition; +let partition = Set_gen.partition; -var filter = Set_gen.filter; +let filter = Set_gen.filter; -var of_sorted_list = Set_gen.of_sorted_list; +let of_sorted_list = Set_gen.of_sorted_list; -var of_sorted_array = Set_gen.of_sorted_array; +let of_sorted_array = Set_gen.of_sorted_array; exports.compare_elt = compare_elt; exports.empty = empty; diff --git a/jscomp/test/string_set_test.js b/jscomp/test/string_set_test.js index 4c9c8c70b1..459762c5b7 100644 --- a/jscomp/test/string_set_test.js +++ b/jscomp/test/string_set_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var String_set = require("./string_set.js"); +let Mt = require("./mt.js"); +let String_set = require("./string_set.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -29,9 +29,9 @@ function eq(loc, x, y) { }; } -var s = String_set.empty; +let s = String_set.empty; -for(var i = 0; i <= 99999; ++i){ +for(let i = 0; i <= 99999; ++i){ s = String_set.add(String(i), s); } diff --git a/jscomp/test/string_test.js b/jscomp/test/string_test.js index 63813ea131..552351a6e6 100644 --- a/jscomp/test/string_test.js +++ b/jscomp/test/string_test.js @@ -1,16 +1,16 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var List = require("../../lib/js/list.js"); -var $$Array = require("../../lib/js/array.js"); -var Bytes = require("../../lib/js/bytes.js"); -var $$String = require("../../lib/js/string.js"); -var Ext_string_test = require("./ext_string_test.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let Mt = require("./mt.js"); +let List = require("../../lib/js/list.js"); +let $$Array = require("../../lib/js/array.js"); +let Bytes = require("../../lib/js/bytes.js"); +let $$String = require("../../lib/js/string.js"); +let Ext_string_test = require("./ext_string_test.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); function ff(x) { - var a; + let a; switch (x) { case "0" : case "1" : @@ -33,7 +33,7 @@ function ff(x) { } function gg(x) { - var a; + let a; switch (x) { case 0 : case 1 : @@ -56,17 +56,17 @@ function gg(x) { } function rev_split_by_char(c, s) { - var loop = function (i, l) { + let loop = function (i, l) { try { - var i$p = $$String.index_from(s, i, c); - var s$p = $$String.sub(s, i, i$p - i | 0); + let i$p = $$String.index_from(s, i, c); + let s$p = $$String.sub(s, i, i$p - i | 0); return loop(i$p + 1 | 0, s$p === "" ? l : ({ hd: s$p, tl: l })); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { return { hd: $$String.sub(s, i, s.length - i | 0), @@ -80,22 +80,22 @@ function rev_split_by_char(c, s) { } function xsplit(delim, s) { - var len = s.length; + let len = s.length; if (len !== 0) { - var _l = /* [] */0; - var _x = len; + let _l = /* [] */0; + let _x = len; while(true) { - var x = _x; - var l = _l; + let x = _x; + let l = _l; if (x === 0) { return l; } - var i$p; + let i$p; try { i$p = $$String.rindex_from(s, x - 1 | 0, delim); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { return { hd: $$String.sub(s, 0, x), @@ -104,12 +104,12 @@ function xsplit(delim, s) { } throw exn; } - var l_0 = $$String.sub(s, i$p + 1 | 0, (x - i$p | 0) - 1 | 0); - var l$1 = { + let l_0 = $$String.sub(s, i$p + 1 | 0, (x - i$p | 0) - 1 | 0); + let l$1 = { hd: l_0, tl: l }; - var l$2 = i$p === 0 ? ({ + let l$2 = i$p === 0 ? ({ hd: "", tl: l$1 }) : l$1; @@ -123,7 +123,7 @@ function xsplit(delim, s) { } function string_of_chars(x) { - var xs = List.map((function (prim) { + let xs = List.map((function (prim) { return String.fromCharCode(prim); }), x); return $$Array.of_list(xs).join(""); diff --git a/jscomp/test/string_unicode_test.js b/jscomp/test/string_unicode_test.js index 151705c23f..386b171876 100644 --- a/jscomp/test/string_unicode_test.js +++ b/jscomp/test/string_unicode_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; diff --git a/jscomp/test/stringmatch_test.js b/jscomp/test/stringmatch_test.js index 603557254e..86a2da45cb 100644 --- a/jscomp/test/stringmatch_test.js +++ b/jscomp/test/stringmatch_test.js @@ -47,7 +47,7 @@ if (tst01("\x00\x00\x00\x00\x00\x00\x00\x07") !== 1) { } function tst02(s) { - var len = s.length; + let len = s.length; if (s === "") { if (len >= 0) { return 1; @@ -1327,373 +1327,373 @@ if (tst05("BBBBBBBD") !== -1) { }; } -var s00 = "and"; +let s00 = "and"; -var t00 = "nad"; +let t00 = "nad"; -var s01 = "as"; +let s01 = "as"; -var t01 = "sa"; +let t01 = "sa"; -var s02 = "assert"; +let s02 = "assert"; -var t02 = "asesrt"; +let t02 = "asesrt"; -var s03 = "begin"; +let s03 = "begin"; -var t03 = "negib"; +let t03 = "negib"; -var s04 = "class"; +let s04 = "class"; -var t04 = "lcass"; +let t04 = "lcass"; -var s05 = "constraint"; +let s05 = "constraint"; -var t05 = "constiarnt"; +let t05 = "constiarnt"; -var s06 = "do"; +let s06 = "do"; -var t06 = "od"; +let t06 = "od"; -var s07 = "done"; +let s07 = "done"; -var t07 = "eond"; +let t07 = "eond"; -var s08 = "downto"; +let s08 = "downto"; -var t08 = "dowtno"; +let t08 = "dowtno"; -var s09 = "else"; +let s09 = "else"; -var t09 = "lese"; +let t09 = "lese"; -var s10 = "end"; +let s10 = "end"; -var t10 = "edn"; +let t10 = "edn"; -var s11 = "exception"; +let s11 = "exception"; -var t11 = "exception"; +let t11 = "exception"; -var s12 = "external"; +let s12 = "external"; -var t12 = "external"; +let t12 = "external"; -var s13 = "false"; +let s13 = "false"; -var t13 = "fslae"; +let t13 = "fslae"; -var s14 = "for"; +let s14 = "for"; -var t14 = "ofr"; +let t14 = "ofr"; -var s15 = "fun"; +let s15 = "fun"; -var t15 = "fnu"; +let t15 = "fnu"; -var s16 = "function"; +let s16 = "function"; -var t16 = "function"; +let t16 = "function"; -var s17 = "functor"; +let s17 = "functor"; -var t17 = "ounctfr"; +let t17 = "ounctfr"; -var s18 = "if"; +let s18 = "if"; -var t18 = "fi"; +let t18 = "fi"; -var s19 = "in"; +let s19 = "in"; -var t19 = "in"; +let t19 = "in"; -var s20 = "include"; +let s20 = "include"; -var t20 = "inculde"; +let t20 = "inculde"; -var s21 = "inherit"; +let s21 = "inherit"; -var t21 = "iehnrit"; +let t21 = "iehnrit"; -var s22 = "initializer"; +let s22 = "initializer"; -var t22 = "enitializir"; +let t22 = "enitializir"; -var s23 = "lazy"; +let s23 = "lazy"; -var t23 = "zaly"; +let t23 = "zaly"; -var s24 = "let"; +let s24 = "let"; -var t24 = "elt"; +let t24 = "elt"; -var s25 = "match"; +let s25 = "match"; -var t25 = "match"; +let t25 = "match"; -var s26 = "method"; +let s26 = "method"; -var t26 = "methdo"; +let t26 = "methdo"; -var s27 = "module"; +let s27 = "module"; -var t27 = "modelu"; +let t27 = "modelu"; -var s28 = "mutable"; +let s28 = "mutable"; -var t28 = "butamle"; +let t28 = "butamle"; -var s29 = "new"; +let s29 = "new"; -var t29 = "wen"; +let t29 = "wen"; -var s30 = "object"; +let s30 = "object"; -var t30 = "objcet"; +let t30 = "objcet"; -var s31 = "of"; +let s31 = "of"; -var t31 = "of"; +let t31 = "of"; -var s32 = "open"; +let s32 = "open"; -var t32 = "epon"; +let t32 = "epon"; -var s33 = "or"; +let s33 = "or"; -var t33 = "ro"; +let t33 = "ro"; -var s34 = "private"; +let s34 = "private"; -var t34 = "privaet"; +let t34 = "privaet"; -var s35 = "rec"; +let s35 = "rec"; -var t35 = "rec"; +let t35 = "rec"; -var s36 = "sig"; +let s36 = "sig"; -var t36 = "gis"; +let t36 = "gis"; -var s37 = "struct"; +let s37 = "struct"; -var t37 = "scrutt"; +let t37 = "scrutt"; -var s38 = "then"; +let s38 = "then"; -var t38 = "hten"; +let t38 = "hten"; -var s39 = "to"; +let s39 = "to"; -var t39 = "to"; +let t39 = "to"; -var s40 = "true"; +let s40 = "true"; -var t40 = "teur"; +let t40 = "teur"; -var s41 = "try"; +let s41 = "try"; -var t41 = "try"; +let t41 = "try"; -var s42 = "type"; +let s42 = "type"; -var t42 = "pyte"; +let t42 = "pyte"; -var s43 = "val"; +let s43 = "val"; -var t43 = "val"; +let t43 = "val"; -var s44 = "virtual"; +let s44 = "virtual"; -var t44 = "vritual"; +let t44 = "vritual"; -var s45 = "when"; +let s45 = "when"; -var t45 = "whne"; +let t45 = "whne"; -var s46 = "while"; +let s46 = "while"; -var t46 = "wlihe"; +let t46 = "wlihe"; -var s47 = "with"; +let s47 = "with"; -var t47 = "iwth"; +let t47 = "iwth"; -var s48 = "mod"; +let s48 = "mod"; -var t48 = "mod"; +let t48 = "mod"; -var s49 = "land"; +let s49 = "land"; -var t49 = "alnd"; +let t49 = "alnd"; -var s50 = "lor"; +let s50 = "lor"; -var t50 = "rol"; +let t50 = "rol"; -var s51 = "lxor"; +let s51 = "lxor"; -var t51 = "lxor"; +let t51 = "lxor"; -var s52 = "lsl"; +let s52 = "lsl"; -var t52 = "lsl"; +let t52 = "lsl"; -var s53 = "lsr"; +let s53 = "lsr"; -var t53 = "lsr"; +let t53 = "lsr"; -var s54 = "asr"; +let s54 = "asr"; -var t54 = "sar"; +let t54 = "sar"; -var s55 = "A"; +let s55 = "A"; -var t55 = "A"; +let t55 = "A"; -var s56 = "AA"; +let s56 = "AA"; -var t56 = "AA"; +let t56 = "AA"; -var s57 = "AAA"; +let s57 = "AAA"; -var t57 = "AAA"; +let t57 = "AAA"; -var s58 = "AAAA"; +let s58 = "AAAA"; -var t58 = "AAAA"; +let t58 = "AAAA"; -var s59 = "AAAAA"; +let s59 = "AAAAA"; -var t59 = "AAAAA"; +let t59 = "AAAAA"; -var s60 = "AAAAAA"; +let s60 = "AAAAAA"; -var t60 = "AAAAAA"; +let t60 = "AAAAAA"; -var s61 = "AAAAAAA"; +let s61 = "AAAAAAA"; -var t61 = "AAAAAAA"; +let t61 = "AAAAAAA"; -var s62 = "AAAAAAAA"; +let s62 = "AAAAAAAA"; -var t62 = "AAAAAAAA"; +let t62 = "AAAAAAAA"; -var s63 = "AAAAAAAAA"; +let s63 = "AAAAAAAAA"; -var t63 = "AAAAAAAAA"; +let t63 = "AAAAAAAAA"; -var s64 = "AAAAAAAAAA"; +let s64 = "AAAAAAAAAA"; -var t64 = "AAAAAAAAAA"; +let t64 = "AAAAAAAAAA"; -var s65 = "AAAAAAAAAAA"; +let s65 = "AAAAAAAAAAA"; -var t65 = "AAAAAAAAAAA"; +let t65 = "AAAAAAAAAAA"; -var s66 = "AAAAAAAAAAAA"; +let s66 = "AAAAAAAAAAAA"; -var t66 = "AAAAAAAAAAAA"; +let t66 = "AAAAAAAAAAAA"; -var s67 = "AAAAAAAAAAAAA"; +let s67 = "AAAAAAAAAAAAA"; -var t67 = "AAAAAAAAAAAAA"; +let t67 = "AAAAAAAAAAAAA"; -var s68 = "AAAAAAAAAAAAAA"; +let s68 = "AAAAAAAAAAAAAA"; -var t68 = "AAAAAAAAAAAAAA"; +let t68 = "AAAAAAAAAAAAAA"; -var s69 = "AAAAAAAAAAAAAAA"; +let s69 = "AAAAAAAAAAAAAAA"; -var t69 = "AAAAAAAAAAAAAAA"; +let t69 = "AAAAAAAAAAAAAAA"; -var s70 = "AAAAAAAAAAAAAAAA"; +let s70 = "AAAAAAAAAAAAAAAA"; -var t70 = "AAAAAAAAAAAAAAAA"; +let t70 = "AAAAAAAAAAAAAAAA"; -var s71 = "AAAAAAAAAAAAAAAAA"; +let s71 = "AAAAAAAAAAAAAAAAA"; -var t71 = "AAAAAAAAAAAAAAAAA"; +let t71 = "AAAAAAAAAAAAAAAAA"; -var s72 = "AAAAAAAAAAAAAAAAAA"; +let s72 = "AAAAAAAAAAAAAAAAAA"; -var t72 = "AAAAAAAAAAAAAAAAAA"; +let t72 = "AAAAAAAAAAAAAAAAAA"; -var s73 = "AAAAAAAAAAAAAAAAAAA"; +let s73 = "AAAAAAAAAAAAAAAAAAA"; -var t73 = "AAAAAAAAAAAAAAAAAAA"; +let t73 = "AAAAAAAAAAAAAAAAAAA"; -var s74 = "AAAAAAAAAAAAAAAAAAAA"; +let s74 = "AAAAAAAAAAAAAAAAAAAA"; -var t74 = "AAAAAAAAAAAAAAAAAAAA"; +let t74 = "AAAAAAAAAAAAAAAAAAAA"; -var s75 = "AAAAAAAAAAAAAAAAAAAAA"; +let s75 = "AAAAAAAAAAAAAAAAAAAAA"; -var t75 = "AAAAAAAAAAAAAAAAAAAAA"; +let t75 = "AAAAAAAAAAAAAAAAAAAAA"; -var s76 = "AAAAAAAAAAAAAAAAAAAAAA"; +let s76 = "AAAAAAAAAAAAAAAAAAAAAA"; -var t76 = "AAAAAAAAAAAAAAAAAAAAAA"; +let t76 = "AAAAAAAAAAAAAAAAAAAAAA"; -var s77 = "AAAAAAAAAAAAAAAAAAAAAAA"; +let s77 = "AAAAAAAAAAAAAAAAAAAAAAA"; -var t77 = "AAAAAAAAAAAAAAAAAAAAAAA"; +let t77 = "AAAAAAAAAAAAAAAAAAAAAAA"; -var s78 = "AAAAAAAAAAAAAAAAAAAAAAAA"; +let s78 = "AAAAAAAAAAAAAAAAAAAAAAAA"; -var t78 = "AAAAAAAAAAAAAAAAAAAAAAAA"; +let t78 = "AAAAAAAAAAAAAAAAAAAAAAAA"; -var s79 = "AAAAAAAAAAAAAAAAAAAAAAAAA"; +let s79 = "AAAAAAAAAAAAAAAAAAAAAAAAA"; -var t79 = "AAAAAAAAAAAAAAAAAAAAAAAAA"; +let t79 = "AAAAAAAAAAAAAAAAAAAAAAAAA"; -var s80 = "AAAAAAAAAAAAAAAAAAAAAAAAAA"; +let s80 = "AAAAAAAAAAAAAAAAAAAAAAAAAA"; -var t80 = "AAAAAAAAAAAAAAAAAAAAAAAAAA"; +let t80 = "AAAAAAAAAAAAAAAAAAAAAAAAAA"; -var s81 = "AAAAAAAAAAAAAAAAAAAAAAAAAAA"; +let s81 = "AAAAAAAAAAAAAAAAAAAAAAAAAAA"; -var t81 = "AAAAAAAAAAAAAAAAAAAAAAAAAAA"; +let t81 = "AAAAAAAAAAAAAAAAAAAAAAAAAAA"; -var s82 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAA"; +let s82 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAA"; -var t82 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAA"; +let t82 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAA"; -var s83 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; +let s83 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; -var t83 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; +let t83 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; -var s84 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; +let s84 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; -var t84 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; +let t84 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; -var s85 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; +let s85 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; -var t85 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; +let t85 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; -var s86 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; +let s86 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; -var t86 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; +let t86 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; -var s87 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; +let s87 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; -var t87 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; +let t87 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; -var s88 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; +let s88 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; -var t88 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; +let t88 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; -var s89 = "BBBBBBBBBBBBBBB"; +let s89 = "BBBBBBBBBBBBBBB"; -var t89 = "BBBBBBBBBBBBBBB"; +let t89 = "BBBBBBBBBBBBBBB"; -var s90 = "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"; +let s90 = "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"; -var t90 = "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"; +let t90 = "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"; -var s91 = "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"; +let s91 = "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"; -var t91 = "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"; +let t91 = "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"; function tst06(s) { switch (s) { diff --git a/jscomp/test/submodule.js b/jscomp/test/submodule.js index bc7b49d0d1..838015f6b9 100644 --- a/jscomp/test/submodule.js +++ b/jscomp/test/submodule.js @@ -32,39 +32,39 @@ function a4(x, y) { return a3(x, y) + 1 | 0; } -var A4 = { +let A4 = { a4: a4 }; -var A3 = { +let A3 = { a3: a3, A4: A4 }; -var A2 = { +let A2 = { a2: a2, A3: A3 }; -var A1 = { +let A1 = { a1: a1, A2: A2 }; -var A0 = { +let A0 = { a0: a0, A1: A1 }; -var v1 = a1(1, 2); +let v1 = a1(1, 2); -var v2 = a2(1, 2); +let v2 = a2(1, 2); -var v3 = a3(1, 2); +let v3 = a3(1, 2); -var v4 = a4(1, 2); +let v4 = a4(1, 2); -var v0 = 4; +let v0 = 4; exports.A0 = A0; exports.v0 = v0; diff --git a/jscomp/test/submodule_call.js b/jscomp/test/submodule_call.js index 331d3eb4db..abc1e34326 100644 --- a/jscomp/test/submodule_call.js +++ b/jscomp/test/submodule_call.js @@ -1,18 +1,18 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); -var Submodule = require("./submodule.js"); +let Curry = require("../../lib/js/curry.js"); +let Submodule = require("./submodule.js"); -var a0 = Submodule.A0.a0(1, 2); +let a0 = Submodule.A0.a0(1, 2); -var a1 = Curry._2(Submodule.A0.A1.a1, 1, 2); +let a1 = Curry._2(Submodule.A0.A1.a1, 1, 2); -var a2 = Curry._2(Submodule.A0.A1.A2.a2, 1, 2); +let a2 = Curry._2(Submodule.A0.A1.A2.a2, 1, 2); -var a3 = Curry._2(Submodule.A0.A1.A2.A3.a3, 1, 2); +let a3 = Curry._2(Submodule.A0.A1.A2.A3.a3, 1, 2); -var a4 = Curry._2(Submodule.A0.A1.A2.A3.A4.a4, 1, 2); +let a4 = Curry._2(Submodule.A0.A1.A2.A3.A4.a4, 1, 2); exports.a0 = a0; exports.a1 = a1; diff --git a/jscomp/test/switch_case_test.js b/jscomp/test/switch_case_test.js index b794501e3a..b91ac0d327 100644 --- a/jscomp/test/switch_case_test.js +++ b/jscomp/test/switch_case_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; diff --git a/jscomp/test/switch_string.js b/jscomp/test/switch_string.js index 41ef9145c6..44bb2901b2 100644 --- a/jscomp/test/switch_string.js +++ b/jscomp/test/switch_string.js @@ -21,7 +21,7 @@ function bar(x) { } } -var s = "😀"; +let s = "😀"; exports.foo = foo; exports.s = s; diff --git a/jscomp/test/tagged_template_test.js b/jscomp/test/tagged_template_test.js index d4b445c3d9..dd27498e7a 100644 --- a/jscomp/test/tagged_template_test.js +++ b/jscomp/test/tagged_template_test.js @@ -1,10 +1,10 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_array = require("../../lib/js/caml_array.js"); -var Caml_splice_call = require("../../lib/js/caml_splice_call.js"); -var Tagged_template_libJs = require("./tagged_template_lib.js"); +let Mt = require("./mt.js"); +let Caml_array = require("../../lib/js/caml_array.js"); +let Caml_splice_call = require("../../lib/js/caml_splice_call.js"); +let Tagged_template_libJs = require("./tagged_template_lib.js"); function sql(prim0, prim1) { return Caml_splice_call.spliceApply(Tagged_template_libJs.sql, [ @@ -13,30 +13,30 @@ function sql(prim0, prim1) { ]); } -var Pg = { +let Pg = { sql: sql }; -var table = "users"; +let table = "users"; -var id = "5"; +let id = "5"; -var queryWithModule = Tagged_template_libJs.sql`SELECT * FROM ${table} WHERE id = ${id}`; +let queryWithModule = Tagged_template_libJs.sql`SELECT * FROM ${table} WHERE id = ${id}`; -var query = Tagged_template_libJs.sql`SELECT * FROM ${table} WHERE id = ${id}`; +let query = Tagged_template_libJs.sql`SELECT * FROM ${table} WHERE id = ${id}`; -var length = Tagged_template_libJs.length`hello ${10} what's the total length? Is it ${3}?`; +let length = Tagged_template_libJs.length`hello ${10} what's the total length? Is it ${3}?`; function foo(strings, values) { - var res = ""; - var valueCount = values.length; - for(var i = 0; i < valueCount; ++i){ + let res = ""; + let valueCount = values.length; + for(let i = 0; i < valueCount; ++i){ res = res + Caml_array.get(strings, i) + String(Math.imul(Caml_array.get(values, i), 10)); } return res + Caml_array.get(strings, valueCount); } -var res = foo([ +let res = foo([ "| 5 * 10 = ", " |" ], [5]); @@ -103,7 +103,7 @@ Mt.from_pair_suites("tagged templates", { } }); -var extraLength = 10; +let extraLength = 10; exports.Pg = Pg; exports.table = table; diff --git a/jscomp/test/tailcall_inline_test.js b/jscomp/test/tailcall_inline_test.js index ecdce79014..9ac0756033 100644 --- a/jscomp/test/tailcall_inline_test.js +++ b/jscomp/test/tailcall_inline_test.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var $$Array = require("../../lib/js/array.js"); -var Caml_array = require("../../lib/js/caml_array.js"); +let Mt = require("./mt.js"); +let $$Array = require("../../lib/js/array.js"); +let Caml_array = require("../../lib/js/caml_array.js"); function f(param) { - var f$1 = function (_acc, _n) { + let f$1 = function (_acc, _n) { while(true) { - var n = _n; - var acc = _acc; + let n = _n; + let acc = _acc; if (n <= 0) { return acc; } @@ -18,14 +18,14 @@ function f(param) { continue ; }; }; - var v = Caml_array.make(10, 0); - for(var i = 0; i <= 9; ++i){ + let v = Caml_array.make(10, 0); + for(let i = 0; i <= 9; ++i){ Caml_array.set(v, i, f$1(0, i)); } return v; } -var suites_0 = [ +let suites_0 = [ "acc", (function (param) { return { @@ -47,7 +47,7 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "array_to_list", (function (param) { @@ -74,7 +74,7 @@ var suites_1 = { tl: /* [] */0 }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/template.js b/jscomp/test/template.js index 16c848d197..9c787fb134 100644 --- a/jscomp/test/template.js +++ b/jscomp/test/template.js @@ -2,7 +2,7 @@ 'use strict'; -var bla2 = ""; +let bla2 = ""; function concat(param) { return "\n display:\r flex;\n " + bla2; diff --git a/jscomp/test/test2.js b/jscomp/test/test2.js index 7a06ae7a97..0fc9b0c8cc 100644 --- a/jscomp/test/test2.js +++ b/jscomp/test/test2.js @@ -2,9 +2,9 @@ 'use strict'; -var H = {}; +let H = {}; -var U = { +let U = { H: H }; diff --git a/jscomp/test/test_alias.js b/jscomp/test/test_alias.js index 2f62e8be9e..fc4679b407 100644 --- a/jscomp/test/test_alias.js +++ b/jscomp/test/test_alias.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var List = require("../../lib/js/list.js"); +let List = require("../../lib/js/list.js"); -var v = List.length; +let v = List.length; exports.v = v; /* No side effect */ diff --git a/jscomp/test/test_ari.js b/jscomp/test/test_ari.js index 123c7b70d1..169d5d84e4 100644 --- a/jscomp/test/test_ari.js +++ b/jscomp/test/test_ari.js @@ -1,10 +1,10 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var U = require("U"); -var VV = require("VV"); -var List = require("../../lib/js/list.js"); -var Curry = require("../../lib/js/curry.js"); +let U = require("U"); +let VV = require("VV"); +let List = require("../../lib/js/list.js"); +let Curry = require("../../lib/js/curry.js"); function f(x) { return function (param) { @@ -24,18 +24,18 @@ function f2(param) { return 3 + param | 0; } -var g = 7; +let g = 7; function ff(param) { return U.test_primit(3, param); } -var fff = VV.test_primit2(3); +let fff = VV.test_primit2(3); function length_aux(_len, _x) { while(true) { - var x = _x; - var len = _len; + let x = _x; + let len = _len; if (!x) { return len; } @@ -45,109 +45,109 @@ function length_aux(_len, _x) { }; } -var length = List.length; +let length = List.length; -var compare_lengths = List.compare_lengths; +let compare_lengths = List.compare_lengths; -var compare_length_with = List.compare_length_with; +let compare_length_with = List.compare_length_with; -var cons = List.cons; +let cons = List.cons; -var hd = List.hd; +let hd = List.hd; -var tl = List.tl; +let tl = List.tl; -var nth = List.nth; +let nth = List.nth; -var nth_opt = List.nth_opt; +let nth_opt = List.nth_opt; -var rev = List.rev; +let rev = List.rev; -var init = List.init; +let init = List.init; -var append = List.append; +let append = List.append; -var rev_append = List.rev_append; +let rev_append = List.rev_append; -var concat = List.concat; +let concat = List.concat; -var flatten = List.flatten; +let flatten = List.flatten; -var iter = List.iter; +let iter = List.iter; -var iteri = List.iteri; +let iteri = List.iteri; -var map = List.map; +let map = List.map; -var mapi = List.mapi; +let mapi = List.mapi; -var rev_map = List.rev_map; +let rev_map = List.rev_map; -var fold_left = List.fold_left; +let fold_left = List.fold_left; -var fold_right = List.fold_right; +let fold_right = List.fold_right; -var iter2 = List.iter2; +let iter2 = List.iter2; -var map2 = List.map2; +let map2 = List.map2; -var rev_map2 = List.rev_map2; +let rev_map2 = List.rev_map2; -var fold_left2 = List.fold_left2; +let fold_left2 = List.fold_left2; -var fold_right2 = List.fold_right2; +let fold_right2 = List.fold_right2; -var for_all = List.for_all; +let for_all = List.for_all; -var exists = List.exists; +let exists = List.exists; -var for_all2 = List.for_all2; +let for_all2 = List.for_all2; -var exists2 = List.exists2; +let exists2 = List.exists2; -var mem = List.mem; +let mem = List.mem; -var memq = List.memq; +let memq = List.memq; -var find = List.find; +let find = List.find; -var find_opt = List.find_opt; +let find_opt = List.find_opt; -var filter = List.filter; +let filter = List.filter; -var find_all = List.find_all; +let find_all = List.find_all; -var partition = List.partition; +let partition = List.partition; -var assoc = List.assoc; +let assoc = List.assoc; -var assoc_opt = List.assoc_opt; +let assoc_opt = List.assoc_opt; -var assq = List.assq; +let assq = List.assq; -var assq_opt = List.assq_opt; +let assq_opt = List.assq_opt; -var mem_assoc = List.mem_assoc; +let mem_assoc = List.mem_assoc; -var mem_assq = List.mem_assq; +let mem_assq = List.mem_assq; -var remove_assoc = List.remove_assoc; +let remove_assoc = List.remove_assoc; -var remove_assq = List.remove_assq; +let remove_assq = List.remove_assq; -var split = List.split; +let split = List.split; -var combine = List.combine; +let combine = List.combine; -var sort = List.sort; +let sort = List.sort; -var stable_sort = List.stable_sort; +let stable_sort = List.stable_sort; -var fast_sort = List.fast_sort; +let fast_sort = List.fast_sort; -var sort_uniq = List.sort_uniq; +let sort_uniq = List.sort_uniq; -var merge = List.merge; +let merge = List.merge; exports.f = f; exports.f1 = f1; diff --git a/jscomp/test/test_array.js b/jscomp/test/test_array.js index 20c1364c35..9d93de2e9d 100644 --- a/jscomp/test/test_array.js +++ b/jscomp/test/test_array.js @@ -1,16 +1,16 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var $$Array = require("../../lib/js/array.js"); -var Caml_array = require("../../lib/js/caml_array.js"); +let $$Array = require("../../lib/js/array.js"); +let Caml_array = require("../../lib/js/caml_array.js"); -var v = Caml_array.make(6, 5); +let v = Caml_array.make(6, 5); Caml_array.make_float(30); -var h = $$Array.sub(v, 0, 2); +let h = $$Array.sub(v, 0, 2); -var hhh = $$Array.append([ +let hhh = $$Array.append([ 1, 2, 3, @@ -22,7 +22,7 @@ var hhh = $$Array.append([ 5 ]); -var u = Caml_array.concat({ +let u = Caml_array.concat({ hd: [ 1, 2 @@ -42,7 +42,7 @@ var u = Caml_array.concat({ } }); -var hh = $$Array.blit; +let hh = $$Array.blit; exports.v = v; exports.h = h; diff --git a/jscomp/test/test_array_append.js b/jscomp/test/test_array_append.js index df19098d62..58cc5d4192 100644 --- a/jscomp/test/test_array_append.js +++ b/jscomp/test/test_array_append.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var $$Array = require("../../lib/js/array.js"); +let $$Array = require("../../lib/js/array.js"); -var const_v = $$Array.append([ +let const_v = $$Array.append([ 1, 2 ], [3]); diff --git a/jscomp/test/test_array_primitive.js b/jscomp/test/test_array_primitive.js index edaa113bc5..e9bfac5d2c 100644 --- a/jscomp/test/test_array_primitive.js +++ b/jscomp/test/test_array_primitive.js @@ -1,11 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_array = require("../../lib/js/caml_array.js"); +let Caml_array = require("../../lib/js/caml_array.js"); function caml_array_sub(x, offset, len) { - var result = new Array(len); - for(var j = 0; j < len; ++j){ + let result = new Array(len); + for(let j = 0; j < len; ++j){ Caml_array.set(result, j, Caml_array.get(x, offset + j | 0)); } return result; @@ -34,8 +34,8 @@ function caml_array_get(xs, index) { } function caml_make_vect(len, init) { - var b = new Array(len); - for(var i = 0; i < len; ++i){ + let b = new Array(len); + for(let i = 0; i < len; ++i){ Caml_array.set(b, i, init); } return b; diff --git a/jscomp/test/test_bs_this.js b/jscomp/test/test_bs_this.js index f16501eb5f..0a1b918fd5 100644 --- a/jscomp/test/test_bs_this.js +++ b/jscomp/test/test_bs_this.js @@ -1,21 +1,21 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); function uux_this(x, y) { - var o = this ; + let o = this ; return (o.length + x | 0) + y | 0; } function even(x) { - var o = this ; + let o = this ; return x + o | 0; } function bark(param) { return function (x, y) { - var o = this ; + let o = this ; console.log([ o.length, o.x, @@ -27,9 +27,9 @@ function bark(param) { }; } -var js_obj = { +let js_obj = { bark: (function (x, y) { - var o = this ; + let o = this ; console.log(o); return x + y | 0; }) @@ -37,11 +37,11 @@ var js_obj = { function f(x) { x.onload = (function () { - var o = this ; + let o = this ; console.log(o); }); return Curry._2(x.addEventListener, "onload", (function () { - var o = this ; + let o = this ; console.log(o.response); })); } diff --git a/jscomp/test/test_bug.js b/jscomp/test/test_bug.js index 57ff83d48d..1dd0680f50 100644 --- a/jscomp/test/test_bug.js +++ b/jscomp/test/test_bug.js @@ -1,16 +1,16 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Bytes = require("../../lib/js/bytes.js"); -var Test_char = require("./test_char.js"); -var Caml_bytes = require("../../lib/js/caml_bytes.js"); +let Bytes = require("../../lib/js/bytes.js"); +let Test_char = require("./test_char.js"); +let Caml_bytes = require("../../lib/js/caml_bytes.js"); function escaped(s) { - var n = 0; - for(var i = 0 ,i_finish = s.length; i < i_finish; ++i){ - var c = s[i]; - var tmp; - var exit = 0; + let n = 0; + for(let i = 0 ,i_finish = s.length; i < i_finish; ++i){ + let c = s[i]; + let tmp; + let exit = 0; if (c >= 14) { if (c !== 34 && c !== 92) { exit = 1; @@ -36,11 +36,11 @@ function escaped(s) { if (n === s.length) { return Bytes.copy(s); } - var s$p = Caml_bytes.create(n); + let s$p = Caml_bytes.create(n); n = 0; - for(var i$1 = 0 ,i_finish$1 = s.length; i$1 < i_finish$1; ++i$1){ - var c$1 = s[i$1]; - var exit$1 = 0; + for(let i$1 = 0 ,i_finish$1 = s.length; i$1 < i_finish$1; ++i$1){ + let c$1 = s[i$1]; + let exit$1 = 0; if (c$1 > 92 || c$1 < 34) { if (c$1 >= 14) { exit$1 = 1; diff --git a/jscomp/test/test_bytes.js b/jscomp/test/test_bytes.js index ce36538d67..9d625d0f65 100644 --- a/jscomp/test/test_bytes.js +++ b/jscomp/test/test_bytes.js @@ -1,11 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Bytes = require("../../lib/js/bytes.js"); +let Bytes = require("../../lib/js/bytes.js"); -var f = Bytes.unsafe_to_string; +let f = Bytes.unsafe_to_string; -var ff = Bytes.to_string; +let ff = Bytes.to_string; exports.f = f; exports.ff = ff; diff --git a/jscomp/test/test_case_opt_collision.js b/jscomp/test/test_case_opt_collision.js index 294ddcb886..752287d60a 100644 --- a/jscomp/test/test_case_opt_collision.js +++ b/jscomp/test/test_case_opt_collision.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -16,8 +16,8 @@ function eq(loc, x, y) { } function f(xOpt, y) { - var x = xOpt !== undefined ? xOpt : 3; - var xOpt$1 = x + 2 | 0; + let x = xOpt !== undefined ? xOpt : 3; + let xOpt$1 = x + 2 | 0; console.log(xOpt$1); return xOpt$1 + y | 0; } diff --git a/jscomp/test/test_case_set.js b/jscomp/test/test_case_set.js index 829ae402b1..418dcc977e 100644 --- a/jscomp/test/test_case_set.js +++ b/jscomp/test/test_case_set.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); function f(x) { x.case = 3; diff --git a/jscomp/test/test_closure.js b/jscomp/test/test_closure.js index d19efb60e1..0476b869e6 100644 --- a/jscomp/test/test_closure.js +++ b/jscomp/test/test_closure.js @@ -1,19 +1,19 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var $$Array = require("../../lib/js/array.js"); -var Curry = require("../../lib/js/curry.js"); -var Caml_array = require("../../lib/js/caml_array.js"); +let $$Array = require("../../lib/js/array.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_array = require("../../lib/js/caml_array.js"); -var v = { +let v = { contents: 0 }; function f(param) { - var arr = Caml_array.make(10, (function (param) { + let arr = Caml_array.make(10, (function (param) { })); - for(var i = 0; i <= 9; ++i){ + for(let i = 0; i <= 9; ++i){ Caml_array.set(arr, i, (function(i){ return function (param) { v.contents = v.contents + i | 0; @@ -23,7 +23,7 @@ function f(param) { return arr; } -var u = f(); +let u = f(); $$Array.iter((function (x) { Curry._1(x, undefined); diff --git a/jscomp/test/test_common.js b/jscomp/test/test_common.js index fcb9fceb1e..f6ff2cfe10 100644 --- a/jscomp/test/test_common.js +++ b/jscomp/test/test_common.js @@ -1,11 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var U = /* @__PURE__ */Caml_exceptions.create("Test_common.U"); +let U = /* @__PURE__ */Caml_exceptions.create("Test_common.U"); -var H = /* @__PURE__ */Caml_exceptions.create("Test_common.H"); +let H = /* @__PURE__ */Caml_exceptions.create("Test_common.H"); exports.U = U; exports.H = H; diff --git a/jscomp/test/test_cpp.js b/jscomp/test/test_cpp.js index 73262846f9..47db685670 100644 --- a/jscomp/test/test_cpp.js +++ b/jscomp/test/test_cpp.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml = require("../../lib/js/caml.js"); +let Caml = require("../../lib/js/caml.js"); -var f = Caml.int_compare; +let f = Caml.int_compare; exports.f = f; /* No side effect */ diff --git a/jscomp/test/test_cps.js b/jscomp/test/test_cps.js index 63661c7f50..cce2161b26 100644 --- a/jscomp/test/test_cps.js +++ b/jscomp/test/test_cps.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); -var Caml_array = require("../../lib/js/caml_array.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_array = require("../../lib/js/caml_array.js"); function f(_n, _acc) { while(true) { - var acc = _acc; - var n = _n; + let acc = _acc; + let n = _n; if (n === 0) { return Curry._1(acc, undefined); } @@ -23,10 +23,10 @@ function f(_n, _acc) { } function test_closure(param) { - var arr = Caml_array.make(6, (function (x) { + let arr = Caml_array.make(6, (function (x) { return x; })); - for(var i = 0; i <= 6; ++i){ + for(let i = 0; i <= 6; ++i){ Caml_array.set(arr, i, (function(i){ return function (param) { return i; diff --git a/jscomp/test/test_demo.js b/jscomp/test/test_demo.js index bfdec105f3..da34385e5b 100644 --- a/jscomp/test/test_demo.js +++ b/jscomp/test/test_demo.js @@ -1,8 +1,8 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var List = require("../../lib/js/list.js"); -var Curry = require("../../lib/js/curry.js"); +let List = require("../../lib/js/list.js"); +let Curry = require("../../lib/js/curry.js"); function fib(x) { if (x === 2 || x === 1) { @@ -33,8 +33,8 @@ function map(f, x) { } function sum(n) { - var v = 0; - for(var i = 0; i <= n; ++i){ + let v = 0; + for(let i = 0; i <= n; ++i){ v = v + i | 0; } return v; @@ -45,32 +45,32 @@ function f(x, y, z) { } function g(x, y) { - var u = x + y | 0; + let u = x + y | 0; return function (z) { return u + z | 0; }; } function g1(x, y) { - var u = x + y | 0; + let u = x + y | 0; return function (xx, yy) { return (xx + yy | 0) + u | 0; }; } -var u = 8; +let u = 8; -var x = u + 6 | 0; +let x = u + 6 | 0; -var u$1 = 7; +let u$1 = 7; function v(param) { return (6 + param | 0) + u$1 | 0; } -var nil = "Nil"; +let nil = "Nil"; -var len = List.length; +let len = List.length; exports.fib = fib; exports.nil = nil; diff --git a/jscomp/test/test_exception.js b/jscomp/test/test_exception.js index 13739f224f..ad5f3cb93f 100644 --- a/jscomp/test/test_exception.js +++ b/jscomp/test/test_exception.js @@ -1,10 +1,10 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Test_common = require("./test_common.js"); -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Test_common = require("./test_common.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var Local = /* @__PURE__ */Caml_exceptions.create("Test_exception.Local"); +let Local = /* @__PURE__ */Caml_exceptions.create("Test_exception.Local"); function f(param) { throw { @@ -44,9 +44,9 @@ function xx(param) { }; } -var Nullary = /* @__PURE__ */Caml_exceptions.create("Test_exception.Nullary"); +let Nullary = /* @__PURE__ */Caml_exceptions.create("Test_exception.Nullary"); -var a = { +let a = { RE_EXN_ID: Nullary }; diff --git a/jscomp/test/test_exception_escape.js b/jscomp/test/test_exception_escape.js index d6c908ff8c..a650111d16 100644 --- a/jscomp/test/test_exception_escape.js +++ b/jscomp/test/test_exception_escape.js @@ -1,11 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var A = /* @__PURE__ */Caml_exceptions.create("Test_exception_escape.N.A"); +let A = /* @__PURE__ */Caml_exceptions.create("Test_exception_escape.N.A"); -var f; +let f; try { throw { @@ -18,7 +18,7 @@ catch (exn){ f = 3; } -var N = { +let N = { f: f }; diff --git a/jscomp/test/test_external.js b/jscomp/test/test_external.js index ff64767ed3..13d3d54156 100644 --- a/jscomp/test/test_external.js +++ b/jscomp/test/test_external.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); -var xx = document(); +let xx = document(); alert("hehha"); -var b = Curry._1(ff("x"), 3); +let b = Curry._1(ff("x"), 3); exports.xx = xx; exports.b = b; diff --git a/jscomp/test/test_external_unit.js b/jscomp/test/test_external_unit.js index 14120ebf58..17e452ce04 100644 --- a/jscomp/test/test_external_unit.js +++ b/jscomp/test/test_external_unit.js @@ -4,9 +4,9 @@ console.log(3); -var v = console.log(3); +let v = console.log(3); -var u; +let u; exports.u = u; exports.v = v; diff --git a/jscomp/test/test_fib.js b/jscomp/test/test_fib.js index 66ca9dcf25..e27b52e063 100644 --- a/jscomp/test/test_fib.js +++ b/jscomp/test/test_fib.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); function fib(x) { if (x === 0 || x === 1) { @@ -19,21 +19,21 @@ function fib2(x) { } } -var v = 0; +let v = 0; -for(var i = 0; i <= 10; ++i){ +for(let i = 0; i <= 10; ++i){ v = v + i | 0; } -var sum = v; +let sum = v; -var v$1 = 0; +let v$1 = 0; -for(var i$1 = 10; i$1 >= 0; --i$1){ +for(let i$1 = 10; i$1 >= 0; --i$1){ v$1 = v$1 + i$1 | 0; } -var sumdown = v$1; +let sumdown = v$1; function cons(x, y) { return { @@ -64,8 +64,8 @@ function map(f, x) { } function f(x) { - var v = x; - var sum = 0; + let v = x; + let sum = 0; while(v > 0) { sum = sum + v | 0; v = v - 1 | 0; @@ -74,13 +74,13 @@ function f(x) { } function fib3(n) { - var _a = 0; - var _b = 1; - var _n = n; + let _a = 0; + let _b = 1; + let _n = n; while(true) { - var n$1 = _n; - var b = _b; - var a = _a; + let n$1 = _n; + let b = _b; + let a = _a; if (n$1 <= 0) { return a; } @@ -91,7 +91,7 @@ function fib3(n) { }; } -var b = fib; +let b = fib; exports.fib = fib; exports.fib2 = fib2; diff --git a/jscomp/test/test_filename.js b/jscomp/test/test_filename.js index 01cffabd96..018404e0ba 100644 --- a/jscomp/test/test_filename.js +++ b/jscomp/test/test_filename.js @@ -1,12 +1,12 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var List = require("../../lib/js/list.js"); -var Filename = require("../../lib/js/filename.js"); +let List = require("../../lib/js/list.js"); +let Filename = require("../../lib/js/filename.js"); -var u = Filename.chop_extension; +let u = Filename.chop_extension; -var v = List.length; +let v = List.length; exports.u = u; exports.v = v; diff --git a/jscomp/test/test_for_loop.js b/jscomp/test/test_for_loop.js index 9f942ca9cb..e9bed9b19e 100644 --- a/jscomp/test/test_for_loop.js +++ b/jscomp/test/test_for_loop.js @@ -1,31 +1,31 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var $$Array = require("../../lib/js/array.js"); -var Curry = require("../../lib/js/curry.js"); -var Caml_array = require("../../lib/js/caml_array.js"); +let $$Array = require("../../lib/js/array.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_array = require("../../lib/js/caml_array.js"); function for_(x) { - for(var i = 0 ,i_finish = (console.log("hi"), x.length); i <= i_finish; ++i){ + for(let i = 0 ,i_finish = (console.log("hi"), x.length); i <= i_finish; ++i){ console.log(Caml_array.get(x, i)); } } function for_2(x) { - for(var i = 0 ,i_finish = x.length; i <= i_finish; ++i){ + for(let i = 0 ,i_finish = x.length; i <= i_finish; ++i){ console.log(Caml_array.get(x, i)); } } function for_3(x) { - var v = { + let v = { contents: 0 }; - var arr = $$Array.map((function (param, param$1) { + let arr = $$Array.map((function (param, param$1) { }), x); - for(var i = 0 ,i_finish = x.length; i <= i_finish; ++i){ - var j = (i << 1); + for(let i = 0 ,i_finish = x.length; i <= i_finish; ++i){ + let j = (i << 1); Caml_array.set(arr, i, (function(j){ return function (param) { v.contents = v.contents + j | 0; @@ -39,15 +39,15 @@ function for_3(x) { } function for_4(x) { - var v = { + let v = { contents: 0 }; - var arr = $$Array.map((function (param, param$1) { + let arr = $$Array.map((function (param, param$1) { }), x); - for(var i = 0 ,i_finish = x.length; i <= i_finish; ++i){ - var j = (i << 1); - var k = (j << 1); + for(let i = 0 ,i_finish = x.length; i <= i_finish; ++i){ + let j = (i << 1); + let k = (j << 1); Caml_array.set(arr, i, (function(k){ return function (param) { v.contents = v.contents + k | 0; @@ -61,14 +61,14 @@ function for_4(x) { } function for_5(x, u) { - var v = { + let v = { contents: 0 }; - var arr = $$Array.map((function (param, param$1) { + let arr = $$Array.map((function (param, param$1) { }), x); - for(var i = 0 ,i_finish = x.length; i <= i_finish; ++i){ - var k = Math.imul((u << 1), u); + for(let i = 0 ,i_finish = x.length; i <= i_finish; ++i){ + let k = Math.imul((u << 1), u); Caml_array.set(arr, i, (function(k){ return function (param) { v.contents = v.contents + k | 0; @@ -82,28 +82,28 @@ function for_5(x, u) { } function for_6(x, u) { - var v = { + let v = { contents: 0 }; - var arr = $$Array.map((function (param, param$1) { + let arr = $$Array.map((function (param, param$1) { }), x); - var v4 = { + let v4 = { contents: 0 }; - var v5 = { + let v5 = { contents: 0 }; v4.contents = v4.contents + 1 | 0; - for(var j = 0; j <= 1; ++j){ + for(let j = 0; j <= 1; ++j){ v5.contents = v5.contents + 1 | 0; - var v2 = { + let v2 = { contents: 0 }; (function(v2){ - for(var i = 0 ,i_finish = x.length; i <= i_finish; ++i){ - var k = Math.imul((u << 1), u); - var h = (v5.contents << 1); + for(let i = 0 ,i_finish = x.length; i <= i_finish; ++i){ + let k = Math.imul((u << 1), u); + let h = (v5.contents << 1); v2.contents = v2.contents + 1 | 0; Caml_array.set(arr, i, (function(k,h){ return function (param) { diff --git a/jscomp/test/test_for_map.js b/jscomp/test/test_for_map.js index 11c3f54b3f..08063cd07a 100644 --- a/jscomp/test/test_for_map.js +++ b/jscomp/test/test_for_map.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml = require("../../lib/js/caml.js"); -var Curry = require("../../lib/js/curry.js"); -var Caml_option = require("../../lib/js/caml_option.js"); +let Caml = require("../../lib/js/caml.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_option = require("../../lib/js/caml_option.js"); function height(param) { if (typeof param !== "object") { @@ -14,8 +14,8 @@ function height(param) { } function create(l, x, d, r) { - var hl = height(l); - var hr = height(r); + let hl = height(l); + let hr = height(r); return { TAG: "Node", l: l, @@ -38,9 +38,9 @@ function singleton(x, d) { } function bal(l, x, d, r) { - var hl; + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -50,10 +50,10 @@ function bal(l, x, d, r) { Error: new Error() }; } - var lr = l.r; - var ld = l.d; - var lv = l.v; - var ll = l.l; + let lr = l.r; + let ld = l.d; + let lv = l.v; + let ll = l.l; if (height(ll) >= height(lr)) { return create(ll, lv, ld, create(lr, x, d, r)); } @@ -83,10 +83,10 @@ function bal(l, x, d, r) { Error: new Error() }; } - var rr = r.r; - var rd = r.d; - var rv = r.v; - var rl = r.l; + let rr = r.r; + let rd = r.d; + let rv = r.v; + let rl = r.l; if (height(rr) >= height(rl)) { return create(create(l, x, d, rl), rv, rd, rr); } @@ -119,11 +119,11 @@ function add(x, data, param) { h: 1 }; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Caml.int_compare(x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Caml.int_compare(x, v); if (c === 0) { if (d === data) { return param; @@ -139,14 +139,14 @@ function add(x, data, param) { } } if (c < 0) { - var ll = add(x, data, l); + let ll = add(x, data, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = add(x, data, r); + let rr = add(x, data, r); if (r === rr) { return param; } else { @@ -156,14 +156,14 @@ function add(x, data, param) { function find(x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var c = Caml.int_compare(x, param.v); + let c = Caml.int_compare(x, param.v); if (c === 0) { return param.d; } @@ -174,29 +174,29 @@ function find(x, _param) { function find_first(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _d0 = param.d; - var _param$1 = param.l; + let _v0 = v; + let _d0 = param.d; + let _param$1 = param.l; while(true) { - var param$1 = _param$1; - var d0 = _d0; - var v0 = _v0; + let param$1 = _param$1; + let d0 = _d0; + let v0 = _v0; if (typeof param$1 !== "object") { return [ v0, d0 ]; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.l; _d0 = param$1.d; @@ -214,26 +214,26 @@ function find_first(f, _param) { function find_first_opt(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _d0 = param.d; - var _param$1 = param.l; + let _v0 = v; + let _d0 = param.d; + let _param$1 = param.l; while(true) { - var param$1 = _param$1; - var d0 = _d0; - var v0 = _v0; + let param$1 = _param$1; + let d0 = _d0; + let v0 = _v0; if (typeof param$1 !== "object") { return [ v0, d0 ]; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.l; _d0 = param$1.d; @@ -251,29 +251,29 @@ function find_first_opt(f, _param) { function find_last(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _d0 = param.d; - var _param$1 = param.r; + let _v0 = v; + let _d0 = param.d; + let _param$1 = param.r; while(true) { - var param$1 = _param$1; - var d0 = _d0; - var v0 = _v0; + let param$1 = _param$1; + let d0 = _d0; + let v0 = _v0; if (typeof param$1 !== "object") { return [ v0, d0 ]; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.r; _d0 = param$1.d; @@ -291,26 +291,26 @@ function find_last(f, _param) { function find_last_opt(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _d0 = param.d; - var _param$1 = param.r; + let _v0 = v; + let _d0 = param.d; + let _param$1 = param.r; while(true) { - var param$1 = _param$1; - var d0 = _d0; - var v0 = _v0; + let param$1 = _param$1; + let d0 = _d0; + let v0 = _v0; if (typeof param$1 !== "object") { return [ v0, d0 ]; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.r; _d0 = param$1.d; @@ -328,11 +328,11 @@ function find_last_opt(f, _param) { function find_opt(x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var c = Caml.int_compare(x, param.v); + let c = Caml.int_compare(x, param.v); if (c === 0) { return Caml_option.some(param.d); } @@ -343,11 +343,11 @@ function find_opt(x, _param) { function mem(x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } - var c = Caml.int_compare(x, param.v); + let c = Caml.int_compare(x, param.v); if (c === 0) { return true; } @@ -358,14 +358,14 @@ function mem(x, _param) { function min_binding(_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return [ param.v, @@ -379,11 +379,11 @@ function min_binding(_param) { function min_binding_opt(_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return [ param.v, @@ -397,14 +397,14 @@ function min_binding_opt(_param) { function max_binding(_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return [ param.v, @@ -418,11 +418,11 @@ function max_binding(_param) { function max_binding_opt(_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return [ param.v, @@ -442,7 +442,7 @@ function remove_min_binding(param) { Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return param.r; } else { @@ -457,7 +457,7 @@ function merge(t1, t2) { if (typeof t2 !== "object") { return t1; } - var match = min_binding(t2); + let match = min_binding(t2); return bal(t1, match[0], match[1], remove_min_binding(t2)); } @@ -465,23 +465,23 @@ function remove(x, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Caml.int_compare(x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Caml.int_compare(x, v); if (c === 0) { return merge(l, r); } if (c < 0) { - var ll = remove(x, l); + let ll = remove(x, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = remove(x, r); + let rr = remove(x, r); if (r === rr) { return param; } else { @@ -491,7 +491,7 @@ function remove(x, param) { function update(x, f, param) { if (typeof param !== "object") { - var data = Curry._1(f, undefined); + let data = Curry._1(f, undefined); if (data !== undefined) { return { TAG: "Node", @@ -505,17 +505,17 @@ function update(x, f, param) { return "Empty"; } } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Caml.int_compare(x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Caml.int_compare(x, v); if (c === 0) { - var data$1 = Curry._1(f, Caml_option.some(d)); + let data$1 = Curry._1(f, Caml_option.some(d)); if (data$1 === undefined) { return merge(l, r); } - var data$2 = Caml_option.valFromOption(data$1); + let data$2 = Caml_option.valFromOption(data$1); if (d === data$2) { return param; } else { @@ -530,14 +530,14 @@ function update(x, f, param) { } } if (c < 0) { - var ll = update(x, f, l); + let ll = update(x, f, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = update(x, f, r); + let rr = update(x, f, r); if (r === rr) { return param; } else { @@ -547,7 +547,7 @@ function update(x, f, param) { function iter(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } @@ -562,9 +562,9 @@ function map(f, param) { if (typeof param !== "object") { return "Empty"; } - var l$p = map(f, param.l); - var d$p = Curry._1(f, param.d); - var r$p = map(f, param.r); + let l$p = map(f, param.l); + let d$p = Curry._1(f, param.d); + let r$p = map(f, param.r); return { TAG: "Node", l: l$p, @@ -579,10 +579,10 @@ function mapi(f, param) { if (typeof param !== "object") { return "Empty"; } - var v = param.v; - var l$p = mapi(f, param.l); - var d$p = Curry._2(f, v, param.d); - var r$p = mapi(f, param.r); + let v = param.v; + let l$p = mapi(f, param.l); + let d$p = Curry._2(f, v, param.d); + let r$p = mapi(f, param.r); return { TAG: "Node", l: l$p, @@ -595,8 +595,8 @@ function mapi(f, param) { function fold(f, _m, _accu) { while(true) { - var accu = _accu; - var m = _m; + let accu = _accu; + let m = _m; if (typeof m !== "object") { return accu; } @@ -608,7 +608,7 @@ function fold(f, _m, _accu) { function for_all(p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return true; } @@ -625,7 +625,7 @@ function for_all(p, _param) { function exists(p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } @@ -660,11 +660,11 @@ function join(l, v, d, r) { if (typeof l !== "object") { return add_min_binding(v, d, r); } - var lh = l.h; + let lh = l.h; if (typeof r !== "object") { return add_max_binding(v, d, l); } - var rh = r.h; + let rh = r.h; if (lh > (rh + 2 | 0)) { return bal(l.l, l.v, l.d, join(l.r, v, d, r)); } else if (rh > (lh + 2 | 0)) { @@ -681,7 +681,7 @@ function concat(t1, t2) { if (typeof t2 !== "object") { return t1; } - var match = min_binding(t2); + let match = min_binding(t2); return join(t1, match[0], match[1], remove_min_binding(t2)); } @@ -701,11 +701,11 @@ function split(x, param) { "Empty" ]; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Caml.int_compare(x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Caml.int_compare(x, v); if (c === 0) { return [ l, @@ -714,14 +714,14 @@ function split(x, param) { ]; } if (c < 0) { - var match = split(x, l); + let match = split(x, l); return [ match[0], match[1], join(match[2], v, d, r) ]; } - var match$1 = split(x, r); + let match$1 = split(x, r); return [ join(l, v, d, match$1[0]), match$1[1], @@ -736,9 +736,9 @@ function merge$1(f, s1, s2) { } } else { - var v1 = s1.v; + let v1 = s1.v; if (s1.h >= height(s2)) { - var match = split(v1, s2); + let match = split(v1, s2); return concat_or_join(merge$1(f, s1.l, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2])); } @@ -754,8 +754,8 @@ function merge$1(f, s1, s2) { Error: new Error() }; } - var v2 = s2.v; - var match$1 = split(v2, s1); + let v2 = s2.v; + let match$1 = split(v2, s1); return concat_or_join(merge$1(f, match$1[0], s2.l), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r)); } @@ -763,28 +763,28 @@ function union(f, s1, s2) { if (typeof s1 !== "object") { return s2; } - var d1 = s1.d; - var v1 = s1.v; + let d1 = s1.d; + let v1 = s1.v; if (typeof s2 !== "object") { return s1; } - var d2 = s2.d; - var v2 = s2.v; + let d2 = s2.d; + let v2 = s2.v; if (s1.h >= s2.h) { - var match = split(v1, s2); - var d2$1 = match[1]; - var l = union(f, s1.l, match[0]); - var r = union(f, s1.r, match[2]); + let match = split(v1, s2); + let d2$1 = match[1]; + let l = union(f, s1.l, match[0]); + let r = union(f, s1.r, match[2]); if (d2$1 !== undefined) { return concat_or_join(l, v1, Curry._3(f, v1, d1, Caml_option.valFromOption(d2$1)), r); } else { return join(l, v1, d1, r); } } - var match$1 = split(v2, s1); - var d1$1 = match$1[1]; - var l$1 = union(f, match$1[0], s2.l); - var r$1 = union(f, match$1[2], s2.r); + let match$1 = split(v2, s1); + let d1$1 = match$1[1]; + let l$1 = union(f, match$1[0], s2.l); + let r$1 = union(f, match$1[2], s2.r); if (d1$1 !== undefined) { return concat_or_join(l$1, v2, Curry._3(f, v2, Caml_option.valFromOption(d1$1), d2), r$1); } else { @@ -796,13 +796,13 @@ function filter(p, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var l$p = filter(p, l); - var pvd = Curry._2(p, v, d); - var r$p = filter(p, r); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let l$p = filter(p, l); + let pvd = Curry._2(p, v, d); + let r$p = filter(p, r); if (pvd) { if (l === l$p && r === r$p) { return param; @@ -821,15 +821,15 @@ function partition(p, param) { "Empty" ]; } - var d = param.d; - var v = param.v; - var match = partition(p, param.l); - var lf = match[1]; - var lt = match[0]; - var pvd = Curry._2(p, v, d); - var match$1 = partition(p, param.r); - var rf = match$1[1]; - var rt = match$1[0]; + let d = param.d; + let v = param.v; + let match = partition(p, param.l); + let lf = match[1]; + let lt = match[0]; + let pvd = Curry._2(p, v, d); + let match$1 = partition(p, param.r); + let rf = match$1[1]; + let rt = match$1[0]; if (pvd) { return [ join(lt, v, d, rt), @@ -845,8 +845,8 @@ function partition(p, param) { function cons_enum(_m, _e) { while(true) { - var e = _e; - var m = _m; + let e = _e; + let m = _m; if (typeof m !== "object") { return e; } @@ -863,11 +863,11 @@ function cons_enum(_m, _e) { } function compare(cmp, m1, m2) { - var _e1 = cons_enum(m1, "End"); - var _e2 = cons_enum(m2, "End"); + let _e1 = cons_enum(m1, "End"); + let _e2 = cons_enum(m2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return 0; @@ -878,11 +878,11 @@ function compare(cmp, m1, m2) { if (typeof e2 !== "object") { return 1; } - var c = Caml.int_compare(e1._0, e2._0); + let c = Caml.int_compare(e1._0, e2._0); if (c !== 0) { return c; } - var c$1 = Curry._2(cmp, e1._1, e2._1); + let c$1 = Curry._2(cmp, e1._1, e2._1); if (c$1 !== 0) { return c$1; } @@ -893,11 +893,11 @@ function compare(cmp, m1, m2) { } function equal(cmp, m1, m2) { - var _e1 = cons_enum(m1, "End"); - var _e2 = cons_enum(m2, "End"); + let _e1 = cons_enum(m1, "End"); + let _e2 = cons_enum(m2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return true; @@ -930,8 +930,8 @@ function cardinal(param) { function bindings_aux(_accu, _param) { while(true) { - var param = _param; - var accu = _accu; + let param = _param; + let accu = _accu; if (typeof param !== "object") { return accu; } @@ -951,7 +951,7 @@ function bindings(s) { return bindings_aux(/* [] */0, s); } -var IntMap = { +let IntMap = { empty: "Empty", is_empty: is_empty, mem: mem, @@ -989,11 +989,11 @@ var IntMap = { }; function assertion_test(param) { - var m = "Empty"; - for(var i = 0; i <= 1000000; ++i){ + let m = "Empty"; + for(let i = 0; i <= 1000000; ++i){ m = add(i, i, m); } - for(var i$1 = 0; i$1 <= 1000000; ++i$1){ + for(let i$1 = 0; i$1 <= 1000000; ++i$1){ find(i$1, m); } } diff --git a/jscomp/test/test_functor_dead_code.js b/jscomp/test/test_functor_dead_code.js index ed299476ec..4e308ce038 100644 --- a/jscomp/test/test_functor_dead_code.js +++ b/jscomp/test/test_functor_dead_code.js @@ -2,7 +2,7 @@ 'use strict'; -var v = true; +let v = true; exports.v = v; /* No side effect */ diff --git a/jscomp/test/test_generative_module.js b/jscomp/test/test_generative_module.js index 07ca4a688a..32bc06daed 100644 --- a/jscomp/test/test_generative_module.js +++ b/jscomp/test/test_generative_module.js @@ -8,7 +8,7 @@ function M($star) { }; } -var V = { +let V = { v: 3 }; diff --git a/jscomp/test/test_global_print.js b/jscomp/test/test_global_print.js index 8aa92d7de3..61ef2a3e26 100644 --- a/jscomp/test/test_global_print.js +++ b/jscomp/test/test_global_print.js @@ -2,17 +2,17 @@ 'use strict'; -var List = { +let List = { u: 3 }; -var X = { +let X = { List: List }; -var Hashtbl; +let Hashtbl; -var V; +let V; exports.X = X; exports.Hashtbl = Hashtbl; diff --git a/jscomp/test/test_google_closure.js b/jscomp/test/test_google_closure.js index bd144a4517..77f3725de3 100644 --- a/jscomp/test/test_google_closure.js +++ b/jscomp/test/test_google_closure.js @@ -1,8 +1,8 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var $$Array = require("../../lib/js/array.js"); -var Caml_array = require("../../lib/js/caml_array.js"); +let $$Array = require("../../lib/js/array.js"); +let Caml_array = require("../../lib/js/caml_array.js"); function f(a, b, param) { return a + b | 0; @@ -14,15 +14,15 @@ function f2(a) { }; } -var a = String(3); +let a = String(3); -var b = 101; +let b = 101; -var arr = $$Array.init(2, (function (param) { +let arr = $$Array.init(2, (function (param) { return 0; })); -for(var i = 0; i <= 1; ++i){ +for(let i = 0; i <= 1; ++i){ Caml_array.set(arr, i, i + 1 | 0); } @@ -32,7 +32,7 @@ console.log([ arr ]); -var c = arr; +let c = arr; exports.f = f; exports.f2 = f2; diff --git a/jscomp/test/test_include.js b/jscomp/test/test_include.js index 03969ae618..5c1bb8b227 100644 --- a/jscomp/test/test_include.js +++ b/jscomp/test/test_include.js @@ -1,149 +1,149 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var List = require("../../lib/js/list.js"); -var $$String = require("../../lib/js/string.js"); -var Test_order = require("./test_order.js"); +let List = require("../../lib/js/list.js"); +let $$String = require("../../lib/js/string.js"); +let Test_order = require("./test_order.js"); function Make(U) { - var compare = U.compare; + let compare = U.compare; return { compare: compare, v: compare }; } -var X = { +let X = { compare: $$String.compare, v: $$String.compare }; -var U = { +let U = { compare: Test_order.compare, v: Test_order.compare }; -var N; +let N; -var v = List.length; +let v = List.length; -var N0; +let N0; -var N1; +let N1; -var N2; +let N2; -var N3; +let N3; -var N4; +let N4; -var N5; +let N5; -var N6; +let N6; -var length = List.length; +let length = List.length; -var compare_lengths = List.compare_lengths; +let compare_lengths = List.compare_lengths; -var compare_length_with = List.compare_length_with; +let compare_length_with = List.compare_length_with; -var cons = List.cons; +let cons = List.cons; -var hd = List.hd; +let hd = List.hd; -var tl = List.tl; +let tl = List.tl; -var nth = List.nth; +let nth = List.nth; -var nth_opt = List.nth_opt; +let nth_opt = List.nth_opt; -var rev = List.rev; +let rev = List.rev; -var init = List.init; +let init = List.init; -var append = List.append; +let append = List.append; -var rev_append = List.rev_append; +let rev_append = List.rev_append; -var concat = List.concat; +let concat = List.concat; -var flatten = List.flatten; +let flatten = List.flatten; -var iter = List.iter; +let iter = List.iter; -var iteri = List.iteri; +let iteri = List.iteri; -var map = List.map; +let map = List.map; -var mapi = List.mapi; +let mapi = List.mapi; -var rev_map = List.rev_map; +let rev_map = List.rev_map; -var fold_left = List.fold_left; +let fold_left = List.fold_left; -var fold_right = List.fold_right; +let fold_right = List.fold_right; -var iter2 = List.iter2; +let iter2 = List.iter2; -var map2 = List.map2; +let map2 = List.map2; -var rev_map2 = List.rev_map2; +let rev_map2 = List.rev_map2; -var fold_left2 = List.fold_left2; +let fold_left2 = List.fold_left2; -var fold_right2 = List.fold_right2; +let fold_right2 = List.fold_right2; -var for_all = List.for_all; +let for_all = List.for_all; -var exists = List.exists; +let exists = List.exists; -var for_all2 = List.for_all2; +let for_all2 = List.for_all2; -var exists2 = List.exists2; +let exists2 = List.exists2; -var mem = List.mem; +let mem = List.mem; -var memq = List.memq; +let memq = List.memq; -var find = List.find; +let find = List.find; -var find_opt = List.find_opt; +let find_opt = List.find_opt; -var filter = List.filter; +let filter = List.filter; -var find_all = List.find_all; +let find_all = List.find_all; -var partition = List.partition; +let partition = List.partition; -var assoc = List.assoc; +let assoc = List.assoc; -var assoc_opt = List.assoc_opt; +let assoc_opt = List.assoc_opt; -var assq = List.assq; +let assq = List.assq; -var assq_opt = List.assq_opt; +let assq_opt = List.assq_opt; -var mem_assoc = List.mem_assoc; +let mem_assoc = List.mem_assoc; -var mem_assq = List.mem_assq; +let mem_assq = List.mem_assq; -var remove_assoc = List.remove_assoc; +let remove_assoc = List.remove_assoc; -var remove_assq = List.remove_assq; +let remove_assq = List.remove_assq; -var split = List.split; +let split = List.split; -var combine = List.combine; +let combine = List.combine; -var sort = List.sort; +let sort = List.sort; -var stable_sort = List.stable_sort; +let stable_sort = List.stable_sort; -var fast_sort = List.fast_sort; +let fast_sort = List.fast_sort; -var sort_uniq = List.sort_uniq; +let sort_uniq = List.sort_uniq; -var merge = List.merge; +let merge = List.merge; exports.N = N; exports.v = v; diff --git a/jscomp/test/test_incr_ref.js b/jscomp/test/test_incr_ref.js index b0e40db379..4640d055fa 100644 --- a/jscomp/test/test_incr_ref.js +++ b/jscomp/test/test_incr_ref.js @@ -2,11 +2,11 @@ 'use strict'; -var u = 0; +let u = 0; u = u + 1 | 0; -var v; +let v; exports.v = v; /* v Not a pure module */ diff --git a/jscomp/test/test_int_map_find.js b/jscomp/test/test_int_map_find.js index 73474c7326..1507df4117 100644 --- a/jscomp/test/test_int_map_find.js +++ b/jscomp/test/test_int_map_find.js @@ -1,8 +1,8 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml = require("../../lib/js/caml.js"); -var List = require("../../lib/js/list.js"); +let Caml = require("../../lib/js/caml.js"); +let List = require("../../lib/js/list.js"); function height(param) { if (typeof param !== "object") { @@ -13,8 +13,8 @@ function height(param) { } function create(l, x, d, r) { - var hl = height(l); - var hr = height(r); + let hl = height(l); + let hr = height(r); return { TAG: "Node", l: l, @@ -26,9 +26,9 @@ function create(l, x, d, r) { } function bal(l, x, d, r) { - var hl; + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -38,10 +38,10 @@ function bal(l, x, d, r) { Error: new Error() }; } - var lr = l.r; - var ld = l.d; - var lv = l.v; - var ll = l.l; + let lr = l.r; + let ld = l.d; + let lv = l.v; + let ll = l.l; if (height(ll) >= height(lr)) { return create(ll, lv, ld, create(lr, x, d, r)); } @@ -71,10 +71,10 @@ function bal(l, x, d, r) { Error: new Error() }; } - var rr = r.r; - var rd = r.d; - var rv = r.v; - var rl = r.l; + let rr = r.r; + let rd = r.d; + let rv = r.v; + let rl = r.l; if (height(rr) >= height(rl)) { return create(create(l, x, d, rl), rv, rd, rr); } @@ -99,11 +99,11 @@ function add(x, data, param) { h: 1 }; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Caml.int_compare(x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Caml.int_compare(x, v); if (c === 0) { if (d === data) { return param; @@ -119,14 +119,14 @@ function add(x, data, param) { } } if (c < 0) { - var ll = add(x, data, l); + let ll = add(x, data, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = add(x, data, r); + let rr = add(x, data, r); if (r === rr) { return param; } else { diff --git a/jscomp/test/test_is_js.js b/jscomp/test/test_is_js.js index 19bec0536f..e2787bd5e4 100644 --- a/jscomp/test/test_is_js.js +++ b/jscomp/test/test_is_js.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; diff --git a/jscomp/test/test_js_ffi.js b/jscomp/test/test_js_ffi.js index 15ce496181..896eb7957f 100644 --- a/jscomp/test/test_js_ffi.js +++ b/jscomp/test/test_js_ffi.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var $$String = require("../../lib/js/string.js"); +let $$String = require("../../lib/js/string.js"); function v(u) { t({ @@ -13,7 +13,7 @@ function u(v) { return v; } -var s = $$String; +let s = $$String; exports.v = v; exports.u = u; diff --git a/jscomp/test/test_let.js b/jscomp/test/test_let.js index 364420ba74..18822f9a11 100644 --- a/jscomp/test/test_let.js +++ b/jscomp/test/test_let.js @@ -4,7 +4,7 @@ console.log(String(3)); -var b = 3; +let b = 3; exports.b = b; /* Not a pure module */ diff --git a/jscomp/test/test_list.js b/jscomp/test/test_list.js index 88a663e704..672586cfc8 100644 --- a/jscomp/test/test_list.js +++ b/jscomp/test/test_list.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var List = require("../../lib/js/list.js"); -var Curry = require("../../lib/js/curry.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Pervasives = require("../../lib/js/pervasives.js"); +let List = require("../../lib/js/list.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Pervasives = require("../../lib/js/pervasives.js"); function length_aux(_len, _x) { while(true) { - var x = _x; - var len = _len; + let x = _x; + let len = _len; if (!x) { return len; } @@ -53,11 +53,11 @@ function nth(l, n) { Error: new Error() }; } - var _l = l; - var _n = n; + let _l = l; + let _n = n; while(true) { - var n$1 = _n; - var l$1 = _l; + let n$1 = _n; + let l$1 = _l; if (l$1) { if (n$1 === 0) { return l$1.hd; @@ -76,8 +76,8 @@ function nth(l, n) { function rev_append(_l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { return l2; } @@ -106,7 +106,7 @@ function map(f, x) { if (!x) { return /* [] */0; } - var r = Curry._1(f, x.hd); + let r = Curry._1(f, x.hd); return { hd: r, tl: map(f, x.tl) @@ -117,7 +117,7 @@ function mapi(i, f, x) { if (!x) { return /* [] */0; } - var r = Curry._2(f, i, x.hd); + let r = Curry._2(f, i, x.hd); return { hd: r, tl: mapi(i + 1 | 0, f, x.tl) @@ -129,11 +129,11 @@ function mapi$1(f, l) { } function rev_map(f, l) { - var _accu = /* [] */0; - var _x = l; + let _accu = /* [] */0; + let _x = l; while(true) { - var x = _x; - var accu = _accu; + let x = _x; + let accu = _accu; if (!x) { return accu; } @@ -148,7 +148,7 @@ function rev_map(f, l) { function iter(f, _x) { while(true) { - var x = _x; + let x = _x; if (!x) { return; } @@ -159,11 +159,11 @@ function iter(f, _x) { } function iteri(f, l) { - var _i = 0; - var _x = l; + let _i = 0; + let _x = l; while(true) { - var x = _x; - var i = _i; + let x = _x; + let i = _i; if (!x) { return; } @@ -176,8 +176,8 @@ function iteri(f, l) { function fold_left(f, _accu, _l) { while(true) { - var l = _l; - var accu = _accu; + let l = _l; + let accu = _accu; if (!l) { return accu; } @@ -198,7 +198,7 @@ function fold_right(f, l, accu) { function map2(f, l1, l2) { if (l1) { if (l2) { - var r = Curry._2(f, l1.hd, l2.hd); + let r = Curry._2(f, l1.hd, l2.hd); return { hd: r, tl: map2(f, l1.tl, l2.tl) @@ -221,13 +221,13 @@ function map2(f, l1, l2) { } function rev_map2(f, l1, l2) { - var _accu = /* [] */0; - var _l1 = l1; - var _l2 = l2; + let _accu = /* [] */0; + let _l1 = l1; + let _l2 = l2; while(true) { - var l2$1 = _l2; - var l1$1 = _l1; - var accu = _accu; + let l2$1 = _l2; + let l1$1 = _l1; + let accu = _accu; if (l1$1) { if (l2$1) { _l2 = l2$1.tl; @@ -257,8 +257,8 @@ function rev_map2(f, l1, l2) { function iter2(f, _l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (l1) { if (l2) { Curry._2(f, l1.hd, l2.hd); @@ -285,9 +285,9 @@ function iter2(f, _l1, _l2) { function fold_left2(f, _accu, _l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; - var accu = _accu; + let l2 = _l2; + let l1 = _l1; + let accu = _accu; if (l1) { if (l2) { _l2 = l2.tl; @@ -335,7 +335,7 @@ function fold_right2(f, l1, l2, accu) { function for_all(p, _x) { while(true) { - var x = _x; + let x = _x; if (!x) { return true; } @@ -349,7 +349,7 @@ function for_all(p, _x) { function exists(p, _x) { while(true) { - var x = _x; + let x = _x; if (!x) { return false; } @@ -363,8 +363,8 @@ function exists(p, _x) { function for_all2(p, _l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (l1) { if (l2) { if (!Curry._2(p, l1.hd, l2.hd)) { @@ -393,8 +393,8 @@ function for_all2(p, _l1, _l2) { function exists2(p, _l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (l1) { if (l2) { if (Curry._2(p, l1.hd, l2.hd)) { @@ -423,7 +423,7 @@ function exists2(p, _l1, _l2) { function mem(x, _x_) { while(true) { - var x_ = _x_; + let x_ = _x_; if (!x_) { return false; } @@ -437,7 +437,7 @@ function mem(x, _x_) { function memq(x, _x_) { while(true) { - var x_ = _x_; + let x_ = _x_; if (!x_) { return false; } @@ -451,9 +451,9 @@ function memq(x, _x_) { function assoc(x, _x_) { while(true) { - var x_ = _x_; + let x_ = _x_; if (x_) { - var match = x_.hd; + let match = x_.hd; if (Caml_obj.equal(match[0], x)) { return match[1]; } @@ -469,9 +469,9 @@ function assoc(x, _x_) { function assq(x, _x_) { while(true) { - var x_ = _x_; + let x_ = _x_; if (x_) { - var match = x_.hd; + let match = x_.hd; if (match[0] === x) { return match[1]; } @@ -487,7 +487,7 @@ function assq(x, _x_) { function mem_assoc(x, _x_) { while(true) { - var x_ = _x_; + let x_ = _x_; if (!x_) { return false; } @@ -501,7 +501,7 @@ function mem_assoc(x, _x_) { function mem_assq(x, _x_) { while(true) { - var x_ = _x_; + let x_ = _x_; if (!x_) { return false; } @@ -517,8 +517,8 @@ function remove_assoc(x, x_) { if (!x_) { return /* [] */0; } - var l = x_.tl; - var pair = x_.hd; + let l = x_.tl; + let pair = x_.hd; if (Caml_obj.equal(pair[0], x)) { return l; } else { @@ -533,8 +533,8 @@ function remove_assq(x, x_) { if (!x_) { return /* [] */0; } - var l = x_.tl; - var pair = x_.hd; + let l = x_.tl; + let pair = x_.hd; if (pair[0] === x) { return l; } else { @@ -547,9 +547,9 @@ function remove_assq(x, x_) { function find(p, _x) { while(true) { - var x = _x; + let x = _x; if (x) { - var x$1 = x.hd; + let x$1 = x.hd; if (Curry._1(p, x$1)) { return x$1; } @@ -565,16 +565,16 @@ function find(p, _x) { function find_all(p) { return function (param) { - var _accu = /* [] */0; - var _x = param; + let _accu = /* [] */0; + let _x = param; while(true) { - var x = _x; - var accu = _accu; + let x = _x; + let accu = _accu; if (!x) { return rev_append(accu, /* [] */0); } - var l = x.tl; - var x$1 = x.hd; + let l = x.tl; + let x$1 = x.hd; if (Curry._1(p, x$1)) { _x = l; _accu = { @@ -590,21 +590,21 @@ function find_all(p) { } function partition(p, l) { - var _yes = /* [] */0; - var _no = /* [] */0; - var _x = l; + let _yes = /* [] */0; + let _no = /* [] */0; + let _x = l; while(true) { - var x = _x; - var no = _no; - var yes = _yes; + let x = _x; + let no = _no; + let yes = _yes; if (!x) { return [ rev_append(yes, /* [] */0), rev_append(no, /* [] */0) ]; } - var l$1 = x.tl; - var x$1 = x.hd; + let l$1 = x.tl; + let x$1 = x.hd; if (Curry._1(p, x$1)) { _x = l$1; _yes = { @@ -629,8 +629,8 @@ function split(x) { /* [] */0 ]; } - var match = x.hd; - var match$1 = split(x.tl); + let match = x.hd; + let match$1 = split(x.tl); return [ { hd: match[0], @@ -677,8 +677,8 @@ function merge(cmp, l1, l2) { if (!l2) { return l1; } - var h2 = l2.hd; - var h1 = l1.hd; + let h2 = l2.hd; + let h1 = l1.hd; if (Curry._2(cmp, h1, h2) <= 0) { return { hd: h1, @@ -694,8 +694,8 @@ function merge(cmp, l1, l2) { function chop(_k, _l) { while(true) { - var l = _l; - var k = _k; + let l = _l; + let k = _k; if (k === 0) { return l; } @@ -717,16 +717,16 @@ function chop(_k, _l) { } function stable_sort(cmp, l) { - var sort = function (n, l) { + let sort = function (n, l) { if (n !== 2) { if (n === 3 && l) { - var match = l.tl; + let match = l.tl; if (match) { - var match$1 = match.tl; + let match$1 = match.tl; if (match$1) { - var x3 = match$1.hd; - var x2 = match.hd; - var x1 = l.hd; + let x3 = match$1.hd; + let x2 = match.hd; + let x1 = l.hd; if (Curry._2(cmp, x1, x2) <= 0) { if (Curry._2(cmp, x2, x3) <= 0) { return { @@ -803,10 +803,10 @@ function stable_sort(cmp, l) { } } else if (l) { - var match$2 = l.tl; + let match$2 = l.tl; if (match$2) { - var x2$1 = match$2.hd; - var x1$1 = l.hd; + let x2$1 = match$2.hd; + let x1$1 = l.hd; if (Curry._2(cmp, x1$1, x2$1) <= 0) { return { hd: x1$1, @@ -827,26 +827,26 @@ function stable_sort(cmp, l) { } } - var n1 = (n >> 1); - var n2 = n - n1 | 0; - var l2 = chop(n1, l); - var s1 = rev_sort(n1, l); - var s2 = rev_sort(n2, l2); - var _l1 = s1; - var _l2 = s2; - var _accu = /* [] */0; + let n1 = (n >> 1); + let n2 = n - n1 | 0; + let l2 = chop(n1, l); + let s1 = rev_sort(n1, l); + let s2 = rev_sort(n2, l2); + let _l1 = s1; + let _l2 = s2; + let _accu = /* [] */0; while(true) { - var accu = _accu; - var l2$1 = _l2; - var l1 = _l1; + let accu = _accu; + let l2$1 = _l2; + let l1 = _l1; if (!l1) { return rev_append(l2$1, accu); } if (!l2$1) { return rev_append(l1, accu); } - var h2 = l2$1.hd; - var h1 = l1.hd; + let h2 = l2$1.hd; + let h1 = l1.hd; if (Curry._2(cmp, h1, h2) > 0) { _accu = { hd: h1, @@ -863,16 +863,16 @@ function stable_sort(cmp, l) { continue ; }; }; - var rev_sort = function (n, l) { + let rev_sort = function (n, l) { if (n !== 2) { if (n === 3 && l) { - var match = l.tl; + let match = l.tl; if (match) { - var match$1 = match.tl; + let match$1 = match.tl; if (match$1) { - var x3 = match$1.hd; - var x2 = match.hd; - var x1 = l.hd; + let x3 = match$1.hd; + let x2 = match.hd; + let x1 = l.hd; if (Curry._2(cmp, x1, x2) > 0) { if (Curry._2(cmp, x2, x3) > 0) { return { @@ -949,10 +949,10 @@ function stable_sort(cmp, l) { } } else if (l) { - var match$2 = l.tl; + let match$2 = l.tl; if (match$2) { - var x2$1 = match$2.hd; - var x1$1 = l.hd; + let x2$1 = match$2.hd; + let x1$1 = l.hd; if (Curry._2(cmp, x1$1, x2$1) > 0) { return { hd: x1$1, @@ -973,26 +973,26 @@ function stable_sort(cmp, l) { } } - var n1 = (n >> 1); - var n2 = n - n1 | 0; - var l2 = chop(n1, l); - var s1 = sort(n1, l); - var s2 = sort(n2, l2); - var _l1 = s1; - var _l2 = s2; - var _accu = /* [] */0; + let n1 = (n >> 1); + let n2 = n - n1 | 0; + let l2 = chop(n1, l); + let s1 = sort(n1, l); + let s2 = sort(n2, l2); + let _l1 = s1; + let _l2 = s2; + let _accu = /* [] */0; while(true) { - var accu = _accu; - var l2$1 = _l2; - var l1 = _l1; + let accu = _accu; + let l2$1 = _l2; + let l1 = _l1; if (!l1) { return rev_append(l2$1, accu); } if (!l2$1) { return rev_append(l1, accu); } - var h2 = l2$1.hd; - var h1 = l1.hd; + let h2 = l2$1.hd; + let h1 = l1.hd; if (Curry._2(cmp, h1, h2) <= 0) { _accu = { hd: h1, @@ -1009,7 +1009,7 @@ function stable_sort(cmp, l) { continue ; }; }; - var len = length_aux(0, l); + let len = length_aux(0, l); if (len < 2) { return l; } else { @@ -1018,19 +1018,19 @@ function stable_sort(cmp, l) { } function sort_uniq(cmp, l) { - var sort = function (n, l) { + let sort = function (n, l) { if (n !== 2) { if (n === 3 && l) { - var match = l.tl; + let match = l.tl; if (match) { - var match$1 = match.tl; + let match$1 = match.tl; if (match$1) { - var x3 = match$1.hd; - var x2 = match.hd; - var x1 = l.hd; - var c = Curry._2(cmp, x1, x2); + let x3 = match$1.hd; + let x2 = match.hd; + let x1 = l.hd; + let c = Curry._2(cmp, x1, x2); if (c === 0) { - var c$1 = Curry._2(cmp, x2, x3); + let c$1 = Curry._2(cmp, x2, x3); if (c$1 === 0) { return { hd: x2, @@ -1055,7 +1055,7 @@ function sort_uniq(cmp, l) { } } if (c < 0) { - var c$2 = Curry._2(cmp, x2, x3); + let c$2 = Curry._2(cmp, x2, x3); if (c$2 === 0) { return { hd: x1, @@ -1077,7 +1077,7 @@ function sort_uniq(cmp, l) { } }; } - var c$3 = Curry._2(cmp, x1, x3); + let c$3 = Curry._2(cmp, x1, x3); if (c$3 === 0) { return { hd: x1, @@ -1110,7 +1110,7 @@ function sort_uniq(cmp, l) { }; } } - var c$4 = Curry._2(cmp, x1, x3); + let c$4 = Curry._2(cmp, x1, x3); if (c$4 === 0) { return { hd: x2, @@ -1132,7 +1132,7 @@ function sort_uniq(cmp, l) { } }; } - var c$5 = Curry._2(cmp, x2, x3); + let c$5 = Curry._2(cmp, x2, x3); if (c$5 === 0) { return { hd: x2, @@ -1171,11 +1171,11 @@ function sort_uniq(cmp, l) { } } else if (l) { - var match$2 = l.tl; + let match$2 = l.tl; if (match$2) { - var x2$1 = match$2.hd; - var x1$1 = l.hd; - var c$6 = Curry._2(cmp, x1$1, x2$1); + let x2$1 = match$2.hd; + let x1$1 = l.hd; + let c$6 = Curry._2(cmp, x1$1, x2$1); if (c$6 === 0) { return { hd: x1$1, @@ -1201,29 +1201,29 @@ function sort_uniq(cmp, l) { } } - var n1 = (n >> 1); - var n2 = n - n1 | 0; - var l2 = chop(n1, l); - var s1 = rev_sort(n1, l); - var s2 = rev_sort(n2, l2); - var _l1 = s1; - var _l2 = s2; - var _accu = /* [] */0; + let n1 = (n >> 1); + let n2 = n - n1 | 0; + let l2 = chop(n1, l); + let s1 = rev_sort(n1, l); + let s2 = rev_sort(n2, l2); + let _l1 = s1; + let _l2 = s2; + let _accu = /* [] */0; while(true) { - var accu = _accu; - var l2$1 = _l2; - var l1 = _l1; + let accu = _accu; + let l2$1 = _l2; + let l1 = _l1; if (!l1) { return rev_append(l2$1, accu); } if (!l2$1) { return rev_append(l1, accu); } - var t2 = l2$1.tl; - var h2 = l2$1.hd; - var t1 = l1.tl; - var h1 = l1.hd; - var c$7 = Curry._2(cmp, h1, h2); + let t2 = l2$1.tl; + let h2 = l2$1.hd; + let t1 = l1.tl; + let h1 = l1.hd; + let c$7 = Curry._2(cmp, h1, h2); if (c$7 === 0) { _accu = { hd: h1, @@ -1249,19 +1249,19 @@ function sort_uniq(cmp, l) { continue ; }; }; - var rev_sort = function (n, l) { + let rev_sort = function (n, l) { if (n !== 2) { if (n === 3 && l) { - var match = l.tl; + let match = l.tl; if (match) { - var match$1 = match.tl; + let match$1 = match.tl; if (match$1) { - var x3 = match$1.hd; - var x2 = match.hd; - var x1 = l.hd; - var c = Curry._2(cmp, x1, x2); + let x3 = match$1.hd; + let x2 = match.hd; + let x1 = l.hd; + let c = Curry._2(cmp, x1, x2); if (c === 0) { - var c$1 = Curry._2(cmp, x2, x3); + let c$1 = Curry._2(cmp, x2, x3); if (c$1 === 0) { return { hd: x2, @@ -1286,7 +1286,7 @@ function sort_uniq(cmp, l) { } } if (c > 0) { - var c$2 = Curry._2(cmp, x2, x3); + let c$2 = Curry._2(cmp, x2, x3); if (c$2 === 0) { return { hd: x1, @@ -1308,7 +1308,7 @@ function sort_uniq(cmp, l) { } }; } - var c$3 = Curry._2(cmp, x1, x3); + let c$3 = Curry._2(cmp, x1, x3); if (c$3 === 0) { return { hd: x1, @@ -1341,7 +1341,7 @@ function sort_uniq(cmp, l) { }; } } - var c$4 = Curry._2(cmp, x1, x3); + let c$4 = Curry._2(cmp, x1, x3); if (c$4 === 0) { return { hd: x2, @@ -1363,7 +1363,7 @@ function sort_uniq(cmp, l) { } }; } - var c$5 = Curry._2(cmp, x2, x3); + let c$5 = Curry._2(cmp, x2, x3); if (c$5 === 0) { return { hd: x2, @@ -1402,11 +1402,11 @@ function sort_uniq(cmp, l) { } } else if (l) { - var match$2 = l.tl; + let match$2 = l.tl; if (match$2) { - var x2$1 = match$2.hd; - var x1$1 = l.hd; - var c$6 = Curry._2(cmp, x1$1, x2$1); + let x2$1 = match$2.hd; + let x1$1 = l.hd; + let c$6 = Curry._2(cmp, x1$1, x2$1); if (c$6 === 0) { return { hd: x1$1, @@ -1432,29 +1432,29 @@ function sort_uniq(cmp, l) { } } - var n1 = (n >> 1); - var n2 = n - n1 | 0; - var l2 = chop(n1, l); - var s1 = sort(n1, l); - var s2 = sort(n2, l2); - var _l1 = s1; - var _l2 = s2; - var _accu = /* [] */0; + let n1 = (n >> 1); + let n2 = n - n1 | 0; + let l2 = chop(n1, l); + let s1 = sort(n1, l); + let s2 = sort(n2, l2); + let _l1 = s1; + let _l2 = s2; + let _accu = /* [] */0; while(true) { - var accu = _accu; - var l2$1 = _l2; - var l1 = _l1; + let accu = _accu; + let l2$1 = _l2; + let l1 = _l1; if (!l1) { return rev_append(l2$1, accu); } if (!l2$1) { return rev_append(l1, accu); } - var t2 = l2$1.tl; - var h2 = l2$1.hd; - var t1 = l1.tl; - var h1 = l1.hd; - var c$7 = Curry._2(cmp, h1, h2); + let t2 = l2$1.tl; + let h2 = l2$1.hd; + let t1 = l1.tl; + let h1 = l1.hd; + let c$7 = Curry._2(cmp, h1, h2); if (c$7 === 0) { _accu = { hd: h1, @@ -1480,7 +1480,7 @@ function sort_uniq(cmp, l) { continue ; }; }; - var len = length_aux(0, l); + let len = length_aux(0, l); if (len < 2) { return l; } else { @@ -1488,17 +1488,17 @@ function sort_uniq(cmp, l) { } } -var u = List.length; +let u = List.length; -var append = Pervasives.$at; +let append = Pervasives.$at; -var concat = flatten; +let concat = flatten; -var filter = find_all; +let filter = find_all; -var sort = stable_sort; +let sort = stable_sort; -var fast_sort = stable_sort; +let fast_sort = stable_sort; exports.u = u; exports.length_aux = length_aux; diff --git a/jscomp/test/test_literal.js b/jscomp/test/test_literal.js index ba37619bfa..d83f67d7df 100644 --- a/jscomp/test/test_literal.js +++ b/jscomp/test/test_literal.js @@ -1,23 +1,23 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var Custom_inline = /* @__PURE__ */Caml_exceptions.create("Test_literal.Custom_inline"); +let Custom_inline = /* @__PURE__ */Caml_exceptions.create("Test_literal.Custom_inline"); -var v = { +let v = { RE_EXN_ID: Custom_inline, _1: 1, _2: 2 }; -var vv = [ +let vv = [ 1, 2, 3 ]; -var long_v = [ +let long_v = [ 1, 2, 3, @@ -26,7 +26,7 @@ var long_v = [ 6 ]; -var long_int_v = [ +let long_int_v = [ 1, 2, 3, @@ -35,9 +35,9 @@ var long_int_v = [ 6 ]; -var short_int_v = [1]; +let short_int_v = [1]; -var empty = []; +let empty = []; exports.Custom_inline = Custom_inline; exports.v = v; diff --git a/jscomp/test/test_literals.js b/jscomp/test/test_literals.js index 0c9081d2bb..bb9b374c58 100644 --- a/jscomp/test/test_literals.js +++ b/jscomp/test/test_literals.js @@ -2,11 +2,11 @@ 'use strict'; -var node_modules_length = "node_modules".length; +let node_modules_length = "node_modules".length; -var node_modules = "node_modules"; +let node_modules = "node_modules"; -var bsconfig_json = "bsconfig.json"; +let bsconfig_json = "bsconfig.json"; exports.node_modules = node_modules; exports.node_modules_length = node_modules_length; diff --git a/jscomp/test/test_match_exception.js b/jscomp/test/test_match_exception.js index bade3d290b..0d55fc6b82 100644 --- a/jscomp/test/test_match_exception.js +++ b/jscomp/test/test_match_exception.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); function f(g, x) { try { return Curry._1(g, x); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { return 3; } diff --git a/jscomp/test/test_mutliple.js b/jscomp/test/test_mutliple.js index 1d1fe0a839..404f57bca2 100644 --- a/jscomp/test/test_mutliple.js +++ b/jscomp/test/test_mutliple.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var List = require("../../lib/js/list.js"); +let List = require("../../lib/js/list.js"); -var f = List.length(/* [] */0); +let f = List.length(/* [] */0); exports.f = f; /* f Not a pure module */ diff --git a/jscomp/test/test_nat64.js b/jscomp/test/test_nat64.js index 7bab9703ae..a09273ff76 100644 --- a/jscomp/test/test_nat64.js +++ b/jscomp/test/test_nat64.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_int64 = require("../../lib/js/caml_int64.js"); +let Caml_int64 = require("../../lib/js/caml_int64.js"); -var v = Caml_int64.zero; +let v = Caml_int64.zero; exports.v = v; /* No side effect */ diff --git a/jscomp/test/test_nested_let.js b/jscomp/test/test_nested_let.js index 57cec0c95a..8c54d12d6e 100644 --- a/jscomp/test/test_nested_let.js +++ b/jscomp/test/test_nested_let.js @@ -2,7 +2,7 @@ 'use strict'; -var v = 68; +let v = 68; exports.v = v; /* No side effect */ diff --git a/jscomp/test/test_nested_print.js b/jscomp/test/test_nested_print.js index fe3e1aa6c7..a7e5bfb8d1 100644 --- a/jscomp/test/test_nested_print.js +++ b/jscomp/test/test_nested_print.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); function u(x, x$1) { return x$1 + x$1 | 0; } function f(g, x) { - var u = Curry._1(g, x); + let u = Curry._1(g, x); return u + u | 0; } diff --git a/jscomp/test/test_order.js b/jscomp/test/test_order.js index 78fd323c8e..802634ad67 100644 --- a/jscomp/test/test_order.js +++ b/jscomp/test/test_order.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml = require("../../lib/js/caml.js"); +let Caml = require("../../lib/js/caml.js"); -var compare = Caml.int_compare; +let compare = Caml.int_compare; exports.compare = compare; /* No side effect */ diff --git a/jscomp/test/test_order_tailcall.js b/jscomp/test/test_order_tailcall.js index 93bc5b29c8..62e9bae434 100644 --- a/jscomp/test/test_order_tailcall.js +++ b/jscomp/test/test_order_tailcall.js @@ -4,8 +4,8 @@ function f(_x, _y) { while(true) { - var y = _y; - var x = _x; + let y = _y; + let x = _x; _y = x; _x = y; continue ; @@ -14,9 +14,9 @@ function f(_x, _y) { function f1(_x, _y, _z) { while(true) { - var z = _z; - var y = _y; - var x = _x; + let z = _z; + let y = _y; + let x = _x; console.log(z); _z = x; _y = z; @@ -27,7 +27,7 @@ function f1(_x, _y, _z) { function f2(x, _y) { while(true) { - var y = _y; + let y = _y; _y = y + 10 | 0; continue ; }; @@ -35,8 +35,8 @@ function f2(x, _y) { function f3(_x, _y) { while(true) { - var y = _y; - var x = _x; + let y = _y; + let x = _x; _y = x + 10 | 0; _x = y; continue ; @@ -45,8 +45,8 @@ function f3(_x, _y) { function f4(_x, _y) { while(true) { - var y = _y; - var x = _x; + let y = _y; + let x = _x; _y = y + x | 0; _x = x + 10 | 0; continue ; @@ -55,7 +55,7 @@ function f4(_x, _y) { function f5(_x, _y, z) { while(true) { - var y = _y; + let y = _y; _y = z + 20 | 0; _x = y + 10 | 0; continue ; @@ -82,8 +82,8 @@ function f7(b) { function f8(_x, _y) { while(true) { - var y = _y; - var x = _x; + let y = _y; + let x = _x; if (x > 10) { _y = y + 1 | 0; continue ; diff --git a/jscomp/test/test_other_exn.js b/jscomp/test/test_other_exn.js index 3fce1d9e02..b7f43166b4 100644 --- a/jscomp/test/test_other_exn.js +++ b/jscomp/test/test_other_exn.js @@ -6,9 +6,9 @@ function Make($star) { return {}; } -var U = {}; +let U = {}; -var V = {}; +let V = {}; exports.Make = Make; exports.U = U; diff --git a/jscomp/test/test_per.js b/jscomp/test/test_per.js index 4698529b80..9153b2e78c 100644 --- a/jscomp/test/test_per.js +++ b/jscomp/test/test_per.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Caml_sys = require("../../lib/js/caml_sys.js"); -var Caml_bytes = require("../../lib/js/caml_bytes.js"); -var Caml_int64 = require("../../lib/js/caml_int64.js"); -var Caml_format = require("../../lib/js/caml_format.js"); -var Caml_string = require("../../lib/js/caml_string.js"); -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var Caml_external_polyfill = require("../../lib/js/caml_external_polyfill.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Caml_sys = require("../../lib/js/caml_sys.js"); +let Caml_bytes = require("../../lib/js/caml_bytes.js"); +let Caml_int64 = require("../../lib/js/caml_int64.js"); +let Caml_format = require("../../lib/js/caml_format.js"); +let Caml_string = require("../../lib/js/caml_string.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Caml_external_polyfill = require("../../lib/js/caml_external_polyfill.js"); Caml_external_polyfill.resolve("register_named_value")("Pervasives.array_bound_error", { RE_EXN_ID: "Invalid_argument", @@ -32,7 +32,7 @@ function invalid_arg(s) { }; } -var Exit = /* @__PURE__ */Caml_exceptions.create("Test_per.Exit"); +let Exit = /* @__PURE__ */Caml_exceptions.create("Test_per.Exit"); function min(x, y) { if (Caml_obj.lessequal(x, y)) { @@ -62,42 +62,42 @@ function lnot(x) { return x ^ -1; } -var min_int = -2147483648; +let min_int = -2147483648; -var infinity = Caml_int64.float_of_bits([ +let infinity = Caml_int64.float_of_bits([ 2146435072, 0 ]); -var neg_infinity = Caml_int64.float_of_bits([ +let neg_infinity = Caml_int64.float_of_bits([ -1048576, 0 ]); -var nan = Caml_int64.float_of_bits([ +let nan = Caml_int64.float_of_bits([ 2146435072, 1 ]); -var max_float = Caml_int64.float_of_bits([ +let max_float = Caml_int64.float_of_bits([ 2146435071, 4294967295 ]); -var min_float = Caml_int64.float_of_bits([ +let min_float = Caml_int64.float_of_bits([ 1048576, 0 ]); -var epsilon_float = Caml_int64.float_of_bits([ +let epsilon_float = Caml_int64.float_of_bits([ 1018167296, 0 ]); function $caret(s1, s2) { - var l1 = s1.length; - var l2 = s2.length; - var s = Caml_bytes.create(l1 + l2 | 0); + let l1 = s1.length; + let l2 = s2.length; + let s = Caml_bytes.create(l1 + l2 | 0); Caml_external_polyfill.resolve("blit_string")(s1, 0, s, 0, l1); Caml_external_polyfill.resolve("blit_string")(s2, 0, s, l1, l2); return s; @@ -142,14 +142,14 @@ function string_of_int(n) { } function valid_float_lexem(s) { - var l = s.length; - var _i = 0; + let l = s.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i >= l) { return $caret(s, "."); } - var match = Caml_string.get(s, i); + let match = Caml_string.get(s, i); if (match >= 48) { if (match >= 58) { return s; @@ -217,9 +217,9 @@ function open_out_bin(name) { } function flush_all(param) { - var _x = Caml_external_polyfill.resolve("ml_out_channels_list")(); + let _x = Caml_external_polyfill.resolve("ml_out_channels_list")(); while(true) { - var x = _x; + let x = _x; if (!x) { return; } @@ -325,12 +325,12 @@ function input(ic, s, ofs, len) { function unsafe_really_input(ic, s, _ofs, _len) { while(true) { - var len = _len; - var ofs = _ofs; + let len = _len; + let ofs = _ofs; if (len <= 0) { return; } - var r = Caml_external_polyfill.resolve("ml_input")(ic, s, ofs, len); + let r = Caml_external_polyfill.resolve("ml_input")(ic, s, ofs, len); if (r === 0) { throw { RE_EXN_ID: "End_of_file", @@ -355,33 +355,33 @@ function really_input(ic, s, ofs, len) { } function really_input_string(ic, len) { - var s = Caml_bytes.create(len); + let s = Caml_bytes.create(len); really_input(ic, s, 0, len); return s; } function input_line(chan) { - var build_result = function (buf, _pos, _x) { + let build_result = function (buf, _pos, _x) { while(true) { - var x = _x; - var pos = _pos; + let x = _x; + let pos = _pos; if (!x) { return buf; } - var hd = x.hd; - var len = hd.length; + let hd = x.hd; + let len = hd.length; Caml_external_polyfill.resolve("blit_string")(hd, 0, buf, pos - len | 0, len); _x = x.tl; _pos = pos - len | 0; continue ; }; }; - var _accu = /* [] */0; - var _len = 0; + let _accu = /* [] */0; + let _len = 0; while(true) { - var len = _len; - var accu = _accu; - var n = Caml_external_polyfill.resolve("ml_input_scan_line")(chan); + let len = _len; + let accu = _accu; + let n = Caml_external_polyfill.resolve("ml_input_scan_line")(chan); if (n === 0) { if (accu) { return build_result(Caml_bytes.create(len), len, accu); @@ -392,19 +392,19 @@ function input_line(chan) { }; } if (n > 0) { - var res = Caml_bytes.create(n - 1 | 0); + let res = Caml_bytes.create(n - 1 | 0); Caml_external_polyfill.resolve("ml_input")(chan, res, 0, n - 1 | 0); Caml_external_polyfill.resolve("ml_input_char")(chan); if (!accu) { return res; } - var len$1 = (len + n | 0) - 1 | 0; + let len$1 = (len + n | 0) - 1 | 0; return build_result(Caml_bytes.create(len$1), len$1, { hd: res, tl: accu }); } - var beg = Caml_bytes.create(-n | 0); + let beg = Caml_bytes.create(-n | 0); Caml_external_polyfill.resolve("ml_input")(chan, beg, 0, -n | 0); _len = len - n | 0; _accu = { @@ -424,14 +424,14 @@ function close_in_noerr(ic) { } } -var LargeFile = {}; +let LargeFile = {}; -var exit_function = { +let exit_function = { contents: flush_all }; function at_exit(f) { - var g = exit_function.contents; + let g = exit_function.contents; exit_function.contents = (function (param) { Curry._1(f, undefined); Curry._1(g, undefined); @@ -449,7 +449,7 @@ function exit(retcode) { Caml_external_polyfill.resolve("register_named_value")("Pervasives.do_at_exit", do_at_exit); -var max_int = 2147483647; +let max_int = 2147483647; exports.failwith = failwith; exports.invalid_arg = invalid_arg; diff --git a/jscomp/test/test_pervasive.js b/jscomp/test/test_pervasive.js index 128440f3db..7541602d0f 100644 --- a/jscomp/test/test_pervasive.js +++ b/jscomp/test/test_pervasive.js @@ -1,10 +1,10 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var List = require("../../lib/js/list.js"); -var Pervasives = require("../../lib/js/pervasives.js"); +let List = require("../../lib/js/list.js"); +let Pervasives = require("../../lib/js/pervasives.js"); -var Pervasives$1 = { +let Pervasives$1 = { length: List.length, compare_lengths: List.compare_lengths, compare_length_with: List.compare_length_with, @@ -169,7 +169,7 @@ function a18(prim0, prim1) { return Math.pow(prim0, prim1); } -var f = Pervasives.$at; +let f = Pervasives.$at; exports.Pervasives = Pervasives$1; exports.f = f; diff --git a/jscomp/test/test_pervasives2.js b/jscomp/test/test_pervasives2.js index f12c45a171..9af5ab9361 100644 --- a/jscomp/test/test_pervasives2.js +++ b/jscomp/test/test_pervasives2.js @@ -1,11 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var List = require("../../lib/js/list.js"); -var Stack = require("../../lib/js/stack.js"); -var Pervasives = require("../../lib/js/pervasives.js"); +let List = require("../../lib/js/list.js"); +let Stack = require("../../lib/js/stack.js"); +let Pervasives = require("../../lib/js/pervasives.js"); -var List$1 = { +let List$1 = { length: List.length, compare_lengths: List.compare_lengths, compare_length_with: List.compare_length_with, @@ -94,7 +94,7 @@ var List$1 = { valid_float_lexem: Pervasives.valid_float_lexem }; -var U = { +let U = { Empty: Stack.Empty, create: Stack.create, push: Stack.push, @@ -142,11 +142,11 @@ var U = { valid_float_lexem: Pervasives.valid_float_lexem }; -var f = Pervasives.$at; +let f = Pervasives.$at; -var ff = List.length; +let ff = List.length; -var fff = Pervasives.$at; +let fff = Pervasives.$at; exports.List = List$1; exports.U = U; diff --git a/jscomp/test/test_pervasives3.js b/jscomp/test/test_pervasives3.js index c85f0668ad..54254d6967 100644 --- a/jscomp/test/test_pervasives3.js +++ b/jscomp/test/test_pervasives3.js @@ -1,10 +1,10 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var List = require("../../lib/js/list.js"); -var Pervasives = require("../../lib/js/pervasives.js"); +let List = require("../../lib/js/list.js"); +let Pervasives = require("../../lib/js/pervasives.js"); -var Pervasives$1 = { +let Pervasives$1 = { Jsx: Pervasives.Jsx, JsxEvent: Pervasives.JsxEvent, JsxDOM: Pervasives.JsxDOM, @@ -93,7 +93,7 @@ var Pervasives$1 = { merge: List.merge }; -var v = Pervasives.$at; +let v = Pervasives.$at; exports.Pervasives = Pervasives$1; exports.v = v; diff --git a/jscomp/test/test_primitive.js b/jscomp/test/test_primitive.js index b2aa55886e..a61a29b06b 100644 --- a/jscomp/test/test_primitive.js +++ b/jscomp/test/test_primitive.js @@ -1,10 +1,10 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); -var Caml_array = require("../../lib/js/caml_array.js"); -var Caml_string = require("../../lib/js/caml_string.js"); -var CamlinternalLazy = require("../../lib/js/camlinternalLazy.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_array = require("../../lib/js/caml_array.js"); +let Caml_string = require("../../lib/js/caml_string.js"); +let CamlinternalLazy = require("../../lib/js/camlinternalLazy.js"); function a4(prim) { return [ @@ -32,18 +32,18 @@ function a6(prim) { ]; } -var test_float = 3; +let test_float = 3; -var test_abs = Math.abs(3.0); +let test_abs = Math.abs(3.0); -var v = [ +let v = [ 1.0, 2.0 ]; -var xxx = "a"; +let xxx = "a"; -var a = Caml_string.get(xxx, 0); +let a = Caml_string.get(xxx, 0); function u(b) { if (b) { @@ -60,7 +60,7 @@ function f2(h, b, param) { Caml_array.set(v, 1, 3.0); -var unboxed_x = { +let unboxed_x = { u: 0, v: 0 }; @@ -73,26 +73,26 @@ function f(x) { return x.length; } -var is_lazy_force = CamlinternalLazy.force; +let is_lazy_force = CamlinternalLazy.force; function fib(n) { if (n === 0 || n === 1) { return 1; } - var fib1 = fib(n - 1 | 0); - var fib2 = fib(n - 2 | 0); + let fib1 = fib(n - 1 | 0); + let fib2 = fib(n - 2 | 0); return (fib1 + fib2 | 0) + 3 | 0; } -var a0 = "File \"test_primitive.res\", line 25, characters 9-16"; +let a0 = "File \"test_primitive.res\", line 25, characters 9-16"; -var a1 = "Test_primitive"; +let a1 = "Test_primitive"; -var a2 = 27; +let a2 = 27; -var a3 = "Test_primitive"; +let a3 = "Test_primitive"; -var xx = [ +let xx = [ 0, 0 ]; diff --git a/jscomp/test/test_ramification.js b/jscomp/test/test_ramification.js index 3550639525..9065dc4388 100644 --- a/jscomp/test/test_ramification.js +++ b/jscomp/test/test_ramification.js @@ -3,7 +3,7 @@ function ff(x) { - var a; + let a; switch (x) { case "0" : case "1" : @@ -26,28 +26,28 @@ function ff(x) { } function f(x) { - var y; + let y; y = x.TAG === "A" ? 3 : 4; return y + 32 | 0; } function f2(x) { - var v = 0; - var y; + let v = 0; + let y; v = 1; if (x.TAG === "A") { - var z = 33; + let z = 33; y = z + 3 | 0; } else { - var z$1 = 33; + let z$1 = 33; y = z$1 + 4 | 0; } return y + 32 | 0; } function f3(x) { - var v = 0; - var y; + let v = 0; + let y; v = 1; y = x.TAG === "A" ? 3 : 4; return y + 32 | 0; diff --git a/jscomp/test/test_react.js b/jscomp/test/test_react.js index db4ba711f3..b932f17e10 100644 --- a/jscomp/test/test_react.js +++ b/jscomp/test/test_react.js @@ -1,12 +1,12 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var C = require("c"); -var C$1 = require("b/c"); -var Xxx = require("xxx"); -var C$2 = require("a/b/c"); -var React = require("react"); -var ReactDom = require("react-dom"); +let C = require("c"); +let C$1 = require("b/c"); +let Xxx = require("xxx"); +let C$2 = require("a/b/c"); +let React = require("react"); +let ReactDom = require("react-dom"); console.log(32); @@ -30,9 +30,9 @@ function f(param) { C.y(); } -var v; +let v; -var u = 33; +let u = 33; exports.v = v; exports.u = u; diff --git a/jscomp/test/test_regex.js b/jscomp/test/test_regex.js index 7a48b54970..ead1c8fa2d 100644 --- a/jscomp/test/test_regex.js +++ b/jscomp/test/test_regex.js @@ -2,11 +2,11 @@ 'use strict'; -var v = /b/ig; +let v = /b/ig; -var r = /Bucklescript是一个程序语言/; +let r = /Bucklescript是一个程序语言/; -var c = v; +let c = v; exports.v = v; exports.r = r; diff --git a/jscomp/test/test_runtime_encoding.js b/jscomp/test/test_runtime_encoding.js index d2339abd75..e5193310b3 100644 --- a/jscomp/test/test_runtime_encoding.js +++ b/jscomp/test/test_runtime_encoding.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_array = require("../../lib/js/caml_array.js"); +let Caml_array = require("../../lib/js/caml_array.js"); function g(x) { return [ @@ -41,7 +41,7 @@ function aaaa(x) { } function f(x) { - for(var i = 0; i <= 10; ++i){ + for(let i = 0; i <= 10; ++i){ Caml_array.set(x, i, i); } } diff --git a/jscomp/test/test_scope.js b/jscomp/test/test_scope.js index 31ebe6e482..bc5e6b9857 100644 --- a/jscomp/test/test_scope.js +++ b/jscomp/test/test_scope.js @@ -2,9 +2,9 @@ 'use strict'; -var h = x(3); +let h = x(3); -var hh = x(3); +let hh = x(3); function f(x, y) { return x + y; diff --git a/jscomp/test/test_seq.js b/jscomp/test/test_seq.js index dae5da94d3..7ce1b8015b 100644 --- a/jscomp/test/test_seq.js +++ b/jscomp/test/test_seq.js @@ -1,23 +1,23 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Pervasives = require("../../lib/js/pervasives.js"); -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Pervasives = require("../../lib/js/pervasives.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); -var Bad = /* @__PURE__ */Caml_exceptions.create("Test_seq.Bad"); +let Bad = /* @__PURE__ */Caml_exceptions.create("Test_seq.Bad"); -var Help = /* @__PURE__ */Caml_exceptions.create("Test_seq.Help"); +let Help = /* @__PURE__ */Caml_exceptions.create("Test_seq.Help"); -var Stop = /* @__PURE__ */Caml_exceptions.create("Test_seq.Stop"); +let Stop = /* @__PURE__ */Caml_exceptions.create("Test_seq.Stop"); function assoc3(x, _l) { while(true) { - var l = _l; + let l = _l; if (l) { - var match = l.hd; + let match = l.hd; if (Caml_obj.equal(match[0], x)) { return match[1]; } @@ -52,13 +52,13 @@ function f(g, speclist) { } function add_help(speclist) { - var add1; + let add1; try { assoc3("-help", speclist); add1 = /* [] */0; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { add1 = { hd: [ @@ -75,13 +75,13 @@ function add_help(speclist) { throw exn; } } - var add2; + let add2; try { assoc3("--help", speclist); add2 = /* [] */0; } catch (raw_exn$1){ - var exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1); + let exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1); if (exn$1.RE_EXN_ID === "Not_found") { add2 = { hd: [ diff --git a/jscomp/test/test_set.js b/jscomp/test/test_set.js index 2b59bb976b..146772a8d6 100644 --- a/jscomp/test/test_set.js +++ b/jscomp/test/test_set.js @@ -1,21 +1,21 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var List = require("../../lib/js/list.js"); -var Curry = require("../../lib/js/curry.js"); +let List = require("../../lib/js/list.js"); +let Curry = require("../../lib/js/curry.js"); function Make(Ord) { - var height = function (x) { + let height = function (x) { if (typeof x !== "object") { return 0; } else { return x._3; } }; - var create = function (l, v, r) { - var hl; + let create = function (l, v, r) { + let hl; hl = typeof l !== "object" ? 0 : l._3; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r._3; return { TAG: "Node", @@ -25,10 +25,10 @@ function Make(Ord) { _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0 }; }; - var bal = function (l, v, r) { - var hl; + let bal = function (l, v, r) { + let hl; hl = typeof l !== "object" ? 0 : l._3; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r._3; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -38,9 +38,9 @@ function Make(Ord) { Error: new Error() }; } - var lr = l._2; - var lv = l._1; - var ll = l._0; + let lr = l._2; + let lv = l._1; + let ll = l._0; if (height(ll) >= height(lr)) { return create(ll, lv, create(lr, v, r)); } @@ -69,9 +69,9 @@ function Make(Ord) { Error: new Error() }; } - var rr = r._2; - var rv = r._1; - var rl = r._0; + let rr = r._2; + let rv = r._1; + let rl = r._0; if (height(rr) >= height(rl)) { return create(create(l, v, rl), rv, rr); } @@ -84,7 +84,7 @@ function Make(Ord) { Error: new Error() }; }; - var add = function (x, x_) { + let add = function (x, x_) { if (typeof x_ !== "object") { return { TAG: "Node", @@ -94,10 +94,10 @@ function Make(Ord) { _3: 1 }; } - var r = x_._2; - var v = x_._1; - var l = x_._0; - var c = Curry._2(Ord.compare, x, v); + let r = x_._2; + let v = x_._1; + let l = x_._0; + let c = Curry._2(Ord.compare, x, v); if (c === 0) { return x_; } else if (c < 0) { @@ -106,7 +106,7 @@ function Make(Ord) { return bal(l, v, add(x, r)); } }; - var singleton = function (x) { + let singleton = function (x) { return { TAG: "Node", _0: "Empty", @@ -115,29 +115,29 @@ function Make(Ord) { _3: 1 }; }; - var add_min_element = function (v, x) { + let add_min_element = function (v, x) { if (typeof x !== "object") { return singleton(v); } else { return bal(add_min_element(v, x._0), x._1, x._2); } }; - var add_max_element = function (v, x) { + let add_max_element = function (v, x) { if (typeof x !== "object") { return singleton(v); } else { return bal(x._0, x._1, add_max_element(v, x._2)); } }; - var join = function (l, v, r) { + let join = function (l, v, r) { if (typeof l !== "object") { return add_min_element(v, r); } - var lh = l._3; + let lh = l._3; if (typeof r !== "object") { return add_max_element(v, l); } - var rh = r._3; + let rh = r._3; if (lh > (rh + 2 | 0)) { return bal(l._0, l._1, join(l._2, v, r)); } else if (rh > (lh + 2 | 0)) { @@ -146,16 +146,16 @@ function Make(Ord) { return create(l, v, r); } }; - var min_elt = function (_x) { + let min_elt = function (_x) { while(true) { - var x = _x; + let x = _x; if (typeof x !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var l = x._0; + let l = x._0; if (typeof l !== "object") { return x._1; } @@ -163,16 +163,16 @@ function Make(Ord) { continue ; }; }; - var max_elt = function (_x) { + let max_elt = function (_x) { while(true) { - var x = _x; + let x = _x; if (typeof x !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var r = x._2; + let r = x._2; if (typeof r !== "object") { return x._1; } @@ -180,7 +180,7 @@ function Make(Ord) { continue ; }; }; - var remove_min_elt = function (x) { + let remove_min_elt = function (x) { if (typeof x !== "object") { throw { RE_EXN_ID: "Invalid_argument", @@ -188,14 +188,14 @@ function Make(Ord) { Error: new Error() }; } - var l = x._0; + let l = x._0; if (typeof l !== "object") { return x._2; } else { return bal(remove_min_elt(l), x._1, x._2); } }; - var merge = function (t1, t2) { + let merge = function (t1, t2) { if (typeof t1 !== "object") { return t2; } else if (typeof t2 !== "object") { @@ -204,7 +204,7 @@ function Make(Ord) { return bal(t1, min_elt(t2), remove_min_elt(t2)); } }; - var concat = function (t1, t2) { + let concat = function (t1, t2) { if (typeof t1 !== "object") { return t2; } else if (typeof t2 !== "object") { @@ -213,7 +213,7 @@ function Make(Ord) { return join(t1, min_elt(t2), remove_min_elt(t2)); } }; - var split = function (x, x_) { + let split = function (x, x_) { if (typeof x_ !== "object") { return [ "Empty", @@ -221,10 +221,10 @@ function Make(Ord) { "Empty" ]; } - var r = x_._2; - var v = x_._1; - var l = x_._0; - var c = Curry._2(Ord.compare, x, v); + let r = x_._2; + let v = x_._1; + let l = x_._0; + let c = Curry._2(Ord.compare, x, v); if (c === 0) { return [ l, @@ -233,34 +233,34 @@ function Make(Ord) { ]; } if (c < 0) { - var match = split(x, l); + let match = split(x, l); return [ match[0], match[1], join(match[2], v, r) ]; } - var match$1 = split(x, r); + let match$1 = split(x, r); return [ join(l, v, match$1[0]), match$1[1], match$1[2] ]; }; - var is_empty = function (x) { + let is_empty = function (x) { if (typeof x !== "object") { return true; } else { return false; } }; - var mem = function (x, _x_) { + let mem = function (x, _x_) { while(true) { - var x_ = _x_; + let x_ = _x_; if (typeof x_ !== "object") { return false; } - var c = Curry._2(Ord.compare, x, x_._1); + let c = Curry._2(Ord.compare, x, x_._1); if (c === 0) { return true; } @@ -268,14 +268,14 @@ function Make(Ord) { continue ; }; }; - var remove = function (x, x_) { + let remove = function (x, x_) { if (typeof x_ !== "object") { return "Empty"; } - var r = x_._2; - var v = x_._1; - var l = x_._0; - var c = Curry._2(Ord.compare, x, v); + let r = x_._2; + let v = x_._1; + let l = x_._0; + let c = Curry._2(Ord.compare, x, v); if (c === 0) { return merge(l, r); } else if (c < 0) { @@ -284,70 +284,70 @@ function Make(Ord) { return bal(l, v, remove(x, r)); } }; - var union = function (s1, s2) { + let union = function (s1, s2) { if (typeof s1 !== "object") { return s2; } - var h1 = s1._3; - var v1 = s1._1; + let h1 = s1._3; + let v1 = s1._1; if (typeof s2 !== "object") { return s1; } - var h2 = s2._3; - var v2 = s2._1; + let h2 = s2._3; + let v2 = s2._1; if (h1 >= h2) { if (h2 === 1) { return add(v2, s1); } - var match = split(v1, s2); + let match = split(v1, s2); return join(union(s1._0, match[0]), v1, union(s1._2, match[2])); } if (h1 === 1) { return add(v1, s2); } - var match$1 = split(v2, s1); + let match$1 = split(v2, s1); return join(union(match$1[0], s2._0), v2, union(match$1[2], s2._2)); }; - var inter = function (s1, s2) { + let inter = function (s1, s2) { if (typeof s1 !== "object") { return "Empty"; } if (typeof s2 !== "object") { return "Empty"; } - var r1 = s1._2; - var v1 = s1._1; - var l1 = s1._0; - var match = split(v1, s2); - var l2 = match[0]; + let r1 = s1._2; + let v1 = s1._1; + let l1 = s1._0; + let match = split(v1, s2); + let l2 = match[0]; if (match[1]) { return join(inter(l1, l2), v1, inter(r1, match[2])); } else { return concat(inter(l1, l2), inter(r1, match[2])); } }; - var diff = function (s1, s2) { + let diff = function (s1, s2) { if (typeof s1 !== "object") { return "Empty"; } if (typeof s2 !== "object") { return s1; } - var r1 = s1._2; - var v1 = s1._1; - var l1 = s1._0; - var match = split(v1, s2); - var l2 = match[0]; + let r1 = s1._2; + let v1 = s1._1; + let l1 = s1._0; + let match = split(v1, s2); + let l2 = match[0]; if (match[1]) { return concat(diff(l1, l2), diff(r1, match[2])); } else { return join(diff(l1, l2), v1, diff(r1, match[2])); } }; - var cons_enum = function (_s, _e) { + let cons_enum = function (_s, _e) { while(true) { - var e = _e; - var s = _s; + let e = _e; + let s = _s; if (typeof s !== "object") { return e; } @@ -361,10 +361,10 @@ function Make(Ord) { continue ; }; }; - var compare_aux = function (_e1, _e2) { + let compare_aux = function (_e1, _e2) { while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return 0; @@ -375,7 +375,7 @@ function Make(Ord) { if (typeof e2 !== "object") { return 1; } - var c = Curry._2(Ord.compare, e1._0, e2._0); + let c = Curry._2(Ord.compare, e1._0, e2._0); if (c !== 0) { return c; } @@ -384,28 +384,28 @@ function Make(Ord) { continue ; }; }; - var compare = function (s1, s2) { + let compare = function (s1, s2) { return compare_aux(cons_enum(s1, "End"), cons_enum(s2, "End")); }; - var equal = function (s1, s2) { + let equal = function (s1, s2) { return compare(s1, s2) === 0; }; - var subset = function (_s1, _s2) { + let subset = function (_s1, _s2) { while(true) { - var s2 = _s2; - var s1 = _s1; + let s2 = _s2; + let s1 = _s1; if (typeof s1 !== "object") { return true; } - var r1 = s1._2; - var v1 = s1._1; - var l1 = s1._0; + let r1 = s1._2; + let v1 = s1._1; + let l1 = s1._0; if (typeof s2 !== "object") { return false; } - var r2 = s2._2; - var l2 = s2._0; - var c = Curry._2(Ord.compare, v1, s2._1); + let r2 = s2._2; + let l2 = s2._0; + let c = Curry._2(Ord.compare, v1, s2._1); if (c === 0) { if (!subset(l1, l2)) { return false; @@ -440,9 +440,9 @@ function Make(Ord) { continue ; }; }; - var iter = function (f, _x_) { + let iter = function (f, _x_) { while(true) { - var x_ = _x_; + let x_ = _x_; if (typeof x_ !== "object") { return; } @@ -452,10 +452,10 @@ function Make(Ord) { continue ; }; }; - var fold = function (f, _s, _accu) { + let fold = function (f, _s, _accu) { while(true) { - var accu = _accu; - var s = _s; + let accu = _accu; + let s = _s; if (typeof s !== "object") { return accu; } @@ -464,9 +464,9 @@ function Make(Ord) { continue ; }; }; - var for_all = function (p, _x) { + let for_all = function (p, _x) { while(true) { - var x = _x; + let x = _x; if (typeof x !== "object") { return true; } @@ -480,9 +480,9 @@ function Make(Ord) { continue ; }; }; - var exists = function (p, _x) { + let exists = function (p, _x) { while(true) { - var x = _x; + let x = _x; if (typeof x !== "object") { return false; } @@ -496,35 +496,35 @@ function Make(Ord) { continue ; }; }; - var filter = function (p, x) { + let filter = function (p, x) { if (typeof x !== "object") { return "Empty"; } - var v = x._1; - var l$p = filter(p, x._0); - var pv = Curry._1(p, v); - var r$p = filter(p, x._2); + let v = x._1; + let l$p = filter(p, x._0); + let pv = Curry._1(p, v); + let r$p = filter(p, x._2); if (pv) { return join(l$p, v, r$p); } else { return concat(l$p, r$p); } }; - var partition = function (p, x) { + let partition = function (p, x) { if (typeof x !== "object") { return [ "Empty", "Empty" ]; } - var v = x._1; - var match = partition(p, x._0); - var lf = match[1]; - var lt = match[0]; - var pv = Curry._1(p, v); - var match$1 = partition(p, x._2); - var rf = match$1[1]; - var rt = match$1[0]; + let v = x._1; + let match = partition(p, x._0); + let lf = match[1]; + let lt = match[0]; + let pv = Curry._1(p, v); + let match$1 = partition(p, x._2); + let rf = match$1[1]; + let rt = match$1[0]; if (pv) { return [ join(lt, v, rt), @@ -537,17 +537,17 @@ function Make(Ord) { ]; } }; - var cardinal = function (x) { + let cardinal = function (x) { if (typeof x !== "object") { return 0; } else { return (cardinal(x._0) + 1 | 0) + cardinal(x._2) | 0; } }; - var elements_aux = function (_accu, _x) { + let elements_aux = function (_accu, _x) { while(true) { - var x = _x; - var accu = _accu; + let x = _x; + let accu = _accu; if (typeof x !== "object") { return accu; } @@ -559,20 +559,20 @@ function Make(Ord) { continue ; }; }; - var elements = function (s) { + let elements = function (s) { return elements_aux(/* [] */0, s); }; - var find = function (x, _x_) { + let find = function (x, _x_) { while(true) { - var x_ = _x_; + let x_ = _x_; if (typeof x_ !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = x_._1; - var c = Curry._2(Ord.compare, x, v); + let v = x_._1; + let c = Curry._2(Ord.compare, x, v); if (c === 0) { return v; } @@ -580,8 +580,8 @@ function Make(Ord) { continue ; }; }; - var of_sorted_list = function (l) { - var sub = function (n, l) { + let of_sorted_list = function (l) { + let sub = function (n, l) { switch (n) { case 0 : return [ @@ -604,7 +604,7 @@ function Make(Ord) { break; case 2 : if (l) { - var match = l.tl; + let match = l.tl; if (match) { return [ { @@ -628,9 +628,9 @@ function Make(Ord) { break; case 3 : if (l) { - var match$1 = l.tl; + let match$1 = l.tl; if (match$1) { - var match$2 = match$1.tl; + let match$2 = match$1.tl; if (match$2) { return [ { @@ -663,11 +663,11 @@ function Make(Ord) { default: } - var nl = n / 2 | 0; - var match$3 = sub(nl, l); - var l$1 = match$3[1]; + let nl = n / 2 | 0; + let match$3 = sub(nl, l); + let l$1 = match$3[1]; if (l$1) { - var match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl); + let match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl); return [ create(match$3[0], l$1.hd, match$4[0]), match$4[1] @@ -685,27 +685,27 @@ function Make(Ord) { }; return sub(List.length(l), l)[0]; }; - var of_list = function (l) { + let of_list = function (l) { if (!l) { return "Empty"; } - var match = l.tl; - var x0 = l.hd; + let match = l.tl; + let x0 = l.hd; if (!match) { return singleton(x0); } - var match$1 = match.tl; - var x1 = match.hd; + let match$1 = match.tl; + let x1 = match.hd; if (!match$1) { return add(x1, singleton(x0)); } - var match$2 = match$1.tl; - var x2 = match$1.hd; + let match$2 = match$1.tl; + let x2 = match$1.hd; if (!match$2) { return add(x2, add(x1, singleton(x0))); } - var match$3 = match$2.tl; - var x3 = match$2.hd; + let match$3 = match$2.tl; + let x3 = match$2.hd; if (match$3) { if (match$3.tl) { return of_sorted_list(List.sort_uniq(Ord.compare, l)); @@ -759,7 +759,7 @@ function Make(Ord) { }; } -var N = { +let N = { a: 3 }; diff --git a/jscomp/test/test_side_effect_functor.js b/jscomp/test/test_side_effect_functor.js index 89d7147567..10d3460d95 100644 --- a/jscomp/test/test_side_effect_functor.js +++ b/jscomp/test/test_side_effect_functor.js @@ -2,7 +2,7 @@ 'use strict'; -var v = 0; +let v = 0; v = v + 1 | 0; @@ -12,7 +12,7 @@ function unuse_v(param) { return 35; } -var h = unuse_v; +let h = unuse_v; exports.h = h; /* Not a pure module */ diff --git a/jscomp/test/test_simple_include.js b/jscomp/test/test_simple_include.js index 41d1457803..01e2f84d75 100644 --- a/jscomp/test/test_simple_include.js +++ b/jscomp/test/test_simple_include.js @@ -1,85 +1,85 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var $$Array = require("../../lib/js/array.js"); +let $$Array = require("../../lib/js/array.js"); -var v = { +let v = { contents: 32 }; v.contents = 0; -var N = { +let N = { a: 3, v: v }; -var v$1 = { +let v$1 = { contents: 32 }; -var NN = { +let NN = { a: 3, v: v$1 }; -var make_float = $$Array.make_float; +let make_float = $$Array.make_float; -var init = $$Array.init; +let init = $$Array.init; -var make_matrix = $$Array.make_matrix; +let make_matrix = $$Array.make_matrix; -var create_matrix = $$Array.create_matrix; +let create_matrix = $$Array.create_matrix; -var append = $$Array.append; +let append = $$Array.append; -var concat = $$Array.concat; +let concat = $$Array.concat; -var sub = $$Array.sub; +let sub = $$Array.sub; -var copy = $$Array.copy; +let copy = $$Array.copy; -var fill = $$Array.fill; +let fill = $$Array.fill; -var blit = $$Array.blit; +let blit = $$Array.blit; -var to_list = $$Array.to_list; +let to_list = $$Array.to_list; -var of_list = $$Array.of_list; +let of_list = $$Array.of_list; -var iter = $$Array.iter; +let iter = $$Array.iter; -var iteri = $$Array.iteri; +let iteri = $$Array.iteri; -var map = $$Array.map; +let map = $$Array.map; -var mapi = $$Array.mapi; +let mapi = $$Array.mapi; -var fold_left = $$Array.fold_left; +let fold_left = $$Array.fold_left; -var fold_right = $$Array.fold_right; +let fold_right = $$Array.fold_right; -var iter2 = $$Array.iter2; +let iter2 = $$Array.iter2; -var map2 = $$Array.map2; +let map2 = $$Array.map2; -var for_all = $$Array.for_all; +let for_all = $$Array.for_all; -var exists = $$Array.exists; +let exists = $$Array.exists; -var mem = $$Array.mem; +let mem = $$Array.mem; -var memq = $$Array.memq; +let memq = $$Array.memq; -var sort = $$Array.sort; +let sort = $$Array.sort; -var stable_sort = $$Array.stable_sort; +let stable_sort = $$Array.stable_sort; -var fast_sort = $$Array.fast_sort; +let fast_sort = $$Array.fast_sort; -var Floatarray = $$Array.Floatarray; +let Floatarray = $$Array.Floatarray; -var a = 3; +let a = 3; exports.make_float = make_float; exports.init = init; diff --git a/jscomp/test/test_simple_pattern_match.js b/jscomp/test/test_simple_pattern_match.js index f6a8ad345f..e127dc7215 100644 --- a/jscomp/test/test_simple_pattern_match.js +++ b/jscomp/test/test_simple_pattern_match.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Sys = require("../../lib/js/sys.js"); +let Sys = require("../../lib/js/sys.js"); -var match; +let match; switch (Sys.os_type) { case "Cygwin" : @@ -20,9 +20,9 @@ switch (Sys.os_type) { ]; } -var a = match[0]; +let a = match[0]; -var b = match[1]; +let b = match[1]; exports.a = a; exports.b = b; diff --git a/jscomp/test/test_simple_ref.js b/jscomp/test/test_simple_ref.js index 82aacb5321..a340698803 100644 --- a/jscomp/test/test_simple_ref.js +++ b/jscomp/test/test_simple_ref.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); -var v = { +let v = { contents: 0 }; @@ -12,23 +12,23 @@ function gen(param) { return v.contents; } -var h = { +let h = { contents: 0 }; -var a = 0; +let a = 0; -var c = { +let c = { contents: 0 }; -var not_real_escape = a; +let not_real_escape = a; function real_escape(f, v) { return Curry._1(f, c); } -var u = h; +let u = h; exports.u = u; exports.gen = gen; diff --git a/jscomp/test/test_simple_tailcall.js b/jscomp/test/test_simple_tailcall.js index 2733ac18b2..6e67dc74de 100644 --- a/jscomp/test/test_simple_tailcall.js +++ b/jscomp/test/test_simple_tailcall.js @@ -18,12 +18,12 @@ function non_length(x) { function length(_acc, _x) { while(true) { - var x = _x; - var acc = _acc; + let x = _x; + let acc = _acc; if (!x) { return acc; } - var tl = x.tl; + let tl = x.tl; if (tl) { return 1 + length(acc + 1 | 0, tl.tl) | 0; } diff --git a/jscomp/test/test_small.js b/jscomp/test/test_small.js index b833b6f535..ff80c9f6ce 100644 --- a/jscomp/test/test_small.js +++ b/jscomp/test/test_small.js @@ -2,9 +2,9 @@ 'use strict'; -var fib = 3; +let fib = 3; -var u = 3; +let u = 3; exports.fib = fib; exports.u = u; diff --git a/jscomp/test/test_static_catch_ident.js b/jscomp/test/test_static_catch_ident.js index 6e9819d858..ba3f7d2401 100644 --- a/jscomp/test/test_static_catch_ident.js +++ b/jscomp/test/test_static_catch_ident.js @@ -1,18 +1,18 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var Scan_failure = /* @__PURE__ */Caml_exceptions.create("Test_static_catch_ident.Scan_failure"); +let Scan_failure = /* @__PURE__ */Caml_exceptions.create("Test_static_catch_ident.Scan_failure"); function scanf_bad_input(ib, x) { - var s; + let s; if (x.RE_EXN_ID === Scan_failure || x.RE_EXN_ID === "Failure") { s = x._1; } else { throw x; } - for(var i = 0; i <= 100; ++i){ + for(let i = 0; i <= 100; ++i){ console.log(s); console.log("don't inlinie"); } diff --git a/jscomp/test/test_string.js b/jscomp/test/test_string.js index f5365941de..e28702b2fe 100644 --- a/jscomp/test/test_string.js +++ b/jscomp/test/test_string.js @@ -1,8 +1,8 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_bytes = require("../../lib/js/caml_bytes.js"); -var Caml_string = require("../../lib/js/caml_string.js"); +let Caml_bytes = require("../../lib/js/caml_bytes.js"); +let Caml_string = require("../../lib/js/caml_string.js"); function f(x) { switch (x) { @@ -35,7 +35,7 @@ function c(x, y) { return x + "hellohiuhi" + y; } -var v = "xx".length; +let v = "xx".length; function h(s, b) { if (Caml_string.get(s, 0) === /* 'a' */97 && Caml_bytes.get(b, 0) === /* 'b' */98) { diff --git a/jscomp/test/test_string_const.js b/jscomp/test/test_string_const.js index 78cce05d5c..52f7bbe5f5 100644 --- a/jscomp/test/test_string_const.js +++ b/jscomp/test/test_string_const.js @@ -1,18 +1,18 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_string = require("../../lib/js/caml_string.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let Caml_string = require("../../lib/js/caml_string.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); -var f = Caml_string.get("ghsogh", 3); +let f = Caml_string.get("ghsogh", 3); -var hh; +let hh; try { hh = Caml_string.get("ghsogh", -3); } catch (raw_e){ - var e = Caml_js_exceptions.internalToOCamlException(raw_e); + let e = Caml_js_exceptions.internalToOCamlException(raw_e); if (e.RE_EXN_ID === "Invalid_argument") { console.log(e._1); hh = /* 'a' */97; diff --git a/jscomp/test/test_string_map.js b/jscomp/test/test_string_map.js index b88bd4929c..6c86bf2790 100644 --- a/jscomp/test/test_string_map.js +++ b/jscomp/test/test_string_map.js @@ -1,8 +1,8 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml = require("../../lib/js/caml.js"); -var Curry = require("../../lib/js/curry.js"); +let Caml = require("../../lib/js/caml.js"); +let Curry = require("../../lib/js/curry.js"); function height(param) { if (typeof param !== "object") { @@ -13,8 +13,8 @@ function height(param) { } function create(l, x, d, r) { - var hl = height(l); - var hr = height(r); + let hl = height(l); + let hr = height(r); return { TAG: "Node", l: l, @@ -26,9 +26,9 @@ function create(l, x, d, r) { } function bal(l, x, d, r) { - var hl; + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -38,10 +38,10 @@ function bal(l, x, d, r) { Error: new Error() }; } - var lr = l.r; - var ld = l.d; - var lv = l.v; - var ll = l.l; + let lr = l.r; + let ld = l.d; + let lv = l.v; + let ll = l.l; if (height(ll) >= height(lr)) { return create(ll, lv, ld, create(lr, x, d, r)); } @@ -71,10 +71,10 @@ function bal(l, x, d, r) { Error: new Error() }; } - var rr = r.r; - var rd = r.d; - var rv = r.v; - var rl = r.l; + let rr = r.r; + let rd = r.d; + let rv = r.v; + let rl = r.l; if (height(rr) >= height(rl)) { return create(create(l, x, d, rl), rv, rd, rr); } @@ -99,11 +99,11 @@ function add(x, data, param) { h: 1 }; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Caml.string_compare(x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Caml.string_compare(x, v); if (c === 0) { if (d === data) { return param; @@ -119,14 +119,14 @@ function add(x, data, param) { } } if (c < 0) { - var ll = add(x, data, l); + let ll = add(x, data, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = add(x, data, r); + let rr = add(x, data, r); if (r === rr) { return param; } else { @@ -136,14 +136,14 @@ function add(x, data, param) { function find(x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var c = Caml.string_compare(x, param.v); + let c = Caml.string_compare(x, param.v); if (c === 0) { return param.d; } @@ -159,16 +159,16 @@ function timing(label, f) { } function assertion_test(param) { - var m = { + let m = { contents: "Empty" }; timing("building", (function (param) { - for(var i = 0; i <= 1000000; ++i){ + for(let i = 0; i <= 1000000; ++i){ m.contents = add(String(i), String(i), m.contents); } })); timing("querying", (function (param) { - for(var i = 0; i <= 1000000; ++i){ + for(let i = 0; i <= 1000000; ++i){ find(String(i), m.contents); } })); diff --git a/jscomp/test/test_string_switch.js b/jscomp/test/test_string_switch.js index be516c2436..14432b71c7 100644 --- a/jscomp/test/test_string_switch.js +++ b/jscomp/test/test_string_switch.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Sys = require("../../lib/js/sys.js"); +let Sys = require("../../lib/js/sys.js"); -var os_version; +let os_version; switch (Sys.os_type) { case "Cygwin" : diff --git a/jscomp/test/test_switch.js b/jscomp/test/test_switch.js index b75cafd1d4..6cd0bab8e5 100644 --- a/jscomp/test/test_switch.js +++ b/jscomp/test/test_switch.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); function f(x) { if (typeof x !== "object") { diff --git a/jscomp/test/test_trywith.js b/jscomp/test/test_trywith.js index 01077ef66a..c1b484b410 100644 --- a/jscomp/test/test_trywith.js +++ b/jscomp/test/test_trywith.js @@ -1,24 +1,24 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); -var Out_of_memory = /* @__PURE__ */Caml_exceptions.create("Test_trywith.Out_of_memory"); +let Out_of_memory = /* @__PURE__ */Caml_exceptions.create("Test_trywith.Out_of_memory"); -var Sys_error = /* @__PURE__ */Caml_exceptions.create("Test_trywith.Sys_error"); +let Sys_error = /* @__PURE__ */Caml_exceptions.create("Test_trywith.Sys_error"); -var Stack_overflow = /* @__PURE__ */Caml_exceptions.create("Test_trywith.Stack_overflow"); +let Stack_overflow = /* @__PURE__ */Caml_exceptions.create("Test_trywith.Stack_overflow"); -var Sys_blocked_io = /* @__PURE__ */Caml_exceptions.create("Test_trywith.Sys_blocked_io"); +let Sys_blocked_io = /* @__PURE__ */Caml_exceptions.create("Test_trywith.Sys_blocked_io"); function ff(g, x) { try { Curry._1(g, x); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID !== "Not_found") { throw exn; } @@ -28,7 +28,7 @@ function ff(g, x) { Curry._1(g, x); } catch (raw_exn$1){ - var exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1); + let exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1); if (exn$1.RE_EXN_ID !== Out_of_memory) { throw exn$1; } @@ -38,7 +38,7 @@ function ff(g, x) { Curry._1(g, x); } catch (raw_exn$2){ - var exn$2 = Caml_js_exceptions.internalToOCamlException(raw_exn$2); + let exn$2 = Caml_js_exceptions.internalToOCamlException(raw_exn$2); if (exn$2.RE_EXN_ID !== Sys_error) { throw exn$2; } @@ -48,7 +48,7 @@ function ff(g, x) { Curry._1(g, x); } catch (raw_exn$3){ - var exn$3 = Caml_js_exceptions.internalToOCamlException(raw_exn$3); + let exn$3 = Caml_js_exceptions.internalToOCamlException(raw_exn$3); if (exn$3.RE_EXN_ID !== "Invalid_argument") { throw exn$3; } @@ -58,7 +58,7 @@ function ff(g, x) { Curry._1(g, x); } catch (raw_exn$4){ - var exn$4 = Caml_js_exceptions.internalToOCamlException(raw_exn$4); + let exn$4 = Caml_js_exceptions.internalToOCamlException(raw_exn$4); if (exn$4.RE_EXN_ID !== "End_of_file") { throw exn$4; } @@ -68,7 +68,7 @@ function ff(g, x) { Curry._1(g, x); } catch (raw_exn$5){ - var exn$5 = Caml_js_exceptions.internalToOCamlException(raw_exn$5); + let exn$5 = Caml_js_exceptions.internalToOCamlException(raw_exn$5); if (exn$5.RE_EXN_ID !== "Match_failure") { throw exn$5; } @@ -78,7 +78,7 @@ function ff(g, x) { Curry._1(g, x); } catch (raw_exn$6){ - var exn$6 = Caml_js_exceptions.internalToOCamlException(raw_exn$6); + let exn$6 = Caml_js_exceptions.internalToOCamlException(raw_exn$6); if (exn$6.RE_EXN_ID !== Stack_overflow) { throw exn$6; } @@ -88,7 +88,7 @@ function ff(g, x) { Curry._1(g, x); } catch (raw_exn$7){ - var exn$7 = Caml_js_exceptions.internalToOCamlException(raw_exn$7); + let exn$7 = Caml_js_exceptions.internalToOCamlException(raw_exn$7); if (exn$7.RE_EXN_ID !== Sys_blocked_io) { throw exn$7; } @@ -98,7 +98,7 @@ function ff(g, x) { Curry._1(g, x); } catch (raw_exn$8){ - var exn$8 = Caml_js_exceptions.internalToOCamlException(raw_exn$8); + let exn$8 = Caml_js_exceptions.internalToOCamlException(raw_exn$8); if (exn$8.RE_EXN_ID !== "Assert_failure") { throw exn$8; } @@ -108,7 +108,7 @@ function ff(g, x) { return Curry._1(g, x); } catch (raw_exn$9){ - var exn$9 = Caml_js_exceptions.internalToOCamlException(raw_exn$9); + let exn$9 = Caml_js_exceptions.internalToOCamlException(raw_exn$9); if (exn$9.RE_EXN_ID === "Undefined_recursive_module") { return; } @@ -141,9 +141,9 @@ function f(x) { }; } -var u1 = "bad character decimal encoding \\"; +let u1 = "bad character decimal encoding \\"; -var v = "bad character decimal encoding \\%c%c%c"; +let v = "bad character decimal encoding \\%c%c%c"; exports.Out_of_memory = Out_of_memory; exports.Sys_error = Sys_error; diff --git a/jscomp/test/test_tuple.js b/jscomp/test/test_tuple.js index eb571fceb1..77fbe2d158 100644 --- a/jscomp/test/test_tuple.js +++ b/jscomp/test/test_tuple.js @@ -2,11 +2,11 @@ 'use strict'; -var r = 0; +let r = 0; -for(var k = 1; k <= 10; ++k){ - for(var i = 1; i <= 10; ++i){ - var match = i % 2 === 0 ? [ +for(let k = 1; k <= 10; ++k){ + for(let i = 1; i <= 10; ++i){ + let match = i % 2 === 0 ? [ 1, (i << 1) ] : [ diff --git a/jscomp/test/test_tuple_destructring.js b/jscomp/test/test_tuple_destructring.js index 9f31f9f654..0603900110 100644 --- a/jscomp/test/test_tuple_destructring.js +++ b/jscomp/test/test_tuple_destructring.js @@ -2,19 +2,19 @@ 'use strict'; -var N = { +let N = { b: 3 }; -var v = 3; +let v = 3; -var u = 3; +let u = 3; -var h = 4; +let h = 4; -var g = 3; +let g = 3; -var gg = 4; +let gg = 4; exports.N = N; exports.v = v; diff --git a/jscomp/test/test_type_based_arity.js b/jscomp/test/test_type_based_arity.js index 5446551baa..eb66db3e62 100644 --- a/jscomp/test/test_type_based_arity.js +++ b/jscomp/test/test_type_based_arity.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); function f0(g, x) { return Curry._1(g, x); @@ -11,7 +11,7 @@ function f1(g, x) { Curry._1(g, x); } -var X = {}; +let X = {}; function f2(g, x) { return Curry._1(g, x); @@ -37,7 +37,7 @@ function f7(g, x) { return Curry._1(g, x); } -var X0 = {}; +let X0 = {}; function f8(g, x) { return Curry._1(g, x); @@ -63,7 +63,7 @@ function f13(g, x) { return Curry._1(g, x); } -var X2 = { +let X2 = { f13: f13 }; diff --git a/jscomp/test/test_u.js b/jscomp/test/test_u.js index e0205adbe5..946f386cab 100644 --- a/jscomp/test/test_u.js +++ b/jscomp/test/test_u.js @@ -3,8 +3,8 @@ function f(x) { - var v = x; - var sum = 0; + let v = x; + let sum = 0; while(v > 0) { sum = sum + v | 0; v = v - 1 | 0; diff --git a/jscomp/test/test_unknown.js b/jscomp/test/test_unknown.js index 3b5276cdda..f09b3e193f 100644 --- a/jscomp/test/test_unknown.js +++ b/jscomp/test/test_unknown.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_option = require("../../lib/js/caml_option.js"); +let Caml_option = require("../../lib/js/caml_option.js"); function some(x) { return Caml_option.some(x); @@ -11,7 +11,7 @@ function some2(x) { return Caml_option.some(x); } -var h = [ +let h = [ 3, 2, 2 diff --git a/jscomp/test/test_unsupported_primitive.js b/jscomp/test/test_unsupported_primitive.js index 72e8ec738f..ff497c5966 100644 --- a/jscomp/test/test_unsupported_primitive.js +++ b/jscomp/test/test_unsupported_primitive.js @@ -1,7 +1,7 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml_external_polyfill = require("../../lib/js/caml_external_polyfill.js"); +let Caml_external_polyfill = require("../../lib/js/caml_external_polyfill.js"); function to_buffer(buff, ofs, len, v, flags) { if (ofs < 0 || len < 0 || ofs > (buff.length - len | 0)) { diff --git a/jscomp/test/test_while_closure.js b/jscomp/test/test_while_closure.js index 03edb7d0ca..f94badf794 100644 --- a/jscomp/test/test_while_closure.js +++ b/jscomp/test/test_while_closure.js @@ -1,22 +1,22 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var $$Array = require("../../lib/js/array.js"); -var Curry = require("../../lib/js/curry.js"); -var Caml_array = require("../../lib/js/caml_array.js"); +let $$Array = require("../../lib/js/array.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_array = require("../../lib/js/caml_array.js"); -var v = { +let v = { contents: 0 }; -var arr = Caml_array.make(10, (function (param) { +let arr = Caml_array.make(10, (function (param) { })); function f(param) { - var n = 0; + let n = 0; while(n < 10) { - var j = n; + let j = n; Caml_array.set(arr, j, (function(j){ return function (param) { v.contents = v.contents + j | 0; @@ -46,7 +46,7 @@ if (v.contents !== 45) { }; } -var count = 10; +let count = 10; exports.v = v; exports.count = count; diff --git a/jscomp/test/test_while_side_effect.js b/jscomp/test/test_while_side_effect.js index b9a2005cf7..c368e122de 100644 --- a/jscomp/test/test_while_side_effect.js +++ b/jscomp/test/test_while_side_effect.js @@ -2,7 +2,7 @@ 'use strict'; -var v = { +let v = { contents: 0 }; @@ -18,12 +18,12 @@ function fib(x) { } } -var x = { +let x = { contents: 3 }; while((function () { - var y = 3; + let y = 3; console.log(String(x.contents)); y = y + 1 | 0; x.contents = x.contents + 1 | 0; diff --git a/jscomp/test/test_zero_nullable.js b/jscomp/test/test_zero_nullable.js index df9198c82a..c8a337ca3f 100644 --- a/jscomp/test/test_zero_nullable.js +++ b/jscomp/test/test_zero_nullable.js @@ -1,15 +1,15 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Curry = require("../../lib/js/curry.js"); -var Caml_option = require("../../lib/js/caml_option.js"); +let Mt = require("./mt.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_option = require("../../lib/js/caml_option.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -47,7 +47,7 @@ function f2(x) { } function f5(h, x) { - var u = Curry._1(h, 32); + let u = Curry._1(h, 32); if (u !== null) { return u + 1 | 0; } else { @@ -56,8 +56,8 @@ function f5(h, x) { } function f4(h, x) { - var u = Curry._1(h, 32); - var v = 32 + x | 0; + let u = Curry._1(h, 32); + let v = 32 + x | 0; if (u !== null) { return u + 1 | 0; } else { @@ -85,7 +85,7 @@ function f8(x) { } } -var u = f8(undefined); +let u = f8(undefined); function f9(x) { if (x === null) { @@ -99,9 +99,9 @@ function f10(x) { return x === null; } -var f11 = false; +let f11 = false; -var Test_null = { +let Test_null = { f1: f1, f2: f2, f5: f5, @@ -132,7 +132,7 @@ function f2$1(x) { } function f5$1(h, x) { - var u = Curry._1(h, 32); + let u = Curry._1(h, 32); if (u !== undefined) { return u + 1 | 0; } else { @@ -141,8 +141,8 @@ function f5$1(h, x) { } function f4$1(h, x) { - var u = Curry._1(h, 32); - var v = 32 + x | 0; + let u = Curry._1(h, 32); + let v = 32 + x | 0; if (u !== undefined) { return u + 1 | 0; } else { @@ -170,7 +170,7 @@ function f8$1(x) { } } -var u$1 = f8$1(undefined); +let u$1 = f8$1(undefined); function f9$1(x) { if (x === undefined) { @@ -184,9 +184,9 @@ function f10$1(x) { return x === undefined; } -var f11$1 = false; +let f11$1 = false; -var Test_def = { +let Test_def = { f1: f1$1, f2: f2$1, f5: f5$1, @@ -217,7 +217,7 @@ function f2$2(x) { } function f5$2(h, x) { - var u = Curry._1(h, 32); + let u = Curry._1(h, 32); if (u == null) { return 3; } else { @@ -226,8 +226,8 @@ function f5$2(h, x) { } function f4$2(h, x) { - var u = Curry._1(h, 32); - var v = 32 + x | 0; + let u = Curry._1(h, 32); + let v = 32 + x | 0; if (u == null) { return 1 + v | 0; } else { @@ -253,7 +253,7 @@ function f8$2(x) { } } -var u$2 = f8$2(undefined); +let u$2 = f8$2(undefined); function f9$2(x) { if (x == null) { @@ -267,9 +267,9 @@ function f10$2(x) { return x == null; } -var f11$2 = false; +let f11$2 = false; -var Test_null_def = { +let Test_null_def = { f1: f1$2, f2: f2$2, f5: f5$2, diff --git a/jscomp/test/then_mangle_test.js b/jscomp/test/then_mangle_test.js index 3a80c8ee0f..4fcfa30d44 100644 --- a/jscomp/test/then_mangle_test.js +++ b/jscomp/test/then_mangle_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; diff --git a/jscomp/test/ticker.js b/jscomp/test/ticker.js index 6aa53efad5..28e221c62f 100644 --- a/jscomp/test/ticker.js +++ b/jscomp/test/ticker.js @@ -1,33 +1,33 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml = require("../../lib/js/caml.js"); -var List = require("../../lib/js/list.js"); -var Curry = require("../../lib/js/curry.js"); -var $$String = require("../../lib/js/string.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Pervasives = require("../../lib/js/pervasives.js"); -var Caml_format = require("../../lib/js/caml_format.js"); -var Caml_option = require("../../lib/js/caml_option.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let Caml = require("../../lib/js/caml.js"); +let List = require("../../lib/js/list.js"); +let Curry = require("../../lib/js/curry.js"); +let $$String = require("../../lib/js/string.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Pervasives = require("../../lib/js/pervasives.js"); +let Caml_format = require("../../lib/js/caml_format.js"); +let Caml_option = require("../../lib/js/caml_option.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); function split(delim, s) { - var len = s.length; + let len = s.length; if (len !== 0) { - var _l = /* [] */0; - var _x = len; + let _l = /* [] */0; + let _x = len; while(true) { - var x = _x; - var l = _l; + let x = _x; + let l = _l; if (x === 0) { return l; } - var i$p; + let i$p; try { i$p = $$String.rindex_from(s, x - 1 | 0, delim); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { return { hd: $$String.sub(s, 0, x), @@ -36,12 +36,12 @@ function split(delim, s) { } throw exn; } - var l_0 = $$String.sub(s, i$p + 1 | 0, (x - i$p | 0) - 1 | 0); - var l$1 = { + let l_0 = $$String.sub(s, i$p + 1 | 0, (x - i$p | 0) - 1 | 0); + let l$1 = { hd: l_0, tl: l }; - var l$2 = i$p === 0 ? ({ + let l$2 = i$p === 0 ? ({ hd: "", tl: l$1 }) : l$1; @@ -62,7 +62,7 @@ function string_of_float_option(x) { } } -var Util = { +let Util = { split: split, string_of_float_option: string_of_float_option }; @@ -87,7 +87,7 @@ function find_ticker_by_name(all_tickers, ticker) { function print_all_composite(all_tickers) { List.iter((function (x) { - var tmp = x.type_; + let tmp = x.type_; if (typeof tmp !== "object") { return; } @@ -104,8 +104,8 @@ function height(param) { } function create(l, x, d, r) { - var hl = height(l); - var hr = height(r); + let hl = height(l); + let hr = height(r); return { TAG: "Node", l: l, @@ -128,9 +128,9 @@ function singleton(x, d) { } function bal(l, x, d, r) { - var hl; + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -140,10 +140,10 @@ function bal(l, x, d, r) { Error: new Error() }; } - var lr = l.r; - var ld = l.d; - var lv = l.v; - var ll = l.l; + let lr = l.r; + let ld = l.d; + let lv = l.v; + let ll = l.l; if (height(ll) >= height(lr)) { return create(ll, lv, ld, create(lr, x, d, r)); } @@ -173,10 +173,10 @@ function bal(l, x, d, r) { Error: new Error() }; } - var rr = r.r; - var rd = r.d; - var rv = r.v; - var rl = r.l; + let rr = r.r; + let rd = r.d; + let rv = r.v; + let rl = r.l; if (height(rr) >= height(rl)) { return create(create(l, x, d, rl), rv, rd, rr); } @@ -209,11 +209,11 @@ function add(x, data, param) { h: 1 }; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Caml_obj.compare(x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Caml_obj.compare(x, v); if (c === 0) { if (d === data) { return param; @@ -229,14 +229,14 @@ function add(x, data, param) { } } if (c < 0) { - var ll = add(x, data, l); + let ll = add(x, data, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = add(x, data, r); + let rr = add(x, data, r); if (r === rr) { return param; } else { @@ -246,14 +246,14 @@ function add(x, data, param) { function find(x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var c = Caml_obj.compare(x, param.v); + let c = Caml_obj.compare(x, param.v); if (c === 0) { return param.d; } @@ -264,29 +264,29 @@ function find(x, _param) { function find_first(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _d0 = param.d; - var _param$1 = param.l; + let _v0 = v; + let _d0 = param.d; + let _param$1 = param.l; while(true) { - var param$1 = _param$1; - var d0 = _d0; - var v0 = _v0; + let param$1 = _param$1; + let d0 = _d0; + let v0 = _v0; if (typeof param$1 !== "object") { return [ v0, d0 ]; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.l; _d0 = param$1.d; @@ -304,26 +304,26 @@ function find_first(f, _param) { function find_first_opt(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _d0 = param.d; - var _param$1 = param.l; + let _v0 = v; + let _d0 = param.d; + let _param$1 = param.l; while(true) { - var param$1 = _param$1; - var d0 = _d0; - var v0 = _v0; + let param$1 = _param$1; + let d0 = _d0; + let v0 = _v0; if (typeof param$1 !== "object") { return [ v0, d0 ]; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.l; _d0 = param$1.d; @@ -341,29 +341,29 @@ function find_first_opt(f, _param) { function find_last(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _d0 = param.d; - var _param$1 = param.r; + let _v0 = v; + let _d0 = param.d; + let _param$1 = param.r; while(true) { - var param$1 = _param$1; - var d0 = _d0; - var v0 = _v0; + let param$1 = _param$1; + let d0 = _d0; + let v0 = _v0; if (typeof param$1 !== "object") { return [ v0, d0 ]; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.r; _d0 = param$1.d; @@ -381,26 +381,26 @@ function find_last(f, _param) { function find_last_opt(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _d0 = param.d; - var _param$1 = param.r; + let _v0 = v; + let _d0 = param.d; + let _param$1 = param.r; while(true) { - var param$1 = _param$1; - var d0 = _d0; - var v0 = _v0; + let param$1 = _param$1; + let d0 = _d0; + let v0 = _v0; if (typeof param$1 !== "object") { return [ v0, d0 ]; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.r; _d0 = param$1.d; @@ -418,11 +418,11 @@ function find_last_opt(f, _param) { function find_opt(x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var c = Caml_obj.compare(x, param.v); + let c = Caml_obj.compare(x, param.v); if (c === 0) { return Caml_option.some(param.d); } @@ -433,11 +433,11 @@ function find_opt(x, _param) { function mem(x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } - var c = Caml_obj.compare(x, param.v); + let c = Caml_obj.compare(x, param.v); if (c === 0) { return true; } @@ -448,14 +448,14 @@ function mem(x, _param) { function min_binding(_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return [ param.v, @@ -469,11 +469,11 @@ function min_binding(_param) { function min_binding_opt(_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return [ param.v, @@ -487,14 +487,14 @@ function min_binding_opt(_param) { function max_binding(_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return [ param.v, @@ -508,11 +508,11 @@ function max_binding(_param) { function max_binding_opt(_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return [ param.v, @@ -532,7 +532,7 @@ function remove_min_binding(param) { Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return param.r; } else { @@ -547,7 +547,7 @@ function merge(t1, t2) { if (typeof t2 !== "object") { return t1; } - var match = min_binding(t2); + let match = min_binding(t2); return bal(t1, match[0], match[1], remove_min_binding(t2)); } @@ -555,23 +555,23 @@ function remove(x, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Caml_obj.compare(x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Caml_obj.compare(x, v); if (c === 0) { return merge(l, r); } if (c < 0) { - var ll = remove(x, l); + let ll = remove(x, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = remove(x, r); + let rr = remove(x, r); if (r === rr) { return param; } else { @@ -581,7 +581,7 @@ function remove(x, param) { function update(x, f, param) { if (typeof param !== "object") { - var data = Curry._1(f, undefined); + let data = Curry._1(f, undefined); if (data !== undefined) { return { TAG: "Node", @@ -595,17 +595,17 @@ function update(x, f, param) { return "Empty"; } } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Caml_obj.compare(x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Caml_obj.compare(x, v); if (c === 0) { - var data$1 = Curry._1(f, Caml_option.some(d)); + let data$1 = Curry._1(f, Caml_option.some(d)); if (data$1 === undefined) { return merge(l, r); } - var data$2 = Caml_option.valFromOption(data$1); + let data$2 = Caml_option.valFromOption(data$1); if (d === data$2) { return param; } else { @@ -620,14 +620,14 @@ function update(x, f, param) { } } if (c < 0) { - var ll = update(x, f, l); + let ll = update(x, f, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = update(x, f, r); + let rr = update(x, f, r); if (r === rr) { return param; } else { @@ -637,7 +637,7 @@ function update(x, f, param) { function iter(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } @@ -652,9 +652,9 @@ function map(f, param) { if (typeof param !== "object") { return "Empty"; } - var l$p = map(f, param.l); - var d$p = Curry._1(f, param.d); - var r$p = map(f, param.r); + let l$p = map(f, param.l); + let d$p = Curry._1(f, param.d); + let r$p = map(f, param.r); return { TAG: "Node", l: l$p, @@ -669,10 +669,10 @@ function mapi(f, param) { if (typeof param !== "object") { return "Empty"; } - var v = param.v; - var l$p = mapi(f, param.l); - var d$p = Curry._2(f, v, param.d); - var r$p = mapi(f, param.r); + let v = param.v; + let l$p = mapi(f, param.l); + let d$p = Curry._2(f, v, param.d); + let r$p = mapi(f, param.r); return { TAG: "Node", l: l$p, @@ -685,8 +685,8 @@ function mapi(f, param) { function fold(f, _m, _accu) { while(true) { - var accu = _accu; - var m = _m; + let accu = _accu; + let m = _m; if (typeof m !== "object") { return accu; } @@ -698,7 +698,7 @@ function fold(f, _m, _accu) { function for_all(p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return true; } @@ -715,7 +715,7 @@ function for_all(p, _param) { function exists(p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } @@ -750,11 +750,11 @@ function join(l, v, d, r) { if (typeof l !== "object") { return add_min_binding(v, d, r); } - var lh = l.h; + let lh = l.h; if (typeof r !== "object") { return add_max_binding(v, d, l); } - var rh = r.h; + let rh = r.h; if (lh > (rh + 2 | 0)) { return bal(l.l, l.v, l.d, join(l.r, v, d, r)); } else if (rh > (lh + 2 | 0)) { @@ -771,7 +771,7 @@ function concat(t1, t2) { if (typeof t2 !== "object") { return t1; } - var match = min_binding(t2); + let match = min_binding(t2); return join(t1, match[0], match[1], remove_min_binding(t2)); } @@ -791,11 +791,11 @@ function split$1(x, param) { "Empty" ]; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Caml_obj.compare(x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Caml_obj.compare(x, v); if (c === 0) { return [ l, @@ -804,14 +804,14 @@ function split$1(x, param) { ]; } if (c < 0) { - var match = split$1(x, l); + let match = split$1(x, l); return [ match[0], match[1], join(match[2], v, d, r) ]; } - var match$1 = split$1(x, r); + let match$1 = split$1(x, r); return [ join(l, v, d, match$1[0]), match$1[1], @@ -826,9 +826,9 @@ function merge$1(f, s1, s2) { } } else { - var v1 = s1.v; + let v1 = s1.v; if (s1.h >= height(s2)) { - var match = split$1(v1, s2); + let match = split$1(v1, s2); return concat_or_join(merge$1(f, s1.l, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2])); } @@ -844,8 +844,8 @@ function merge$1(f, s1, s2) { Error: new Error() }; } - var v2 = s2.v; - var match$1 = split$1(v2, s1); + let v2 = s2.v; + let match$1 = split$1(v2, s1); return concat_or_join(merge$1(f, match$1[0], s2.l), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r)); } @@ -853,28 +853,28 @@ function union(f, s1, s2) { if (typeof s1 !== "object") { return s2; } - var d1 = s1.d; - var v1 = s1.v; + let d1 = s1.d; + let v1 = s1.v; if (typeof s2 !== "object") { return s1; } - var d2 = s2.d; - var v2 = s2.v; + let d2 = s2.d; + let v2 = s2.v; if (s1.h >= s2.h) { - var match = split$1(v1, s2); - var d2$1 = match[1]; - var l = union(f, s1.l, match[0]); - var r = union(f, s1.r, match[2]); + let match = split$1(v1, s2); + let d2$1 = match[1]; + let l = union(f, s1.l, match[0]); + let r = union(f, s1.r, match[2]); if (d2$1 !== undefined) { return concat_or_join(l, v1, Curry._3(f, v1, d1, Caml_option.valFromOption(d2$1)), r); } else { return join(l, v1, d1, r); } } - var match$1 = split$1(v2, s1); - var d1$1 = match$1[1]; - var l$1 = union(f, match$1[0], s2.l); - var r$1 = union(f, match$1[2], s2.r); + let match$1 = split$1(v2, s1); + let d1$1 = match$1[1]; + let l$1 = union(f, match$1[0], s2.l); + let r$1 = union(f, match$1[2], s2.r); if (d1$1 !== undefined) { return concat_or_join(l$1, v2, Curry._3(f, v2, Caml_option.valFromOption(d1$1), d2), r$1); } else { @@ -886,13 +886,13 @@ function filter(p, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var l$p = filter(p, l); - var pvd = Curry._2(p, v, d); - var r$p = filter(p, r); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let l$p = filter(p, l); + let pvd = Curry._2(p, v, d); + let r$p = filter(p, r); if (pvd) { if (l === l$p && r === r$p) { return param; @@ -911,15 +911,15 @@ function partition(p, param) { "Empty" ]; } - var d = param.d; - var v = param.v; - var match = partition(p, param.l); - var lf = match[1]; - var lt = match[0]; - var pvd = Curry._2(p, v, d); - var match$1 = partition(p, param.r); - var rf = match$1[1]; - var rt = match$1[0]; + let d = param.d; + let v = param.v; + let match = partition(p, param.l); + let lf = match[1]; + let lt = match[0]; + let pvd = Curry._2(p, v, d); + let match$1 = partition(p, param.r); + let rf = match$1[1]; + let rt = match$1[0]; if (pvd) { return [ join(lt, v, d, rt), @@ -935,8 +935,8 @@ function partition(p, param) { function cons_enum(_m, _e) { while(true) { - var e = _e; - var m = _m; + let e = _e; + let m = _m; if (typeof m !== "object") { return e; } @@ -953,11 +953,11 @@ function cons_enum(_m, _e) { } function compare(cmp, m1, m2) { - var _e1 = cons_enum(m1, "End"); - var _e2 = cons_enum(m2, "End"); + let _e1 = cons_enum(m1, "End"); + let _e2 = cons_enum(m2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return 0; @@ -968,11 +968,11 @@ function compare(cmp, m1, m2) { if (typeof e2 !== "object") { return 1; } - var c = Caml_obj.compare(e1._0, e2._0); + let c = Caml_obj.compare(e1._0, e2._0); if (c !== 0) { return c; } - var c$1 = Curry._2(cmp, e1._1, e2._1); + let c$1 = Curry._2(cmp, e1._1, e2._1); if (c$1 !== 0) { return c$1; } @@ -983,11 +983,11 @@ function compare(cmp, m1, m2) { } function equal(cmp, m1, m2) { - var _e1 = cons_enum(m1, "End"); - var _e2 = cons_enum(m2, "End"); + let _e1 = cons_enum(m1, "End"); + let _e2 = cons_enum(m2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return true; @@ -1020,8 +1020,8 @@ function cardinal(param) { function bindings_aux(_accu, _param) { while(true) { - var param = _param; - var accu = _accu; + let param = _param; + let accu = _accu; if (typeof param !== "object") { return accu; } @@ -1041,7 +1041,7 @@ function bindings(s) { return bindings_aux(/* [] */0, s); } -var Ticker_map = { +let Ticker_map = { empty: "Empty", is_empty: is_empty, mem: mem, @@ -1080,8 +1080,8 @@ var Ticker_map = { function compute_update_sequences(all_tickers) { List.fold_left((function (counter, ticker) { - var loop = function (counter, ticker) { - var rank = ticker.rank; + let loop = function (counter, ticker) { + let rank = ticker.rank; if (typeof rank === "object") { return counter; } @@ -1089,19 +1089,19 @@ function compute_update_sequences(all_tickers) { return counter; } ticker.rank = "Visited"; - var match = ticker.type_; + let match = ticker.type_; if (typeof match !== "object") { - var counter$1 = counter + 1 | 0; + let counter$1 = counter + 1 | 0; ticker.rank = { TAG: "Ranked", _0: counter$1 }; return counter$1; } - var match$1 = match._0; - var counter$2 = loop(counter, match$1.lhs); - var counter$3 = loop(counter$2, match$1.rhs); - var counter$4 = counter$3 + 1 | 0; + let match$1 = match._0; + let counter$2 = loop(counter, match$1.lhs); + let counter$3 = loop(counter$2, match$1.rhs); + let counter$4 = counter$3 + 1 | 0; ticker.rank = { TAG: "Ranked", _0: counter$4 @@ -1110,27 +1110,27 @@ function compute_update_sequences(all_tickers) { }; return loop(counter, ticker); }), 0, all_tickers); - var map = List.fold_left((function (map, ticker) { - var tmp = ticker.type_; + let map = List.fold_left((function (map, ticker) { + let tmp = ticker.type_; if (typeof tmp !== "object") { return add(ticker.ticker_name, { hd: ticker, tl: /* [] */0 }, map); } - var loop = function (_up, _map, _ticker) { + let loop = function (_up, _map, _ticker) { while(true) { - var ticker = _ticker; - var map = _map; - var up = _up; - var type_ = ticker.type_; - var ticker_name = ticker.ticker_name; + let ticker = _ticker; + let map = _map; + let up = _up; + let type_ = ticker.type_; + let ticker_name = ticker.ticker_name; if (typeof type_ !== "object") { - var l = find(ticker_name, map); + let l = find(ticker_name, map); return add(ticker_name, Pervasives.$at(up, l), map); } - var match = type_._0; - var map$1 = loop({ + let match = type_._0; + let map$1 = loop({ hd: ticker, tl: up }, map, match.lhs); @@ -1146,8 +1146,8 @@ function compute_update_sequences(all_tickers) { return loop(/* [] */0, map, ticker); }), "Empty", List.rev(all_tickers)); return fold((function (k, l, map) { - var l$1 = List.sort_uniq((function (lhs, rhs) { - var x = lhs.rank; + let l$1 = List.sort_uniq((function (lhs, rhs) { + let x = lhs.rank; if (typeof x !== "object") { if (x === "Uninitialized") { throw { @@ -1162,7 +1162,7 @@ function compute_update_sequences(all_tickers) { Error: new Error() }; } else { - var y = rhs.rank; + let y = rhs.rank; if (typeof y === "object") { return Caml.int_compare(x._0, y._0); } @@ -1185,9 +1185,9 @@ function compute_update_sequences(all_tickers) { } function process_quote(ticker_map, new_ticker, new_value) { - var update_sequence = find(new_ticker, ticker_map); + let update_sequence = find(new_ticker, ticker_map); List.iter((function (ticker) { - var match = ticker.type_; + let match = ticker.type_; if (typeof match !== "object") { if (ticker.ticker_name === new_ticker) { ticker.value = new_value; @@ -1199,10 +1199,10 @@ function process_quote(ticker_map, new_ticker, new_value) { Error: new Error() }; } - var match$1 = match._0; - var match$2 = match$1.lhs.value; - var match$3 = match$1.rhs.value; - var value = match$2 !== undefined && match$3 !== undefined ? ( + let match$1 = match._0; + let match$2 = match$1.lhs.value; + let match$3 = match$1.rhs.value; + let value = match$2 !== undefined && match$3 !== undefined ? ( match$1.op === "PLUS" ? match$2 + match$3 : match$2 - match$3 ) : undefined; ticker.value = value; @@ -1210,9 +1210,9 @@ function process_quote(ticker_map, new_ticker, new_value) { } function process_input_line(ticker_map, all_tickers, line) { - var make_binary_op = function (ticker_name, lhs, rhs, op) { - var lhs$1 = find_ticker_by_name(all_tickers, lhs); - var rhs$1 = find_ticker_by_name(all_tickers, rhs); + let make_binary_op = function (ticker_name, lhs, rhs, op) { + let lhs$1 = find_ticker_by_name(all_tickers, lhs); + let rhs$1 = find_ticker_by_name(all_tickers, rhs); return { value: undefined, rank: "Uninitialized", @@ -1227,13 +1227,13 @@ function process_input_line(ticker_map, all_tickers, line) { } }; }; - var tokens = split(/* '|' */124, line); + let tokens = split(/* '|' */124, line); if (tokens) { switch (tokens.hd) { case "Q" : - var match = tokens.tl; + let match = tokens.tl; if (match) { - var match$1 = match.tl; + let match$1 = match.tl; if (match$1) { if (match$1.tl) { throw { @@ -1242,8 +1242,8 @@ function process_input_line(ticker_map, all_tickers, line) { Error: new Error() }; } - var ticker_map$1 = ticker_map !== undefined ? Caml_option.valFromOption(ticker_map) : compute_update_sequences(all_tickers); - var value = Caml_format.float_of_string(match$1.hd); + let ticker_map$1 = ticker_map !== undefined ? Caml_option.valFromOption(ticker_map) : compute_update_sequences(all_tickers); + let value = Caml_format.float_of_string(match$1.hd); process_quote(ticker_map$1, match.hd, value); return [ all_tickers, @@ -1262,16 +1262,16 @@ function process_input_line(ticker_map, all_tickers, line) { Error: new Error() }; case "R" : - var match$2 = tokens.tl; + let match$2 = tokens.tl; if (match$2) { - var match$3 = match$2.tl; + let match$3 = match$2.tl; if (match$3) { - var ticker_name = match$2.hd; + let ticker_name = match$2.hd; switch (match$3.hd) { case "+" : - var match$4 = match$3.tl; + let match$4 = match$3.tl; if (match$4) { - var match$5 = match$4.tl; + let match$5 = match$4.tl; if (match$5) { if (match$5.tl) { throw { @@ -1300,9 +1300,9 @@ function process_input_line(ticker_map, all_tickers, line) { Error: new Error() }; case "-" : - var match$6 = match$3.tl; + let match$6 = match$3.tl; if (match$6) { - var match$7 = match$6.tl; + let match$7 = match$6.tl; if (match$7) { if (match$7.tl) { throw { @@ -1389,9 +1389,9 @@ function process_input_line(ticker_map, all_tickers, line) { function loop(_lines, _param) { while(true) { - var param = _param; - var lines = _lines; - var all_tickers = param[0]; + let param = _param; + let lines = _lines; + let all_tickers = param[0]; if (!lines) { return print_all_composite(all_tickers); } @@ -1401,7 +1401,7 @@ function loop(_lines, _param) { }; } -var lines = { +let lines = { hd: "R|MSFT|S", tl: { hd: "R|IBM|S", diff --git a/jscomp/test/to_string_test.js b/jscomp/test/to_string_test.js index 94fb35ac72..e6fc68e9db 100644 --- a/jscomp/test/to_string_test.js +++ b/jscomp/test/to_string_test.js @@ -1,10 +1,10 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Pervasives = require("../../lib/js/pervasives.js"); +let Mt = require("./mt.js"); +let Pervasives = require("../../lib/js/pervasives.js"); -var ff = Pervasives.string_of_float; +let ff = Pervasives.string_of_float; function f(v) { return String(v); diff --git a/jscomp/test/topsort_test.js b/jscomp/test/topsort_test.js index ded80b814c..3209382efe 100644 --- a/jscomp/test/topsort_test.js +++ b/jscomp/test/topsort_test.js @@ -1,17 +1,17 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Caml = require("../../lib/js/caml.js"); -var List = require("../../lib/js/list.js"); -var Curry = require("../../lib/js/curry.js"); -var $$String = require("../../lib/js/string.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Pervasives = require("../../lib/js/pervasives.js"); -var Caml_option = require("../../lib/js/caml_option.js"); -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); - -var graph = { +let Caml = require("../../lib/js/caml.js"); +let List = require("../../lib/js/list.js"); +let Curry = require("../../lib/js/curry.js"); +let $$String = require("../../lib/js/string.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Pervasives = require("../../lib/js/pervasives.js"); +let Caml_option = require("../../lib/js/caml_option.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); + +let graph = { hd: [ "a", "b" @@ -76,13 +76,13 @@ function nexts(x, g) { function dfs1(_nodes, graph, _visited) { while(true) { - var visited = _visited; - var nodes = _nodes; + let visited = _visited; + let nodes = _nodes; if (!nodes) { return List.rev(visited); } - var xs = nodes.tl; - var x = nodes.hd; + let xs = nodes.tl; + let x = nodes.hd; if (List.mem(x, visited)) { _nodes = xs; continue ; @@ -172,15 +172,15 @@ if (!Caml_obj.equal(dfs1({ } function dfs2(nodes, graph, visited) { - var aux = function (_nodes, graph, _visited) { + let aux = function (_nodes, graph, _visited) { while(true) { - var visited = _visited; - var nodes = _nodes; + let visited = _visited; + let nodes = _nodes; if (!nodes) { return visited; } - var xs = nodes.tl; - var x = nodes.hd; + let xs = nodes.tl; + let x = nodes.hd; if (List.mem(x, visited)) { _nodes = xs; continue ; @@ -269,10 +269,10 @@ if (!Caml_obj.equal(dfs2({ } function dfs3(nodes, graph) { - var visited = { + let visited = { contents: /* [] */0 }; - var aux = function (node, graph) { + let aux = function (node, graph) { if (!List.mem(node, visited.contents)) { visited.contents = { hd: node, @@ -362,7 +362,7 @@ if (!Caml_obj.equal(dfs3({ }; } -var grwork = { +let grwork = { hd: [ "wake", "shower" @@ -401,14 +401,14 @@ var grwork = { }; function unsafe_topsort(graph) { - var visited = { + let visited = { contents: /* [] */0 }; - var sort_node = function (node) { + let sort_node = function (node) { if (List.mem(node, visited.contents)) { return; } - var nodes = nexts(node, graph); + let nodes = nexts(node, graph); List.iter(sort_node, nodes); visited.contents = { hd: node, @@ -460,9 +460,9 @@ function height(param) { } function create(l, v, r) { - var hl; + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; return { TAG: "Node", @@ -474,9 +474,9 @@ function create(l, v, r) { } function bal(l, v, r) { - var hl; + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -486,9 +486,9 @@ function bal(l, v, r) { Error: new Error() }; } - var lr = l.r; - var lv = l.v; - var ll = l.l; + let lr = l.r; + let lv = l.v; + let ll = l.l; if (height(ll) >= height(lr)) { return create(ll, lv, create(lr, v, r)); } @@ -517,9 +517,9 @@ function bal(l, v, r) { Error: new Error() }; } - var rr = r.r; - var rv = r.v; - var rl = r.l; + let rr = r.r; + let rv = r.v; + let rl = r.l; if (height(rr) >= height(rl)) { return create(create(l, v, rl), rv, rr); } @@ -543,22 +543,22 @@ function add(x, param) { h: 1 }; } - var r = param.r; - var v = param.v; - var l = param.l; - var c = Caml.string_compare(x, v); + let r = param.r; + let v = param.v; + let l = param.l; + let c = Caml.string_compare(x, v); if (c === 0) { return param; } if (c < 0) { - var ll = add(x, l); + let ll = add(x, l); if (l === ll) { return param; } else { return bal(ll, v, r); } } - var rr = add(x, r); + let rr = add(x, r); if (r === rr) { return param; } else { @@ -596,11 +596,11 @@ function join(l, v, r) { if (typeof l !== "object") { return add_min_element(v, r); } - var lh = l.h; + let lh = l.h; if (typeof r !== "object") { return add_max_element(v, l); } - var rh = r.h; + let rh = r.h; if (lh > (rh + 2 | 0)) { return bal(l.l, l.v, join(l.r, v, r)); } else if (rh > (lh + 2 | 0)) { @@ -612,14 +612,14 @@ function join(l, v, r) { function min_elt(_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return param.v; } @@ -630,11 +630,11 @@ function min_elt(_param) { function min_elt_opt(_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return Caml_option.some(param.v); } @@ -645,14 +645,14 @@ function min_elt_opt(_param) { function max_elt(_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return param.v; } @@ -663,11 +663,11 @@ function max_elt(_param) { function max_elt_opt(_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return Caml_option.some(param.v); } @@ -684,7 +684,7 @@ function remove_min_elt(param) { Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return param.r; } else { @@ -710,10 +710,10 @@ function split(x, param) { "Empty" ]; } - var r = param.r; - var v = param.v; - var l = param.l; - var c = Caml.string_compare(x, v); + let r = param.r; + let v = param.v; + let l = param.l; + let c = Caml.string_compare(x, v); if (c === 0) { return [ l, @@ -722,14 +722,14 @@ function split(x, param) { ]; } if (c < 0) { - var match = split(x, l); + let match = split(x, l); return [ match[0], match[1], join(match[2], v, r) ]; } - var match$1 = split(x, r); + let match$1 = split(x, r); return [ join(l, v, match$1[0]), match$1[1], @@ -747,11 +747,11 @@ function is_empty(param) { function mem(x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } - var c = Caml.string_compare(x, param.v); + let c = Caml.string_compare(x, param.v); if (c === 0) { return true; } @@ -764,10 +764,10 @@ function remove(x, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var v = param.v; - var l = param.l; - var c = Caml.string_compare(x, v); + let r = param.r; + let v = param.v; + let l = param.l; + let c = Caml.string_compare(x, v); if (c === 0) { if (typeof l !== "object") { return r; @@ -778,14 +778,14 @@ function remove(x, param) { } } if (c < 0) { - var ll = remove(x, l); + let ll = remove(x, l); if (l === ll) { return param; } else { return bal(ll, v, r); } } - var rr = remove(x, r); + let rr = remove(x, r); if (r === rr) { return param; } else { @@ -797,24 +797,24 @@ function union(s1, s2) { if (typeof s1 !== "object") { return s2; } - var h1 = s1.h; - var v1 = s1.v; + let h1 = s1.h; + let v1 = s1.v; if (typeof s2 !== "object") { return s1; } - var h2 = s2.h; - var v2 = s2.v; + let h2 = s2.h; + let v2 = s2.v; if (h1 >= h2) { if (h2 === 1) { return add(v2, s1); } - var match = split(v1, s2); + let match = split(v1, s2); return join(union(s1.l, match[0]), v1, union(s1.r, match[2])); } if (h1 === 1) { return add(v1, s2); } - var match$1 = split(v2, s1); + let match$1 = split(v2, s1); return join(union(match$1[0], s2.l), v2, union(match$1[2], s2.r)); } @@ -825,11 +825,11 @@ function inter(s1, s2) { if (typeof s2 !== "object") { return "Empty"; } - var r1 = s1.r; - var v1 = s1.v; - var l1 = s1.l; - var match = split(v1, s2); - var l2 = match[0]; + let r1 = s1.r; + let v1 = s1.v; + let l1 = s1.l; + let match = split(v1, s2); + let l2 = match[0]; if (match[1]) { return join(inter(l1, l2), v1, inter(r1, match[2])); } else { @@ -844,11 +844,11 @@ function diff(s1, s2) { if (typeof s2 !== "object") { return s1; } - var r1 = s1.r; - var v1 = s1.v; - var l1 = s1.l; - var match = split(v1, s2); - var l2 = match[0]; + let r1 = s1.r; + let v1 = s1.v; + let l1 = s1.l; + let match = split(v1, s2); + let l2 = match[0]; if (match[1]) { return concat(diff(l1, l2), diff(r1, match[2])); } else { @@ -858,8 +858,8 @@ function diff(s1, s2) { function cons_enum(_s, _e) { while(true) { - var e = _e; - var s = _s; + let e = _e; + let s = _s; if (typeof s !== "object") { return e; } @@ -875,11 +875,11 @@ function cons_enum(_s, _e) { } function compare(s1, s2) { - var _e1 = cons_enum(s1, "End"); - var _e2 = cons_enum(s2, "End"); + let _e1 = cons_enum(s1, "End"); + let _e2 = cons_enum(s2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return 0; @@ -890,7 +890,7 @@ function compare(s1, s2) { if (typeof e2 !== "object") { return 1; } - var c = Caml.string_compare(e1._0, e2._0); + let c = Caml.string_compare(e1._0, e2._0); if (c !== 0) { return c; } @@ -906,20 +906,20 @@ function equal(s1, s2) { function subset(_s1, _s2) { while(true) { - var s2 = _s2; - var s1 = _s1; + let s2 = _s2; + let s1 = _s1; if (typeof s1 !== "object") { return true; } - var r1 = s1.r; - var v1 = s1.v; - var l1 = s1.l; + let r1 = s1.r; + let v1 = s1.v; + let l1 = s1.l; if (typeof s2 !== "object") { return false; } - var r2 = s2.r; - var l2 = s2.l; - var c = Caml.string_compare(v1, s2.v); + let r2 = s2.r; + let l2 = s2.l; + let c = Caml.string_compare(v1, s2.v); if (c === 0) { if (!subset(l1, l2)) { return false; @@ -957,7 +957,7 @@ function subset(_s1, _s2) { function iter(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } @@ -970,8 +970,8 @@ function iter(f, _param) { function fold(f, _s, _accu) { while(true) { - var accu = _accu; - var s = _s; + let accu = _accu; + let s = _s; if (typeof s !== "object") { return accu; } @@ -983,7 +983,7 @@ function fold(f, _s, _accu) { function for_all(p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return true; } @@ -1000,7 +1000,7 @@ function for_all(p, _param) { function exists(p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } @@ -1019,12 +1019,12 @@ function filter(p, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var v = param.v; - var l = param.l; - var l$p = filter(p, l); - var pv = Curry._1(p, v); - var r$p = filter(p, r); + let r = param.r; + let v = param.v; + let l = param.l; + let l$p = filter(p, l); + let pv = Curry._1(p, v); + let r$p = filter(p, r); if (pv) { if (l === l$p && r === r$p) { return param; @@ -1043,14 +1043,14 @@ function partition(p, param) { "Empty" ]; } - var v = param.v; - var match = partition(p, param.l); - var lf = match[1]; - var lt = match[0]; - var pv = Curry._1(p, v); - var match$1 = partition(p, param.r); - var rf = match$1[1]; - var rt = match$1[0]; + let v = param.v; + let match = partition(p, param.l); + let lf = match[1]; + let lt = match[0]; + let pv = Curry._1(p, v); + let match$1 = partition(p, param.r); + let rf = match$1[1]; + let rt = match$1[0]; if (pv) { return [ join(lt, v, rt), @@ -1074,8 +1074,8 @@ function cardinal(param) { function elements_aux(_accu, _param) { while(true) { - var param = _param; - var accu = _accu; + let param = _param; + let accu = _accu; if (typeof param !== "object") { return accu; } @@ -1094,15 +1094,15 @@ function elements(s) { function find(x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; - var c = Caml.string_compare(x, v); + let v = param.v; + let c = Caml.string_compare(x, v); if (c === 0) { return v; } @@ -1113,24 +1113,24 @@ function find(x, _param) { function find_first(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _param$1 = param.l; + let _v0 = v; + let _param$1 = param.l; while(true) { - var param$1 = _param$1; - var v0 = _v0; + let param$1 = _param$1; + let v0 = _v0; if (typeof param$1 !== "object") { return v0; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.l; _v0 = v$1; @@ -1147,21 +1147,21 @@ function find_first(f, _param) { function find_first_opt(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _param$1 = param.l; + let _v0 = v; + let _param$1 = param.l; while(true) { - var param$1 = _param$1; - var v0 = _v0; + let param$1 = _param$1; + let v0 = _v0; if (typeof param$1 !== "object") { return Caml_option.some(v0); } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.l; _v0 = v$1; @@ -1178,24 +1178,24 @@ function find_first_opt(f, _param) { function find_last(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _param$1 = param.r; + let _v0 = v; + let _param$1 = param.r; while(true) { - var param$1 = _param$1; - var v0 = _v0; + let param$1 = _param$1; + let v0 = _v0; if (typeof param$1 !== "object") { return v0; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.r; _v0 = v$1; @@ -1212,21 +1212,21 @@ function find_last(f, _param) { function find_last_opt(f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _param$1 = param.r; + let _v0 = v; + let _param$1 = param.r; while(true) { - var param$1 = _param$1; - var v0 = _v0; + let param$1 = _param$1; + let v0 = _v0; if (typeof param$1 !== "object") { return Caml_option.some(v0); } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.r; _v0 = v$1; @@ -1243,12 +1243,12 @@ function find_last_opt(f, _param) { function find_opt(x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; - var c = Caml.string_compare(x, v); + let v = param.v; + let c = Caml.string_compare(x, v); if (c === 0) { return Caml_option.some(v); } @@ -1261,12 +1261,12 @@ function map(f, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var v = param.v; - var l = param.l; - var l$p = map(f, l); - var v$p = Curry._1(f, v); - var r$p = map(f, r); + let r = param.r; + let v = param.v; + let l = param.l; + let l$p = map(f, l); + let v$p = Curry._1(f, v); + let r$p = map(f, r); if (l === l$p && v === v$p && r === r$p) { return param; } else if ((l$p === "Empty" || Caml.string_compare(max_elt(l$p), v$p) < 0) && (r$p === "Empty" || Caml.string_compare(v$p, min_elt(r$p)) < 0)) { @@ -1280,27 +1280,27 @@ function of_list(l) { if (!l) { return "Empty"; } - var match = l.tl; - var x0 = l.hd; + let match = l.tl; + let x0 = l.hd; if (!match) { return singleton(x0); } - var match$1 = match.tl; - var x1 = match.hd; + let match$1 = match.tl; + let x1 = match.hd; if (!match$1) { return add(x1, singleton(x0)); } - var match$2 = match$1.tl; - var x2 = match$1.hd; + let match$2 = match$1.tl; + let x2 = match$1.hd; if (!match$2) { return add(x2, add(x1, singleton(x0))); } - var match$3 = match$2.tl; - var x3 = match$2.hd; + let match$3 = match$2.tl; + let x3 = match$2.hd; if (match$3) { if (match$3.tl) { - var l$1 = List.sort_uniq($$String.compare, l); - var sub = function (n, l) { + let l$1 = List.sort_uniq($$String.compare, l); + let sub = function (n, l) { switch (n) { case 0 : return [ @@ -1323,7 +1323,7 @@ function of_list(l) { break; case 2 : if (l) { - var match = l.tl; + let match = l.tl; if (match) { return [ { @@ -1347,9 +1347,9 @@ function of_list(l) { break; case 3 : if (l) { - var match$1 = l.tl; + let match$1 = l.tl; if (match$1) { - var match$2 = match$1.tl; + let match$2 = match$1.tl; if (match$2) { return [ { @@ -1382,11 +1382,11 @@ function of_list(l) { default: } - var nl = n / 2 | 0; - var match$3 = sub(nl, l); - var l$1 = match$3[1]; + let nl = n / 2 | 0; + let match$3 = sub(nl, l); + let l$1 = match$3[1]; if (l$1) { - var match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl); + let match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl); return [ create(match$3[0], l$1.hd, match$4[0]), match$4[1] @@ -1411,7 +1411,7 @@ function of_list(l) { } } -var String_set = { +let String_set = { empty: "Empty", is_empty: is_empty, mem: mem, @@ -1449,19 +1449,19 @@ var String_set = { of_list: of_list }; -var Cycle = /* @__PURE__ */Caml_exceptions.create("Topsort_test.Cycle"); +let Cycle = /* @__PURE__ */Caml_exceptions.create("Topsort_test.Cycle"); function pathsort(graph) { - var visited = { + let visited = { contents: /* [] */0 }; - var empty_path = [ + let empty_path = [ "Empty", /* [] */0 ]; - var $plus$great = function (node, param) { - var stack = param[1]; - var set = param[0]; + let $plus$great = function (node, param) { + let stack = param[1]; + let set = param[0]; if (mem(node, set)) { throw { RE_EXN_ID: Cycle, @@ -1480,12 +1480,12 @@ function pathsort(graph) { } ]; }; - var sort_nodes = function (path, nodes) { + let sort_nodes = function (path, nodes) { List.iter((function (node) { sort_node(path, node); }), nodes); }; - var sort_node = function (path, node) { + let sort_node = function (path, node) { if (!List.mem(node, visited.contents)) { sort_nodes($plus$great(node, path), nexts(node, graph)); visited.contents = { @@ -1551,16 +1551,16 @@ try { }; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); - var exit = 0; + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exit = 0; if (exn.RE_EXN_ID === Cycle) { - var match = exn._1; + let match = exn._1; if (match && match.hd === "go") { - var match$1 = match.tl; + let match$1 = match.tl; if (match$1 && match$1.hd === "washup") { - var match$2 = match$1.tl; + let match$2 = match$1.tl; if (match$2 && match$2.hd === "eat") { - var match$3 = match$2.tl; + let match$3 = match$2.tl; if (!(match$3 && match$3.hd === "go" && !match$3.tl)) { exit = 1; } diff --git a/jscomp/test/tramp_fib.js b/jscomp/test/tramp_fib.js index 549622be4b..f19c8cc038 100644 --- a/jscomp/test/tramp_fib.js +++ b/jscomp/test/tramp_fib.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -32,7 +32,7 @@ function fib(n, k) { } } -var u = fib(10, (function (x) { +let u = fib(10, (function (x) { return { TAG: "Continue", _0: x @@ -41,7 +41,7 @@ var u = fib(10, (function (x) { function iter(_bounce) { while(true) { - var bounce = _bounce; + let bounce = _bounce; if (bounce.TAG === "Continue") { return bounce._0; } diff --git a/jscomp/test/tuple_alloc.js b/jscomp/test/tuple_alloc.js index aa36c4a4cd..19fc3755d4 100644 --- a/jscomp/test/tuple_alloc.js +++ b/jscomp/test/tuple_alloc.js @@ -1,9 +1,9 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); -var v = { +let v = { contents: 0 }; @@ -15,7 +15,7 @@ function incr(param) { v.contents = v.contents + 1 | 0; } -var vv = { +let vv = { contents: 0 }; @@ -28,9 +28,9 @@ function incr2(param) { } function f(a, b, d, e) { - var h = Curry._1(a, b); - var u = Curry._1(d, h); - var v = Curry._1(e, h); + let h = Curry._1(a, b); + let u = Curry._1(d, h); + let v = Curry._1(e, h); return u + v | 0; } diff --git a/jscomp/test/type_disambiguate.js b/jscomp/test/type_disambiguate.js index 430222f987..22dd58bcc4 100644 --- a/jscomp/test/type_disambiguate.js +++ b/jscomp/test/type_disambiguate.js @@ -2,14 +2,14 @@ 'use strict'; -var N = {}; +let N = {}; function f(e) { return (e.a + e.b | 0) + e.c | 0; } function f1(e) { - var c = e.c; + let c = e.c; return ((e.a + e.b | 0) + c | 0) + e.d(c) | 0; } diff --git a/jscomp/test/typeof_test.js b/jscomp/test/typeof_test.js index 719620660a..0c3b24f510 100644 --- a/jscomp/test/typeof_test.js +++ b/jscomp/test/typeof_test.js @@ -1,11 +1,11 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Js_types = require("../../lib/js/js_types.js"); +let Mt = require("./mt.js"); +let Js_types = require("../../lib/js/js_types.js"); function string_or_number(x) { - var ty = Js_types.classify(x); + let ty = Js_types.classify(x); if (typeof ty !== "object") { switch (ty) { default: @@ -28,7 +28,7 @@ function string_or_number(x) { } } -var suites_0 = [ +let suites_0 = [ "int_type", (function (param) { return { @@ -39,7 +39,7 @@ var suites_0 = [ }) ]; -var suites_1 = { +let suites_1 = { hd: [ "string_type", (function (param) { @@ -179,7 +179,7 @@ var suites_1 = { } }; -var suites = { +let suites = { hd: suites_0, tl: suites_1 }; diff --git a/jscomp/test/unboxed_attribute_test.js b/jscomp/test/unboxed_attribute_test.js index 3e25b6f289..9bc33ddede 100644 --- a/jscomp/test/unboxed_attribute_test.js +++ b/jscomp/test/unboxed_attribute_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -23,25 +23,25 @@ function get(x) { return x; } -var x = "foo"; +let x = "foo"; eq("File \"unboxed_attribute_test.res\", line 19, characters 4-11", x, x); -var x$1 = "foo"; +let x$1 = "foo"; eq("File \"unboxed_attribute_test.res\", line 34, characters 5-12", x$1, x$1); -var x$2 = "foo"; +let x$2 = "foo"; eq("File \"unboxed_attribute_test.res\", line 43, characters 4-11", x$2, x$2); -var y = {}; +let y = {}; y._0 = y; Mt.from_pair_suites("unboxed_attribute_test.res", suites.contents); -var v0 = 3; +let v0 = 3; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/unboxed_crash.js b/jscomp/test/unboxed_crash.js index 59df909bab..96af2b0708 100644 --- a/jscomp/test/unboxed_crash.js +++ b/jscomp/test/unboxed_crash.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); function g(x) { return Curry._1(x, x); } -var loop = g(g); +let loop = g(g); exports.g = g; exports.loop = loop; diff --git a/jscomp/test/unboxed_use_case.js b/jscomp/test/unboxed_use_case.js index bd935592f8..45124f4231 100644 --- a/jscomp/test/unboxed_use_case.js +++ b/jscomp/test/unboxed_use_case.js @@ -1,8 +1,8 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); function map_pair(r, param) { return [ @@ -20,7 +20,7 @@ map_pair(u, [ true ]); -var hi = [ +let hi = [ 3, 2, "x" @@ -30,14 +30,14 @@ console.log(3); console.log("x"); -var v0 = {}; +let v0 = {}; Caml_obj.update_dummy(v0, { NAME: "A", VAL: v0 }); -var v1 = { +let v1 = { NAME: "A", VAL: "B" }; diff --git a/jscomp/test/uncurried_cast.js b/jscomp/test/uncurried_cast.js index 983f630ba3..d0c893c335 100644 --- a/jscomp/test/uncurried_cast.js +++ b/jscomp/test/uncurried_cast.js @@ -1,26 +1,26 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); -var Belt_List = require("../../lib/js/belt_List.js"); -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Curry = require("../../lib/js/curry.js"); +let Belt_List = require("../../lib/js/belt_List.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); function raise(e) { throw e; } -var map = Belt_List.mapU; +let map = Belt_List.mapU; -var List = { +let List = { map: map }; -var Uncurried = { +let Uncurried = { raise: raise, List: List }; -var E = /* @__PURE__ */Caml_exceptions.create("Uncurried_cast.E"); +let E = /* @__PURE__ */Caml_exceptions.create("Uncurried_cast.E"); function testRaise(param) { throw { @@ -29,7 +29,7 @@ function testRaise(param) { }; } -var l = Belt_List.mapU({ +let l = Belt_List.mapU({ hd: 1, tl: { hd: 2, @@ -39,7 +39,7 @@ var l = Belt_List.mapU({ return x + 1 | 0; })); -var partial_arg = { +let partial_arg = { hd: 1, tl: { hd: 2, @@ -51,13 +51,13 @@ function partial(param) { return map(partial_arg, param); } -var ll = partial(function (x) { +let ll = partial(function (x) { return x + 1 | 0; }); function withOpts(xOpt, y, zOpt, w) { - var x = xOpt !== undefined ? xOpt : 3; - var z = zOpt !== undefined ? zOpt : 4; + let x = xOpt !== undefined ? xOpt : 3; + let z = zOpt !== undefined ? zOpt : 4; return ((x + y | 0) + z | 0) + w | 0; } @@ -65,9 +65,9 @@ function still2Args(param, param$1) { return withOpts(undefined, 4, param, param$1); } -var anInt = Curry._1(still2Args, 3)(5); +let anInt = Curry._1(still2Args, 3)(5); -var StandardNotation = { +let StandardNotation = { testRaise: testRaise, l: l, partial: partial, @@ -84,7 +84,7 @@ function testRaise$1() { }; } -var l$1 = Belt_List.mapU({ +let l$1 = Belt_List.mapU({ hd: 1, tl: { hd: 2, @@ -94,7 +94,7 @@ var l$1 = Belt_List.mapU({ return x + 1 | 0; })); -var partial_arg$1 = { +let partial_arg$1 = { hd: 1, tl: { hd: 2, @@ -106,13 +106,13 @@ function partial$1(param) { return map(partial_arg$1, param); } -var ll$1 = partial$1(function (x) { +let ll$1 = partial$1(function (x) { return x + 1 | 0; }); function withOpts$1(xOpt, y, zOpt, w) { - var x = xOpt !== undefined ? xOpt : 3; - var z = zOpt !== undefined ? zOpt : 4; + let x = xOpt !== undefined ? xOpt : 3; + let z = zOpt !== undefined ? zOpt : 4; return ((x + y | 0) + z | 0) + w | 0; } @@ -120,9 +120,9 @@ function still2Args$1(param, param$1) { return withOpts$1(undefined, 4, param, param$1); } -var partial_arg$2 = 3; +let partial_arg$2 = 3; -var anInt$1 = (function (param) { +let anInt$1 = (function (param) { return still2Args$1(partial_arg$2, param); })(5); diff --git a/jscomp/test/uncurried_default.args.js b/jscomp/test/uncurried_default.args.js index 2c662976a7..523750380f 100644 --- a/jscomp/test/uncurried_default.args.js +++ b/jscomp/test/uncurried_default.args.js @@ -1,52 +1,52 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); +let Curry = require("../../lib/js/curry.js"); function withOpt(xOpt, y) { - var x = xOpt !== undefined ? xOpt : 1; + let x = xOpt !== undefined ? xOpt : 1; return function (zOpt, w) { - var z = zOpt !== undefined ? zOpt : 1; + let z = zOpt !== undefined ? zOpt : 1; return ((x + y | 0) + z | 0) + w | 0; }; } -var testWithOpt = withOpt(undefined, 3)(undefined, 4); +let testWithOpt = withOpt(undefined, 3)(undefined, 4); -var partial_arg = 10; +let partial_arg = 10; -var partial = Curry._1((function (param) { +let partial = Curry._1((function (param) { return withOpt(partial_arg, param); })(3), 4)(11); -var total = withOpt(10, 3)(4, 11); +let total = withOpt(10, 3)(4, 11); function foo1(xOpt, y) { - var x = xOpt !== undefined ? xOpt : 3; + let x = xOpt !== undefined ? xOpt : 3; return x + y | 0; } -var x = 3; +let x = 3; -var r1 = x + 11 | 0; +let r1 = x + 11 | 0; function foo2(y, xOpt, zOpt) { - var x = xOpt !== undefined ? xOpt : 3; - var z = zOpt !== undefined ? zOpt : 4; + let x = xOpt !== undefined ? xOpt : 3; + let z = zOpt !== undefined ? zOpt : 4; return (x + y | 0) + z | 0; } -var r2 = foo2(11, undefined, undefined); +let r2 = foo2(11, undefined, undefined); function foo3(xOpt, yOpt) { - var x = xOpt !== undefined ? xOpt : 3; - var y = yOpt !== undefined ? yOpt : 4; + let x = xOpt !== undefined ? xOpt : 3; + let y = yOpt !== undefined ? yOpt : 4; return x + y | 0; } -var r3 = foo3(undefined, undefined); +let r3 = foo3(undefined, undefined); -var StandardNotation = { +let StandardNotation = { withOpt: withOpt, testWithOpt: testWithOpt, partial: partial, @@ -60,53 +60,53 @@ var StandardNotation = { }; function withOpt$1(xOpt, y) { - var x = xOpt !== undefined ? xOpt : 1; + let x = xOpt !== undefined ? xOpt : 1; return function (zOpt, w) { - var z = zOpt !== undefined ? zOpt : 1; + let z = zOpt !== undefined ? zOpt : 1; return ((x + y | 0) + z | 0) + w | 0; }; } -var testWithOpt$1 = withOpt$1(undefined, 3)(undefined, 4); +let testWithOpt$1 = withOpt$1(undefined, 3)(undefined, 4); -var partial_arg$1 = 10; +let partial_arg$1 = 10; -var partial$1 = Curry._1((function (param) { +let partial$1 = Curry._1((function (param) { return withOpt$1(partial_arg$1, param); })(3), 4)(11); -var total$1 = withOpt$1(10, 3)(4, 11); +let total$1 = withOpt$1(10, 3)(4, 11); function foo1$1(xOpt, y) { - var x = xOpt !== undefined ? xOpt : 3; + let x = xOpt !== undefined ? xOpt : 3; return x + y | 0; } -var x$1 = 3; +let x$1 = 3; -var r1$1 = x$1 + 11 | 0; +let r1$1 = x$1 + 11 | 0; function foo2$1(y, xOpt, zOpt) { - var x = xOpt !== undefined ? xOpt : 3; - var z = zOpt !== undefined ? zOpt : 4; + let x = xOpt !== undefined ? xOpt : 3; + let z = zOpt !== undefined ? zOpt : 4; return (x + y | 0) + z | 0; } -var r2$1 = foo2$1(11, undefined, undefined); +let r2$1 = foo2$1(11, undefined, undefined); function foo3$1(xOpt, yOpt) { - var x = xOpt !== undefined ? xOpt : 3; - var y = yOpt !== undefined ? yOpt : 4; + let x = xOpt !== undefined ? xOpt : 3; + let y = yOpt !== undefined ? yOpt : 4; return x + y | 0; } -var r3$1 = foo3$1(undefined, undefined); +let r3$1 = foo3$1(undefined, undefined); function foo(func) { return func() + 1 | 0; } -var M = { +let M = { foo: foo }; diff --git a/jscomp/test/uncurried_pipe.js b/jscomp/test/uncurried_pipe.js index 99620a8220..55c0ae9d4e 100644 --- a/jscomp/test/uncurried_pipe.js +++ b/jscomp/test/uncurried_pipe.js @@ -10,19 +10,19 @@ function addC(x, y) { return x + y | 0; } -var v7 = 7; +let v7 = 7; -var v17 = 17; +let v17 = 17; -var v27 = 27; +let v27 = 27; -var v37 = 37; +let v37 = 37; function unary(x) { return x + 1 | 0; } -var StandardNotation = { +let StandardNotation = { add: add, addC: addC, v7: v7, @@ -32,15 +32,15 @@ var StandardNotation = { unary: unary }; -var v7$1 = 7; +let v7$1 = 7; -var v17$1 = 17; +let v17$1 = 17; -var v27$1 = 27; +let v27$1 = 27; -var v37$1 = 37; +let v37$1 = 37; -var v100 = 100; +let v100 = 100; exports.StandardNotation = StandardNotation; exports.v7 = v7$1; diff --git a/jscomp/test/uncurry_external_test.js b/jscomp/test/uncurry_external_test.js index dbbdc307ed..57141e2d66 100644 --- a/jscomp/test/uncurry_external_test.js +++ b/jscomp/test/uncurry_external_test.js @@ -1,13 +1,13 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); +let Mt = require("./mt.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -33,7 +33,7 @@ function sum(a,b){ } ; -var h = sum(1.0, 2.0); +let h = sum(1.0, 2.0); eq("File \"uncurry_external_test.res\", line 19, characters 12-19", h, 3); diff --git a/jscomp/test/uncurry_glob_test.js b/jscomp/test/uncurry_glob_test.js index c0703e5628..cd2c5f391a 100644 --- a/jscomp/test/uncurry_glob_test.js +++ b/jscomp/test/uncurry_glob_test.js @@ -3,7 +3,7 @@ function M(U) { - var v = U.f(100, "x"); + let v = U.f(100, "x"); return { v: v }; diff --git a/jscomp/test/undef_regression2_test.js b/jscomp/test/undef_regression2_test.js index cfda3dee3a..c534601ce0 100644 --- a/jscomp/test/undef_regression2_test.js +++ b/jscomp/test/undef_regression2_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_option = require("../../lib/js/caml_option.js"); +let Mt = require("./mt.js"); +let Caml_option = require("../../lib/js/caml_option.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -45,12 +45,12 @@ function ok(loc, x) { }; } -var match = typeof ___undefined_value === "undefined" ? undefined : ___undefined_value; +let match = typeof ___undefined_value === "undefined" ? undefined : ___undefined_value; -var a = match !== undefined ? 2 : 1; +let a = match !== undefined ? 2 : 1; function test(param) { - var match = typeof __DEV__ === "undefined" ? undefined : __DEV__; + let match = typeof __DEV__ === "undefined" ? undefined : __DEV__; if (match !== undefined) { console.log("dev mode"); } else { @@ -59,7 +59,7 @@ function test(param) { } function test2(param) { - var f = typeof __filename === "undefined" ? undefined : __filename; + let f = typeof __filename === "undefined" ? undefined : __filename; if (f !== undefined) { console.log(f); } else { diff --git a/jscomp/test/undef_regression_test.js b/jscomp/test/undef_regression_test.js index 814f0bcc0f..b0f7d3fa3c 100644 --- a/jscomp/test/undef_regression_test.js +++ b/jscomp/test/undef_regression_test.js @@ -6,7 +6,7 @@ function f(obj) { if (typeof obj === "function") { return; } - var size = obj.length; + let size = obj.length; if (size !== undefined) { console.log(size); return; diff --git a/jscomp/test/undefine_conditional.js b/jscomp/test/undefine_conditional.js index 1124e51ff1..71b40893dd 100644 --- a/jscomp/test/undefine_conditional.js +++ b/jscomp/test/undefine_conditional.js @@ -2,11 +2,11 @@ 'use strict'; -var x = 3; +let x = 3; -var y = 6; +let y = 6; -var has_ocaml_version = true; +let has_ocaml_version = true; exports.x = x; exports.y = y; diff --git a/jscomp/test/unit_undefined_test.js b/jscomp/test/unit_undefined_test.js index cc4e589115..72ca85f67d 100644 --- a/jscomp/test/unit_undefined_test.js +++ b/jscomp/test/unit_undefined_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_option = require("../../lib/js/caml_option.js"); +let Mt = require("./mt.js"); +let Caml_option = require("../../lib/js/caml_option.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -46,13 +46,13 @@ function u0(x) { return Caml_option.some(x); } -var u1 = Caml_option.some(undefined); +let u1 = Caml_option.some(undefined); function u2(x) { return Caml_option.some(x); } -var u3 = Caml_option.some(undefined); +let u3 = Caml_option.some(undefined); eq("File \"unit_undefined_test.res\", line 41, characters 3-10", Caml_option.some(), Caml_option.some(undefined)); @@ -66,7 +66,7 @@ eq("File \"unit_undefined_test.res\", line 45, characters 3-10", undefined, unde Mt.from_pair_suites("unit_undefined_test.res", suites.contents); -var u4; +let u4; exports.suites = suites; exports.test_id = test_id; diff --git a/jscomp/test/unsafe_ppx_test.js b/jscomp/test/unsafe_ppx_test.js index c4f2090b88..d36a9fe128 100644 --- a/jscomp/test/unsafe_ppx_test.js +++ b/jscomp/test/unsafe_ppx_test.js @@ -1,29 +1,29 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Curry = require("../../lib/js/curry.js"); -var Pervasives = require("../../lib/js/pervasives.js"); -var Ffi_js_test = require("./ffi_js_test.js"); +let Mt = require("./mt.js"); +let Curry = require("../../lib/js/curry.js"); +let Pervasives = require("../../lib/js/pervasives.js"); +let Ffi_js_test = require("./ffi_js_test.js"); -var x = "\\x01\\x02\\x03"; +let x = "\\x01\\x02\\x03"; -var max = Math.max; +let max = Math.max; function $$test(x,y){ return x + y; } ; -var regression3 = Math.max; +let regression3 = Math.max; -var regression4 = Math.max; +let regression4 = Math.max; function g(a) { - var regression = (function(x,y){ + let regression = (function(x,y){ return "" }); - var regression2 = Math.max; + let regression2 = Math.max; regression(a, Pervasives.failwith); Curry._2(regression2, 3, 2); regression3(3, 2); @@ -32,7 +32,7 @@ function g(a) { })); } -var max2 = Math.max; +let max2 = Math.max; function umax(a, b) { return max2(a, b); @@ -42,15 +42,15 @@ function u(h) { return max2(3, h); } -var max3 = Math.max; +let max3 = Math.max; function uu(h) { return max2(3, h); } -var empty = Object.keys(3); +let empty = Object.keys(3); -var v = $$test(1, 2); +let v = $$test(1, 2); Mt.from_pair_suites("Unsafe_ppx_test", { hd: [ diff --git a/jscomp/test/update_record_test.js b/jscomp/test/update_record_test.js index 8ba65f8dcd..c5959d818f 100644 --- a/jscomp/test/update_record_test.js +++ b/jscomp/test/update_record_test.js @@ -1,14 +1,14 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Mt = require("./mt.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); +let Mt = require("./mt.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); -var suites = { +let suites = { contents: /* [] */0 }; -var test_id = { +let test_id = { contents: 0 }; @@ -34,7 +34,7 @@ function eq(loc, x, y) { } function f(x) { - var y = Caml_obj.obj_dup(x); + let y = Caml_obj.obj_dup(x); return { a0: 1, a1: y.a1, @@ -54,7 +54,7 @@ eq("File \"update_record_test.res\", line 28, characters 5-12", 1, f({ a5: 0 }).a0); -var val0 = { +let val0 = { "invalid_js_id'": 3, x: 2 }; @@ -66,7 +66,7 @@ function fff(x) { }; } -var val1 = fff(val0); +let val1 = fff(val0); eq("File \"update_record_test.res\", line 41, characters 5-12", 3, 3); diff --git a/jscomp/test/variant.js b/jscomp/test/variant.js index f2314392aa..b9db735100 100644 --- a/jscomp/test/variant.js +++ b/jscomp/test/variant.js @@ -1,10 +1,10 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../../lib/js/curry.js"); -var Caml_obj = require("../../lib/js/caml_obj.js"); -var Caml_exceptions = require("../../lib/js/caml_exceptions.js"); -var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); +let Curry = require("../../lib/js/curry.js"); +let Caml_obj = require("../../lib/js/caml_obj.js"); +let Caml_exceptions = require("../../lib/js/caml_exceptions.js"); +let Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js"); function foo(x) { if (typeof x !== "object") { @@ -20,7 +20,7 @@ function foo(x) { case "C" : return x._0 + x._1 | 0; case "D" : - var match = x._0; + let match = x._0; return match[0] + match[1] | 0; } @@ -55,17 +55,17 @@ function switchNum(x) { } } -var same = Caml_obj.equal; +let same = Caml_obj.equal; -var compare = Caml_obj.compare; +let compare = Caml_obj.compare; -var Path = { +let Path = { same: same, compare: compare }; function Make(M) { - var find = function (x) { + let find = function (x) { }; return { @@ -77,7 +77,7 @@ function find(x) { } -var M = { +let M = { find: find }; @@ -86,7 +86,7 @@ function rollback_path(subst, p) { return "try"; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { switch (p.TAG) { case "Pdot" : @@ -102,22 +102,22 @@ function rollback_path(subst, p) { } } -var EA1 = /* @__PURE__ */Caml_exceptions.create("Variant.EA1"); +let EA1 = /* @__PURE__ */Caml_exceptions.create("Variant.EA1"); -var EA2 = /* @__PURE__ */Caml_exceptions.create("Variant.EA2"); +let EA2 = /* @__PURE__ */Caml_exceptions.create("Variant.EA2"); -var EB = /* @__PURE__ */Caml_exceptions.create("Variant.EB"); +let EB = /* @__PURE__ */Caml_exceptions.create("Variant.EB"); -var EC = /* @__PURE__ */Caml_exceptions.create("Variant.EC"); +let EC = /* @__PURE__ */Caml_exceptions.create("Variant.EC"); -var ED = /* @__PURE__ */Caml_exceptions.create("Variant.ED"); +let ED = /* @__PURE__ */Caml_exceptions.create("Variant.ED"); function fooExn(f) { try { return Curry._1(f, undefined); } catch (raw_n){ - var n = Caml_js_exceptions.internalToOCamlException(raw_n); + let n = Caml_js_exceptions.internalToOCamlException(raw_n); if (n.RE_EXN_ID === EA1) { return 1; } @@ -131,29 +131,29 @@ function fooExn(f) { return n._1 + n._2 | 0; } if (n.RE_EXN_ID === ED) { - var match = n._1; + let match = n._1; return match[0] + match[1] | 0; } throw n; } } -var a1 = "A1"; +let a1 = "A1"; -var a2 = "A2"; +let a2 = "A2"; -var b = { +let b = { TAG: "B", _0: 34 }; -var c = { +let c = { TAG: "C", _0: 4, _1: 2 }; -var d = { +let d = { TAG: "D", _0: [ 4, diff --git a/jscomp/test/variantsMatching.js b/jscomp/test/variantsMatching.js index ef1b48f939..62c4678445 100644 --- a/jscomp/test/variantsMatching.js +++ b/jscomp/test/variantsMatching.js @@ -91,14 +91,14 @@ function third(l) { if (l.hd !== 1) { return false; } - var match = l.tl; + let match = l.tl; if (!match) { return false; } if (match.hd !== 2) { return false; } - var match$1 = match.tl; + let match$1 = match.tl; if (match$1 && !(match$1.hd !== 3 || match$1.tl)) { return true; } else { @@ -113,21 +113,21 @@ function third2(l) { if (l._0 !== 1) { return false; } - var match = l._1; + let match = l._1; if (typeof match !== "object") { return false; } if (match._0 !== 2) { return false; } - var match$1 = match._1; + let match$1 = match._1; if (typeof match$1 !== "object") { return false; } if (match$1._0 !== 3) { return false; } - var tmp = match$1._1; + let tmp = match$1._1; if (typeof tmp !== "object") { return true; } else { @@ -159,17 +159,17 @@ function foo(x) { } } -var CustomizeTags_d = { +let CustomizeTags_d = { TAG: "qq", _0: 42 }; -var CustomizeTags_e = { +let CustomizeTags_e = { TAG: 42, _0: 0 }; -var CustomizeTags = { +let CustomizeTags = { foo: foo, a: "dd", b: 12, @@ -192,7 +192,7 @@ function plus(x, y) { } } -var MyUndefined = { +let MyUndefined = { $$undefined: undefined, isUndefined: isUndefined, plus: plus @@ -212,9 +212,9 @@ function plus$1(x, y) { } } -var MyNull_null = null; +let MyNull_null = null; -var MyNull = { +let MyNull = { $$null: MyNull_null, isNull: isNull, plus: plus$1 @@ -250,13 +250,13 @@ function kind(x) { } } -var expectSeven = plus$2(3, 4); +let expectSeven = plus$2(3, 4); console.log("expect 7:", expectSeven); -var MyNullable_null = null; +let MyNullable_null = null; -var MyNullable = { +let MyNullable = { $$null: MyNullable_null, $$undefined: undefined, isNull: isNull$1, @@ -322,7 +322,7 @@ function kind$1(x) { } } -var expectSeven$1 = plus$3({ +let expectSeven$1 = plus$3({ x: 4, y: 3 }, { @@ -332,9 +332,9 @@ var expectSeven$1 = plus$3({ console.log("expect {x:7, y:7}:", expectSeven$1); -var MyNullableExtended_null = null; +let MyNullableExtended_null = null; -var MyNullableExtended = { +let MyNullableExtended = { $$null: MyNullableExtended_null, $$undefined: undefined, whynot: "WhyNotAnotherOne", @@ -358,33 +358,33 @@ function area(shape) { } } -var TaggedUnions_circle = { +let TaggedUnions_circle = { kind: 1, radius: 10 }; -var TaggedUnions_square = { +let TaggedUnions_square = { kind: "square", sideLength: 10 }; -var TaggedUnions = { +let TaggedUnions = { area: area, circle: TaggedUnions_circle, square: TaggedUnions_square }; -var CustomTagNotInline_a = { +let CustomTagNotInline_a = { "custom-tag": "A", _0: 10 }; -var CustomTagNotInline_b = { +let CustomTagNotInline_b = { "custom-tag": "B", _0: 20 }; -var CustomTagNotInline = { +let CustomTagNotInline = { a: CustomTagNotInline_a, b: CustomTagNotInline_b }; @@ -407,7 +407,7 @@ function classify(x) { } } -var UntaggedWithBool = { +let UntaggedWithBool = { classify: classify }; @@ -419,7 +419,7 @@ function classify$1(x) { } } -var UntaggedWithTuple = { +let UntaggedWithTuple = { classify: classify$1 }; diff --git a/jscomp/test/webpack_config.js b/jscomp/test/webpack_config.js index e7af3f78f3..78d2b3ec79 100644 --- a/jscomp/test/webpack_config.js +++ b/jscomp/test/webpack_config.js @@ -1,23 +1,23 @@ // Generated by ReScript, PLEASE EDIT WITH CARE 'use strict'; -var List = require("../../lib/js/list.js"); -var List$1 = require("List"); -var List$2 = require("reactV"); -var List$3 = require("reactX"); -var Local = require("./local"); -var WebpackConfigJs = require("../../../webpack.config.js"); -var WebpackMiddlewareConfigJs = require("../../../webpack.middleware.config.js"); +let List = require("../../lib/js/list.js"); +let List$1 = require("List"); +let List$2 = require("reactV"); +let List$3 = require("reactX"); +let Local = require("./local"); +let WebpackConfigJs = require("../../../webpack.config.js"); +let WebpackMiddlewareConfigJs = require("../../../webpack.middleware.config.js"); -var configx = WebpackConfigJs; +let configx = WebpackConfigJs; -var WebpackConfig = { +let WebpackConfig = { configx: configx }; -var configx$1 = WebpackMiddlewareConfigJs; +let configx$1 = WebpackMiddlewareConfigJs; -var WebpackDevMiddlewareConfig = { +let WebpackDevMiddlewareConfig = { configx: configx$1 }; @@ -29,13 +29,13 @@ function configX$1(prim) { return WebpackConfigJs.configX(); } -var U = { +let U = { configX: configX$1 }; -var A = {}; +let A = {}; -var B = {}; +let B = {}; function f(param) { return [ diff --git a/lib/es6/arg.js b/lib/es6/arg.js index cf1c740869..ac450a1bc3 100644 --- a/lib/es6/arg.js +++ b/lib/es6/arg.js @@ -15,17 +15,17 @@ import * as Caml_string from "./caml_string.js"; import * as Caml_exceptions from "./caml_exceptions.js"; import * as Caml_js_exceptions from "./caml_js_exceptions.js"; -var Bad = /* @__PURE__ */Caml_exceptions.create("Arg.Bad"); +let Bad = /* @__PURE__ */Caml_exceptions.create("Arg.Bad"); -var Help = /* @__PURE__ */Caml_exceptions.create("Arg.Help"); +let Help = /* @__PURE__ */Caml_exceptions.create("Arg.Help"); -var Stop = /* @__PURE__ */Caml_exceptions.create("Arg.Stop"); +let Stop = /* @__PURE__ */Caml_exceptions.create("Arg.Stop"); function assoc3(x, _l) { while(true) { - var l = _l; + let l = _l; if (l) { - var match = l.hd; + let match = l.hd; if (Caml_obj.equal(match[0], x)) { return match[1]; } @@ -40,8 +40,8 @@ function assoc3(x, _l) { } function split(s) { - var i = $$String.index(s, /* '=' */61); - var len = s.length; + let i = $$String.index(s, /* '=' */61); + let len = s.length; return [ $$String.sub(s, 0, i), $$String.sub(s, i + 1 | 0, len - (i + 1 | 0) | 0) @@ -70,13 +70,13 @@ function help_action(param) { } function add_help(speclist) { - var add1; + let add1; try { assoc3("-help", speclist); add1 = /* [] */0; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { add1 = { hd: [ @@ -93,13 +93,13 @@ function add_help(speclist) { throw exn; } } - var add2; + let add2; try { assoc3("--help", speclist); add2 = /* [] */0; } catch (raw_exn$1){ - var exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1); + let exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1); if (exn$1.RE_EXN_ID === "Not_found") { add2 = { hd: [ @@ -122,22 +122,22 @@ function add_help(speclist) { function usage_b(buf, speclist, errmsg) { $$Buffer.add_string(buf, errmsg + "\n"); List.iter((function (param) { - var doc = param[2]; + let doc = param[2]; if (doc.length === 0) { return; } - var spec = param[1]; - var key = param[0]; + let spec = param[1]; + let key = param[0]; if (spec.TAG !== "Symbol") { return $$Buffer.add_string(buf, " " + key + " " + doc + "\n"); } - var sym = make_symlist("{", "|", "}", spec._0); + let sym = make_symlist("{", "|", "}", spec._0); return $$Buffer.add_string(buf, " " + key + " " + sym + doc + "\n"); }), add_help(speclist)); } function usage_string(speclist, errmsg) { - var b = $$Buffer.create(200); + let b = $$Buffer.create(200); usage_b(b, speclist, errmsg); return $$Buffer.contents(b); } @@ -146,7 +146,7 @@ function usage(speclist, errmsg) { console.log(usage_string(speclist, errmsg)); } -var current = { +let current = { contents: 0 }; @@ -155,7 +155,7 @@ function bool_of_string_opt(x) { return Pervasives.bool_of_string(x); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Invalid_argument") { return; } @@ -168,7 +168,7 @@ function int_of_string_opt(x) { return Caml_format.int_of_string(x); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Failure") { return; } @@ -181,7 +181,7 @@ function float_of_string_opt(x) { return Caml_format.float_of_string(x); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Failure") { return; } @@ -190,13 +190,13 @@ function float_of_string_opt(x) { } function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist, anonfun, errmsg) { - var initpos = current.contents; - var convert_error = function (error) { - var b = $$Buffer.create(200); - var progname = initpos < argv.contents.length ? Caml_array.get(argv.contents, initpos) : "(?)"; + let initpos = current.contents; + let convert_error = function (error) { + let b = $$Buffer.create(200); + let progname = initpos < argv.contents.length ? Caml_array.get(argv.contents, initpos) : "(?)"; switch (error.TAG) { case "Unknown" : - var s = error._0; + let s = error._0; switch (s) { case "--help" : case "-help" : @@ -238,9 +238,9 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist current.contents = current.contents + 1 | 0; while(current.contents < argv.contents.length) { try { - var s = Caml_array.get(argv.contents, current.contents); + let s = Caml_array.get(argv.contents, current.contents); if (s.length >= 1 && Caml_string.get(s, 0) === /* '-' */45) { - var match; + let match; try { match = [ assoc3(s, speclist.contents), @@ -248,17 +248,17 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist ]; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { try { - var match$1 = split(s); + let match$1 = split(s); match = [ assoc3(match$1[0], speclist.contents), match$1[1] ]; } catch (raw_exn$1){ - var exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1); + let exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1); if (exn$1.RE_EXN_ID === "Not_found") { throw { RE_EXN_ID: Stop, @@ -275,8 +275,8 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist throw exn; } } - var follow = match[1]; - var no_arg = (function(s,follow){ + let follow = match[1]; + let no_arg = (function(s,follow){ return function no_arg(param) { if (follow === undefined) { return; @@ -293,7 +293,7 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist }; } }(s,follow)); - var get_arg = (function(s,follow){ + let get_arg = (function(s,follow){ return function get_arg(param) { if (follow !== undefined) { return follow; @@ -311,7 +311,7 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist }; } }(s,follow)); - var consume_arg = (function(follow){ + let consume_arg = (function(follow){ return function consume_arg(param) { if (follow !== undefined) { return; @@ -321,14 +321,14 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist } } }(follow)); - var treat_action = (function(s){ + let treat_action = (function(s){ return function treat_action(f) { switch (f.TAG) { case "Unit" : return Curry._1(f._0, undefined); case "Bool" : - var arg = get_arg(); - var s$1 = bool_of_string_opt(arg); + let arg = get_arg(); + let s$1 = bool_of_string_opt(arg); if (s$1 !== undefined) { Curry._1(f._0, s$1); } else { @@ -353,15 +353,15 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist f._0.contents = false; return; case "String" : - var arg$1 = get_arg(); + let arg$1 = get_arg(); Curry._1(f._0, arg$1); return consume_arg(); case "Set_string" : f._0.contents = get_arg(); return consume_arg(); case "Int" : - var arg$2 = get_arg(); - var x = int_of_string_opt(arg$2); + let arg$2 = get_arg(); + let x = int_of_string_opt(arg$2); if (x !== undefined) { Curry._1(f._0, x); } else { @@ -378,8 +378,8 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist } return consume_arg(); case "Set_int" : - var arg$3 = get_arg(); - var x$1 = int_of_string_opt(arg$3); + let arg$3 = get_arg(); + let x$1 = int_of_string_opt(arg$3); if (x$1 !== undefined) { f._0.contents = x$1; } else { @@ -396,8 +396,8 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist } return consume_arg(); case "Float" : - var arg$4 = get_arg(); - var x$2 = float_of_string_opt(arg$4); + let arg$4 = get_arg(); + let x$2 = float_of_string_opt(arg$4); if (x$2 !== undefined) { Curry._1(f._0, x$2); } else { @@ -414,8 +414,8 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist } return consume_arg(); case "Set_float" : - var arg$5 = get_arg(); - var x$3 = float_of_string_opt(arg$5); + let arg$5 = get_arg(); + let x$3 = float_of_string_opt(arg$5); if (x$3 !== undefined) { f._0.contents = x$3; } else { @@ -434,8 +434,8 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist case "Tuple" : return List.iter(treat_action, f._0); case "Symbol" : - var symb = f._0; - var arg$6 = get_arg(); + let symb = f._0; + let arg$6 = get_arg(); if (List.mem(arg$6, symb)) { Curry._1(f._1, arg$6); return consume_arg(); @@ -451,7 +451,7 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist Error: new Error() }; case "Rest" : - var f$1 = f._0; + let f$1 = f._0; while(current.contents < (argv.contents.length - 1 | 0)) { Curry._1(f$1, Caml_array.get(argv.contents, current.contents + 1 | 0)); consume_arg(); @@ -465,11 +465,11 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist Error: new Error() }; } - var arg$7 = get_arg(); - var newarg = Curry._1(f._0, arg$7); + let arg$7 = get_arg(); + let newarg = Curry._1(f._0, arg$7); consume_arg(); - var before = $$Array.sub(argv.contents, 0, current.contents + 1 | 0); - var after = $$Array.sub(argv.contents, current.contents + 1 | 0, (argv.contents.length - current.contents | 0) - 1 | 0); + let before = $$Array.sub(argv.contents, 0, current.contents + 1 | 0); + let after = $$Array.sub(argv.contents, current.contents + 1 | 0, (argv.contents.length - current.contents | 0) - 1 | 0); argv.contents = Caml_array.concat({ hd: before, tl: { @@ -491,7 +491,7 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist } } catch (raw_m){ - var m = Caml_js_exceptions.internalToOCamlException(raw_m); + let m = Caml_js_exceptions.internalToOCamlException(raw_m); if (m.RE_EXN_ID === Bad) { throw convert_error({ TAG: "Message", @@ -512,14 +512,14 @@ function parse_and_expand_argv_dynamic(current, argv, speclist, anonfun, errmsg) } function parse_argv_dynamic(currentOpt, argv, speclist, anonfun, errmsg) { - var current$1 = currentOpt !== undefined ? currentOpt : current; + let current$1 = currentOpt !== undefined ? currentOpt : current; parse_and_expand_argv_dynamic_aux(false, current$1, { contents: argv }, speclist, anonfun, errmsg); } function parse_argv(currentOpt, argv, speclist, anonfun, errmsg) { - var current$1 = currentOpt !== undefined ? currentOpt : current; + let current$1 = currentOpt !== undefined ? currentOpt : current; parse_argv_dynamic(current$1, argv, { contents: speclist }, anonfun, errmsg); @@ -530,7 +530,7 @@ function parse(l, f, msg) { return parse_argv(undefined, Sys.argv, l, f, msg); } catch (raw_msg){ - var msg$1 = Caml_js_exceptions.internalToOCamlException(raw_msg); + let msg$1 = Caml_js_exceptions.internalToOCamlException(raw_msg); if (msg$1.RE_EXN_ID === Bad) { console.log(msg$1._1); return Pervasives.exit(2); @@ -548,7 +548,7 @@ function parse_dynamic(l, f, msg) { return parse_argv_dynamic(undefined, Sys.argv, l, f, msg); } catch (raw_msg){ - var msg$1 = Caml_js_exceptions.internalToOCamlException(raw_msg); + let msg$1 = Caml_js_exceptions.internalToOCamlException(raw_msg); if (msg$1.RE_EXN_ID === Bad) { console.log(msg$1._1); return Pervasives.exit(2); @@ -563,19 +563,19 @@ function parse_dynamic(l, f, msg) { function parse_expand(l, f, msg) { try { - var argv = { + let argv = { contents: Sys.argv }; - var spec = { + let spec = { contents: l }; - var current$1 = { + let current$1 = { contents: current.contents }; return parse_and_expand_argv_dynamic(current$1, argv, spec, f, msg); } catch (raw_msg){ - var msg$1 = Caml_js_exceptions.internalToOCamlException(raw_msg); + let msg$1 = Caml_js_exceptions.internalToOCamlException(raw_msg); if (msg$1.RE_EXN_ID === Bad) { console.log(msg$1._1); return Pervasives.exit(2); @@ -589,10 +589,10 @@ function parse_expand(l, f, msg) { } function second_word(s) { - var len = s.length; - var loop = function (_n) { + let len = s.length; + let loop = function (_n) { while(true) { - var n = _n; + let n = _n; if (n >= len) { return len; } @@ -603,21 +603,21 @@ function second_word(s) { continue ; }; }; - var n; + let n; try { n = $$String.index(s, /* '\t' */9); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { - var exit = 0; - var n$1; + let exit = 0; + let n$1; try { n$1 = $$String.index(s, /* ' ' */32); exit = 2; } catch (raw_exn$1){ - var exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1); + let exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1); if (exn$1.RE_EXN_ID === "Not_found") { return len; } @@ -635,7 +635,7 @@ function second_word(s) { } function max_arg_len(cur, param) { - var kwd = param[0]; + let kwd = param[0]; if (param[1].TAG === "Symbol") { return Caml.int_max(cur, kwd.length); } else { @@ -644,7 +644,7 @@ function max_arg_len(cur, param) { } function replace_leading_tab(s) { - var seen = { + let seen = { contents: false }; return $$String.map((function (c) { @@ -658,30 +658,30 @@ function replace_leading_tab(s) { } function align(limitOpt, speclist) { - var limit = limitOpt !== undefined ? limitOpt : Pervasives.max_int; - var completed = add_help(speclist); - var len = List.fold_left(max_arg_len, 0, completed); - var len$1 = len < limit ? len : limit; + let limit = limitOpt !== undefined ? limitOpt : Pervasives.max_int; + let completed = add_help(speclist); + let len = List.fold_left(max_arg_len, 0, completed); + let len$1 = len < limit ? len : limit; return List.map((function (param) { - var spec = param[1]; - var kwd = param[0]; + let spec = param[1]; + let kwd = param[0]; if (param[2] === "") { return param; } if (spec.TAG === "Symbol") { - var msg = param[2]; - var cutcol = second_word(msg); - var spaces = " ".repeat(Caml.int_max(0, len$1 - cutcol | 0) + 3 | 0); + let msg = param[2]; + let cutcol = second_word(msg); + let spaces = " ".repeat(Caml.int_max(0, len$1 - cutcol | 0) + 3 | 0); return [ kwd, spec, "\n" + (spaces + replace_leading_tab(msg)) ]; } - var msg$1 = param[2]; - var cutcol$1 = second_word(msg$1); - var kwd_len = kwd.length; - var diff = (len$1 - kwd_len | 0) - cutcol$1 | 0; + let msg$1 = param[2]; + let cutcol$1 = second_word(msg$1); + let kwd_len = kwd.length; + let diff = (len$1 - kwd_len | 0) - cutcol$1 | 0; if (diff <= 0) { return [ kwd, @@ -689,9 +689,9 @@ function align(limitOpt, speclist) { replace_leading_tab(msg$1) ]; } - var spaces$1 = " ".repeat(diff); - var prefix = $$String.sub(replace_leading_tab(msg$1), 0, cutcol$1); - var suffix = $$String.sub(msg$1, cutcol$1, msg$1.length - cutcol$1 | 0); + let spaces$1 = " ".repeat(diff); + let prefix = $$String.sub(replace_leading_tab(msg$1), 0, cutcol$1); + let suffix = $$String.sub(msg$1, cutcol$1, msg$1.length - cutcol$1 | 0); return [ kwd, spec, diff --git a/lib/es6/array.js b/lib/es6/array.js index 398becc505..046ce2c381 100644 --- a/lib/es6/array.js +++ b/lib/es6/array.js @@ -6,9 +6,9 @@ import * as Caml_array from "./caml_array.js"; import * as Caml_exceptions from "./caml_exceptions.js"; import * as Caml_js_exceptions from "./caml_js_exceptions.js"; -var make_float = Caml_array.make_float; +let make_float = Caml_array.make_float; -var Floatarray = {}; +let Floatarray = {}; function init(l, f) { if (l === 0) { @@ -21,23 +21,23 @@ function init(l, f) { Error: new Error() }; } - var res = Caml_array.make(l, Curry._1(f, 0)); - for(var i = 1; i < l; ++i){ + let res = Caml_array.make(l, Curry._1(f, 0)); + for(let i = 1; i < l; ++i){ res[i] = Curry._1(f, i); } return res; } function make_matrix(sx, sy, init) { - var res = Caml_array.make(sx, []); - for(var x = 0; x < sx; ++x){ + let res = Caml_array.make(sx, []); + for(let x = 0; x < sx; ++x){ res[x] = Caml_array.make(sy, init); } return res; } function copy(a) { - var l = a.length; + let l = a.length; if (l === 0) { return []; } else { @@ -46,7 +46,7 @@ function copy(a) { } function append(a1, a2) { - var l1 = a1.length; + let l1 = a1.length; if (l1 === 0) { return copy(a2); } else if (a2.length === 0) { @@ -75,7 +75,7 @@ function fill(a, ofs, len, v) { Error: new Error() }; } - for(var i = ofs ,i_finish = ofs + len | 0; i < i_finish; ++i){ + for(let i = ofs ,i_finish = ofs + len | 0; i < i_finish; ++i){ a[i] = v; } } @@ -92,7 +92,7 @@ function blit(a1, ofs1, a2, ofs2, len) { } function iter(f, a) { - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ Curry._1(f, a[i]); } } @@ -105,26 +105,26 @@ function iter2(f, a, b) { Error: new Error() }; } - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ Curry._2(f, a[i], b[i]); } } function map(f, a) { - var l = a.length; + let l = a.length; if (l === 0) { return []; } - var r = Caml_array.make(l, Curry._1(f, a[0])); - for(var i = 1; i < l; ++i){ + let r = Caml_array.make(l, Curry._1(f, a[0])); + for(let i = 1; i < l; ++i){ r[i] = Curry._1(f, a[i]); } return r; } function map2(f, a, b) { - var la = a.length; - var lb = b.length; + let la = a.length; + let lb = b.length; if (la !== lb) { throw { RE_EXN_ID: "Invalid_argument", @@ -135,37 +135,37 @@ function map2(f, a, b) { if (la === 0) { return []; } - var r = Caml_array.make(la, Curry._2(f, a[0], b[0])); - for(var i = 1; i < la; ++i){ + let r = Caml_array.make(la, Curry._2(f, a[0], b[0])); + for(let i = 1; i < la; ++i){ r[i] = Curry._2(f, a[i], b[i]); } return r; } function iteri(f, a) { - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ Curry._2(f, i, a[i]); } } function mapi(f, a) { - var l = a.length; + let l = a.length; if (l === 0) { return []; } - var r = Caml_array.make(l, Curry._2(f, 0, a[0])); - for(var i = 1; i < l; ++i){ + let r = Caml_array.make(l, Curry._2(f, 0, a[0])); + for(let i = 1; i < l; ++i){ r[i] = Curry._2(f, i, a[i]); } return r; } function to_list(a) { - var _i = a.length - 1 | 0; - var _res = /* [] */0; + let _i = a.length - 1 | 0; + let _res = /* [] */0; while(true) { - var res = _res; - var i = _i; + let res = _res; + let i = _i; if (i < 0) { return res; } @@ -180,8 +180,8 @@ function to_list(a) { function list_length(_accu, _param) { while(true) { - var param = _param; - var accu = _accu; + let param = _param; + let accu = _accu; if (!param) { return accu; } @@ -195,12 +195,12 @@ function of_list(param) { if (!param) { return []; } - var a = Caml_array.make(list_length(0, param), param.hd); - var _i = 1; - var _param = param.tl; + let a = Caml_array.make(list_length(0, param), param.hd); + let _i = 1; + let _param = param.tl; while(true) { - var param$1 = _param; - var i = _i; + let param$1 = _param; + let i = _i; if (!param$1) { return a; } @@ -212,26 +212,26 @@ function of_list(param) { } function fold_left(f, x, a) { - var r = x; - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + let r = x; + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ r = Curry._2(f, r, a[i]); } return r; } function fold_right(f, a, x) { - var r = x; - for(var i = a.length - 1 | 0; i >= 0; --i){ + let r = x; + for(let i = a.length - 1 | 0; i >= 0; --i){ r = Curry._2(f, a[i], r); } return r; } function exists(p, a) { - var n = a.length; - var _i = 0; + let n = a.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === n) { return false; } @@ -244,10 +244,10 @@ function exists(p, a) { } function for_all(p, a) { - var n = a.length; - var _i = 0; + let n = a.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === n) { return true; } @@ -260,10 +260,10 @@ function for_all(p, a) { } function mem(x, a) { - var n = a.length; - var _i = 0; + let n = a.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === n) { return false; } @@ -276,10 +276,10 @@ function mem(x, a) { } function memq(x, a) { - var n = a.length; - var _i = 0; + let n = a.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === n) { return false; } @@ -291,12 +291,12 @@ function memq(x, a) { }; } -var Bottom = /* @__PURE__ */Caml_exceptions.create("Array.Bottom"); +let Bottom = /* @__PURE__ */Caml_exceptions.create("Array.Bottom"); function sort(cmp, a) { - var maxson = function (l, i) { - var i31 = ((i + i | 0) + i | 0) + 1 | 0; - var x = i31; + let maxson = function (l, i) { + let i31 = ((i + i | 0) + i | 0) + 1 | 0; + let x = i31; if ((i31 + 2 | 0) < l) { if (Curry._2(cmp, Caml_array.get(a, i31), Caml_array.get(a, i31 + 1 | 0)) < 0) { x = i31 + 1 | 0; @@ -318,12 +318,12 @@ function sort(cmp, a) { Error: new Error() }; }; - var trickle = function (l, i, e) { + let trickle = function (l, i, e) { try { - var _i = i; + let _i = i; while(true) { - var i$1 = _i; - var j = maxson(l, i$1); + let i$1 = _i; + let j = maxson(l, i$1); if (Curry._2(cmp, Caml_array.get(a, j), e) <= 0) { return Caml_array.set(a, i$1, e); } @@ -333,36 +333,36 @@ function sort(cmp, a) { }; } catch (raw_i){ - var i$2 = Caml_js_exceptions.internalToOCamlException(raw_i); + let i$2 = Caml_js_exceptions.internalToOCamlException(raw_i); if (i$2.RE_EXN_ID === Bottom) { return Caml_array.set(a, i$2._1, e); } throw i$2; } }; - var bubble = function (l, i) { + let bubble = function (l, i) { try { - var _i = i; + let _i = i; while(true) { - var i$1 = _i; - var j = maxson(l, i$1); + let i$1 = _i; + let j = maxson(l, i$1); Caml_array.set(a, i$1, Caml_array.get(a, j)); _i = j; continue ; }; } catch (raw_i){ - var i$2 = Caml_js_exceptions.internalToOCamlException(raw_i); + let i$2 = Caml_js_exceptions.internalToOCamlException(raw_i); if (i$2.RE_EXN_ID === Bottom) { return i$2._1; } throw i$2; } }; - var trickleup = function (_i, e) { + let trickleup = function (_i, e) { while(true) { - var i = _i; - var father = (i - 1 | 0) / 3 | 0; + let i = _i; + let father = (i - 1 | 0) / 3 | 0; if (i === father) { throw { RE_EXN_ID: "Assert_failure", @@ -385,41 +385,41 @@ function sort(cmp, a) { continue ; }; }; - var l = a.length; - for(var i = ((l + 1 | 0) / 3 | 0) - 1 | 0; i >= 0; --i){ + let l = a.length; + for(let i = ((l + 1 | 0) / 3 | 0) - 1 | 0; i >= 0; --i){ trickle(l, i, Caml_array.get(a, i)); } - for(var i$1 = l - 1 | 0; i$1 >= 2; --i$1){ - var e = Caml_array.get(a, i$1); + for(let i$1 = l - 1 | 0; i$1 >= 2; --i$1){ + let e = Caml_array.get(a, i$1); Caml_array.set(a, i$1, Caml_array.get(a, 0)); trickleup(bubble(i$1, 0), e); } if (l <= 1) { return; } - var e$1 = Caml_array.get(a, 1); + let e$1 = Caml_array.get(a, 1); Caml_array.set(a, 1, Caml_array.get(a, 0)); Caml_array.set(a, 0, e$1); } function stable_sort(cmp, a) { - var merge = function (src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = Caml_array.get(a, src1ofs); - var _i2 = src2ofs; - var _s2 = Caml_array.get(src2, src2ofs); - var _d = dstofs; + let merge = function (src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = Caml_array.get(a, src1ofs); + let _i2 = src2ofs; + let _s2 = Caml_array.get(src2, src2ofs); + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (Curry._2(cmp, s1, s2) <= 0) { Caml_array.set(dst, d, s1); - var i1$1 = i1 + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return blit(src2, i2, dst, d + 1 | 0, src2r - i2 | 0); } @@ -429,7 +429,7 @@ function stable_sort(cmp, a) { continue ; } Caml_array.set(dst, d, s2); - var i2$1 = i2 + 1 | 0; + let i2$1 = i2 + 1 | 0; if (i2$1 >= src2r) { return blit(a, i1, dst, d + 1 | 0, src1r - i1 | 0); } @@ -439,10 +439,10 @@ function stable_sort(cmp, a) { continue ; }; }; - var isortto = function (srcofs, dst, dstofs, len) { - for(var i = 0; i < len; ++i){ - var e = Caml_array.get(a, srcofs + i | 0); - var j = (dstofs + i | 0) - 1 | 0; + let isortto = function (srcofs, dst, dstofs, len) { + for(let i = 0; i < len; ++i){ + let e = Caml_array.get(a, srcofs + i | 0); + let j = (dstofs + i | 0) - 1 | 0; while(j >= dstofs && Curry._2(cmp, Caml_array.get(dst, j), e) > 0) { Caml_array.set(dst, j + 1 | 0, Caml_array.get(dst, j)); j = j - 1 | 0; @@ -450,33 +450,33 @@ function stable_sort(cmp, a) { Caml_array.set(dst, j + 1 | 0, e); } }; - var sortto = function (srcofs, dst, dstofs, len) { + let sortto = function (srcofs, dst, dstofs, len) { if (len <= 5) { return isortto(srcofs, dst, dstofs, len); } - var l1 = len / 2 | 0; - var l2 = len - l1 | 0; + let l1 = len / 2 | 0; + let l2 = len - l1 | 0; sortto(srcofs + l1 | 0, dst, dstofs + l1 | 0, l2); sortto(srcofs, a, srcofs + l2 | 0, l1); merge(srcofs + l2 | 0, l1, dst, dstofs + l1 | 0, l2, dst, dstofs); }; - var l = a.length; + let l = a.length; if (l <= 5) { return isortto(0, a, 0, l); } - var l1 = l / 2 | 0; - var l2 = l - l1 | 0; - var t = Caml_array.make(l2, Caml_array.get(a, 0)); + let l1 = l / 2 | 0; + let l2 = l - l1 | 0; + let t = Caml_array.make(l2, Caml_array.get(a, 0)); sortto(l1, t, 0, l2); sortto(0, a, l2, l1); merge(l2, l1, t, 0, l2, a, 0); } -var create_matrix = make_matrix; +let create_matrix = make_matrix; -var concat = Caml_array.concat; +let concat = Caml_array.concat; -var fast_sort = stable_sort; +let fast_sort = stable_sort; export { make_float, diff --git a/lib/es6/arrayLabels.js b/lib/es6/arrayLabels.js index f569f6cd89..b15c310a39 100644 --- a/lib/es6/arrayLabels.js +++ b/lib/es6/arrayLabels.js @@ -6,9 +6,9 @@ import * as Caml_array from "./caml_array.js"; import * as Caml_exceptions from "./caml_exceptions.js"; import * as Caml_js_exceptions from "./caml_js_exceptions.js"; -var make_float = Caml_array.make_float; +let make_float = Caml_array.make_float; -var Floatarray = {}; +let Floatarray = {}; function init(l, f) { if (l === 0) { @@ -21,23 +21,23 @@ function init(l, f) { Error: new Error() }; } - var res = Caml_array.make(l, Curry._1(f, 0)); - for(var i = 1; i < l; ++i){ + let res = Caml_array.make(l, Curry._1(f, 0)); + for(let i = 1; i < l; ++i){ res[i] = Curry._1(f, i); } return res; } function make_matrix(sx, sy, init) { - var res = Caml_array.make(sx, []); - for(var x = 0; x < sx; ++x){ + let res = Caml_array.make(sx, []); + for(let x = 0; x < sx; ++x){ res[x] = Caml_array.make(sy, init); } return res; } function copy(a) { - var l = a.length; + let l = a.length; if (l === 0) { return []; } else { @@ -46,7 +46,7 @@ function copy(a) { } function append(a1, a2) { - var l1 = a1.length; + let l1 = a1.length; if (l1 === 0) { return copy(a2); } else if (a2.length === 0) { @@ -75,7 +75,7 @@ function fill(a, ofs, len, v) { Error: new Error() }; } - for(var i = ofs ,i_finish = ofs + len | 0; i < i_finish; ++i){ + for(let i = ofs ,i_finish = ofs + len | 0; i < i_finish; ++i){ a[i] = v; } } @@ -92,7 +92,7 @@ function blit(a1, ofs1, a2, ofs2, len) { } function iter(f, a) { - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ Curry._1(f, a[i]); } } @@ -105,26 +105,26 @@ function iter2(f, a, b) { Error: new Error() }; } - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ Curry._2(f, a[i], b[i]); } } function map(f, a) { - var l = a.length; + let l = a.length; if (l === 0) { return []; } - var r = Caml_array.make(l, Curry._1(f, a[0])); - for(var i = 1; i < l; ++i){ + let r = Caml_array.make(l, Curry._1(f, a[0])); + for(let i = 1; i < l; ++i){ r[i] = Curry._1(f, a[i]); } return r; } function map2(f, a, b) { - var la = a.length; - var lb = b.length; + let la = a.length; + let lb = b.length; if (la !== lb) { throw { RE_EXN_ID: "Invalid_argument", @@ -135,37 +135,37 @@ function map2(f, a, b) { if (la === 0) { return []; } - var r = Caml_array.make(la, Curry._2(f, a[0], b[0])); - for(var i = 1; i < la; ++i){ + let r = Caml_array.make(la, Curry._2(f, a[0], b[0])); + for(let i = 1; i < la; ++i){ r[i] = Curry._2(f, a[i], b[i]); } return r; } function iteri(f, a) { - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ Curry._2(f, i, a[i]); } } function mapi(f, a) { - var l = a.length; + let l = a.length; if (l === 0) { return []; } - var r = Caml_array.make(l, Curry._2(f, 0, a[0])); - for(var i = 1; i < l; ++i){ + let r = Caml_array.make(l, Curry._2(f, 0, a[0])); + for(let i = 1; i < l; ++i){ r[i] = Curry._2(f, i, a[i]); } return r; } function to_list(a) { - var _i = a.length - 1 | 0; - var _res = /* [] */0; + let _i = a.length - 1 | 0; + let _res = /* [] */0; while(true) { - var res = _res; - var i = _i; + let res = _res; + let i = _i; if (i < 0) { return res; } @@ -180,8 +180,8 @@ function to_list(a) { function list_length(_accu, _param) { while(true) { - var param = _param; - var accu = _accu; + let param = _param; + let accu = _accu; if (!param) { return accu; } @@ -195,12 +195,12 @@ function of_list(param) { if (!param) { return []; } - var a = Caml_array.make(list_length(0, param), param.hd); - var _i = 1; - var _param = param.tl; + let a = Caml_array.make(list_length(0, param), param.hd); + let _i = 1; + let _param = param.tl; while(true) { - var param$1 = _param; - var i = _i; + let param$1 = _param; + let i = _i; if (!param$1) { return a; } @@ -212,26 +212,26 @@ function of_list(param) { } function fold_left(f, x, a) { - var r = x; - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + let r = x; + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ r = Curry._2(f, r, a[i]); } return r; } function fold_right(f, a, x) { - var r = x; - for(var i = a.length - 1 | 0; i >= 0; --i){ + let r = x; + for(let i = a.length - 1 | 0; i >= 0; --i){ r = Curry._2(f, a[i], r); } return r; } function exists(p, a) { - var n = a.length; - var _i = 0; + let n = a.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === n) { return false; } @@ -244,10 +244,10 @@ function exists(p, a) { } function for_all(p, a) { - var n = a.length; - var _i = 0; + let n = a.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === n) { return true; } @@ -260,10 +260,10 @@ function for_all(p, a) { } function mem(x, a) { - var n = a.length; - var _i = 0; + let n = a.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === n) { return false; } @@ -276,10 +276,10 @@ function mem(x, a) { } function memq(x, a) { - var n = a.length; - var _i = 0; + let n = a.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === n) { return false; } @@ -291,12 +291,12 @@ function memq(x, a) { }; } -var Bottom = /* @__PURE__ */Caml_exceptions.create("ArrayLabels.Bottom"); +let Bottom = /* @__PURE__ */Caml_exceptions.create("ArrayLabels.Bottom"); function sort(cmp, a) { - var maxson = function (l, i) { - var i31 = ((i + i | 0) + i | 0) + 1 | 0; - var x = i31; + let maxson = function (l, i) { + let i31 = ((i + i | 0) + i | 0) + 1 | 0; + let x = i31; if ((i31 + 2 | 0) < l) { if (Curry._2(cmp, Caml_array.get(a, i31), Caml_array.get(a, i31 + 1 | 0)) < 0) { x = i31 + 1 | 0; @@ -318,12 +318,12 @@ function sort(cmp, a) { Error: new Error() }; }; - var trickle = function (l, i, e) { + let trickle = function (l, i, e) { try { - var _i = i; + let _i = i; while(true) { - var i$1 = _i; - var j = maxson(l, i$1); + let i$1 = _i; + let j = maxson(l, i$1); if (Curry._2(cmp, Caml_array.get(a, j), e) <= 0) { return Caml_array.set(a, i$1, e); } @@ -333,36 +333,36 @@ function sort(cmp, a) { }; } catch (raw_i){ - var i$2 = Caml_js_exceptions.internalToOCamlException(raw_i); + let i$2 = Caml_js_exceptions.internalToOCamlException(raw_i); if (i$2.RE_EXN_ID === Bottom) { return Caml_array.set(a, i$2._1, e); } throw i$2; } }; - var bubble = function (l, i) { + let bubble = function (l, i) { try { - var _i = i; + let _i = i; while(true) { - var i$1 = _i; - var j = maxson(l, i$1); + let i$1 = _i; + let j = maxson(l, i$1); Caml_array.set(a, i$1, Caml_array.get(a, j)); _i = j; continue ; }; } catch (raw_i){ - var i$2 = Caml_js_exceptions.internalToOCamlException(raw_i); + let i$2 = Caml_js_exceptions.internalToOCamlException(raw_i); if (i$2.RE_EXN_ID === Bottom) { return i$2._1; } throw i$2; } }; - var trickleup = function (_i, e) { + let trickleup = function (_i, e) { while(true) { - var i = _i; - var father = (i - 1 | 0) / 3 | 0; + let i = _i; + let father = (i - 1 | 0) / 3 | 0; if (i === father) { throw { RE_EXN_ID: "Assert_failure", @@ -385,41 +385,41 @@ function sort(cmp, a) { continue ; }; }; - var l = a.length; - for(var i = ((l + 1 | 0) / 3 | 0) - 1 | 0; i >= 0; --i){ + let l = a.length; + for(let i = ((l + 1 | 0) / 3 | 0) - 1 | 0; i >= 0; --i){ trickle(l, i, Caml_array.get(a, i)); } - for(var i$1 = l - 1 | 0; i$1 >= 2; --i$1){ - var e = Caml_array.get(a, i$1); + for(let i$1 = l - 1 | 0; i$1 >= 2; --i$1){ + let e = Caml_array.get(a, i$1); Caml_array.set(a, i$1, Caml_array.get(a, 0)); trickleup(bubble(i$1, 0), e); } if (l <= 1) { return; } - var e$1 = Caml_array.get(a, 1); + let e$1 = Caml_array.get(a, 1); Caml_array.set(a, 1, Caml_array.get(a, 0)); Caml_array.set(a, 0, e$1); } function stable_sort(cmp, a) { - var merge = function (src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = Caml_array.get(a, src1ofs); - var _i2 = src2ofs; - var _s2 = Caml_array.get(src2, src2ofs); - var _d = dstofs; + let merge = function (src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = Caml_array.get(a, src1ofs); + let _i2 = src2ofs; + let _s2 = Caml_array.get(src2, src2ofs); + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (Curry._2(cmp, s1, s2) <= 0) { Caml_array.set(dst, d, s1); - var i1$1 = i1 + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return blit(src2, i2, dst, d + 1 | 0, src2r - i2 | 0); } @@ -429,7 +429,7 @@ function stable_sort(cmp, a) { continue ; } Caml_array.set(dst, d, s2); - var i2$1 = i2 + 1 | 0; + let i2$1 = i2 + 1 | 0; if (i2$1 >= src2r) { return blit(a, i1, dst, d + 1 | 0, src1r - i1 | 0); } @@ -439,10 +439,10 @@ function stable_sort(cmp, a) { continue ; }; }; - var isortto = function (srcofs, dst, dstofs, len) { - for(var i = 0; i < len; ++i){ - var e = Caml_array.get(a, srcofs + i | 0); - var j = (dstofs + i | 0) - 1 | 0; + let isortto = function (srcofs, dst, dstofs, len) { + for(let i = 0; i < len; ++i){ + let e = Caml_array.get(a, srcofs + i | 0); + let j = (dstofs + i | 0) - 1 | 0; while(j >= dstofs && Curry._2(cmp, Caml_array.get(dst, j), e) > 0) { Caml_array.set(dst, j + 1 | 0, Caml_array.get(dst, j)); j = j - 1 | 0; @@ -450,33 +450,33 @@ function stable_sort(cmp, a) { Caml_array.set(dst, j + 1 | 0, e); } }; - var sortto = function (srcofs, dst, dstofs, len) { + let sortto = function (srcofs, dst, dstofs, len) { if (len <= 5) { return isortto(srcofs, dst, dstofs, len); } - var l1 = len / 2 | 0; - var l2 = len - l1 | 0; + let l1 = len / 2 | 0; + let l2 = len - l1 | 0; sortto(srcofs + l1 | 0, dst, dstofs + l1 | 0, l2); sortto(srcofs, a, srcofs + l2 | 0, l1); merge(srcofs + l2 | 0, l1, dst, dstofs + l1 | 0, l2, dst, dstofs); }; - var l = a.length; + let l = a.length; if (l <= 5) { return isortto(0, a, 0, l); } - var l1 = l / 2 | 0; - var l2 = l - l1 | 0; - var t = Caml_array.make(l2, Caml_array.get(a, 0)); + let l1 = l / 2 | 0; + let l2 = l - l1 | 0; + let t = Caml_array.make(l2, Caml_array.get(a, 0)); sortto(l1, t, 0, l2); sortto(0, a, l2, l1); merge(l2, l1, t, 0, l2, a, 0); } -var create_matrix = make_matrix; +let create_matrix = make_matrix; -var concat = Caml_array.concat; +let concat = Caml_array.concat; -var fast_sort = stable_sort; +let fast_sort = stable_sort; export { init, diff --git a/lib/es6/belt.js b/lib/es6/belt.js index 81b8008f3c..0a2bd7d6e3 100644 --- a/lib/es6/belt.js +++ b/lib/es6/belt.js @@ -1,39 +1,39 @@ -var Id; +let Id; -var $$Array; +let $$Array; -var SortArray; +let SortArray; -var MutableQueue; +let MutableQueue; -var MutableStack; +let MutableStack; -var List; +let List; -var $$Range; +let $$Range; -var $$Set; +let $$Set; -var $$Map; +let $$Map; -var MutableSet; +let MutableSet; -var MutableMap; +let MutableMap; -var HashSet; +let HashSet; -var HashMap; +let HashMap; -var $$Option; +let $$Option; -var Result; +let Result; -var Int; +let Int; -var Float; +let Float; export { Id, diff --git a/lib/es6/belt_Array.js b/lib/es6/belt_Array.js index 22213e28c0..6afe4cb1ed 100644 --- a/lib/es6/belt_Array.js +++ b/lib/es6/belt_Array.js @@ -52,36 +52,36 @@ function setExn(arr, i, v) { } function swapUnsafe(xs, i, j) { - var tmp = xs[i]; + let tmp = xs[i]; xs[i] = xs[j]; xs[j] = tmp; } function shuffleInPlace(xs) { - var len = xs.length; - for(var i = 0; i < len; ++i){ + let len = xs.length; + for(let i = 0; i < len; ++i){ swapUnsafe(xs, i, Js_math.random_int(i, len)); } } function shuffle(xs) { - var result = xs.slice(0); + let result = xs.slice(0); shuffleInPlace(result); return result; } function reverseInPlace(xs) { - var len = xs.length; - var ofs = 0; - for(var i = 0 ,i_finish = len / 2 | 0; i < i_finish; ++i){ + let len = xs.length; + let ofs = 0; + for(let i = 0 ,i_finish = len / 2 | 0; i < i_finish; ++i){ swapUnsafe(xs, ofs + i | 0, ((ofs + len | 0) - i | 0) - 1 | 0); } } function reverse(xs) { - var len = xs.length; - var result = new Array(len); - for(var i = 0; i < len; ++i){ + let len = xs.length; + let result = new Array(len); + for(let i = 0; i < len; ++i){ result[i] = xs[(len - 1 | 0) - i | 0]; } return result; @@ -91,8 +91,8 @@ function make(l, f) { if (l <= 0) { return []; } - var res = new Array(l); - for(var i = 0; i < l; ++i){ + let res = new Array(l); + for(let i = 0; i < l; ++i){ res[i] = f; } return res; @@ -102,8 +102,8 @@ function makeByU(l, f) { if (l <= 0) { return []; } - var res = new Array(l); - for(var i = 0; i < l; ++i){ + let res = new Array(l); + for(let i = 0; i < l; ++i){ res[i] = f(i); } return res; @@ -114,7 +114,7 @@ function makeBy(l, f) { } function makeByAndShuffleU(l, f) { - var u = makeByU(l, f); + let u = makeByU(l, f); shuffleInPlace(u); return u; } @@ -124,26 +124,26 @@ function makeByAndShuffle(l, f) { } function range(start, finish) { - var cut = finish - start | 0; + let cut = finish - start | 0; if (cut < 0) { return []; } - var arr = new Array(cut + 1 | 0); - for(var i = 0; i <= cut; ++i){ + let arr = new Array(cut + 1 | 0); + for(let i = 0; i <= cut; ++i){ arr[i] = start + i | 0; } return arr; } function rangeBy(start, finish, step) { - var cut = finish - start | 0; + let cut = finish - start | 0; if (cut < 0 || step <= 0) { return []; } - var nb = (cut / step | 0) + 1 | 0; - var arr = new Array(nb); - var cur = start; - for(var i = 0; i < nb; ++i){ + let nb = (cut / step | 0) + 1 | 0; + let arr = new Array(nb); + let cur = start; + for(let i = 0; i < nb; ++i){ arr[i] = cur; cur = cur + step | 0; } @@ -151,11 +151,11 @@ function rangeBy(start, finish, step) { } function zip(xs, ys) { - var lenx = xs.length; - var leny = ys.length; - var len = lenx < leny ? lenx : leny; - var s = new Array(len); - for(var i = 0; i < len; ++i){ + let lenx = xs.length; + let leny = ys.length; + let len = lenx < leny ? lenx : leny; + let s = new Array(len); + for(let i = 0; i < len; ++i){ s[i] = [ xs[i], ys[i] @@ -165,11 +165,11 @@ function zip(xs, ys) { } function zipByU(xs, ys, f) { - var lenx = xs.length; - var leny = ys.length; - var len = lenx < leny ? lenx : leny; - var s = new Array(len); - for(var i = 0; i < len; ++i){ + let lenx = xs.length; + let leny = ys.length; + let len = lenx < leny ? lenx : leny; + let s = new Array(len); + for(let i = 0; i < len; ++i){ s[i] = f(xs[i], ys[i]); } return s; @@ -180,29 +180,29 @@ function zipBy(xs, ys, f) { } function concat(a1, a2) { - var l1 = a1.length; - var l2 = a2.length; - var a1a2 = new Array(l1 + l2 | 0); - for(var i = 0; i < l1; ++i){ + let l1 = a1.length; + let l2 = a2.length; + let a1a2 = new Array(l1 + l2 | 0); + for(let i = 0; i < l1; ++i){ a1a2[i] = a1[i]; } - for(var i$1 = 0; i$1 < l2; ++i$1){ + for(let i$1 = 0; i$1 < l2; ++i$1){ a1a2[l1 + i$1 | 0] = a2[i$1]; } return a1a2; } function concatMany(arrs) { - var lenArrs = arrs.length; - var totalLen = 0; - for(var i = 0; i < lenArrs; ++i){ + let lenArrs = arrs.length; + let totalLen = 0; + for(let i = 0; i < lenArrs; ++i){ totalLen = totalLen + arrs[i].length | 0; } - var result = new Array(totalLen); + let result = new Array(totalLen); totalLen = 0; - for(var j = 0; j < lenArrs; ++j){ - var cur = arrs[j]; - for(var k = 0 ,k_finish = cur.length; k < k_finish; ++k){ + for(let j = 0; j < lenArrs; ++j){ + let cur = arrs[j]; + for(let k = 0 ,k_finish = cur.length; k < k_finish; ++k){ result[totalLen] = cur[k]; totalLen = totalLen + 1 | 0; } @@ -214,26 +214,26 @@ function slice(a, offset, len) { if (len <= 0) { return []; } - var lena = a.length; - var ofs = offset < 0 ? Caml.int_max(lena + offset | 0, 0) : offset; - var hasLen = lena - ofs | 0; - var copyLength = hasLen < len ? hasLen : len; + let lena = a.length; + let ofs = offset < 0 ? Caml.int_max(lena + offset | 0, 0) : offset; + let hasLen = lena - ofs | 0; + let copyLength = hasLen < len ? hasLen : len; if (copyLength <= 0) { return []; } - var result = new Array(copyLength); - for(var i = 0; i < copyLength; ++i){ + let result = new Array(copyLength); + for(let i = 0; i < copyLength; ++i){ result[i] = a[ofs + i | 0]; } return result; } function sliceToEnd(a, offset) { - var lena = a.length; - var ofs = offset < 0 ? Caml.int_max(lena + offset | 0, 0) : offset; - var len = lena > ofs ? lena - ofs | 0 : 0; - var result = new Array(len); - for(var i = 0; i < len; ++i){ + let lena = a.length; + let ofs = offset < 0 ? Caml.int_max(lena + offset | 0, 0) : offset; + let len = lena > ofs ? lena - ofs | 0 : 0; + let result = new Array(len); + for(let i = 0; i < len; ++i){ result[i] = a[ofs + i | 0]; } return result; @@ -243,49 +243,49 @@ function fill(a, offset, len, v) { if (len <= 0) { return; } - var lena = a.length; - var ofs = offset < 0 ? Caml.int_max(lena + offset | 0, 0) : offset; - var hasLen = lena - ofs | 0; - var fillLength = hasLen < len ? hasLen : len; + let lena = a.length; + let ofs = offset < 0 ? Caml.int_max(lena + offset | 0, 0) : offset; + let hasLen = lena - ofs | 0; + let fillLength = hasLen < len ? hasLen : len; if (fillLength <= 0) { return; } - for(var i = ofs ,i_finish = ofs + fillLength | 0; i < i_finish; ++i){ + for(let i = ofs ,i_finish = ofs + fillLength | 0; i < i_finish; ++i){ a[i] = v; } } function blitUnsafe(a1, srcofs1, a2, srcofs2, blitLength) { if (srcofs2 <= srcofs1) { - for(var j = 0; j < blitLength; ++j){ + for(let j = 0; j < blitLength; ++j){ a2[j + srcofs2 | 0] = a1[j + srcofs1 | 0]; } return; } - for(var j$1 = blitLength - 1 | 0; j$1 >= 0; --j$1){ + for(let j$1 = blitLength - 1 | 0; j$1 >= 0; --j$1){ a2[j$1 + srcofs2 | 0] = a1[j$1 + srcofs1 | 0]; } } function blit(a1, ofs1, a2, ofs2, len) { - var lena1 = a1.length; - var lena2 = a2.length; - var srcofs1 = ofs1 < 0 ? Caml.int_max(lena1 + ofs1 | 0, 0) : ofs1; - var srcofs2 = ofs2 < 0 ? Caml.int_max(lena2 + ofs2 | 0, 0) : ofs2; - var blitLength = Caml.int_min(len, Caml.int_min(lena1 - srcofs1 | 0, lena2 - srcofs2 | 0)); + let lena1 = a1.length; + let lena2 = a2.length; + let srcofs1 = ofs1 < 0 ? Caml.int_max(lena1 + ofs1 | 0, 0) : ofs1; + let srcofs2 = ofs2 < 0 ? Caml.int_max(lena2 + ofs2 | 0, 0) : ofs2; + let blitLength = Caml.int_min(len, Caml.int_min(lena1 - srcofs1 | 0, lena2 - srcofs2 | 0)); if (srcofs2 <= srcofs1) { - for(var j = 0; j < blitLength; ++j){ + for(let j = 0; j < blitLength; ++j){ a2[j + srcofs2 | 0] = a1[j + srcofs1 | 0]; } return; } - for(var j$1 = blitLength - 1 | 0; j$1 >= 0; --j$1){ + for(let j$1 = blitLength - 1 | 0; j$1 >= 0; --j$1){ a2[j$1 + srcofs2 | 0] = a1[j$1 + srcofs1 | 0]; } } function forEachU(a, f) { - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ f(a[i]); } } @@ -295,9 +295,9 @@ function forEach(a, f) { } function mapU(a, f) { - var l = a.length; - var r = new Array(l); - for(var i = 0; i < l; ++i){ + let l = a.length; + let r = new Array(l); + for(let i = 0; i < l; ++i){ r[i] = f(a[i]); } return r; @@ -316,11 +316,11 @@ function flatMap(a, f) { } function getByU(a, p) { - var l = a.length; - var i = 0; - var r; + let l = a.length; + let i = 0; + let r; while(r === undefined && i < l) { - var v = a[i]; + let v = a[i]; if (p(v)) { r = Caml_option.some(v); } @@ -334,11 +334,11 @@ function getBy(a, p) { } function getIndexByU(a, p) { - var l = a.length; - var i = 0; - var r; + let l = a.length; + let i = 0; + let r; while(r === undefined && i < l) { - var v = a[i]; + let v = a[i]; if (p(v)) { r = i; } @@ -352,11 +352,11 @@ function getIndexBy(a, p) { } function keepU(a, f) { - var l = a.length; - var r = new Array(l); - var j = 0; - for(var i = 0; i < l; ++i){ - var v = a[i]; + let l = a.length; + let r = new Array(l); + let j = 0; + for(let i = 0; i < l; ++i){ + let v = a[i]; if (f(v)) { r[j] = v; j = j + 1 | 0; @@ -372,11 +372,11 @@ function keep(a, f) { } function keepWithIndexU(a, f) { - var l = a.length; - var r = new Array(l); - var j = 0; - for(var i = 0; i < l; ++i){ - var v = a[i]; + let l = a.length; + let r = new Array(l); + let j = 0; + for(let i = 0; i < l; ++i){ + let v = a[i]; if (f(v, i)) { r[j] = v; j = j + 1 | 0; @@ -392,12 +392,12 @@ function keepWithIndex(a, f) { } function keepMapU(a, f) { - var l = a.length; - var r = new Array(l); - var j = 0; - for(var i = 0; i < l; ++i){ - var v = a[i]; - var v$1 = f(v); + let l = a.length; + let r = new Array(l); + let j = 0; + for(let i = 0; i < l; ++i){ + let v = a[i]; + let v$1 = f(v); if (v$1 !== undefined) { r[j] = Caml_option.valFromOption(v$1); j = j + 1 | 0; @@ -413,7 +413,7 @@ function keepMap(a, f) { } function forEachWithIndexU(a, f) { - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ f(i, a[i]); } } @@ -423,9 +423,9 @@ function forEachWithIndex(a, f) { } function mapWithIndexU(a, f) { - var l = a.length; - var r = new Array(l); - for(var i = 0; i < l; ++i){ + let l = a.length; + let r = new Array(l); + for(let i = 0; i < l; ++i){ r[i] = f(i, a[i]); } return r; @@ -436,8 +436,8 @@ function mapWithIndex(a, f) { } function reduceU(a, x, f) { - var r = x; - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + let r = x; + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ r = f(r, a[i]); } return r; @@ -448,8 +448,8 @@ function reduce(a, x, f) { } function reduceReverseU(a, x, f) { - var r = x; - for(var i = a.length - 1 | 0; i >= 0; --i){ + let r = x; + for(let i = a.length - 1 | 0; i >= 0; --i){ r = f(r, a[i]); } return r; @@ -460,9 +460,9 @@ function reduceReverse(a, x, f) { } function reduceReverse2U(a, b, x, f) { - var r = x; - var len = Caml.int_min(a.length, b.length); - for(var i = len - 1 | 0; i >= 0; --i){ + let r = x; + let len = Caml.int_min(a.length, b.length); + for(let i = len - 1 | 0; i >= 0; --i){ r = f(r, a[i], b[i]); } return r; @@ -473,8 +473,8 @@ function reduceReverse2(a, b, x, f) { } function reduceWithIndexU(a, x, f) { - var r = x; - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + let r = x; + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ r = f(r, a[i], i); } return r; @@ -485,10 +485,10 @@ function reduceWithIndex(a, x, f) { } function everyU(arr, b) { - var len = arr.length; - var _i = 0; + let len = arr.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === len) { return true; } @@ -505,10 +505,10 @@ function every(arr, f) { } function someU(arr, b) { - var len = arr.length; - var _i = 0; + let len = arr.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === len) { return false; } @@ -526,7 +526,7 @@ function some(arr, f) { function everyAux2(arr1, arr2, _i, b, len) { while(true) { - var i = _i; + let i = _i; if (i === len) { return true; } @@ -547,10 +547,10 @@ function every2(a, b, p) { } function some2U(a, b, p) { - var _i = 0; - var len = Caml.int_min(a.length, b.length); + let _i = 0; + let len = Caml.int_min(a.length, b.length); while(true) { - var i = _i; + let i = _i; if (i === len) { return false; } @@ -567,8 +567,8 @@ function some2(a, b, p) { } function eqU(a, b, p) { - var lena = a.length; - var lenb = b.length; + let lena = a.length; + let lenb = b.length; if (lena === lenb) { return everyAux2(a, b, 0, p, lena); } else { @@ -581,20 +581,20 @@ function eq(a, b, p) { } function cmpU(a, b, p) { - var lena = a.length; - var lenb = b.length; + let lena = a.length; + let lenb = b.length; if (lena > lenb) { return 1; } else if (lena < lenb) { return -1; } else { - var _i = 0; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === lena) { return 0; } - var c = p(a[i], b[i]); + let c = p(a[i], b[i]); if (c !== 0) { return c; } @@ -609,13 +609,13 @@ function cmp(a, b, p) { } function partitionU(a, f) { - var l = a.length; - var i = 0; - var j = 0; - var a1 = new Array(l); - var a2 = new Array(l); - for(var ii = 0; ii < l; ++ii){ - var v = a[ii]; + let l = a.length; + let i = 0; + let j = 0; + let a1 = new Array(l); + let a2 = new Array(l); + for(let ii = 0; ii < l; ++ii){ + let v = a[ii]; if (f(v)) { a1[i] = v; i = i + 1 | 0; @@ -637,11 +637,11 @@ function partition(a, f) { } function unzip(a) { - var l = a.length; - var a1 = new Array(l); - var a2 = new Array(l); - for(var i = 0; i < l; ++i){ - var match = a[i]; + let l = a.length; + let a1 = new Array(l); + let a2 = new Array(l); + for(let i = 0; i < l; ++i){ + let match = a[i]; a1[i] = match[0]; a2[i] = match[1]; } @@ -652,16 +652,16 @@ function unzip(a) { } function joinWithU(a, sep, toString) { - var l = a.length; + let l = a.length; if (l === 0) { return ""; } - var lastIndex = l - 1 | 0; - var _i = 0; - var _res = ""; + let lastIndex = l - 1 | 0; + let _i = 0; + let _res = ""; while(true) { - var res = _res; - var i = _i; + let res = _res; + let i = _i; if (i === lastIndex) { return res + toString(a[i]); } @@ -676,8 +676,8 @@ function joinWith(a, sep, toString) { } function initU(n, f) { - var v = new Array(n); - for(var i = 0; i < n; ++i){ + let v = new Array(n); + for(let i = 0; i < n; ++i){ v[i] = f(i); } return v; diff --git a/lib/es6/belt_Float.js b/lib/es6/belt_Float.js index 8ace73c859..80c12e96f1 100644 --- a/lib/es6/belt_Float.js +++ b/lib/es6/belt_Float.js @@ -2,7 +2,7 @@ function fromString(i) { - var i$1 = parseFloat(i); + let i$1 = parseFloat(i); if (isNaN(i$1)) { return; } else { diff --git a/lib/es6/belt_HashMap.js b/lib/es6/belt_HashMap.js index 033352d046..087cfc52cd 100644 --- a/lib/es6/belt_HashMap.js +++ b/lib/es6/belt_HashMap.js @@ -10,12 +10,12 @@ function size(h) { function copyBucketReHash(hash, h_buckets, ndata_tail, _old_bucket) { while(true) { - var old_bucket = _old_bucket; + let old_bucket = _old_bucket; if (old_bucket === undefined) { return; } - var nidx = hash(old_bucket.key) & (h_buckets.length - 1 | 0); - var tail = ndata_tail[nidx]; + let nidx = hash(old_bucket.key) & (h_buckets.length - 1 | 0); + let tail = ndata_tail[nidx]; if (tail !== undefined) { tail.next = old_bucket; } else { @@ -29,12 +29,12 @@ function copyBucketReHash(hash, h_buckets, ndata_tail, _old_bucket) { function replaceInBucket(eq, key, info, _cell) { while(true) { - var cell = _cell; + let cell = _cell; if (eq(cell.key, key)) { cell.value = info; return false; } - var cell$1 = cell.next; + let cell$1 = cell.next; if (cell$1 === undefined) { return true; } @@ -44,10 +44,10 @@ function replaceInBucket(eq, key, info, _cell) { } function set0(h, key, value, eq, hash) { - var h_buckets = h.buckets; - var buckets_len = h_buckets.length; - var i = hash(key) & (buckets_len - 1 | 0); - var l = h_buckets[i]; + let h_buckets = h.buckets; + let buckets_len = h_buckets.length; + let i = hash(key) & (buckets_len - 1 | 0); + let l = h_buckets[i]; if (l !== undefined) { if (replaceInBucket(eq, key, value, l)) { h_buckets[i] = { @@ -67,20 +67,20 @@ function set0(h, key, value, eq, hash) { h.size = h.size + 1 | 0; } if (h.size > (buckets_len << 1)) { - var odata = h.buckets; - var osize = odata.length; - var nsize = (osize << 1); + let odata = h.buckets; + let osize = odata.length; + let nsize = (osize << 1); if (nsize < osize) { return; } - var h_buckets$1 = new Array(nsize); - var ndata_tail = new Array(nsize); + let h_buckets$1 = new Array(nsize); + let ndata_tail = new Array(nsize); h.buckets = h_buckets$1; - for(var i$1 = 0; i$1 < osize; ++i$1){ + for(let i$1 = 0; i$1 < osize; ++i$1){ copyBucketReHash(hash, h_buckets$1, ndata_tail, odata[i$1]); } - for(var i$2 = 0; i$2 < nsize; ++i$2){ - var tail = ndata_tail[i$2]; + for(let i$2 = 0; i$2 < nsize; ++i$2){ + let tail = ndata_tail[i$2]; if (tail !== undefined) { tail.next = undefined; } @@ -96,27 +96,27 @@ function set(h, key, value) { } function remove(h, key) { - var h_buckets = h.buckets; - var i = h.hash(key) & (h_buckets.length - 1 | 0); - var bucket = h_buckets[i]; + let h_buckets = h.buckets; + let i = h.hash(key) & (h_buckets.length - 1 | 0); + let bucket = h_buckets[i]; if (bucket === undefined) { return; } - var eq = h.eq; + let eq = h.eq; if (eq(bucket.key, key)) { h_buckets[i] = bucket.next; h.size = h.size - 1 | 0; return; } else { - var _prec = bucket; - var _bucket = bucket.next; + let _prec = bucket; + let _bucket = bucket.next; while(true) { - var bucket$1 = _bucket; - var prec = _prec; + let bucket$1 = _bucket; + let prec = _prec; if (bucket$1 === undefined) { return; } - var cell_next = bucket$1.next; + let cell_next = bucket$1.next; if (eq(bucket$1.key, key)) { prec.next = cell_next; h.size = h.size - 1 | 0; @@ -130,31 +130,31 @@ function remove(h, key) { } function get(h, key) { - var h_buckets = h.buckets; - var nid = h.hash(key) & (h_buckets.length - 1 | 0); - var cell1 = h_buckets[nid]; + let h_buckets = h.buckets; + let nid = h.hash(key) & (h_buckets.length - 1 | 0); + let cell1 = h_buckets[nid]; if (cell1 === undefined) { return; } - var eq = h.eq; + let eq = h.eq; if (eq(key, cell1.key)) { return Caml_option.some(cell1.value); } - var cell2 = cell1.next; + let cell2 = cell1.next; if (cell2 === undefined) { return; } if (eq(key, cell2.key)) { return Caml_option.some(cell2.value); } - var cell3 = cell2.next; + let cell3 = cell2.next; if (cell3 !== undefined) { if (eq(key, cell3.key)) { return Caml_option.some(cell3.value); } else { - var _buckets = cell3.next; + let _buckets = cell3.next; while(true) { - var buckets = _buckets; + let buckets = _buckets; if (buckets === undefined) { return; } @@ -170,18 +170,18 @@ function get(h, key) { } function has(h, key) { - var h_buckets = h.buckets; - var nid = h.hash(key) & (h_buckets.length - 1 | 0); - var bucket = h_buckets[nid]; + let h_buckets = h.buckets; + let nid = h.hash(key) & (h_buckets.length - 1 | 0); + let bucket = h_buckets[nid]; if (bucket !== undefined) { - var _cell = bucket; - var eq = h.eq; + let _cell = bucket; + let eq = h.eq; while(true) { - var cell = _cell; + let cell = _cell; if (eq(cell.key, key)) { return true; } - var nextCell = cell.next; + let nextCell = cell.next; if (nextCell === undefined) { return false; } @@ -198,58 +198,58 @@ function make(hintSize, id) { } function fromArray(arr, id) { - var hash = id.hash; - var eq = id.eq; - var len = arr.length; - var v = Belt_internalBucketsType.make(hash, eq, len); - for(var i = 0; i < len; ++i){ - var match = arr[i]; + let hash = id.hash; + let eq = id.eq; + let len = arr.length; + let v = Belt_internalBucketsType.make(hash, eq, len); + for(let i = 0; i < len; ++i){ + let match = arr[i]; set0(v, match[0], match[1], eq, hash); } return v; } function mergeMany(h, arr) { - var hash = h.hash; - var eq = h.eq; - var len = arr.length; - for(var i = 0; i < len; ++i){ - var match = arr[i]; + let hash = h.hash; + let eq = h.eq; + let len = arr.length; + for(let i = 0; i < len; ++i){ + let match = arr[i]; set0(h, match[0], match[1], eq, hash); } } -var Int; +let Int; -var $$String; +let $$String; -var clear = Belt_internalBucketsType.clear; +let clear = Belt_internalBucketsType.clear; -var isEmpty = Belt_internalBucketsType.isEmpty; +let isEmpty = Belt_internalBucketsType.isEmpty; -var copy = Belt_internalBuckets.copy; +let copy = Belt_internalBuckets.copy; -var forEachU = Belt_internalBuckets.forEachU; +let forEachU = Belt_internalBuckets.forEachU; -var forEach = Belt_internalBuckets.forEach; +let forEach = Belt_internalBuckets.forEach; -var reduceU = Belt_internalBuckets.reduceU; +let reduceU = Belt_internalBuckets.reduceU; -var reduce = Belt_internalBuckets.reduce; +let reduce = Belt_internalBuckets.reduce; -var keepMapInPlaceU = Belt_internalBuckets.keepMapInPlaceU; +let keepMapInPlaceU = Belt_internalBuckets.keepMapInPlaceU; -var keepMapInPlace = Belt_internalBuckets.keepMapInPlace; +let keepMapInPlace = Belt_internalBuckets.keepMapInPlace; -var toArray = Belt_internalBuckets.toArray; +let toArray = Belt_internalBuckets.toArray; -var keysToArray = Belt_internalBuckets.keysToArray; +let keysToArray = Belt_internalBuckets.keysToArray; -var valuesToArray = Belt_internalBuckets.valuesToArray; +let valuesToArray = Belt_internalBuckets.valuesToArray; -var getBucketHistogram = Belt_internalBuckets.getBucketHistogram; +let getBucketHistogram = Belt_internalBuckets.getBucketHistogram; -var logStats = Belt_internalBuckets.logStats; +let logStats = Belt_internalBuckets.logStats; export { Int, diff --git a/lib/es6/belt_HashMapInt.js b/lib/es6/belt_HashMapInt.js index 289a8f6c02..328b78ee94 100644 --- a/lib/es6/belt_HashMapInt.js +++ b/lib/es6/belt_HashMapInt.js @@ -7,12 +7,12 @@ import * as Belt_internalBucketsType from "./belt_internalBucketsType.js"; function copyBucketReHash(h_buckets, ndata_tail, _old_bucket) { while(true) { - var old_bucket = _old_bucket; + let old_bucket = _old_bucket; if (old_bucket === undefined) { return; } - var nidx = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, old_bucket.key)) & (h_buckets.length - 1 | 0); - var tail = ndata_tail[nidx]; + let nidx = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, old_bucket.key)) & (h_buckets.length - 1 | 0); + let tail = ndata_tail[nidx]; if (tail !== undefined) { tail.next = old_bucket; } else { @@ -26,12 +26,12 @@ function copyBucketReHash(h_buckets, ndata_tail, _old_bucket) { function replaceInBucket(key, info, _cell) { while(true) { - var cell = _cell; + let cell = _cell; if (cell.key === key) { cell.value = info; return false; } - var cell$1 = cell.next; + let cell$1 = cell.next; if (cell$1 === undefined) { return true; } @@ -41,10 +41,10 @@ function replaceInBucket(key, info, _cell) { } function set(h, key, value) { - var h_buckets = h.buckets; - var buckets_len = h_buckets.length; - var i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (buckets_len - 1 | 0); - var l = h_buckets[i]; + let h_buckets = h.buckets; + let buckets_len = h_buckets.length; + let i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (buckets_len - 1 | 0); + let l = h_buckets[i]; if (l !== undefined) { if (replaceInBucket(key, value, l)) { h_buckets[i] = { @@ -64,20 +64,20 @@ function set(h, key, value) { h.size = h.size + 1 | 0; } if (h.size > (buckets_len << 1)) { - var odata = h.buckets; - var osize = odata.length; - var nsize = (osize << 1); + let odata = h.buckets; + let osize = odata.length; + let nsize = (osize << 1); if (nsize < osize) { return; } - var h_buckets$1 = new Array(nsize); - var ndata_tail = new Array(nsize); + let h_buckets$1 = new Array(nsize); + let ndata_tail = new Array(nsize); h.buckets = h_buckets$1; - for(var i$1 = 0; i$1 < osize; ++i$1){ + for(let i$1 = 0; i$1 < osize; ++i$1){ copyBucketReHash(h_buckets$1, ndata_tail, odata[i$1]); } - for(var i$2 = 0; i$2 < nsize; ++i$2){ - var tail = ndata_tail[i$2]; + for(let i$2 = 0; i$2 < nsize; ++i$2){ + let tail = ndata_tail[i$2]; if (tail !== undefined) { tail.next = undefined; } @@ -89,24 +89,24 @@ function set(h, key, value) { } function remove(h, key) { - var h_buckets = h.buckets; - var i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); - var bucket = h_buckets[i]; + let h_buckets = h.buckets; + let i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); + let bucket = h_buckets[i]; if (bucket !== undefined) { if (bucket.key === key) { h_buckets[i] = bucket.next; h.size = h.size - 1 | 0; return; } else { - var _prec = bucket; - var _buckets = bucket.next; + let _prec = bucket; + let _buckets = bucket.next; while(true) { - var buckets = _buckets; - var prec = _prec; + let buckets = _buckets; + let prec = _prec; if (buckets === undefined) { return; } - var cell_next = buckets.next; + let cell_next = buckets.next; if (buckets.key === key) { prec.next = cell_next; h.size = h.size - 1 | 0; @@ -122,30 +122,30 @@ function remove(h, key) { } function get(h, key) { - var h_buckets = h.buckets; - var nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); - var cell1 = h_buckets[nid]; + let h_buckets = h.buckets; + let nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); + let cell1 = h_buckets[nid]; if (cell1 === undefined) { return; } if (key === cell1.key) { return Caml_option.some(cell1.value); } - var cell2 = cell1.next; + let cell2 = cell1.next; if (cell2 === undefined) { return; } if (key === cell2.key) { return Caml_option.some(cell2.value); } - var cell3 = cell2.next; + let cell3 = cell2.next; if (cell3 !== undefined) { if (key === cell3.key) { return Caml_option.some(cell3.value); } else { - var _buckets = cell3.next; + let _buckets = cell3.next; while(true) { - var buckets = _buckets; + let buckets = _buckets; if (buckets === undefined) { return; } @@ -161,17 +161,17 @@ function get(h, key) { } function has(h, key) { - var h_buckets = h.buckets; - var nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); - var bucket = h_buckets[nid]; + let h_buckets = h.buckets; + let nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); + let bucket = h_buckets[nid]; if (bucket !== undefined) { - var _cell = bucket; + let _cell = bucket; while(true) { - var cell = _cell; + let cell = _cell; if (cell.key === key) { return true; } - var nextCell = cell.next; + let nextCell = cell.next; if (nextCell === undefined) { return false; } @@ -192,50 +192,50 @@ function size(h) { } function fromArray(arr) { - var len = arr.length; - var v = Belt_internalBucketsType.make(undefined, undefined, len); - for(var i = 0; i < len; ++i){ - var match = arr[i]; + let len = arr.length; + let v = Belt_internalBucketsType.make(undefined, undefined, len); + for(let i = 0; i < len; ++i){ + let match = arr[i]; set(v, match[0], match[1]); } return v; } function mergeMany(h, arr) { - var len = arr.length; - for(var i = 0; i < len; ++i){ - var match = arr[i]; + let len = arr.length; + for(let i = 0; i < len; ++i){ + let match = arr[i]; set(h, match[0], match[1]); } } -var clear = Belt_internalBucketsType.clear; +let clear = Belt_internalBucketsType.clear; -var isEmpty = Belt_internalBucketsType.isEmpty; +let isEmpty = Belt_internalBucketsType.isEmpty; -var copy = Belt_internalBuckets.copy; +let copy = Belt_internalBuckets.copy; -var forEachU = Belt_internalBuckets.forEachU; +let forEachU = Belt_internalBuckets.forEachU; -var forEach = Belt_internalBuckets.forEach; +let forEach = Belt_internalBuckets.forEach; -var reduceU = Belt_internalBuckets.reduceU; +let reduceU = Belt_internalBuckets.reduceU; -var reduce = Belt_internalBuckets.reduce; +let reduce = Belt_internalBuckets.reduce; -var keepMapInPlaceU = Belt_internalBuckets.keepMapInPlaceU; +let keepMapInPlaceU = Belt_internalBuckets.keepMapInPlaceU; -var keepMapInPlace = Belt_internalBuckets.keepMapInPlace; +let keepMapInPlace = Belt_internalBuckets.keepMapInPlace; -var toArray = Belt_internalBuckets.toArray; +let toArray = Belt_internalBuckets.toArray; -var keysToArray = Belt_internalBuckets.keysToArray; +let keysToArray = Belt_internalBuckets.keysToArray; -var valuesToArray = Belt_internalBuckets.valuesToArray; +let valuesToArray = Belt_internalBuckets.valuesToArray; -var getBucketHistogram = Belt_internalBuckets.getBucketHistogram; +let getBucketHistogram = Belt_internalBuckets.getBucketHistogram; -var logStats = Belt_internalBuckets.logStats; +let logStats = Belt_internalBuckets.logStats; export { make, diff --git a/lib/es6/belt_HashMapString.js b/lib/es6/belt_HashMapString.js index f976aaabf1..1c330f45f3 100644 --- a/lib/es6/belt_HashMapString.js +++ b/lib/es6/belt_HashMapString.js @@ -7,12 +7,12 @@ import * as Belt_internalBucketsType from "./belt_internalBucketsType.js"; function copyBucketReHash(h_buckets, ndata_tail, _old_bucket) { while(true) { - var old_bucket = _old_bucket; + let old_bucket = _old_bucket; if (old_bucket === undefined) { return; } - var nidx = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, old_bucket.key)) & (h_buckets.length - 1 | 0); - var tail = ndata_tail[nidx]; + let nidx = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, old_bucket.key)) & (h_buckets.length - 1 | 0); + let tail = ndata_tail[nidx]; if (tail !== undefined) { tail.next = old_bucket; } else { @@ -26,12 +26,12 @@ function copyBucketReHash(h_buckets, ndata_tail, _old_bucket) { function replaceInBucket(key, info, _cell) { while(true) { - var cell = _cell; + let cell = _cell; if (cell.key === key) { cell.value = info; return false; } - var cell$1 = cell.next; + let cell$1 = cell.next; if (cell$1 === undefined) { return true; } @@ -41,10 +41,10 @@ function replaceInBucket(key, info, _cell) { } function set(h, key, value) { - var h_buckets = h.buckets; - var buckets_len = h_buckets.length; - var i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (buckets_len - 1 | 0); - var l = h_buckets[i]; + let h_buckets = h.buckets; + let buckets_len = h_buckets.length; + let i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (buckets_len - 1 | 0); + let l = h_buckets[i]; if (l !== undefined) { if (replaceInBucket(key, value, l)) { h_buckets[i] = { @@ -64,20 +64,20 @@ function set(h, key, value) { h.size = h.size + 1 | 0; } if (h.size > (buckets_len << 1)) { - var odata = h.buckets; - var osize = odata.length; - var nsize = (osize << 1); + let odata = h.buckets; + let osize = odata.length; + let nsize = (osize << 1); if (nsize < osize) { return; } - var h_buckets$1 = new Array(nsize); - var ndata_tail = new Array(nsize); + let h_buckets$1 = new Array(nsize); + let ndata_tail = new Array(nsize); h.buckets = h_buckets$1; - for(var i$1 = 0; i$1 < osize; ++i$1){ + for(let i$1 = 0; i$1 < osize; ++i$1){ copyBucketReHash(h_buckets$1, ndata_tail, odata[i$1]); } - for(var i$2 = 0; i$2 < nsize; ++i$2){ - var tail = ndata_tail[i$2]; + for(let i$2 = 0; i$2 < nsize; ++i$2){ + let tail = ndata_tail[i$2]; if (tail !== undefined) { tail.next = undefined; } @@ -89,24 +89,24 @@ function set(h, key, value) { } function remove(h, key) { - var h_buckets = h.buckets; - var i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); - var bucket = h_buckets[i]; + let h_buckets = h.buckets; + let i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); + let bucket = h_buckets[i]; if (bucket !== undefined) { if (bucket.key === key) { h_buckets[i] = bucket.next; h.size = h.size - 1 | 0; return; } else { - var _prec = bucket; - var _buckets = bucket.next; + let _prec = bucket; + let _buckets = bucket.next; while(true) { - var buckets = _buckets; - var prec = _prec; + let buckets = _buckets; + let prec = _prec; if (buckets === undefined) { return; } - var cell_next = buckets.next; + let cell_next = buckets.next; if (buckets.key === key) { prec.next = cell_next; h.size = h.size - 1 | 0; @@ -122,30 +122,30 @@ function remove(h, key) { } function get(h, key) { - var h_buckets = h.buckets; - var nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); - var cell1 = h_buckets[nid]; + let h_buckets = h.buckets; + let nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); + let cell1 = h_buckets[nid]; if (cell1 === undefined) { return; } if (key === cell1.key) { return Caml_option.some(cell1.value); } - var cell2 = cell1.next; + let cell2 = cell1.next; if (cell2 === undefined) { return; } if (key === cell2.key) { return Caml_option.some(cell2.value); } - var cell3 = cell2.next; + let cell3 = cell2.next; if (cell3 !== undefined) { if (key === cell3.key) { return Caml_option.some(cell3.value); } else { - var _buckets = cell3.next; + let _buckets = cell3.next; while(true) { - var buckets = _buckets; + let buckets = _buckets; if (buckets === undefined) { return; } @@ -161,17 +161,17 @@ function get(h, key) { } function has(h, key) { - var h_buckets = h.buckets; - var nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); - var bucket = h_buckets[nid]; + let h_buckets = h.buckets; + let nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); + let bucket = h_buckets[nid]; if (bucket !== undefined) { - var _cell = bucket; + let _cell = bucket; while(true) { - var cell = _cell; + let cell = _cell; if (cell.key === key) { return true; } - var nextCell = cell.next; + let nextCell = cell.next; if (nextCell === undefined) { return false; } @@ -192,50 +192,50 @@ function size(h) { } function fromArray(arr) { - var len = arr.length; - var v = Belt_internalBucketsType.make(undefined, undefined, len); - for(var i = 0; i < len; ++i){ - var match = arr[i]; + let len = arr.length; + let v = Belt_internalBucketsType.make(undefined, undefined, len); + for(let i = 0; i < len; ++i){ + let match = arr[i]; set(v, match[0], match[1]); } return v; } function mergeMany(h, arr) { - var len = arr.length; - for(var i = 0; i < len; ++i){ - var match = arr[i]; + let len = arr.length; + for(let i = 0; i < len; ++i){ + let match = arr[i]; set(h, match[0], match[1]); } } -var clear = Belt_internalBucketsType.clear; +let clear = Belt_internalBucketsType.clear; -var isEmpty = Belt_internalBucketsType.isEmpty; +let isEmpty = Belt_internalBucketsType.isEmpty; -var copy = Belt_internalBuckets.copy; +let copy = Belt_internalBuckets.copy; -var forEachU = Belt_internalBuckets.forEachU; +let forEachU = Belt_internalBuckets.forEachU; -var forEach = Belt_internalBuckets.forEach; +let forEach = Belt_internalBuckets.forEach; -var reduceU = Belt_internalBuckets.reduceU; +let reduceU = Belt_internalBuckets.reduceU; -var reduce = Belt_internalBuckets.reduce; +let reduce = Belt_internalBuckets.reduce; -var keepMapInPlaceU = Belt_internalBuckets.keepMapInPlaceU; +let keepMapInPlaceU = Belt_internalBuckets.keepMapInPlaceU; -var keepMapInPlace = Belt_internalBuckets.keepMapInPlace; +let keepMapInPlace = Belt_internalBuckets.keepMapInPlace; -var toArray = Belt_internalBuckets.toArray; +let toArray = Belt_internalBuckets.toArray; -var keysToArray = Belt_internalBuckets.keysToArray; +let keysToArray = Belt_internalBuckets.keysToArray; -var valuesToArray = Belt_internalBuckets.valuesToArray; +let valuesToArray = Belt_internalBuckets.valuesToArray; -var getBucketHistogram = Belt_internalBuckets.getBucketHistogram; +let getBucketHistogram = Belt_internalBuckets.getBucketHistogram; -var logStats = Belt_internalBuckets.logStats; +let logStats = Belt_internalBuckets.logStats; export { make, diff --git a/lib/es6/belt_HashSet.js b/lib/es6/belt_HashSet.js index 86c4ddb87a..8fc92a3699 100644 --- a/lib/es6/belt_HashSet.js +++ b/lib/es6/belt_HashSet.js @@ -5,12 +5,12 @@ import * as Belt_internalBucketsType from "./belt_internalBucketsType.js"; function copyBucket(hash, h_buckets, ndata_tail, _old_bucket) { while(true) { - var old_bucket = _old_bucket; + let old_bucket = _old_bucket; if (old_bucket === undefined) { return; } - var nidx = hash(old_bucket.key) & (h_buckets.length - 1 | 0); - var tail = ndata_tail[nidx]; + let nidx = hash(old_bucket.key) & (h_buckets.length - 1 | 0); + let tail = ndata_tail[nidx]; if (tail !== undefined) { tail.next = old_bucket; } else { @@ -23,25 +23,25 @@ function copyBucket(hash, h_buckets, ndata_tail, _old_bucket) { } function remove(h, key) { - var eq = h.eq; - var h_buckets = h.buckets; - var i = h.hash(key) & (h_buckets.length - 1 | 0); - var l = h_buckets[i]; + let eq = h.eq; + let h_buckets = h.buckets; + let i = h.hash(key) & (h_buckets.length - 1 | 0); + let l = h_buckets[i]; if (l === undefined) { return; } - var next_cell = l.next; + let next_cell = l.next; if (eq(l.key, key)) { h.size = h.size - 1 | 0; h_buckets[i] = next_cell; return; } else if (next_cell !== undefined) { - var _prec = l; - var _cell = next_cell; + let _prec = l; + let _cell = next_cell; while(true) { - var cell = _cell; - var prec = _prec; - var cell_next = cell.next; + let cell = _cell; + let prec = _prec; + let cell_next = cell.next; if (eq(cell.key, key)) { prec.next = cell_next; h.size = h.size - 1 | 0; @@ -61,11 +61,11 @@ function remove(h, key) { function addBucket(h, key, _cell, eq) { while(true) { - var cell = _cell; + let cell = _cell; if (eq(cell.key, key)) { return; } - var n = cell.next; + let n = cell.next; if (n !== undefined) { _cell = n; continue ; @@ -80,10 +80,10 @@ function addBucket(h, key, _cell, eq) { } function add0(h, key, hash, eq) { - var h_buckets = h.buckets; - var buckets_len = h_buckets.length; - var i = hash(key) & (buckets_len - 1 | 0); - var l = h_buckets[i]; + let h_buckets = h.buckets; + let buckets_len = h_buckets.length; + let i = hash(key) & (buckets_len - 1 | 0); + let l = h_buckets[i]; if (l !== undefined) { addBucket(h, key, l, eq); } else { @@ -94,20 +94,20 @@ function add0(h, key, hash, eq) { }; } if (h.size > (buckets_len << 1)) { - var odata = h.buckets; - var osize = odata.length; - var nsize = (osize << 1); + let odata = h.buckets; + let osize = odata.length; + let nsize = (osize << 1); if (nsize < osize) { return; } - var h_buckets$1 = new Array(nsize); - var ndata_tail = new Array(nsize); + let h_buckets$1 = new Array(nsize); + let ndata_tail = new Array(nsize); h.buckets = h_buckets$1; - for(var i$1 = 0; i$1 < osize; ++i$1){ + for(let i$1 = 0; i$1 < osize; ++i$1){ copyBucket(hash, h_buckets$1, ndata_tail, odata[i$1]); } - for(var i$2 = 0; i$2 < nsize; ++i$2){ - var tail = ndata_tail[i$2]; + for(let i$2 = 0; i$2 < nsize; ++i$2){ + let tail = ndata_tail[i$2]; if (tail !== undefined) { tail.next = undefined; } @@ -123,18 +123,18 @@ function add(h, key) { } function has(h, key) { - var eq = h.eq; - var h_buckets = h.buckets; - var nid = h.hash(key) & (h_buckets.length - 1 | 0); - var bucket = h_buckets[nid]; + let eq = h.eq; + let h_buckets = h.buckets; + let nid = h.hash(key) & (h_buckets.length - 1 | 0); + let bucket = h_buckets[nid]; if (bucket !== undefined) { - var _cell = bucket; + let _cell = bucket; while(true) { - var cell = _cell; + let cell = _cell; if (eq(cell.key, key)) { return true; } - var nextCell = cell.next; + let nextCell = cell.next; if (nextCell === undefined) { return false; } @@ -155,48 +155,48 @@ function size(h) { } function fromArray(arr, id) { - var eq = id.eq; - var hash = id.hash; - var len = arr.length; - var v = Belt_internalBucketsType.make(hash, eq, len); - for(var i = 0; i < len; ++i){ + let eq = id.eq; + let hash = id.hash; + let len = arr.length; + let v = Belt_internalBucketsType.make(hash, eq, len); + for(let i = 0; i < len; ++i){ add0(v, arr[i], hash, eq); } return v; } function mergeMany(h, arr) { - var eq = h.eq; - var hash = h.hash; - var len = arr.length; - for(var i = 0; i < len; ++i){ + let eq = h.eq; + let hash = h.hash; + let len = arr.length; + for(let i = 0; i < len; ++i){ add0(h, arr[i], hash, eq); } } -var Int; +let Int; -var $$String; +let $$String; -var clear = Belt_internalBucketsType.clear; +let clear = Belt_internalBucketsType.clear; -var isEmpty = Belt_internalBucketsType.isEmpty; +let isEmpty = Belt_internalBucketsType.isEmpty; -var copy = Belt_internalSetBuckets.copy; +let copy = Belt_internalSetBuckets.copy; -var forEachU = Belt_internalSetBuckets.forEachU; +let forEachU = Belt_internalSetBuckets.forEachU; -var forEach = Belt_internalSetBuckets.forEach; +let forEach = Belt_internalSetBuckets.forEach; -var reduceU = Belt_internalSetBuckets.reduceU; +let reduceU = Belt_internalSetBuckets.reduceU; -var reduce = Belt_internalSetBuckets.reduce; +let reduce = Belt_internalSetBuckets.reduce; -var logStats = Belt_internalSetBuckets.logStats; +let logStats = Belt_internalSetBuckets.logStats; -var toArray = Belt_internalSetBuckets.toArray; +let toArray = Belt_internalSetBuckets.toArray; -var getBucketHistogram = Belt_internalSetBuckets.getBucketHistogram; +let getBucketHistogram = Belt_internalSetBuckets.getBucketHistogram; export { Int, diff --git a/lib/es6/belt_HashSetInt.js b/lib/es6/belt_HashSetInt.js index c5cba094a1..9327ed7dca 100644 --- a/lib/es6/belt_HashSetInt.js +++ b/lib/es6/belt_HashSetInt.js @@ -6,12 +6,12 @@ import * as Belt_internalBucketsType from "./belt_internalBucketsType.js"; function copyBucket(h_buckets, ndata_tail, _old_bucket) { while(true) { - var old_bucket = _old_bucket; + let old_bucket = _old_bucket; if (old_bucket === undefined) { return; } - var nidx = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, old_bucket.key)) & (h_buckets.length - 1 | 0); - var tail = ndata_tail[nidx]; + let nidx = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, old_bucket.key)) & (h_buckets.length - 1 | 0); + let tail = ndata_tail[nidx]; if (tail !== undefined) { tail.next = old_bucket; } else { @@ -24,24 +24,24 @@ function copyBucket(h_buckets, ndata_tail, _old_bucket) { } function remove(h, key) { - var h_buckets = h.buckets; - var i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); - var l = h_buckets[i]; + let h_buckets = h.buckets; + let i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); + let l = h_buckets[i]; if (l === undefined) { return; } - var next_cell = l.next; + let next_cell = l.next; if (l.key === key) { h.size = h.size - 1 | 0; h_buckets[i] = next_cell; return; } else if (next_cell !== undefined) { - var _prec = l; - var _cell = next_cell; + let _prec = l; + let _cell = next_cell; while(true) { - var cell = _cell; - var prec = _prec; - var cell_next = cell.next; + let cell = _cell; + let prec = _prec; + let cell_next = cell.next; if (cell.key === key) { prec.next = cell_next; h.size = h.size - 1 | 0; @@ -61,11 +61,11 @@ function remove(h, key) { function addBucket(h, key, _cell) { while(true) { - var cell = _cell; + let cell = _cell; if (cell.key === key) { return; } - var n = cell.next; + let n = cell.next; if (n !== undefined) { _cell = n; continue ; @@ -80,10 +80,10 @@ function addBucket(h, key, _cell) { } function add(h, key) { - var h_buckets = h.buckets; - var buckets_len = h_buckets.length; - var i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (buckets_len - 1 | 0); - var l = h_buckets[i]; + let h_buckets = h.buckets; + let buckets_len = h_buckets.length; + let i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (buckets_len - 1 | 0); + let l = h_buckets[i]; if (l !== undefined) { addBucket(h, key, l); } else { @@ -94,20 +94,20 @@ function add(h, key) { h.size = h.size + 1 | 0; } if (h.size > (buckets_len << 1)) { - var odata = h.buckets; - var osize = odata.length; - var nsize = (osize << 1); + let odata = h.buckets; + let osize = odata.length; + let nsize = (osize << 1); if (nsize < osize) { return; } - var h_buckets$1 = new Array(nsize); - var ndata_tail = new Array(nsize); + let h_buckets$1 = new Array(nsize); + let ndata_tail = new Array(nsize); h.buckets = h_buckets$1; - for(var i$1 = 0; i$1 < osize; ++i$1){ + for(let i$1 = 0; i$1 < osize; ++i$1){ copyBucket(h_buckets$1, ndata_tail, odata[i$1]); } - for(var i$2 = 0; i$2 < nsize; ++i$2){ - var tail = ndata_tail[i$2]; + for(let i$2 = 0; i$2 < nsize; ++i$2){ + let tail = ndata_tail[i$2]; if (tail !== undefined) { tail.next = undefined; } @@ -119,17 +119,17 @@ function add(h, key) { } function has(h, key) { - var h_buckets = h.buckets; - var nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); - var bucket = h_buckets[nid]; + let h_buckets = h.buckets; + let nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); + let bucket = h_buckets[nid]; if (bucket !== undefined) { - var _cell = bucket; + let _cell = bucket; while(true) { - var cell = _cell; + let cell = _cell; if (cell.key === key) { return true; } - var nextCell = cell.next; + let nextCell = cell.next; if (nextCell === undefined) { return false; } @@ -150,40 +150,40 @@ function size(h) { } function fromArray(arr) { - var len = arr.length; - var v = Belt_internalBucketsType.make(undefined, undefined, len); - for(var i = 0; i < len; ++i){ + let len = arr.length; + let v = Belt_internalBucketsType.make(undefined, undefined, len); + for(let i = 0; i < len; ++i){ add(v, arr[i]); } return v; } function mergeMany(h, arr) { - var len = arr.length; - for(var i = 0; i < len; ++i){ + let len = arr.length; + for(let i = 0; i < len; ++i){ add(h, arr[i]); } } -var clear = Belt_internalBucketsType.clear; +let clear = Belt_internalBucketsType.clear; -var isEmpty = Belt_internalBucketsType.isEmpty; +let isEmpty = Belt_internalBucketsType.isEmpty; -var copy = Belt_internalSetBuckets.copy; +let copy = Belt_internalSetBuckets.copy; -var forEachU = Belt_internalSetBuckets.forEachU; +let forEachU = Belt_internalSetBuckets.forEachU; -var forEach = Belt_internalSetBuckets.forEach; +let forEach = Belt_internalSetBuckets.forEach; -var reduceU = Belt_internalSetBuckets.reduceU; +let reduceU = Belt_internalSetBuckets.reduceU; -var reduce = Belt_internalSetBuckets.reduce; +let reduce = Belt_internalSetBuckets.reduce; -var logStats = Belt_internalSetBuckets.logStats; +let logStats = Belt_internalSetBuckets.logStats; -var toArray = Belt_internalSetBuckets.toArray; +let toArray = Belt_internalSetBuckets.toArray; -var getBucketHistogram = Belt_internalSetBuckets.getBucketHistogram; +let getBucketHistogram = Belt_internalSetBuckets.getBucketHistogram; export { make, diff --git a/lib/es6/belt_HashSetString.js b/lib/es6/belt_HashSetString.js index 6da55844cf..7b1a191571 100644 --- a/lib/es6/belt_HashSetString.js +++ b/lib/es6/belt_HashSetString.js @@ -6,12 +6,12 @@ import * as Belt_internalBucketsType from "./belt_internalBucketsType.js"; function copyBucket(h_buckets, ndata_tail, _old_bucket) { while(true) { - var old_bucket = _old_bucket; + let old_bucket = _old_bucket; if (old_bucket === undefined) { return; } - var nidx = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, old_bucket.key)) & (h_buckets.length - 1 | 0); - var tail = ndata_tail[nidx]; + let nidx = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, old_bucket.key)) & (h_buckets.length - 1 | 0); + let tail = ndata_tail[nidx]; if (tail !== undefined) { tail.next = old_bucket; } else { @@ -24,24 +24,24 @@ function copyBucket(h_buckets, ndata_tail, _old_bucket) { } function remove(h, key) { - var h_buckets = h.buckets; - var i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); - var l = h_buckets[i]; + let h_buckets = h.buckets; + let i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); + let l = h_buckets[i]; if (l === undefined) { return; } - var next_cell = l.next; + let next_cell = l.next; if (l.key === key) { h.size = h.size - 1 | 0; h_buckets[i] = next_cell; return; } else if (next_cell !== undefined) { - var _prec = l; - var _cell = next_cell; + let _prec = l; + let _cell = next_cell; while(true) { - var cell = _cell; - var prec = _prec; - var cell_next = cell.next; + let cell = _cell; + let prec = _prec; + let cell_next = cell.next; if (cell.key === key) { prec.next = cell_next; h.size = h.size - 1 | 0; @@ -61,11 +61,11 @@ function remove(h, key) { function addBucket(h, key, _cell) { while(true) { - var cell = _cell; + let cell = _cell; if (cell.key === key) { return; } - var n = cell.next; + let n = cell.next; if (n !== undefined) { _cell = n; continue ; @@ -80,10 +80,10 @@ function addBucket(h, key, _cell) { } function add(h, key) { - var h_buckets = h.buckets; - var buckets_len = h_buckets.length; - var i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (buckets_len - 1 | 0); - var l = h_buckets[i]; + let h_buckets = h.buckets; + let buckets_len = h_buckets.length; + let i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (buckets_len - 1 | 0); + let l = h_buckets[i]; if (l !== undefined) { addBucket(h, key, l); } else { @@ -94,20 +94,20 @@ function add(h, key) { h.size = h.size + 1 | 0; } if (h.size > (buckets_len << 1)) { - var odata = h.buckets; - var osize = odata.length; - var nsize = (osize << 1); + let odata = h.buckets; + let osize = odata.length; + let nsize = (osize << 1); if (nsize < osize) { return; } - var h_buckets$1 = new Array(nsize); - var ndata_tail = new Array(nsize); + let h_buckets$1 = new Array(nsize); + let ndata_tail = new Array(nsize); h.buckets = h_buckets$1; - for(var i$1 = 0; i$1 < osize; ++i$1){ + for(let i$1 = 0; i$1 < osize; ++i$1){ copyBucket(h_buckets$1, ndata_tail, odata[i$1]); } - for(var i$2 = 0; i$2 < nsize; ++i$2){ - var tail = ndata_tail[i$2]; + for(let i$2 = 0; i$2 < nsize; ++i$2){ + let tail = ndata_tail[i$2]; if (tail !== undefined) { tail.next = undefined; } @@ -119,17 +119,17 @@ function add(h, key) { } function has(h, key) { - var h_buckets = h.buckets; - var nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); - var bucket = h_buckets[nid]; + let h_buckets = h.buckets; + let nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); + let bucket = h_buckets[nid]; if (bucket !== undefined) { - var _cell = bucket; + let _cell = bucket; while(true) { - var cell = _cell; + let cell = _cell; if (cell.key === key) { return true; } - var nextCell = cell.next; + let nextCell = cell.next; if (nextCell === undefined) { return false; } @@ -150,40 +150,40 @@ function size(h) { } function fromArray(arr) { - var len = arr.length; - var v = Belt_internalBucketsType.make(undefined, undefined, len); - for(var i = 0; i < len; ++i){ + let len = arr.length; + let v = Belt_internalBucketsType.make(undefined, undefined, len); + for(let i = 0; i < len; ++i){ add(v, arr[i]); } return v; } function mergeMany(h, arr) { - var len = arr.length; - for(var i = 0; i < len; ++i){ + let len = arr.length; + for(let i = 0; i < len; ++i){ add(h, arr[i]); } } -var clear = Belt_internalBucketsType.clear; +let clear = Belt_internalBucketsType.clear; -var isEmpty = Belt_internalBucketsType.isEmpty; +let isEmpty = Belt_internalBucketsType.isEmpty; -var copy = Belt_internalSetBuckets.copy; +let copy = Belt_internalSetBuckets.copy; -var forEachU = Belt_internalSetBuckets.forEachU; +let forEachU = Belt_internalSetBuckets.forEachU; -var forEach = Belt_internalSetBuckets.forEach; +let forEach = Belt_internalSetBuckets.forEach; -var reduceU = Belt_internalSetBuckets.reduceU; +let reduceU = Belt_internalSetBuckets.reduceU; -var reduce = Belt_internalSetBuckets.reduce; +let reduce = Belt_internalSetBuckets.reduce; -var logStats = Belt_internalSetBuckets.logStats; +let logStats = Belt_internalSetBuckets.logStats; -var toArray = Belt_internalSetBuckets.toArray; +let toArray = Belt_internalSetBuckets.toArray; -var getBucketHistogram = Belt_internalSetBuckets.getBucketHistogram; +let getBucketHistogram = Belt_internalSetBuckets.getBucketHistogram; export { make, diff --git a/lib/es6/belt_Id.js b/lib/es6/belt_Id.js index c8ceb8e9ec..ff1ebbb299 100644 --- a/lib/es6/belt_Id.js +++ b/lib/es6/belt_Id.js @@ -7,8 +7,8 @@ function MakeComparableU(M) { } function MakeComparable(M) { - var cmp = M.cmp; - var cmp$1 = Curry.__2(cmp); + let cmp = M.cmp; + let cmp$1 = Curry.__2(cmp); return { cmp: cmp$1 }; @@ -21,7 +21,7 @@ function comparableU(cmp) { } function comparable(cmp) { - var cmp$1 = Curry.__2(cmp); + let cmp$1 = Curry.__2(cmp); return { cmp: cmp$1 }; @@ -32,10 +32,10 @@ function MakeHashableU(M) { } function MakeHashable(M) { - var hash = M.hash; - var hash$1 = Curry.__1(hash); - var eq = M.eq; - var eq$1 = Curry.__2(eq); + let hash = M.hash; + let hash$1 = Curry.__1(hash); + let eq = M.eq; + let eq$1 = Curry.__2(eq); return { hash: hash$1, eq: eq$1 @@ -50,8 +50,8 @@ function hashableU(hash, eq) { } function hashable(hash, eq) { - var hash$1 = Curry.__1(hash); - var eq$1 = Curry.__2(eq); + let hash$1 = Curry.__1(hash); + let eq$1 = Curry.__2(eq); return { hash: hash$1, eq: eq$1 diff --git a/lib/es6/belt_Int.js b/lib/es6/belt_Int.js index 014908fa13..500142b3b4 100644 --- a/lib/es6/belt_Int.js +++ b/lib/es6/belt_Int.js @@ -2,7 +2,7 @@ function fromString(i) { - var i$1 = parseInt(i, 10); + let i$1 = parseInt(i, 10); if (isNaN(i$1)) { return; } else { diff --git a/lib/es6/belt_List.js b/lib/es6/belt_List.js index 1d1fb5eb8f..007080139b 100644 --- a/lib/es6/belt_List.js +++ b/lib/es6/belt_List.js @@ -50,11 +50,11 @@ function get(x, n) { if (n < 0) { return; } else { - var _x = x; - var _n = n; + let _x = x; + let _n = n; while(true) { - var n$1 = _n; - var x$1 = _x; + let n$1 = _n; + let x$1 = _x; if (!x$1) { return; } @@ -75,11 +75,11 @@ function getExn(x, n) { Error: new Error() }; } - var _x = x; - var _n = n; + let _x = x; + let _n = n; while(true) { - var n$1 = _n; - var x$1 = _x; + let n$1 = _n; + let x$1 = _x; if (x$1) { if (n$1 === 0) { return x$1.hd; @@ -97,15 +97,15 @@ function getExn(x, n) { function partitionAux(p, _cell, _precX, _precY) { while(true) { - var precY = _precY; - var precX = _precX; - var cell = _cell; + let precY = _precY; + let precX = _precX; + let cell = _cell; if (!cell) { return; } - var t = cell.tl; - var h = cell.hd; - var next = { + let t = cell.tl; + let h = cell.hd; + let next = { hd: h, tl: /* [] */0 }; @@ -124,18 +124,18 @@ function partitionAux(p, _cell, _precX, _precY) { function splitAux(_cell, _precX, _precY) { while(true) { - var precY = _precY; - var precX = _precX; - var cell = _cell; + let precY = _precY; + let precX = _precX; + let cell = _cell; if (!cell) { return; } - var match = cell.hd; - var nextA = { + let match = cell.hd; + let nextA = { hd: match[0], tl: /* [] */0 }; - var nextB = { + let nextB = { hd: match[1], tl: /* [] */0 }; @@ -150,12 +150,12 @@ function splitAux(_cell, _precX, _precY) { function copyAuxCont(_cellX, _prec) { while(true) { - var prec = _prec; - var cellX = _cellX; + let prec = _prec; + let cellX = _cellX; if (!cellX) { return prec; } - var next = { + let next = { hd: cellX.hd, tl: /* [] */0 }; @@ -168,15 +168,15 @@ function copyAuxCont(_cellX, _prec) { function copyAuxWitFilter(f, _cellX, _prec) { while(true) { - var prec = _prec; - var cellX = _cellX; + let prec = _prec; + let cellX = _cellX; if (!cellX) { return; } - var t = cellX.tl; - var h = cellX.hd; + let t = cellX.tl; + let h = cellX.hd; if (f(h)) { - var next = { + let next = { hd: h, tl: /* [] */0 }; @@ -192,16 +192,16 @@ function copyAuxWitFilter(f, _cellX, _prec) { function copyAuxWithFilterIndex(f, _cellX, _prec, _i) { while(true) { - var i = _i; - var prec = _prec; - var cellX = _cellX; + let i = _i; + let prec = _prec; + let cellX = _cellX; if (!cellX) { return; } - var t = cellX.tl; - var h = cellX.hd; + let t = cellX.tl; + let h = cellX.hd; if (f(h, i)) { - var next = { + let next = { hd: h, tl: /* [] */0 }; @@ -219,15 +219,15 @@ function copyAuxWithFilterIndex(f, _cellX, _prec, _i) { function copyAuxWitFilterMap(f, _cellX, _prec) { while(true) { - var prec = _prec; - var cellX = _cellX; + let prec = _prec; + let cellX = _cellX; if (!cellX) { return; } - var t = cellX.tl; - var h = f(cellX.hd); + let t = cellX.tl; + let h = f(cellX.hd); if (h !== undefined) { - var next = { + let next = { hd: Caml_option.valFromOption(h), tl: /* [] */0 }; @@ -243,18 +243,18 @@ function copyAuxWitFilterMap(f, _cellX, _prec) { function removeAssocAuxWithMap(_cellX, x, _prec, f) { while(true) { - var prec = _prec; - var cellX = _cellX; + let prec = _prec; + let cellX = _cellX; if (!cellX) { return false; } - var t = cellX.tl; - var h = cellX.hd; + let t = cellX.tl; + let h = cellX.hd; if (f(h[0], x)) { prec.tl = t; return true; } - var next = { + let next = { hd: h, tl: /* [] */0 }; @@ -267,13 +267,13 @@ function removeAssocAuxWithMap(_cellX, x, _prec, f) { function setAssocAuxWithMap(_cellX, x, k, _prec, eq) { while(true) { - var prec = _prec; - var cellX = _cellX; + let prec = _prec; + let cellX = _cellX; if (!cellX) { return false; } - var t = cellX.tl; - var h = cellX.hd; + let t = cellX.tl; + let h = cellX.hd; if (eq(h[0], x)) { prec.tl = { hd: [ @@ -284,7 +284,7 @@ function setAssocAuxWithMap(_cellX, x, k, _prec, eq) { }; return true; } - var next = { + let next = { hd: h, tl: /* [] */0 }; @@ -297,12 +297,12 @@ function setAssocAuxWithMap(_cellX, x, k, _prec, eq) { function copyAuxWithMap(_cellX, _prec, f) { while(true) { - var prec = _prec; - var cellX = _cellX; + let prec = _prec; + let cellX = _cellX; if (!cellX) { return; } - var next = { + let next = { hd: f(cellX.hd), tl: /* [] */0 }; @@ -315,16 +315,16 @@ function copyAuxWithMap(_cellX, _prec, f) { function zipAux(_cellX, _cellY, _prec) { while(true) { - var prec = _prec; - var cellY = _cellY; - var cellX = _cellX; + let prec = _prec; + let cellY = _cellY; + let cellX = _cellX; if (!cellX) { return; } if (!cellY) { return; } - var next = { + let next = { hd: [ cellX.hd, cellY.hd @@ -341,16 +341,16 @@ function zipAux(_cellX, _cellY, _prec) { function copyAuxWithMap2(f, _cellX, _cellY, _prec) { while(true) { - var prec = _prec; - var cellY = _cellY; - var cellX = _cellX; + let prec = _prec; + let cellY = _cellY; + let cellX = _cellX; if (!cellX) { return; } if (!cellY) { return; } - var next = { + let next = { hd: f(cellX.hd, cellY.hd), tl: /* [] */0 }; @@ -364,13 +364,13 @@ function copyAuxWithMap2(f, _cellX, _cellY, _prec) { function copyAuxWithMapI(f, _i, _cellX, _prec) { while(true) { - var prec = _prec; - var cellX = _cellX; - var i = _i; + let prec = _prec; + let cellX = _cellX; + let i = _i; if (!cellX) { return; } - var next = { + let next = { hd: f(i, cellX.hd), tl: /* [] */0 }; @@ -384,16 +384,16 @@ function copyAuxWithMapI(f, _i, _cellX, _prec) { function takeAux(_n, _cell, _prec) { while(true) { - var prec = _prec; - var cell = _cell; - var n = _n; + let prec = _prec; + let cell = _cell; + let n = _n; if (n === 0) { return true; } if (!cell) { return false; } - var cell$1 = { + let cell$1 = { hd: cell.hd, tl: /* [] */0 }; @@ -407,16 +407,16 @@ function takeAux(_n, _cell, _prec) { function splitAtAux(_n, _cell, _prec) { while(true) { - var prec = _prec; - var cell = _cell; - var n = _n; + let prec = _prec; + let cell = _cell; + let n = _n; if (n === 0) { return cell; } if (!cell) { return; } - var cell$1 = { + let cell$1 = { hd: cell.hd, tl: /* [] */0 }; @@ -438,11 +438,11 @@ function take(lst, n) { if (!lst) { return; } - var cell = { + let cell = { hd: lst.hd, tl: /* [] */0 }; - var has = takeAux(n - 1 | 0, lst.tl, cell); + let has = takeAux(n - 1 | 0, lst.tl, cell); if (has) { return cell; } @@ -453,11 +453,11 @@ function drop(lst, n) { if (n < 0) { return; } else { - var _l = lst; - var _n = n; + let _l = lst; + let _n = n; while(true) { - var n$1 = _n; - var l = _l; + let n$1 = _n; + let l = _l; if (n$1 === 0) { return l; } @@ -484,11 +484,11 @@ function splitAt(lst, n) { if (!lst) { return; } - var cell = { + let cell = { hd: lst.hd, tl: /* [] */0 }; - var rest = splitAtAux(n - 1 | 0, lst.tl, cell); + let rest = splitAtAux(n - 1 | 0, lst.tl, cell); if (rest !== undefined) { return [ cell, @@ -502,7 +502,7 @@ function concat(xs, ys) { if (!xs) { return ys; } - var cell = { + let cell = { hd: xs.hd, tl: /* [] */0 }; @@ -514,7 +514,7 @@ function mapU(xs, f) { if (!xs) { return /* [] */0; } - var cell = { + let cell = { hd: f(xs.hd), tl: /* [] */0 }; @@ -533,7 +533,7 @@ function zipByU(l1, l2, f) { if (!l2) { return /* [] */0; } - var cell = { + let cell = { hd: f(l1.hd, l2.hd), tl: /* [] */0 }; @@ -549,7 +549,7 @@ function mapWithIndexU(xs, f) { if (!xs) { return /* [] */0; } - var cell = { + let cell = { hd: f(0, xs.hd), tl: /* [] */0 }; @@ -565,14 +565,14 @@ function makeByU(n, f) { if (n <= 0) { return /* [] */0; } - var headX = { + let headX = { hd: f(0), tl: /* [] */0 }; - var cur = headX; - var i = 1; + let cur = headX; + let i = 1; while(i < n) { - var v = { + let v = { hd: f(i), tl: /* [] */0 }; @@ -591,14 +591,14 @@ function make(n, v) { if (n <= 0) { return /* [] */0; } - var headX = { + let headX = { hd: v, tl: /* [] */0 }; - var cur = headX; - var i = 1; + let cur = headX; + let i = 1; while(i < n) { - var v$1 = { + let v$1 = { hd: v, tl: /* [] */0 }; @@ -610,11 +610,11 @@ function make(n, v) { } function length(xs) { - var _x = xs; - var _acc = 0; + let _x = xs; + let _acc = 0; while(true) { - var acc = _acc; - var x = _x; + let acc = _acc; + let x = _x; if (!x) { return acc; } @@ -626,8 +626,8 @@ function length(xs) { function fillAux(arr, _i, _x) { while(true) { - var x = _x; - var i = _i; + let x = _x; + let i = _i; if (!x) { return; } @@ -639,11 +639,11 @@ function fillAux(arr, _i, _x) { } function fromArray(a) { - var _i = a.length - 1 | 0; - var _res = /* [] */0; + let _i = a.length - 1 | 0; + let _res = /* [] */0; while(true) { - var res = _res; - var i = _i; + let res = _res; + let i = _i; if (i < 0) { return res; } @@ -657,22 +657,22 @@ function fromArray(a) { } function toArray(x) { - var len = length(x); - var arr = new Array(len); + let len = length(x); + let arr = new Array(len); fillAux(arr, 0, x); return arr; } function shuffle(xs) { - var v = toArray(xs); + let v = toArray(xs); Belt_Array.shuffleInPlace(v); return fromArray(v); } function reverseConcat(_l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { return l2; } @@ -691,8 +691,8 @@ function reverse(l) { function flattenAux(_prec, _xs) { while(true) { - var xs = _xs; - var prec = _prec; + let xs = _xs; + let prec = _prec; if (xs) { _xs = xs.tl; _prec = copyAuxCont(xs.hd, prec); @@ -705,13 +705,13 @@ function flattenAux(_prec, _xs) { function flatten(_xs) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return /* [] */0; } - var match = xs.hd; + let match = xs.hd; if (match) { - var cell = { + let cell = { hd: match.hd, tl: /* [] */0 }; @@ -724,27 +724,27 @@ function flatten(_xs) { } function concatMany(xs) { - var len = xs.length; + let len = xs.length; if (len === 1) { return xs[0]; } if (len === 0) { return /* [] */0; } - var len$1 = xs.length; - var v = xs[len$1 - 1 | 0]; - for(var i = len$1 - 2 | 0; i >= 0; --i){ + let len$1 = xs.length; + let v = xs[len$1 - 1 | 0]; + for(let i = len$1 - 2 | 0; i >= 0; --i){ v = concat(xs[i], v); } return v; } function mapReverseU(l, f) { - var _accu = /* [] */0; - var _xs = l; + let _accu = /* [] */0; + let _xs = l; while(true) { - var xs = _xs; - var accu = _accu; + let xs = _xs; + let accu = _accu; if (!xs) { return accu; } @@ -763,7 +763,7 @@ function mapReverse(l, f) { function forEachU(_xs, f) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return; } @@ -778,11 +778,11 @@ function forEach(xs, f) { } function forEachWithIndexU(l, f) { - var _xs = l; - var _i = 0; + let _xs = l; + let _i = 0; while(true) { - var i = _i; - var xs = _xs; + let i = _i; + let xs = _xs; if (!xs) { return; } @@ -799,8 +799,8 @@ function forEachWithIndex(l, f) { function reduceU(_l, _accu, f) { while(true) { - var accu = _accu; - var l = _l; + let accu = _accu; + let l = _l; if (!l) { return accu; } @@ -823,7 +823,7 @@ function reduceReverseUnsafeU(l, accu, f) { } function reduceReverseU(l, acc, f) { - var len = length(l); + let len = length(l); if (len < 1000) { return reduceReverseUnsafeU(l, acc, f); } else { @@ -836,13 +836,13 @@ function reduceReverse(l, accu, f) { } function reduceWithIndexU(l, acc, f) { - var _l = l; - var _acc = acc; - var _i = 0; + let _l = l; + let _acc = acc; + let _i = 0; while(true) { - var i = _i; - var acc$1 = _acc; - var l$1 = _l; + let i = _i; + let acc$1 = _acc; + let l$1 = _l; if (!l$1) { return acc$1; } @@ -858,13 +858,13 @@ function reduceWithIndex(l, acc, f) { } function mapReverse2U(l1, l2, f) { - var _l1 = l1; - var _l2 = l2; - var _accu = /* [] */0; + let _l1 = l1; + let _l2 = l2; + let _accu = /* [] */0; while(true) { - var accu = _accu; - var l2$1 = _l2; - var l1$1 = _l1; + let accu = _accu; + let l2$1 = _l2; + let l1$1 = _l1; if (!l1$1) { return accu; } @@ -887,8 +887,8 @@ function mapReverse2(l1, l2, f) { function forEach2U(_l1, _l2, f) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { return; } @@ -908,9 +908,9 @@ function forEach2(l1, l2, f) { function reduce2U(_l1, _l2, _accu, f) { while(true) { - var accu = _accu; - var l2 = _l2; - var l1 = _l1; + let accu = _accu; + let l2 = _l2; + let l1 = _l1; if (!l1) { return accu; } @@ -937,7 +937,7 @@ function reduceReverse2UnsafeU(l1, l2, accu, f) { } function reduceReverse2U(l1, l2, acc, f) { - var len = length(l1); + let len = length(l1); if (len < 1000) { return reduceReverse2UnsafeU(l1, l2, acc, f); } else { @@ -951,7 +951,7 @@ function reduceReverse2(l1, l2, acc, f) { function everyU(_xs, p) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return true; } @@ -969,7 +969,7 @@ function every(xs, p) { function someU(_xs, p) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return false; } @@ -987,8 +987,8 @@ function some(xs, p) { function every2U(_l1, _l2, p) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { return true; } @@ -1010,8 +1010,8 @@ function every2(l1, l2, p) { function cmpByLength(_l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { if (l2) { return -1; @@ -1030,8 +1030,8 @@ function cmpByLength(_l1, _l2) { function cmpU(_l1, _l2, p) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { if (l2) { return -1; @@ -1042,7 +1042,7 @@ function cmpU(_l1, _l2, p) { if (!l2) { return 1; } - var c = p(l1.hd, l2.hd); + let c = p(l1.hd, l2.hd); if (c !== 0) { return c; } @@ -1058,8 +1058,8 @@ function cmp(l1, l2, f) { function eqU(_l1, _l2, p) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { if (l2) { return false; @@ -1085,8 +1085,8 @@ function eq(l1, l2, f) { function some2U(_l1, _l2, p) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { return false; } @@ -1108,7 +1108,7 @@ function some2(l1, l2, p) { function hasU(_xs, x, eq) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return false; } @@ -1126,11 +1126,11 @@ function has(xs, x, eq) { function getAssocU(_xs, x, eq) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return; } - var match = xs.hd; + let match = xs.hd; if (eq(match[0], x)) { return Caml_option.some(match[1]); } @@ -1145,7 +1145,7 @@ function getAssoc(xs, x, eq) { function hasAssocU(_xs, x, eq) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return false; } @@ -1165,16 +1165,16 @@ function removeAssocU(xs, x, eq) { if (!xs) { return /* [] */0; } - var l = xs.tl; - var pair = xs.hd; + let l = xs.tl; + let pair = xs.hd; if (eq(pair[0], x)) { return l; } - var cell = { + let cell = { hd: pair, tl: /* [] */0 }; - var removed = removeAssocAuxWithMap(l, x, cell, eq); + let removed = removeAssocAuxWithMap(l, x, cell, eq); if (removed) { return cell; } else { @@ -1196,8 +1196,8 @@ function setAssocU(xs, x, k, eq) { tl: /* [] */0 }; } - var l = xs.tl; - var pair = xs.hd; + let l = xs.tl; + let pair = xs.hd; if (eq(pair[0], x)) { return { hd: [ @@ -1207,11 +1207,11 @@ function setAssocU(xs, x, k, eq) { tl: l }; } - var cell = { + let cell = { hd: pair, tl: /* [] */0 }; - var replaced = setAssocAuxWithMap(l, x, k, cell, eq); + let replaced = setAssocAuxWithMap(l, x, k, cell, eq); if (replaced) { return cell; } else { @@ -1230,7 +1230,7 @@ function setAssoc(xs, x, k, eq) { } function sortU(xs, cmp) { - var arr = toArray(xs); + let arr = toArray(xs); Belt_SortArray.stableSortInPlaceByU(arr, cmp); return fromArray(arr); } @@ -1241,11 +1241,11 @@ function sort(xs, cmp) { function getByU(_xs, p) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return; } - var x = xs.hd; + let x = xs.hd; if (p(x)) { return Caml_option.some(x); } @@ -1260,14 +1260,14 @@ function getBy(xs, p) { function keepU(_xs, p) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return /* [] */0; } - var t = xs.tl; - var h = xs.hd; + let t = xs.tl; + let h = xs.hd; if (p(h)) { - var cell = { + let cell = { hd: h, tl: /* [] */0 }; @@ -1284,18 +1284,18 @@ function keep(xs, p) { } function keepWithIndexU(xs, p) { - var _xs = xs; - var _i = 0; + let _xs = xs; + let _i = 0; while(true) { - var i = _i; - var xs$1 = _xs; + let i = _i; + let xs$1 = _xs; if (!xs$1) { return /* [] */0; } - var t = xs$1.tl; - var h = xs$1.hd; + let t = xs$1.tl; + let h = xs$1.hd; if (p(h, i)) { - var cell = { + let cell = { hd: h, tl: /* [] */0 }; @@ -1314,14 +1314,14 @@ function keepWithIndex(xs, p) { function keepMapU(_xs, p) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return /* [] */0; } - var t = xs.tl; - var h = p(xs.hd); + let t = xs.tl; + let h = p(xs.hd); if (h !== undefined) { - var cell = { + let cell = { hd: Caml_option.valFromOption(h), tl: /* [] */0 }; @@ -1344,16 +1344,16 @@ function partitionU(l, p) { /* [] */0 ]; } - var h = l.hd; - var nextX = { + let h = l.hd; + let nextX = { hd: h, tl: /* [] */0 }; - var nextY = { + let nextY = { hd: h, tl: /* [] */0 }; - var b = p(h); + let b = p(h); partitionAux(p, l.tl, nextX, nextY); if (b) { return [ @@ -1379,12 +1379,12 @@ function unzip(xs) { /* [] */0 ]; } - var match = xs.hd; - var cellX = { + let match = xs.hd; + let cellX = { hd: match[0], tl: /* [] */0 }; - var cellY = { + let cellY = { hd: match[1], tl: /* [] */0 }; @@ -1402,7 +1402,7 @@ function zip(l1, l2) { if (!l2) { return /* [] */0; } - var cell = { + let cell = { hd: [ l1.hd, l2.hd @@ -1413,11 +1413,11 @@ function zip(l1, l2) { return cell; } -var size = length; +let size = length; -var filter = keep; +let filter = keep; -var filterWithIndex = keepWithIndex; +let filterWithIndex = keepWithIndex; export { length, diff --git a/lib/es6/belt_Map.js b/lib/es6/belt_Map.js index f80ddd764b..8234a5b949 100644 --- a/lib/es6/belt_Map.js +++ b/lib/es6/belt_Map.js @@ -4,7 +4,7 @@ import * as Curry from "./curry.js"; import * as Belt_MapDict from "./belt_MapDict.js"; function fromArray(data, id) { - var cmp = id.cmp; + let cmp = id.cmp; return { cmp: cmp, data: Belt_MapDict.fromArray(data, cmp) @@ -12,9 +12,9 @@ function fromArray(data, id) { } function remove(m, x) { - var odata = m.data; - var cmp = m.cmp; - var newData = Belt_MapDict.remove(odata, x, cmp); + let odata = m.data; + let cmp = m.cmp; + let newData = Belt_MapDict.remove(odata, x, cmp); if (newData === odata) { return m; } else { @@ -26,8 +26,8 @@ function remove(m, x) { } function removeMany(m, x) { - var cmp = m.cmp; - var newData = Belt_MapDict.removeMany(m.data, x, cmp); + let cmp = m.cmp; + let newData = Belt_MapDict.removeMany(m.data, x, cmp); return { cmp: cmp, data: newData @@ -35,7 +35,7 @@ function removeMany(m, x) { } function set(m, key, d) { - var cmp = m.cmp; + let cmp = m.cmp; return { cmp: cmp, data: Belt_MapDict.set(m.data, key, d, cmp) @@ -43,7 +43,7 @@ function set(m, key, d) { } function mergeMany(m, e) { - var cmp = m.cmp; + let cmp = m.cmp; return { cmp: cmp, data: Belt_MapDict.mergeMany(m.data, e, cmp) @@ -51,7 +51,7 @@ function mergeMany(m, e) { } function updateU(m, key, f) { - var cmp = m.cmp; + let cmp = m.cmp; return { cmp: cmp, data: Belt_MapDict.updateU(m.data, key, f, cmp) @@ -63,9 +63,9 @@ function update(m, key, f) { } function split(m, x) { - var cmp = m.cmp; - var match = Belt_MapDict.split(m.data, x, cmp); - var match$1 = match[0]; + let cmp = m.cmp; + let match = Belt_MapDict.split(m.data, x, cmp); + let match$1 = match[0]; return [ [ { @@ -82,7 +82,7 @@ function split(m, x) { } function mergeU(s1, s2, f) { - var cmp = s1.cmp; + let cmp = s1.cmp; return { cmp: cmp, data: Belt_MapDict.mergeU(s1.data, s2.data, f, cmp) @@ -156,8 +156,8 @@ function keep(m, f) { } function partitionU(m, p) { - var cmp = m.cmp; - var match = Belt_MapDict.partitionU(m.data, p); + let cmp = m.cmp; + let match = Belt_MapDict.partitionU(m.data, p); return [ { cmp: cmp, @@ -293,7 +293,7 @@ function getData(m) { } function getId(m) { - var cmp = m.cmp; + let cmp = m.cmp; return { cmp: cmp }; @@ -306,11 +306,11 @@ function packIdData(id, data) { }; } -var Int; +let Int; -var $$String; +let $$String; -var Dict; +let Dict; export { Int, diff --git a/lib/es6/belt_MapDict.js b/lib/es6/belt_MapDict.js index 78813d5390..364e0217bf 100644 --- a/lib/es6/belt_MapDict.js +++ b/lib/es6/belt_MapDict.js @@ -8,14 +8,14 @@ function set(t, newK, newD, cmp) { if (t === undefined) { return Belt_internalAVLtree.singleton(newK, newD); } - var k = t.k; - var c = cmp(newK, k); + let k = t.k; + let c = cmp(newK, k); if (c === 0) { return Belt_internalAVLtree.updateValue(t, newD); } - var l = t.l; - var r = t.r; - var v = t.v; + let l = t.l; + let r = t.r; + let v = t.v; if (c < 0) { return Belt_internalAVLtree.bal(set(l, newK, newD, cmp), k, v, r); } else { @@ -25,49 +25,49 @@ function set(t, newK, newD, cmp) { function updateU(t, newK, f, cmp) { if (t !== undefined) { - var k = t.k; - var c = cmp(newK, k); + let k = t.k; + let c = cmp(newK, k); if (c === 0) { - var newD = f(Caml_option.some(t.v)); + let newD = f(Caml_option.some(t.v)); if (newD !== undefined) { return Belt_internalAVLtree.updateValue(t, Caml_option.valFromOption(newD)); } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (l === undefined) { return r; } if (r === undefined) { return l; } - var kr = { + let kr = { contents: r.k }; - var vr = { + let vr = { contents: r.v }; - var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); + let r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1); } - var l$1 = t.l; - var r$2 = t.r; - var v = t.v; + let l$1 = t.l; + let r$2 = t.r; + let v = t.v; if (c < 0) { - var ll = updateU(l$1, newK, f, cmp); + let ll = updateU(l$1, newK, f, cmp); if (l$1 === ll) { return t; } else { return Belt_internalAVLtree.bal(ll, k, v, r$2); } } - var rr = updateU(r$2, newK, f, cmp); + let rr = updateU(r$2, newK, f, cmp); if (r$2 === rr) { return t; } else { return Belt_internalAVLtree.bal(l$1, k, v, rr); } } - var newD$1 = f(undefined); + let newD$1 = f(undefined); if (newD$1 !== undefined) { return Belt_internalAVLtree.singleton(newK, Caml_option.valFromOption(newD$1)); } else { @@ -80,10 +80,10 @@ function update(t, newK, f, cmp) { } function removeAux0(n, x, cmp) { - var v = n.k; - var l = n.l; - var r = n.r; - var c = cmp(x, v); + let v = n.k; + let l = n.l; + let r = n.r; + let c = cmp(x, v); if (c === 0) { if (l === undefined) { return r; @@ -91,20 +91,20 @@ function removeAux0(n, x, cmp) { if (r === undefined) { return l; } - var kr = { + let kr = { contents: r.k }; - var vr = { + let vr = { contents: r.v }; - var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); + let r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1); } if (c < 0) { if (l === undefined) { return n; } - var ll = removeAux0(l, x, cmp); + let ll = removeAux0(l, x, cmp); if (ll === l) { return n; } else { @@ -114,7 +114,7 @@ function removeAux0(n, x, cmp) { if (r === undefined) { return n; } - var rr = removeAux0(r, x, cmp); + let rr = removeAux0(r, x, cmp); if (rr === r) { return n; } else { @@ -130,21 +130,21 @@ function remove(n, x, cmp) { } function mergeMany(h, arr, cmp) { - var len = arr.length; - var v = h; - for(var i = 0; i < len; ++i){ - var match = arr[i]; + let len = arr.length; + let v = h; + for(let i = 0; i < len; ++i){ + let match = arr[i]; v = set(v, match[0], match[1], cmp); } return v; } function splitAuxPivot(n, x, pres, cmp) { - var v = n.k; - var d = n.v; - var l = n.l; - var r = n.r; - var c = cmp(x, v); + let v = n.k; + let d = n.v; + let l = n.l; + let r = n.r; + let c = cmp(x, v); if (c === 0) { pres.contents = Caml_option.some(d); return [ @@ -159,7 +159,7 @@ function splitAuxPivot(n, x, pres, cmp) { n ]; } - var match = splitAuxPivot(l, x, pres, cmp); + let match = splitAuxPivot(l, x, pres, cmp); return [ match[0], Belt_internalAVLtree.join(match[1], v, d, r) @@ -171,7 +171,7 @@ function splitAuxPivot(n, x, pres, cmp) { undefined ]; } - var match$1 = splitAuxPivot(r, x, pres, cmp); + let match$1 = splitAuxPivot(r, x, pres, cmp); return [ Belt_internalAVLtree.join(l, v, d, match$1[0]), match$1[1] @@ -188,10 +188,10 @@ function split(n, x, cmp) { undefined ]; } - var pres = { + let pres = { contents: undefined }; - var v = splitAuxPivot(n, x, pres, cmp); + let v = splitAuxPivot(n, x, pres, cmp); return [ v, pres.contents @@ -214,32 +214,32 @@ function mergeU(s1, s2, f, cmp) { })); } if (s1.h >= s2.h) { - var v1 = s1.k; - var d1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var d2 = { + let v1 = s1.k; + let d1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let d2 = { contents: undefined }; - var match = splitAuxPivot(s2, v1, d2, cmp); - var d2$1 = d2.contents; - var newLeft = mergeU(l1, match[0], f, cmp); - var newD = f(v1, Caml_option.some(d1), d2$1); - var newRight = mergeU(r1, match[1], f, cmp); + let match = splitAuxPivot(s2, v1, d2, cmp); + let d2$1 = d2.contents; + let newLeft = mergeU(l1, match[0], f, cmp); + let newD = f(v1, Caml_option.some(d1), d2$1); + let newRight = mergeU(r1, match[1], f, cmp); return Belt_internalAVLtree.concatOrJoin(newLeft, v1, newD, newRight); } - var v2 = s2.k; - var d2$2 = s2.v; - var l2 = s2.l; - var r2 = s2.r; - var d1$1 = { + let v2 = s2.k; + let d2$2 = s2.v; + let l2 = s2.l; + let r2 = s2.r; + let d1$1 = { contents: undefined }; - var match$1 = splitAuxPivot(s1, v2, d1$1, cmp); - var d1$2 = d1$1.contents; - var newLeft$1 = mergeU(match$1[0], l2, f, cmp); - var newD$1 = f(v2, d1$2, Caml_option.some(d2$2)); - var newRight$1 = mergeU(match$1[1], r2, f, cmp); + let match$1 = splitAuxPivot(s1, v2, d1$1, cmp); + let d1$2 = d1$1.contents; + let newLeft$1 = mergeU(match$1[0], l2, f, cmp); + let newD$1 = f(v2, d1$2, Caml_option.some(d2$2)); + let newRight$1 = mergeU(match$1[1], r2, f, cmp); return Belt_internalAVLtree.concatOrJoin(newLeft$1, v2, newD$1, newRight$1); } @@ -248,18 +248,18 @@ function merge(s1, s2, f, cmp) { } function removeMany(t, keys, cmp) { - var len = keys.length; + let len = keys.length; if (t !== undefined) { - var _t = t; - var _i = 0; + let _t = t; + let _i = 0; while(true) { - var i = _i; - var t$1 = _t; + let i = _i; + let t$1 = _t; if (i >= len) { return t$1; } - var ele = keys[i]; - var u = removeAux0(t$1, ele, cmp); + let ele = keys[i]; + let u = removeAux0(t$1, ele, cmp); if (u === undefined) { return u; } @@ -271,93 +271,93 @@ function removeMany(t, keys, cmp) { } -var empty; +let empty; -var isEmpty = Belt_internalAVLtree.isEmpty; +let isEmpty = Belt_internalAVLtree.isEmpty; -var has = Belt_internalAVLtree.has; +let has = Belt_internalAVLtree.has; -var cmpU = Belt_internalAVLtree.cmpU; +let cmpU = Belt_internalAVLtree.cmpU; -var cmp = Belt_internalAVLtree.cmp; +let cmp = Belt_internalAVLtree.cmp; -var eqU = Belt_internalAVLtree.eqU; +let eqU = Belt_internalAVLtree.eqU; -var eq = Belt_internalAVLtree.eq; +let eq = Belt_internalAVLtree.eq; -var findFirstByU = Belt_internalAVLtree.findFirstByU; +let findFirstByU = Belt_internalAVLtree.findFirstByU; -var findFirstBy = Belt_internalAVLtree.findFirstBy; +let findFirstBy = Belt_internalAVLtree.findFirstBy; -var forEachU = Belt_internalAVLtree.forEachU; +let forEachU = Belt_internalAVLtree.forEachU; -var forEach = Belt_internalAVLtree.forEach; +let forEach = Belt_internalAVLtree.forEach; -var reduceU = Belt_internalAVLtree.reduceU; +let reduceU = Belt_internalAVLtree.reduceU; -var reduce = Belt_internalAVLtree.reduce; +let reduce = Belt_internalAVLtree.reduce; -var everyU = Belt_internalAVLtree.everyU; +let everyU = Belt_internalAVLtree.everyU; -var every = Belt_internalAVLtree.every; +let every = Belt_internalAVLtree.every; -var someU = Belt_internalAVLtree.someU; +let someU = Belt_internalAVLtree.someU; -var some = Belt_internalAVLtree.some; +let some = Belt_internalAVLtree.some; -var size = Belt_internalAVLtree.size; +let size = Belt_internalAVLtree.size; -var toList = Belt_internalAVLtree.toList; +let toList = Belt_internalAVLtree.toList; -var toArray = Belt_internalAVLtree.toArray; +let toArray = Belt_internalAVLtree.toArray; -var fromArray = Belt_internalAVLtree.fromArray; +let fromArray = Belt_internalAVLtree.fromArray; -var keysToArray = Belt_internalAVLtree.keysToArray; +let keysToArray = Belt_internalAVLtree.keysToArray; -var valuesToArray = Belt_internalAVLtree.valuesToArray; +let valuesToArray = Belt_internalAVLtree.valuesToArray; -var minKey = Belt_internalAVLtree.minKey; +let minKey = Belt_internalAVLtree.minKey; -var minKeyUndefined = Belt_internalAVLtree.minKeyUndefined; +let minKeyUndefined = Belt_internalAVLtree.minKeyUndefined; -var maxKey = Belt_internalAVLtree.maxKey; +let maxKey = Belt_internalAVLtree.maxKey; -var maxKeyUndefined = Belt_internalAVLtree.maxKeyUndefined; +let maxKeyUndefined = Belt_internalAVLtree.maxKeyUndefined; -var minimum = Belt_internalAVLtree.minimum; +let minimum = Belt_internalAVLtree.minimum; -var minUndefined = Belt_internalAVLtree.minUndefined; +let minUndefined = Belt_internalAVLtree.minUndefined; -var maximum = Belt_internalAVLtree.maximum; +let maximum = Belt_internalAVLtree.maximum; -var maxUndefined = Belt_internalAVLtree.maxUndefined; +let maxUndefined = Belt_internalAVLtree.maxUndefined; -var get = Belt_internalAVLtree.get; +let get = Belt_internalAVLtree.get; -var getUndefined = Belt_internalAVLtree.getUndefined; +let getUndefined = Belt_internalAVLtree.getUndefined; -var getWithDefault = Belt_internalAVLtree.getWithDefault; +let getWithDefault = Belt_internalAVLtree.getWithDefault; -var getExn = Belt_internalAVLtree.getExn; +let getExn = Belt_internalAVLtree.getExn; -var checkInvariantInternal = Belt_internalAVLtree.checkInvariantInternal; +let checkInvariantInternal = Belt_internalAVLtree.checkInvariantInternal; -var keepU = Belt_internalAVLtree.keepSharedU; +let keepU = Belt_internalAVLtree.keepSharedU; -var keep = Belt_internalAVLtree.keepShared; +let keep = Belt_internalAVLtree.keepShared; -var partitionU = Belt_internalAVLtree.partitionSharedU; +let partitionU = Belt_internalAVLtree.partitionSharedU; -var partition = Belt_internalAVLtree.partitionShared; +let partition = Belt_internalAVLtree.partitionShared; -var mapU = Belt_internalAVLtree.mapU; +let mapU = Belt_internalAVLtree.mapU; -var map = Belt_internalAVLtree.map; +let map = Belt_internalAVLtree.map; -var mapWithKeyU = Belt_internalAVLtree.mapWithKeyU; +let mapWithKeyU = Belt_internalAVLtree.mapWithKeyU; -var mapWithKey = Belt_internalAVLtree.mapWithKey; +let mapWithKey = Belt_internalAVLtree.mapWithKey; export { empty, diff --git a/lib/es6/belt_MapInt.js b/lib/es6/belt_MapInt.js index e3b89d9682..e616d3cd84 100644 --- a/lib/es6/belt_MapInt.js +++ b/lib/es6/belt_MapInt.js @@ -9,11 +9,11 @@ function set(t, newK, newD) { if (t === undefined) { return Belt_internalAVLtree.singleton(newK, newD); } - var k = t.k; + let k = t.k; if (newK === k) { return Belt_internalAVLtree.updateValue(t, newD); } - var v = t.v; + let v = t.v; if (newK < k) { return Belt_internalAVLtree.bal(set(t.l, newK, newD), k, v, t.r); } else { @@ -23,48 +23,48 @@ function set(t, newK, newD) { function updateU(t, x, f) { if (t !== undefined) { - var k = t.k; + let k = t.k; if (x === k) { - var data = f(Caml_option.some(t.v)); + let data = f(Caml_option.some(t.v)); if (data !== undefined) { return Belt_internalAVLtree.updateValue(t, Caml_option.valFromOption(data)); } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (l === undefined) { return r; } if (r === undefined) { return l; } - var kr = { + let kr = { contents: r.k }; - var vr = { + let vr = { contents: r.v }; - var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); + let r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1); } - var v = t.v; - var l$1 = t.l; - var r$2 = t.r; + let v = t.v; + let l$1 = t.l; + let r$2 = t.r; if (x < k) { - var ll = updateU(l$1, x, f); + let ll = updateU(l$1, x, f); if (l$1 === ll) { return t; } else { return Belt_internalAVLtree.bal(ll, k, v, r$2); } } - var rr = updateU(r$2, x, f); + let rr = updateU(r$2, x, f); if (r$2 === rr) { return t; } else { return Belt_internalAVLtree.bal(l$1, k, v, rr); } } - var data$1 = f(undefined); + let data$1 = f(undefined); if (data$1 !== undefined) { return Belt_internalAVLtree.singleton(x, Caml_option.valFromOption(data$1)); } else { @@ -77,9 +77,9 @@ function update(t, x, f) { } function removeAux(n, x) { - var v = n.k; - var l = n.l; - var r = n.r; + let v = n.k; + let l = n.l; + let r = n.r; if (x === v) { if (l === undefined) { return r; @@ -87,20 +87,20 @@ function removeAux(n, x) { if (r === undefined) { return l; } - var kr = { + let kr = { contents: r.k }; - var vr = { + let vr = { contents: r.v }; - var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); + let r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1); } if (x < v) { if (l === undefined) { return n; } - var ll = removeAux(l, x); + let ll = removeAux(l, x); if (ll === l) { return n; } else { @@ -110,7 +110,7 @@ function removeAux(n, x) { if (r === undefined) { return n; } - var rr = removeAux(r, x); + let rr = removeAux(r, x); return Belt_internalAVLtree.bal(l, v, n.v, rr); } @@ -122,18 +122,18 @@ function remove(n, x) { } function removeMany(t, keys) { - var len = keys.length; + let len = keys.length; if (t !== undefined) { - var _t = t; - var _i = 0; + let _t = t; + let _i = 0; while(true) { - var i = _i; - var t$1 = _t; + let i = _i; + let t$1 = _t; if (i >= len) { return t$1; } - var ele = keys[i]; - var u = removeAux(t$1, ele); + let ele = keys[i]; + let u = removeAux(t$1, ele); if (u === undefined) { return u; } @@ -146,108 +146,108 @@ function removeMany(t, keys) { } function mergeMany(h, arr) { - var len = arr.length; - var v = h; - for(var i = 0; i < len; ++i){ - var match = arr[i]; + let len = arr.length; + let v = h; + for(let i = 0; i < len; ++i){ + let match = arr[i]; v = set(v, match[0], match[1]); } return v; } -var empty; +let empty; -var isEmpty = Belt_internalAVLtree.isEmpty; +let isEmpty = Belt_internalAVLtree.isEmpty; -var has = Belt_internalMapInt.has; +let has = Belt_internalMapInt.has; -var cmpU = Belt_internalMapInt.cmpU; +let cmpU = Belt_internalMapInt.cmpU; -var cmp = Belt_internalMapInt.cmp; +let cmp = Belt_internalMapInt.cmp; -var eqU = Belt_internalMapInt.eqU; +let eqU = Belt_internalMapInt.eqU; -var eq = Belt_internalMapInt.eq; +let eq = Belt_internalMapInt.eq; -var findFirstByU = Belt_internalAVLtree.findFirstByU; +let findFirstByU = Belt_internalAVLtree.findFirstByU; -var findFirstBy = Belt_internalAVLtree.findFirstBy; +let findFirstBy = Belt_internalAVLtree.findFirstBy; -var forEachU = Belt_internalAVLtree.forEachU; +let forEachU = Belt_internalAVLtree.forEachU; -var forEach = Belt_internalAVLtree.forEach; +let forEach = Belt_internalAVLtree.forEach; -var reduceU = Belt_internalAVLtree.reduceU; +let reduceU = Belt_internalAVLtree.reduceU; -var reduce = Belt_internalAVLtree.reduce; +let reduce = Belt_internalAVLtree.reduce; -var everyU = Belt_internalAVLtree.everyU; +let everyU = Belt_internalAVLtree.everyU; -var every = Belt_internalAVLtree.every; +let every = Belt_internalAVLtree.every; -var someU = Belt_internalAVLtree.someU; +let someU = Belt_internalAVLtree.someU; -var some = Belt_internalAVLtree.some; +let some = Belt_internalAVLtree.some; -var size = Belt_internalAVLtree.size; +let size = Belt_internalAVLtree.size; -var toList = Belt_internalAVLtree.toList; +let toList = Belt_internalAVLtree.toList; -var toArray = Belt_internalAVLtree.toArray; +let toArray = Belt_internalAVLtree.toArray; -var fromArray = Belt_internalMapInt.fromArray; +let fromArray = Belt_internalMapInt.fromArray; -var keysToArray = Belt_internalAVLtree.keysToArray; +let keysToArray = Belt_internalAVLtree.keysToArray; -var valuesToArray = Belt_internalAVLtree.valuesToArray; +let valuesToArray = Belt_internalAVLtree.valuesToArray; -var minKey = Belt_internalAVLtree.minKey; +let minKey = Belt_internalAVLtree.minKey; -var minKeyUndefined = Belt_internalAVLtree.minKeyUndefined; +let minKeyUndefined = Belt_internalAVLtree.minKeyUndefined; -var maxKey = Belt_internalAVLtree.maxKey; +let maxKey = Belt_internalAVLtree.maxKey; -var maxKeyUndefined = Belt_internalAVLtree.maxKeyUndefined; +let maxKeyUndefined = Belt_internalAVLtree.maxKeyUndefined; -var minimum = Belt_internalAVLtree.minimum; +let minimum = Belt_internalAVLtree.minimum; -var minUndefined = Belt_internalAVLtree.minUndefined; +let minUndefined = Belt_internalAVLtree.minUndefined; -var maximum = Belt_internalAVLtree.maximum; +let maximum = Belt_internalAVLtree.maximum; -var maxUndefined = Belt_internalAVLtree.maxUndefined; +let maxUndefined = Belt_internalAVLtree.maxUndefined; -var get = Belt_internalMapInt.get; +let get = Belt_internalMapInt.get; -var getUndefined = Belt_internalMapInt.getUndefined; +let getUndefined = Belt_internalMapInt.getUndefined; -var getWithDefault = Belt_internalMapInt.getWithDefault; +let getWithDefault = Belt_internalMapInt.getWithDefault; -var getExn = Belt_internalMapInt.getExn; +let getExn = Belt_internalMapInt.getExn; -var checkInvariantInternal = Belt_internalAVLtree.checkInvariantInternal; +let checkInvariantInternal = Belt_internalAVLtree.checkInvariantInternal; -var mergeU = Belt_internalMapInt.mergeU; +let mergeU = Belt_internalMapInt.mergeU; -var merge = Belt_internalMapInt.merge; +let merge = Belt_internalMapInt.merge; -var keepU = Belt_internalAVLtree.keepSharedU; +let keepU = Belt_internalAVLtree.keepSharedU; -var keep = Belt_internalAVLtree.keepShared; +let keep = Belt_internalAVLtree.keepShared; -var partitionU = Belt_internalAVLtree.partitionSharedU; +let partitionU = Belt_internalAVLtree.partitionSharedU; -var partition = Belt_internalAVLtree.partitionShared; +let partition = Belt_internalAVLtree.partitionShared; -var split = Belt_internalMapInt.split; +let split = Belt_internalMapInt.split; -var mapU = Belt_internalAVLtree.mapU; +let mapU = Belt_internalAVLtree.mapU; -var map = Belt_internalAVLtree.map; +let map = Belt_internalAVLtree.map; -var mapWithKeyU = Belt_internalAVLtree.mapWithKeyU; +let mapWithKeyU = Belt_internalAVLtree.mapWithKeyU; -var mapWithKey = Belt_internalAVLtree.mapWithKey; +let mapWithKey = Belt_internalAVLtree.mapWithKey; export { empty, diff --git a/lib/es6/belt_MapString.js b/lib/es6/belt_MapString.js index f999019f37..88b9478f7d 100644 --- a/lib/es6/belt_MapString.js +++ b/lib/es6/belt_MapString.js @@ -9,11 +9,11 @@ function set(t, newK, newD) { if (t === undefined) { return Belt_internalAVLtree.singleton(newK, newD); } - var k = t.k; + let k = t.k; if (newK === k) { return Belt_internalAVLtree.updateValue(t, newD); } - var v = t.v; + let v = t.v; if (newK < k) { return Belt_internalAVLtree.bal(set(t.l, newK, newD), k, v, t.r); } else { @@ -23,48 +23,48 @@ function set(t, newK, newD) { function updateU(t, x, f) { if (t !== undefined) { - var k = t.k; + let k = t.k; if (x === k) { - var data = f(Caml_option.some(t.v)); + let data = f(Caml_option.some(t.v)); if (data !== undefined) { return Belt_internalAVLtree.updateValue(t, Caml_option.valFromOption(data)); } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (l === undefined) { return r; } if (r === undefined) { return l; } - var kr = { + let kr = { contents: r.k }; - var vr = { + let vr = { contents: r.v }; - var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); + let r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1); } - var v = t.v; - var l$1 = t.l; - var r$2 = t.r; + let v = t.v; + let l$1 = t.l; + let r$2 = t.r; if (x < k) { - var ll = updateU(l$1, x, f); + let ll = updateU(l$1, x, f); if (l$1 === ll) { return t; } else { return Belt_internalAVLtree.bal(ll, k, v, r$2); } } - var rr = updateU(r$2, x, f); + let rr = updateU(r$2, x, f); if (r$2 === rr) { return t; } else { return Belt_internalAVLtree.bal(l$1, k, v, rr); } } - var data$1 = f(undefined); + let data$1 = f(undefined); if (data$1 !== undefined) { return Belt_internalAVLtree.singleton(x, Caml_option.valFromOption(data$1)); } else { @@ -77,9 +77,9 @@ function update(t, x, f) { } function removeAux(n, x) { - var v = n.k; - var l = n.l; - var r = n.r; + let v = n.k; + let l = n.l; + let r = n.r; if (x === v) { if (l === undefined) { return r; @@ -87,20 +87,20 @@ function removeAux(n, x) { if (r === undefined) { return l; } - var kr = { + let kr = { contents: r.k }; - var vr = { + let vr = { contents: r.v }; - var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); + let r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1); } if (x < v) { if (l === undefined) { return n; } - var ll = removeAux(l, x); + let ll = removeAux(l, x); if (ll === l) { return n; } else { @@ -110,7 +110,7 @@ function removeAux(n, x) { if (r === undefined) { return n; } - var rr = removeAux(r, x); + let rr = removeAux(r, x); return Belt_internalAVLtree.bal(l, v, n.v, rr); } @@ -122,18 +122,18 @@ function remove(n, x) { } function removeMany(t, keys) { - var len = keys.length; + let len = keys.length; if (t !== undefined) { - var _t = t; - var _i = 0; + let _t = t; + let _i = 0; while(true) { - var i = _i; - var t$1 = _t; + let i = _i; + let t$1 = _t; if (i >= len) { return t$1; } - var ele = keys[i]; - var u = removeAux(t$1, ele); + let ele = keys[i]; + let u = removeAux(t$1, ele); if (u === undefined) { return u; } @@ -146,108 +146,108 @@ function removeMany(t, keys) { } function mergeMany(h, arr) { - var len = arr.length; - var v = h; - for(var i = 0; i < len; ++i){ - var match = arr[i]; + let len = arr.length; + let v = h; + for(let i = 0; i < len; ++i){ + let match = arr[i]; v = set(v, match[0], match[1]); } return v; } -var empty; +let empty; -var isEmpty = Belt_internalAVLtree.isEmpty; +let isEmpty = Belt_internalAVLtree.isEmpty; -var has = Belt_internalMapString.has; +let has = Belt_internalMapString.has; -var cmpU = Belt_internalMapString.cmpU; +let cmpU = Belt_internalMapString.cmpU; -var cmp = Belt_internalMapString.cmp; +let cmp = Belt_internalMapString.cmp; -var eqU = Belt_internalMapString.eqU; +let eqU = Belt_internalMapString.eqU; -var eq = Belt_internalMapString.eq; +let eq = Belt_internalMapString.eq; -var findFirstByU = Belt_internalAVLtree.findFirstByU; +let findFirstByU = Belt_internalAVLtree.findFirstByU; -var findFirstBy = Belt_internalAVLtree.findFirstBy; +let findFirstBy = Belt_internalAVLtree.findFirstBy; -var forEachU = Belt_internalAVLtree.forEachU; +let forEachU = Belt_internalAVLtree.forEachU; -var forEach = Belt_internalAVLtree.forEach; +let forEach = Belt_internalAVLtree.forEach; -var reduceU = Belt_internalAVLtree.reduceU; +let reduceU = Belt_internalAVLtree.reduceU; -var reduce = Belt_internalAVLtree.reduce; +let reduce = Belt_internalAVLtree.reduce; -var everyU = Belt_internalAVLtree.everyU; +let everyU = Belt_internalAVLtree.everyU; -var every = Belt_internalAVLtree.every; +let every = Belt_internalAVLtree.every; -var someU = Belt_internalAVLtree.someU; +let someU = Belt_internalAVLtree.someU; -var some = Belt_internalAVLtree.some; +let some = Belt_internalAVLtree.some; -var size = Belt_internalAVLtree.size; +let size = Belt_internalAVLtree.size; -var toList = Belt_internalAVLtree.toList; +let toList = Belt_internalAVLtree.toList; -var toArray = Belt_internalAVLtree.toArray; +let toArray = Belt_internalAVLtree.toArray; -var fromArray = Belt_internalMapString.fromArray; +let fromArray = Belt_internalMapString.fromArray; -var keysToArray = Belt_internalAVLtree.keysToArray; +let keysToArray = Belt_internalAVLtree.keysToArray; -var valuesToArray = Belt_internalAVLtree.valuesToArray; +let valuesToArray = Belt_internalAVLtree.valuesToArray; -var minKey = Belt_internalAVLtree.minKey; +let minKey = Belt_internalAVLtree.minKey; -var minKeyUndefined = Belt_internalAVLtree.minKeyUndefined; +let minKeyUndefined = Belt_internalAVLtree.minKeyUndefined; -var maxKey = Belt_internalAVLtree.maxKey; +let maxKey = Belt_internalAVLtree.maxKey; -var maxKeyUndefined = Belt_internalAVLtree.maxKeyUndefined; +let maxKeyUndefined = Belt_internalAVLtree.maxKeyUndefined; -var minimum = Belt_internalAVLtree.minimum; +let minimum = Belt_internalAVLtree.minimum; -var minUndefined = Belt_internalAVLtree.minUndefined; +let minUndefined = Belt_internalAVLtree.minUndefined; -var maximum = Belt_internalAVLtree.maximum; +let maximum = Belt_internalAVLtree.maximum; -var maxUndefined = Belt_internalAVLtree.maxUndefined; +let maxUndefined = Belt_internalAVLtree.maxUndefined; -var get = Belt_internalMapString.get; +let get = Belt_internalMapString.get; -var getUndefined = Belt_internalMapString.getUndefined; +let getUndefined = Belt_internalMapString.getUndefined; -var getWithDefault = Belt_internalMapString.getWithDefault; +let getWithDefault = Belt_internalMapString.getWithDefault; -var getExn = Belt_internalMapString.getExn; +let getExn = Belt_internalMapString.getExn; -var checkInvariantInternal = Belt_internalAVLtree.checkInvariantInternal; +let checkInvariantInternal = Belt_internalAVLtree.checkInvariantInternal; -var mergeU = Belt_internalMapString.mergeU; +let mergeU = Belt_internalMapString.mergeU; -var merge = Belt_internalMapString.merge; +let merge = Belt_internalMapString.merge; -var keepU = Belt_internalAVLtree.keepSharedU; +let keepU = Belt_internalAVLtree.keepSharedU; -var keep = Belt_internalAVLtree.keepShared; +let keep = Belt_internalAVLtree.keepShared; -var partitionU = Belt_internalAVLtree.partitionSharedU; +let partitionU = Belt_internalAVLtree.partitionSharedU; -var partition = Belt_internalAVLtree.partitionShared; +let partition = Belt_internalAVLtree.partitionShared; -var split = Belt_internalMapString.split; +let split = Belt_internalMapString.split; -var mapU = Belt_internalAVLtree.mapU; +let mapU = Belt_internalAVLtree.mapU; -var map = Belt_internalAVLtree.map; +let map = Belt_internalAVLtree.map; -var mapWithKeyU = Belt_internalAVLtree.mapWithKeyU; +let mapWithKeyU = Belt_internalAVLtree.mapWithKeyU; -var mapWithKey = Belt_internalAVLtree.mapWithKey; +let mapWithKey = Belt_internalAVLtree.mapWithKey; export { empty, diff --git a/lib/es6/belt_MutableMap.js b/lib/es6/belt_MutableMap.js index 8b54851975..0e2363f2ee 100644 --- a/lib/es6/belt_MutableMap.js +++ b/lib/es6/belt_MutableMap.js @@ -5,11 +5,11 @@ import * as Caml_option from "./caml_option.js"; import * as Belt_internalAVLtree from "./belt_internalAVLtree.js"; function removeMutateAux(nt, x, cmp) { - var k = nt.k; - var c = cmp(x, k); + let k = nt.k; + let c = cmp(x, k); if (c === 0) { - var l = nt.l; - var r = nt.r; + let l = nt.l; + let r = nt.r; if (l !== undefined) { if (r !== undefined) { nt.r = Belt_internalAVLtree.removeMinAuxWithRootMutate(nt, r); @@ -24,7 +24,7 @@ function removeMutateAux(nt, x, cmp) { } } if (c < 0) { - var l$1 = nt.l; + let l$1 = nt.l; if (l$1 !== undefined) { nt.l = removeMutateAux(l$1, x, cmp); return Belt_internalAVLtree.balMutate(nt); @@ -32,7 +32,7 @@ function removeMutateAux(nt, x, cmp) { return nt; } } - var r$1 = nt.r; + let r$1 = nt.r; if (r$1 !== undefined) { nt.r = removeMutateAux(r$1, x, cmp); return Belt_internalAVLtree.balMutate(nt); @@ -42,11 +42,11 @@ function removeMutateAux(nt, x, cmp) { } function remove(d, k) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return; } - var newRoot = removeMutateAux(oldRoot, k, d.cmp); + let newRoot = removeMutateAux(oldRoot, k, d.cmp); if (newRoot !== oldRoot) { d.data = newRoot; return; @@ -56,13 +56,13 @@ function remove(d, k) { function removeArrayMutateAux(_t, xs, _i, len, cmp) { while(true) { - var i = _i; - var t = _t; + let i = _i; + let t = _t; if (i >= len) { return t; } - var ele = xs[i]; - var u = removeMutateAux(t, ele, cmp); + let ele = xs[i]; + let u = removeMutateAux(t, ele, cmp); if (u === undefined) { return; } @@ -73,12 +73,12 @@ function removeArrayMutateAux(_t, xs, _i, len, cmp) { } function removeMany(d, xs) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return; } - var len = xs.length; - var newRoot = removeArrayMutateAux(oldRoot, xs, 0, len, d.cmp); + let len = xs.length; + let newRoot = removeArrayMutateAux(oldRoot, xs, 0, len, d.cmp); if (newRoot !== oldRoot) { d.data = newRoot; return; @@ -88,16 +88,16 @@ function removeMany(d, xs) { function updateDone(t, x, f, cmp) { if (t !== undefined) { - var k = t.k; - var c = cmp(x, k); + let k = t.k; + let c = cmp(x, k); if (c === 0) { - var data = f(Caml_option.some(t.v)); + let data = f(Caml_option.some(t.v)); if (data !== undefined) { t.v = Caml_option.valFromOption(data); return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (l !== undefined) { if (r !== undefined) { t.r = Belt_internalAVLtree.removeMinAuxWithRootMutate(t, r); @@ -118,7 +118,7 @@ function updateDone(t, x, f, cmp) { } return Belt_internalAVLtree.balMutate(t); } - var data$1 = f(undefined); + let data$1 = f(undefined); if (data$1 !== undefined) { return Belt_internalAVLtree.singleton(x, Caml_option.valFromOption(data$1)); } else { @@ -127,8 +127,8 @@ function updateDone(t, x, f, cmp) { } function updateU(t, x, f) { - var oldRoot = t.data; - var newRoot = updateDone(oldRoot, x, f, t.cmp); + let oldRoot = t.data; + let newRoot = updateDone(oldRoot, x, f, t.cmp); if (newRoot !== oldRoot) { t.data = newRoot; return; @@ -152,7 +152,7 @@ function clear(m) { } function isEmpty(d) { - var x = d.data; + let x = d.data; return x === undefined; } @@ -303,7 +303,7 @@ function has(m, x) { } function fromArray(data, id) { - var cmp = id.cmp; + let cmp = id.cmp; return { cmp: cmp, data: Belt_internalAVLtree.fromArray(data, cmp) @@ -311,8 +311,8 @@ function fromArray(data, id) { } function set(m, e, v) { - var oldRoot = m.data; - var newRoot = Belt_internalAVLtree.updateMutate(oldRoot, e, v, m.cmp); + let oldRoot = m.data; + let newRoot = Belt_internalAVLtree.updateMutate(oldRoot, e, v, m.cmp); if (newRoot !== oldRoot) { m.data = newRoot; return; @@ -321,17 +321,17 @@ function set(m, e, v) { } function mergeManyAux(t, xs, cmp) { - var v = t; - for(var i = 0 ,i_finish = xs.length; i < i_finish; ++i){ - var match = xs[i]; + let v = t; + for(let i = 0 ,i_finish = xs.length; i < i_finish; ++i){ + let match = xs[i]; v = Belt_internalAVLtree.updateMutate(v, match[0], match[1], cmp); } return v; } function mergeMany(d, xs) { - var oldRoot = d.data; - var newRoot = mergeManyAux(oldRoot, xs, d.cmp); + let oldRoot = d.data; + let newRoot = mergeManyAux(oldRoot, xs, d.cmp); if (newRoot !== oldRoot) { d.data = newRoot; return; @@ -339,9 +339,9 @@ function mergeMany(d, xs) { } -var Int; +let Int; -var $$String; +let $$String; export { Int, diff --git a/lib/es6/belt_MutableMapInt.js b/lib/es6/belt_MutableMapInt.js index c9b233fd2d..3cb1a4ce79 100644 --- a/lib/es6/belt_MutableMapInt.js +++ b/lib/es6/belt_MutableMapInt.js @@ -12,7 +12,7 @@ function make(param) { } function isEmpty(m) { - var x = m.data; + let x = m.data; return x === undefined; } @@ -53,8 +53,8 @@ function maxUndefined(m) { } function set(m, k, v) { - var old_data = m.data; - var v$1 = Belt_internalMapInt.addMutate(old_data, k, v); + let old_data = m.data; + let v$1 = Belt_internalMapInt.addMutate(old_data, k, v); if (v$1 !== old_data) { m.data = v$1; return; @@ -143,10 +143,10 @@ function has(d, v) { } function removeMutateAux(nt, x) { - var k = nt.k; + let k = nt.k; if (x === k) { - var l = nt.l; - var r = nt.r; + let l = nt.l; + let r = nt.r; if (l !== undefined) { if (r !== undefined) { nt.r = Belt_internalAVLtree.removeMinAuxWithRootMutate(nt, r); @@ -159,7 +159,7 @@ function removeMutateAux(nt, x) { } } if (x < k) { - var l$1 = nt.l; + let l$1 = nt.l; if (l$1 !== undefined) { nt.l = removeMutateAux(l$1, x); return Belt_internalAVLtree.balMutate(nt); @@ -167,7 +167,7 @@ function removeMutateAux(nt, x) { return nt; } } - var r$1 = nt.r; + let r$1 = nt.r; if (r$1 !== undefined) { nt.r = removeMutateAux(r$1, x); return Belt_internalAVLtree.balMutate(nt); @@ -177,11 +177,11 @@ function removeMutateAux(nt, x) { } function remove(d, v) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return; } - var newRoot = removeMutateAux(oldRoot, v); + let newRoot = removeMutateAux(oldRoot, v); if (newRoot !== oldRoot) { d.data = newRoot; return; @@ -191,15 +191,15 @@ function remove(d, v) { function updateDone(t, x, f) { if (t !== undefined) { - var k = t.k; + let k = t.k; if (k === x) { - var data = f(Caml_option.some(t.v)); + let data = f(Caml_option.some(t.v)); if (data !== undefined) { t.v = Caml_option.valFromOption(data); return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (l !== undefined) { if (r !== undefined) { t.r = Belt_internalAVLtree.removeMinAuxWithRootMutate(t, r); @@ -211,17 +211,17 @@ function updateDone(t, x, f) { return r; } } - var l$1 = t.l; - var r$1 = t.r; + let l$1 = t.l; + let r$1 = t.r; if (x < k) { - var ll = updateDone(l$1, x, f); + let ll = updateDone(l$1, x, f); t.l = ll; } else { t.r = updateDone(r$1, x, f); } return Belt_internalAVLtree.balMutate(t); } - var data$1 = f(undefined); + let data$1 = f(undefined); if (data$1 !== undefined) { return Belt_internalAVLtree.singleton(x, Caml_option.valFromOption(data$1)); } else { @@ -230,8 +230,8 @@ function updateDone(t, x, f) { } function updateU(t, x, f) { - var oldRoot = t.data; - var newRoot = updateDone(oldRoot, x, f); + let oldRoot = t.data; + let newRoot = updateDone(oldRoot, x, f); if (newRoot !== oldRoot) { t.data = newRoot; return; @@ -245,13 +245,13 @@ function update(t, x, f) { function removeArrayMutateAux(_t, xs, _i, len) { while(true) { - var i = _i; - var t = _t; + let i = _i; + let t = _t; if (i >= len) { return t; } - var ele = xs[i]; - var u = removeMutateAux(t, ele); + let ele = xs[i]; + let u = removeMutateAux(t, ele); if (u === undefined) { return; } @@ -262,12 +262,12 @@ function removeArrayMutateAux(_t, xs, _i, len) { } function removeMany(d, xs) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return; } - var len = xs.length; - var newRoot = removeArrayMutateAux(oldRoot, xs, 0, len); + let len = xs.length; + let newRoot = removeArrayMutateAux(oldRoot, xs, 0, len); if (newRoot !== oldRoot) { d.data = newRoot; return; diff --git a/lib/es6/belt_MutableMapString.js b/lib/es6/belt_MutableMapString.js index 3fa7d10aec..0703abaf43 100644 --- a/lib/es6/belt_MutableMapString.js +++ b/lib/es6/belt_MutableMapString.js @@ -12,7 +12,7 @@ function make(param) { } function isEmpty(m) { - var x = m.data; + let x = m.data; return x === undefined; } @@ -53,8 +53,8 @@ function maxUndefined(m) { } function set(m, k, v) { - var old_data = m.data; - var v$1 = Belt_internalMapString.addMutate(old_data, k, v); + let old_data = m.data; + let v$1 = Belt_internalMapString.addMutate(old_data, k, v); if (v$1 !== old_data) { m.data = v$1; return; @@ -143,10 +143,10 @@ function has(d, v) { } function removeMutateAux(nt, x) { - var k = nt.k; + let k = nt.k; if (x === k) { - var l = nt.l; - var r = nt.r; + let l = nt.l; + let r = nt.r; if (l !== undefined) { if (r !== undefined) { nt.r = Belt_internalAVLtree.removeMinAuxWithRootMutate(nt, r); @@ -159,7 +159,7 @@ function removeMutateAux(nt, x) { } } if (x < k) { - var l$1 = nt.l; + let l$1 = nt.l; if (l$1 !== undefined) { nt.l = removeMutateAux(l$1, x); return Belt_internalAVLtree.balMutate(nt); @@ -167,7 +167,7 @@ function removeMutateAux(nt, x) { return nt; } } - var r$1 = nt.r; + let r$1 = nt.r; if (r$1 !== undefined) { nt.r = removeMutateAux(r$1, x); return Belt_internalAVLtree.balMutate(nt); @@ -177,11 +177,11 @@ function removeMutateAux(nt, x) { } function remove(d, v) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return; } - var newRoot = removeMutateAux(oldRoot, v); + let newRoot = removeMutateAux(oldRoot, v); if (newRoot !== oldRoot) { d.data = newRoot; return; @@ -191,15 +191,15 @@ function remove(d, v) { function updateDone(t, x, f) { if (t !== undefined) { - var k = t.k; + let k = t.k; if (k === x) { - var data = f(Caml_option.some(t.v)); + let data = f(Caml_option.some(t.v)); if (data !== undefined) { t.v = Caml_option.valFromOption(data); return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (l !== undefined) { if (r !== undefined) { t.r = Belt_internalAVLtree.removeMinAuxWithRootMutate(t, r); @@ -211,17 +211,17 @@ function updateDone(t, x, f) { return r; } } - var l$1 = t.l; - var r$1 = t.r; + let l$1 = t.l; + let r$1 = t.r; if (x < k) { - var ll = updateDone(l$1, x, f); + let ll = updateDone(l$1, x, f); t.l = ll; } else { t.r = updateDone(r$1, x, f); } return Belt_internalAVLtree.balMutate(t); } - var data$1 = f(undefined); + let data$1 = f(undefined); if (data$1 !== undefined) { return Belt_internalAVLtree.singleton(x, Caml_option.valFromOption(data$1)); } else { @@ -230,8 +230,8 @@ function updateDone(t, x, f) { } function updateU(t, x, f) { - var oldRoot = t.data; - var newRoot = updateDone(oldRoot, x, f); + let oldRoot = t.data; + let newRoot = updateDone(oldRoot, x, f); if (newRoot !== oldRoot) { t.data = newRoot; return; @@ -245,13 +245,13 @@ function update(t, x, f) { function removeArrayMutateAux(_t, xs, _i, len) { while(true) { - var i = _i; - var t = _t; + let i = _i; + let t = _t; if (i >= len) { return t; } - var ele = xs[i]; - var u = removeMutateAux(t, ele); + let ele = xs[i]; + let u = removeMutateAux(t, ele); if (u === undefined) { return; } @@ -262,12 +262,12 @@ function removeArrayMutateAux(_t, xs, _i, len) { } function removeMany(d, xs) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return; } - var len = xs.length; - var newRoot = removeArrayMutateAux(oldRoot, xs, 0, len); + let len = xs.length; + let newRoot = removeArrayMutateAux(oldRoot, xs, 0, len); if (newRoot !== oldRoot) { d.data = newRoot; return; diff --git a/lib/es6/belt_MutableQueue.js b/lib/es6/belt_MutableQueue.js index 4579e7dca8..492d2e6ddb 100644 --- a/lib/es6/belt_MutableQueue.js +++ b/lib/es6/belt_MutableQueue.js @@ -18,11 +18,11 @@ function clear(q) { } function add(q, x) { - var cell = { + let cell = { content: x, next: undefined }; - var last = q.last; + let last = q.last; if (last !== undefined) { q.length = q.length + 1 | 0; last.next = cell; @@ -35,7 +35,7 @@ function add(q, x) { } function peek(q) { - var v = q.first; + let v = q.first; if (v !== undefined) { return Caml_option.some(v.content); } @@ -43,7 +43,7 @@ function peek(q) { } function peekUndefined(q) { - var v = q.first; + let v = q.first; if (v !== undefined) { return v.content; } @@ -51,7 +51,7 @@ function peekUndefined(q) { } function peekExn(q) { - var v = q.first; + let v = q.first; if (v !== undefined) { return v.content; } @@ -62,11 +62,11 @@ function peekExn(q) { } function pop(q) { - var x = q.first; + let x = q.first; if (x === undefined) { return; } - var next = x.next; + let next = x.next; if (next === undefined) { clear(q); return Caml_option.some(x.content); @@ -78,9 +78,9 @@ function pop(q) { } function popExn(q) { - var x = q.first; + let x = q.first; if (x !== undefined) { - var next = x.next; + let next = x.next; if (next === undefined) { clear(q); return x.content; @@ -97,11 +97,11 @@ function popExn(q) { } function popUndefined(q) { - var x = q.first; + let x = q.first; if (x === undefined) { return; } - var next = x.next; + let next = x.next; if (next === undefined) { clear(q); return x.content; @@ -113,19 +113,19 @@ function popUndefined(q) { } function copy(q) { - var qRes = { + let qRes = { length: q.length, first: undefined, last: undefined }; - var _prev; - var _cell = q.first; + let _prev; + let _cell = q.first; while(true) { - var cell = _cell; - var prev = _prev; + let cell = _cell; + let prev = _prev; if (cell !== undefined) { - var content = cell.content; - var res = { + let content = cell.content; + let res = { content: content, next: undefined }; @@ -144,19 +144,19 @@ function copy(q) { } function mapU(q, f) { - var qRes = { + let qRes = { length: q.length, first: undefined, last: undefined }; - var _prev; - var _cell = q.first; + let _prev; + let _cell = q.first; while(true) { - var cell = _cell; - var prev = _prev; + let cell = _cell; + let prev = _prev; if (cell !== undefined) { - var content = f(cell.content); - var res = { + let content = f(cell.content); + let res = { content: content, next: undefined }; @@ -187,9 +187,9 @@ function size(q) { } function forEachU(q, f) { - var _cell = q.first; + let _cell = q.first; while(true) { - var cell = _cell; + let cell = _cell; if (cell === undefined) { return; } @@ -204,15 +204,15 @@ function forEach(q, f) { } function reduceU(q, accu, f) { - var _accu = accu; - var _cell = q.first; + let _accu = accu; + let _cell = q.first; while(true) { - var cell = _cell; - var accu$1 = _accu; + let cell = _cell; + let accu$1 = _accu; if (cell === undefined) { return accu$1; } - var accu$2 = f(accu$1, cell.content); + let accu$2 = f(accu$1, cell.content); _cell = cell.next; _accu = accu$2; continue ; @@ -227,7 +227,7 @@ function transfer(q1, q2) { if (q1.length <= 0) { return; } - var l = q2.last; + let l = q2.last; if (l !== undefined) { q2.length = q2.length + q1.length | 0; l.next = q1.first; @@ -243,8 +243,8 @@ function transfer(q1, q2) { function fillAux(_i, arr, _cell) { while(true) { - var cell = _cell; - var i = _i; + let cell = _cell; + let i = _i; if (cell === undefined) { return; } @@ -256,18 +256,18 @@ function fillAux(_i, arr, _cell) { } function toArray(x) { - var v = new Array(x.length); + let v = new Array(x.length); fillAux(0, v, x.first); return v; } function fromArray(arr) { - var q = { + let q = { length: 0, first: undefined, last: undefined }; - for(var i = 0 ,i_finish = arr.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = arr.length; i < i_finish; ++i){ add(q, arr[i]); } return q; diff --git a/lib/es6/belt_MutableSet.js b/lib/es6/belt_MutableSet.js index 7c3da36452..b6802bad5c 100644 --- a/lib/es6/belt_MutableSet.js +++ b/lib/es6/belt_MutableSet.js @@ -5,11 +5,11 @@ import * as Belt_SortArray from "./belt_SortArray.js"; import * as Belt_internalAVLset from "./belt_internalAVLset.js"; function remove0(nt, x, cmp) { - var k = nt.v; - var c = cmp(x, k); + let k = nt.v; + let c = cmp(x, k); if (c === 0) { - var l = nt.l; - var r = nt.r; + let l = nt.l; + let r = nt.r; if (l !== undefined) { if (r !== undefined) { nt.r = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r); @@ -22,7 +22,7 @@ function remove0(nt, x, cmp) { } } if (c < 0) { - var l$1 = nt.l; + let l$1 = nt.l; if (l$1 !== undefined) { nt.l = remove0(l$1, x, cmp); return Belt_internalAVLset.balMutate(nt); @@ -30,7 +30,7 @@ function remove0(nt, x, cmp) { return nt; } } - var r$1 = nt.r; + let r$1 = nt.r; if (r$1 !== undefined) { nt.r = remove0(r$1, x, cmp); return Belt_internalAVLset.balMutate(nt); @@ -40,11 +40,11 @@ function remove0(nt, x, cmp) { } function remove(d, v) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return; } - var newRoot = remove0(oldRoot, v, d.cmp); + let newRoot = remove0(oldRoot, v, d.cmp); if (newRoot !== oldRoot) { d.data = newRoot; return; @@ -54,13 +54,13 @@ function remove(d, v) { function removeMany0(_t, xs, _i, len, cmp) { while(true) { - var i = _i; - var t = _t; + let i = _i; + let t = _t; if (i >= len) { return t; } - var ele = xs[i]; - var u = remove0(t, ele, cmp); + let ele = xs[i]; + let u = remove0(t, ele, cmp); if (u === undefined) { return; } @@ -71,21 +71,21 @@ function removeMany0(_t, xs, _i, len, cmp) { } function removeMany(d, xs) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return; } - var len = xs.length; + let len = xs.length; d.data = removeMany0(oldRoot, xs, 0, len, d.cmp); } function removeCheck0(nt, x, removed, cmp) { - var k = nt.v; - var c = cmp(x, k); + let k = nt.v; + let c = cmp(x, k); if (c === 0) { removed.contents = true; - var l = nt.l; - var r = nt.r; + let l = nt.l; + let r = nt.r; if (l !== undefined) { if (r !== undefined) { nt.r = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r); @@ -98,7 +98,7 @@ function removeCheck0(nt, x, removed, cmp) { } } if (c < 0) { - var l$1 = nt.l; + let l$1 = nt.l; if (l$1 !== undefined) { nt.l = removeCheck0(l$1, x, removed, cmp); return Belt_internalAVLset.balMutate(nt); @@ -106,7 +106,7 @@ function removeCheck0(nt, x, removed, cmp) { return nt; } } - var r$1 = nt.r; + let r$1 = nt.r; if (r$1 !== undefined) { nt.r = removeCheck0(r$1, x, removed, cmp); return Belt_internalAVLset.balMutate(nt); @@ -116,14 +116,14 @@ function removeCheck0(nt, x, removed, cmp) { } function removeCheck(d, v) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return false; } - var removed = { + let removed = { contents: false }; - var newRoot = removeCheck0(oldRoot, v, removed, d.cmp); + let newRoot = removeCheck0(oldRoot, v, removed, d.cmp); if (newRoot !== oldRoot) { d.data = newRoot; } @@ -132,15 +132,15 @@ function removeCheck(d, v) { function addCheck0(t, x, added, cmp) { if (t !== undefined) { - var k = t.v; - var c = cmp(x, k); + let k = t.v; + let c = cmp(x, k); if (c === 0) { return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (c < 0) { - var ll = addCheck0(l, x, added, cmp); + let ll = addCheck0(l, x, added, cmp); t.l = ll; } else { t.r = addCheck0(r, x, added, cmp); @@ -152,11 +152,11 @@ function addCheck0(t, x, added, cmp) { } function addCheck(m, e) { - var oldRoot = m.data; - var added = { + let oldRoot = m.data; + let added = { contents: false }; - var newRoot = addCheck0(oldRoot, e, added, m.cmp); + let newRoot = addCheck0(oldRoot, e, added, m.cmp); if (newRoot !== oldRoot) { m.data = newRoot; } @@ -164,8 +164,8 @@ function addCheck(m, e) { } function add(m, e) { - var oldRoot = m.data; - var newRoot = Belt_internalAVLset.addMutate(m.cmp, oldRoot, e); + let oldRoot = m.data; + let newRoot = Belt_internalAVLset.addMutate(m.cmp, oldRoot, e); if (newRoot !== oldRoot) { m.data = newRoot; return; @@ -174,8 +174,8 @@ function add(m, e) { } function addArrayMutate(t, xs, cmp) { - var v = t; - for(var i = 0 ,i_finish = xs.length; i < i_finish; ++i){ + let v = t; + for(let i = 0 ,i_finish = xs.length; i < i_finish; ++i){ v = Belt_internalAVLset.addMutate(cmp, v, xs[i]); } return v; @@ -193,7 +193,7 @@ function make(id) { } function isEmpty(d) { - var n = d.data; + let n = d.data; return n === undefined; } @@ -269,7 +269,7 @@ function checkInvariantInternal(d) { } function fromArray(data, id) { - var cmp = id.cmp; + let cmp = id.cmp; return { cmp: cmp, data: Belt_internalAVLset.fromArray(data, cmp) @@ -297,10 +297,10 @@ function getExn(d, x) { } function split(d, key) { - var arr = Belt_internalAVLset.toArray(d.data); - var cmp = d.cmp; - var i = Belt_SortArray.binarySearchByU(arr, key, cmp); - var len = arr.length; + let arr = Belt_internalAVLset.toArray(d.data); + let cmp = d.cmp; + let i = Belt_SortArray.binarySearchByU(arr, key, cmp); + let len = arr.length; if (i >= 0) { return [ [ @@ -316,7 +316,7 @@ function split(d, key) { true ]; } - var next = (-i | 0) - 1 | 0; + let next = (-i | 0) - 1 | 0; return [ [ { @@ -344,8 +344,8 @@ function keep(d, p) { } function partitionU(d, p) { - var cmp = d.cmp; - var match = Belt_internalAVLset.partitionCopyU(d.data, p); + let cmp = d.cmp; + let match = Belt_internalAVLset.partitionCopyU(d.data, p); return [ { cmp: cmp, @@ -367,9 +367,9 @@ function subset(a, b) { } function intersect(a, b) { - var cmp = a.cmp; - var match = a.data; - var match$1 = b.data; + let cmp = a.cmp; + let match = a.data; + let match$1 = b.data; if (match === undefined) { return { cmp: cmp, @@ -382,10 +382,10 @@ function intersect(a, b) { data: undefined }; } - var sizea = Belt_internalAVLset.lengthNode(match); - var sizeb = Belt_internalAVLset.lengthNode(match$1); - var totalSize = sizea + sizeb | 0; - var tmp = new Array(totalSize); + let sizea = Belt_internalAVLset.lengthNode(match); + let sizeb = Belt_internalAVLset.lengthNode(match$1); + let totalSize = sizea + sizeb | 0; + let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(match, 0, tmp); Belt_internalAVLset.fillArray(match$1, sizea, tmp); if (cmp(tmp[sizea - 1 | 0], tmp[sizea]) < 0 || cmp(tmp[totalSize - 1 | 0], tmp[0]) < 0) { @@ -394,8 +394,8 @@ function intersect(a, b) { data: undefined }; } - var tmp2 = new Array(sizea < sizeb ? sizea : sizeb); - var k = Belt_SortArray.intersectU(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0, cmp); + let tmp2 = new Array(sizea < sizeb ? sizea : sizeb); + let k = Belt_SortArray.intersectU(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0, cmp); return { cmp: cmp, data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) @@ -403,9 +403,9 @@ function intersect(a, b) { } function diff(a, b) { - var cmp = a.cmp; - var dataa = a.data; - var match = b.data; + let cmp = a.cmp; + let dataa = a.data; + let match = b.data; if (dataa === undefined) { return { cmp: cmp, @@ -418,10 +418,10 @@ function diff(a, b) { data: Belt_internalAVLset.copy(dataa) }; } - var sizea = Belt_internalAVLset.lengthNode(dataa); - var sizeb = Belt_internalAVLset.lengthNode(match); - var totalSize = sizea + sizeb | 0; - var tmp = new Array(totalSize); + let sizea = Belt_internalAVLset.lengthNode(dataa); + let sizeb = Belt_internalAVLset.lengthNode(match); + let totalSize = sizea + sizeb | 0; + let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(dataa, 0, tmp); Belt_internalAVLset.fillArray(match, sizea, tmp); if (cmp(tmp[sizea - 1 | 0], tmp[sizea]) < 0 || cmp(tmp[totalSize - 1 | 0], tmp[0]) < 0) { @@ -430,8 +430,8 @@ function diff(a, b) { data: Belt_internalAVLset.copy(dataa) }; } - var tmp2 = new Array(sizea); - var k = Belt_SortArray.diffU(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0, cmp); + let tmp2 = new Array(sizea); + let k = Belt_SortArray.diffU(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0, cmp); return { cmp: cmp, data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) @@ -439,9 +439,9 @@ function diff(a, b) { } function union(a, b) { - var cmp = a.cmp; - var dataa = a.data; - var datab = b.data; + let cmp = a.cmp; + let dataa = a.data; + let datab = b.data; if (dataa === undefined) { return { cmp: cmp, @@ -454,10 +454,10 @@ function union(a, b) { data: Belt_internalAVLset.copy(dataa) }; } - var sizea = Belt_internalAVLset.lengthNode(dataa); - var sizeb = Belt_internalAVLset.lengthNode(datab); - var totalSize = sizea + sizeb | 0; - var tmp = new Array(totalSize); + let sizea = Belt_internalAVLset.lengthNode(dataa); + let sizeb = Belt_internalAVLset.lengthNode(datab); + let totalSize = sizea + sizeb | 0; + let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(dataa, 0, tmp); Belt_internalAVLset.fillArray(datab, sizea, tmp); if (cmp(tmp[sizea - 1 | 0], tmp[sizea]) < 0) { @@ -466,8 +466,8 @@ function union(a, b) { data: Belt_internalAVLset.fromSortedArrayAux(tmp, 0, totalSize) }; } - var tmp2 = new Array(totalSize); - var k = Belt_SortArray.unionU(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0, cmp); + let tmp2 = new Array(totalSize); + let k = Belt_SortArray.unionU(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0, cmp); return { cmp: cmp, data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) @@ -485,9 +485,9 @@ function copy(d) { }; } -var Int; +let Int; -var $$String; +let $$String; export { Int, diff --git a/lib/es6/belt_MutableSetInt.js b/lib/es6/belt_MutableSetInt.js index b656b4f063..b680d23971 100644 --- a/lib/es6/belt_MutableSetInt.js +++ b/lib/es6/belt_MutableSetInt.js @@ -6,10 +6,10 @@ import * as Belt_internalAVLset from "./belt_internalAVLset.js"; import * as Belt_internalSetInt from "./belt_internalSetInt.js"; function remove0(nt, x) { - var k = nt.v; + let k = nt.v; if (x === k) { - var l = nt.l; - var r = nt.r; + let l = nt.l; + let r = nt.r; if (l !== undefined) { if (r !== undefined) { nt.r = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r); @@ -22,7 +22,7 @@ function remove0(nt, x) { } } if (x < k) { - var l$1 = nt.l; + let l$1 = nt.l; if (l$1 !== undefined) { nt.l = remove0(l$1, x); return Belt_internalAVLset.balMutate(nt); @@ -30,7 +30,7 @@ function remove0(nt, x) { return nt; } } - var r$1 = nt.r; + let r$1 = nt.r; if (r$1 !== undefined) { nt.r = remove0(r$1, x); return Belt_internalAVLset.balMutate(nt); @@ -40,11 +40,11 @@ function remove0(nt, x) { } function remove(d, v) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return; } - var newRoot = remove0(oldRoot, v); + let newRoot = remove0(oldRoot, v); if (newRoot !== oldRoot) { d.data = newRoot; return; @@ -54,13 +54,13 @@ function remove(d, v) { function removeMany0(_t, xs, _i, len) { while(true) { - var i = _i; - var t = _t; + let i = _i; + let t = _t; if (i >= len) { return t; } - var ele = xs[i]; - var u = remove0(t, ele); + let ele = xs[i]; + let u = remove0(t, ele); if (u === undefined) { return; } @@ -71,20 +71,20 @@ function removeMany0(_t, xs, _i, len) { } function removeMany(d, xs) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return; } - var len = xs.length; + let len = xs.length; d.data = removeMany0(oldRoot, xs, 0, len); } function removeCheck0(nt, x, removed) { - var k = nt.v; + let k = nt.v; if (x === k) { removed.contents = true; - var l = nt.l; - var r = nt.r; + let l = nt.l; + let r = nt.r; if (l !== undefined) { if (r !== undefined) { nt.r = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r); @@ -97,7 +97,7 @@ function removeCheck0(nt, x, removed) { } } if (x < k) { - var l$1 = nt.l; + let l$1 = nt.l; if (l$1 !== undefined) { nt.l = removeCheck0(l$1, x, removed); return Belt_internalAVLset.balMutate(nt); @@ -105,7 +105,7 @@ function removeCheck0(nt, x, removed) { return nt; } } - var r$1 = nt.r; + let r$1 = nt.r; if (r$1 !== undefined) { nt.r = removeCheck0(r$1, x, removed); return Belt_internalAVLset.balMutate(nt); @@ -115,14 +115,14 @@ function removeCheck0(nt, x, removed) { } function removeCheck(d, v) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return false; } - var removed = { + let removed = { contents: false }; - var newRoot = removeCheck0(oldRoot, v, removed); + let newRoot = removeCheck0(oldRoot, v, removed); if (newRoot !== oldRoot) { d.data = newRoot; } @@ -131,14 +131,14 @@ function removeCheck(d, v) { function addCheck0(t, x, added) { if (t !== undefined) { - var k = t.v; + let k = t.v; if (x === k) { return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (x < k) { - var ll = addCheck0(l, x, added); + let ll = addCheck0(l, x, added); t.l = ll; } else { t.r = addCheck0(r, x, added); @@ -150,11 +150,11 @@ function addCheck0(t, x, added) { } function addCheck(m, e) { - var oldRoot = m.data; - var added = { + let oldRoot = m.data; + let added = { contents: false }; - var newRoot = addCheck0(oldRoot, e, added); + let newRoot = addCheck0(oldRoot, e, added); if (newRoot !== oldRoot) { m.data = newRoot; } @@ -162,8 +162,8 @@ function addCheck(m, e) { } function add(d, k) { - var oldRoot = d.data; - var v = Belt_internalSetInt.addMutate(oldRoot, k); + let oldRoot = d.data; + let v = Belt_internalSetInt.addMutate(oldRoot, k); if (v !== oldRoot) { d.data = v; return; @@ -172,8 +172,8 @@ function add(d, k) { } function addArrayMutate(t, xs) { - var v = t; - for(var i = 0 ,i_finish = xs.length; i < i_finish; ++i){ + let v = t; + for(let i = 0 ,i_finish = xs.length; i < i_finish; ++i){ v = Belt_internalSetInt.addMutate(v, xs[i]); } return v; @@ -190,7 +190,7 @@ function make(param) { } function isEmpty(d) { - var n = d.data; + let n = d.data; return n === undefined; } @@ -291,9 +291,9 @@ function getExn(d, x) { } function split(d, key) { - var arr = Belt_internalAVLset.toArray(d.data); - var i = Belt_SortArrayInt.binarySearch(arr, key); - var len = arr.length; + let arr = Belt_internalAVLset.toArray(d.data); + let i = Belt_SortArrayInt.binarySearch(arr, key); + let len = arr.length; if (i >= 0) { return [ [ @@ -307,7 +307,7 @@ function split(d, key) { true ]; } - var next = (-i | 0) - 1 | 0; + let next = (-i | 0) - 1 | 0; return [ [ { @@ -332,7 +332,7 @@ function keep(d, p) { } function partitionU(d, p) { - var match = Belt_internalAVLset.partitionCopyU(d.data, p); + let match = Belt_internalAVLset.partitionCopyU(d.data, p); return [ { data: match[0] @@ -352,8 +352,8 @@ function subset(a, b) { } function intersect(dataa, datab) { - var dataa$1 = dataa.data; - var datab$1 = datab.data; + let dataa$1 = dataa.data; + let datab$1 = datab.data; if (dataa$1 === undefined) { return { data: undefined @@ -364,10 +364,10 @@ function intersect(dataa, datab) { data: undefined }; } - var sizea = Belt_internalAVLset.lengthNode(dataa$1); - var sizeb = Belt_internalAVLset.lengthNode(datab$1); - var totalSize = sizea + sizeb | 0; - var tmp = new Array(totalSize); + let sizea = Belt_internalAVLset.lengthNode(dataa$1); + let sizeb = Belt_internalAVLset.lengthNode(datab$1); + let totalSize = sizea + sizeb | 0; + let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(dataa$1, 0, tmp); Belt_internalAVLset.fillArray(datab$1, sizea, tmp); if (tmp[sizea - 1 | 0] < tmp[sizea] || tmp[totalSize - 1 | 0] < tmp[0]) { @@ -375,16 +375,16 @@ function intersect(dataa, datab) { data: undefined }; } - var tmp2 = new Array(sizea < sizeb ? sizea : sizeb); - var k = Belt_SortArrayInt.intersect(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); + let tmp2 = new Array(sizea < sizeb ? sizea : sizeb); + let k = Belt_SortArrayInt.intersect(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); return { data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) }; } function diff(dataa, datab) { - var dataa$1 = dataa.data; - var datab$1 = datab.data; + let dataa$1 = dataa.data; + let datab$1 = datab.data; if (dataa$1 === undefined) { return { data: undefined @@ -395,10 +395,10 @@ function diff(dataa, datab) { data: Belt_internalAVLset.copy(dataa$1) }; } - var sizea = Belt_internalAVLset.lengthNode(dataa$1); - var sizeb = Belt_internalAVLset.lengthNode(datab$1); - var totalSize = sizea + sizeb | 0; - var tmp = new Array(totalSize); + let sizea = Belt_internalAVLset.lengthNode(dataa$1); + let sizeb = Belt_internalAVLset.lengthNode(datab$1); + let totalSize = sizea + sizeb | 0; + let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(dataa$1, 0, tmp); Belt_internalAVLset.fillArray(datab$1, sizea, tmp); if (tmp[sizea - 1 | 0] < tmp[sizea] || tmp[totalSize - 1 | 0] < tmp[0]) { @@ -406,16 +406,16 @@ function diff(dataa, datab) { data: Belt_internalAVLset.copy(dataa$1) }; } - var tmp2 = new Array(sizea); - var k = Belt_SortArrayInt.diff(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); + let tmp2 = new Array(sizea); + let k = Belt_SortArrayInt.diff(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); return { data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) }; } function union(dataa, datab) { - var dataa$1 = dataa.data; - var datab$1 = datab.data; + let dataa$1 = dataa.data; + let datab$1 = datab.data; if (dataa$1 === undefined) { return { data: Belt_internalAVLset.copy(datab$1) @@ -426,10 +426,10 @@ function union(dataa, datab) { data: Belt_internalAVLset.copy(dataa$1) }; } - var sizea = Belt_internalAVLset.lengthNode(dataa$1); - var sizeb = Belt_internalAVLset.lengthNode(datab$1); - var totalSize = sizea + sizeb | 0; - var tmp = new Array(totalSize); + let sizea = Belt_internalAVLset.lengthNode(dataa$1); + let sizeb = Belt_internalAVLset.lengthNode(datab$1); + let totalSize = sizea + sizeb | 0; + let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(dataa$1, 0, tmp); Belt_internalAVLset.fillArray(datab$1, sizea, tmp); if (tmp[sizea - 1 | 0] < tmp[sizea]) { @@ -437,8 +437,8 @@ function union(dataa, datab) { data: Belt_internalAVLset.fromSortedArrayAux(tmp, 0, totalSize) }; } - var tmp2 = new Array(totalSize); - var k = Belt_SortArrayInt.union(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); + let tmp2 = new Array(totalSize); + let k = Belt_SortArrayInt.union(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); return { data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) }; diff --git a/lib/es6/belt_MutableSetString.js b/lib/es6/belt_MutableSetString.js index 1496359cc8..6ba453d1ac 100644 --- a/lib/es6/belt_MutableSetString.js +++ b/lib/es6/belt_MutableSetString.js @@ -6,10 +6,10 @@ import * as Belt_SortArrayString from "./belt_SortArrayString.js"; import * as Belt_internalSetString from "./belt_internalSetString.js"; function remove0(nt, x) { - var k = nt.v; + let k = nt.v; if (x === k) { - var l = nt.l; - var r = nt.r; + let l = nt.l; + let r = nt.r; if (l !== undefined) { if (r !== undefined) { nt.r = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r); @@ -22,7 +22,7 @@ function remove0(nt, x) { } } if (x < k) { - var l$1 = nt.l; + let l$1 = nt.l; if (l$1 !== undefined) { nt.l = remove0(l$1, x); return Belt_internalAVLset.balMutate(nt); @@ -30,7 +30,7 @@ function remove0(nt, x) { return nt; } } - var r$1 = nt.r; + let r$1 = nt.r; if (r$1 !== undefined) { nt.r = remove0(r$1, x); return Belt_internalAVLset.balMutate(nt); @@ -40,11 +40,11 @@ function remove0(nt, x) { } function remove(d, v) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return; } - var newRoot = remove0(oldRoot, v); + let newRoot = remove0(oldRoot, v); if (newRoot !== oldRoot) { d.data = newRoot; return; @@ -54,13 +54,13 @@ function remove(d, v) { function removeMany0(_t, xs, _i, len) { while(true) { - var i = _i; - var t = _t; + let i = _i; + let t = _t; if (i >= len) { return t; } - var ele = xs[i]; - var u = remove0(t, ele); + let ele = xs[i]; + let u = remove0(t, ele); if (u === undefined) { return; } @@ -71,20 +71,20 @@ function removeMany0(_t, xs, _i, len) { } function removeMany(d, xs) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return; } - var len = xs.length; + let len = xs.length; d.data = removeMany0(oldRoot, xs, 0, len); } function removeCheck0(nt, x, removed) { - var k = nt.v; + let k = nt.v; if (x === k) { removed.contents = true; - var l = nt.l; - var r = nt.r; + let l = nt.l; + let r = nt.r; if (l !== undefined) { if (r !== undefined) { nt.r = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r); @@ -97,7 +97,7 @@ function removeCheck0(nt, x, removed) { } } if (x < k) { - var l$1 = nt.l; + let l$1 = nt.l; if (l$1 !== undefined) { nt.l = removeCheck0(l$1, x, removed); return Belt_internalAVLset.balMutate(nt); @@ -105,7 +105,7 @@ function removeCheck0(nt, x, removed) { return nt; } } - var r$1 = nt.r; + let r$1 = nt.r; if (r$1 !== undefined) { nt.r = removeCheck0(r$1, x, removed); return Belt_internalAVLset.balMutate(nt); @@ -115,14 +115,14 @@ function removeCheck0(nt, x, removed) { } function removeCheck(d, v) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return false; } - var removed = { + let removed = { contents: false }; - var newRoot = removeCheck0(oldRoot, v, removed); + let newRoot = removeCheck0(oldRoot, v, removed); if (newRoot !== oldRoot) { d.data = newRoot; } @@ -131,14 +131,14 @@ function removeCheck(d, v) { function addCheck0(t, x, added) { if (t !== undefined) { - var k = t.v; + let k = t.v; if (x === k) { return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (x < k) { - var ll = addCheck0(l, x, added); + let ll = addCheck0(l, x, added); t.l = ll; } else { t.r = addCheck0(r, x, added); @@ -150,11 +150,11 @@ function addCheck0(t, x, added) { } function addCheck(m, e) { - var oldRoot = m.data; - var added = { + let oldRoot = m.data; + let added = { contents: false }; - var newRoot = addCheck0(oldRoot, e, added); + let newRoot = addCheck0(oldRoot, e, added); if (newRoot !== oldRoot) { m.data = newRoot; } @@ -162,8 +162,8 @@ function addCheck(m, e) { } function add(d, k) { - var oldRoot = d.data; - var v = Belt_internalSetString.addMutate(oldRoot, k); + let oldRoot = d.data; + let v = Belt_internalSetString.addMutate(oldRoot, k); if (v !== oldRoot) { d.data = v; return; @@ -172,8 +172,8 @@ function add(d, k) { } function addArrayMutate(t, xs) { - var v = t; - for(var i = 0 ,i_finish = xs.length; i < i_finish; ++i){ + let v = t; + for(let i = 0 ,i_finish = xs.length; i < i_finish; ++i){ v = Belt_internalSetString.addMutate(v, xs[i]); } return v; @@ -190,7 +190,7 @@ function make(param) { } function isEmpty(d) { - var n = d.data; + let n = d.data; return n === undefined; } @@ -291,9 +291,9 @@ function getExn(d, x) { } function split(d, key) { - var arr = Belt_internalAVLset.toArray(d.data); - var i = Belt_SortArrayString.binarySearch(arr, key); - var len = arr.length; + let arr = Belt_internalAVLset.toArray(d.data); + let i = Belt_SortArrayString.binarySearch(arr, key); + let len = arr.length; if (i >= 0) { return [ [ @@ -307,7 +307,7 @@ function split(d, key) { true ]; } - var next = (-i | 0) - 1 | 0; + let next = (-i | 0) - 1 | 0; return [ [ { @@ -332,7 +332,7 @@ function keep(d, p) { } function partitionU(d, p) { - var match = Belt_internalAVLset.partitionCopyU(d.data, p); + let match = Belt_internalAVLset.partitionCopyU(d.data, p); return [ { data: match[0] @@ -352,8 +352,8 @@ function subset(a, b) { } function intersect(dataa, datab) { - var dataa$1 = dataa.data; - var datab$1 = datab.data; + let dataa$1 = dataa.data; + let datab$1 = datab.data; if (dataa$1 === undefined) { return { data: undefined @@ -364,10 +364,10 @@ function intersect(dataa, datab) { data: undefined }; } - var sizea = Belt_internalAVLset.lengthNode(dataa$1); - var sizeb = Belt_internalAVLset.lengthNode(datab$1); - var totalSize = sizea + sizeb | 0; - var tmp = new Array(totalSize); + let sizea = Belt_internalAVLset.lengthNode(dataa$1); + let sizeb = Belt_internalAVLset.lengthNode(datab$1); + let totalSize = sizea + sizeb | 0; + let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(dataa$1, 0, tmp); Belt_internalAVLset.fillArray(datab$1, sizea, tmp); if (tmp[sizea - 1 | 0] < tmp[sizea] || tmp[totalSize - 1 | 0] < tmp[0]) { @@ -375,16 +375,16 @@ function intersect(dataa, datab) { data: undefined }; } - var tmp2 = new Array(sizea < sizeb ? sizea : sizeb); - var k = Belt_SortArrayString.intersect(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); + let tmp2 = new Array(sizea < sizeb ? sizea : sizeb); + let k = Belt_SortArrayString.intersect(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); return { data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) }; } function diff(dataa, datab) { - var dataa$1 = dataa.data; - var datab$1 = datab.data; + let dataa$1 = dataa.data; + let datab$1 = datab.data; if (dataa$1 === undefined) { return { data: undefined @@ -395,10 +395,10 @@ function diff(dataa, datab) { data: Belt_internalAVLset.copy(dataa$1) }; } - var sizea = Belt_internalAVLset.lengthNode(dataa$1); - var sizeb = Belt_internalAVLset.lengthNode(datab$1); - var totalSize = sizea + sizeb | 0; - var tmp = new Array(totalSize); + let sizea = Belt_internalAVLset.lengthNode(dataa$1); + let sizeb = Belt_internalAVLset.lengthNode(datab$1); + let totalSize = sizea + sizeb | 0; + let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(dataa$1, 0, tmp); Belt_internalAVLset.fillArray(datab$1, sizea, tmp); if (tmp[sizea - 1 | 0] < tmp[sizea] || tmp[totalSize - 1 | 0] < tmp[0]) { @@ -406,16 +406,16 @@ function diff(dataa, datab) { data: Belt_internalAVLset.copy(dataa$1) }; } - var tmp2 = new Array(sizea); - var k = Belt_SortArrayString.diff(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); + let tmp2 = new Array(sizea); + let k = Belt_SortArrayString.diff(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); return { data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) }; } function union(dataa, datab) { - var dataa$1 = dataa.data; - var datab$1 = datab.data; + let dataa$1 = dataa.data; + let datab$1 = datab.data; if (dataa$1 === undefined) { return { data: Belt_internalAVLset.copy(datab$1) @@ -426,10 +426,10 @@ function union(dataa, datab) { data: Belt_internalAVLset.copy(dataa$1) }; } - var sizea = Belt_internalAVLset.lengthNode(dataa$1); - var sizeb = Belt_internalAVLset.lengthNode(datab$1); - var totalSize = sizea + sizeb | 0; - var tmp = new Array(totalSize); + let sizea = Belt_internalAVLset.lengthNode(dataa$1); + let sizeb = Belt_internalAVLset.lengthNode(datab$1); + let totalSize = sizea + sizeb | 0; + let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(dataa$1, 0, tmp); Belt_internalAVLset.fillArray(datab$1, sizea, tmp); if (tmp[sizea - 1 | 0] < tmp[sizea]) { @@ -437,8 +437,8 @@ function union(dataa, datab) { data: Belt_internalAVLset.fromSortedArrayAux(tmp, 0, totalSize) }; } - var tmp2 = new Array(totalSize); - var k = Belt_SortArrayString.union(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); + let tmp2 = new Array(totalSize); + let k = Belt_SortArrayString.union(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); return { data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) }; diff --git a/lib/es6/belt_MutableStack.js b/lib/es6/belt_MutableStack.js index 8f3dcbcffc..b29258ef1f 100644 --- a/lib/es6/belt_MutableStack.js +++ b/lib/es6/belt_MutableStack.js @@ -27,7 +27,7 @@ function push(s, x) { } function topUndefined(s) { - var x = s.root; + let x = s.root; if (x !== undefined) { return x.head; } @@ -35,7 +35,7 @@ function topUndefined(s) { } function top(s) { - var x = s.root; + let x = s.root; if (x !== undefined) { return Caml_option.some(x.head); } @@ -47,7 +47,7 @@ function isEmpty(s) { } function popUndefined(s) { - var x = s.root; + let x = s.root; if (x !== undefined) { s.root = x.tail; return x.head; @@ -56,7 +56,7 @@ function popUndefined(s) { } function pop(s) { - var x = s.root; + let x = s.root; if (x !== undefined) { s.root = x.tail; return Caml_option.some(x.head); @@ -65,14 +65,14 @@ function pop(s) { } function size(s) { - var x = s.root; + let x = s.root; if (x !== undefined) { - var _x = x; - var _acc = 0; + let _x = x; + let _acc = 0; while(true) { - var acc = _acc; - var x$1 = _x; - var x$2 = x$1.tail; + let acc = _acc; + let x$1 = _x; + let x$2 = x$1.tail; if (x$2 === undefined) { return acc + 1 | 0; } @@ -86,9 +86,9 @@ function size(s) { } function forEachU(s, f) { - var _s = s.root; + let _s = s.root; while(true) { - var s$1 = _s; + let s$1 = _s; if (s$1 === undefined) { return; } @@ -104,7 +104,7 @@ function forEach(s, f) { function dynamicPopIterU(s, f) { while(true) { - var match = s.root; + let match = s.root; if (match === undefined) { return; } diff --git a/lib/es6/belt_Range.js b/lib/es6/belt_Range.js index bcdba00971..03ae5af496 100644 --- a/lib/es6/belt_Range.js +++ b/lib/es6/belt_Range.js @@ -3,7 +3,7 @@ import * as Curry from "./curry.js"; function forEachU(s, f, action) { - for(var i = s; i <= f; ++i){ + for(let i = s; i <= f; ++i){ action(i); } } @@ -14,7 +14,7 @@ function forEach(s, f, action) { function everyU(_s, f, p) { while(true) { - var s = _s; + let s = _s; if (s > f) { return true; } @@ -32,9 +32,9 @@ function every(s, f, p) { function everyByU(s, f, step, p) { if (step > 0) { - var _s = s; + let _s = s; while(true) { - var s$1 = _s; + let s$1 = _s; if (s$1 > f) { return true; } @@ -55,7 +55,7 @@ function everyBy(s, f, step, p) { function someU(_s, f, p) { while(true) { - var s = _s; + let s = _s; if (s > f) { return false; } @@ -73,9 +73,9 @@ function some(s, f, p) { function someByU(s, f, step, p) { if (step > 0) { - var _s = s; + let _s = s; while(true) { - var s$1 = _s; + let s$1 = _s; if (s$1 > f) { return false; } diff --git a/lib/es6/belt_Set.js b/lib/es6/belt_Set.js index bfb458d595..816c874348 100644 --- a/lib/es6/belt_Set.js +++ b/lib/es6/belt_Set.js @@ -4,7 +4,7 @@ import * as Curry from "./curry.js"; import * as Belt_SetDict from "./belt_SetDict.js"; function fromArray(data, id) { - var cmp = id.cmp; + let cmp = id.cmp; return { cmp: cmp, data: Belt_SetDict.fromArray(data, cmp) @@ -12,9 +12,9 @@ function fromArray(data, id) { } function remove(m, e) { - var data = m.data; - var cmp = m.cmp; - var newData = Belt_SetDict.remove(data, e, cmp); + let data = m.data; + let cmp = m.cmp; + let newData = Belt_SetDict.remove(data, e, cmp); if (newData === data) { return m; } else { @@ -26,9 +26,9 @@ function remove(m, e) { } function add(m, e) { - var data = m.data; - var cmp = m.cmp; - var newData = Belt_SetDict.add(data, e, cmp); + let data = m.data; + let cmp = m.cmp; + let newData = Belt_SetDict.add(data, e, cmp); if (newData === data) { return m; } else { @@ -40,7 +40,7 @@ function add(m, e) { } function mergeMany(m, e) { - var cmp = m.cmp; + let cmp = m.cmp; return { cmp: cmp, data: Belt_SetDict.mergeMany(m.data, e, cmp) @@ -48,7 +48,7 @@ function mergeMany(m, e) { } function removeMany(m, e) { - var cmp = m.cmp; + let cmp = m.cmp; return { cmp: cmp, data: Belt_SetDict.removeMany(m.data, e, cmp) @@ -56,7 +56,7 @@ function removeMany(m, e) { } function union(m, n) { - var cmp = m.cmp; + let cmp = m.cmp; return { cmp: cmp, data: Belt_SetDict.union(m.data, n.data, cmp) @@ -64,7 +64,7 @@ function union(m, n) { } function intersect(m, n) { - var cmp = m.cmp; + let cmp = m.cmp; return { cmp: cmp, data: Belt_SetDict.intersect(m.data, n.data, cmp) @@ -72,7 +72,7 @@ function intersect(m, n) { } function diff(m, n) { - var cmp = m.cmp; + let cmp = m.cmp; return { cmp: cmp, data: Belt_SetDict.diff(m.data, n.data, cmp) @@ -80,14 +80,14 @@ function diff(m, n) { } function subset(m, n) { - var cmp = m.cmp; + let cmp = m.cmp; return Belt_SetDict.subset(m.data, n.data, cmp); } function split(m, e) { - var cmp = m.cmp; - var match = Belt_SetDict.split(m.data, e, cmp); - var match$1 = match[0]; + let cmp = m.cmp; + let match = Belt_SetDict.split(m.data, e, cmp); + let match$1 = match[0]; return [ [ { @@ -115,7 +115,7 @@ function isEmpty(m) { } function cmp(m, n) { - var cmp$1 = m.cmp; + let cmp$1 = m.cmp; return Belt_SetDict.cmp(m.data, n.data, cmp$1); } @@ -167,8 +167,8 @@ function keep(m, f) { } function partitionU(m, f) { - var match = Belt_SetDict.partitionU(m.data, f); - var cmp = m.cmp; + let match = Belt_SetDict.partitionU(m.data, f); + let cmp = m.cmp; return [ { cmp: cmp, @@ -241,7 +241,7 @@ function getData(m) { } function getId(m) { - var cmp = m.cmp; + let cmp = m.cmp; return { cmp: cmp }; @@ -258,11 +258,11 @@ function checkInvariantInternal(d) { Belt_SetDict.checkInvariantInternal(d.data); } -var Int; +let Int; -var $$String; +let $$String; -var Dict; +let Dict; export { Int, diff --git a/lib/es6/belt_SetDict.js b/lib/es6/belt_SetDict.js index 8e66fec20a..4231c26328 100644 --- a/lib/es6/belt_SetDict.js +++ b/lib/es6/belt_SetDict.js @@ -6,22 +6,22 @@ function add(t, x, cmp) { if (t === undefined) { return Belt_internalAVLset.singleton(x); } - var k = t.v; - var c = cmp(x, k); + let k = t.v; + let c = cmp(x, k); if (c === 0) { return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (c < 0) { - var ll = add(l, x, cmp); + let ll = add(l, x, cmp); if (ll === l) { return t; } else { return Belt_internalAVLset.bal(ll, k, r); } } - var rr = add(r, x, cmp); + let rr = add(r, x, cmp); if (rr === r) { return t; } else { @@ -33,10 +33,10 @@ function remove(t, x, cmp) { if (t === undefined) { return t; } - var v = t.v; - var l = t.l; - var r = t.r; - var c = cmp(x, v); + let v = t.v; + let l = t.l; + let r = t.r; + let c = cmp(x, v); if (c === 0) { if (l === undefined) { return r; @@ -44,21 +44,21 @@ function remove(t, x, cmp) { if (r === undefined) { return l; } - var v$1 = { + let v$1 = { contents: r.v }; - var r$1 = Belt_internalAVLset.removeMinAuxWithRef(r, v$1); + let r$1 = Belt_internalAVLset.removeMinAuxWithRef(r, v$1); return Belt_internalAVLset.bal(l, v$1.contents, r$1); } if (c < 0) { - var ll = remove(l, x, cmp); + let ll = remove(l, x, cmp); if (ll === l) { return t; } else { return Belt_internalAVLset.bal(ll, v, r); } } - var rr = remove(r, x, cmp); + let rr = remove(r, x, cmp); if (rr === r) { return t; } else { @@ -67,30 +67,30 @@ function remove(t, x, cmp) { } function mergeMany(h, arr, cmp) { - var len = arr.length; - var v = h; - for(var i = 0; i < len; ++i){ - var key = arr[i]; + let len = arr.length; + let v = h; + for(let i = 0; i < len; ++i){ + let key = arr[i]; v = add(v, key, cmp); } return v; } function removeMany(h, arr, cmp) { - var len = arr.length; - var v = h; - for(var i = 0; i < len; ++i){ - var key = arr[i]; + let len = arr.length; + let v = h; + for(let i = 0; i < len; ++i){ + let key = arr[i]; v = remove(v, key, cmp); } return v; } function splitAuxNoPivot(cmp, n, x) { - var v = n.v; - var l = n.l; - var r = n.r; - var c = cmp(x, v); + let v = n.v; + let l = n.l; + let r = n.r; + let c = cmp(x, v); if (c === 0) { return [ l, @@ -104,7 +104,7 @@ function splitAuxNoPivot(cmp, n, x) { n ]; } - var match = splitAuxNoPivot(cmp, l, x); + let match = splitAuxNoPivot(cmp, l, x); return [ match[0], Belt_internalAVLset.joinShared(match[1], v, r) @@ -116,7 +116,7 @@ function splitAuxNoPivot(cmp, n, x) { undefined ]; } - var match$1 = splitAuxNoPivot(cmp, r, x); + let match$1 = splitAuxNoPivot(cmp, r, x); return [ Belt_internalAVLset.joinShared(l, v, match$1[0]), match$1[1] @@ -124,10 +124,10 @@ function splitAuxNoPivot(cmp, n, x) { } function splitAuxPivot(cmp, n, x, pres) { - var v = n.v; - var l = n.l; - var r = n.r; - var c = cmp(x, v); + let v = n.v; + let l = n.l; + let r = n.r; + let c = cmp(x, v); if (c === 0) { pres.contents = true; return [ @@ -142,7 +142,7 @@ function splitAuxPivot(cmp, n, x, pres) { n ]; } - var match = splitAuxPivot(cmp, l, x, pres); + let match = splitAuxPivot(cmp, l, x, pres); return [ match[0], Belt_internalAVLset.joinShared(match[1], v, r) @@ -154,7 +154,7 @@ function splitAuxPivot(cmp, n, x, pres) { undefined ]; } - var match$1 = splitAuxPivot(cmp, r, x, pres); + let match$1 = splitAuxPivot(cmp, r, x, pres); return [ Belt_internalAVLset.joinShared(l, v, match$1[0]), match$1[1] @@ -171,10 +171,10 @@ function split(t, x, cmp) { false ]; } - var pres = { + let pres = { contents: false }; - var v = splitAuxPivot(cmp, t, x, pres); + let v = splitAuxPivot(cmp, t, x, pres); return [ v, pres.contents @@ -188,25 +188,25 @@ function union(s1, s2, cmp) { if (s2 === undefined) { return s1; } - var h1 = s1.h; - var h2 = s2.h; + let h1 = s1.h; + let h2 = s2.h; if (h1 >= h2) { if (h2 === 1) { return add(s1, s2.v, cmp); } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var match = splitAuxNoPivot(cmp, s2, v1); + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let match = splitAuxNoPivot(cmp, s2, v1); return Belt_internalAVLset.joinShared(union(l1, match[0], cmp), v1, union(r1, match[1], cmp)); } if (h1 === 1) { return add(s2, s1.v, cmp); } - var v2 = s2.v; - var l2 = s2.l; - var r2 = s2.r; - var match$1 = splitAuxNoPivot(cmp, s1, v2); + let v2 = s2.v; + let l2 = s2.l; + let r2 = s2.r; + let match$1 = splitAuxNoPivot(cmp, s1, v2); return Belt_internalAVLset.joinShared(union(match$1[0], l2, cmp), v2, union(match$1[1], r2, cmp)); } @@ -217,15 +217,15 @@ function intersect(s1, s2, cmp) { if (s2 === undefined) { return; } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var pres = { + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let pres = { contents: false }; - var match = splitAuxPivot(cmp, s2, v1, pres); - var ll = intersect(l1, match[0], cmp); - var rr = intersect(r1, match[1], cmp); + let match = splitAuxPivot(cmp, s2, v1, pres); + let ll = intersect(l1, match[0], cmp); + let rr = intersect(r1, match[1], cmp); if (pres.contents) { return Belt_internalAVLset.joinShared(ll, v1, rr); } else { @@ -240,15 +240,15 @@ function diff(s1, s2, cmp) { if (s2 === undefined) { return s1; } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var pres = { + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let pres = { contents: false }; - var match = splitAuxPivot(cmp, s2, v1, pres); - var ll = diff(l1, match[0], cmp); - var rr = diff(r1, match[1], cmp); + let match = splitAuxPivot(cmp, s2, v1, pres); + let ll = diff(l1, match[0], cmp); + let rr = diff(r1, match[1], cmp); if (pres.contents) { return Belt_internalAVLset.concatShared(ll, rr); } else { @@ -256,67 +256,67 @@ function diff(s1, s2, cmp) { } } -var empty; +let empty; -var fromArray = Belt_internalAVLset.fromArray; +let fromArray = Belt_internalAVLset.fromArray; -var fromSortedArrayUnsafe = Belt_internalAVLset.fromSortedArrayUnsafe; +let fromSortedArrayUnsafe = Belt_internalAVLset.fromSortedArrayUnsafe; -var isEmpty = Belt_internalAVLset.isEmpty; +let isEmpty = Belt_internalAVLset.isEmpty; -var has = Belt_internalAVLset.has; +let has = Belt_internalAVLset.has; -var subset = Belt_internalAVLset.subset; +let subset = Belt_internalAVLset.subset; -var cmp = Belt_internalAVLset.cmp; +let cmp = Belt_internalAVLset.cmp; -var eq = Belt_internalAVLset.eq; +let eq = Belt_internalAVLset.eq; -var forEachU = Belt_internalAVLset.forEachU; +let forEachU = Belt_internalAVLset.forEachU; -var forEach = Belt_internalAVLset.forEach; +let forEach = Belt_internalAVLset.forEach; -var reduceU = Belt_internalAVLset.reduceU; +let reduceU = Belt_internalAVLset.reduceU; -var reduce = Belt_internalAVLset.reduce; +let reduce = Belt_internalAVLset.reduce; -var everyU = Belt_internalAVLset.everyU; +let everyU = Belt_internalAVLset.everyU; -var every = Belt_internalAVLset.every; +let every = Belt_internalAVLset.every; -var someU = Belt_internalAVLset.someU; +let someU = Belt_internalAVLset.someU; -var some = Belt_internalAVLset.some; +let some = Belt_internalAVLset.some; -var keepU = Belt_internalAVLset.keepSharedU; +let keepU = Belt_internalAVLset.keepSharedU; -var keep = Belt_internalAVLset.keepShared; +let keep = Belt_internalAVLset.keepShared; -var partitionU = Belt_internalAVLset.partitionSharedU; +let partitionU = Belt_internalAVLset.partitionSharedU; -var partition = Belt_internalAVLset.partitionShared; +let partition = Belt_internalAVLset.partitionShared; -var size = Belt_internalAVLset.size; +let size = Belt_internalAVLset.size; -var toList = Belt_internalAVLset.toList; +let toList = Belt_internalAVLset.toList; -var toArray = Belt_internalAVLset.toArray; +let toArray = Belt_internalAVLset.toArray; -var minimum = Belt_internalAVLset.minimum; +let minimum = Belt_internalAVLset.minimum; -var minUndefined = Belt_internalAVLset.minUndefined; +let minUndefined = Belt_internalAVLset.minUndefined; -var maximum = Belt_internalAVLset.maximum; +let maximum = Belt_internalAVLset.maximum; -var maxUndefined = Belt_internalAVLset.maxUndefined; +let maxUndefined = Belt_internalAVLset.maxUndefined; -var get = Belt_internalAVLset.get; +let get = Belt_internalAVLset.get; -var getUndefined = Belt_internalAVLset.getUndefined; +let getUndefined = Belt_internalAVLset.getUndefined; -var getExn = Belt_internalAVLset.getExn; +let getExn = Belt_internalAVLset.getExn; -var checkInvariantInternal = Belt_internalAVLset.checkInvariantInternal; +let checkInvariantInternal = Belt_internalAVLset.checkInvariantInternal; export { empty, diff --git a/lib/es6/belt_SetInt.js b/lib/es6/belt_SetInt.js index 710d2bc365..6c172f6644 100644 --- a/lib/es6/belt_SetInt.js +++ b/lib/es6/belt_SetInt.js @@ -7,21 +7,21 @@ function add(t, x) { if (t === undefined) { return Belt_internalAVLset.singleton(x); } - var v = t.v; + let v = t.v; if (x === v) { return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (x < v) { - var ll = add(l, x); + let ll = add(l, x); if (ll === l) { return t; } else { return Belt_internalAVLset.bal(ll, v, r); } } - var rr = add(r, x); + let rr = add(r, x); if (rr === r) { return t; } else { @@ -30,10 +30,10 @@ function add(t, x) { } function mergeMany(h, arr) { - var len = arr.length; - var v = h; - for(var i = 0; i < len; ++i){ - var key = arr[i]; + let len = arr.length; + let v = h; + for(let i = 0; i < len; ++i){ + let key = arr[i]; v = add(v, key); } return v; @@ -43,9 +43,9 @@ function remove(t, x) { if (t === undefined) { return t; } - var v = t.v; - var l = t.l; - var r = t.r; + let v = t.v; + let l = t.l; + let r = t.r; if (x === v) { if (l === undefined) { return r; @@ -53,21 +53,21 @@ function remove(t, x) { if (r === undefined) { return l; } - var v$1 = { + let v$1 = { contents: r.v }; - var r$1 = Belt_internalAVLset.removeMinAuxWithRef(r, v$1); + let r$1 = Belt_internalAVLset.removeMinAuxWithRef(r, v$1); return Belt_internalAVLset.bal(l, v$1.contents, r$1); } if (x < v) { - var ll = remove(l, x); + let ll = remove(l, x); if (ll === l) { return t; } else { return Belt_internalAVLset.bal(ll, v, r); } } - var rr = remove(r, x); + let rr = remove(r, x); if (rr === r) { return t; } else { @@ -76,19 +76,19 @@ function remove(t, x) { } function removeMany(h, arr) { - var len = arr.length; - var v = h; - for(var i = 0; i < len; ++i){ - var key = arr[i]; + let len = arr.length; + let v = h; + for(let i = 0; i < len; ++i){ + let key = arr[i]; v = remove(v, key); } return v; } function splitAuxNoPivot(n, x) { - var v = n.v; - var l = n.l; - var r = n.r; + let v = n.v; + let l = n.l; + let r = n.r; if (x === v) { return [ l, @@ -102,7 +102,7 @@ function splitAuxNoPivot(n, x) { n ]; } - var match = splitAuxNoPivot(l, x); + let match = splitAuxNoPivot(l, x); return [ match[0], Belt_internalAVLset.joinShared(match[1], v, r) @@ -114,7 +114,7 @@ function splitAuxNoPivot(n, x) { undefined ]; } - var match$1 = splitAuxNoPivot(r, x); + let match$1 = splitAuxNoPivot(r, x); return [ Belt_internalAVLset.joinShared(l, v, match$1[0]), match$1[1] @@ -122,9 +122,9 @@ function splitAuxNoPivot(n, x) { } function splitAuxPivot(n, x, pres) { - var v = n.v; - var l = n.l; - var r = n.r; + let v = n.v; + let l = n.l; + let r = n.r; if (x === v) { pres.contents = true; return [ @@ -139,7 +139,7 @@ function splitAuxPivot(n, x, pres) { n ]; } - var match = splitAuxPivot(l, x, pres); + let match = splitAuxPivot(l, x, pres); return [ match[0], Belt_internalAVLset.joinShared(match[1], v, r) @@ -151,7 +151,7 @@ function splitAuxPivot(n, x, pres) { undefined ]; } - var match$1 = splitAuxPivot(r, x, pres); + let match$1 = splitAuxPivot(r, x, pres); return [ Belt_internalAVLset.joinShared(l, v, match$1[0]), match$1[1] @@ -168,10 +168,10 @@ function split(t, x) { false ]; } - var pres = { + let pres = { contents: false }; - var v = splitAuxPivot(t, x, pres); + let v = splitAuxPivot(t, x, pres); return [ v, pres.contents @@ -185,25 +185,25 @@ function union(s1, s2) { if (s2 === undefined) { return s1; } - var h1 = s1.h; - var h2 = s2.h; + let h1 = s1.h; + let h2 = s2.h; if (h1 >= h2) { if (h2 === 1) { return add(s1, s2.v); } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var match = splitAuxNoPivot(s2, v1); + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let match = splitAuxNoPivot(s2, v1); return Belt_internalAVLset.joinShared(union(l1, match[0]), v1, union(r1, match[1])); } if (h1 === 1) { return add(s2, s1.v); } - var v2 = s2.v; - var l2 = s2.l; - var r2 = s2.r; - var match$1 = splitAuxNoPivot(s1, v2); + let v2 = s2.v; + let l2 = s2.l; + let r2 = s2.r; + let match$1 = splitAuxNoPivot(s1, v2); return Belt_internalAVLset.joinShared(union(match$1[0], l2), v2, union(match$1[1], r2)); } @@ -214,15 +214,15 @@ function intersect(s1, s2) { if (s2 === undefined) { return; } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var pres = { + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let pres = { contents: false }; - var match = splitAuxPivot(s2, v1, pres); - var ll = intersect(l1, match[0]); - var rr = intersect(r1, match[1]); + let match = splitAuxPivot(s2, v1, pres); + let ll = intersect(l1, match[0]); + let rr = intersect(r1, match[1]); if (pres.contents) { return Belt_internalAVLset.joinShared(ll, v1, rr); } else { @@ -237,15 +237,15 @@ function diff(s1, s2) { if (s2 === undefined) { return s1; } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var pres = { + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let pres = { contents: false }; - var match = splitAuxPivot(s2, v1, pres); - var ll = diff(l1, match[0]); - var rr = diff(r1, match[1]); + let match = splitAuxPivot(s2, v1, pres); + let ll = diff(l1, match[0]); + let rr = diff(r1, match[1]); if (pres.contents) { return Belt_internalAVLset.concatShared(ll, rr); } else { @@ -253,67 +253,67 @@ function diff(s1, s2) { } } -var empty; +let empty; -var fromArray = Belt_internalSetInt.fromArray; +let fromArray = Belt_internalSetInt.fromArray; -var fromSortedArrayUnsafe = Belt_internalAVLset.fromSortedArrayUnsafe; +let fromSortedArrayUnsafe = Belt_internalAVLset.fromSortedArrayUnsafe; -var isEmpty = Belt_internalAVLset.isEmpty; +let isEmpty = Belt_internalAVLset.isEmpty; -var has = Belt_internalSetInt.has; +let has = Belt_internalSetInt.has; -var subset = Belt_internalSetInt.subset; +let subset = Belt_internalSetInt.subset; -var cmp = Belt_internalSetInt.cmp; +let cmp = Belt_internalSetInt.cmp; -var eq = Belt_internalSetInt.eq; +let eq = Belt_internalSetInt.eq; -var forEachU = Belt_internalAVLset.forEachU; +let forEachU = Belt_internalAVLset.forEachU; -var forEach = Belt_internalAVLset.forEach; +let forEach = Belt_internalAVLset.forEach; -var reduceU = Belt_internalAVLset.reduceU; +let reduceU = Belt_internalAVLset.reduceU; -var reduce = Belt_internalAVLset.reduce; +let reduce = Belt_internalAVLset.reduce; -var everyU = Belt_internalAVLset.everyU; +let everyU = Belt_internalAVLset.everyU; -var every = Belt_internalAVLset.every; +let every = Belt_internalAVLset.every; -var someU = Belt_internalAVLset.someU; +let someU = Belt_internalAVLset.someU; -var some = Belt_internalAVLset.some; +let some = Belt_internalAVLset.some; -var keepU = Belt_internalAVLset.keepSharedU; +let keepU = Belt_internalAVLset.keepSharedU; -var keep = Belt_internalAVLset.keepShared; +let keep = Belt_internalAVLset.keepShared; -var partitionU = Belt_internalAVLset.partitionSharedU; +let partitionU = Belt_internalAVLset.partitionSharedU; -var partition = Belt_internalAVLset.partitionShared; +let partition = Belt_internalAVLset.partitionShared; -var size = Belt_internalAVLset.size; +let size = Belt_internalAVLset.size; -var toList = Belt_internalAVLset.toList; +let toList = Belt_internalAVLset.toList; -var toArray = Belt_internalAVLset.toArray; +let toArray = Belt_internalAVLset.toArray; -var minimum = Belt_internalAVLset.minimum; +let minimum = Belt_internalAVLset.minimum; -var minUndefined = Belt_internalAVLset.minUndefined; +let minUndefined = Belt_internalAVLset.minUndefined; -var maximum = Belt_internalAVLset.maximum; +let maximum = Belt_internalAVLset.maximum; -var maxUndefined = Belt_internalAVLset.maxUndefined; +let maxUndefined = Belt_internalAVLset.maxUndefined; -var get = Belt_internalSetInt.get; +let get = Belt_internalSetInt.get; -var getUndefined = Belt_internalSetInt.getUndefined; +let getUndefined = Belt_internalSetInt.getUndefined; -var getExn = Belt_internalSetInt.getExn; +let getExn = Belt_internalSetInt.getExn; -var checkInvariantInternal = Belt_internalAVLset.checkInvariantInternal; +let checkInvariantInternal = Belt_internalAVLset.checkInvariantInternal; export { empty, diff --git a/lib/es6/belt_SetString.js b/lib/es6/belt_SetString.js index a0d4f0a9f5..3322ff29fa 100644 --- a/lib/es6/belt_SetString.js +++ b/lib/es6/belt_SetString.js @@ -7,21 +7,21 @@ function add(t, x) { if (t === undefined) { return Belt_internalAVLset.singleton(x); } - var v = t.v; + let v = t.v; if (x === v) { return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (x < v) { - var ll = add(l, x); + let ll = add(l, x); if (ll === l) { return t; } else { return Belt_internalAVLset.bal(ll, v, r); } } - var rr = add(r, x); + let rr = add(r, x); if (rr === r) { return t; } else { @@ -30,10 +30,10 @@ function add(t, x) { } function mergeMany(h, arr) { - var len = arr.length; - var v = h; - for(var i = 0; i < len; ++i){ - var key = arr[i]; + let len = arr.length; + let v = h; + for(let i = 0; i < len; ++i){ + let key = arr[i]; v = add(v, key); } return v; @@ -43,9 +43,9 @@ function remove(t, x) { if (t === undefined) { return t; } - var v = t.v; - var l = t.l; - var r = t.r; + let v = t.v; + let l = t.l; + let r = t.r; if (x === v) { if (l === undefined) { return r; @@ -53,21 +53,21 @@ function remove(t, x) { if (r === undefined) { return l; } - var v$1 = { + let v$1 = { contents: r.v }; - var r$1 = Belt_internalAVLset.removeMinAuxWithRef(r, v$1); + let r$1 = Belt_internalAVLset.removeMinAuxWithRef(r, v$1); return Belt_internalAVLset.bal(l, v$1.contents, r$1); } if (x < v) { - var ll = remove(l, x); + let ll = remove(l, x); if (ll === l) { return t; } else { return Belt_internalAVLset.bal(ll, v, r); } } - var rr = remove(r, x); + let rr = remove(r, x); if (rr === r) { return t; } else { @@ -76,19 +76,19 @@ function remove(t, x) { } function removeMany(h, arr) { - var len = arr.length; - var v = h; - for(var i = 0; i < len; ++i){ - var key = arr[i]; + let len = arr.length; + let v = h; + for(let i = 0; i < len; ++i){ + let key = arr[i]; v = remove(v, key); } return v; } function splitAuxNoPivot(n, x) { - var v = n.v; - var l = n.l; - var r = n.r; + let v = n.v; + let l = n.l; + let r = n.r; if (x === v) { return [ l, @@ -102,7 +102,7 @@ function splitAuxNoPivot(n, x) { n ]; } - var match = splitAuxNoPivot(l, x); + let match = splitAuxNoPivot(l, x); return [ match[0], Belt_internalAVLset.joinShared(match[1], v, r) @@ -114,7 +114,7 @@ function splitAuxNoPivot(n, x) { undefined ]; } - var match$1 = splitAuxNoPivot(r, x); + let match$1 = splitAuxNoPivot(r, x); return [ Belt_internalAVLset.joinShared(l, v, match$1[0]), match$1[1] @@ -122,9 +122,9 @@ function splitAuxNoPivot(n, x) { } function splitAuxPivot(n, x, pres) { - var v = n.v; - var l = n.l; - var r = n.r; + let v = n.v; + let l = n.l; + let r = n.r; if (x === v) { pres.contents = true; return [ @@ -139,7 +139,7 @@ function splitAuxPivot(n, x, pres) { n ]; } - var match = splitAuxPivot(l, x, pres); + let match = splitAuxPivot(l, x, pres); return [ match[0], Belt_internalAVLset.joinShared(match[1], v, r) @@ -151,7 +151,7 @@ function splitAuxPivot(n, x, pres) { undefined ]; } - var match$1 = splitAuxPivot(r, x, pres); + let match$1 = splitAuxPivot(r, x, pres); return [ Belt_internalAVLset.joinShared(l, v, match$1[0]), match$1[1] @@ -168,10 +168,10 @@ function split(t, x) { false ]; } - var pres = { + let pres = { contents: false }; - var v = splitAuxPivot(t, x, pres); + let v = splitAuxPivot(t, x, pres); return [ v, pres.contents @@ -185,25 +185,25 @@ function union(s1, s2) { if (s2 === undefined) { return s1; } - var h1 = s1.h; - var h2 = s2.h; + let h1 = s1.h; + let h2 = s2.h; if (h1 >= h2) { if (h2 === 1) { return add(s1, s2.v); } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var match = splitAuxNoPivot(s2, v1); + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let match = splitAuxNoPivot(s2, v1); return Belt_internalAVLset.joinShared(union(l1, match[0]), v1, union(r1, match[1])); } if (h1 === 1) { return add(s2, s1.v); } - var v2 = s2.v; - var l2 = s2.l; - var r2 = s2.r; - var match$1 = splitAuxNoPivot(s1, v2); + let v2 = s2.v; + let l2 = s2.l; + let r2 = s2.r; + let match$1 = splitAuxNoPivot(s1, v2); return Belt_internalAVLset.joinShared(union(match$1[0], l2), v2, union(match$1[1], r2)); } @@ -214,15 +214,15 @@ function intersect(s1, s2) { if (s2 === undefined) { return; } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var pres = { + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let pres = { contents: false }; - var match = splitAuxPivot(s2, v1, pres); - var ll = intersect(l1, match[0]); - var rr = intersect(r1, match[1]); + let match = splitAuxPivot(s2, v1, pres); + let ll = intersect(l1, match[0]); + let rr = intersect(r1, match[1]); if (pres.contents) { return Belt_internalAVLset.joinShared(ll, v1, rr); } else { @@ -237,15 +237,15 @@ function diff(s1, s2) { if (s2 === undefined) { return s1; } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var pres = { + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let pres = { contents: false }; - var match = splitAuxPivot(s2, v1, pres); - var ll = diff(l1, match[0]); - var rr = diff(r1, match[1]); + let match = splitAuxPivot(s2, v1, pres); + let ll = diff(l1, match[0]); + let rr = diff(r1, match[1]); if (pres.contents) { return Belt_internalAVLset.concatShared(ll, rr); } else { @@ -253,67 +253,67 @@ function diff(s1, s2) { } } -var empty; +let empty; -var fromArray = Belt_internalSetString.fromArray; +let fromArray = Belt_internalSetString.fromArray; -var fromSortedArrayUnsafe = Belt_internalAVLset.fromSortedArrayUnsafe; +let fromSortedArrayUnsafe = Belt_internalAVLset.fromSortedArrayUnsafe; -var isEmpty = Belt_internalAVLset.isEmpty; +let isEmpty = Belt_internalAVLset.isEmpty; -var has = Belt_internalSetString.has; +let has = Belt_internalSetString.has; -var subset = Belt_internalSetString.subset; +let subset = Belt_internalSetString.subset; -var cmp = Belt_internalSetString.cmp; +let cmp = Belt_internalSetString.cmp; -var eq = Belt_internalSetString.eq; +let eq = Belt_internalSetString.eq; -var forEachU = Belt_internalAVLset.forEachU; +let forEachU = Belt_internalAVLset.forEachU; -var forEach = Belt_internalAVLset.forEach; +let forEach = Belt_internalAVLset.forEach; -var reduceU = Belt_internalAVLset.reduceU; +let reduceU = Belt_internalAVLset.reduceU; -var reduce = Belt_internalAVLset.reduce; +let reduce = Belt_internalAVLset.reduce; -var everyU = Belt_internalAVLset.everyU; +let everyU = Belt_internalAVLset.everyU; -var every = Belt_internalAVLset.every; +let every = Belt_internalAVLset.every; -var someU = Belt_internalAVLset.someU; +let someU = Belt_internalAVLset.someU; -var some = Belt_internalAVLset.some; +let some = Belt_internalAVLset.some; -var keepU = Belt_internalAVLset.keepSharedU; +let keepU = Belt_internalAVLset.keepSharedU; -var keep = Belt_internalAVLset.keepShared; +let keep = Belt_internalAVLset.keepShared; -var partitionU = Belt_internalAVLset.partitionSharedU; +let partitionU = Belt_internalAVLset.partitionSharedU; -var partition = Belt_internalAVLset.partitionShared; +let partition = Belt_internalAVLset.partitionShared; -var size = Belt_internalAVLset.size; +let size = Belt_internalAVLset.size; -var toList = Belt_internalAVLset.toList; +let toList = Belt_internalAVLset.toList; -var toArray = Belt_internalAVLset.toArray; +let toArray = Belt_internalAVLset.toArray; -var minimum = Belt_internalAVLset.minimum; +let minimum = Belt_internalAVLset.minimum; -var minUndefined = Belt_internalAVLset.minUndefined; +let minUndefined = Belt_internalAVLset.minUndefined; -var maximum = Belt_internalAVLset.maximum; +let maximum = Belt_internalAVLset.maximum; -var maxUndefined = Belt_internalAVLset.maxUndefined; +let maxUndefined = Belt_internalAVLset.maxUndefined; -var get = Belt_internalSetString.get; +let get = Belt_internalSetString.get; -var getUndefined = Belt_internalSetString.getUndefined; +let getUndefined = Belt_internalSetString.getUndefined; -var getExn = Belt_internalSetString.getExn; +let getExn = Belt_internalSetString.getExn; -var checkInvariantInternal = Belt_internalAVLset.checkInvariantInternal; +let checkInvariantInternal = Belt_internalAVLset.checkInvariantInternal; export { empty, diff --git a/lib/es6/belt_SortArray.js b/lib/es6/belt_SortArray.js index 0e35521e67..27f499e4dd 100644 --- a/lib/es6/belt_SortArray.js +++ b/lib/es6/belt_SortArray.js @@ -5,12 +5,12 @@ import * as Belt_Array from "./belt_Array.js"; function sortedLengthAuxMore(xs, _prec, _acc, len, lt) { while(true) { - var acc = _acc; - var prec = _prec; + let acc = _acc; + let prec = _prec; if (acc >= len) { return acc; } - var v = xs[acc]; + let v = xs[acc]; if (!lt(v, prec)) { return acc; } @@ -21,22 +21,22 @@ function sortedLengthAuxMore(xs, _prec, _acc, len, lt) { } function strictlySortedLengthU(xs, lt) { - var len = xs.length; + let len = xs.length; if (len === 0 || len === 1) { return len; } - var x0 = xs[0]; - var x1 = xs[1]; + let x0 = xs[0]; + let x1 = xs[1]; if (lt(x0, x1)) { - var _prec = x1; - var _acc = 2; + let _prec = x1; + let _acc = 2; while(true) { - var acc = _acc; - var prec = _prec; + let acc = _acc; + let prec = _prec; if (acc >= len) { return acc; } - var v = xs[acc]; + let v = xs[acc]; if (!lt(prec, v)) { return acc; } @@ -56,14 +56,14 @@ function strictlySortedLength(xs, lt) { } function isSortedU(a, cmp) { - var len = a.length; + let len = a.length; if (len === 0) { return true; } else { - var _i = 0; - var last_bound = len - 1 | 0; + let _i = 0; + let last_bound = len - 1 | 0; while(true) { - var i = _i; + let i = _i; if (i === last_bound) { return true; } @@ -81,22 +81,22 @@ function isSorted(a, cmp) { } function merge(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (cmp(s1, s2) <= 0) { dst[d] = s1; - var i1$1 = i1 + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return Belt_Array.blitUnsafe(src2, i2, dst, d + 1 | 0, src2r - i2 | 0); } @@ -106,7 +106,7 @@ function merge(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) continue ; } dst[d] = s2; - var i2$1 = i2 + 1 | 0; + let i2$1 = i2 + 1 | 0; if (i2$1 >= src2r) { return Belt_Array.blitUnsafe(src, i1, dst, d + 1 | 0, src1r - i1 | 0); } @@ -118,24 +118,24 @@ function merge(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) } function unionU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; - var c = cmp(s1, s2); + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; + let c = cmp(s1, s2); if (c < 0) { dst[d] = s1; - var i1$1 = i1 + 1 | 0; - var d$1 = d + 1 | 0; + let i1$1 = i1 + 1 | 0; + let d$1 = d + 1 | 0; if (i1$1 < src1r) { _d = d$1; _s1 = src[i1$1]; @@ -147,9 +147,9 @@ function unionU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) } if (c === 0) { dst[d] = s1; - var i1$2 = i1 + 1 | 0; - var i2$1 = i2 + 1 | 0; - var d$2 = d + 1 | 0; + let i1$2 = i1 + 1 | 0; + let i2$1 = i2 + 1 | 0; + let d$2 = d + 1 | 0; if (!(i1$2 < src1r && i2$1 < src2r)) { if (i1$2 === src1r) { Belt_Array.blitUnsafe(src2, i2$1, dst, d$2, src2r - i2$1 | 0); @@ -167,8 +167,8 @@ function unionU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) continue ; } dst[d] = s2; - var i2$2 = i2 + 1 | 0; - var d$3 = d + 1 | 0; + let i2$2 = i2 + 1 | 0; + let d$3 = d + 1 | 0; if (i2$2 < src2r) { _d = d$3; _s2 = src2[i2$2]; @@ -185,22 +185,22 @@ function union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) } function intersectU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; - var c = cmp(s1, s2); + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; + let c = cmp(s1, s2); if (c < 0) { - var i1$1 = i1 + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return d; } @@ -210,9 +210,9 @@ function intersectU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, } if (c === 0) { dst[d] = s1; - var i1$2 = i1 + 1 | 0; - var i2$1 = i2 + 1 | 0; - var d$1 = d + 1 | 0; + let i1$2 = i1 + 1 | 0; + let i2$1 = i2 + 1 | 0; + let d$1 = d + 1 | 0; if (!(i1$2 < src1r && i2$1 < src2r)) { return d$1; } @@ -223,7 +223,7 @@ function intersectU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, _i1 = i1$2; continue ; } - var i2$2 = i2 + 1 | 0; + let i2$2 = i2 + 1 | 0; if (i2$2 >= src2r) { return d; } @@ -238,24 +238,24 @@ function intersect(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, c } function diffU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; - var c = cmp(s1, s2); + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; + let c = cmp(s1, s2); if (c < 0) { dst[d] = s1; - var d$1 = d + 1 | 0; - var i1$1 = i1 + 1 | 0; + let d$1 = d + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return d$1; } @@ -265,8 +265,8 @@ function diffU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) continue ; } if (c === 0) { - var i1$2 = i1 + 1 | 0; - var i2$1 = i2 + 1 | 0; + let i1$2 = i1 + 1 | 0; + let i2$1 = i2 + 1 | 0; if (!(i1$2 < src1r && i2$1 < src2r)) { if (i1$2 === src1r) { return d; @@ -281,7 +281,7 @@ function diffU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) _i1 = i1$2; continue ; } - var i2$2 = i2 + 1 | 0; + let i2$2 = i2 + 1 | 0; if (i2$2 < src2r) { _s2 = src2[i2$2]; _i2 = i2$2; @@ -297,9 +297,9 @@ function diff(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { } function insertionSort(src, srcofs, dst, dstofs, len, cmp) { - for(var i = 0; i < len; ++i){ - var e = src[srcofs + i | 0]; - var j = (dstofs + i | 0) - 1 | 0; + for(let i = 0; i < len; ++i){ + let e = src[srcofs + i | 0]; + let j = (dstofs + i | 0) - 1 | 0; while(j >= dstofs && cmp(dst[j], e) > 0) { dst[j + 1 | 0] = dst[j]; j = j - 1 | 0; @@ -312,21 +312,21 @@ function sortTo(src, srcofs, dst, dstofs, len, cmp) { if (len <= 5) { return insertionSort(src, srcofs, dst, dstofs, len, cmp); } - var l1 = len / 2 | 0; - var l2 = len - l1 | 0; + let l1 = len / 2 | 0; + let l2 = len - l1 | 0; sortTo(src, srcofs + l1 | 0, dst, dstofs + l1 | 0, l2, cmp); sortTo(src, srcofs, src, srcofs + l2 | 0, l1, cmp); merge(src, srcofs + l2 | 0, l1, dst, dstofs + l1 | 0, l2, dst, dstofs, cmp); } function stableSortInPlaceByU(a, cmp) { - var l = a.length; + let l = a.length; if (l <= 5) { return insertionSort(a, 0, a, 0, l, cmp); } - var l1 = l / 2 | 0; - var l2 = l - l1 | 0; - var t = new Array(l2); + let l1 = l / 2 | 0; + let l2 = l - l1 | 0; + let t = new Array(l2); sortTo(a, l1, t, 0, l2, cmp); sortTo(a, 0, a, l2, l1, cmp); merge(a, l2, l1, t, 0, l2, a, 0, cmp); @@ -337,7 +337,7 @@ function stableSortInPlaceBy(a, cmp) { } function stableSortByU(a, cmp) { - var b = a.slice(0); + let b = a.slice(0); stableSortInPlaceByU(b, cmp); return b; } @@ -347,28 +347,28 @@ function stableSortBy(a, cmp) { } function binarySearchByU(sorted, key, cmp) { - var len = sorted.length; + let len = sorted.length; if (len === 0) { return -1; } - var lo = sorted[0]; - var c = cmp(key, lo); + let lo = sorted[0]; + let c = cmp(key, lo); if (c < 0) { return -1; } - var hi = sorted[len - 1 | 0]; - var c2 = cmp(key, hi); + let hi = sorted[len - 1 | 0]; + let c2 = cmp(key, hi); if (c2 > 0) { return -(len + 1 | 0) | 0; } else { - var _lo = 0; - var _hi = len - 1 | 0; + let _lo = 0; + let _hi = len - 1 | 0; while(true) { - var hi$1 = _hi; - var lo$1 = _lo; - var mid = (lo$1 + hi$1 | 0) / 2 | 0; - var midVal = sorted[mid]; - var c$1 = cmp(key, midVal); + let hi$1 = _hi; + let lo$1 = _lo; + let mid = (lo$1 + hi$1 | 0) / 2 | 0; + let midVal = sorted[mid]; + let c$1 = cmp(key, midVal); if (c$1 === 0) { return mid; } @@ -400,9 +400,9 @@ function binarySearchBy(sorted, key, cmp) { return binarySearchByU(sorted, key, Curry.__2(cmp)); } -var Int; +let Int; -var $$String; +let $$String; export { Int, diff --git a/lib/es6/belt_SortArrayInt.js b/lib/es6/belt_SortArrayInt.js index 882e3a6295..b9fc437873 100644 --- a/lib/es6/belt_SortArrayInt.js +++ b/lib/es6/belt_SortArrayInt.js @@ -4,12 +4,12 @@ import * as Belt_Array from "./belt_Array.js"; function sortedLengthAuxMore(xs, _prec, _acc, len) { while(true) { - var acc = _acc; - var prec = _prec; + let acc = _acc; + let prec = _prec; if (acc >= len) { return acc; } - var v = xs[acc]; + let v = xs[acc]; if (prec <= v) { return acc; } @@ -20,22 +20,22 @@ function sortedLengthAuxMore(xs, _prec, _acc, len) { } function strictlySortedLength(xs) { - var len = xs.length; + let len = xs.length; if (len === 0 || len === 1) { return len; } - var x0 = xs[0]; - var x1 = xs[1]; + let x0 = xs[0]; + let x1 = xs[1]; if (x0 < x1) { - var _prec = x1; - var _acc = 2; + let _prec = x1; + let _acc = 2; while(true) { - var acc = _acc; - var prec = _prec; + let acc = _acc; + let prec = _prec; if (acc >= len) { return acc; } - var v = xs[acc]; + let v = xs[acc]; if (prec >= v) { return acc; } @@ -51,14 +51,14 @@ function strictlySortedLength(xs) { } function isSorted(a) { - var len = a.length; + let len = a.length; if (len === 0) { return true; } else { - var _i = 0; - var last_bound = len - 1 | 0; + let _i = 0; + let last_bound = len - 1 | 0; while(true) { - var i = _i; + let i = _i; if (i === last_bound) { return true; } @@ -72,22 +72,22 @@ function isSorted(a) { } function merge(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (s1 <= s2) { dst[d] = s1; - var i1$1 = i1 + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return Belt_Array.blitUnsafe(src2, i2, dst, d + 1 | 0, src2r - i2 | 0); } @@ -97,7 +97,7 @@ function merge(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { continue ; } dst[d] = s2; - var i2$1 = i2 + 1 | 0; + let i2$1 = i2 + 1 | 0; if (i2$1 >= src2r) { return Belt_Array.blitUnsafe(src, i1, dst, d + 1 | 0, src1r - i1 | 0); } @@ -109,23 +109,23 @@ function merge(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { } function union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (s1 < s2) { dst[d] = s1; - var i1$1 = i1 + 1 | 0; - var d$1 = d + 1 | 0; + let i1$1 = i1 + 1 | 0; + let d$1 = d + 1 | 0; if (i1$1 < src1r) { _d = d$1; _s1 = src[i1$1]; @@ -137,9 +137,9 @@ function union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { } if (s1 === s2) { dst[d] = s1; - var i1$2 = i1 + 1 | 0; - var i2$1 = i2 + 1 | 0; - var d$2 = d + 1 | 0; + let i1$2 = i1 + 1 | 0; + let i2$1 = i2 + 1 | 0; + let d$2 = d + 1 | 0; if (!(i1$2 < src1r && i2$1 < src2r)) { if (i1$2 === src1r) { Belt_Array.blitUnsafe(src2, i2$1, dst, d$2, src2r - i2$1 | 0); @@ -157,8 +157,8 @@ function union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { continue ; } dst[d] = s2; - var i2$2 = i2 + 1 | 0; - var d$3 = d + 1 | 0; + let i2$2 = i2 + 1 | 0; + let d$3 = d + 1 | 0; if (i2$2 < src2r) { _d = d$3; _s2 = src2[i2$2]; @@ -171,21 +171,21 @@ function union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { } function intersect(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (s1 < s2) { - var i1$1 = i1 + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return d; } @@ -195,9 +195,9 @@ function intersect(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { } if (s1 === s2) { dst[d] = s1; - var i1$2 = i1 + 1 | 0; - var i2$1 = i2 + 1 | 0; - var d$1 = d + 1 | 0; + let i1$2 = i1 + 1 | 0; + let i2$1 = i2 + 1 | 0; + let d$1 = d + 1 | 0; if (!(i1$2 < src1r && i2$1 < src2r)) { return d$1; } @@ -208,7 +208,7 @@ function intersect(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { _i1 = i1$2; continue ; } - var i2$2 = i2 + 1 | 0; + let i2$2 = i2 + 1 | 0; if (i2$2 >= src2r) { return d; } @@ -219,23 +219,23 @@ function intersect(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { } function diff(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (s1 < s2) { dst[d] = s1; - var d$1 = d + 1 | 0; - var i1$1 = i1 + 1 | 0; + let d$1 = d + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return d$1; } @@ -245,8 +245,8 @@ function diff(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { continue ; } if (s1 === s2) { - var i1$2 = i1 + 1 | 0; - var i2$1 = i2 + 1 | 0; + let i1$2 = i1 + 1 | 0; + let i2$1 = i2 + 1 | 0; if (!(i1$2 < src1r && i2$1 < src2r)) { if (i1$2 === src1r) { return d; @@ -261,7 +261,7 @@ function diff(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { _i1 = i1$2; continue ; } - var i2$2 = i2 + 1 | 0; + let i2$2 = i2 + 1 | 0; if (i2$2 < src2r) { _s2 = src2[i2$2]; _i2 = i2$2; @@ -273,9 +273,9 @@ function diff(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { } function insertionSort(src, srcofs, dst, dstofs, len) { - for(var i = 0; i < len; ++i){ - var e = src[srcofs + i | 0]; - var j = (dstofs + i | 0) - 1 | 0; + for(let i = 0; i < len; ++i){ + let e = src[srcofs + i | 0]; + let j = (dstofs + i | 0) - 1 | 0; while(j >= dstofs && dst[j] > e) { dst[j + 1 | 0] = dst[j]; j = j - 1 | 0; @@ -288,52 +288,52 @@ function sortTo(src, srcofs, dst, dstofs, len) { if (len <= 5) { return insertionSort(src, srcofs, dst, dstofs, len); } - var l1 = len / 2 | 0; - var l2 = len - l1 | 0; + let l1 = len / 2 | 0; + let l2 = len - l1 | 0; sortTo(src, srcofs + l1 | 0, dst, dstofs + l1 | 0, l2); sortTo(src, srcofs, src, srcofs + l2 | 0, l1); merge(src, srcofs + l2 | 0, l1, dst, dstofs + l1 | 0, l2, dst, dstofs); } function stableSortInPlace(a) { - var l = a.length; + let l = a.length; if (l <= 5) { return insertionSort(a, 0, a, 0, l); } - var l1 = l / 2 | 0; - var l2 = l - l1 | 0; - var t = new Array(l2); + let l1 = l / 2 | 0; + let l2 = l - l1 | 0; + let t = new Array(l2); sortTo(a, l1, t, 0, l2); sortTo(a, 0, a, l2, l1); merge(a, l2, l1, t, 0, l2, a, 0); } function stableSort(a) { - var b = a.slice(0); + let b = a.slice(0); stableSortInPlace(b); return b; } function binarySearch(sorted, key) { - var len = sorted.length; + let len = sorted.length; if (len === 0) { return -1; } - var lo = sorted[0]; + let lo = sorted[0]; if (key < lo) { return -1; } - var hi = sorted[len - 1 | 0]; + let hi = sorted[len - 1 | 0]; if (key > hi) { return -(len + 1 | 0) | 0; } else { - var _lo = 0; - var _hi = len - 1 | 0; + let _lo = 0; + let _hi = len - 1 | 0; while(true) { - var hi$1 = _hi; - var lo$1 = _lo; - var mid = (lo$1 + hi$1 | 0) / 2 | 0; - var midVal = sorted[mid]; + let hi$1 = _hi; + let lo$1 = _lo; + let mid = (lo$1 + hi$1 | 0) / 2 | 0; + let midVal = sorted[mid]; if (key === midVal) { return mid; } diff --git a/lib/es6/belt_SortArrayString.js b/lib/es6/belt_SortArrayString.js index 882e3a6295..b9fc437873 100644 --- a/lib/es6/belt_SortArrayString.js +++ b/lib/es6/belt_SortArrayString.js @@ -4,12 +4,12 @@ import * as Belt_Array from "./belt_Array.js"; function sortedLengthAuxMore(xs, _prec, _acc, len) { while(true) { - var acc = _acc; - var prec = _prec; + let acc = _acc; + let prec = _prec; if (acc >= len) { return acc; } - var v = xs[acc]; + let v = xs[acc]; if (prec <= v) { return acc; } @@ -20,22 +20,22 @@ function sortedLengthAuxMore(xs, _prec, _acc, len) { } function strictlySortedLength(xs) { - var len = xs.length; + let len = xs.length; if (len === 0 || len === 1) { return len; } - var x0 = xs[0]; - var x1 = xs[1]; + let x0 = xs[0]; + let x1 = xs[1]; if (x0 < x1) { - var _prec = x1; - var _acc = 2; + let _prec = x1; + let _acc = 2; while(true) { - var acc = _acc; - var prec = _prec; + let acc = _acc; + let prec = _prec; if (acc >= len) { return acc; } - var v = xs[acc]; + let v = xs[acc]; if (prec >= v) { return acc; } @@ -51,14 +51,14 @@ function strictlySortedLength(xs) { } function isSorted(a) { - var len = a.length; + let len = a.length; if (len === 0) { return true; } else { - var _i = 0; - var last_bound = len - 1 | 0; + let _i = 0; + let last_bound = len - 1 | 0; while(true) { - var i = _i; + let i = _i; if (i === last_bound) { return true; } @@ -72,22 +72,22 @@ function isSorted(a) { } function merge(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (s1 <= s2) { dst[d] = s1; - var i1$1 = i1 + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return Belt_Array.blitUnsafe(src2, i2, dst, d + 1 | 0, src2r - i2 | 0); } @@ -97,7 +97,7 @@ function merge(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { continue ; } dst[d] = s2; - var i2$1 = i2 + 1 | 0; + let i2$1 = i2 + 1 | 0; if (i2$1 >= src2r) { return Belt_Array.blitUnsafe(src, i1, dst, d + 1 | 0, src1r - i1 | 0); } @@ -109,23 +109,23 @@ function merge(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { } function union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (s1 < s2) { dst[d] = s1; - var i1$1 = i1 + 1 | 0; - var d$1 = d + 1 | 0; + let i1$1 = i1 + 1 | 0; + let d$1 = d + 1 | 0; if (i1$1 < src1r) { _d = d$1; _s1 = src[i1$1]; @@ -137,9 +137,9 @@ function union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { } if (s1 === s2) { dst[d] = s1; - var i1$2 = i1 + 1 | 0; - var i2$1 = i2 + 1 | 0; - var d$2 = d + 1 | 0; + let i1$2 = i1 + 1 | 0; + let i2$1 = i2 + 1 | 0; + let d$2 = d + 1 | 0; if (!(i1$2 < src1r && i2$1 < src2r)) { if (i1$2 === src1r) { Belt_Array.blitUnsafe(src2, i2$1, dst, d$2, src2r - i2$1 | 0); @@ -157,8 +157,8 @@ function union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { continue ; } dst[d] = s2; - var i2$2 = i2 + 1 | 0; - var d$3 = d + 1 | 0; + let i2$2 = i2 + 1 | 0; + let d$3 = d + 1 | 0; if (i2$2 < src2r) { _d = d$3; _s2 = src2[i2$2]; @@ -171,21 +171,21 @@ function union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { } function intersect(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (s1 < s2) { - var i1$1 = i1 + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return d; } @@ -195,9 +195,9 @@ function intersect(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { } if (s1 === s2) { dst[d] = s1; - var i1$2 = i1 + 1 | 0; - var i2$1 = i2 + 1 | 0; - var d$1 = d + 1 | 0; + let i1$2 = i1 + 1 | 0; + let i2$1 = i2 + 1 | 0; + let d$1 = d + 1 | 0; if (!(i1$2 < src1r && i2$1 < src2r)) { return d$1; } @@ -208,7 +208,7 @@ function intersect(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { _i1 = i1$2; continue ; } - var i2$2 = i2 + 1 | 0; + let i2$2 = i2 + 1 | 0; if (i2$2 >= src2r) { return d; } @@ -219,23 +219,23 @@ function intersect(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { } function diff(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (s1 < s2) { dst[d] = s1; - var d$1 = d + 1 | 0; - var i1$1 = i1 + 1 | 0; + let d$1 = d + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return d$1; } @@ -245,8 +245,8 @@ function diff(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { continue ; } if (s1 === s2) { - var i1$2 = i1 + 1 | 0; - var i2$1 = i2 + 1 | 0; + let i1$2 = i1 + 1 | 0; + let i2$1 = i2 + 1 | 0; if (!(i1$2 < src1r && i2$1 < src2r)) { if (i1$2 === src1r) { return d; @@ -261,7 +261,7 @@ function diff(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { _i1 = i1$2; continue ; } - var i2$2 = i2 + 1 | 0; + let i2$2 = i2 + 1 | 0; if (i2$2 < src2r) { _s2 = src2[i2$2]; _i2 = i2$2; @@ -273,9 +273,9 @@ function diff(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { } function insertionSort(src, srcofs, dst, dstofs, len) { - for(var i = 0; i < len; ++i){ - var e = src[srcofs + i | 0]; - var j = (dstofs + i | 0) - 1 | 0; + for(let i = 0; i < len; ++i){ + let e = src[srcofs + i | 0]; + let j = (dstofs + i | 0) - 1 | 0; while(j >= dstofs && dst[j] > e) { dst[j + 1 | 0] = dst[j]; j = j - 1 | 0; @@ -288,52 +288,52 @@ function sortTo(src, srcofs, dst, dstofs, len) { if (len <= 5) { return insertionSort(src, srcofs, dst, dstofs, len); } - var l1 = len / 2 | 0; - var l2 = len - l1 | 0; + let l1 = len / 2 | 0; + let l2 = len - l1 | 0; sortTo(src, srcofs + l1 | 0, dst, dstofs + l1 | 0, l2); sortTo(src, srcofs, src, srcofs + l2 | 0, l1); merge(src, srcofs + l2 | 0, l1, dst, dstofs + l1 | 0, l2, dst, dstofs); } function stableSortInPlace(a) { - var l = a.length; + let l = a.length; if (l <= 5) { return insertionSort(a, 0, a, 0, l); } - var l1 = l / 2 | 0; - var l2 = l - l1 | 0; - var t = new Array(l2); + let l1 = l / 2 | 0; + let l2 = l - l1 | 0; + let t = new Array(l2); sortTo(a, l1, t, 0, l2); sortTo(a, 0, a, l2, l1); merge(a, l2, l1, t, 0, l2, a, 0); } function stableSort(a) { - var b = a.slice(0); + let b = a.slice(0); stableSortInPlace(b); return b; } function binarySearch(sorted, key) { - var len = sorted.length; + let len = sorted.length; if (len === 0) { return -1; } - var lo = sorted[0]; + let lo = sorted[0]; if (key < lo) { return -1; } - var hi = sorted[len - 1 | 0]; + let hi = sorted[len - 1 | 0]; if (key > hi) { return -(len + 1 | 0) | 0; } else { - var _lo = 0; - var _hi = len - 1 | 0; + let _lo = 0; + let _hi = len - 1 | 0; while(true) { - var hi$1 = _hi; - var lo$1 = _lo; - var mid = (lo$1 + hi$1 | 0) / 2 | 0; - var midVal = sorted[mid]; + let hi$1 = _hi; + let lo$1 = _lo; + let mid = (lo$1 + hi$1 | 0) / 2 | 0; + let midVal = sorted[mid]; if (key === midVal) { return mid; } diff --git a/lib/es6/belt_internalAVLset.js b/lib/es6/belt_internalAVLset.js index 55916ff19d..2babdbac8e 100644 --- a/lib/es6/belt_internalAVLset.js +++ b/lib/es6/belt_internalAVLset.js @@ -18,8 +18,8 @@ function copy(n) { } function create(l, v, r) { - var hl = l !== undefined ? l.h : 0; - var hr = r !== undefined ? r.h : 0; + let hl = l !== undefined ? l.h : 0; + let hr = r !== undefined ? r.h : 0; return { v: v, h: ( @@ -52,11 +52,11 @@ function heightGe(l, r) { } function bal(l, v, r) { - var hl = l !== undefined ? l.h : 0; - var hr = r !== undefined ? r.h : 0; + let hl = l !== undefined ? l.h : 0; + let hr = r !== undefined ? r.h : 0; if (hl > (hr + 2 | 0)) { - var ll = l.l; - var lr = l.r; + let ll = l.l; + let lr = l.r; if (heightGe(ll, lr)) { return create(ll, l.v, create(lr, v, r)); } else { @@ -73,8 +73,8 @@ function bal(l, v, r) { r: r }; } - var rl = r.l; - var rr = r.r; + let rl = r.l; + let rr = r.r; if (heightGe(rr, rl)) { return create(create(l, v, rl), r.v, rr); } else { @@ -84,8 +84,8 @@ function bal(l, v, r) { function min0Aux(_n) { while(true) { - var n = _n; - var n$1 = n.l; + let n = _n; + let n$1 = n.l; if (n$1 === undefined) { return n.v; } @@ -110,8 +110,8 @@ function minUndefined(n) { function max0Aux(_n) { while(true) { - var n = _n; - var n$1 = n.r; + let n = _n; + let n$1 = n.r; if (n$1 === undefined) { return n.v; } @@ -135,7 +135,7 @@ function maxUndefined(n) { } function removeMinAuxWithRef(n, v) { - var ln = n.l; + let ln = n.l; if (ln !== undefined) { return bal(removeMinAuxWithRef(ln, v), n.v, n.r); } else { @@ -150,8 +150,8 @@ function isEmpty(n) { function stackAllLeft(_v, _s) { while(true) { - var s = _s; - var v = _v; + let s = _s; + let v = _v; if (v === undefined) { return s; } @@ -166,7 +166,7 @@ function stackAllLeft(_v, _s) { function forEachU(_n, f) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return; } @@ -183,8 +183,8 @@ function forEach(n, f) { function reduceU(_s, _accu, f) { while(true) { - var accu = _accu; - var s = _s; + let accu = _accu; + let s = _s; if (s === undefined) { return accu; } @@ -200,7 +200,7 @@ function reduce(s, accu, f) { function everyU(_n, p) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return true; } @@ -221,7 +221,7 @@ function every(n, p) { function someU(_n, p) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return false; } @@ -263,8 +263,8 @@ function joinShared(ln, v, rn) { if (rn === undefined) { return addMaxElement(ln, v); } - var lh = ln.h; - var rh = rn.h; + let lh = ln.h; + let rh = rn.h; if (lh > (rh + 2 | 0)) { return bal(ln.l, ln.v, joinShared(ln.r, v, rn)); } else if (rh > (lh + 2 | 0)) { @@ -281,10 +281,10 @@ function concatShared(t1, t2) { if (t2 === undefined) { return t1; } - var v = { + let v = { contents: t2.v }; - var t2r = removeMinAuxWithRef(t2, v); + let t2r = removeMinAuxWithRef(t2, v); return joinShared(t1, v.contents, t2r); } @@ -295,14 +295,14 @@ function partitionSharedU(n, p) { undefined ]; } - var value = n.v; - var match = partitionSharedU(n.l, p); - var lf = match[1]; - var lt = match[0]; - var pv = p(value); - var match$1 = partitionSharedU(n.r, p); - var rf = match$1[1]; - var rt = match$1[0]; + let value = n.v; + let match = partitionSharedU(n.l, p); + let lf = match[1]; + let lt = match[0]; + let pv = p(value); + let match$1 = partitionSharedU(n.r, p); + let rf = match$1[1]; + let rt = match$1[0]; if (pv) { return [ joinShared(lt, value, rt), @@ -321,10 +321,10 @@ function partitionShared(n, p) { } function lengthNode(n) { - var l = n.l; - var r = n.r; - var sizeL = l !== undefined ? lengthNode(l) : 0; - var sizeR = r !== undefined ? lengthNode(r) : 0; + let l = n.l; + let r = n.r; + let sizeL = l !== undefined ? lengthNode(l) : 0; + let sizeR = r !== undefined ? lengthNode(r) : 0; return (1 + sizeL | 0) + sizeR | 0; } @@ -338,8 +338,8 @@ function size(n) { function toListAux(_n, _accu) { while(true) { - var accu = _accu; - var n = _n; + let accu = _accu; + let n = _n; if (n === undefined) { return accu; } @@ -358,13 +358,13 @@ function toList(s) { function checkInvariantInternal(_v) { while(true) { - var v = _v; + let v = _v; if (v === undefined) { return; } - var l = v.l; - var r = v.r; - var diff = ( + let l = v.l; + let r = v.r; + let diff = ( l !== undefined ? l.h : 0 ) - ( r !== undefined ? r.h : 0 @@ -388,14 +388,14 @@ function checkInvariantInternal(_v) { function fillArray(_n, _i, arr) { while(true) { - var i = _i; - var n = _n; - var v = n.v; - var l = n.l; - var r = n.r; - var next = l !== undefined ? fillArray(l, i, arr) : i; + let i = _i; + let n = _n; + let v = n.v; + let l = n.l; + let r = n.r; + let next = l !== undefined ? fillArray(l, i, arr) : i; arr[next] = v; - var rnext = next + 1 | 0; + let rnext = next + 1 | 0; if (r === undefined) { return rnext; } @@ -407,19 +407,19 @@ function fillArray(_n, _i, arr) { function fillArrayWithPartition(_n, cursor, arr, p) { while(true) { - var n = _n; - var v = n.v; - var l = n.l; - var r = n.r; + let n = _n; + let v = n.v; + let l = n.l; + let r = n.r; if (l !== undefined) { fillArrayWithPartition(l, cursor, arr, p); } if (p(v)) { - var c = cursor.forward; + let c = cursor.forward; arr[c] = v; cursor.forward = c + 1 | 0; } else { - var c$1 = cursor.backward; + let c$1 = cursor.backward; arr[c$1] = v; cursor.backward = c$1 - 1 | 0; } @@ -433,13 +433,13 @@ function fillArrayWithPartition(_n, cursor, arr, p) { function fillArrayWithFilter(_n, _i, arr, p) { while(true) { - var i = _i; - var n = _n; - var v = n.v; - var l = n.l; - var r = n.r; - var next = l !== undefined ? fillArrayWithFilter(l, i, arr, p) : i; - var rnext = p(v) ? (arr[next] = v, next + 1 | 0) : next; + let i = _i; + let n = _n; + let v = n.v; + let l = n.l; + let r = n.r; + let next = l !== undefined ? fillArrayWithFilter(l, i, arr, p) : i; + let rnext = p(v) ? (arr[next] = v, next + 1 | 0) : next; if (r === undefined) { return rnext; } @@ -453,8 +453,8 @@ function toArray(n) { if (n === undefined) { return []; } - var size = lengthNode(n); - var v = new Array(size); + let size = lengthNode(n); + let v = new Array(size); fillArray(n, 0, v); return v; } @@ -466,8 +466,8 @@ function fromSortedArrayRevAux(arr, off, len) { case 1 : return singleton(arr[off]); case 2 : - var x0 = arr[off]; - var x1 = arr[off - 1 | 0]; + let x0 = arr[off]; + let x1 = arr[off - 1 | 0]; return { v: x1, h: 2, @@ -475,9 +475,9 @@ function fromSortedArrayRevAux(arr, off, len) { r: undefined }; case 3 : - var x0$1 = arr[off]; - var x1$1 = arr[off - 1 | 0]; - var x2 = arr[off - 2 | 0]; + let x0$1 = arr[off]; + let x1$1 = arr[off - 1 | 0]; + let x2 = arr[off - 2 | 0]; return { v: x1$1, h: 2, @@ -485,10 +485,10 @@ function fromSortedArrayRevAux(arr, off, len) { r: singleton(x2) }; default: - var nl = len / 2 | 0; - var left = fromSortedArrayRevAux(arr, off, nl); - var mid = arr[off - nl | 0]; - var right = fromSortedArrayRevAux(arr, (off - nl | 0) - 1 | 0, (len - nl | 0) - 1 | 0); + let nl = len / 2 | 0; + let left = fromSortedArrayRevAux(arr, off, nl); + let mid = arr[off - nl | 0]; + let right = fromSortedArrayRevAux(arr, (off - nl | 0) - 1 | 0, (len - nl | 0) - 1 | 0); return create(left, mid, right); } } @@ -500,8 +500,8 @@ function fromSortedArrayAux(arr, off, len) { case 1 : return singleton(arr[off]); case 2 : - var x0 = arr[off]; - var x1 = arr[off + 1 | 0]; + let x0 = arr[off]; + let x1 = arr[off + 1 | 0]; return { v: x1, h: 2, @@ -509,9 +509,9 @@ function fromSortedArrayAux(arr, off, len) { r: undefined }; case 3 : - var x0$1 = arr[off]; - var x1$1 = arr[off + 1 | 0]; - var x2 = arr[off + 2 | 0]; + let x0$1 = arr[off]; + let x1$1 = arr[off + 1 | 0]; + let x2 = arr[off + 2 | 0]; return { v: x1$1, h: 2, @@ -519,10 +519,10 @@ function fromSortedArrayAux(arr, off, len) { r: singleton(x2) }; default: - var nl = len / 2 | 0; - var left = fromSortedArrayAux(arr, off, nl); - var mid = arr[off + nl | 0]; - var right = fromSortedArrayAux(arr, (off + nl | 0) + 1 | 0, (len - nl | 0) - 1 | 0); + let nl = len / 2 | 0; + let left = fromSortedArrayAux(arr, off, nl); + let mid = arr[off + nl | 0]; + let right = fromSortedArrayAux(arr, (off + nl | 0) + 1 | 0, (len - nl | 0) - 1 | 0); return create(left, mid, right); } } @@ -535,12 +535,12 @@ function keepSharedU(n, p) { if (n === undefined) { return; } - var v = n.v; - var l = n.l; - var r = n.r; - var newL = keepSharedU(l, p); - var pv = p(v); - var newR = keepSharedU(r, p); + let v = n.v; + let l = n.l; + let r = n.r; + let newL = keepSharedU(l, p); + let pv = p(v); + let newR = keepSharedU(r, p); if (pv) { if (l === newL && r === newR) { return n; @@ -560,9 +560,9 @@ function keepCopyU(n, p) { if (n === undefined) { return; } - var size = lengthNode(n); - var v = new Array(size); - var last = fillArrayWithFilter(n, 0, v, p); + let size = lengthNode(n); + let v = new Array(size); + let last = fillArrayWithFilter(n, 0, v, p); return fromSortedArrayAux(v, 0, last); } @@ -577,15 +577,15 @@ function partitionCopyU(n, p) { undefined ]; } - var size = lengthNode(n); - var v = new Array(size); - var backward = size - 1 | 0; - var cursor = { + let size = lengthNode(n); + let v = new Array(size); + let backward = size - 1 | 0; + let cursor = { forward: 0, backward: backward }; fillArrayWithPartition(n, cursor, v, p); - var forwardLen = cursor.forward; + let forwardLen = cursor.forward; return [ fromSortedArrayAux(v, 0, forwardLen), fromSortedArrayRevAux(v, backward, size - forwardLen | 0) @@ -598,12 +598,12 @@ function partitionCopy(n, p) { function has(_t, x, cmp) { while(true) { - var t = _t; + let t = _t; if (t === undefined) { return false; } - var v = t.v; - var c = cmp(x, v); + let v = t.v; + let c = cmp(x, v); if (c === 0) { return true; } @@ -613,23 +613,23 @@ function has(_t, x, cmp) { } function cmp(s1, s2, cmp$1) { - var len1 = size(s1); - var len2 = size(s2); + let len1 = size(s1); + let len2 = size(s2); if (len1 === len2) { - var _e1 = stackAllLeft(s1, /* [] */0); - var _e2 = stackAllLeft(s2, /* [] */0); + let _e1 = stackAllLeft(s1, /* [] */0); + let _e2 = stackAllLeft(s2, /* [] */0); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (!e1) { return 0; } if (!e2) { return 0; } - var h2 = e2.hd; - var h1 = e1.hd; - var c = cmp$1(h1.v, h2.v); + let h2 = e2.hd; + let h1 = e1.hd; + let c = cmp$1(h1.v, h2.v); if (c !== 0) { return c; } @@ -650,21 +650,21 @@ function eq(s1, s2, c) { function subset(_s1, _s2, cmp) { while(true) { - var s2 = _s2; - var s1 = _s1; + let s2 = _s2; + let s1 = _s1; if (s1 === undefined) { return true; } if (s2 === undefined) { return false; } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var v2 = s2.v; - var l2 = s2.l; - var r2 = s2.r; - var c = cmp(v1, v2); + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let v2 = s2.v; + let l2 = s2.l; + let r2 = s2.r; + let c = cmp(v1, v2); if (c === 0) { if (!subset(l1, l2, cmp)) { return false; @@ -690,12 +690,12 @@ function subset(_s1, _s2, cmp) { function get(_n, x, cmp) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return; } - var v = n.v; - var c = cmp(x, v); + let v = n.v; + let c = cmp(x, v); if (c === 0) { return Caml_option.some(v); } @@ -706,12 +706,12 @@ function get(_n, x, cmp) { function getUndefined(_n, x, cmp) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return; } - var v = n.v; - var c = cmp(x, v); + let v = n.v; + let c = cmp(x, v); if (c === 0) { return v; } @@ -722,10 +722,10 @@ function getUndefined(_n, x, cmp) { function getExn(_n, x, cmp) { while(true) { - var n = _n; + let n = _n; if (n !== undefined) { - var v = n.v; - var c = cmp(x, v); + let v = n.v; + let c = cmp(x, v); if (c === 0) { return v; } @@ -740,19 +740,19 @@ function getExn(_n, x, cmp) { } function rotateWithLeftChild(k2) { - var k1 = k2.l; + let k1 = k2.l; k2.l = k1.r; k1.r = k2; - var n = k2.l; - var hlk2 = n !== undefined ? n.h : 0; - var n$1 = k2.r; - var hrk2 = n$1 !== undefined ? n$1.h : 0; + let n = k2.l; + let hlk2 = n !== undefined ? n.h : 0; + let n$1 = k2.r; + let hrk2 = n$1 !== undefined ? n$1.h : 0; k2.h = ( hlk2 > hrk2 ? hlk2 : hrk2 ) + 1 | 0; - var n$2 = k1.l; - var hlk1 = n$2 !== undefined ? n$2.h : 0; - var hk2 = k2.h; + let n$2 = k1.l; + let hlk1 = n$2 !== undefined ? n$2.h : 0; + let hk2 = k2.h; k1.h = ( hlk1 > hk2 ? hlk1 : hk2 ) + 1 | 0; @@ -760,19 +760,19 @@ function rotateWithLeftChild(k2) { } function rotateWithRightChild(k1) { - var k2 = k1.r; + let k2 = k1.r; k1.r = k2.l; k2.l = k1; - var n = k1.l; - var hlk1 = n !== undefined ? n.h : 0; - var n$1 = k1.r; - var hrk1 = n$1 !== undefined ? n$1.h : 0; + let n = k1.l; + let hlk1 = n !== undefined ? n.h : 0; + let n$1 = k1.r; + let hrk1 = n$1 !== undefined ? n$1.h : 0; k1.h = ( hlk1 > hrk1 ? hlk1 : hrk1 ) + 1 | 0; - var n$2 = k2.r; - var hrk2 = n$2 !== undefined ? n$2.h : 0; - var hk1 = k1.h; + let n$2 = k2.r; + let hrk2 = n$2 !== undefined ? n$2.h : 0; + let hk1 = k1.h; k2.h = ( hrk2 > hk1 ? hrk2 : hk1 ) + 1 | 0; @@ -780,24 +780,24 @@ function rotateWithRightChild(k1) { } function doubleWithLeftChild(k3) { - var k3l = k3.l; - var v = rotateWithRightChild(k3l); + let k3l = k3.l; + let v = rotateWithRightChild(k3l); k3.l = v; return rotateWithLeftChild(k3); } function doubleWithRightChild(k2) { - var k2r = k2.r; - var v = rotateWithLeftChild(k2r); + let k2r = k2.r; + let v = rotateWithLeftChild(k2r); k2.r = v; return rotateWithRightChild(k2); } function heightUpdateMutate(t) { - var n = t.l; - var hlt = n !== undefined ? n.h : 0; - var n$1 = t.r; - var hrt = n$1 !== undefined ? n$1.h : 0; + let n = t.l; + let hlt = n !== undefined ? n.h : 0; + let n$1 = t.r; + let hrt = n$1 !== undefined ? n$1.h : 0; t.h = ( hlt > hrt ? hlt : hrt ) + 1 | 0; @@ -805,13 +805,13 @@ function heightUpdateMutate(t) { } function balMutate(nt) { - var l = nt.l; - var r = nt.r; - var hl = l !== undefined ? l.h : 0; - var hr = r !== undefined ? r.h : 0; + let l = nt.l; + let r = nt.r; + let hl = l !== undefined ? l.h : 0; + let hr = r !== undefined ? r.h : 0; if (hl > (2 + hr | 0)) { - var ll = l.l; - var lr = l.r; + let ll = l.l; + let lr = l.r; if (heightGe(ll, lr)) { return heightUpdateMutate(rotateWithLeftChild(nt)); } else { @@ -819,8 +819,8 @@ function balMutate(nt) { } } if (hr > (2 + hl | 0)) { - var rl = r.l; - var rr = r.r; + let rl = r.l; + let rr = r.r; if (heightGe(rr, rl)) { return heightUpdateMutate(rotateWithRightChild(nt)); } else { @@ -837,15 +837,15 @@ function addMutate(cmp, t, x) { if (t === undefined) { return singleton(x); } - var k = t.v; - var c = cmp(x, k); + let k = t.v; + let c = cmp(x, k); if (c === 0) { return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (c < 0) { - var ll = addMutate(cmp, l, x); + let ll = addMutate(cmp, l, x); t.l = ll; } else { t.r = addMutate(cmp, r, x); @@ -854,29 +854,29 @@ function addMutate(cmp, t, x) { } function fromArray(xs, cmp) { - var len = xs.length; + let len = xs.length; if (len === 0) { return; } - var next = Belt_SortArray.strictlySortedLengthU(xs, (function (x, y) { + let next = Belt_SortArray.strictlySortedLengthU(xs, (function (x, y) { return cmp(x, y) < 0; })); - var result; + let result; if (next >= 0) { result = fromSortedArrayAux(xs, 0, next); } else { next = -next | 0; result = fromSortedArrayRevAux(xs, next - 1 | 0, next); } - for(var i = next; i < len; ++i){ + for(let i = next; i < len; ++i){ result = addMutate(cmp, result, xs[i]); } return result; } function removeMinAuxWithRootMutate(nt, n) { - var ln = n.l; - var rn = n.r; + let ln = n.l; + let rn = n.r; if (ln !== undefined) { n.l = removeMinAuxWithRootMutate(nt, ln); return balMutate(n); diff --git a/lib/es6/belt_internalAVLtree.js b/lib/es6/belt_internalAVLtree.js index 0e7e8205e8..93dbbab4e2 100644 --- a/lib/es6/belt_internalAVLtree.js +++ b/lib/es6/belt_internalAVLtree.js @@ -27,8 +27,8 @@ function copy(n) { } function create(l, x, d, r) { - var hl = treeHeight(l); - var hr = treeHeight(r); + let hl = treeHeight(l); + let hr = treeHeight(r); return { k: x, v: d, @@ -75,11 +75,11 @@ function updateValue(n, newValue) { } function bal(l, x, d, r) { - var hl = l !== undefined ? l.h : 0; - var hr = r !== undefined ? r.h : 0; + let hl = l !== undefined ? l.h : 0; + let hr = r !== undefined ? r.h : 0; if (hl > (hr + 2 | 0)) { - var ll = l.l; - var lr = l.r; + let ll = l.l; + let lr = l.r; if (treeHeight(ll) >= treeHeight(lr)) { return create(ll, l.k, l.v, create(lr, x, d, r)); } else { @@ -95,8 +95,8 @@ function bal(l, x, d, r) { r: r }; } - var rl = r.l; - var rr = r.r; + let rl = r.l; + let rr = r.r; if (treeHeight(rr) >= treeHeight(rl)) { return create(create(l, x, d, rl), r.k, r.v, rr); } else { @@ -106,8 +106,8 @@ function bal(l, x, d, r) { function minKey0Aux(_n) { while(true) { - var n = _n; - var n$1 = n.l; + let n = _n; + let n$1 = n.l; if (n$1 === undefined) { return n.k; } @@ -132,8 +132,8 @@ function minKeyUndefined(n) { function maxKey0Aux(_n) { while(true) { - var n = _n; - var n$1 = n.r; + let n = _n; + let n$1 = n.r; if (n$1 === undefined) { return n.k; } @@ -158,8 +158,8 @@ function maxKeyUndefined(n) { function minKV0Aux(_n) { while(true) { - var n = _n; - var n$1 = n.l; + let n = _n; + let n$1 = n.l; if (n$1 === undefined) { return [ n.k, @@ -187,8 +187,8 @@ function minUndefined(n) { function maxKV0Aux(_n) { while(true) { - var n = _n; - var n$1 = n.r; + let n = _n; + let n$1 = n.r; if (n$1 === undefined) { return [ n.k, @@ -215,7 +215,7 @@ function maxUndefined(n) { } function removeMinAuxWithRef(n, kr, vr) { - var ln = n.l; + let ln = n.l; if (ln !== undefined) { return bal(removeMinAuxWithRef(ln, kr, vr), n.k, n.v, n.r); } else { @@ -231,8 +231,8 @@ function isEmpty(x) { function stackAllLeft(_v, _s) { while(true) { - var s = _s; - var v = _v; + let s = _s; + let v = _v; if (v === undefined) { return s; } @@ -249,20 +249,20 @@ function findFirstByU(n, p) { if (n === undefined) { return; } - var left = findFirstByU(n.l, p); + let left = findFirstByU(n.l, p); if (left !== undefined) { return left; } - var v = n.k; - var d = n.v; - var pvd = p(v, d); + let v = n.k; + let d = n.v; + let pvd = p(v, d); if (pvd) { return [ v, d ]; } - var right = findFirstByU(n.r, p); + let right = findFirstByU(n.r, p); if (right !== undefined) { return right; } @@ -275,7 +275,7 @@ function findFirstBy(n, p) { function forEachU(_n, f) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return; } @@ -294,9 +294,9 @@ function mapU(n, f) { if (n === undefined) { return; } - var newLeft = mapU(n.l, f); - var newD = f(n.v); - var newRight = mapU(n.r, f); + let newLeft = mapU(n.l, f); + let newD = f(n.v); + let newRight = mapU(n.r, f); return { k: n.k, v: newD, @@ -314,10 +314,10 @@ function mapWithKeyU(n, f) { if (n === undefined) { return; } - var key = n.k; - var newLeft = mapWithKeyU(n.l, f); - var newD = f(key, n.v); - var newRight = mapWithKeyU(n.r, f); + let key = n.k; + let newLeft = mapWithKeyU(n.l, f); + let newD = f(key, n.v); + let newRight = mapWithKeyU(n.r, f); return { k: key, v: newD, @@ -333,15 +333,15 @@ function mapWithKey(n, f) { function reduceU(_m, _accu, f) { while(true) { - var accu = _accu; - var m = _m; + let accu = _accu; + let m = _m; if (m === undefined) { return accu; } - var v = m.k; - var d = m.v; - var l = m.l; - var r = m.r; + let v = m.k; + let d = m.v; + let l = m.l; + let r = m.r; _accu = f(reduceU(l, accu, f), v, d); _m = r; continue ; @@ -354,7 +354,7 @@ function reduce(m, accu, f) { function everyU(_n, p) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return true; } @@ -375,7 +375,7 @@ function every(n, p) { function someU(_n, p) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return false; } @@ -417,16 +417,16 @@ function join(ln, v, d, rn) { if (rn === undefined) { return addMaxElement(ln, v, d); } - var lv = ln.k; - var ld = ln.v; - var lh = ln.h; - var ll = ln.l; - var lr = ln.r; - var rv = rn.k; - var rd = rn.v; - var rh = rn.h; - var rl = rn.l; - var rr = rn.r; + let lv = ln.k; + let ld = ln.v; + let lh = ln.h; + let ll = ln.l; + let lr = ln.r; + let rv = rn.k; + let rd = rn.v; + let rh = rn.h; + let rl = rn.l; + let rr = rn.r; if (lh > (rh + 2 | 0)) { return bal(ll, lv, ld, join(lr, v, d, rn)); } else if (rh > (lh + 2 | 0)) { @@ -443,13 +443,13 @@ function concat(t1, t2) { if (t2 === undefined) { return t1; } - var kr = { + let kr = { contents: t2.k }; - var vr = { + let vr = { contents: t2.v }; - var t2r = removeMinAuxWithRef(t2, kr, vr); + let t2r = removeMinAuxWithRef(t2, kr, vr); return join(t1, kr.contents, vr.contents, t2r); } @@ -465,11 +465,11 @@ function keepSharedU(n, p) { if (n === undefined) { return; } - var v = n.k; - var d = n.v; - var newLeft = keepSharedU(n.l, p); - var pvd = p(v, d); - var newRight = keepSharedU(n.r, p); + let v = n.k; + let d = n.v; + let newLeft = keepSharedU(n.l, p); + let pvd = p(v, d); + let newRight = keepSharedU(n.r, p); if (pvd) { return join(newLeft, v, d, newRight); } else { @@ -485,11 +485,11 @@ function keepMapU(n, p) { if (n === undefined) { return; } - var v = n.k; - var d = n.v; - var newLeft = keepMapU(n.l, p); - var pvd = p(v, d); - var newRight = keepMapU(n.r, p); + let v = n.k; + let d = n.v; + let newLeft = keepMapU(n.l, p); + let pvd = p(v, d); + let newRight = keepMapU(n.r, p); if (pvd !== undefined) { return join(newLeft, v, Caml_option.valFromOption(pvd), newRight); } else { @@ -508,15 +508,15 @@ function partitionSharedU(n, p) { undefined ]; } - var key = n.k; - var value = n.v; - var match = partitionSharedU(n.l, p); - var lf = match[1]; - var lt = match[0]; - var pvd = p(key, value); - var match$1 = partitionSharedU(n.r, p); - var rf = match$1[1]; - var rt = match$1[0]; + let key = n.k; + let value = n.v; + let match = partitionSharedU(n.l, p); + let lf = match[1]; + let lt = match[0]; + let pvd = p(key, value); + let match$1 = partitionSharedU(n.r, p); + let rf = match$1[1]; + let rt = match$1[0]; if (pvd) { return [ join(lt, key, value, rt), @@ -535,10 +535,10 @@ function partitionShared(n, p) { } function lengthNode(n) { - var l = n.l; - var r = n.r; - var sizeL = l !== undefined ? lengthNode(l) : 0; - var sizeR = r !== undefined ? lengthNode(r) : 0; + let l = n.l; + let r = n.r; + let sizeL = l !== undefined ? lengthNode(l) : 0; + let sizeR = r !== undefined ? lengthNode(r) : 0; return (1 + sizeL | 0) + sizeR | 0; } @@ -552,15 +552,15 @@ function size(n) { function toListAux(_n, _accu) { while(true) { - var accu = _accu; - var n = _n; + let accu = _accu; + let n = _n; if (n === undefined) { return accu; } - var k = n.k; - var v = n.v; - var l = n.l; - var r = n.r; + let k = n.k; + let v = n.v; + let l = n.l; + let r = n.r; _accu = { hd: [ k, @@ -579,13 +579,13 @@ function toList(s) { function checkInvariantInternal(_v) { while(true) { - var v = _v; + let v = _v; if (v === undefined) { return; } - var l = v.l; - var r = v.r; - var diff = treeHeight(l) - treeHeight(r) | 0; + let l = v.l; + let r = v.r; + let diff = treeHeight(l) - treeHeight(r) | 0; if (!(diff <= 2 && diff >= -2)) { throw { RE_EXN_ID: "Assert_failure", @@ -605,14 +605,14 @@ function checkInvariantInternal(_v) { function fillArrayKey(_n, _i, arr) { while(true) { - var i = _i; - var n = _n; - var v = n.k; - var l = n.l; - var r = n.r; - var next = l !== undefined ? fillArrayKey(l, i, arr) : i; + let i = _i; + let n = _n; + let v = n.k; + let l = n.l; + let r = n.r; + let next = l !== undefined ? fillArrayKey(l, i, arr) : i; arr[next] = v; - var rnext = next + 1 | 0; + let rnext = next + 1 | 0; if (r === undefined) { return rnext; } @@ -624,13 +624,13 @@ function fillArrayKey(_n, _i, arr) { function fillArrayValue(_n, _i, arr) { while(true) { - var i = _i; - var n = _n; - var l = n.l; - var r = n.r; - var next = l !== undefined ? fillArrayValue(l, i, arr) : i; + let i = _i; + let n = _n; + let l = n.l; + let r = n.r; + let next = l !== undefined ? fillArrayValue(l, i, arr) : i; arr[next] = n.v; - var rnext = next + 1 | 0; + let rnext = next + 1 | 0; if (r === undefined) { return rnext; } @@ -642,17 +642,17 @@ function fillArrayValue(_n, _i, arr) { function fillArray(_n, _i, arr) { while(true) { - var i = _i; - var n = _n; - var l = n.l; - var v = n.k; - var r = n.r; - var next = l !== undefined ? fillArray(l, i, arr) : i; + let i = _i; + let n = _n; + let l = n.l; + let v = n.k; + let r = n.r; + let next = l !== undefined ? fillArray(l, i, arr) : i; arr[next] = [ v, n.v ]; - var rnext = next + 1 | 0; + let rnext = next + 1 | 0; if (r === undefined) { return rnext; } @@ -666,8 +666,8 @@ function toArray(n) { if (n === undefined) { return []; } - var size = lengthNode(n); - var v = new Array(size); + let size = lengthNode(n); + let v = new Array(size); fillArray(n, 0, v); return v; } @@ -676,8 +676,8 @@ function keysToArray(n) { if (n === undefined) { return []; } - var size = lengthNode(n); - var v = new Array(size); + let size = lengthNode(n); + let v = new Array(size); fillArrayKey(n, 0, v); return v; } @@ -686,8 +686,8 @@ function valuesToArray(n) { if (n === undefined) { return []; } - var size = lengthNode(n); - var v = new Array(size); + let size = lengthNode(n); + let v = new Array(size); fillArrayValue(n, 0, v); return v; } @@ -697,13 +697,13 @@ function fromSortedArrayRevAux(arr, off, len) { case 0 : return; case 1 : - var match = arr[off]; + let match = arr[off]; return singleton(match[0], match[1]); case 2 : - var match_0 = arr[off]; - var match_1 = arr[off - 1 | 0]; - var match$1 = match_1; - var match$2 = match_0; + let match_0 = arr[off]; + let match_1 = arr[off - 1 | 0]; + let match$1 = match_1; + let match$2 = match_0; return { k: match$1[0], v: match$1[1], @@ -712,12 +712,12 @@ function fromSortedArrayRevAux(arr, off, len) { r: undefined }; case 3 : - var match_0$1 = arr[off]; - var match_1$1 = arr[off - 1 | 0]; - var match_2 = arr[off - 2 | 0]; - var match$3 = match_2; - var match$4 = match_1$1; - var match$5 = match_0$1; + let match_0$1 = arr[off]; + let match_1$1 = arr[off - 1 | 0]; + let match_2 = arr[off - 2 | 0]; + let match$3 = match_2; + let match$4 = match_1$1; + let match$5 = match_0$1; return { k: match$4[0], v: match$4[1], @@ -726,10 +726,10 @@ function fromSortedArrayRevAux(arr, off, len) { r: singleton(match$3[0], match$3[1]) }; default: - var nl = len / 2 | 0; - var left = fromSortedArrayRevAux(arr, off, nl); - var match$6 = arr[off - nl | 0]; - var right = fromSortedArrayRevAux(arr, (off - nl | 0) - 1 | 0, (len - nl | 0) - 1 | 0); + let nl = len / 2 | 0; + let left = fromSortedArrayRevAux(arr, off, nl); + let match$6 = arr[off - nl | 0]; + let right = fromSortedArrayRevAux(arr, (off - nl | 0) - 1 | 0, (len - nl | 0) - 1 | 0); return create(left, match$6[0], match$6[1], right); } } @@ -739,13 +739,13 @@ function fromSortedArrayAux(arr, off, len) { case 0 : return; case 1 : - var match = arr[off]; + let match = arr[off]; return singleton(match[0], match[1]); case 2 : - var match_0 = arr[off]; - var match_1 = arr[off + 1 | 0]; - var match$1 = match_1; - var match$2 = match_0; + let match_0 = arr[off]; + let match_1 = arr[off + 1 | 0]; + let match$1 = match_1; + let match$2 = match_0; return { k: match$1[0], v: match$1[1], @@ -754,12 +754,12 @@ function fromSortedArrayAux(arr, off, len) { r: undefined }; case 3 : - var match_0$1 = arr[off]; - var match_1$1 = arr[off + 1 | 0]; - var match_2 = arr[off + 2 | 0]; - var match$3 = match_2; - var match$4 = match_1$1; - var match$5 = match_0$1; + let match_0$1 = arr[off]; + let match_1$1 = arr[off + 1 | 0]; + let match_2 = arr[off + 2 | 0]; + let match$3 = match_2; + let match$4 = match_1$1; + let match$5 = match_0$1; return { k: match$4[0], v: match$4[1], @@ -768,10 +768,10 @@ function fromSortedArrayAux(arr, off, len) { r: singleton(match$3[0], match$3[1]) }; default: - var nl = len / 2 | 0; - var left = fromSortedArrayAux(arr, off, nl); - var match$6 = arr[off + nl | 0]; - var right = fromSortedArrayAux(arr, (off + nl | 0) + 1 | 0, (len - nl | 0) - 1 | 0); + let nl = len / 2 | 0; + let left = fromSortedArrayAux(arr, off, nl); + let match$6 = arr[off + nl | 0]; + let right = fromSortedArrayAux(arr, (off + nl | 0) + 1 | 0, (len - nl | 0) - 1 | 0); return create(left, match$6[0], match$6[1], right); } } @@ -781,27 +781,27 @@ function fromSortedArrayUnsafe(arr) { } function cmpU(s1, s2, kcmp, vcmp) { - var len1 = size(s1); - var len2 = size(s2); + let len1 = size(s1); + let len2 = size(s2); if (len1 === len2) { - var _e1 = stackAllLeft(s1, /* [] */0); - var _e2 = stackAllLeft(s2, /* [] */0); + let _e1 = stackAllLeft(s1, /* [] */0); + let _e2 = stackAllLeft(s2, /* [] */0); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (!e1) { return 0; } if (!e2) { return 0; } - var h2 = e2.hd; - var h1 = e1.hd; - var c = kcmp(h1.k, h2.k); + let h2 = e2.hd; + let h1 = e1.hd; + let c = kcmp(h1.k, h2.k); if (c !== 0) { return c; } - var cx = vcmp(h1.v, h2.v); + let cx = vcmp(h1.v, h2.v); if (cx !== 0) { return cx; } @@ -821,22 +821,22 @@ function cmp(s1, s2, kcmp, vcmp) { } function eqU(s1, s2, kcmp, veq) { - var len1 = size(s1); - var len2 = size(s2); + let len1 = size(s1); + let len2 = size(s2); if (len1 === len2) { - var _e1 = stackAllLeft(s1, /* [] */0); - var _e2 = stackAllLeft(s2, /* [] */0); + let _e1 = stackAllLeft(s1, /* [] */0); + let _e2 = stackAllLeft(s2, /* [] */0); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (!e1) { return true; } if (!e2) { return true; } - var h2 = e2.hd; - var h1 = e1.hd; + let h2 = e2.hd; + let h1 = e1.hd; if (!(kcmp(h1.k, h2.k) === 0 && veq(h1.v, h2.v))) { return false; } @@ -855,12 +855,12 @@ function eq(s1, s2, kcmp, veq) { function get(_n, x, cmp) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return; } - var v = n.k; - var c = cmp(x, v); + let v = n.k; + let c = cmp(x, v); if (c === 0) { return Caml_option.some(n.v); } @@ -871,12 +871,12 @@ function get(_n, x, cmp) { function getUndefined(_n, x, cmp) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return; } - var v = n.k; - var c = cmp(x, v); + let v = n.k; + let c = cmp(x, v); if (c === 0) { return n.v; } @@ -887,10 +887,10 @@ function getUndefined(_n, x, cmp) { function getExn(_n, x, cmp) { while(true) { - var n = _n; + let n = _n; if (n !== undefined) { - var v = n.k; - var c = cmp(x, v); + let v = n.k; + let c = cmp(x, v); if (c === 0) { return n.v; } @@ -906,12 +906,12 @@ function getExn(_n, x, cmp) { function getWithDefault(_n, x, def, cmp) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return def; } - var v = n.k; - var c = cmp(x, v); + let v = n.k; + let c = cmp(x, v); if (c === 0) { return n.v; } @@ -922,12 +922,12 @@ function getWithDefault(_n, x, def, cmp) { function has(_n, x, cmp) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return false; } - var v = n.k; - var c = cmp(x, v); + let v = n.k; + let c = cmp(x, v); if (c === 0) { return true; } @@ -937,16 +937,16 @@ function has(_n, x, cmp) { } function rotateWithLeftChild(k2) { - var k1 = k2.l; + let k1 = k2.l; k2.l = k1.r; k1.r = k2; - var hlk2 = treeHeight(k2.l); - var hrk2 = treeHeight(k2.r); + let hlk2 = treeHeight(k2.l); + let hrk2 = treeHeight(k2.r); k2.h = ( hlk2 > hrk2 ? hlk2 : hrk2 ) + 1 | 0; - var hlk1 = treeHeight(k1.l); - var hk2 = k2.h; + let hlk1 = treeHeight(k1.l); + let hk2 = k2.h; k1.h = ( hlk1 > hk2 ? hlk1 : hk2 ) + 1 | 0; @@ -954,16 +954,16 @@ function rotateWithLeftChild(k2) { } function rotateWithRightChild(k1) { - var k2 = k1.r; + let k2 = k1.r; k1.r = k2.l; k2.l = k1; - var hlk1 = treeHeight(k1.l); - var hrk1 = treeHeight(k1.r); + let hlk1 = treeHeight(k1.l); + let hrk1 = treeHeight(k1.r); k1.h = ( hlk1 > hrk1 ? hlk1 : hrk1 ) + 1 | 0; - var hrk2 = treeHeight(k2.r); - var hk1 = k1.h; + let hrk2 = treeHeight(k2.r); + let hk1 = k1.h; k2.h = ( hrk2 > hk1 ? hrk2 : hk1 ) + 1 | 0; @@ -971,22 +971,22 @@ function rotateWithRightChild(k1) { } function doubleWithLeftChild(k3) { - var x = k3.l; - var v = rotateWithRightChild(x); + let x = k3.l; + let v = rotateWithRightChild(x); k3.l = v; return rotateWithLeftChild(k3); } function doubleWithRightChild(k2) { - var x = k2.r; - var v = rotateWithLeftChild(x); + let x = k2.r; + let v = rotateWithLeftChild(x); k2.r = v; return rotateWithRightChild(k2); } function heightUpdateMutate(t) { - var hlt = treeHeight(t.l); - var hrt = treeHeight(t.r); + let hlt = treeHeight(t.l); + let hrt = treeHeight(t.r); t.h = ( hlt > hrt ? hlt : hrt ) + 1 | 0; @@ -994,13 +994,13 @@ function heightUpdateMutate(t) { } function balMutate(nt) { - var l = nt.l; - var r = nt.r; - var hl = treeHeight(l); - var hr = treeHeight(r); + let l = nt.l; + let r = nt.r; + let hl = treeHeight(l); + let hr = treeHeight(r); if (hl > (2 + hr | 0)) { - var ll = l.l; - var lr = l.r; + let ll = l.l; + let lr = l.r; if (heightGe(ll, lr)) { return heightUpdateMutate(rotateWithLeftChild(nt)); } else { @@ -1008,8 +1008,8 @@ function balMutate(nt) { } } if (hr > (2 + hl | 0)) { - var rl = r.l; - var rr = r.r; + let rl = r.l; + let rr = r.r; if (heightGe(rr, rl)) { return heightUpdateMutate(rotateWithRightChild(nt)); } else { @@ -1026,16 +1026,16 @@ function updateMutate(t, x, data, cmp) { if (t === undefined) { return singleton(x, data); } - var k = t.k; - var c = cmp(x, k); + let k = t.k; + let c = cmp(x, k); if (c === 0) { t.v = data; return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (c < 0) { - var ll = updateMutate(l, x, data, cmp); + let ll = updateMutate(l, x, data, cmp); t.l = ll; } else { t.r = updateMutate(r, x, data, cmp); @@ -1044,30 +1044,30 @@ function updateMutate(t, x, data, cmp) { } function fromArray(xs, cmp) { - var len = xs.length; + let len = xs.length; if (len === 0) { return; } - var next = Belt_SortArray.strictlySortedLengthU(xs, (function (param, param$1) { + let next = Belt_SortArray.strictlySortedLengthU(xs, (function (param, param$1) { return cmp(param[0], param$1[0]) < 0; })); - var result; + let result; if (next >= 0) { result = fromSortedArrayAux(xs, 0, next); } else { next = -next | 0; result = fromSortedArrayRevAux(xs, next - 1 | 0, next); } - for(var i = next; i < len; ++i){ - var match = xs[i]; + for(let i = next; i < len; ++i){ + let match = xs[i]; result = updateMutate(result, match[0], match[1], cmp); } return result; } function removeMinAuxWithRootMutate(nt, n) { - var rn = n.r; - var ln = n.l; + let rn = n.r; + let ln = n.l; if (ln !== undefined) { n.l = removeMinAuxWithRootMutate(nt, ln); return balMutate(n); diff --git a/lib/es6/belt_internalBuckets.js b/lib/es6/belt_internalBuckets.js index 68cdc5f858..48b48534c4 100644 --- a/lib/es6/belt_internalBuckets.js +++ b/lib/es6/belt_internalBuckets.js @@ -8,7 +8,7 @@ function copyBucket(c) { if (c === undefined) { return c; } - var head = { + let head = { key: c.key, value: c.value, next: undefined @@ -19,12 +19,12 @@ function copyBucket(c) { function copyAuxCont(_c, _prec) { while(true) { - var prec = _prec; - var c = _c; + let prec = _prec; + let c = _c; if (c === undefined) { return; } - var ncopy = { + let ncopy = { key: c.key, value: c.value, next: undefined @@ -37,9 +37,9 @@ function copyAuxCont(_c, _prec) { } function copyBuckets(buckets) { - var len = buckets.length; - var newBuckets = new Array(len); - for(var i = 0; i < len; ++i){ + let len = buckets.length; + let newBuckets = new Array(len); + for(let i = 0; i < len; ++i){ newBuckets[i] = copyBucket(buckets[i]); } return newBuckets; @@ -56,8 +56,8 @@ function copy(x) { function bucketLength(_accu, _buckets) { while(true) { - var buckets = _buckets; - var accu = _accu; + let buckets = _buckets; + let accu = _accu; if (buckets === undefined) { return accu; } @@ -69,7 +69,7 @@ function bucketLength(_accu, _buckets) { function do_bucket_iter(f, _buckets) { while(true) { - var buckets = _buckets; + let buckets = _buckets; if (buckets === undefined) { return; } @@ -80,8 +80,8 @@ function do_bucket_iter(f, _buckets) { } function forEachU(h, f) { - var d = h.buckets; - for(var i = 0 ,i_finish = d.length; i < i_finish; ++i){ + let d = h.buckets; + for(let i = 0 ,i_finish = d.length; i < i_finish; ++i){ do_bucket_iter(f, d[i]); } } @@ -92,8 +92,8 @@ function forEach(h, f) { function do_bucket_fold(f, _b, _accu) { while(true) { - var accu = _accu; - var b = _b; + let accu = _accu; + let b = _b; if (b === undefined) { return accu; } @@ -104,9 +104,9 @@ function do_bucket_fold(f, _b, _accu) { } function reduceU(h, init, f) { - var d = h.buckets; - var accu = init; - for(var i = 0 ,i_finish = d.length; i < i_finish; ++i){ + let d = h.buckets; + let accu = init; + for(let i = 0 ,i_finish = d.length; i < i_finish; ++i){ accu = do_bucket_fold(f, d[i], accu); } return accu; @@ -118,7 +118,7 @@ function reduce(h, init, f) { function getMaxBucketLength(h) { return Belt_Array.reduceU(h.buckets, 0, (function (m, b) { - var len = bucketLength(0, b); + let len = bucketLength(0, b); if (m > len) { return m; } else { @@ -128,19 +128,19 @@ function getMaxBucketLength(h) { } function getBucketHistogram(h) { - var mbl = getMaxBucketLength(h); - var histo = Belt_Array.makeByU(mbl + 1 | 0, (function (param) { + let mbl = getMaxBucketLength(h); + let histo = Belt_Array.makeByU(mbl + 1 | 0, (function (param) { return 0; })); Belt_Array.forEachU(h.buckets, (function (b) { - var l = bucketLength(0, b); + let l = bucketLength(0, b); histo[l] = histo[l] + 1 | 0; })); return histo; } function logStats(h) { - var histogram = getBucketHistogram(h); + let histogram = getBucketHistogram(h); console.log({ bindings: h.size, buckets: h.buckets.length, @@ -150,10 +150,10 @@ function logStats(h) { function filterMapInplaceBucket(f, h, i, _prec, _cell) { while(true) { - var cell = _cell; - var prec = _prec; - var n = cell.next; - var data = f(cell.key, cell.value); + let cell = _cell; + let prec = _prec; + let n = cell.next; + let data = f(cell.key, cell.value); if (data !== undefined) { if (prec !== undefined) { cell.next = cell; @@ -184,9 +184,9 @@ function filterMapInplaceBucket(f, h, i, _prec, _cell) { } function keepMapInPlaceU(h, f) { - var h_buckets = h.buckets; - for(var i = 0 ,i_finish = h_buckets.length; i < i_finish; ++i){ - var v = h_buckets[i]; + let h_buckets = h.buckets; + for(let i = 0 ,i_finish = h_buckets.length; i < i_finish; ++i){ + let v = h_buckets[i]; if (v !== undefined) { filterMapInplaceBucket(f, h, i, undefined, v); } @@ -200,13 +200,13 @@ function keepMapInPlace(h, f) { function fillArray(_i, arr, _cell) { while(true) { - var cell = _cell; - var i = _i; + let cell = _cell; + let i = _i; arr[i] = [ cell.key, cell.value ]; - var v = cell.next; + let v = cell.next; if (v === undefined) { return i + 1 | 0; } @@ -218,10 +218,10 @@ function fillArray(_i, arr, _cell) { function fillArrayMap(_i, arr, _cell, f) { while(true) { - var cell = _cell; - var i = _i; + let cell = _cell; + let i = _i; arr[i] = f(cell); - var v = cell.next; + let v = cell.next; if (v === undefined) { return i + 1 | 0; } @@ -232,11 +232,11 @@ function fillArrayMap(_i, arr, _cell, f) { } function linear(h, f) { - var d = h.buckets; - var current = 0; - var arr = new Array(h.size); - for(var i = 0 ,i_finish = d.length; i < i_finish; ++i){ - var cell = d[i]; + let d = h.buckets; + let current = 0; + let arr = new Array(h.size); + for(let i = 0 ,i_finish = d.length; i < i_finish; ++i){ + let cell = d[i]; if (cell !== undefined) { current = fillArrayMap(current, arr, cell, f); } @@ -266,7 +266,7 @@ function toArray(h) { })); } -var C; +let C; export { C, diff --git a/lib/es6/belt_internalBucketsType.js b/lib/es6/belt_internalBucketsType.js index 386b0bfd51..733cc172ca 100644 --- a/lib/es6/belt_internalBucketsType.js +++ b/lib/es6/belt_internalBucketsType.js @@ -3,7 +3,7 @@ function power_2_above(_x, n) { while(true) { - var x = _x; + let x = _x; if (x >= n) { return x; } @@ -16,7 +16,7 @@ function power_2_above(_x, n) { } function make(hash, eq, hintSize) { - var s = power_2_above(16, hintSize); + let s = power_2_above(16, hintSize); return { size: 0, buckets: new Array(s), @@ -27,9 +27,9 @@ function make(hash, eq, hintSize) { function clear(h) { h.size = 0; - var h_buckets = h.buckets; - var len = h_buckets.length; - for(var i = 0; i < len; ++i){ + let h_buckets = h.buckets; + let len = h_buckets.length; + for(let i = 0; i < len; ++i){ h_buckets[i] = undefined; } } @@ -38,7 +38,7 @@ function isEmpty(h) { return h.size === 0; } -var emptyOpt; +let emptyOpt; export { emptyOpt, diff --git a/lib/es6/belt_internalMapInt.js b/lib/es6/belt_internalMapInt.js index 5d6bef8e8c..fd55125beb 100644 --- a/lib/es6/belt_internalMapInt.js +++ b/lib/es6/belt_internalMapInt.js @@ -10,11 +10,11 @@ function add(t, x, data) { if (t === undefined) { return Belt_internalAVLtree.singleton(x, data); } - var k = t.k; + let k = t.k; if (x === k) { return Belt_internalAVLtree.updateValue(t, data); } - var v = t.v; + let v = t.v; if (x < k) { return Belt_internalAVLtree.bal(add(t.l, x, data), k, v, t.r); } else { @@ -24,11 +24,11 @@ function add(t, x, data) { function get(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return; } - var v = n.k; + let v = n.k; if (x === v) { return Caml_option.some(n.v); } @@ -39,11 +39,11 @@ function get(_n, x) { function getUndefined(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return; } - var v = n.k; + let v = n.k; if (x === v) { return n.v; } @@ -54,9 +54,9 @@ function getUndefined(_n, x) { function getExn(_n, x) { while(true) { - var n = _n; + let n = _n; if (n !== undefined) { - var v = n.k; + let v = n.k; if (x === v) { return n.v; } @@ -72,11 +72,11 @@ function getExn(_n, x) { function getWithDefault(_n, x, def) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return def; } - var v = n.k; + let v = n.k; if (x === v) { return n.v; } @@ -87,11 +87,11 @@ function getWithDefault(_n, x, def) { function has(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return false; } - var v = n.k; + let v = n.k; if (x === v) { return true; } @@ -104,9 +104,9 @@ function remove(n, x) { if (n === undefined) { return n; } - var v = n.k; - var l = n.l; - var r = n.r; + let v = n.k; + let l = n.l; + let r = n.r; if (x !== v) { if (x < v) { return Belt_internalAVLtree.bal(remove(l, x), v, n.v, r); @@ -120,21 +120,21 @@ function remove(n, x) { if (r === undefined) { return l; } - var kr = { + let kr = { contents: r.k }; - var vr = { + let vr = { contents: r.v }; - var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); + let r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1); } function splitAux(x, n) { - var v = n.k; - var d = n.v; - var l = n.l; - var r = n.r; + let v = n.k; + let d = n.v; + let l = n.l; + let r = n.r; if (x === v) { return [ l, @@ -150,7 +150,7 @@ function splitAux(x, n) { n ]; } - var match = splitAux(x, l); + let match = splitAux(x, l); return [ match[0], match[1], @@ -164,7 +164,7 @@ function splitAux(x, n) { undefined ]; } - var match$1 = splitAux(x, r); + let match$1 = splitAux(x, r); return [ Belt_internalAVLtree.join(l, v, d, match$1[0]), match$1[1], @@ -189,22 +189,22 @@ function mergeU(s1, s2, f) { if (s1.h >= ( s2 !== undefined ? s2.h : 0 )) { - var v1 = s1.k; - var d1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var match = split(v1, s2); + let v1 = s1.k; + let d1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let match = split(v1, s2); return Belt_internalAVLtree.concatOrJoin(mergeU(l1, match[0], f), v1, f(v1, Caml_option.some(d1), match[1]), mergeU(r1, match[2], f)); } } else if (s2 === undefined) { return; } - var v2 = s2.k; - var d2 = s2.v; - var l2 = s2.l; - var r2 = s2.r; - var match$1 = split(v2, s1); + let v2 = s2.k; + let d2 = s2.v; + let l2 = s2.l; + let r2 = s2.r; + let match$1 = split(v2, s1); return Belt_internalAVLtree.concatOrJoin(mergeU(match$1[0], l2, f), v2, f(v2, match$1[1], Caml_option.some(d2)), mergeU(match$1[2], r2, f)); } @@ -214,21 +214,21 @@ function merge(s1, s2, f) { function compareAux(_e1, _e2, vcmp) { while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (!e1) { return 0; } if (!e2) { return 0; } - var h2 = e2.hd; - var h1 = e1.hd; - var c = Caml.int_compare(h1.k, h2.k); + let h2 = e2.hd; + let h1 = e1.hd; + let c = Caml.int_compare(h1.k, h2.k); if (c !== 0) { return c; } - var cx = vcmp(h1.v, h2.v); + let cx = vcmp(h1.v, h2.v); if (cx !== 0) { return cx; } @@ -239,8 +239,8 @@ function compareAux(_e1, _e2, vcmp) { } function cmpU(s1, s2, cmp) { - var len1 = Belt_internalAVLtree.size(s1); - var len2 = Belt_internalAVLtree.size(s2); + let len1 = Belt_internalAVLtree.size(s1); + let len2 = Belt_internalAVLtree.size(s2); if (len1 === len2) { return compareAux(Belt_internalAVLtree.stackAllLeft(s1, /* [] */0), Belt_internalAVLtree.stackAllLeft(s2, /* [] */0), cmp); } else if (len1 < len2) { @@ -256,16 +256,16 @@ function cmp(s1, s2, f) { function eqAux(_e1, _e2, eq) { while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (!e1) { return true; } if (!e2) { return true; } - var h2 = e2.hd; - var h1 = e1.hd; + let h2 = e2.hd; + let h1 = e1.hd; if (!(h1.k === h2.k && eq(h1.v, h2.v))) { return false; } @@ -276,8 +276,8 @@ function eqAux(_e1, _e2, eq) { } function eqU(s1, s2, eq) { - var len1 = Belt_internalAVLtree.size(s1); - var len2 = Belt_internalAVLtree.size(s2); + let len1 = Belt_internalAVLtree.size(s1); + let len2 = Belt_internalAVLtree.size(s2); if (len1 === len2) { return eqAux(Belt_internalAVLtree.stackAllLeft(s1, /* [] */0), Belt_internalAVLtree.stackAllLeft(s2, /* [] */0), eq); } else { @@ -293,16 +293,16 @@ function addMutate(t, x, data) { if (t === undefined) { return Belt_internalAVLtree.singleton(x, data); } - var k = t.k; + let k = t.k; if (x === k) { t.k = x; t.v = data; return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (x < k) { - var ll = addMutate(l, x, data); + let ll = addMutate(l, x, data); t.l = ll; } else { t.r = addMutate(r, x, data); @@ -311,32 +311,32 @@ function addMutate(t, x, data) { } function fromArray(xs) { - var len = xs.length; + let len = xs.length; if (len === 0) { return; } - var next = Belt_SortArray.strictlySortedLengthU(xs, (function (param, param$1) { + let next = Belt_SortArray.strictlySortedLengthU(xs, (function (param, param$1) { return param[0] < param$1[0]; })); - var result; + let result; if (next >= 0) { result = Belt_internalAVLtree.fromSortedArrayAux(xs, 0, next); } else { next = -next | 0; result = Belt_internalAVLtree.fromSortedArrayRevAux(xs, next - 1 | 0, next); } - for(var i = next; i < len; ++i){ - var match = xs[i]; + for(let i = next; i < len; ++i){ + let match = xs[i]; result = addMutate(result, match[0], match[1]); } return result; } -var N; +let N; -var A; +let A; -var S; +let S; export { N, diff --git a/lib/es6/belt_internalMapString.js b/lib/es6/belt_internalMapString.js index 52bdf6be10..54c470c695 100644 --- a/lib/es6/belt_internalMapString.js +++ b/lib/es6/belt_internalMapString.js @@ -10,11 +10,11 @@ function add(t, x, data) { if (t === undefined) { return Belt_internalAVLtree.singleton(x, data); } - var k = t.k; + let k = t.k; if (x === k) { return Belt_internalAVLtree.updateValue(t, data); } - var v = t.v; + let v = t.v; if (x < k) { return Belt_internalAVLtree.bal(add(t.l, x, data), k, v, t.r); } else { @@ -24,11 +24,11 @@ function add(t, x, data) { function get(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return; } - var v = n.k; + let v = n.k; if (x === v) { return Caml_option.some(n.v); } @@ -39,11 +39,11 @@ function get(_n, x) { function getUndefined(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return; } - var v = n.k; + let v = n.k; if (x === v) { return n.v; } @@ -54,9 +54,9 @@ function getUndefined(_n, x) { function getExn(_n, x) { while(true) { - var n = _n; + let n = _n; if (n !== undefined) { - var v = n.k; + let v = n.k; if (x === v) { return n.v; } @@ -72,11 +72,11 @@ function getExn(_n, x) { function getWithDefault(_n, x, def) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return def; } - var v = n.k; + let v = n.k; if (x === v) { return n.v; } @@ -87,11 +87,11 @@ function getWithDefault(_n, x, def) { function has(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return false; } - var v = n.k; + let v = n.k; if (x === v) { return true; } @@ -104,9 +104,9 @@ function remove(n, x) { if (n === undefined) { return n; } - var v = n.k; - var l = n.l; - var r = n.r; + let v = n.k; + let l = n.l; + let r = n.r; if (x !== v) { if (x < v) { return Belt_internalAVLtree.bal(remove(l, x), v, n.v, r); @@ -120,21 +120,21 @@ function remove(n, x) { if (r === undefined) { return l; } - var kr = { + let kr = { contents: r.k }; - var vr = { + let vr = { contents: r.v }; - var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); + let r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1); } function splitAux(x, n) { - var v = n.k; - var d = n.v; - var l = n.l; - var r = n.r; + let v = n.k; + let d = n.v; + let l = n.l; + let r = n.r; if (x === v) { return [ l, @@ -150,7 +150,7 @@ function splitAux(x, n) { n ]; } - var match = splitAux(x, l); + let match = splitAux(x, l); return [ match[0], match[1], @@ -164,7 +164,7 @@ function splitAux(x, n) { undefined ]; } - var match$1 = splitAux(x, r); + let match$1 = splitAux(x, r); return [ Belt_internalAVLtree.join(l, v, d, match$1[0]), match$1[1], @@ -189,22 +189,22 @@ function mergeU(s1, s2, f) { if (s1.h >= ( s2 !== undefined ? s2.h : 0 )) { - var v1 = s1.k; - var d1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var match = split(v1, s2); + let v1 = s1.k; + let d1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let match = split(v1, s2); return Belt_internalAVLtree.concatOrJoin(mergeU(l1, match[0], f), v1, f(v1, Caml_option.some(d1), match[1]), mergeU(r1, match[2], f)); } } else if (s2 === undefined) { return; } - var v2 = s2.k; - var d2 = s2.v; - var l2 = s2.l; - var r2 = s2.r; - var match$1 = split(v2, s1); + let v2 = s2.k; + let d2 = s2.v; + let l2 = s2.l; + let r2 = s2.r; + let match$1 = split(v2, s1); return Belt_internalAVLtree.concatOrJoin(mergeU(match$1[0], l2, f), v2, f(v2, match$1[1], Caml_option.some(d2)), mergeU(match$1[2], r2, f)); } @@ -214,21 +214,21 @@ function merge(s1, s2, f) { function compareAux(_e1, _e2, vcmp) { while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (!e1) { return 0; } if (!e2) { return 0; } - var h2 = e2.hd; - var h1 = e1.hd; - var c = Caml.string_compare(h1.k, h2.k); + let h2 = e2.hd; + let h1 = e1.hd; + let c = Caml.string_compare(h1.k, h2.k); if (c !== 0) { return c; } - var cx = vcmp(h1.v, h2.v); + let cx = vcmp(h1.v, h2.v); if (cx !== 0) { return cx; } @@ -239,8 +239,8 @@ function compareAux(_e1, _e2, vcmp) { } function cmpU(s1, s2, cmp) { - var len1 = Belt_internalAVLtree.size(s1); - var len2 = Belt_internalAVLtree.size(s2); + let len1 = Belt_internalAVLtree.size(s1); + let len2 = Belt_internalAVLtree.size(s2); if (len1 === len2) { return compareAux(Belt_internalAVLtree.stackAllLeft(s1, /* [] */0), Belt_internalAVLtree.stackAllLeft(s2, /* [] */0), cmp); } else if (len1 < len2) { @@ -256,16 +256,16 @@ function cmp(s1, s2, f) { function eqAux(_e1, _e2, eq) { while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (!e1) { return true; } if (!e2) { return true; } - var h2 = e2.hd; - var h1 = e1.hd; + let h2 = e2.hd; + let h1 = e1.hd; if (!(h1.k === h2.k && eq(h1.v, h2.v))) { return false; } @@ -276,8 +276,8 @@ function eqAux(_e1, _e2, eq) { } function eqU(s1, s2, eq) { - var len1 = Belt_internalAVLtree.size(s1); - var len2 = Belt_internalAVLtree.size(s2); + let len1 = Belt_internalAVLtree.size(s1); + let len2 = Belt_internalAVLtree.size(s2); if (len1 === len2) { return eqAux(Belt_internalAVLtree.stackAllLeft(s1, /* [] */0), Belt_internalAVLtree.stackAllLeft(s2, /* [] */0), eq); } else { @@ -293,16 +293,16 @@ function addMutate(t, x, data) { if (t === undefined) { return Belt_internalAVLtree.singleton(x, data); } - var k = t.k; + let k = t.k; if (x === k) { t.k = x; t.v = data; return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (x < k) { - var ll = addMutate(l, x, data); + let ll = addMutate(l, x, data); t.l = ll; } else { t.r = addMutate(r, x, data); @@ -311,32 +311,32 @@ function addMutate(t, x, data) { } function fromArray(xs) { - var len = xs.length; + let len = xs.length; if (len === 0) { return; } - var next = Belt_SortArray.strictlySortedLengthU(xs, (function (param, param$1) { + let next = Belt_SortArray.strictlySortedLengthU(xs, (function (param, param$1) { return param[0] < param$1[0]; })); - var result; + let result; if (next >= 0) { result = Belt_internalAVLtree.fromSortedArrayAux(xs, 0, next); } else { next = -next | 0; result = Belt_internalAVLtree.fromSortedArrayRevAux(xs, next - 1 | 0, next); } - for(var i = next; i < len; ++i){ - var match = xs[i]; + for(let i = next; i < len; ++i){ + let match = xs[i]; result = addMutate(result, match[0], match[1]); } return result; } -var N; +let N; -var A; +let A; -var S; +let S; export { N, diff --git a/lib/es6/belt_internalSetBuckets.js b/lib/es6/belt_internalSetBuckets.js index b0078ca30a..69c207800f 100644 --- a/lib/es6/belt_internalSetBuckets.js +++ b/lib/es6/belt_internalSetBuckets.js @@ -5,12 +5,12 @@ import * as Belt_Array from "./belt_Array.js"; function copyAuxCont(_c, _prec) { while(true) { - var prec = _prec; - var c = _c; + let prec = _prec; + let c = _c; if (c === undefined) { return; } - var ncopy = { + let ncopy = { key: c.key, next: undefined }; @@ -25,7 +25,7 @@ function copyBucket(c) { if (c === undefined) { return c; } - var head = { + let head = { key: c.key, next: undefined }; @@ -34,9 +34,9 @@ function copyBucket(c) { } function copyBuckets(buckets) { - var len = buckets.length; - var newBuckets = new Array(len); - for(var i = 0; i < len; ++i){ + let len = buckets.length; + let newBuckets = new Array(len); + for(let i = 0; i < len; ++i){ newBuckets[i] = copyBucket(buckets[i]); } return newBuckets; @@ -53,8 +53,8 @@ function copy(x) { function bucketLength(_accu, _buckets) { while(true) { - var buckets = _buckets; - var accu = _accu; + let buckets = _buckets; + let accu = _accu; if (buckets === undefined) { return accu; } @@ -66,7 +66,7 @@ function bucketLength(_accu, _buckets) { function doBucketIter(f, _buckets) { while(true) { - var buckets = _buckets; + let buckets = _buckets; if (buckets === undefined) { return; } @@ -77,8 +77,8 @@ function doBucketIter(f, _buckets) { } function forEachU(h, f) { - var d = h.buckets; - for(var i = 0 ,i_finish = d.length; i < i_finish; ++i){ + let d = h.buckets; + for(let i = 0 ,i_finish = d.length; i < i_finish; ++i){ doBucketIter(f, d[i]); } } @@ -89,10 +89,10 @@ function forEach(h, f) { function fillArray(_i, arr, _cell) { while(true) { - var cell = _cell; - var i = _i; + let cell = _cell; + let i = _i; arr[i] = cell.key; - var v = cell.next; + let v = cell.next; if (v === undefined) { return i + 1 | 0; } @@ -103,11 +103,11 @@ function fillArray(_i, arr, _cell) { } function toArray(h) { - var d = h.buckets; - var current = 0; - var arr = new Array(h.size); - for(var i = 0 ,i_finish = d.length; i < i_finish; ++i){ - var cell = d[i]; + let d = h.buckets; + let current = 0; + let arr = new Array(h.size); + for(let i = 0 ,i_finish = d.length; i < i_finish; ++i){ + let cell = d[i]; if (cell !== undefined) { current = fillArray(current, arr, cell); } @@ -118,8 +118,8 @@ function toArray(h) { function doBucketFold(f, _b, _accu) { while(true) { - var accu = _accu; - var b = _b; + let accu = _accu; + let b = _b; if (b === undefined) { return accu; } @@ -130,9 +130,9 @@ function doBucketFold(f, _b, _accu) { } function reduceU(h, init, f) { - var d = h.buckets; - var accu = init; - for(var i = 0 ,i_finish = d.length; i < i_finish; ++i){ + let d = h.buckets; + let accu = init; + for(let i = 0 ,i_finish = d.length; i < i_finish; ++i){ accu = doBucketFold(f, d[i], accu); } return accu; @@ -144,7 +144,7 @@ function reduce(h, init, f) { function getMaxBucketLength(h) { return Belt_Array.reduceU(h.buckets, 0, (function (m, b) { - var len = bucketLength(0, b); + let len = bucketLength(0, b); if (m > len) { return m; } else { @@ -154,19 +154,19 @@ function getMaxBucketLength(h) { } function getBucketHistogram(h) { - var mbl = getMaxBucketLength(h); - var histo = Belt_Array.makeByU(mbl + 1 | 0, (function (param) { + let mbl = getMaxBucketLength(h); + let histo = Belt_Array.makeByU(mbl + 1 | 0, (function (param) { return 0; })); Belt_Array.forEachU(h.buckets, (function (b) { - var l = bucketLength(0, b); + let l = bucketLength(0, b); histo[l] = histo[l] + 1 | 0; })); return histo; } function logStats(h) { - var histogram = getBucketHistogram(h); + let histogram = getBucketHistogram(h); console.log({ bindings: h.size, buckets: h.buckets.length, @@ -174,7 +174,7 @@ function logStats(h) { }); } -var C; +let C; export { C, diff --git a/lib/es6/belt_internalSetInt.js b/lib/es6/belt_internalSetInt.js index afe7a7f67a..96aaf1f1f4 100644 --- a/lib/es6/belt_internalSetInt.js +++ b/lib/es6/belt_internalSetInt.js @@ -5,11 +5,11 @@ import * as Belt_internalAVLset from "./belt_internalAVLset.js"; function has(_t, x) { while(true) { - var t = _t; + let t = _t; if (t === undefined) { return false; } - var v = t.v; + let v = t.v; if (x === v) { return true; } @@ -20,18 +20,18 @@ function has(_t, x) { function compareAux(_e1, _e2) { while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (!e1) { return 0; } if (!e2) { return 0; } - var h2 = e2.hd; - var h1 = e1.hd; - var k1 = h1.v; - var k2 = h2.v; + let h2 = e2.hd; + let h1 = e1.hd; + let k1 = h1.v; + let k2 = h2.v; if (k1 !== k2) { if (k1 < k2) { return -1; @@ -46,8 +46,8 @@ function compareAux(_e1, _e2) { } function cmp(s1, s2) { - var len1 = Belt_internalAVLset.size(s1); - var len2 = Belt_internalAVLset.size(s2); + let len1 = Belt_internalAVLset.size(s1); + let len2 = Belt_internalAVLset.size(s2); if (len1 === len2) { return compareAux(Belt_internalAVLset.stackAllLeft(s1, /* [] */0), Belt_internalAVLset.stackAllLeft(s2, /* [] */0)); } else if (len1 < len2) { @@ -63,20 +63,20 @@ function eq(s1, s2) { function subset(_s1, _s2) { while(true) { - var s2 = _s2; - var s1 = _s1; + let s2 = _s2; + let s1 = _s1; if (s1 === undefined) { return true; } if (s2 === undefined) { return false; } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var v2 = s2.v; - var l2 = s2.l; - var r2 = s2.r; + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let v2 = s2.v; + let l2 = s2.l; + let r2 = s2.r; if (v1 === v2) { if (!subset(l1, l2)) { return false; @@ -102,11 +102,11 @@ function subset(_s1, _s2) { function get(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return; } - var v = n.v; + let v = n.v; if (x === v) { return v; } @@ -117,11 +117,11 @@ function get(_n, x) { function getUndefined(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return; } - var v = n.v; + let v = n.v; if (x === v) { return v; } @@ -132,9 +132,9 @@ function getUndefined(_n, x) { function getExn(_n, x) { while(true) { - var n = _n; + let n = _n; if (n !== undefined) { - var v = n.v; + let v = n.v; if (x === v) { return v; } @@ -152,12 +152,12 @@ function addMutate(t, x) { if (t === undefined) { return Belt_internalAVLset.singleton(x); } - var k = t.v; + let k = t.v; if (x === k) { return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (x < k) { t.l = addMutate(l, x); } else { @@ -167,29 +167,29 @@ function addMutate(t, x) { } function fromArray(xs) { - var len = xs.length; + let len = xs.length; if (len === 0) { return; } - var next = Belt_SortArrayInt.strictlySortedLength(xs); - var result; + let next = Belt_SortArrayInt.strictlySortedLength(xs); + let result; if (next >= 0) { result = Belt_internalAVLset.fromSortedArrayAux(xs, 0, next); } else { next = -next | 0; result = Belt_internalAVLset.fromSortedArrayRevAux(xs, next - 1 | 0, next); } - for(var i = next; i < len; ++i){ + for(let i = next; i < len; ++i){ result = addMutate(result, xs[i]); } return result; } -var S; +let S; -var N; +let N; -var A; +let A; export { S, diff --git a/lib/es6/belt_internalSetString.js b/lib/es6/belt_internalSetString.js index 2e8645ab93..3593e98149 100644 --- a/lib/es6/belt_internalSetString.js +++ b/lib/es6/belt_internalSetString.js @@ -5,11 +5,11 @@ import * as Belt_SortArrayString from "./belt_SortArrayString.js"; function has(_t, x) { while(true) { - var t = _t; + let t = _t; if (t === undefined) { return false; } - var v = t.v; + let v = t.v; if (x === v) { return true; } @@ -20,18 +20,18 @@ function has(_t, x) { function compareAux(_e1, _e2) { while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (!e1) { return 0; } if (!e2) { return 0; } - var h2 = e2.hd; - var h1 = e1.hd; - var k1 = h1.v; - var k2 = h2.v; + let h2 = e2.hd; + let h1 = e1.hd; + let k1 = h1.v; + let k2 = h2.v; if (k1 !== k2) { if (k1 < k2) { return -1; @@ -46,8 +46,8 @@ function compareAux(_e1, _e2) { } function cmp(s1, s2) { - var len1 = Belt_internalAVLset.size(s1); - var len2 = Belt_internalAVLset.size(s2); + let len1 = Belt_internalAVLset.size(s1); + let len2 = Belt_internalAVLset.size(s2); if (len1 === len2) { return compareAux(Belt_internalAVLset.stackAllLeft(s1, /* [] */0), Belt_internalAVLset.stackAllLeft(s2, /* [] */0)); } else if (len1 < len2) { @@ -63,20 +63,20 @@ function eq(s1, s2) { function subset(_s1, _s2) { while(true) { - var s2 = _s2; - var s1 = _s1; + let s2 = _s2; + let s1 = _s1; if (s1 === undefined) { return true; } if (s2 === undefined) { return false; } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var v2 = s2.v; - var l2 = s2.l; - var r2 = s2.r; + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let v2 = s2.v; + let l2 = s2.l; + let r2 = s2.r; if (v1 === v2) { if (!subset(l1, l2)) { return false; @@ -102,11 +102,11 @@ function subset(_s1, _s2) { function get(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return; } - var v = n.v; + let v = n.v; if (x === v) { return v; } @@ -117,11 +117,11 @@ function get(_n, x) { function getUndefined(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return; } - var v = n.v; + let v = n.v; if (x === v) { return v; } @@ -132,9 +132,9 @@ function getUndefined(_n, x) { function getExn(_n, x) { while(true) { - var n = _n; + let n = _n; if (n !== undefined) { - var v = n.v; + let v = n.v; if (x === v) { return v; } @@ -152,12 +152,12 @@ function addMutate(t, x) { if (t === undefined) { return Belt_internalAVLset.singleton(x); } - var k = t.v; + let k = t.v; if (x === k) { return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (x < k) { t.l = addMutate(l, x); } else { @@ -167,29 +167,29 @@ function addMutate(t, x) { } function fromArray(xs) { - var len = xs.length; + let len = xs.length; if (len === 0) { return; } - var next = Belt_SortArrayString.strictlySortedLength(xs); - var result; + let next = Belt_SortArrayString.strictlySortedLength(xs); + let result; if (next >= 0) { result = Belt_internalAVLset.fromSortedArrayAux(xs, 0, next); } else { next = -next | 0; result = Belt_internalAVLset.fromSortedArrayRevAux(xs, next - 1 | 0, next); } - for(var i = next; i < len; ++i){ + for(let i = next; i < len; ++i){ result = addMutate(result, xs[i]); } return result; } -var S; +let S; -var N; +let N; -var A; +let A; export { S, diff --git a/lib/es6/buffer.js b/lib/es6/buffer.js index 3cbed4be2e..010a1f8113 100644 --- a/lib/es6/buffer.js +++ b/lib/es6/buffer.js @@ -7,8 +7,8 @@ import * as Caml_bytes from "./caml_bytes.js"; import * as Caml_string from "./caml_string.js"; function create(n) { - var n$1 = n < 1 ? 1 : n; - var s = Caml_bytes.create(n$1); + let n$1 = n < 1 ? 1 : n; + let s = Caml_bytes.create(n$1); return { buffer: s, position: 0, @@ -73,19 +73,19 @@ function reset(b) { } function resize(b, more) { - var len = b.length; - var new_len = len; + let len = b.length; + let new_len = len; while((b.position + more | 0) > new_len) { new_len = (new_len << 1); }; - var new_buffer = Caml_bytes.create(new_len); + let new_buffer = Caml_bytes.create(new_len); Bytes.blit(b.buffer, 0, new_buffer, 0, b.position); b.buffer = new_buffer; b.length = new_len; } function add_char(b, c) { - var pos = b.position; + let pos = b.position; if (pos >= b.length) { resize(b, 1); } @@ -94,7 +94,7 @@ function add_char(b, c) { } function add_utf_8_uchar(b, u) { - var u$1 = u; + let u$1 = u; if (u$1 < 0) { throw { RE_EXN_ID: "Assert_failure", @@ -110,7 +110,7 @@ function add_utf_8_uchar(b, u) { return add_char(b, u$1); } if (u$1 <= 2047) { - var pos = b.position; + let pos = b.position; if ((pos + 2 | 0) > b.length) { resize(b, 2); } @@ -120,7 +120,7 @@ function add_utf_8_uchar(b, u) { return; } if (u$1 <= 65535) { - var pos$1 = b.position; + let pos$1 = b.position; if ((pos$1 + 3 | 0) > b.length) { resize(b, 3); } @@ -131,7 +131,7 @@ function add_utf_8_uchar(b, u) { return; } if (u$1 <= 1114111) { - var pos$2 = b.position; + let pos$2 = b.position; if ((pos$2 + 4 | 0) > b.length) { resize(b, 4); } @@ -154,7 +154,7 @@ function add_utf_8_uchar(b, u) { } function add_utf_16be_uchar(b, u) { - var u$1 = u; + let u$1 = u; if (u$1 < 0) { throw { RE_EXN_ID: "Assert_failure", @@ -167,7 +167,7 @@ function add_utf_16be_uchar(b, u) { }; } if (u$1 <= 65535) { - var pos = b.position; + let pos = b.position; if ((pos + 2 | 0) > b.length) { resize(b, 2); } @@ -177,10 +177,10 @@ function add_utf_16be_uchar(b, u) { return; } if (u$1 <= 1114111) { - var u$p = u$1 - 65536 | 0; - var hi = 55296 | (u$p >>> 10); - var lo = 56320 | u$p & 1023; - var pos$1 = b.position; + let u$p = u$1 - 65536 | 0; + let hi = 55296 | (u$p >>> 10); + let lo = 56320 | u$p & 1023; + let pos$1 = b.position; if ((pos$1 + 4 | 0) > b.length) { resize(b, 4); } @@ -203,7 +203,7 @@ function add_utf_16be_uchar(b, u) { } function add_utf_16le_uchar(b, u) { - var u$1 = u; + let u$1 = u; if (u$1 < 0) { throw { RE_EXN_ID: "Assert_failure", @@ -216,7 +216,7 @@ function add_utf_16le_uchar(b, u) { }; } if (u$1 <= 65535) { - var pos = b.position; + let pos = b.position; if ((pos + 2 | 0) > b.length) { resize(b, 2); } @@ -226,10 +226,10 @@ function add_utf_16le_uchar(b, u) { return; } if (u$1 <= 1114111) { - var u$p = u$1 - 65536 | 0; - var hi = 55296 | (u$p >>> 10); - var lo = 56320 | u$p & 1023; - var pos$1 = b.position; + let u$p = u$1 - 65536 | 0; + let hi = 55296 | (u$p >>> 10); + let lo = 56320 | u$p & 1023; + let pos$1 = b.position; if ((pos$1 + 4 | 0) > b.length) { resize(b, 4); } @@ -259,7 +259,7 @@ function add_substring(b, s, offset, len) { Error: new Error() }; } - var new_position = b.position + len | 0; + let new_position = b.position + len | 0; if (new_position > b.length) { resize(b, len); } @@ -272,8 +272,8 @@ function add_subbytes(b, s, offset, len) { } function add_string(b, s) { - var len = s.length; - var new_position = b.position + len | 0; + let len = s.length; + let new_position = b.position + len | 0; if (new_position > b.length) { resize(b, len); } @@ -308,12 +308,12 @@ function closing(param) { } function advance_to_closing(opening, closing, k, s, start) { - var _k = k; - var _i = start; - var lim = s.length; + let _k = k; + let _i = start; + let lim = s.length; while(true) { - var i = _i; - var k$1 = _k; + let i = _i; + let k$1 = _k; if (i >= lim) { throw { RE_EXN_ID: "Not_found", @@ -339,14 +339,14 @@ function advance_to_closing(opening, closing, k, s, start) { } function advance_to_non_alpha(s, start) { - var _i = start; - var lim = s.length; + let _i = start; + let lim = s.length; while(true) { - var i = _i; + let i = _i; if (i >= lim) { return lim; } - var match = Caml_string.get(s, i); + let match = Caml_string.get(s, i); if (match >= 91) { if (match >= 97) { if (match >= 123) { @@ -377,16 +377,16 @@ function find_ident(s, start, lim) { Error: new Error() }; } - var c = Caml_string.get(s, start); + let c = Caml_string.get(s, start); if (c !== 40 && c !== 123) { - var stop = advance_to_non_alpha(s, start + 1 | 0); + let stop = advance_to_non_alpha(s, start + 1 | 0); return [ $$String.sub(s, start, stop - start | 0), stop ]; } - var new_start = start + 1 | 0; - var stop$1 = advance_to_closing(c, closing(c), 0, s, new_start); + let new_start = start + 1 | 0; + let stop$1 = advance_to_closing(c, closing(c), 0, s, new_start); return [ $$String.sub(s, new_start, (stop$1 - start | 0) - 1 | 0), stop$1 + 1 | 0 @@ -394,12 +394,12 @@ function find_ident(s, start, lim) { } function add_substitute(b, f, s) { - var lim = s.length; - var _previous = /* ' ' */32; - var _i = 0; + let lim = s.length; + let _previous = /* ' ' */32; + let _i = 0; while(true) { - var i = _i; - var previous = _previous; + let i = _i; + let previous = _previous; if (i >= lim) { if (previous === /* '\\' */92) { return add_char(b, previous); @@ -407,7 +407,7 @@ function add_substitute(b, f, s) { return; } } - var current = Caml_string.get(s, i); + let current = Caml_string.get(s, i); if (current !== 36) { if (previous === /* '\\' */92) { add_char(b, /* '\\' */92); @@ -432,8 +432,8 @@ function add_substitute(b, f, s) { _previous = /* ' ' */32; continue ; } - var j = i + 1 | 0; - var match = find_ident(s, j, lim); + let j = i + 1 | 0; + let match = find_ident(s, j, lim); add_string(b, Curry._1(f, match[0])); _i = match[1]; _previous = /* ' ' */32; diff --git a/lib/es6/bytes.js b/lib/es6/bytes.js index b0717e118a..d30b0e1bd6 100644 --- a/lib/es6/bytes.js +++ b/lib/es6/bytes.js @@ -10,7 +10,7 @@ function unsafe_fill(s, i, l, c) { if (l <= 0) { return; } - for(var k = i ,k_finish = l + i | 0; k < k_finish; ++k){ + for(let k = i ,k_finish = l + i | 0; k < k_finish; ++k){ s[k] = c; } } @@ -21,10 +21,10 @@ function unsafe_blit(s1, i1, s2, i2, len) { } if (s1 === s2) { if (i1 < i2) { - var range_a = (s1.length - i2 | 0) - 1 | 0; - var range_b = len - 1 | 0; - var range = range_a > range_b ? range_b : range_a; - for(var j = range; j >= 0; --j){ + let range_a = (s1.length - i2 | 0) - 1 | 0; + let range_b = len - 1 | 0; + let range = range_a > range_b ? range_b : range_a; + for(let j = range; j >= 0; --j){ s1[i2 + j | 0] = s1[i1 + j | 0]; } return; @@ -32,65 +32,65 @@ function unsafe_blit(s1, i1, s2, i2, len) { if (i1 <= i2) { return; } - var range_a$1 = (s1.length - i1 | 0) - 1 | 0; - var range_b$1 = len - 1 | 0; - var range$1 = range_a$1 > range_b$1 ? range_b$1 : range_a$1; - for(var k = 0; k <= range$1; ++k){ + let range_a$1 = (s1.length - i1 | 0) - 1 | 0; + let range_b$1 = len - 1 | 0; + let range$1 = range_a$1 > range_b$1 ? range_b$1 : range_a$1; + for(let k = 0; k <= range$1; ++k){ s1[i2 + k | 0] = s1[i1 + k | 0]; } return; } - var off1 = s1.length - i1 | 0; + let off1 = s1.length - i1 | 0; if (len <= off1) { - for(var i = 0; i < len; ++i){ + for(let i = 0; i < len; ++i){ s2[i2 + i | 0] = s1[i1 + i | 0]; } return; } - for(var i$1 = 0; i$1 < off1; ++i$1){ + for(let i$1 = 0; i$1 < off1; ++i$1){ s2[i2 + i$1 | 0] = s1[i1 + i$1 | 0]; } - for(var i$2 = off1; i$2 < len; ++i$2){ + for(let i$2 = off1; i$2 < len; ++i$2){ s2[i2 + i$2 | 0] = /* '\000' */0; } } function make(n, c) { - var s = Caml_bytes.create(n); + let s = Caml_bytes.create(n); unsafe_fill(s, 0, n, c); return s; } function init(n, f) { - var s = Caml_bytes.create(n); - for(var i = 0; i < n; ++i){ + let s = Caml_bytes.create(n); + for(let i = 0; i < n; ++i){ s[i] = Curry._1(f, i); } return s; } -var empty = []; +let empty = []; function copy(s) { - var len = s.length; - var r = Caml_bytes.create(len); + let len = s.length; + let r = Caml_bytes.create(len); unsafe_blit(s, 0, r, 0, len); return r; } function to_string(a) { - var i = 0; - var len = a.length; - var s = ""; - var s_len = len; + let i = 0; + let len = a.length; + let s = ""; + let s_len = len; if (i === 0 && len <= 4096 && len === a.length) { return String.fromCharCode.apply(null, a); } - var offset = 0; + let offset = 0; while(s_len > 0) { - var next = s_len < 1024 ? s_len : 1024; - var tmp_bytes = new Array(next); - for(var k = 0; k < next; ++k){ + let next = s_len < 1024 ? s_len : 1024; + let tmp_bytes = new Array(next); + for(let k = 0; k < next; ++k){ tmp_bytes[k] = a[k + offset | 0]; } s = s + String.fromCharCode.apply(null, tmp_bytes); @@ -101,9 +101,9 @@ function to_string(a) { } function of_string(s) { - var len = s.length; - var res = new Array(len); - for(var i = 0; i < len; ++i){ + let len = s.length; + let res = new Array(len); + for(let i = 0; i < len; ++i){ res[i] = s.codePointAt(i); } return res; @@ -117,7 +117,7 @@ function sub(s, ofs, len) { Error: new Error() }; } - var r = Caml_bytes.create(len); + let r = Caml_bytes.create(len); unsafe_blit(s, ofs, r, 0, len); return r; } @@ -127,10 +127,10 @@ function sub_string(b, ofs, len) { } function $plus$plus(a, b) { - var c = a + b | 0; - var match = a < 0; - var match$1 = b < 0; - var match$2 = c < 0; + let c = a + b | 0; + let match = a < 0; + let match$1 = b < 0; + let match$2 = c < 0; if (match) { if (!match$1) { return c; @@ -158,18 +158,18 @@ function $plus$plus(a, b) { } function extend(s, left, right) { - var len = $plus$plus($plus$plus(s.length, left), right); - var r = Caml_bytes.create(len); - var match = left < 0 ? [ + let len = $plus$plus($plus$plus(s.length, left), right); + let r = Caml_bytes.create(len); + let match = left < 0 ? [ -left | 0, 0 ] : [ 0, left ]; - var dstoff = match[1]; - var srcoff = match[0]; - var cpylen = Caml.int_min(s.length - srcoff | 0, len - dstoff | 0); + let dstoff = match[1]; + let srcoff = match[0]; + let cpylen = Caml.int_min(s.length - srcoff | 0, len - dstoff | 0); if (cpylen > 0) { unsafe_blit(s, srcoff, r, dstoff, cpylen); } @@ -209,29 +209,29 @@ function blit_string(s1, ofs1, s2, ofs2, len) { if (len <= 0) { return; } - var off1 = s1.length - ofs1 | 0; + let off1 = s1.length - ofs1 | 0; if (len <= off1) { - for(var i = 0; i < len; ++i){ + for(let i = 0; i < len; ++i){ s2[ofs2 + i | 0] = s1.codePointAt(ofs1 + i | 0); } return; } - for(var i$1 = 0; i$1 < off1; ++i$1){ + for(let i$1 = 0; i$1 < off1; ++i$1){ s2[ofs2 + i$1 | 0] = s1.codePointAt(ofs1 + i$1 | 0); } - for(var i$2 = off1; i$2 < len; ++i$2){ + for(let i$2 = off1; i$2 < len; ++i$2){ s2[ofs2 + i$2 | 0] = /* '\000' */0; } } function iter(f, a) { - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ Curry._1(f, a[i]); } } function iteri(f, a) { - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ Curry._2(f, i, a[i]); } } @@ -249,13 +249,13 @@ function ensure_ge(x, y) { function sum_lengths(_acc, seplen, _param) { while(true) { - var param = _param; - var acc = _acc; + let param = _param; + let acc = _acc; if (!param) { return acc; } - var tl = param.tl; - var hd = param.hd; + let tl = param.tl; + let hd = param.hd; if (!tl) { return hd.length + acc | 0; } @@ -269,18 +269,18 @@ function concat(sep, param) { if (!param) { return empty; } - var seplen = sep.length; - var dst = Caml_bytes.create(sum_lengths(0, seplen, param)); - var _pos = 0; - var _param = param; + let seplen = sep.length; + let dst = Caml_bytes.create(sum_lengths(0, seplen, param)); + let _pos = 0; + let _param = param; while(true) { - var param$1 = _param; - var pos = _pos; + let param$1 = _param; + let pos = _pos; if (!param$1) { return dst; } - var tl = param$1.tl; - var hd = param$1.hd; + let tl = param$1.tl; + let hd = param$1.hd; if (tl) { unsafe_blit(hd, 0, dst, pos, hd.length); unsafe_blit(sep, 0, dst, pos + hd.length | 0, seplen); @@ -294,9 +294,9 @@ function concat(sep, param) { } function cat(s1, s2) { - var l1 = s1.length; - var l2 = s2.length; - var r = Caml_bytes.create(l1 + l2 | 0); + let l1 = s1.length; + let l2 = s2.length; + let r = Caml_bytes.create(l1 + l2 | 0); unsafe_blit(s1, 0, r, 0, l1); unsafe_blit(s2, 0, r, l1, l2); return r; @@ -311,12 +311,12 @@ function is_space(param) { } function trim(s) { - var len = s.length; - var i = 0; + let len = s.length; + let i = 0; while(i < len && is_space(s[i])) { i = i + 1 | 0; }; - var j = len - 1 | 0; + let j = len - 1 | 0; while(j >= i && is_space(s[j])) { j = j - 1 | 0; }; @@ -328,9 +328,9 @@ function trim(s) { } function escaped(s) { - var n = 0; - for(var i = 0 ,i_finish = s.length; i < i_finish; ++i){ - var match = s[i]; + let n = 0; + for(let i = 0 ,i_finish = s.length; i < i_finish; ++i){ + let match = s[i]; n = n + ( match >= 32 ? ( match > 92 || match < 34 ? ( @@ -350,11 +350,11 @@ function escaped(s) { if (n === s.length) { return copy(s); } - var s$p = Caml_bytes.create(n); + let s$p = Caml_bytes.create(n); n = 0; - for(var i$1 = 0 ,i_finish$1 = s.length; i$1 < i_finish$1; ++i$1){ - var c = s[i$1]; - var exit = 0; + for(let i$1 = 0 ,i_finish$1 = s.length; i$1 < i_finish$1; ++i$1){ + let c = s[i$1]; + let exit = 0; if (c >= 35) { if (c !== 92) { if (c >= 127) { @@ -433,24 +433,24 @@ function escaped(s) { } function map(f, s) { - var l = s.length; + let l = s.length; if (l === 0) { return s; } - var r = Caml_bytes.create(l); - for(var i = 0; i < l; ++i){ + let r = Caml_bytes.create(l); + for(let i = 0; i < l; ++i){ r[i] = Curry._1(f, s[i]); } return r; } function mapi(f, s) { - var l = s.length; + let l = s.length; if (l === 0) { return s; } - var r = Caml_bytes.create(l); - for(var i = 0; i < l; ++i){ + let r = Caml_bytes.create(l); + for(let i = 0; i < l; ++i){ r[i] = Curry._2(f, i, s[i]); } return r; @@ -468,7 +468,7 @@ function apply1(f, s) { if (s.length === 0) { return s; } - var r = copy(s); + let r = copy(s); r[0] = Curry._1(f, s[0]); return r; } @@ -483,7 +483,7 @@ function uncapitalize_ascii(s) { function index_rec(s, lim, _i, c) { while(true) { - var i = _i; + let i = _i; if (i >= lim) { throw { RE_EXN_ID: "Not_found", @@ -504,7 +504,7 @@ function index(s, c) { function index_rec_opt(s, lim, _i, c) { while(true) { - var i = _i; + let i = _i; if (i >= lim) { return; } @@ -521,7 +521,7 @@ function index_opt(s, c) { } function index_from(s, i, c) { - var l = s.length; + let l = s.length; if (i < 0 || i > l) { throw { RE_EXN_ID: "Invalid_argument", @@ -533,7 +533,7 @@ function index_from(s, i, c) { } function index_from_opt(s, i, c) { - var l = s.length; + let l = s.length; if (i < 0 || i > l) { throw { RE_EXN_ID: "Invalid_argument", @@ -546,7 +546,7 @@ function index_from_opt(s, i, c) { function rindex_rec(s, _i, c) { while(true) { - var i = _i; + let i = _i; if (i < 0) { throw { RE_EXN_ID: "Not_found", @@ -578,7 +578,7 @@ function rindex_from(s, i, c) { function rindex_rec_opt(s, _i, c) { while(true) { - var i = _i; + let i = _i; if (i < 0) { return; } @@ -606,7 +606,7 @@ function rindex_from_opt(s, i, c) { } function contains_from(s, i, c) { - var l = s.length; + let l = s.length; if (i < 0 || i > l) { throw { RE_EXN_ID: "Invalid_argument", @@ -619,7 +619,7 @@ function contains_from(s, i, c) { return true; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { return false; } @@ -644,7 +644,7 @@ function rcontains_from(s, i, c) { return true; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { return false; } @@ -652,13 +652,13 @@ function rcontains_from(s, i, c) { } } -var compare = Caml_bytes.bytes_compare; +let compare = Caml_bytes.bytes_compare; -var equal = Caml_bytes.bytes_equal; +let equal = Caml_bytes.bytes_equal; -var unsafe_to_string = to_string; +let unsafe_to_string = to_string; -var unsafe_of_string = of_string; +let unsafe_of_string = of_string; export { make, diff --git a/lib/es6/bytesLabels.js b/lib/es6/bytesLabels.js index b0717e118a..d30b0e1bd6 100644 --- a/lib/es6/bytesLabels.js +++ b/lib/es6/bytesLabels.js @@ -10,7 +10,7 @@ function unsafe_fill(s, i, l, c) { if (l <= 0) { return; } - for(var k = i ,k_finish = l + i | 0; k < k_finish; ++k){ + for(let k = i ,k_finish = l + i | 0; k < k_finish; ++k){ s[k] = c; } } @@ -21,10 +21,10 @@ function unsafe_blit(s1, i1, s2, i2, len) { } if (s1 === s2) { if (i1 < i2) { - var range_a = (s1.length - i2 | 0) - 1 | 0; - var range_b = len - 1 | 0; - var range = range_a > range_b ? range_b : range_a; - for(var j = range; j >= 0; --j){ + let range_a = (s1.length - i2 | 0) - 1 | 0; + let range_b = len - 1 | 0; + let range = range_a > range_b ? range_b : range_a; + for(let j = range; j >= 0; --j){ s1[i2 + j | 0] = s1[i1 + j | 0]; } return; @@ -32,65 +32,65 @@ function unsafe_blit(s1, i1, s2, i2, len) { if (i1 <= i2) { return; } - var range_a$1 = (s1.length - i1 | 0) - 1 | 0; - var range_b$1 = len - 1 | 0; - var range$1 = range_a$1 > range_b$1 ? range_b$1 : range_a$1; - for(var k = 0; k <= range$1; ++k){ + let range_a$1 = (s1.length - i1 | 0) - 1 | 0; + let range_b$1 = len - 1 | 0; + let range$1 = range_a$1 > range_b$1 ? range_b$1 : range_a$1; + for(let k = 0; k <= range$1; ++k){ s1[i2 + k | 0] = s1[i1 + k | 0]; } return; } - var off1 = s1.length - i1 | 0; + let off1 = s1.length - i1 | 0; if (len <= off1) { - for(var i = 0; i < len; ++i){ + for(let i = 0; i < len; ++i){ s2[i2 + i | 0] = s1[i1 + i | 0]; } return; } - for(var i$1 = 0; i$1 < off1; ++i$1){ + for(let i$1 = 0; i$1 < off1; ++i$1){ s2[i2 + i$1 | 0] = s1[i1 + i$1 | 0]; } - for(var i$2 = off1; i$2 < len; ++i$2){ + for(let i$2 = off1; i$2 < len; ++i$2){ s2[i2 + i$2 | 0] = /* '\000' */0; } } function make(n, c) { - var s = Caml_bytes.create(n); + let s = Caml_bytes.create(n); unsafe_fill(s, 0, n, c); return s; } function init(n, f) { - var s = Caml_bytes.create(n); - for(var i = 0; i < n; ++i){ + let s = Caml_bytes.create(n); + for(let i = 0; i < n; ++i){ s[i] = Curry._1(f, i); } return s; } -var empty = []; +let empty = []; function copy(s) { - var len = s.length; - var r = Caml_bytes.create(len); + let len = s.length; + let r = Caml_bytes.create(len); unsafe_blit(s, 0, r, 0, len); return r; } function to_string(a) { - var i = 0; - var len = a.length; - var s = ""; - var s_len = len; + let i = 0; + let len = a.length; + let s = ""; + let s_len = len; if (i === 0 && len <= 4096 && len === a.length) { return String.fromCharCode.apply(null, a); } - var offset = 0; + let offset = 0; while(s_len > 0) { - var next = s_len < 1024 ? s_len : 1024; - var tmp_bytes = new Array(next); - for(var k = 0; k < next; ++k){ + let next = s_len < 1024 ? s_len : 1024; + let tmp_bytes = new Array(next); + for(let k = 0; k < next; ++k){ tmp_bytes[k] = a[k + offset | 0]; } s = s + String.fromCharCode.apply(null, tmp_bytes); @@ -101,9 +101,9 @@ function to_string(a) { } function of_string(s) { - var len = s.length; - var res = new Array(len); - for(var i = 0; i < len; ++i){ + let len = s.length; + let res = new Array(len); + for(let i = 0; i < len; ++i){ res[i] = s.codePointAt(i); } return res; @@ -117,7 +117,7 @@ function sub(s, ofs, len) { Error: new Error() }; } - var r = Caml_bytes.create(len); + let r = Caml_bytes.create(len); unsafe_blit(s, ofs, r, 0, len); return r; } @@ -127,10 +127,10 @@ function sub_string(b, ofs, len) { } function $plus$plus(a, b) { - var c = a + b | 0; - var match = a < 0; - var match$1 = b < 0; - var match$2 = c < 0; + let c = a + b | 0; + let match = a < 0; + let match$1 = b < 0; + let match$2 = c < 0; if (match) { if (!match$1) { return c; @@ -158,18 +158,18 @@ function $plus$plus(a, b) { } function extend(s, left, right) { - var len = $plus$plus($plus$plus(s.length, left), right); - var r = Caml_bytes.create(len); - var match = left < 0 ? [ + let len = $plus$plus($plus$plus(s.length, left), right); + let r = Caml_bytes.create(len); + let match = left < 0 ? [ -left | 0, 0 ] : [ 0, left ]; - var dstoff = match[1]; - var srcoff = match[0]; - var cpylen = Caml.int_min(s.length - srcoff | 0, len - dstoff | 0); + let dstoff = match[1]; + let srcoff = match[0]; + let cpylen = Caml.int_min(s.length - srcoff | 0, len - dstoff | 0); if (cpylen > 0) { unsafe_blit(s, srcoff, r, dstoff, cpylen); } @@ -209,29 +209,29 @@ function blit_string(s1, ofs1, s2, ofs2, len) { if (len <= 0) { return; } - var off1 = s1.length - ofs1 | 0; + let off1 = s1.length - ofs1 | 0; if (len <= off1) { - for(var i = 0; i < len; ++i){ + for(let i = 0; i < len; ++i){ s2[ofs2 + i | 0] = s1.codePointAt(ofs1 + i | 0); } return; } - for(var i$1 = 0; i$1 < off1; ++i$1){ + for(let i$1 = 0; i$1 < off1; ++i$1){ s2[ofs2 + i$1 | 0] = s1.codePointAt(ofs1 + i$1 | 0); } - for(var i$2 = off1; i$2 < len; ++i$2){ + for(let i$2 = off1; i$2 < len; ++i$2){ s2[ofs2 + i$2 | 0] = /* '\000' */0; } } function iter(f, a) { - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ Curry._1(f, a[i]); } } function iteri(f, a) { - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ Curry._2(f, i, a[i]); } } @@ -249,13 +249,13 @@ function ensure_ge(x, y) { function sum_lengths(_acc, seplen, _param) { while(true) { - var param = _param; - var acc = _acc; + let param = _param; + let acc = _acc; if (!param) { return acc; } - var tl = param.tl; - var hd = param.hd; + let tl = param.tl; + let hd = param.hd; if (!tl) { return hd.length + acc | 0; } @@ -269,18 +269,18 @@ function concat(sep, param) { if (!param) { return empty; } - var seplen = sep.length; - var dst = Caml_bytes.create(sum_lengths(0, seplen, param)); - var _pos = 0; - var _param = param; + let seplen = sep.length; + let dst = Caml_bytes.create(sum_lengths(0, seplen, param)); + let _pos = 0; + let _param = param; while(true) { - var param$1 = _param; - var pos = _pos; + let param$1 = _param; + let pos = _pos; if (!param$1) { return dst; } - var tl = param$1.tl; - var hd = param$1.hd; + let tl = param$1.tl; + let hd = param$1.hd; if (tl) { unsafe_blit(hd, 0, dst, pos, hd.length); unsafe_blit(sep, 0, dst, pos + hd.length | 0, seplen); @@ -294,9 +294,9 @@ function concat(sep, param) { } function cat(s1, s2) { - var l1 = s1.length; - var l2 = s2.length; - var r = Caml_bytes.create(l1 + l2 | 0); + let l1 = s1.length; + let l2 = s2.length; + let r = Caml_bytes.create(l1 + l2 | 0); unsafe_blit(s1, 0, r, 0, l1); unsafe_blit(s2, 0, r, l1, l2); return r; @@ -311,12 +311,12 @@ function is_space(param) { } function trim(s) { - var len = s.length; - var i = 0; + let len = s.length; + let i = 0; while(i < len && is_space(s[i])) { i = i + 1 | 0; }; - var j = len - 1 | 0; + let j = len - 1 | 0; while(j >= i && is_space(s[j])) { j = j - 1 | 0; }; @@ -328,9 +328,9 @@ function trim(s) { } function escaped(s) { - var n = 0; - for(var i = 0 ,i_finish = s.length; i < i_finish; ++i){ - var match = s[i]; + let n = 0; + for(let i = 0 ,i_finish = s.length; i < i_finish; ++i){ + let match = s[i]; n = n + ( match >= 32 ? ( match > 92 || match < 34 ? ( @@ -350,11 +350,11 @@ function escaped(s) { if (n === s.length) { return copy(s); } - var s$p = Caml_bytes.create(n); + let s$p = Caml_bytes.create(n); n = 0; - for(var i$1 = 0 ,i_finish$1 = s.length; i$1 < i_finish$1; ++i$1){ - var c = s[i$1]; - var exit = 0; + for(let i$1 = 0 ,i_finish$1 = s.length; i$1 < i_finish$1; ++i$1){ + let c = s[i$1]; + let exit = 0; if (c >= 35) { if (c !== 92) { if (c >= 127) { @@ -433,24 +433,24 @@ function escaped(s) { } function map(f, s) { - var l = s.length; + let l = s.length; if (l === 0) { return s; } - var r = Caml_bytes.create(l); - for(var i = 0; i < l; ++i){ + let r = Caml_bytes.create(l); + for(let i = 0; i < l; ++i){ r[i] = Curry._1(f, s[i]); } return r; } function mapi(f, s) { - var l = s.length; + let l = s.length; if (l === 0) { return s; } - var r = Caml_bytes.create(l); - for(var i = 0; i < l; ++i){ + let r = Caml_bytes.create(l); + for(let i = 0; i < l; ++i){ r[i] = Curry._2(f, i, s[i]); } return r; @@ -468,7 +468,7 @@ function apply1(f, s) { if (s.length === 0) { return s; } - var r = copy(s); + let r = copy(s); r[0] = Curry._1(f, s[0]); return r; } @@ -483,7 +483,7 @@ function uncapitalize_ascii(s) { function index_rec(s, lim, _i, c) { while(true) { - var i = _i; + let i = _i; if (i >= lim) { throw { RE_EXN_ID: "Not_found", @@ -504,7 +504,7 @@ function index(s, c) { function index_rec_opt(s, lim, _i, c) { while(true) { - var i = _i; + let i = _i; if (i >= lim) { return; } @@ -521,7 +521,7 @@ function index_opt(s, c) { } function index_from(s, i, c) { - var l = s.length; + let l = s.length; if (i < 0 || i > l) { throw { RE_EXN_ID: "Invalid_argument", @@ -533,7 +533,7 @@ function index_from(s, i, c) { } function index_from_opt(s, i, c) { - var l = s.length; + let l = s.length; if (i < 0 || i > l) { throw { RE_EXN_ID: "Invalid_argument", @@ -546,7 +546,7 @@ function index_from_opt(s, i, c) { function rindex_rec(s, _i, c) { while(true) { - var i = _i; + let i = _i; if (i < 0) { throw { RE_EXN_ID: "Not_found", @@ -578,7 +578,7 @@ function rindex_from(s, i, c) { function rindex_rec_opt(s, _i, c) { while(true) { - var i = _i; + let i = _i; if (i < 0) { return; } @@ -606,7 +606,7 @@ function rindex_from_opt(s, i, c) { } function contains_from(s, i, c) { - var l = s.length; + let l = s.length; if (i < 0 || i > l) { throw { RE_EXN_ID: "Invalid_argument", @@ -619,7 +619,7 @@ function contains_from(s, i, c) { return true; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { return false; } @@ -644,7 +644,7 @@ function rcontains_from(s, i, c) { return true; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { return false; } @@ -652,13 +652,13 @@ function rcontains_from(s, i, c) { } } -var compare = Caml_bytes.bytes_compare; +let compare = Caml_bytes.bytes_compare; -var equal = Caml_bytes.bytes_equal; +let equal = Caml_bytes.bytes_equal; -var unsafe_to_string = to_string; +let unsafe_to_string = to_string; -var unsafe_of_string = of_string; +let unsafe_of_string = of_string; export { make, diff --git a/lib/es6/caml.js b/lib/es6/caml.js index 2be02000a3..a85e2555f3 100644 --- a/lib/es6/caml.js +++ b/lib/es6/caml.js @@ -132,8 +132,8 @@ function i64_eq(x, y) { } function i64_ge(param, param$1) { - var other_hi = param$1[0]; - var hi = param[0]; + let other_hi = param$1[0]; + let hi = param[0]; if (hi > other_hi) { return true; } else if (hi < other_hi) { diff --git a/lib/es6/caml_array.js b/lib/es6/caml_array.js index 68cadf144a..57f5c774b8 100644 --- a/lib/es6/caml_array.js +++ b/lib/es6/caml_array.js @@ -2,9 +2,9 @@ function sub(x, offset, len) { - var result = new Array(len); - var j = 0; - var i = offset; + let result = new Array(len); + let j = 0; + let i = offset; while(j < len) { result[j] = x[i]; j = j + 1 | 0; @@ -15,8 +15,8 @@ function sub(x, offset, len) { function len(_acc, _l) { while(true) { - var l = _l; - var acc = _acc; + let l = _l; + let acc = _acc; if (!l) { return acc; } @@ -28,15 +28,15 @@ function len(_acc, _l) { function fill(arr, _i, _l) { while(true) { - var l = _l; - var i = _i; + let l = _l; + let i = _i; if (!l) { return; } - var x = l.hd; - var l$1 = x.length; - var k = i; - var j = 0; + let x = l.hd; + let l$1 = x.length; + let k = i; + let j = 0; while(j < l$1) { arr[k] = x[j]; k = k + 1 | 0; @@ -49,8 +49,8 @@ function fill(arr, _i, _l) { } function concat(l) { - var v = len(0, l); - var result = new Array(v); + let v = len(0, l); + let result = new Array(v); fill(result, 0, l); return result; } @@ -78,16 +78,16 @@ function get(xs, index) { } function make(len, init) { - var b = new Array(len); - for(var i = 0; i < len; ++i){ + let b = new Array(len); + for(let i = 0; i < len; ++i){ b[i] = init; } return b; } function make_float(len) { - var b = new Array(len); - for(var i = 0; i < len; ++i){ + let b = new Array(len); + for(let i = 0; i < len; ++i){ b[i] = 0; } return b; @@ -95,12 +95,12 @@ function make_float(len) { function blit(a1, i1, a2, i2, len) { if (i2 <= i1) { - for(var j = 0; j < len; ++j){ + for(let j = 0; j < len; ++j){ a2[j + i2 | 0] = a1[j + i1 | 0]; } return; } - for(var j$1 = len - 1 | 0; j$1 >= 0; --j$1){ + for(let j$1 = len - 1 | 0; j$1 >= 0; --j$1){ a2[j$1 + i2 | 0] = a1[j$1 + i1 | 0]; } } diff --git a/lib/es6/caml_bytes.js b/lib/es6/caml_bytes.js index 0e001148e2..ccfb1b2c2e 100644 --- a/lib/es6/caml_bytes.js +++ b/lib/es6/caml_bytes.js @@ -31,8 +31,8 @@ function create(len) { Error: new Error() }; } - var result = new Array(len); - for(var i = 0; i < len; ++i){ + let result = new Array(len); + for(let i = 0; i < len; ++i){ result[i] = /* '\000' */0; } return result; @@ -40,12 +40,12 @@ function create(len) { function bytes_compare_aux(s1, s2, _off, len, def) { while(true) { - var off = _off; + let off = _off; if (off >= len) { return def; } - var a = s1[off]; - var b = s2[off]; + let a = s1[off]; + let b = s2[off]; if (a > b) { return 1; } @@ -58,8 +58,8 @@ function bytes_compare_aux(s1, s2, _off, len, def) { } function bytes_compare(s1, s2) { - var len1 = s1.length; - var len2 = s2.length; + let len1 = s1.length; + let len2 = s2.length; if (len1 === len2) { return bytes_compare_aux(s1, s2, 0, len1, 0); } else if (len1 < len2) { @@ -70,17 +70,17 @@ function bytes_compare(s1, s2) { } function bytes_equal(s1, s2) { - var len1 = s1.length; - var len2 = s2.length; + let len1 = s1.length; + let len2 = s2.length; if (len1 === len2) { - var _off = 0; + let _off = 0; while(true) { - var off = _off; + let off = _off; if (off === len1) { return true; } - var a = s1[off]; - var b = s2[off]; + let a = s1[off]; + let b = s2[off]; if (a !== b) { return false; } diff --git a/lib/es6/caml_exceptions.js b/lib/es6/caml_exceptions.js index cb315299bd..63b488abac 100644 --- a/lib/es6/caml_exceptions.js +++ b/lib/es6/caml_exceptions.js @@ -1,13 +1,13 @@ -var idMap = new Map(); +let idMap = new Map(); function create(str) { - var v = idMap.get(str); - var id; + let v = idMap.get(str); + let id; if (v !== undefined) { - var id$1 = v + 1 | 0; + let id$1 = v + 1 | 0; idMap.set(str, id$1); id = id$1; } else { diff --git a/lib/es6/caml_external_polyfill.js b/lib/es6/caml_external_polyfill.js index 981b0a0ce7..dac65243f5 100644 --- a/lib/es6/caml_external_polyfill.js +++ b/lib/es6/caml_external_polyfill.js @@ -1,7 +1,7 @@ -var getGlobalThis = (function(){ +let getGlobalThis = (function(){ if (typeof globalThis !== 'undefined') return globalThis; if (typeof self !== 'undefined') return self; if (typeof window !== 'undefined') return window; @@ -10,7 +10,7 @@ var getGlobalThis = (function(){ throw new Error('Unable to locate global this'); }); -var resolve = (function(s){ +let resolve = (function(s){ var myGlobal = getGlobalThis(); if (myGlobal[s] === undefined){ throw new Error(s + " not polyfilled by ReScript yet\n") @@ -18,7 +18,7 @@ var resolve = (function(s){ return myGlobal[s] }); -var register = (function(s,fn){ +let register = (function(s,fn){ var myGlobal = getGlobalThis(); myGlobal[s] = fn return 0 diff --git a/lib/es6/caml_float.js b/lib/es6/caml_float.js index 301cfec2b9..4cd67eddf0 100644 --- a/lib/es6/caml_float.js +++ b/lib/es6/caml_float.js @@ -1,11 +1,11 @@ -var int_float_of_bits = (function(x){ +let int_float_of_bits = (function(x){ return new Float32Array(new Int32Array([x]).buffer)[0] }); -var int_bits_of_float = (function(x){ +let int_bits_of_float = (function(x){ return new Int32Array(new Float32Array([x]).buffer)[0] }); @@ -23,10 +23,10 @@ function modf_float(x) { ]; } } - var neg = 1 / x < 0; - var x$1 = Math.abs(x); - var i = Math.floor(x$1); - var f = x$1 - i; + let neg = 1 / x < 0; + let x$1 = Math.abs(x); + let i = Math.floor(x$1); + let f = x$1 - i; if (neg) { return [ - f, @@ -41,8 +41,8 @@ function modf_float(x) { } function ldexp_float(x, exp) { - var x$p = x; - var exp$p = exp; + let x$p = x; + let exp$p = exp; if (exp$p > 1023) { exp$p = exp$p - 1023; x$p = x$p * Math.pow(2, 1023); @@ -65,9 +65,9 @@ function frexp_float(x) { 0 ]; } - var neg = x < 0; - var x$p = Math.abs(x); - var exp = Math.floor(Math.LOG2E * Math.log(x$p)) + 1; + let neg = x < 0; + let x$p = Math.abs(x); + let exp = Math.floor(Math.LOG2E * Math.log(x$p)) + 1; x$p = x$p * Math.pow(2, - exp); if (x$p < 0.5) { x$p = x$p * 2; @@ -83,8 +83,8 @@ function frexp_float(x) { } function copysign_float(x, y) { - var x$1 = Math.abs(x); - var y$1 = y === 0 ? 1 / y : y; + let x$1 = Math.abs(x); + let y$1 = y === 0 ? 1 / y : y; if (y$1 < 0) { return - x$1; } else { @@ -93,8 +93,8 @@ function copysign_float(x, y) { } function expm1_float(x) { - var y = Math.exp(x); - var z = y - 1; + let y = Math.exp(x); + let z = y - 1; if (Math.abs(x) > 1) { return z; } else if (z === 0) { @@ -105,10 +105,10 @@ function expm1_float(x) { } function hypot_float(x, y) { - var x0 = Math.abs(x); - var y0 = Math.abs(y); - var a = x0 > y0 ? x0 : y0; - var b = ( + let x0 = Math.abs(x); + let y0 = Math.abs(y); + let a = x0 > y0 ? x0 : y0; + let b = ( x0 < y0 ? x0 : y0 ) / ( a !== 0 ? a : 1 diff --git a/lib/es6/caml_format.js b/lib/es6/caml_format.js index 14bb6bb2cf..e0022127e5 100644 --- a/lib/es6/caml_format.js +++ b/lib/es6/caml_format.js @@ -38,10 +38,10 @@ function int_of_string_base(param) { } function parse_sign_and_base(s) { - var sign = 1; - var base = "Dec"; - var i = 0; - var match = s.codePointAt(i); + let sign = 1; + let base = "Dec"; + let i = 0; + let match = s.codePointAt(i); switch (match) { case 43 : i = i + 1 | 0; @@ -54,7 +54,7 @@ function parse_sign_and_base(s) { } if (s.codePointAt(i) === /* '0' */48) { - var match$1 = s.codePointAt(i + 1 | 0); + let match$1 = s.codePointAt(i + 1 | 0); if (match$1 >= 89) { if (match$1 >= 111) { if (match$1 < 121) { @@ -126,13 +126,13 @@ function parse_sign_and_base(s) { } function int_of_string(s) { - var match = parse_sign_and_base(s); - var i = match[0]; - var base = int_of_string_base(match[2]); - var threshold = 4294967295; - var len = s.length; - var c = i < len ? s.codePointAt(i) : /* '\000' */0; - var d = parse_digit(c); + let match = parse_sign_and_base(s); + let i = match[0]; + let base = int_of_string_base(match[2]); + let threshold = 4294967295; + let len = s.length; + let c = i < len ? s.codePointAt(i) : /* '\000' */0; + let d = parse_digit(c); if (d < 0 || d >= base) { throw { RE_EXN_ID: "Failure", @@ -140,19 +140,19 @@ function int_of_string(s) { Error: new Error() }; } - var aux = function (_acc, _k) { + let aux = function (_acc, _k) { while(true) { - var k = _k; - var acc = _acc; + let k = _k; + let acc = _acc; if (k === len) { return acc; } - var a = s.codePointAt(k); + let a = s.codePointAt(k); if (a === /* '_' */95) { _k = k + 1 | 0; continue ; } - var v = parse_digit(a); + let v = parse_digit(a); if (v < 0 || v >= base) { throw { RE_EXN_ID: "Failure", @@ -160,7 +160,7 @@ function int_of_string(s) { Error: new Error() }; } - var acc$1 = base * acc + v; + let acc$1 = base * acc + v; if (acc$1 > threshold) { throw { RE_EXN_ID: "Failure", @@ -173,8 +173,8 @@ function int_of_string(s) { continue ; }; }; - var res = match[1] * aux(d, i + 1 | 0); - var or_res = res | 0; + let res = match[1] * aux(d, i + 1 | 0); + let or_res = res | 0; if (base === 10 && res !== or_res) { throw { RE_EXN_ID: "Failure", @@ -186,12 +186,12 @@ function int_of_string(s) { } function int64_of_string(s) { - var match = parse_sign_and_base(s); - var hbase = match[2]; - var i = match[0]; - var base = Caml_int64.of_int32(int_of_string_base(hbase)); - var sign = Caml_int64.of_int32(match[1]); - var threshold; + let match = parse_sign_and_base(s); + let hbase = match[2]; + let i = match[0]; + let base = Caml_int64.of_int32(int_of_string_base(hbase)); + let sign = Caml_int64.of_int32(match[1]); + let threshold; switch (hbase) { case "Oct" : threshold = [ @@ -216,9 +216,9 @@ function int64_of_string(s) { break; } - var len = s.length; - var c = i < len ? s.codePointAt(i) : /* '\000' */0; - var d = Caml_int64.of_int32(parse_digit(c)); + let len = s.length; + let c = i < len ? s.codePointAt(i) : /* '\000' */0; + let d = Caml_int64.of_int32(parse_digit(c)); if (Caml.i64_lt(d, Caml_int64.zero) || Caml.i64_ge(d, base)) { throw { RE_EXN_ID: "Failure", @@ -226,19 +226,19 @@ function int64_of_string(s) { Error: new Error() }; } - var aux = function (_acc, _k) { + let aux = function (_acc, _k) { while(true) { - var k = _k; - var acc = _acc; + let k = _k; + let acc = _acc; if (k === len) { return acc; } - var a = s.codePointAt(k); + let a = s.codePointAt(k); if (a === /* '_' */95) { _k = k + 1 | 0; continue ; } - var v = Caml_int64.of_int32(parse_digit(a)); + let v = Caml_int64.of_int32(parse_digit(a)); if (Caml.i64_lt(v, Caml_int64.zero) || Caml.i64_ge(v, base) || Caml.i64_gt(acc, threshold)) { throw { RE_EXN_ID: "Failure", @@ -246,14 +246,14 @@ function int64_of_string(s) { Error: new Error() }; } - var acc$1 = Caml_int64.add(Caml_int64.mul(base, acc), v); + let acc$1 = Caml_int64.add(Caml_int64.mul(base, acc), v); _k = k + 1 | 0; _acc = acc$1; continue ; }; }; - var res = Caml_int64.mul(sign, aux(d, i + 1 | 0)); - var or_res = Caml_int64.or_(res, Caml_int64.zero); + let res = Caml_int64.mul(sign, aux(d, i + 1 | 0)); + let or_res = Caml_int64.or_(res, Caml_int64.zero); if (Caml.i64_eq(base, [ 0, 10 @@ -288,7 +288,7 @@ function lowercase(c) { } function parse_format(fmt) { - var len = fmt.length; + let len = fmt.length; if (len > 31) { throw { RE_EXN_ID: "Invalid_argument", @@ -296,7 +296,7 @@ function parse_format(fmt) { Error: new Error() }; } - var f = { + let f = { justify: "+", signstyle: "-", filter: " ", @@ -309,14 +309,14 @@ function parse_format(fmt) { prec: -1, conv: "f" }; - var _i = 0; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i >= len) { return f; } - var c = fmt.codePointAt(i); - var exit = 0; + let c = fmt.codePointAt(i); + let exit = 0; if (c >= 69) { if (c >= 88) { if (c >= 121) { @@ -403,10 +403,10 @@ function parse_format(fmt) { continue ; case 46 : f.prec = 0; - var j = i + 1 | 0; + let j = i + 1 | 0; while((function(j){ return function () { - var w = fmt.codePointAt(j) - /* '0' */48 | 0; + let w = fmt.codePointAt(j) - /* '0' */48 | 0; return w >= 0 && w <= 9; } }(j))()) { @@ -444,10 +444,10 @@ function parse_format(fmt) { continue ; case 3 : f.width = 0; - var j$1 = i; + let j$1 = i; while((function(j$1){ return function () { - var w = fmt.codePointAt(j$1) - /* '0' */48 | 0; + let w = fmt.codePointAt(j$1) - /* '0' */48 | 0; return w >= 0 && w <= 9; } }(j$1))()) { @@ -472,16 +472,16 @@ function parse_format(fmt) { } function finish_formatting(config, rawbuffer) { - var justify = config.justify; - var signstyle = config.signstyle; - var filter = config.filter; - var alternate = config.alternate; - var base = config.base; - var signedconv = config.signedconv; - var width = config.width; - var uppercase = config.uppercase; - var sign = config.sign; - var len = rawbuffer.length; + let justify = config.justify; + let signstyle = config.signstyle; + let filter = config.filter; + let alternate = config.alternate; + let base = config.base; + let signedconv = config.signedconv; + let width = config.width; + let uppercase = config.uppercase; + let sign = config.sign; + let len = rawbuffer.length; if (signedconv && (sign < 0 || signstyle !== "-")) { len = len + 1 | 0; } @@ -493,9 +493,9 @@ function finish_formatting(config, rawbuffer) { } } - var buffer = ""; + let buffer = ""; if (justify === "+" && filter === " ") { - for(var _for = len; _for < width; ++_for){ + for(let _for = len; _for < width; ++_for){ buffer = buffer + filter; } } @@ -514,13 +514,13 @@ function finish_formatting(config, rawbuffer) { buffer = buffer + "0x"; } if (justify === "+" && filter === "0") { - for(var _for$1 = len; _for$1 < width; ++_for$1){ + for(let _for$1 = len; _for$1 < width; ++_for$1){ buffer = buffer + filter; } } buffer = uppercase ? buffer + rawbuffer.toUpperCase() : buffer + rawbuffer; if (justify === "-") { - for(var _for$2 = len; _for$2 < width; ++_for$2){ + for(let _for$2 = len; _for$2 < width; ++_for$2){ buffer = buffer + " "; } } @@ -531,14 +531,14 @@ function format_int(fmt, i) { if (fmt === "%d") { return String(i); } - var f = parse_format(fmt); - var i$1 = i < 0 ? ( + let f = parse_format(fmt); + let i$1 = i < 0 ? ( f.signedconv ? (f.sign = -1, (-i >>> 0)) : (i >>> 0) ) : i; - var s = i$1.toString(int_of_base(f.base)); + let s = i$1.toString(int_of_base(f.base)); if (f.prec >= 0) { f.filter = " "; - var n = f.prec - s.length | 0; + let n = f.prec - s.length | 0; if (n > 0) { s = "0".repeat(n) + s; } @@ -551,17 +551,17 @@ function dec_of_pos_int64(x) { if (!Caml.i64_lt(x, Caml_int64.zero)) { return Caml_int64.to_string(x); } - var wbase = [ + let wbase = [ 0, 10 ]; - var y = Caml_int64.discard_sign(x); - var match = Caml_int64.div_mod(y, wbase); - var match$1 = Caml_int64.div_mod(Caml_int64.add([ + let y = Caml_int64.discard_sign(x); + let match = Caml_int64.div_mod(y, wbase); + let match$1 = Caml_int64.div_mod(Caml_int64.add([ 0, 8 ], match[1]), wbase); - var quotient = Caml_int64.add(Caml_int64.add([ + let quotient = Caml_int64.add(Caml_int64.add([ 214748364, 3435973836 ], match[0]), match$1[0]); @@ -569,34 +569,34 @@ function dec_of_pos_int64(x) { } function oct_of_int64(x) { - var s = ""; - var wbase = [ + let s = ""; + let wbase = [ 0, 8 ]; - var cvtbl = "01234567"; + let cvtbl = "01234567"; if (Caml.i64_lt(x, Caml_int64.zero)) { - var y = Caml_int64.discard_sign(x); - var match = Caml_int64.div_mod(y, wbase); - var quotient = Caml_int64.add([ + let y = Caml_int64.discard_sign(x); + let match = Caml_int64.div_mod(y, wbase); + let quotient = Caml_int64.add([ 268435456, 0 ], match[0]); - var modulus = match[1]; + let modulus = match[1]; s = cvtbl[Caml_int64.to_int32(modulus)] + s; while(Caml.i64_neq(quotient, Caml_int64.zero)) { - var match$1 = Caml_int64.div_mod(quotient, wbase); + let match$1 = Caml_int64.div_mod(quotient, wbase); quotient = match$1[0]; modulus = match$1[1]; s = cvtbl[Caml_int64.to_int32(modulus)] + s; }; } else { - var match$2 = Caml_int64.div_mod(x, wbase); - var quotient$1 = match$2[0]; - var modulus$1 = match$2[1]; + let match$2 = Caml_int64.div_mod(x, wbase); + let quotient$1 = match$2[0]; + let modulus$1 = match$2[1]; s = cvtbl[Caml_int64.to_int32(modulus$1)] + s; while(Caml.i64_neq(quotient$1, Caml_int64.zero)) { - var match$3 = Caml_int64.div_mod(quotient$1, wbase); + let match$3 = Caml_int64.div_mod(quotient$1, wbase); quotient$1 = match$3[0]; modulus$1 = match$3[1]; s = cvtbl[Caml_int64.to_int32(modulus$1)] + s; @@ -609,10 +609,10 @@ function int64_format(fmt, x) { if (fmt === "%d") { return Caml_int64.to_string(x); } - var f = parse_format(fmt); - var x$1 = f.signedconv && Caml.i64_lt(x, Caml_int64.zero) ? (f.sign = -1, Caml_int64.neg(x)) : x; - var match = f.base; - var s; + let f = parse_format(fmt); + let x$1 = f.signedconv && Caml.i64_lt(x, Caml_int64.zero) ? (f.sign = -1, Caml_int64.neg(x)) : x; + let match = f.base; + let s; switch (match) { case "Oct" : s = oct_of_int64(x$1); @@ -625,10 +625,10 @@ function int64_format(fmt, x) { break; } - var fill_s; + let fill_s; if (f.prec >= 0) { f.filter = " "; - var n = f.prec - s.length | 0; + let n = f.prec - s.length | 0; fill_s = n > 0 ? "0".repeat(n) + s : s; } else { fill_s = s; @@ -637,19 +637,19 @@ function int64_format(fmt, x) { } function format_float(fmt, x) { - var f = parse_format(fmt); - var prec = f.prec < 0 ? 6 : f.prec; - var x$1 = x < 0 ? (f.sign = -1, - x) : x; - var s = ""; + let f = parse_format(fmt); + let prec = f.prec < 0 ? 6 : f.prec; + let x$1 = x < 0 ? (f.sign = -1, - x) : x; + let s = ""; if (isNaN(x$1)) { s = "nan"; f.filter = " "; } else if (isFinite(x$1)) { - var match = f.conv; + let match = f.conv; switch (match) { case "e" : s = x$1.toExponential(prec); - var i = s.length; + let i = s.length; if (s.codePointAt(i - 3 | 0) === /* 'e' */101) { s = s.slice(0, i - 1 | 0) + ("0" + s.slice(i - 1 | 0)); } @@ -658,12 +658,12 @@ function format_float(fmt, x) { s = x$1.toFixed(prec); break; case "g" : - var prec$1 = prec !== 0 ? prec : 1; + let prec$1 = prec !== 0 ? prec : 1; s = x$1.toExponential(prec$1 - 1 | 0); - var j = s.indexOf("e"); - var exp = Number(s.slice(j + 1 | 0)) | 0; + let j = s.indexOf("e"); + let exp = Number(s.slice(j + 1 | 0)) | 0; if (exp < -4 || x$1 >= 1e21 || x$1.toFixed().length > prec$1) { - var i$1 = j - 1 | 0; + let i$1 = j - 1 | 0; while(s.codePointAt(i$1) === /* '0' */48) { i$1 = i$1 - 1 | 0; }; @@ -671,13 +671,13 @@ function format_float(fmt, x) { i$1 = i$1 - 1 | 0; } s = s.slice(0, i$1 + 1 | 0) + s.slice(j); - var i$2 = s.length; + let i$2 = s.length; if (s.codePointAt(i$2 - 3 | 0) === /* 'e' */101) { s = s.slice(0, i$2 - 1 | 0) + ("0" + s.slice(i$2 - 1 | 0)); } } else { - var p = prec$1; + let p = prec$1; if (exp < 0) { p = p - (exp + 1 | 0) | 0; s = x$1.toFixed(p); @@ -690,7 +690,7 @@ function format_float(fmt, x) { }; } if (p !== 0) { - var k = s.length - 1 | 0; + let k = s.length - 1 | 0; while(s.codePointAt(k) === /* '0' */48) { k = k - 1 | 0; }; @@ -712,7 +712,7 @@ function format_float(fmt, x) { return finish_formatting(f, s); } -var hexstring_of_float = (function(x,prec,style){ +let hexstring_of_float = (function(x,prec,style){ if (!isFinite(x)) { if (isNaN(x)) return "nan"; return x > 0 ? "infinity":"-infinity"; @@ -758,7 +758,7 @@ var hexstring_of_float = (function(x,prec,style){ return (sign_str + '0x' + x_str + 'p' + exp_sign + exp.toString(10)); }); -var float_of_string = (function(s,exn){ +let float_of_string = (function(s,exn){ var res = +s; if ((s.length > 0) && (res === res)) diff --git a/lib/es6/caml_hash.js b/lib/es6/caml_hash.js index d6f3c1e4a7..41be4c6ac6 100644 --- a/lib/es6/caml_hash.js +++ b/lib/es6/caml_hash.js @@ -3,11 +3,11 @@ import * as Caml_hash_primitive from "./caml_hash_primitive.js"; function push_back(q, v) { - var cell = { + let cell = { content: v, next: undefined }; - var last = q.last; + let last = q.last; if (last !== undefined) { q.length = q.length + 1 | 0; last.next = cell; @@ -20,8 +20,8 @@ function push_back(q, v) { } function unsafe_pop(q) { - var cell = q.first; - var next = cell.next; + let cell = q.first; + let next = cell.next; if (next === undefined) { q.length = 0; q.first = undefined; @@ -34,9 +34,9 @@ function unsafe_pop(q) { } function hash(count, _limit, seed, obj) { - var s = seed; + let s = seed; if (typeof obj === "number") { - var u = obj | 0; + let u = obj | 0; s = Caml_hash_primitive.hash_mix_int(s, (u + u | 0) + 1 | 0); return Caml_hash_primitive.hash_final_mix(s); } @@ -44,40 +44,40 @@ function hash(count, _limit, seed, obj) { s = Caml_hash_primitive.hash_mix_string(s, obj); return Caml_hash_primitive.hash_final_mix(s); } - var queue = { + let queue = { length: 0, first: undefined, last: undefined }; - var num = count; + let num = count; push_back(queue, obj); num = num - 1 | 0; while(queue.length !== 0 && num > 0) { - var obj$1 = unsafe_pop(queue); + let obj$1 = unsafe_pop(queue); if (typeof obj$1 === "number") { - var u$1 = obj$1 | 0; + let u$1 = obj$1 | 0; s = Caml_hash_primitive.hash_mix_int(s, (u$1 + u$1 | 0) + 1 | 0); num = num - 1 | 0; } else if (typeof obj$1 === "string") { s = Caml_hash_primitive.hash_mix_string(s, obj$1); num = num - 1 | 0; } else if (typeof obj$1 !== "boolean" && typeof obj$1 !== "undefined" && typeof obj$1 !== "symbol" && typeof obj$1 !== "function") { - var size = obj$1.length | 0; + let size = obj$1.length | 0; if (size !== 0) { - var obj_tag = obj$1.TAG; - var tag = (size << 10) | obj_tag; + let obj_tag = obj$1.TAG; + let tag = (size << 10) | obj_tag; if (obj_tag === 248) { s = Caml_hash_primitive.hash_mix_int(s, obj$1[1]); } else { s = Caml_hash_primitive.hash_mix_int(s, tag); - var v = size - 1 | 0; - var block = v < num ? v : num; - for(var i = 0; i <= block; ++i){ + let v = size - 1 | 0; + let block = v < num ? v : num; + for(let i = 0; i <= block; ++i){ push_back(queue, obj$1[i]); } } } else { - var size$1 = (function(obj,cb){ + let size$1 = (function(obj,cb){ var size = 0 for(var k in obj){ cb(obj[k]) diff --git a/lib/es6/caml_hash_primitive.js b/lib/es6/caml_hash_primitive.js index 923fc36567..2407c206c0 100644 --- a/lib/es6/caml_hash_primitive.js +++ b/lib/es6/caml_hash_primitive.js @@ -6,17 +6,17 @@ function rotl32(x, n) { } function hash_mix_int(h, d) { - var d$1 = d; + let d$1 = d; d$1 = Math.imul(d$1, -862048943); d$1 = rotl32(d$1, 15); d$1 = Math.imul(d$1, 461845907); - var h$1 = h ^ d$1; + let h$1 = h ^ d$1; h$1 = rotl32(h$1, 13); return (h$1 + (h$1 << 2) | 0) - 430675100 | 0; } function hash_final_mix(h) { - var h$1 = h ^ (h >>> 16); + let h$1 = h ^ (h >>> 16); h$1 = Math.imul(h$1, -2048144789); h$1 = h$1 ^ (h$1 >>> 13); h$1 = Math.imul(h$1, -1028477387); @@ -24,17 +24,17 @@ function hash_final_mix(h) { } function hash_mix_string(h, s) { - var len = s.length; - var block = (len / 4 | 0) - 1 | 0; - var hash = h; - for(var i = 0; i <= block; ++i){ - var j = (i << 2); - var w = s.charCodeAt(j) | (s.charCodeAt(j + 1 | 0) << 8) | (s.charCodeAt(j + 2 | 0) << 16) | (s.charCodeAt(j + 3 | 0) << 24); + let len = s.length; + let block = (len / 4 | 0) - 1 | 0; + let hash = h; + for(let i = 0; i <= block; ++i){ + let j = (i << 2); + let w = s.charCodeAt(j) | (s.charCodeAt(j + 1 | 0) << 8) | (s.charCodeAt(j + 2 | 0) << 16) | (s.charCodeAt(j + 3 | 0) << 24); hash = hash_mix_int(hash, w); } - var modulo = len & 3; + let modulo = len & 3; if (modulo !== 0) { - var w$1 = modulo === 3 ? (s.charCodeAt(len - 1 | 0) << 16) | (s.charCodeAt(len - 2 | 0) << 8) | s.charCodeAt(len - 3 | 0) : ( + let w$1 = modulo === 3 ? (s.charCodeAt(len - 1 | 0) << 16) | (s.charCodeAt(len - 2 | 0) << 8) | s.charCodeAt(len - 3 | 0) : ( modulo === 2 ? (s.charCodeAt(len - 1 | 0) << 8) | s.charCodeAt(len - 2 | 0) : s.charCodeAt(len - 1 | 0) ); hash = hash_mix_int(hash, w$1); diff --git a/lib/es6/caml_int64.js b/lib/es6/caml_int64.js index 6d87e6bc30..091dfe1584 100644 --- a/lib/es6/caml_int64.js +++ b/lib/es6/caml_int64.js @@ -9,27 +9,27 @@ function mk(lo, hi) { ]; } -var min_int = [ +let min_int = [ -2147483648, 0 ]; -var max_int = [ +let max_int = [ 2147483647, 4294967295 ]; -var one = [ +let one = [ 0, 1 ]; -var zero = [ +let zero = [ 0, 0 ]; -var neg_one = [ +let neg_one = [ -1, 4294967295 ]; @@ -43,9 +43,9 @@ function non_neg_signed(x) { } function succ(param) { - var x_lo = param[1]; - var x_hi = param[0]; - var lo = x_lo + 1 | 0; + let x_lo = param[1]; + let x_hi = param[0]; + let lo = x_lo + 1 | 0; return [ x_hi + ( lo === 0 ? 1 : 0 @@ -55,7 +55,7 @@ function succ(param) { } function neg(param) { - var other_lo = (param[1] ^ -1) + 1 | 0; + let other_lo = (param[1] ^ -1) + 1 | 0; return [ (param[0] ^ -1) + ( other_lo === 0 ? 1 : 0 @@ -65,9 +65,9 @@ function neg(param) { } function add_aux(param, y_lo, y_hi) { - var x_lo = param[1]; - var lo = x_lo + y_lo | 0; - var overflow = neg_signed(x_lo) && (neg_signed(y_lo) || non_neg_signed(lo)) || neg_signed(y_lo) && non_neg_signed(lo) ? 1 : 0; + let x_lo = param[1]; + let lo = x_lo + y_lo | 0; + let overflow = neg_signed(x_lo) && (neg_signed(y_lo) || non_neg_signed(lo)) || neg_signed(y_lo) && non_neg_signed(lo) ? 1 : 0; return [ param[0] + y_hi + overflow | 0, (lo >>> 0) @@ -111,8 +111,8 @@ function equal_nullable(x, y) { } function sub_aux(x, lo, hi) { - var y_lo = ((lo ^ -1) + 1 >>> 0); - var y_hi = (hi ^ -1) + ( + let y_lo = ((lo ^ -1) + 1 >>> 0); + let y_hi = (hi ^ -1) + ( y_lo === 0 ? 1 : 0 ) | 0; return add_aux(x, y_lo, y_hi); @@ -126,7 +126,7 @@ function lsl_(x, numBits) { if (numBits === 0) { return x; } - var lo = x[1]; + let lo = x[1]; if (numBits >= 32) { return [ (lo << (numBits - 32 | 0)), @@ -144,8 +144,8 @@ function lsr_(x, numBits) { if (numBits === 0) { return x; } - var hi = x[0]; - var offset = numBits - 32 | 0; + let hi = x[0]; + let offset = numBits - 32 | 0; if (offset === 0) { return [ 0, @@ -168,7 +168,7 @@ function asr_(x, numBits) { if (numBits === 0) { return x; } - var hi = x[0]; + let hi = x[0]; if (numBits < 32) { return [ (hi >> numBits), @@ -192,13 +192,13 @@ function is_zero(x) { function mul(_this, _other) { while(true) { - var other = _other; - var $$this = _this; - var lo; - var this_hi = $$this[0]; - var exit = 0; - var exit$1 = 0; - var exit$2 = 0; + let other = _other; + let $$this = _this; + let lo; + let this_hi = $$this[0]; + let exit = 0; + let exit$1 = 0; + let exit$2 = 0; if (this_hi !== 0) { exit$2 = 4; } else { @@ -225,16 +225,16 @@ function mul(_this, _other) { } } if (exit === 2) { - var other_hi = other[0]; - var lo$1 = $$this[1]; - var exit$3 = 0; + let other_hi = other[0]; + let lo$1 = $$this[1]; + let exit$3 = 0; if (other_hi !== -2147483648 || other[1] !== 0) { exit$3 = 3; } else { lo = lo$1; } if (exit$3 === 3) { - var other_lo = other[1]; + let other_lo = other[1]; if (this_hi < 0) { if (other_hi >= 0) { return neg(mul(neg($$this), other)); @@ -246,18 +246,18 @@ function mul(_this, _other) { if (other_hi < 0) { return neg(mul($$this, neg(other))); } - var a48 = (this_hi >>> 16); - var a32 = this_hi & 65535; - var a16 = (lo$1 >>> 16); - var a00 = lo$1 & 65535; - var b48 = (other_hi >>> 16); - var b32 = other_hi & 65535; - var b16 = (other_lo >>> 16); - var b00 = other_lo & 65535; - var c48 = 0; - var c32 = 0; - var c16 = 0; - var c00 = a00 * b00; + let a48 = (this_hi >>> 16); + let a32 = this_hi & 65535; + let a16 = (lo$1 >>> 16); + let a00 = lo$1 & 65535; + let b48 = (other_hi >>> 16); + let b32 = other_hi & 65535; + let b16 = (other_lo >>> 16); + let b00 = other_lo & 65535; + let c48 = 0; + let c32 = 0; + let c16 = 0; + let c00 = a00 * b00; c16 = (c00 >>> 16) + a16 * b00; c32 = (c16 >>> 16); c16 = (c16 & 65535) + a00 * b16; @@ -322,8 +322,8 @@ function of_float(x) { if (x < 0) { return neg(of_float(- x)); } - var hi = x / 4294967296 | 0; - var lo = x % 4294967296 | 0; + let hi = x / 4294967296 | 0; + let lo = x % 4294967296 | 0; return [ hi, (lo >>> 0) @@ -331,8 +331,8 @@ function of_float(x) { } function isSafeInteger(param) { - var hi = param[0]; - var top11Bits = (hi >> 21); + let hi = param[0]; + let top11Bits = (hi >> 21); if (top11Bits === 0) { return true; } else if (top11Bits === -1) { @@ -353,33 +353,33 @@ function to_string(self) { return "-" + to_string(neg(self)); } } - var approx_div1 = of_float(Math.floor(to_float(self) / 10)); - var lo = approx_div1[1]; - var hi = approx_div1[0]; - var match = sub_aux(sub_aux(self, (lo << 3), (lo >>> 29) | (hi << 3)), (lo << 1), (lo >>> 31) | (hi << 1)); - var rem_lo = match[1]; - var rem_hi = match[0]; + let approx_div1 = of_float(Math.floor(to_float(self) / 10)); + let lo = approx_div1[1]; + let hi = approx_div1[0]; + let match = sub_aux(sub_aux(self, (lo << 3), (lo >>> 29) | (hi << 3)), (lo << 1), (lo >>> 31) | (hi << 1)); + let rem_lo = match[1]; + let rem_hi = match[0]; if (rem_lo === 0 && rem_hi === 0) { return to_string(approx_div1) + "0"; } if (rem_hi < 0) { - var rem_lo$1 = ((rem_lo ^ -1) + 1 >>> 0); - var delta = Math.ceil(rem_lo$1 / 10); - var remainder = 10 * delta - rem_lo$1; + let rem_lo$1 = ((rem_lo ^ -1) + 1 >>> 0); + let delta = Math.ceil(rem_lo$1 / 10); + let remainder = 10 * delta - rem_lo$1; return to_string(sub_aux(approx_div1, delta | 0, 0)) + String(remainder | 0); } - var delta$1 = Math.floor(rem_lo / 10); - var remainder$1 = rem_lo - 10 * delta$1; + let delta$1 = Math.floor(rem_lo / 10); + let remainder$1 = rem_lo - 10 * delta$1; return to_string(add_aux(approx_div1, delta$1 | 0, 0)) + String(remainder$1 | 0); } function div(_self, _other) { while(true) { - var other = _other; - var self = _self; - var self_hi = self[0]; - var exit = 0; - var exit$1 = 0; + let other = _other; + let self = _self; + let self_hi = self[0]; + let exit = 0; + let exit$1 = 0; if (other[0] !== 0 || other[1] !== 0) { exit$1 = 2; } else { @@ -407,9 +407,9 @@ function div(_self, _other) { if (Caml.i64_eq(other, min_int)) { return one; } - var half_this = asr_(self, 1); - var approx = lsl_(div(half_this, other), 1); - var exit$2 = 0; + let half_this = asr_(self, 1); + let approx = lsl_(div(half_this, other), 1); + let exit$2 = 0; if (approx[0] !== 0) { exit$2 = 3; } else { @@ -423,15 +423,15 @@ function div(_self, _other) { exit$2 = 3; } if (exit$2 === 3) { - var rem = sub(self, mul(other, approx)); + let rem = sub(self, mul(other, approx)); return add(approx, div(rem, other)); } } } if (exit === 1) { - var other_hi = other[0]; - var exit$3 = 0; + let other_hi = other[0]; + let exit$3 = 0; if (other_hi !== -2147483648) { exit$3 = 2; } else { @@ -452,15 +452,15 @@ function div(_self, _other) { if (other_hi < 0) { return neg(div(self, neg(other))); } - var res = zero; - var rem$1 = self; + let res = zero; + let rem$1 = self; while(Caml.i64_ge(rem$1, other)) { - var b = Math.floor(to_float(rem$1) / to_float(other)); - var approx$1 = 1 > b ? 1 : b; - var log2 = Math.ceil(Math.log(approx$1) / Math.LN2); - var delta = log2 <= 48 ? 1 : Math.pow(2, log2 - 48); - var approxRes = of_float(approx$1); - var approxRem = mul(approxRes, other); + let b = Math.floor(to_float(rem$1) / to_float(other)); + let approx$1 = 1 > b ? 1 : b; + let log2 = Math.ceil(Math.log(approx$1) / Math.LN2); + let delta = log2 <= 48 ? 1 : Math.pow(2, log2 - 48); + let approxRes = of_float(approx$1); + let approxRem = mul(approxRes, other); while(approxRem[0] < 0 || Caml.i64_gt(approxRem, rem$1)) { approx$1 = approx$1 - delta; approxRes = of_float(approx$1); @@ -485,7 +485,7 @@ function mod_(self, other) { } function div_mod(self, other) { - var quotient = div(self, other); + let quotient = div(self, other); return [ quotient, sub(self, mul(quotient, other)) @@ -493,16 +493,16 @@ function div_mod(self, other) { } function compare(self, other) { - var y = other[0]; - var x = self[0]; - var v = x < y ? -1 : ( + let y = other[0]; + let x = self[0]; + let v = x < y ? -1 : ( x === y ? 0 : 1 ); if (v !== 0) { return v; } - var y$1 = other[1]; - var x$1 = self[1]; + let y$1 = other[1]; + let x$1 = self[1]; if (x$1 < y$1) { return -1; } else if (x$1 === y$1) { @@ -524,9 +524,9 @@ function to_int32(x) { } function to_hex(x) { - var x_lo = x[1]; - var x_hi = x[0]; - var aux = function (v) { + let x_lo = x[1]; + let x_hi = x[0]; + let aux = function (v) { return (v >>> 0).toString(16); }; if (x_hi === 0 && x_lo === 0) { @@ -538,8 +538,8 @@ function to_hex(x) { if (x_hi === 0) { return aux(x_lo); } - var lo = aux(x_lo); - var pad = 8 - lo.length | 0; + let lo = aux(x_lo); + let pad = 8 - lo.length | 0; if (pad <= 0) { return aux(x_hi) + lo; } else { @@ -559,7 +559,7 @@ function float_of_bits(x) { } function bits_of_float(x) { - var match = (function(x){return new Int32Array(new Float64Array([x]).buffer)})(x); + let match = (function(x){return new Int32Array(new Float64Array([x]).buffer)})(x); return [ match[1], (match[0] >>> 0) diff --git a/lib/es6/caml_js_exceptions.js b/lib/es6/caml_js_exceptions.js index 27d32d1ab8..2c7c1e13a0 100644 --- a/lib/es6/caml_js_exceptions.js +++ b/lib/es6/caml_js_exceptions.js @@ -3,7 +3,7 @@ import * as Caml_option from "./caml_option.js"; import * as Caml_exceptions from "./caml_exceptions.js"; -var $$Error = "JsError"; +let $$Error = "JsError"; function internalToOCamlException(e) { if (Caml_exceptions.is_extension(e)) { diff --git a/lib/es6/caml_lexer.js b/lib/es6/caml_lexer.js index 8b13ace897..a1ad028fd3 100644 --- a/lib/es6/caml_lexer.js +++ b/lib/es6/caml_lexer.js @@ -31,7 +31,7 @@ function caml_lex_array(s) { } ; -var caml_lex_engine_aux = (function (tbl, start_state, lexbuf, exn){ +let caml_lex_engine_aux = (function (tbl, start_state, lexbuf, exn){ if (!Array.isArray(tbl.lex_default)) { tbl.lex_base = caml_lex_array(tbl.lex_base); @@ -101,7 +101,7 @@ var caml_lex_engine_aux = (function (tbl, start_state, lexbuf, exn){ } }); -var empty_token_lit = "lexing: empty token"; +let empty_token_lit = "lexing: empty token"; function lex_engine(tbls, i, buf) { return caml_lex_engine_aux(tbls, i, buf, { @@ -156,7 +156,7 @@ function caml_lex_run_tag(s, i, mem) { } ; -var caml_new_lex_engine_aux = (function (tbl, start_state, lexbuf, exn) { +let caml_new_lex_engine_aux = (function (tbl, start_state, lexbuf, exn) { if (!Array.isArray(tbl.lex_default)) { tbl.lex_base = caml_lex_array(tbl.lex_base); diff --git a/lib/es6/caml_md5.js b/lib/es6/caml_md5.js index e9935d2dd7..f25333fb91 100644 --- a/lib/es6/caml_md5.js +++ b/lib/es6/caml_md5.js @@ -2,7 +2,7 @@ function cmn(q, a, b, x, s, t) { - var a$1 = ((a + q | 0) + x | 0) + t | 0; + let a$1 = ((a + q | 0) + x | 0) + t | 0; return ((a$1 << s) | (a$1 >>> (32 - s | 0)) | 0) + b | 0; } @@ -23,10 +23,10 @@ function i(a, b, c, d, x, s, t) { } function cycle(x, k) { - var a = x[0]; - var b = x[1]; - var c = x[2]; - var d = x[3]; + let a = x[0]; + let b = x[1]; + let c = x[2]; + let d = x[3]; a = f(a, b, c, d, k[0], 7, -680876936); d = f(d, a, b, c, k[1], 12, -389564586); c = f(c, d, a, b, k[2], 17, 606105819); @@ -97,14 +97,14 @@ function cycle(x, k) { x[3] = d + x[3] | 0; } -var state = [ +let state = [ 1732584193, -271733879, -1732584194, 271733878 ]; -var md5blk = [ +let md5blk = [ 0, 0, 0, @@ -124,36 +124,36 @@ var md5blk = [ ]; function md5_string(s, start, len) { - var s$1 = s.slice(start, len); - var n = s$1.length; + let s$1 = s.slice(start, len); + let n = s$1.length; state[0] = 1732584193; state[1] = -271733879; state[2] = -1732584194; state[3] = 271733878; - for(var i = 0; i <= 15; ++i){ + for(let i = 0; i <= 15; ++i){ md5blk[i] = 0; } - var i_end = n / 64 | 0; - for(var i$1 = 1; i$1 <= i_end; ++i$1){ - for(var j = 0; j <= 15; ++j){ - var k = ((i$1 << 6) - 64 | 0) + (j << 2) | 0; + let i_end = n / 64 | 0; + for(let i$1 = 1; i$1 <= i_end; ++i$1){ + for(let j = 0; j <= 15; ++j){ + let k = ((i$1 << 6) - 64 | 0) + (j << 2) | 0; md5blk[j] = ((s$1.charCodeAt(k) + (s$1.charCodeAt(k + 1 | 0) << 8) | 0) + (s$1.charCodeAt(k + 2 | 0) << 16) | 0) + (s$1.charCodeAt(k + 3 | 0) << 24) | 0; } cycle(state, md5blk); } - var s_tail = s$1.slice((i_end << 6)); - for(var kk = 0; kk <= 15; ++kk){ + let s_tail = s$1.slice((i_end << 6)); + for(let kk = 0; kk <= 15; ++kk){ md5blk[kk] = 0; } - var i_end$1 = s_tail.length - 1 | 0; - for(var i$2 = 0; i$2 <= i_end$1; ++i$2){ + let i_end$1 = s_tail.length - 1 | 0; + for(let i$2 = 0; i$2 <= i_end$1; ++i$2){ md5blk[i$2 / 4 | 0] = md5blk[i$2 / 4 | 0] | (s_tail.charCodeAt(i$2) << (i$2 % 4 << 3)); } - var i$3 = i_end$1 + 1 | 0; + let i$3 = i_end$1 + 1 | 0; md5blk[i$3 / 4 | 0] = md5blk[i$3 / 4 | 0] | (128 << (i$3 % 4 << 3)); if (i$3 > 55) { cycle(state, md5blk); - for(var i$4 = 0; i$4 <= 15; ++i$4){ + for(let i$4 = 0; i$4 <= 15; ++i$4){ md5blk[i$4] = 0; } } diff --git a/lib/es6/caml_module.js b/lib/es6/caml_module.js index 6bea562ec0..36f6cf4ab9 100644 --- a/lib/es6/caml_module.js +++ b/lib/es6/caml_module.js @@ -3,14 +3,14 @@ import * as Caml_obj from "./caml_obj.js"; function init_mod(loc, shape) { - var undef_module = function (param) { + let undef_module = function (param) { throw { RE_EXN_ID: "Undefined_recursive_module", _1: loc, Error: new Error() }; }; - var loop = function (shape, struct_, idx) { + let loop = function (shape, struct_, idx) { if (typeof shape !== "object") { switch (shape) { case "Function" : @@ -29,12 +29,12 @@ function init_mod(loc, shape) { } } else { if (shape.TAG === "Module") { - var comps = shape._0; - var v = {}; + let comps = shape._0; + let v = {}; struct_[idx] = v; - var len = comps.length; - for(var i = 0; i < len; ++i){ - var match = comps[i]; + let len = comps.length; + for(let i = 0; i < len; ++i){ + let match = comps[i]; loop(match[0], v, match[1]); } return; @@ -43,14 +43,14 @@ function init_mod(loc, shape) { return; } }; - var res = {}; - var dummy_name = "dummy"; + let res = {}; + let dummy_name = "dummy"; loop(shape, res, dummy_name); return res[dummy_name]; } function update_mod(shape, o, n) { - var aux = function (shape, o, n, parent, i) { + let aux = function (shape, o, n, parent, i) { if (typeof shape !== "object") { switch (shape) { case "Function" : @@ -65,10 +65,10 @@ function update_mod(shape, o, n) { if (shape.TAG !== "Module") { return; } - var comps = shape._0; - for(var i$1 = 0 ,i_finish = comps.length; i$1 < i_finish; ++i$1){ - var match = comps[i$1]; - var name = match[1]; + let comps = shape._0; + for(let i$1 = 0 ,i_finish = comps.length; i$1 < i_finish; ++i$1){ + let match = comps[i$1]; + let name = match[1]; aux(match[0], o[name], n[name], o, name); } return; @@ -86,10 +86,10 @@ function update_mod(shape, o, n) { }; } if (shape.TAG === "Module") { - var comps = shape._0; - for(var i = 0 ,i_finish = comps.length; i < i_finish; ++i){ - var match = comps[i]; - var name = match[1]; + let comps = shape._0; + for(let i = 0 ,i_finish = comps.length; i < i_finish; ++i){ + let match = comps[i]; + let name = match[1]; aux(match[0], o[name], n[name], o, name); } return; diff --git a/lib/es6/caml_obj.js b/lib/es6/caml_obj.js index f50ed32ffb..cea7618aad 100644 --- a/lib/es6/caml_obj.js +++ b/lib/es6/caml_obj.js @@ -2,10 +2,10 @@ import * as Caml from "./caml.js"; -var for_in = (function(o,foo){ +let for_in = (function(o,foo){ for (var x in o) { foo(x) }}); -var obj_dup = (function(x){ +let obj_dup = (function(x){ if(Array.isArray(x)){ var len = x.length var v = new Array(len) @@ -20,7 +20,7 @@ var obj_dup = (function(x){ return Object.assign({},x) }); -var update_dummy = (function(x,y){ +let update_dummy = (function(x,y){ var k if(Array.isArray(y)){ for(k = 0; k < y.length ; ++k){ @@ -40,8 +40,8 @@ function compare(a, b) { if (a === b) { return 0; } - var a_type = typeof a; - var b_type = typeof b; + let a_type = typeof a; + let b_type = typeof b; switch (a_type) { case "bigint" : if (b_type === "bigint") { @@ -131,8 +131,8 @@ function compare(a, b) { return -1; } } - var tag_a = a.TAG; - var tag_b = b.TAG; + let tag_a = a.TAG; + let tag_b = b.TAG; if (tag_a === 248) { return Caml.int_compare(a[1], b[1]); } @@ -150,17 +150,17 @@ function compare(a, b) { return 1; } } - var len_a = a.length | 0; - var len_b = b.length | 0; + let len_a = a.length | 0; + let len_b = b.length | 0; if (len_a === len_b) { if (Array.isArray(a)) { - var _i = 0; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === len_a) { return 0; } - var res = compare(a[i], b[i]); + let res = compare(a[i], b[i]); if (res !== 0) { return res; } @@ -173,13 +173,13 @@ function compare(a, b) { return aux_obj_compare(a, b); } } else if (len_a < len_b) { - var _i$1 = 0; + let _i$1 = 0; while(true) { - var i$1 = _i$1; + let i$1 = _i$1; if (i$1 === len_a) { return -1; } - var res$1 = compare(a[i$1], b[i$1]); + let res$1 = compare(a[i$1], b[i$1]); if (res$1 !== 0) { return res$1; } @@ -187,13 +187,13 @@ function compare(a, b) { continue ; }; } else { - var _i$2 = 0; + let _i$2 = 0; while(true) { - var i$2 = _i$2; + let i$2 = _i$2; if (i$2 === len_b) { return 1; } - var res$2 = compare(a[i$2], b[i$2]); + let res$2 = compare(a[i$2], b[i$2]); if (res$2 !== 0) { return res$2; } @@ -205,19 +205,19 @@ function compare(a, b) { } function aux_obj_compare(a, b) { - var min_key_lhs = { + let min_key_lhs = { contents: undefined }; - var min_key_rhs = { + let min_key_rhs = { contents: undefined }; - var do_key = function (param, key) { - var min_key = param[2]; - var b = param[1]; + let do_key = function (param, key) { + let min_key = param[2]; + let b = param[1]; if (!(!Object.prototype.hasOwnProperty.call(b, key) || compare(param[0][key], b[key]) > 0)) { return; } - var mk = min_key.contents; + let mk = min_key.contents; if (mk !== undefined && key >= mk) { return; } else { @@ -225,26 +225,26 @@ function aux_obj_compare(a, b) { return; } }; - var partial_arg = [ + let partial_arg = [ a, b, min_key_rhs ]; - var do_key_a = function (param) { + let do_key_a = function (param) { return do_key(partial_arg, param); }; - var partial_arg$1 = [ + let partial_arg$1 = [ b, a, min_key_lhs ]; - var do_key_b = function (param) { + let do_key_b = function (param) { return do_key(partial_arg$1, param); }; for_in(a, do_key_a); for_in(b, do_key_b); - var match = min_key_lhs.contents; - var match$1 = min_key_rhs.contents; + let match = min_key_lhs.contents; + let match$1 = min_key_rhs.contents; if (match !== undefined) { if (match$1 !== undefined) { return Caml.string_compare(match, match$1); @@ -262,11 +262,11 @@ function equal(a, b) { if (a === b) { return true; } - var a_type = typeof a; + let a_type = typeof a; if (a_type === "string" || a_type === "number" || a_type === "bigint" || a_type === "boolean" || a_type === "undefined" || a === null) { return false; } - var b_type = typeof b; + let b_type = typeof b; if (a_type === "function" || b_type === "function") { throw { RE_EXN_ID: "Invalid_argument", @@ -277,8 +277,8 @@ function equal(a, b) { if (b_type === "number" || b_type === "bigint" || b_type === "undefined" || b === null) { return false; } - var tag_a = a.TAG; - var tag_b = b.TAG; + let tag_a = a.TAG; + let tag_b = b.TAG; if (tag_a === 248) { return a[1] === b[1]; } @@ -292,13 +292,13 @@ function equal(a, b) { if (tag_a !== tag_b) { return false; } - var len_a = a.length | 0; - var len_b = b.length | 0; + let len_a = a.length | 0; + let len_b = b.length | 0; if (len_a === len_b) { if (Array.isArray(a)) { - var _i = 0; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === len_a) { return true; } @@ -311,17 +311,17 @@ function equal(a, b) { } else if ((a instanceof Date && b instanceof Date)) { return !(a > b || a < b); } else { - var result = { + let result = { contents: true }; - var do_key_a = function (key) { + let do_key_a = function (key) { if (!Object.prototype.hasOwnProperty.call(b, key)) { result.contents = false; return; } }; - var do_key_b = function (key) { + let do_key_b = function (key) { if (!Object.prototype.hasOwnProperty.call(a, key) || !equal(b[key], a[key])) { result.contents = false; return; diff --git a/lib/es6/caml_option.js b/lib/es6/caml_option.js index b0e9e730a0..704efe581c 100644 --- a/lib/es6/caml_option.js +++ b/lib/es6/caml_option.js @@ -47,7 +47,7 @@ function valFromOption(x) { if (!(x !== null && x.BS_PRIVATE_NESTED_SOME_NONE !== undefined)) { return x; } - var depth = x.BS_PRIVATE_NESTED_SOME_NONE; + let depth = x.BS_PRIVATE_NESTED_SOME_NONE; if (depth === 0) { return; } else { diff --git a/lib/es6/caml_parser.js b/lib/es6/caml_parser.js index d94b4a29a5..cbd8dc7b8d 100644 --- a/lib/es6/caml_parser.js +++ b/lib/es6/caml_parser.js @@ -65,7 +65,7 @@ var Result = { var PARSER_TRACE = false; ; -var parse_engine = (function (tables /* parser_table */, env /* parser_env */, cmd /* parser_input*/, arg /* Obj.t*/) { +let parse_engine = (function (tables /* parser_table */, env /* parser_env */, cmd /* parser_input*/, arg /* Obj.t*/) { var ERRCODE = 256; //var START = 0; //var TOKEN_READ = 1; @@ -290,7 +290,7 @@ var parse_engine = (function (tables /* parser_table */, env /* parser_env */, c return res; }); -var set_parser_trace = (function (v) { +let set_parser_trace = (function (v) { var old = PARSER_TRACE; PARSER_TRACE = v; return old; diff --git a/lib/es6/caml_splice_call.js b/lib/es6/caml_splice_call.js index 58c8366e74..6de399047a 100644 --- a/lib/es6/caml_splice_call.js +++ b/lib/es6/caml_splice_call.js @@ -1,7 +1,7 @@ -var spliceApply = (function(fn,args){ +let spliceApply = (function(fn,args){ var i, argLen; argLen = args.length var applied = [] @@ -15,7 +15,7 @@ var spliceApply = (function(fn,args){ return fn.apply(null,applied) }); -var spliceNewApply = (function (ctor,args){ +let spliceNewApply = (function (ctor,args){ var i, argLen; argLen = args.length var applied = [null] // Function.prototype.bind.apply(fn, args) requires the first element in \`args\` to be \`null\` @@ -30,7 +30,7 @@ var spliceNewApply = (function (ctor,args){ return new C() }); -var spliceObjApply = (function(obj,name,args){ +let spliceObjApply = (function(obj,name,args){ var i, argLen; argLen = args.length var applied = [] diff --git a/lib/es6/caml_sys.js b/lib/es6/caml_sys.js index cc50a08032..e898165039 100644 --- a/lib/es6/caml_sys.js +++ b/lib/es6/caml_sys.js @@ -8,7 +8,7 @@ function sys_getenv(s) { Error: new Error() }; } - var x = process.env[s]; + let x = process.env[s]; if (x !== undefined) { return x; } @@ -18,7 +18,7 @@ function sys_getenv(s) { }; } -var os_type = (function(_){ +let os_type = (function(_){ if(typeof process !== 'undefined' && process.platform === 'win32'){ return "Win32" } @@ -35,7 +35,7 @@ function sys_time(param) { } } -var sys_getcwd = (function(param){ +let sys_getcwd = (function(param){ if (typeof process === "undefined" || process.cwd === undefined){ return "/" } @@ -49,7 +49,7 @@ function sys_get_argv(param) { [""] ]; } - var argv = process.argv; + let argv = process.argv; if (argv == null) { return [ "", diff --git a/lib/es6/camlinternalLazy.js b/lib/es6/camlinternalLazy.js index 3c7711e561..9772d9ca9d 100644 --- a/lib/es6/camlinternalLazy.js +++ b/lib/es6/camlinternalLazy.js @@ -6,10 +6,10 @@ function is_val(l) { return l.LAZY_DONE; } -var Undefined = /* @__PURE__ */Caml_exceptions.create("CamlinternalLazy.Undefined"); +let Undefined = /* @__PURE__ */Caml_exceptions.create("CamlinternalLazy.Undefined"); function forward_with_closure(blk, closure) { - var result = closure(); + let result = closure(); blk.VAL = result; blk.LAZY_DONE = true; return result; @@ -26,7 +26,7 @@ function force(lzv) { if (lzv.LAZY_DONE) { return lzv.VAL; } else { - var closure = lzv.VAL; + let closure = lzv.VAL; lzv.VAL = raise_undefined; try { return forward_with_closure(lzv, closure); @@ -44,7 +44,7 @@ function force_val(lzv) { if (lzv.LAZY_DONE) { return lzv.VAL; } else { - var closure = lzv.VAL; + let closure = lzv.VAL; lzv.VAL = raise_undefined; return forward_with_closure(lzv, closure); } diff --git a/lib/es6/char.js b/lib/es6/char.js index a110d60714..3851e7f014 100644 --- a/lib/es6/char.js +++ b/lib/es6/char.js @@ -14,7 +14,7 @@ function chr(n) { } function escaped(param) { - var exit = 0; + let exit = 0; if (param >= 40) { if (param === 92) { return "\\\\"; @@ -54,7 +54,7 @@ function escaped(param) { } switch (exit) { case 1 : - var s = [ + let s = [ 0, 0, 0, @@ -66,7 +66,7 @@ function escaped(param) { s[3] = 48 + param % 10 | 0; return Bytes.to_string(s); case 2 : - var s$1 = [0]; + let s$1 = [0]; s$1[0] = param; return Bytes.to_string(s$1); diff --git a/lib/es6/complex.js b/lib/es6/complex.js index 7f461dcb10..9285c41e45 100644 --- a/lib/es6/complex.js +++ b/lib/es6/complex.js @@ -1,7 +1,7 @@ -var one = { +let one = { re: 1.0, im: 0.0 }; @@ -43,15 +43,15 @@ function mul(x, y) { function div(x, y) { if (Math.abs(y.re) >= Math.abs(y.im)) { - var r = y.im / y.re; - var d = y.re + r * y.im; + let r = y.im / y.re; + let d = y.re + r * y.im; return { re: (x.re + r * x.im) / d, im: (x.im - r * x.re) / d }; } - var r$1 = y.re / y.im; - var d$1 = y.im + r$1 * y.re; + let r$1 = y.re / y.im; + let d$1 = y.im + r$1 * y.re; return { re: (r$1 * x.re + x.im) / d$1, im: (r$1 * x.im - x.re) / d$1 @@ -67,8 +67,8 @@ function norm2(x) { } function norm(x) { - var r = Math.abs(x.re); - var i = Math.abs(x.im); + let r = Math.abs(x.re); + let i = Math.abs(x.im); if (r === 0.0) { return i; } @@ -76,10 +76,10 @@ function norm(x) { return r; } if (r >= i) { - var q = i / r; + let q = i / r; return r * Math.sqrt(1.0 + q * q); } - var q$1 = r / i; + let q$1 = r / i; return i * Math.sqrt(1.0 + q$1 * q$1); } @@ -101,14 +101,14 @@ function sqrt(x) { im: 0.0 }; } - var r = Math.abs(x.re); - var i = Math.abs(x.im); - var w; + let r = Math.abs(x.re); + let i = Math.abs(x.im); + let w; if (r >= i) { - var q = i / r; + let q = i / r; w = Math.sqrt(r) * Math.sqrt(0.5 * (1.0 + Math.sqrt(1.0 + q * q))); } else { - var q$1 = r / i; + let q$1 = r / i; w = Math.sqrt(i) * Math.sqrt(0.5 * (q$1 + Math.sqrt(1.0 + q$1 * q$1))); } if (x.re >= 0.0) { @@ -125,7 +125,7 @@ function sqrt(x) { } function exp(x) { - var e = Math.exp(x.re); + let e = Math.exp(x.re); return { re: e * Math.cos(x.im), im: e * Math.sin(x.im) @@ -143,12 +143,12 @@ function pow(x, y) { return exp(mul(y, log(x))); } -var zero = { +let zero = { re: 0.0, im: 0.0 }; -var i = { +let i = { re: 0.0, im: 1.0 }; diff --git a/lib/es6/curry.js b/lib/es6/curry.js index f2bdc0bc61..c1ce91c791 100644 --- a/lib/es6/curry.js +++ b/lib/es6/curry.js @@ -4,12 +4,12 @@ import * as Caml_array from "./caml_array.js"; function app(_f, _args) { while(true) { - var args = _args; - var f = _f; - var init_arity = f.length; - var arity = init_arity === 0 ? 1 : init_arity; - var len = args.length; - var d = arity - len | 0; + let args = _args; + let f = _f; + let init_arity = f.length; + let arity = init_arity === 0 ? 1 : init_arity; + let len = args.length; + let d = arity - len | 0; if (d === 0) { return f.apply(null, args); } @@ -27,7 +27,7 @@ function app(_f, _args) { } function _1(o, a0) { - var arity = o.length; + let arity = o.length; if (arity === 1) { return o(a0); } else { @@ -65,7 +65,7 @@ function _1(o, a0) { } function __1(o) { - var arity = o.length; + let arity = o.length; if (arity === 1) { return o; } else { @@ -76,7 +76,7 @@ function __1(o) { } function _2(o, a0, a1) { - var arity = o.length; + let arity = o.length; if (arity === 2) { return o(a0, a1); } else { @@ -115,7 +115,7 @@ function _2(o, a0, a1) { } function __2(o) { - var arity = o.length; + let arity = o.length; if (arity === 2) { return o; } else { @@ -126,7 +126,7 @@ function __2(o) { } function _3(o, a0, a1, a2) { - var arity = o.length; + let arity = o.length; if (arity === 3) { return o(a0, a1, a2); } else { @@ -167,7 +167,7 @@ function _3(o, a0, a1, a2) { } function __3(o) { - var arity = o.length; + let arity = o.length; if (arity === 3) { return o; } else { @@ -178,7 +178,7 @@ function __3(o) { } function _4(o, a0, a1, a2, a3) { - var arity = o.length; + let arity = o.length; if (arity === 4) { return o(a0, a1, a2, a3); } else { @@ -222,7 +222,7 @@ function _4(o, a0, a1, a2, a3) { } function __4(o) { - var arity = o.length; + let arity = o.length; if (arity === 4) { return o; } else { @@ -233,7 +233,7 @@ function __4(o) { } function _5(o, a0, a1, a2, a3, a4) { - var arity = o.length; + let arity = o.length; if (arity === 5) { return o(a0, a1, a2, a3, a4); } else { @@ -281,7 +281,7 @@ function _5(o, a0, a1, a2, a3, a4) { } function __5(o) { - var arity = o.length; + let arity = o.length; if (arity === 5) { return o; } else { @@ -292,7 +292,7 @@ function __5(o) { } function _6(o, a0, a1, a2, a3, a4, a5) { - var arity = o.length; + let arity = o.length; if (arity === 6) { return o(a0, a1, a2, a3, a4, a5); } else { @@ -345,7 +345,7 @@ function _6(o, a0, a1, a2, a3, a4, a5) { } function __6(o) { - var arity = o.length; + let arity = o.length; if (arity === 6) { return o; } else { @@ -356,7 +356,7 @@ function __6(o) { } function _7(o, a0, a1, a2, a3, a4, a5, a6) { - var arity = o.length; + let arity = o.length; if (arity === 7) { return o(a0, a1, a2, a3, a4, a5, a6); } else { @@ -415,7 +415,7 @@ function _7(o, a0, a1, a2, a3, a4, a5, a6) { } function __7(o) { - var arity = o.length; + let arity = o.length; if (arity === 7) { return o; } else { @@ -426,7 +426,7 @@ function __7(o) { } function _8(o, a0, a1, a2, a3, a4, a5, a6, a7) { - var arity = o.length; + let arity = o.length; if (arity === 8) { return o(a0, a1, a2, a3, a4, a5, a6, a7); } else { @@ -494,7 +494,7 @@ function _8(o, a0, a1, a2, a3, a4, a5, a6, a7) { } function __8(o) { - var arity = o.length; + let arity = o.length; if (arity === 8) { return o; } else { diff --git a/lib/es6/digest.js b/lib/es6/digest.js index 5725fba214..ff4c201aec 100644 --- a/lib/es6/digest.js +++ b/lib/es6/digest.js @@ -44,9 +44,9 @@ function to_hex(d) { Error: new Error() }; } - var result = Caml_bytes.create(32); - for(var i = 0; i <= 15; ++i){ - var x = Caml_string.get(d, i); + let result = Caml_bytes.create(32); + for(let i = 0; i <= 15; ++i){ + let x = Caml_string.get(d, i); result[(i << 1)] = char_hex((x >>> 4)); result[(i << 1) + 1 | 0] = char_hex(x & 15); } @@ -61,7 +61,7 @@ function from_hex(s) { Error: new Error() }; } - var digit = function (c) { + let digit = function (c) { if (c >= 65) { if (c >= 97) { if (c >= 103) { @@ -91,19 +91,19 @@ function from_hex(s) { } return c - /* '0' */48 | 0; }; - var $$byte = function (i) { + let $$byte = function (i) { return (digit(Caml_string.get(s, i)) << 4) + digit(Caml_string.get(s, i + 1 | 0)) | 0; }; - var result = Caml_bytes.create(16); - for(var i = 0; i <= 15; ++i){ + let result = Caml_bytes.create(16); + for(let i = 0; i <= 15; ++i){ Caml_bytes.set(result, i, Char.chr($$byte((i << 1)))); } return Bytes.unsafe_to_string(result); } -var compare = $$String.compare; +let compare = $$String.compare; -var equal = $$String.equal; +let equal = $$String.equal; export { compare, diff --git a/lib/es6/dom.js b/lib/es6/dom.js index bf6ffec2dc..8aae4560b2 100644 --- a/lib/es6/dom.js +++ b/lib/es6/dom.js @@ -1,9 +1,9 @@ -var $$Storage; +let $$Storage; -var Storage2; +let Storage2; export { $$Storage, diff --git a/lib/es6/filename.js b/lib/es6/filename.js index 2b0112eef8..38e02568ba 100644 --- a/lib/es6/filename.js +++ b/lib/es6/filename.js @@ -13,17 +13,17 @@ function generic_basename(is_dir_sep, current_dir_name, name) { if (name === "") { return current_dir_name; } else { - var _n = name.length - 1 | 0; + let _n = name.length - 1 | 0; while(true) { - var n = _n; + let n = _n; if (n < 0) { return $$String.sub(name, 0, 1); } if (!Curry._2(is_dir_sep, name, n)) { - var _n$1 = n; - var p = n + 1 | 0; + let _n$1 = n; + let p = n + 1 | 0; while(true) { - var n$1 = _n$1; + let n$1 = _n$1; if (n$1 < 0) { return $$String.sub(name, 0, p); } @@ -44,23 +44,23 @@ function generic_dirname(is_dir_sep, current_dir_name, name) { if (name === "") { return current_dir_name; } else { - var _n = name.length - 1 | 0; + let _n = name.length - 1 | 0; while(true) { - var n = _n; + let n = _n; if (n < 0) { return $$String.sub(name, 0, 1); } if (!Curry._2(is_dir_sep, name, n)) { - var _n$1 = n; + let _n$1 = n; while(true) { - var n$1 = _n$1; + let n$1 = _n$1; if (n$1 < 0) { return current_dir_name; } if (Curry._2(is_dir_sep, name, n$1)) { - var _n$2 = n$1; + let _n$2 = n$1; while(true) { - var n$2 = _n$2; + let n$2 = _n$2; if (n$2 < 0) { return $$String.sub(name, 0, 1); } @@ -81,7 +81,7 @@ function generic_dirname(is_dir_sep, current_dir_name, name) { } } -var current_dir_name = "."; +let current_dir_name = "."; function is_dir_sep(s, i) { return Caml_string.get(s, i) === /* '/' */47; @@ -115,13 +115,13 @@ function check_suffix(name, suff) { } } -var temp_dir_name; +let temp_dir_name; try { temp_dir_name = Caml_sys.sys_getenv("TMPDIR"); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { temp_dir_name = "/tmp"; } else { @@ -130,11 +130,11 @@ catch (raw_exn){ } function quote(param) { - var quotequote = "'\\''"; - var l = param.length; - var b = $$Buffer.create(l + 20 | 0); + let quotequote = "'\\''"; + let l = param.length; + let b = $$Buffer.create(l + 20 | 0); $$Buffer.add_char(b, /* '\'' */39); - for(var i = 0; i < l; ++i){ + for(let i = 0; i < l; ++i){ if (Caml_string.get(param, i) === /* '\'' */39) { $$Buffer.add_string(b, quotequote); } else { @@ -153,10 +153,10 @@ function dirname(param) { return generic_dirname(is_dir_sep, current_dir_name, param); } -var current_dir_name$1 = "."; +let current_dir_name$1 = "."; function is_dir_sep$1(s, i) { - var c = Caml_string.get(s, i); + let c = Caml_string.get(s, i); if (c === /* '/' */47 || c === /* '\\' */92) { return true; } else { @@ -192,17 +192,17 @@ function check_suffix$1(name, suff) { if (name.length < suff.length) { return false; } - var s = $$String.sub(name, name.length - suff.length | 0, suff.length); + let s = $$String.sub(name, name.length - suff.length | 0, suff.length); return Bytes.unsafe_to_string(Bytes.lowercase_ascii(Bytes.unsafe_of_string(s))) === Bytes.unsafe_to_string(Bytes.lowercase_ascii(Bytes.unsafe_of_string(suff))); } -var temp_dir_name$1; +let temp_dir_name$1; try { temp_dir_name$1 = Caml_sys.sys_getenv("TEMP"); } catch (raw_exn$1){ - var exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1); + let exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1); if (exn$1.RE_EXN_ID === "Not_found") { temp_dir_name$1 = "."; } else { @@ -211,16 +211,16 @@ catch (raw_exn$1){ } function quote$1(s) { - var l = s.length; - var b = $$Buffer.create(l + 20 | 0); + let l = s.length; + let b = $$Buffer.create(l + 20 | 0); $$Buffer.add_char(b, /* '"' */34); - var loop = function (_i) { + let loop = function (_i) { while(true) { - var i = _i; + let i = _i; if (i === l) { return $$Buffer.add_char(b, /* '"' */34); } - var c = Caml_string.get(s, i); + let c = Caml_string.get(s, i); if (c === 34) { return loop_bs(0, i); } @@ -232,15 +232,15 @@ function quote$1(s) { continue ; }; }; - var loop_bs = function (_n, _i) { + let loop_bs = function (_n, _i) { while(true) { - var i = _i; - var n = _n; + let i = _i; + let n = _n; if (i === l) { $$Buffer.add_char(b, /* '"' */34); return add_bs(n); } - var match = Caml_string.get(s, i); + let match = Caml_string.get(s, i); if (match !== 34) { if (match !== 92) { add_bs(n); @@ -255,8 +255,8 @@ function quote$1(s) { return loop(i + 1 | 0); }; }; - var add_bs = function (n) { - for(var _j = 1; _j <= n; ++_j){ + let add_bs = function (n) { + for(let _j = 1; _j <= n; ++_j){ $$Buffer.add_char(b, /* '\\' */92); } }; @@ -265,7 +265,7 @@ function quote$1(s) { } function has_drive(s) { - var is_letter = function (param) { + let is_letter = function (param) { if (param >= 91) { return !(param > 122 || param < 97); } else { @@ -294,17 +294,17 @@ function drive_and_path(s) { } function dirname$1(s) { - var match = drive_and_path(s); - var dir = generic_dirname(is_dir_sep$1, current_dir_name$1, match[1]); + let match = drive_and_path(s); + let dir = generic_dirname(is_dir_sep$1, current_dir_name$1, match[1]); return match[0] + dir; } function basename$1(s) { - var match = drive_and_path(s); + let match = drive_and_path(s); return generic_basename(is_dir_sep$1, current_dir_name$1, match[1]); } -var current_dir_name$2 = "."; +let current_dir_name$2 = "."; function basename$2(param) { return generic_basename(is_dir_sep$1, current_dir_name$2, param); @@ -314,7 +314,7 @@ function dirname$2(param) { return generic_dirname(is_dir_sep$1, current_dir_name$2, param); } -var match; +let match; switch (Sys.os_type) { case "Cygwin" : @@ -363,14 +363,14 @@ switch (Sys.os_type) { ]; } -var temp_dir_name$2 = match[7]; +let temp_dir_name$2 = match[7]; -var is_dir_sep$2 = match[3]; +let is_dir_sep$2 = match[3]; -var dir_sep = match[2]; +let dir_sep = match[2]; function concat(dirname, filename) { - var l = dirname.length; + let l = dirname.length; if (l === 0 || Curry._2(is_dir_sep$2, dirname, l - 1 | 0)) { return dirname + filename; } else { @@ -379,7 +379,7 @@ function concat(dirname, filename) { } function chop_suffix(name, suff) { - var n = name.length - suff.length | 0; + let n = name.length - suff.length | 0; if (n < 0) { throw { RE_EXN_ID: "Invalid_argument", @@ -391,16 +391,16 @@ function chop_suffix(name, suff) { } function extension_len(name) { - var _i = name.length - 1 | 0; + let _i = name.length - 1 | 0; while(true) { - var i = _i; + let i = _i; if (i < 0 || Curry._2(is_dir_sep$2, name, i)) { return 0; } if (Caml_string.get(name, i) === /* '.' */46) { - var _i$1 = i - 1 | 0; + let _i$1 = i - 1 | 0; while(true) { - var i$1 = _i$1; + let i$1 = _i$1; if (i$1 < 0 || Curry._2(is_dir_sep$2, name, i$1)) { return 0; } @@ -417,7 +417,7 @@ function extension_len(name) { } function extension(name) { - var l = extension_len(name); + let l = extension_len(name); if (l === 0) { return ""; } else { @@ -426,7 +426,7 @@ function extension(name) { } function chop_extension(name) { - var l = extension_len(name); + let l = extension_len(name); if (l === 0) { throw { RE_EXN_ID: "Invalid_argument", @@ -438,7 +438,7 @@ function chop_extension(name) { } function remove_extension(name) { - var l = extension_len(name); + let l = extension_len(name); if (l === 0) { return name; } else { @@ -446,7 +446,7 @@ function remove_extension(name) { } } -var current_temp_dir_name = { +let current_temp_dir_name = { contents: temp_dir_name$2 }; @@ -458,21 +458,21 @@ function get_temp_dir_name(param) { return current_temp_dir_name.contents; } -var current_dir_name$3 = match[0]; +let current_dir_name$3 = match[0]; -var parent_dir_name = match[1]; +let parent_dir_name = match[1]; -var is_relative$2 = match[4]; +let is_relative$2 = match[4]; -var is_implicit$2 = match[5]; +let is_implicit$2 = match[5]; -var check_suffix$2 = match[6]; +let check_suffix$2 = match[6]; -var basename$3 = match[9]; +let basename$3 = match[9]; -var dirname$3 = match[10]; +let dirname$3 = match[10]; -var quote$2 = match[8]; +let quote$2 = match[8]; export { current_dir_name$3 as current_dir_name, diff --git a/lib/es6/genlex.js b/lib/es6/genlex.js index 4fa9f26e39..307badc512 100644 --- a/lib/es6/genlex.js +++ b/lib/es6/genlex.js @@ -10,13 +10,13 @@ import * as Caml_format from "./caml_format.js"; import * as Caml_string from "./caml_string.js"; import * as Caml_js_exceptions from "./caml_js_exceptions.js"; -var initial_buffer = Caml_bytes.create(32); +let initial_buffer = Caml_bytes.create(32); -var buffer = { +let buffer = { contents: initial_buffer }; -var bufpos = { +let bufpos = { contents: 0 }; @@ -27,7 +27,7 @@ function reset_buffer(param) { function store(c) { if (bufpos.contents >= buffer.contents.length) { - var newbuffer = Caml_bytes.create((bufpos.contents << 1)); + let newbuffer = Caml_bytes.create((bufpos.contents << 1)); Bytes.blit(buffer.contents, 0, newbuffer, 0, bufpos.contents); buffer.contents = newbuffer; } @@ -36,25 +36,25 @@ function store(c) { } function get_string(param) { - var s = Bytes.sub_string(buffer.contents, 0, bufpos.contents); + let s = Bytes.sub_string(buffer.contents, 0, bufpos.contents); buffer.contents = initial_buffer; return s; } function make_lexer(keywords) { - var kwd_table = Hashtbl.create(undefined, 17); + let kwd_table = Hashtbl.create(undefined, 17); List.iter((function (s) { Hashtbl.add(kwd_table, s, { TAG: "Kwd", _0: s }); }), keywords); - var ident_or_keyword = function (id) { + let ident_or_keyword = function (id) { try { return Hashtbl.find(kwd_table, id); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { return { TAG: "Ident", @@ -64,13 +64,13 @@ function make_lexer(keywords) { throw exn; } }; - var keyword_or_error = function (c) { - var s = Caml_string.make(1, c); + let keyword_or_error = function (c) { + let s = Caml_string.make(1, c); try { return Hashtbl.find(kwd_table, s); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { throw { RE_EXN_ID: Stream.$$Error, @@ -81,13 +81,13 @@ function make_lexer(keywords) { throw exn; } }; - var next_token = function (strm__) { + let next_token = function (strm__) { while(true) { - var c = Stream.peek(strm__); + let c = Stream.peek(strm__); if (c === undefined) { return; } - var exit = 0; + let exit = 0; if (c < 124) { if (c > 122 || c < 65) { if (c >= 123) { @@ -111,12 +111,12 @@ function make_lexer(keywords) { }; case 39 : Stream.junk(strm__); - var c$1; + let c$1; try { c$1 = $$char(strm__); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === Stream.Failure) { throw { RE_EXN_ID: Stream.$$Error, @@ -126,7 +126,7 @@ function make_lexer(keywords) { } throw exn; } - var match = Stream.peek(strm__); + let match = Stream.peek(strm__); if (match !== undefined) { if (match !== 39) { throw { @@ -148,7 +148,7 @@ function make_lexer(keywords) { }; case 40 : Stream.junk(strm__); - var match$1 = Stream.peek(strm__); + let match$1 = Stream.peek(strm__); if (match$1 === 42) { Stream.junk(strm__); comment(strm__); @@ -158,7 +158,7 @@ function make_lexer(keywords) { } case 45 : Stream.junk(strm__); - var c$2 = Stream.peek(strm__); + let c$2 = Stream.peek(strm__); if (c$2 !== undefined && !(c$2 > 57 || c$2 < 48)) { Stream.junk(strm__); reset_buffer(); @@ -265,7 +265,7 @@ function make_lexer(keywords) { reset_buffer(); store(c); while(true) { - var c$3 = Stream.peek(strm__); + let c$3 = Stream.peek(strm__); if (c$3 === undefined) { return ident_or_keyword(get_string()); } @@ -305,9 +305,9 @@ function make_lexer(keywords) { } }; }; - var ident2 = function (strm__) { + let ident2 = function (strm__) { while(true) { - var c = Stream.peek(strm__); + let c = Stream.peek(strm__); if (c === undefined) { return ident_or_keyword(get_string()); } @@ -373,9 +373,9 @@ function make_lexer(keywords) { continue ; }; }; - var number = function (strm__) { + let number = function (strm__) { while(true) { - var c = Stream.peek(strm__); + let c = Stream.peek(strm__); if (c !== undefined) { if (c >= 58) { if (!(c !== 69 && c !== 101)) { @@ -395,7 +395,7 @@ function make_lexer(keywords) { Stream.junk(strm__); store(/* '.' */46); while(true) { - var c$1 = Stream.peek(strm__); + let c$1 = Stream.peek(strm__); if (c$1 !== undefined) { if (c$1 > 101 || c$1 < 69) { if (!(c$1 > 57 || c$1 < 48)) { @@ -424,8 +424,8 @@ function make_lexer(keywords) { }; }; }; - var exponent_part = function (strm__) { - var c = Stream.peek(strm__); + let exponent_part = function (strm__) { + let c = Stream.peek(strm__); if (c !== undefined && !(c !== 43 && c !== 45)) { Stream.junk(strm__); store(c); @@ -434,9 +434,9 @@ function make_lexer(keywords) { return end_exponent_part(strm__); } }; - var end_exponent_part = function (strm__) { + let end_exponent_part = function (strm__) { while(true) { - var c = Stream.peek(strm__); + let c = Stream.peek(strm__); if (c === undefined) { return { TAG: "Float", @@ -454,9 +454,9 @@ function make_lexer(keywords) { continue ; }; }; - var string = function (strm__) { + let string = function (strm__) { while(true) { - var c = Stream.peek(strm__); + let c = Stream.peek(strm__); if (c !== undefined) { if (c !== 34) { if (c !== 92) { @@ -465,12 +465,12 @@ function make_lexer(keywords) { continue ; } Stream.junk(strm__); - var c$1; + let c$1; try { c$1 = $$escape(strm__); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === Stream.Failure) { throw { RE_EXN_ID: Stream.$$Error, @@ -492,8 +492,8 @@ function make_lexer(keywords) { }; }; }; - var $$char = function (strm__) { - var c = Stream.peek(strm__); + let $$char = function (strm__) { + let c = Stream.peek(strm__); if (c !== undefined) { if (c !== 92) { Stream.junk(strm__); @@ -504,7 +504,7 @@ function make_lexer(keywords) { return $$escape(strm__); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === Stream.Failure) { throw { RE_EXN_ID: Stream.$$Error, @@ -521,8 +521,8 @@ function make_lexer(keywords) { }; } }; - var $$escape = function (strm__) { - var c1 = Stream.peek(strm__); + let $$escape = function (strm__) { + let c1 = Stream.peek(strm__); if (c1 !== undefined) { if (c1 >= 58) { switch (c1) { @@ -542,7 +542,7 @@ function make_lexer(keywords) { } else { if (c1 >= 48) { Stream.junk(strm__); - var c2 = Stream.peek(strm__); + let c2 = Stream.peek(strm__); if (c2 !== undefined) { if (c2 > 57 || c2 < 48) { throw { @@ -552,7 +552,7 @@ function make_lexer(keywords) { }; } Stream.junk(strm__); - var c3 = Stream.peek(strm__); + let c3 = Stream.peek(strm__); if (c3 !== undefined) { if (c3 > 57 || c3 < 48) { throw { @@ -586,14 +586,14 @@ function make_lexer(keywords) { }; } }; - var comment = function (strm__) { + let comment = function (strm__) { while(true) { - var match = Stream.peek(strm__); + let match = Stream.peek(strm__); if (match !== undefined) { switch (match) { case 40 : Stream.junk(strm__); - var match$1 = Stream.peek(strm__); + let match$1 = Stream.peek(strm__); if (match$1 !== undefined) { if (match$1 !== 42) { Stream.junk(strm__); @@ -611,7 +611,7 @@ function make_lexer(keywords) { case 42 : Stream.junk(strm__); while(true) { - var match$2 = Stream.peek(strm__); + let match$2 = Stream.peek(strm__); if (match$2 !== undefined) { if (match$2 !== 41) { if (match$2 !== 42) { diff --git a/lib/es6/hashtbl.js b/lib/es6/hashtbl.js index be49f01828..c64ad25205 100644 --- a/lib/es6/hashtbl.js +++ b/lib/es6/hashtbl.js @@ -27,7 +27,7 @@ function flip_ongoing_traversal(h) { h.initial_size = -h.initial_size | 0; } -var randomized = { +let randomized = { contents: false }; @@ -39,13 +39,13 @@ function is_randomized(param) { return randomized.contents; } -var prng = CamlinternalLazy.from_fun(function () { +let prng = CamlinternalLazy.from_fun(function () { return Random.State.make_self_init(); }); function power_2_above(_x, n) { while(true) { - var x = _x; + let x = _x; if (x >= n) { return x; } @@ -58,9 +58,9 @@ function power_2_above(_x, n) { } function create(randomOpt, initial_size) { - var random = randomOpt !== undefined ? randomOpt : randomized.contents; - var s = power_2_above(16, initial_size); - var seed = random ? Random.State.bits(CamlinternalLazy.force(prng)) : 0; + let random = randomOpt !== undefined ? randomOpt : randomized.contents; + let s = power_2_above(16, initial_size); + let seed = random ? Random.State.bits(CamlinternalLazy.force(prng)) : 0; return { size: 0, data: Caml_array.make(s, "Empty"), @@ -71,14 +71,14 @@ function create(randomOpt, initial_size) { function clear(h) { h.size = 0; - var len = h.data.length; - for(var i = 0; i < len; ++i){ + let len = h.data.length; + for(let i = 0; i < len; ++i){ Caml_array.set(h.data, i, "Empty"); } } function reset(h) { - var len = h.data.length; + let len = h.data.length; if (len === Pervasives.abs(h.initial_size)) { return clear(h); } else { @@ -92,20 +92,20 @@ function copy_bucketlist(param) { if (typeof param !== "object") { return "Empty"; } - var key = param.key; - var data = param.data; - var next = param.next; - var loop = function (_prec, _param) { + let key = param.key; + let data = param.data; + let next = param.next; + let loop = function (_prec, _param) { while(true) { - var param = _param; - var prec = _prec; + let param = _param; + let prec = _prec; if (typeof param !== "object") { return; } - var key = param.key; - var data = param.data; - var next = param.next; - var r = { + let key = param.key; + let data = param.data; + let next = param.next; + let r = { TAG: "Cons", key: key, data: data, @@ -128,7 +128,7 @@ function copy_bucketlist(param) { continue ; }; }; - var r = { + let r = { TAG: "Cons", key: key, data: data, @@ -152,33 +152,33 @@ function length(h) { } function resize(indexfun, h) { - var odata = h.data; - var osize = odata.length; - var nsize = (osize << 1); + let odata = h.data; + let osize = odata.length; + let nsize = (osize << 1); if (nsize < osize) { return; } - var ndata = Caml_array.make(nsize, "Empty"); - var ndata_tail = Caml_array.make(nsize, "Empty"); - var inplace = h.initial_size >= 0; + let ndata = Caml_array.make(nsize, "Empty"); + let ndata_tail = Caml_array.make(nsize, "Empty"); + let inplace = h.initial_size >= 0; h.data = ndata; - var insert_bucket = function (_param) { + let insert_bucket = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var key = param.key; - var data = param.data; - var next = param.next; - var cell = inplace ? param : ({ + let key = param.key; + let data = param.data; + let next = param.next; + let cell = inplace ? param : ({ TAG: "Cons", key: key, data: data, next: "Empty" }); - var nidx = Curry._2(indexfun, h, key); - var tail = Caml_array.get(ndata_tail, nidx); + let nidx = Curry._2(indexfun, h, key); + let tail = Caml_array.get(ndata_tail, nidx); if (typeof tail !== "object") { Caml_array.set(ndata, nidx, cell); } else { @@ -189,14 +189,14 @@ function resize(indexfun, h) { continue ; }; }; - for(var i = 0; i < osize; ++i){ + for(let i = 0; i < osize; ++i){ insert_bucket(Caml_array.get(odata, i)); } if (!inplace) { return; } - for(var i$1 = 0; i$1 < nsize; ++i$1){ - var tail = Caml_array.get(ndata_tail, i$1); + for(let i$1 = 0; i$1 < nsize; ++i$1){ + let tail = Caml_array.get(ndata_tail, i$1); if (typeof tail === "object") { tail.next = "Empty"; } @@ -209,8 +209,8 @@ function key_index(h, key) { } function add(h, key, data) { - var i = key_index(h, key); - var bucket = { + let i = key_index(h, key); + let bucket = { TAG: "Cons", key: key, data: data, @@ -225,17 +225,17 @@ function add(h, key, data) { } function remove(h, key) { - var i = key_index(h, key); - var _prec = "Empty"; - var _param = Caml_array.get(h.data, i); + let i = key_index(h, key); + let _prec = "Empty"; + let _param = Caml_array.get(h.data, i); while(true) { - var param = _param; - var prec = _prec; + let param = _param; + let prec = _prec; if (typeof param !== "object") { return; } - var k = param.key; - var next = param.next; + let k = param.key; + let next = param.next; if (Caml_obj.equal(k, key)) { h.size = h.size - 1 | 0; if (typeof prec !== "object") { @@ -252,16 +252,16 @@ function remove(h, key) { } function find(h, key) { - var match = Caml_array.get(h.data, key_index(h, key)); + let match = Caml_array.get(h.data, key_index(h, key)); if (typeof match !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var k1 = match.key; - var d1 = match.data; - var next1 = match.next; + let k1 = match.key; + let d1 = match.data; + let next1 = match.next; if (Caml_obj.equal(key, k1)) { return d1; } @@ -271,9 +271,9 @@ function find(h, key) { Error: new Error() }; } - var k2 = next1.key; - var d2 = next1.data; - var next2 = next1.next; + let k2 = next1.key; + let d2 = next1.data; + let next2 = next1.next; if (Caml_obj.equal(key, k2)) { return d2; } @@ -283,24 +283,24 @@ function find(h, key) { Error: new Error() }; } - var k3 = next2.key; - var d3 = next2.data; - var next3 = next2.next; + let k3 = next2.key; + let d3 = next2.data; + let next3 = next2.next; if (Caml_obj.equal(key, k3)) { return d3; } else { - var _param = next3; + let _param = next3; while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var k = param.key; - var data = param.data; - var next = param.next; + let k = param.key; + let data = param.data; + let next = param.next; if (Caml_obj.equal(key, k)) { return data; } @@ -311,43 +311,43 @@ function find(h, key) { } function find_opt(h, key) { - var match = Caml_array.get(h.data, key_index(h, key)); + let match = Caml_array.get(h.data, key_index(h, key)); if (typeof match !== "object") { return; } - var k1 = match.key; - var d1 = match.data; - var next1 = match.next; + let k1 = match.key; + let d1 = match.data; + let next1 = match.next; if (Caml_obj.equal(key, k1)) { return Caml_option.some(d1); } if (typeof next1 !== "object") { return; } - var k2 = next1.key; - var d2 = next1.data; - var next2 = next1.next; + let k2 = next1.key; + let d2 = next1.data; + let next2 = next1.next; if (Caml_obj.equal(key, k2)) { return Caml_option.some(d2); } if (typeof next2 !== "object") { return; } - var k3 = next2.key; - var d3 = next2.data; - var next3 = next2.next; + let k3 = next2.key; + let d3 = next2.data; + let next3 = next2.next; if (Caml_obj.equal(key, k3)) { return Caml_option.some(d3); } else { - var _param = next3; + let _param = next3; while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var k = param.key; - var data = param.data; - var next = param.next; + let k = param.key; + let data = param.data; + let next = param.next; if (Caml_obj.equal(key, k)) { return Caml_option.some(data); } @@ -358,15 +358,15 @@ function find_opt(h, key) { } function find_all(h, key) { - var find_in_bucket = function (_param) { + let find_in_bucket = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return /* [] */0; } - var k = param.key; - var data = param.data; - var next = param.next; + let k = param.key; + let data = param.data; + let next = param.next; if (Caml_obj.equal(k, key)) { return { hd: data, @@ -382,12 +382,12 @@ function find_all(h, key) { function replace_bucket(key, data, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return true; } - var k = param.key; - var next = param.next; + let k = param.key; + let next = param.next; if (Caml_obj.equal(k, key)) { param.key = key; param.data = data; @@ -399,8 +399,8 @@ function replace_bucket(key, data, _param) { } function replace(h, key, data) { - var i = key_index(h, key); - var l = Caml_array.get(h.data, i); + let i = key_index(h, key); + let l = Caml_array.get(h.data, i); if (replace_bucket(key, data, l)) { Caml_array.set(h.data, i, { TAG: "Cons", @@ -419,14 +419,14 @@ function replace(h, key, data) { } function mem(h, key) { - var _param = Caml_array.get(h.data, key_index(h, key)); + let _param = Caml_array.get(h.data, key_index(h, key)); while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } - var k = param.key; - var next = param.next; + let k = param.key; + let next = param.next; if (Caml_obj.equal(k, key)) { return true; } @@ -436,27 +436,27 @@ function mem(h, key) { } function iter(f, h) { - var do_bucket = function (_param) { + let do_bucket = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var key = param.key; - var data = param.data; - var next = param.next; + let key = param.key; + let data = param.data; + let next = param.next; Curry._2(f, key, data); _param = next; continue ; }; }; - var old_trav = h.initial_size < 0; + let old_trav = h.initial_size < 0; if (!old_trav) { flip_ongoing_traversal(h); } try { - var d = h.data; - for(var i = 0 ,i_finish = d.length; i < i_finish; ++i){ + let d = h.data; + for(let i = 0 ,i_finish = d.length; i < i_finish; ++i){ do_bucket(Caml_array.get(d, i)); } if (!old_trav) { @@ -476,8 +476,8 @@ function iter(f, h) { function filter_map_inplace_bucket(f, h, i, _prec, _param) { while(true) { - var param = _param; - var prec = _prec; + let param = _param; + let prec = _prec; if (typeof param !== "object") { if (typeof prec !== "object") { return Caml_array.set(h.data, i, "Empty"); @@ -486,10 +486,10 @@ function filter_map_inplace_bucket(f, h, i, _prec, _param) { return; } } - var key = param.key; - var data = param.data; - var next = param.next; - var data$1 = Curry._2(f, key, data); + let key = param.key; + let data = param.data; + let next = param.next; + let data$1 = Curry._2(f, key, data); if (data$1 !== undefined) { if (typeof prec !== "object") { Caml_array.set(h.data, i, param); @@ -508,13 +508,13 @@ function filter_map_inplace_bucket(f, h, i, _prec, _param) { } function filter_map_inplace(f, h) { - var d = h.data; - var old_trav = h.initial_size < 0; + let d = h.data; + let old_trav = h.initial_size < 0; if (!old_trav) { flip_ongoing_traversal(h); } try { - for(var i = 0 ,i_finish = d.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = d.length; i < i_finish; ++i){ filter_map_inplace_bucket(f, h, i, "Empty", Caml_array.get(h.data, i)); } return; @@ -529,29 +529,29 @@ function filter_map_inplace(f, h) { } function fold(f, h, init) { - var do_bucket = function (_b, _accu) { + let do_bucket = function (_b, _accu) { while(true) { - var accu = _accu; - var b = _b; + let accu = _accu; + let b = _b; if (typeof b !== "object") { return accu; } - var key = b.key; - var data = b.data; - var next = b.next; + let key = b.key; + let data = b.data; + let next = b.next; _accu = Curry._3(f, key, data, accu); _b = next; continue ; }; }; - var old_trav = h.initial_size < 0; + let old_trav = h.initial_size < 0; if (!old_trav) { flip_ongoing_traversal(h); } try { - var d = h.data; - var accu = init; - for(var i = 0 ,i_finish = d.length; i < i_finish; ++i){ + let d = h.data; + let accu = init; + for(let i = 0 ,i_finish = d.length; i < i_finish; ++i){ accu = do_bucket(Caml_array.get(d, i), accu); } if (!old_trav) { @@ -570,12 +570,12 @@ function fold(f, h, init) { function bucket_length(_accu, _param) { while(true) { - var param = _param; - var accu = _accu; + let param = _param; + let accu = _accu; if (typeof param !== "object") { return accu; } - var next = param.next; + let next = param.next; _param = next; _accu = accu + 1 | 0; continue ; @@ -583,12 +583,12 @@ function bucket_length(_accu, _param) { } function stats(h) { - var mbl = $$Array.fold_left((function (m, b) { + let mbl = $$Array.fold_left((function (m, b) { return Caml.int_max(m, bucket_length(0, b)); }), 0, h.data); - var histo = Caml_array.make(mbl + 1 | 0, 0); + let histo = Caml_array.make(mbl + 1 | 0, 0); $$Array.iter((function (b) { - var l = bucket_length(0, b); + let l = bucket_length(0, b); Caml_array.set(histo, l, Caml_array.get(histo, l) + 1 | 0); }), h.data); return { @@ -600,12 +600,12 @@ function stats(h) { } function MakeSeeded(H) { - var key_index = function (h, key) { + let key_index = function (h, key) { return Curry._2(H.hash, h.seed, key) & (h.data.length - 1 | 0); }; - var add = function (h, key, data) { - var i = key_index(h, key); - var bucket = { + let add = function (h, key, data) { + let i = key_index(h, key); + let bucket = { TAG: "Cons", key: key, data: data, @@ -618,18 +618,18 @@ function MakeSeeded(H) { } }; - var remove = function (h, key) { - var i = key_index(h, key); - var _prec = "Empty"; - var _param = Caml_array.get(h.data, i); + let remove = function (h, key) { + let i = key_index(h, key); + let _prec = "Empty"; + let _param = Caml_array.get(h.data, i); while(true) { - var param = _param; - var prec = _prec; + let param = _param; + let prec = _prec; if (typeof param !== "object") { return; } - var k = param.key; - var next = param.next; + let k = param.key; + let next = param.next; if (Curry._2(H.equal, k, key)) { h.size = h.size - 1 | 0; if (typeof prec !== "object") { @@ -644,17 +644,17 @@ function MakeSeeded(H) { continue ; }; }; - var find = function (h, key) { - var match = Caml_array.get(h.data, key_index(h, key)); + let find = function (h, key) { + let match = Caml_array.get(h.data, key_index(h, key)); if (typeof match !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var k1 = match.key; - var d1 = match.data; - var next1 = match.next; + let k1 = match.key; + let d1 = match.data; + let next1 = match.next; if (Curry._2(H.equal, key, k1)) { return d1; } @@ -664,9 +664,9 @@ function MakeSeeded(H) { Error: new Error() }; } - var k2 = next1.key; - var d2 = next1.data; - var next2 = next1.next; + let k2 = next1.key; + let d2 = next1.data; + let next2 = next1.next; if (Curry._2(H.equal, key, k2)) { return d2; } @@ -676,24 +676,24 @@ function MakeSeeded(H) { Error: new Error() }; } - var k3 = next2.key; - var d3 = next2.data; - var next3 = next2.next; + let k3 = next2.key; + let d3 = next2.data; + let next3 = next2.next; if (Curry._2(H.equal, key, k3)) { return d3; } else { - var _param = next3; + let _param = next3; while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var k = param.key; - var data = param.data; - var next = param.next; + let k = param.key; + let data = param.data; + let next = param.next; if (Curry._2(H.equal, key, k)) { return data; } @@ -702,44 +702,44 @@ function MakeSeeded(H) { }; } }; - var find_opt = function (h, key) { - var match = Caml_array.get(h.data, key_index(h, key)); + let find_opt = function (h, key) { + let match = Caml_array.get(h.data, key_index(h, key)); if (typeof match !== "object") { return; } - var k1 = match.key; - var d1 = match.data; - var next1 = match.next; + let k1 = match.key; + let d1 = match.data; + let next1 = match.next; if (Curry._2(H.equal, key, k1)) { return Caml_option.some(d1); } if (typeof next1 !== "object") { return; } - var k2 = next1.key; - var d2 = next1.data; - var next2 = next1.next; + let k2 = next1.key; + let d2 = next1.data; + let next2 = next1.next; if (Curry._2(H.equal, key, k2)) { return Caml_option.some(d2); } if (typeof next2 !== "object") { return; } - var k3 = next2.key; - var d3 = next2.data; - var next3 = next2.next; + let k3 = next2.key; + let d3 = next2.data; + let next3 = next2.next; if (Curry._2(H.equal, key, k3)) { return Caml_option.some(d3); } else { - var _param = next3; + let _param = next3; while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var k = param.key; - var data = param.data; - var next = param.next; + let k = param.key; + let data = param.data; + let next = param.next; if (Curry._2(H.equal, key, k)) { return Caml_option.some(data); } @@ -748,16 +748,16 @@ function MakeSeeded(H) { }; } }; - var find_all = function (h, key) { - var find_in_bucket = function (_param) { + let find_all = function (h, key) { + let find_in_bucket = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return /* [] */0; } - var k = param.key; - var d = param.data; - var next = param.next; + let k = param.key; + let d = param.data; + let next = param.next; if (Curry._2(H.equal, k, key)) { return { hd: d, @@ -770,14 +770,14 @@ function MakeSeeded(H) { }; return find_in_bucket(Caml_array.get(h.data, key_index(h, key))); }; - var replace_bucket = function (key, data, _param) { + let replace_bucket = function (key, data, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return true; } - var k = param.key; - var next = param.next; + let k = param.key; + let next = param.next; if (Curry._2(H.equal, k, key)) { param.key = key; param.data = data; @@ -787,9 +787,9 @@ function MakeSeeded(H) { continue ; }; }; - var replace = function (h, key, data) { - var i = key_index(h, key); - var l = Caml_array.get(h.data, i); + let replace = function (h, key, data) { + let i = key_index(h, key); + let l = Caml_array.get(h.data, i); if (replace_bucket(key, data, l)) { Caml_array.set(h.data, i, { TAG: "Cons", @@ -806,15 +806,15 @@ function MakeSeeded(H) { } }; - var mem = function (h, key) { - var _param = Caml_array.get(h.data, key_index(h, key)); + let mem = function (h, key) { + let _param = Caml_array.get(h.data, key_index(h, key)); while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } - var k = param.key; - var next = param.next; + let k = param.key; + let next = param.next; if (Curry._2(H.equal, k, key)) { return true; } @@ -843,13 +843,13 @@ function MakeSeeded(H) { } function Make(H) { - var equal = H.equal; - var key_index = function (h, key) { + let equal = H.equal; + let key_index = function (h, key) { return Curry._1(H.hash, key) & (h.data.length - 1 | 0); }; - var add = function (h, key, data) { - var i = key_index(h, key); - var bucket = { + let add = function (h, key, data) { + let i = key_index(h, key); + let bucket = { TAG: "Cons", key: key, data: data, @@ -862,18 +862,18 @@ function Make(H) { } }; - var remove = function (h, key) { - var i = key_index(h, key); - var _prec = "Empty"; - var _param = Caml_array.get(h.data, i); + let remove = function (h, key) { + let i = key_index(h, key); + let _prec = "Empty"; + let _param = Caml_array.get(h.data, i); while(true) { - var param = _param; - var prec = _prec; + let param = _param; + let prec = _prec; if (typeof param !== "object") { return; } - var k = param.key; - var next = param.next; + let k = param.key; + let next = param.next; if (Curry._2(equal, k, key)) { h.size = h.size - 1 | 0; if (typeof prec !== "object") { @@ -888,17 +888,17 @@ function Make(H) { continue ; }; }; - var find = function (h, key) { - var match = Caml_array.get(h.data, key_index(h, key)); + let find = function (h, key) { + let match = Caml_array.get(h.data, key_index(h, key)); if (typeof match !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var k1 = match.key; - var d1 = match.data; - var next1 = match.next; + let k1 = match.key; + let d1 = match.data; + let next1 = match.next; if (Curry._2(equal, key, k1)) { return d1; } @@ -908,9 +908,9 @@ function Make(H) { Error: new Error() }; } - var k2 = next1.key; - var d2 = next1.data; - var next2 = next1.next; + let k2 = next1.key; + let d2 = next1.data; + let next2 = next1.next; if (Curry._2(equal, key, k2)) { return d2; } @@ -920,24 +920,24 @@ function Make(H) { Error: new Error() }; } - var k3 = next2.key; - var d3 = next2.data; - var next3 = next2.next; + let k3 = next2.key; + let d3 = next2.data; + let next3 = next2.next; if (Curry._2(equal, key, k3)) { return d3; } else { - var _param = next3; + let _param = next3; while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var k = param.key; - var data = param.data; - var next = param.next; + let k = param.key; + let data = param.data; + let next = param.next; if (Curry._2(equal, key, k)) { return data; } @@ -946,44 +946,44 @@ function Make(H) { }; } }; - var find_opt = function (h, key) { - var match = Caml_array.get(h.data, key_index(h, key)); + let find_opt = function (h, key) { + let match = Caml_array.get(h.data, key_index(h, key)); if (typeof match !== "object") { return; } - var k1 = match.key; - var d1 = match.data; - var next1 = match.next; + let k1 = match.key; + let d1 = match.data; + let next1 = match.next; if (Curry._2(equal, key, k1)) { return Caml_option.some(d1); } if (typeof next1 !== "object") { return; } - var k2 = next1.key; - var d2 = next1.data; - var next2 = next1.next; + let k2 = next1.key; + let d2 = next1.data; + let next2 = next1.next; if (Curry._2(equal, key, k2)) { return Caml_option.some(d2); } if (typeof next2 !== "object") { return; } - var k3 = next2.key; - var d3 = next2.data; - var next3 = next2.next; + let k3 = next2.key; + let d3 = next2.data; + let next3 = next2.next; if (Curry._2(equal, key, k3)) { return Caml_option.some(d3); } else { - var _param = next3; + let _param = next3; while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var k = param.key; - var data = param.data; - var next = param.next; + let k = param.key; + let data = param.data; + let next = param.next; if (Curry._2(equal, key, k)) { return Caml_option.some(data); } @@ -992,16 +992,16 @@ function Make(H) { }; } }; - var find_all = function (h, key) { - var find_in_bucket = function (_param) { + let find_all = function (h, key) { + let find_in_bucket = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return /* [] */0; } - var k = param.key; - var d = param.data; - var next = param.next; + let k = param.key; + let d = param.data; + let next = param.next; if (Curry._2(equal, k, key)) { return { hd: d, @@ -1014,14 +1014,14 @@ function Make(H) { }; return find_in_bucket(Caml_array.get(h.data, key_index(h, key))); }; - var replace_bucket = function (key, data, _param) { + let replace_bucket = function (key, data, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return true; } - var k = param.key; - var next = param.next; + let k = param.key; + let next = param.next; if (Curry._2(equal, k, key)) { param.key = key; param.data = data; @@ -1031,9 +1031,9 @@ function Make(H) { continue ; }; }; - var replace = function (h, key, data) { - var i = key_index(h, key); - var l = Caml_array.get(h.data, i); + let replace = function (h, key, data) { + let i = key_index(h, key); + let l = Caml_array.get(h.data, i); if (replace_bucket(key, data, l)) { Caml_array.set(h.data, i, { TAG: "Cons", @@ -1050,15 +1050,15 @@ function Make(H) { } }; - var mem = function (h, key) { - var _param = Caml_array.get(h.data, key_index(h, key)); + let mem = function (h, key) { + let _param = Caml_array.get(h.data, key_index(h, key)); while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } - var k = param.key; - var next = param.next; + let k = param.key; + let next = param.next; if (Curry._2(equal, k, key)) { return true; } @@ -1066,7 +1066,7 @@ function Make(H) { continue ; }; }; - var create$1 = function (sz) { + let create$1 = function (sz) { return create(false, sz); }; return { @@ -1089,7 +1089,7 @@ function Make(H) { }; } -var seeded_hash_param = Caml_hash.hash; +let seeded_hash_param = Caml_hash.hash; export { create, diff --git a/lib/es6/hashtblLabels.js b/lib/es6/hashtblLabels.js index 9083987360..168edfb9c1 100644 --- a/lib/es6/hashtblLabels.js +++ b/lib/es6/hashtblLabels.js @@ -3,9 +3,9 @@ import * as Curry from "./curry.js"; import * as Hashtbl from "./hashtbl.js"; -var add = Hashtbl.add; +let add = Hashtbl.add; -var replace = Hashtbl.replace; +let replace = Hashtbl.replace; function iter(f, tbl) { Hashtbl.iter(Curry.__2(f), tbl); @@ -20,21 +20,21 @@ function fold(f, tbl, init) { } function MakeSeeded(H) { - var include = Hashtbl.MakeSeeded(H); - var add = include.add; - var replace = include.replace; - var iter = include.iter; - var filter_map_inplace = include.filter_map_inplace; - var fold = include.fold; - var add$1 = Curry.__3(add); - var replace$1 = Curry.__3(replace); - var iter$1 = function (f, tbl) { + let include = Hashtbl.MakeSeeded(H); + let add = include.add; + let replace = include.replace; + let iter = include.iter; + let filter_map_inplace = include.filter_map_inplace; + let fold = include.fold; + let add$1 = Curry.__3(add); + let replace$1 = Curry.__3(replace); + let iter$1 = function (f, tbl) { Curry._2(iter, Curry.__2(f), tbl); }; - var filter_map_inplace$1 = function (f, tbl) { + let filter_map_inplace$1 = function (f, tbl) { Curry._2(filter_map_inplace, Curry.__2(f), tbl); }; - var fold$1 = function (f, tbl, init) { + let fold$1 = function (f, tbl, init) { return Curry._3(fold, Curry.__3(f), tbl, init); }; return { @@ -58,33 +58,33 @@ function MakeSeeded(H) { } function Make(H) { - var hash = function (_seed, x) { + let hash = function (_seed, x) { return Curry._1(H.hash, x); }; - var H_equal = H.equal; - var H$1 = { + let H_equal = H.equal; + let H$1 = { equal: H_equal, hash: hash }; - var include = Hashtbl.MakeSeeded(H$1); - var create = include.create; - var add = include.add; - var replace = include.replace; - var iter = include.iter; - var filter_map_inplace = include.filter_map_inplace; - var fold = include.fold; - var add$1 = Curry.__3(add); - var replace$1 = Curry.__3(replace); - var iter$1 = function (f, tbl) { + let include = Hashtbl.MakeSeeded(H$1); + let create = include.create; + let add = include.add; + let replace = include.replace; + let iter = include.iter; + let filter_map_inplace = include.filter_map_inplace; + let fold = include.fold; + let add$1 = Curry.__3(add); + let replace$1 = Curry.__3(replace); + let iter$1 = function (f, tbl) { Curry._2(iter, Curry.__2(f), tbl); }; - var filter_map_inplace$1 = function (f, tbl) { + let filter_map_inplace$1 = function (f, tbl) { Curry._2(filter_map_inplace, Curry.__2(f), tbl); }; - var fold$1 = function (f, tbl, init) { + let fold$1 = function (f, tbl, init) { return Curry._3(fold, Curry.__3(f), tbl, init); }; - var create$1 = function (sz) { + let create$1 = function (sz) { return Curry._2(create, false, sz); }; return { @@ -107,39 +107,39 @@ function Make(H) { }; } -var create = Hashtbl.create; +let create = Hashtbl.create; -var clear = Hashtbl.clear; +let clear = Hashtbl.clear; -var reset = Hashtbl.reset; +let reset = Hashtbl.reset; -var copy = Hashtbl.copy; +let copy = Hashtbl.copy; -var find = Hashtbl.find; +let find = Hashtbl.find; -var find_opt = Hashtbl.find_opt; +let find_opt = Hashtbl.find_opt; -var find_all = Hashtbl.find_all; +let find_all = Hashtbl.find_all; -var mem = Hashtbl.mem; +let mem = Hashtbl.mem; -var remove = Hashtbl.remove; +let remove = Hashtbl.remove; -var length = Hashtbl.length; +let length = Hashtbl.length; -var randomize = Hashtbl.randomize; +let randomize = Hashtbl.randomize; -var is_randomized = Hashtbl.is_randomized; +let is_randomized = Hashtbl.is_randomized; -var stats = Hashtbl.stats; +let stats = Hashtbl.stats; -var hash = Hashtbl.hash; +let hash = Hashtbl.hash; -var seeded_hash = Hashtbl.seeded_hash; +let seeded_hash = Hashtbl.seeded_hash; -var hash_param = Hashtbl.hash_param; +let hash_param = Hashtbl.hash_param; -var seeded_hash_param = Hashtbl.seeded_hash_param; +let seeded_hash_param = Hashtbl.seeded_hash_param; export { create, diff --git a/lib/es6/int32.js b/lib/es6/int32.js index b185287101..201fb9fa10 100644 --- a/lib/es6/int32.js +++ b/lib/es6/int32.js @@ -33,7 +33,7 @@ function of_string_opt(s) { return Caml_format.int_of_string(s); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Failure") { return; } @@ -41,21 +41,21 @@ function of_string_opt(s) { } } -var compare = Caml.int_compare; +let compare = Caml.int_compare; function equal(x, y) { return x === y; } -var zero = 0; +let zero = 0; -var one = 1; +let one = 1; -var minus_one = -1; +let minus_one = -1; -var max_int = 2147483647; +let max_int = 2147483647; -var min_int = -2147483648; +let min_int = -2147483648; export { zero, diff --git a/lib/es6/int64.js b/lib/es6/int64.js index 5f2a0c4945..7c88c7192e 100644 --- a/lib/es6/int64.js +++ b/lib/es6/int64.js @@ -26,7 +26,7 @@ function of_string_opt(s) { return Caml_format.int64_of_string(s); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Failure") { return; } @@ -34,23 +34,23 @@ function of_string_opt(s) { } } -var compare = Caml_int64.compare; +let compare = Caml_int64.compare; -var equal = Caml_int64.equal; +let equal = Caml_int64.equal; -var zero = Caml_int64.zero; +let zero = Caml_int64.zero; -var one = Caml_int64.one; +let one = Caml_int64.one; -var minus_one = Caml_int64.neg_one; +let minus_one = Caml_int64.neg_one; -var succ = Caml_int64.succ; +let succ = Caml_int64.succ; -var max_int = Caml_int64.max_int; +let max_int = Caml_int64.max_int; -var min_int = Caml_int64.min_int; +let min_int = Caml_int64.min_int; -var to_string = Caml_int64.to_string; +let to_string = Caml_int64.to_string; export { zero, diff --git a/lib/es6/js.js b/lib/es6/js.js index 37fb201db2..65c68ceb54 100644 --- a/lib/es6/js.js +++ b/lib/es6/js.js @@ -1,79 +1,79 @@ -var Internal = {}; +let Internal = {}; -var MapperRt; +let MapperRt; -var Null; +let Null; -var Undefined; +let Undefined; -var Nullable; +let Nullable; -var Null_undefined; +let Null_undefined; -var Exn; +let Exn; -var $$Array; +let $$Array; -var Array2; +let Array2; -var $$String; +let $$String; -var String2; +let String2; -var Re; +let Re; -var $$Promise; +let $$Promise; -var Promise2; +let Promise2; -var $$Date; +let $$Date; -var Dict; +let Dict; -var Global; +let Global; -var Json; +let Json; -var $$Math; +let $$Math; -var Obj; +let Obj; -var Typed_array; +let Typed_array; -var TypedArray2; +let TypedArray2; -var Types; +let Types; -var Float; +let Float; -var Int; +let Int; -var $$BigInt; +let $$BigInt; -var $$File; +let $$File; -var $$Blob; +let $$Blob; -var $$Option; +let $$Option; -var Result; +let Result; -var List; +let List; -var Vector; +let Vector; -var Console; +let Console; -var $$Set; +let $$Set; -var $$WeakSet; +let $$WeakSet; -var $$Map; +let $$Map; -var $$WeakMap; +let $$WeakMap; export { MapperRt, diff --git a/lib/es6/js_OO.js b/lib/es6/js_OO.js index 0dba861157..c6841bd608 100644 --- a/lib/es6/js_OO.js +++ b/lib/es6/js_OO.js @@ -1,7 +1,7 @@ -var Callback = {}; +let Callback = {}; export { Callback, diff --git a/lib/es6/js_dict.js b/lib/es6/js_dict.js index 2dd5437e2e..9022c73606 100644 --- a/lib/es6/js_dict.js +++ b/lib/es6/js_dict.js @@ -9,16 +9,16 @@ function get(dict, k) { } -var unsafeDeleteKey = (function (dict,key){ +let unsafeDeleteKey = (function (dict,key){ delete dict[key]; }); function entries(dict) { - var keys = Object.keys(dict); - var l = keys.length; - var values = new Array(l); - for(var i = 0; i < l; ++i){ - var key = keys[i]; + let keys = Object.keys(dict); + let l = keys.length; + let values = new Array(l); + for(let i = 0; i < l; ++i){ + let key = keys[i]; values[i] = [ key, dict[key] @@ -28,24 +28,24 @@ function entries(dict) { } function values(dict) { - var keys = Object.keys(dict); - var l = keys.length; - var values$1 = new Array(l); - for(var i = 0; i < l; ++i){ + let keys = Object.keys(dict); + let l = keys.length; + let values$1 = new Array(l); + for(let i = 0; i < l; ++i){ values$1[i] = dict[keys[i]]; } return values$1; } function fromList(entries) { - var dict = {}; - var _x = entries; + let dict = {}; + let _x = entries; while(true) { - var x = _x; + let x = _x; if (!x) { return dict; } - var match = x.hd; + let match = x.hd; dict[match[0]] = match[1]; _x = x.tl; continue ; @@ -53,21 +53,21 @@ function fromList(entries) { } function fromArray(entries) { - var dict = {}; - var l = entries.length; - for(var i = 0; i < l; ++i){ - var match = entries[i]; + let dict = {}; + let l = entries.length; + for(let i = 0; i < l; ++i){ + let match = entries[i]; dict[match[0]] = match[1]; } return dict; } function map(f, source) { - var target = {}; - var keys = Object.keys(source); - var l = keys.length; - for(var i = 0; i < l; ++i){ - var key = keys[i]; + let target = {}; + let keys = Object.keys(source); + let l = keys.length; + for(let i = 0; i < l; ++i){ + let key = keys[i]; target[key] = f(source[key]); } return target; diff --git a/lib/es6/js_exn.js b/lib/es6/js_exn.js index 3ac73adfb8..74add0dd3a 100644 --- a/lib/es6/js_exn.js +++ b/lib/es6/js_exn.js @@ -29,7 +29,7 @@ function raiseUriError(str) { throw new URIError(str); } -var $$Error$1 = "JsError"; +let $$Error$1 = "JsError"; export { $$Error$1 as $$Error, diff --git a/lib/es6/js_int.js b/lib/es6/js_int.js index f6e4e5c5f3..53a2d18b85 100644 --- a/lib/es6/js_int.js +++ b/lib/es6/js_int.js @@ -5,9 +5,9 @@ function equal(x, y) { return x === y; } -var max = 2147483647; +let max = 2147483647; -var min = -2147483648; +let min = -2147483648; export { equal, diff --git a/lib/es6/js_json.js b/lib/es6/js_json.js index 2f5069ca4b..03cb589c08 100644 --- a/lib/es6/js_json.js +++ b/lib/es6/js_json.js @@ -1,10 +1,10 @@ -var Kind = {}; +let Kind = {}; function classify(x) { - var ty = typeof x; + let ty = typeof x; if (ty === "string") { return { TAG: "JSONString", @@ -100,7 +100,7 @@ function decodeNull(json) { } -var patch = (function (json) { +let patch = (function (json) { var x = [json]; var q = [{ kind: 0, i: 0, parent: x }]; while (q.length !== 0) { diff --git a/lib/es6/js_list.js b/lib/es6/js_list.js index f4802ce0a3..9e7dab0adf 100644 --- a/lib/es6/js_list.js +++ b/lib/es6/js_list.js @@ -4,11 +4,11 @@ import * as Js_vector from "./js_vector.js"; import * as Caml_option from "./caml_option.js"; function length(l) { - var _len = 0; - var _x = l; + let _len = 0; + let _x = l; while(true) { - var x = _x; - var len = _len; + let x = _x; + let len = _len; if (!x) { return len; } @@ -47,11 +47,11 @@ function nth(l, n) { if (n < 0) { return; } - var _l = l; - var _n = n; + let _l = l; + let _n = n; while(true) { - var n$1 = _n; - var l$1 = _l; + let n$1 = _n; + let l$1 = _l; if (!l$1) { return; } @@ -66,8 +66,8 @@ function nth(l, n) { function revAppend(_l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { return l2; } @@ -86,8 +86,8 @@ function rev(l) { function mapRevAux(f, _acc, _ls) { while(true) { - var ls = _ls; - var acc = _acc; + let ls = _ls; + let acc = _acc; if (!ls) { return acc; } @@ -110,7 +110,7 @@ function map(f, ls) { function iter(f, _x) { while(true) { - var x = _x; + let x = _x; if (!x) { return; } @@ -121,11 +121,11 @@ function iter(f, _x) { } function iteri(f, l) { - var _i = 0; - var _x = l; + let _i = 0; + let _x = l; while(true) { - var x = _x; - var i = _i; + let x = _x; + let i = _i; if (!x) { return; } @@ -138,8 +138,8 @@ function iteri(f, l) { function foldLeft(f, _accu, _l) { while(true) { - var l = _l; - var accu = _accu; + let l = _l; + let accu = _accu; if (!l) { return accu; } @@ -151,8 +151,8 @@ function foldLeft(f, _accu, _l) { function tailLoop(f, _acc, _x) { while(true) { - var x = _x; - var acc = _acc; + let x = _x; + let acc = _acc; if (!x) { return acc; } @@ -163,12 +163,12 @@ function tailLoop(f, _acc, _x) { } function foldRight(f, l, init) { - var loop = function (n, x) { + let loop = function (n, x) { if (!x) { return init; } - var t = x.tl; - var h = x.hd; + let t = x.tl; + let h = x.hd; if (n < 1000) { return f(h, loop(n + 1 | 0, t)); } else { @@ -179,11 +179,11 @@ function foldRight(f, l, init) { } function flatten(lx) { - var _acc = /* [] */0; - var _lx = lx; + let _acc = /* [] */0; + let _lx = lx; while(true) { - var lx$1 = _lx; - var acc = _acc; + let lx$1 = _lx; + let acc = _acc; if (!lx$1) { return revAppend(acc, /* [] */0); } @@ -195,13 +195,13 @@ function flatten(lx) { function filterRevAux(f, _acc, _xs) { while(true) { - var xs = _xs; - var acc = _acc; + let xs = _xs; + let acc = _acc; if (!xs) { return acc; } - var ys = xs.tl; - var y = xs.hd; + let ys = xs.tl; + let y = xs.hd; if (f(y)) { _xs = ys; _acc = { @@ -221,13 +221,13 @@ function filter(f, xs) { function filterMapRevAux(f, _acc, _xs) { while(true) { - var xs = _xs; - var acc = _acc; + let xs = _xs; + let acc = _acc; if (!xs) { return acc; } - var ys = xs.tl; - var z = f(xs.hd); + let ys = xs.tl; + let z = f(xs.hd); if (z !== undefined) { _xs = ys; _acc = { @@ -246,11 +246,11 @@ function filterMap(f, xs) { } function countBy(f, xs) { - var _acc = 0; - var _xs = xs; + let _acc = 0; + let _xs = xs; while(true) { - var xs$1 = _xs; - var acc = _acc; + let xs$1 = _xs; + let acc = _acc; if (!xs$1) { return acc; } @@ -268,12 +268,12 @@ function toVector(xs) { if (!xs) { return []; } - var a = new Array(length(xs)); - var _i = 0; - var _x = xs; + let a = new Array(length(xs)); + let _i = 0; + let _x = xs; while(true) { - var x = _x; - var i = _i; + let x = _x; + let i = _i; if (!x) { return a; } @@ -286,8 +286,8 @@ function toVector(xs) { function equal(cmp, _xs, _ys) { while(true) { - var ys = _ys; - var xs = _xs; + let ys = _ys; + let xs = _xs; if (!xs) { if (ys) { return false; diff --git a/lib/es6/js_mapperRt.js b/lib/es6/js_mapperRt.js index 56ea2cfbf0..f47342386c 100644 --- a/lib/es6/js_mapperRt.js +++ b/lib/es6/js_mapperRt.js @@ -12,13 +12,13 @@ function raiseWhenNotFound(x) { } function fromInt(len, xs, $$enum) { - var _i = 0; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === len) { return; } - var k = xs[i]; + let k = xs[i]; if (k === $$enum) { return i; } @@ -28,16 +28,16 @@ function fromInt(len, xs, $$enum) { } function fromIntAssert(len, xs, $$enum) { - var _i = 0; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === len) { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var k = xs[i]; + let k = xs[i]; if (k === $$enum) { return i; } diff --git a/lib/es6/js_math.js b/lib/es6/js_math.js index dec1bd76cb..a7efd1a0a3 100644 --- a/lib/es6/js_math.js +++ b/lib/es6/js_math.js @@ -34,9 +34,9 @@ function random_int(min, max) { return floor_int(Math.random() * (max - min | 0)) + min | 0; } -var ceil = ceil_int; +let ceil = ceil_int; -var floor = floor_int; +let floor = floor_int; export { unsafe_ceil, diff --git a/lib/es6/js_null.js b/lib/es6/js_null.js index e8451d9d95..9ac6a94514 100644 --- a/lib/es6/js_null.js +++ b/lib/es6/js_null.js @@ -36,7 +36,7 @@ function fromOption(x) { } } -var from_opt = fromOption; +let from_opt = fromOption; export { test, diff --git a/lib/es6/js_null_undefined.js b/lib/es6/js_null_undefined.js index 508f2a2ea5..58e5799d43 100644 --- a/lib/es6/js_null_undefined.js +++ b/lib/es6/js_null_undefined.js @@ -24,7 +24,7 @@ function fromOption(x) { } -var from_opt = fromOption; +let from_opt = fromOption; export { bind, diff --git a/lib/es6/js_option.js b/lib/es6/js_option.js index e00f882693..0667fcd74d 100644 --- a/lib/es6/js_option.js +++ b/lib/es6/js_option.js @@ -67,7 +67,7 @@ function filter(f, x) { if (x === undefined) { return; } - var x$1 = Caml_option.valFromOption(x); + let x$1 = Caml_option.valFromOption(x); if (f(x$1)) { return Caml_option.some(x$1); } @@ -84,7 +84,7 @@ function firstSome(a, b) { } } -var $$default = getWithDefault; +let $$default = getWithDefault; export { some, diff --git a/lib/es6/js_promise2.js b/lib/es6/js_promise2.js index 788f3cf405..727ab7ea0c 100644 --- a/lib/es6/js_promise2.js +++ b/lib/es6/js_promise2.js @@ -1,11 +1,11 @@ -var then = (function(p, cont) { +let then = (function(p, cont) { return Promise.resolve(p).then(cont) }); -var $$catch = (function(p, cont) { +let $$catch = (function(p, cont) { return Promise.resolve(p).catch(cont) }); diff --git a/lib/es6/js_typed_array.js b/lib/es6/js_typed_array.js index 94414f1792..3516646992 100644 --- a/lib/es6/js_typed_array.js +++ b/lib/es6/js_typed_array.js @@ -9,7 +9,7 @@ function sliceFrom(arg1, obj) { return obj.slice(arg1); } -var $$ArrayBuffer = { +let $$ArrayBuffer = { slice: slice, sliceFrom: sliceFrom }; @@ -162,7 +162,7 @@ function somei(arg1, obj) { return obj.some(arg1); } -var $$Int8Array = { +let $$Int8Array = { setArray: setArray, setArrayOffset: setArrayOffset, copyWithin: copyWithin, @@ -350,7 +350,7 @@ function somei$1(arg1, obj) { return obj.some(arg1); } -var $$Uint8Array = { +let $$Uint8Array = { setArray: setArray$1, setArrayOffset: setArrayOffset$1, copyWithin: copyWithin$1, @@ -538,7 +538,7 @@ function somei$2(arg1, obj) { return obj.some(arg1); } -var $$Uint8ClampedArray = { +let $$Uint8ClampedArray = { setArray: setArray$2, setArrayOffset: setArrayOffset$2, copyWithin: copyWithin$2, @@ -726,7 +726,7 @@ function somei$3(arg1, obj) { return obj.some(arg1); } -var $$Int16Array = { +let $$Int16Array = { setArray: setArray$3, setArrayOffset: setArrayOffset$3, copyWithin: copyWithin$3, @@ -914,7 +914,7 @@ function somei$4(arg1, obj) { return obj.some(arg1); } -var $$Uint16Array = { +let $$Uint16Array = { setArray: setArray$4, setArrayOffset: setArrayOffset$4, copyWithin: copyWithin$4, @@ -1102,7 +1102,7 @@ function somei$5(arg1, obj) { return obj.some(arg1); } -var $$Int32Array = { +let $$Int32Array = { setArray: setArray$5, setArrayOffset: setArrayOffset$5, copyWithin: copyWithin$5, @@ -1290,7 +1290,7 @@ function somei$6(arg1, obj) { return obj.some(arg1); } -var $$Uint32Array = { +let $$Uint32Array = { setArray: setArray$6, setArrayOffset: setArrayOffset$6, copyWithin: copyWithin$6, @@ -1478,7 +1478,7 @@ function somei$7(arg1, obj) { return obj.some(arg1); } -var $$Float32Array = { +let $$Float32Array = { setArray: setArray$7, setArrayOffset: setArrayOffset$7, copyWithin: copyWithin$7, @@ -1666,7 +1666,7 @@ function somei$8(arg1, obj) { return obj.some(arg1); } -var $$Float64Array = { +let $$Float64Array = { setArray: setArray$8, setArrayOffset: setArrayOffset$8, copyWithin: copyWithin$8, @@ -1706,13 +1706,13 @@ var $$Float64Array = { somei: somei$8 }; -var $$DataView = {}; +let $$DataView = {}; -var Int32_array; +let Int32_array; -var Float32_array; +let Float32_array; -var Float64_array; +let Float64_array; export { $$ArrayBuffer, diff --git a/lib/es6/js_typed_array2.js b/lib/es6/js_typed_array2.js index 7dd42afedd..0ebdb875ec 100644 --- a/lib/es6/js_typed_array2.js +++ b/lib/es6/js_typed_array2.js @@ -1,27 +1,27 @@ -var $$ArrayBuffer = {}; +let $$ArrayBuffer = {}; -var $$Int8Array = {}; +let $$Int8Array = {}; -var $$Uint8Array = {}; +let $$Uint8Array = {}; -var $$Uint8ClampedArray = {}; +let $$Uint8ClampedArray = {}; -var $$Int16Array = {}; +let $$Int16Array = {}; -var $$Uint16Array = {}; +let $$Uint16Array = {}; -var $$Int32Array = {}; +let $$Int32Array = {}; -var $$Uint32Array = {}; +let $$Uint32Array = {}; -var $$Float32Array = {}; +let $$Float32Array = {}; -var $$Float64Array = {}; +let $$Float64Array = {}; -var $$DataView = {}; +let $$DataView = {}; export { $$ArrayBuffer, diff --git a/lib/es6/js_types.js b/lib/es6/js_types.js index f1ac629d03..4cefeba96a 100644 --- a/lib/es6/js_types.js +++ b/lib/es6/js_types.js @@ -2,7 +2,7 @@ function classify(x) { - var ty = typeof x; + let ty = typeof x; if (ty === "undefined") { return "JSUndefined"; } else if (x === null) { diff --git a/lib/es6/js_undefined.js b/lib/es6/js_undefined.js index 092dc33fe4..8d5125bc03 100644 --- a/lib/es6/js_undefined.js +++ b/lib/es6/js_undefined.js @@ -38,7 +38,7 @@ function fromOption(x) { } -var from_opt = fromOption; +let from_opt = fromOption; export { test, diff --git a/lib/es6/js_vector.js b/lib/es6/js_vector.js index 9a73e14f07..88ebde71b2 100644 --- a/lib/es6/js_vector.js +++ b/lib/es6/js_vector.js @@ -2,10 +2,10 @@ function filterInPlace(p, a) { - var i = 0; - var j = 0; + let i = 0; + let j = 0; while(i < a.length) { - var v = a[i]; + let v = a[i]; if (p(v)) { a[j] = v; j = j + 1 | 0; @@ -28,23 +28,23 @@ function memByRef(x, xs) { } function iter(f, xs) { - for(var i = 0 ,i_finish = xs.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = xs.length; i < i_finish; ++i){ f(xs[i]); } } function iteri(f, a) { - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ f(i, a[i]); } } function toList(a) { - var _i = a.length - 1 | 0; - var _res = /* [] */0; + let _i = a.length - 1 | 0; + let _res = /* [] */0; while(true) { - var res = _res; - var i = _i; + let res = _res; + let i = _i; if (i < 0) { return res; } @@ -58,54 +58,54 @@ function toList(a) { } function init(n, f) { - var v = new Array(n); - for(var i = 0; i < n; ++i){ + let v = new Array(n); + for(let i = 0; i < n; ++i){ v[i] = f(i); } return v; } function copy(x) { - var len = x.length; - var b = new Array(len); - for(var i = 0; i < len; ++i){ + let len = x.length; + let b = new Array(len); + for(let i = 0; i < len; ++i){ b[i] = x[i]; } return b; } function map(f, a) { - var l = a.length; - var r = new Array(l); - for(var i = 0; i < l; ++i){ + let l = a.length; + let r = new Array(l); + for(let i = 0; i < l; ++i){ r[i] = f(a[i]); } return r; } function foldLeft(f, x, a) { - var r = x; - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + let r = x; + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ r = f(r, a[i]); } return r; } function foldRight(f, a, x) { - var r = x; - for(var i = a.length - 1 | 0; i >= 0; --i){ + let r = x; + for(let i = a.length - 1 | 0; i >= 0; --i){ r = f(a[i], r); } return r; } function mapi(f, a) { - var l = a.length; + let l = a.length; if (l === 0) { return []; } - var r = new Array(l); - for(var i = 0; i < l; ++i){ + let r = new Array(l); + for(let i = 0; i < l; ++i){ r[i] = f(i, a[i]); } return r; diff --git a/lib/es6/jsxEventC.js b/lib/es6/jsxEventC.js index 1ba8815602..4a8684de93 100644 --- a/lib/es6/jsxEventC.js +++ b/lib/es6/jsxEventC.js @@ -5,37 +5,37 @@ function MakeEventWithType(Type) { return {}; } -var Synthetic = {}; +let Synthetic = {}; -var Clipboard = {}; +let Clipboard = {}; -var Composition = {}; +let Composition = {}; -var Keyboard = {}; +let Keyboard = {}; -var Focus = {}; +let Focus = {}; -var Form = {}; +let Form = {}; -var Mouse = {}; +let Mouse = {}; -var Pointer = {}; +let Pointer = {}; -var $$Selection = {}; +let $$Selection = {}; -var $$Touch = {}; +let $$Touch = {}; -var UI = {}; +let UI = {}; -var Wheel = {}; +let Wheel = {}; -var Media = {}; +let Media = {}; -var $$Image = {}; +let $$Image = {}; -var $$Animation = {}; +let $$Animation = {}; -var Transition = {}; +let Transition = {}; export { MakeEventWithType, diff --git a/lib/es6/jsxEventU.js b/lib/es6/jsxEventU.js index 1ba8815602..4a8684de93 100644 --- a/lib/es6/jsxEventU.js +++ b/lib/es6/jsxEventU.js @@ -5,37 +5,37 @@ function MakeEventWithType(Type) { return {}; } -var Synthetic = {}; +let Synthetic = {}; -var Clipboard = {}; +let Clipboard = {}; -var Composition = {}; +let Composition = {}; -var Keyboard = {}; +let Keyboard = {}; -var Focus = {}; +let Focus = {}; -var Form = {}; +let Form = {}; -var Mouse = {}; +let Mouse = {}; -var Pointer = {}; +let Pointer = {}; -var $$Selection = {}; +let $$Selection = {}; -var $$Touch = {}; +let $$Touch = {}; -var UI = {}; +let UI = {}; -var Wheel = {}; +let Wheel = {}; -var Media = {}; +let Media = {}; -var $$Image = {}; +let $$Image = {}; -var $$Animation = {}; +let $$Animation = {}; -var Transition = {}; +let Transition = {}; export { MakeEventWithType, diff --git a/lib/es6/jsxPPXReactSupportC.js b/lib/es6/jsxPPXReactSupportC.js index 3261f13de6..85203df4e9 100644 --- a/lib/es6/jsxPPXReactSupportC.js +++ b/lib/es6/jsxPPXReactSupportC.js @@ -19,7 +19,7 @@ function createElementVariadicWithKey(key, component, props, elements) { ]); } -var Jsx; +let Jsx; export { Jsx, diff --git a/lib/es6/jsxPPXReactSupportU.js b/lib/es6/jsxPPXReactSupportU.js index 3261f13de6..85203df4e9 100644 --- a/lib/es6/jsxPPXReactSupportU.js +++ b/lib/es6/jsxPPXReactSupportU.js @@ -19,7 +19,7 @@ function createElementVariadicWithKey(key, component, props, elements) { ]); } -var Jsx; +let Jsx; export { Jsx, diff --git a/lib/es6/lazy.js b/lib/es6/lazy.js index a25ad4e183..1adb9d296b 100644 --- a/lib/es6/lazy.js +++ b/lib/es6/lazy.js @@ -9,19 +9,19 @@ function from_fun(f) { }); } -var from_val = CamlinternalLazy.from_val; +let from_val = CamlinternalLazy.from_val; -var Undefined = CamlinternalLazy.Undefined; +let Undefined = CamlinternalLazy.Undefined; -var force_val = CamlinternalLazy.force_val; +let force_val = CamlinternalLazy.force_val; -var is_val = CamlinternalLazy.is_val; +let is_val = CamlinternalLazy.is_val; -var lazy_from_fun = from_fun; +let lazy_from_fun = from_fun; -var lazy_from_val = from_val; +let lazy_from_val = from_val; -var lazy_is_val = CamlinternalLazy.is_val; +let lazy_is_val = CamlinternalLazy.is_val; export { Undefined, diff --git a/lib/es6/lexing.js b/lib/es6/lexing.js index d34084845c..531f2fd3ba 100644 --- a/lib/es6/lexing.js +++ b/lib/es6/lexing.js @@ -7,10 +7,10 @@ import * as Caml_bytes from "./caml_bytes.js"; import * as Caml_lexer from "./caml_lexer.js"; function engine(tbl, state, buf) { - var result = Caml_lexer.lex_engine(tbl, state, buf); + let result = Caml_lexer.lex_engine(tbl, state, buf); if (result >= 0) { buf.lex_start_p = buf.lex_curr_p; - var init = buf.lex_curr_p; + let init = buf.lex_curr_p; buf.lex_curr_p = { pos_fname: init.pos_fname, pos_lnum: init.pos_lnum, @@ -22,10 +22,10 @@ function engine(tbl, state, buf) { } function new_engine(tbl, state, buf) { - var result = Caml_lexer.new_lex_engine(tbl, state, buf); + let result = Caml_lexer.new_lex_engine(tbl, state, buf); if (result >= 0) { buf.lex_start_p = buf.lex_curr_p; - var init = buf.lex_curr_p; + let init = buf.lex_curr_p; buf.lex_curr_p = { pos_fname: init.pos_fname, pos_lnum: init.pos_lnum, @@ -36,7 +36,7 @@ function new_engine(tbl, state, buf) { return result; } -var zero_pos = { +let zero_pos = { pos_fname: "", pos_lnum: 1, pos_bol: 0, @@ -44,16 +44,16 @@ var zero_pos = { }; function from_function(f) { - var partial_arg = Caml_bytes.create(512); + let partial_arg = Caml_bytes.create(512); return { refill_buff: (function (param) { - var read = Curry._2(f, partial_arg, partial_arg.length); - var n = read > 0 ? read : (param.lex_eof_reached = true, 0); + let read = Curry._2(f, partial_arg, partial_arg.length); + let n = read > 0 ? read : (param.lex_eof_reached = true, 0); if ((param.lex_buffer_len + n | 0) > param.lex_buffer.length) { if (((param.lex_buffer_len - param.lex_start_pos | 0) + n | 0) <= param.lex_buffer.length) { Bytes.blit(param.lex_buffer, param.lex_start_pos, param.lex_buffer, 0, param.lex_buffer_len - param.lex_start_pos | 0); } else { - var newlen = (param.lex_buffer.length << 1); + let newlen = (param.lex_buffer.length << 1); if (((param.lex_buffer_len - param.lex_start_pos | 0) + n | 0) > newlen) { throw { RE_EXN_ID: "Failure", @@ -61,19 +61,19 @@ function from_function(f) { Error: new Error() }; } - var newbuf = Caml_bytes.create(newlen); + let newbuf = Caml_bytes.create(newlen); Bytes.blit(param.lex_buffer, param.lex_start_pos, newbuf, 0, param.lex_buffer_len - param.lex_start_pos | 0); param.lex_buffer = newbuf; } - var s = param.lex_start_pos; + let s = param.lex_start_pos; param.lex_abs_pos = param.lex_abs_pos + s | 0; param.lex_curr_pos = param.lex_curr_pos - s | 0; param.lex_start_pos = 0; param.lex_last_pos = param.lex_last_pos - s | 0; param.lex_buffer_len = param.lex_buffer_len - s | 0; - var t = param.lex_mem; - for(var i = 0 ,i_finish = t.length; i < i_finish; ++i){ - var v = Caml_array.get(t, i); + let t = param.lex_mem; + for(let i = 0 ,i_finish = t.length; i < i_finish; ++i){ + let v = Caml_array.get(t, i); if (v >= 0) { Caml_array.set(t, i, v - s | 0); } @@ -117,12 +117,12 @@ function from_string(s) { } function lexeme(lexbuf) { - var len = lexbuf.lex_curr_pos - lexbuf.lex_start_pos | 0; + let len = lexbuf.lex_curr_pos - lexbuf.lex_start_pos | 0; return Bytes.sub_string(lexbuf.lex_buffer, lexbuf.lex_start_pos, len); } function sub_lexeme(lexbuf, i1, i2) { - var len = i2 - i1 | 0; + let len = i2 - i1 | 0; return Bytes.sub_string(lexbuf.lex_buffer, i1, len); } @@ -130,7 +130,7 @@ function sub_lexeme_opt(lexbuf, i1, i2) { if (i1 < 0) { return; } - var len = i2 - i1 | 0; + let len = i2 - i1 | 0; return Bytes.sub_string(lexbuf.lex_buffer, i1, len); } @@ -166,7 +166,7 @@ function lexeme_end_p(lexbuf) { } function new_line(lexbuf) { - var lcp = lexbuf.lex_curr_p; + let lcp = lexbuf.lex_curr_p; lexbuf.lex_curr_p = { pos_fname: lcp.pos_fname, pos_lnum: lcp.pos_lnum + 1 | 0, @@ -178,7 +178,7 @@ function new_line(lexbuf) { function flush_input(lb) { lb.lex_curr_pos = 0; lb.lex_abs_pos = 0; - var init = lb.lex_curr_p; + let init = lb.lex_curr_p; lb.lex_curr_p = { pos_fname: init.pos_fname, pos_lnum: init.pos_lnum, @@ -188,7 +188,7 @@ function flush_input(lb) { lb.lex_buffer_len = 0; } -var dummy_pos = { +let dummy_pos = { pos_fname: "", pos_lnum: 0, pos_bol: 0, diff --git a/lib/es6/list.js b/lib/es6/list.js index 61eb8e59fd..d861adfc14 100644 --- a/lib/es6/list.js +++ b/lib/es6/list.js @@ -6,11 +6,11 @@ import * as Pervasives from "./pervasives.js"; import * as Caml_option from "./caml_option.js"; function length(l) { - var _len = 0; - var _param = l; + let _len = 0; + let _param = l; while(true) { - var param = _param; - var len = _len; + let param = _param; + let len = _len; if (!param) { return len; } @@ -57,11 +57,11 @@ function nth(l, n) { Error: new Error() }; } - var _l = l; - var _n = n; + let _l = l; + let _n = n; while(true) { - var n$1 = _n; - var l$1 = _l; + let n$1 = _n; + let l$1 = _l; if (l$1) { if (n$1 === 0) { return l$1.hd; @@ -86,11 +86,11 @@ function nth_opt(l, n) { Error: new Error() }; } - var _l = l; - var _n = n; + let _l = l; + let _n = n; while(true) { - var n$1 = _n; - var l$1 = _l; + let n$1 = _n; + let l$1 = _l; if (!l$1) { return; } @@ -105,8 +105,8 @@ function nth_opt(l, n) { function rev_append(_l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { return l2; } @@ -125,8 +125,8 @@ function rev(l) { function init_tailrec_aux(_acc, _i, n, f) { while(true) { - var i = _i; - var acc = _acc; + let i = _i; + let acc = _acc; if (i >= n) { return acc; } @@ -143,7 +143,7 @@ function init_aux(i, n, f) { if (i >= n) { return /* [] */0; } - var r = Curry._1(f, i); + let r = Curry._1(f, i); return { hd: r, tl: init_aux(i + 1 | 0, n, f) @@ -177,7 +177,7 @@ function map(f, param) { if (!param) { return /* [] */0; } - var r = Curry._1(f, param.hd); + let r = Curry._1(f, param.hd); return { hd: r, tl: map(f, param.tl) @@ -188,7 +188,7 @@ function mapi(i, f, param) { if (!param) { return /* [] */0; } - var r = Curry._2(f, i, param.hd); + let r = Curry._2(f, i, param.hd); return { hd: r, tl: mapi(i + 1 | 0, f, param.tl) @@ -200,11 +200,11 @@ function mapi$1(f, l) { } function rev_map(f, l) { - var _accu = /* [] */0; - var _param = l; + let _accu = /* [] */0; + let _param = l; while(true) { - var param = _param; - var accu = _accu; + let param = _param; + let accu = _accu; if (!param) { return accu; } @@ -219,7 +219,7 @@ function rev_map(f, l) { function iter(f, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return; } @@ -230,11 +230,11 @@ function iter(f, _param) { } function iteri(f, l) { - var _i = 0; - var _param = l; + let _i = 0; + let _param = l; while(true) { - var param = _param; - var i = _i; + let param = _param; + let i = _i; if (!param) { return; } @@ -247,8 +247,8 @@ function iteri(f, l) { function fold_left(f, _accu, _l) { while(true) { - var l = _l; - var accu = _accu; + let l = _l; + let accu = _accu; if (!l) { return accu; } @@ -269,7 +269,7 @@ function fold_right(f, l, accu) { function map2(f, l1, l2) { if (l1) { if (l2) { - var r = Curry._2(f, l1.hd, l2.hd); + let r = Curry._2(f, l1.hd, l2.hd); return { hd: r, tl: map2(f, l1.tl, l2.tl) @@ -292,13 +292,13 @@ function map2(f, l1, l2) { } function rev_map2(f, l1, l2) { - var _accu = /* [] */0; - var _l1 = l1; - var _l2 = l2; + let _accu = /* [] */0; + let _l1 = l1; + let _l2 = l2; while(true) { - var l2$1 = _l2; - var l1$1 = _l1; - var accu = _accu; + let l2$1 = _l2; + let l1$1 = _l1; + let accu = _accu; if (l1$1) { if (l2$1) { _l2 = l2$1.tl; @@ -328,8 +328,8 @@ function rev_map2(f, l1, l2) { function iter2(f, _l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (l1) { if (l2) { Curry._2(f, l1.hd, l2.hd); @@ -356,9 +356,9 @@ function iter2(f, _l1, _l2) { function fold_left2(f, _accu, _l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; - var accu = _accu; + let l2 = _l2; + let l1 = _l1; + let accu = _accu; if (l1) { if (l2) { _l2 = l2.tl; @@ -406,7 +406,7 @@ function fold_right2(f, l1, l2, accu) { function for_all(p, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return true; } @@ -420,7 +420,7 @@ function for_all(p, _param) { function exists(p, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return false; } @@ -434,8 +434,8 @@ function exists(p, _param) { function for_all2(p, _l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (l1) { if (l2) { if (!Curry._2(p, l1.hd, l2.hd)) { @@ -464,8 +464,8 @@ function for_all2(p, _l1, _l2) { function exists2(p, _l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (l1) { if (l2) { if (Curry._2(p, l1.hd, l2.hd)) { @@ -494,7 +494,7 @@ function exists2(p, _l1, _l2) { function mem(x, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return false; } @@ -508,7 +508,7 @@ function mem(x, _param) { function memq(x, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return false; } @@ -522,9 +522,9 @@ function memq(x, _param) { function assoc(x, _param) { while(true) { - var param = _param; + let param = _param; if (param) { - var match = param.hd; + let match = param.hd; if (Caml_obj.equal(match[0], x)) { return match[1]; } @@ -540,11 +540,11 @@ function assoc(x, _param) { function assoc_opt(x, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return; } - var match = param.hd; + let match = param.hd; if (Caml_obj.equal(match[0], x)) { return Caml_option.some(match[1]); } @@ -555,9 +555,9 @@ function assoc_opt(x, _param) { function assq(x, _param) { while(true) { - var param = _param; + let param = _param; if (param) { - var match = param.hd; + let match = param.hd; if (match[0] === x) { return match[1]; } @@ -573,11 +573,11 @@ function assq(x, _param) { function assq_opt(x, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return; } - var match = param.hd; + let match = param.hd; if (match[0] === x) { return Caml_option.some(match[1]); } @@ -588,7 +588,7 @@ function assq_opt(x, _param) { function mem_assoc(x, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return false; } @@ -602,7 +602,7 @@ function mem_assoc(x, _param) { function mem_assq(x, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return false; } @@ -618,8 +618,8 @@ function remove_assoc(x, param) { if (!param) { return /* [] */0; } - var l = param.tl; - var pair = param.hd; + let l = param.tl; + let pair = param.hd; if (Caml_obj.equal(pair[0], x)) { return l; } else { @@ -634,8 +634,8 @@ function remove_assq(x, param) { if (!param) { return /* [] */0; } - var l = param.tl; - var pair = param.hd; + let l = param.tl; + let pair = param.hd; if (pair[0] === x) { return l; } else { @@ -648,9 +648,9 @@ function remove_assq(x, param) { function find(p, _param) { while(true) { - var param = _param; + let param = _param; if (param) { - var x = param.hd; + let x = param.hd; if (Curry._1(p, x)) { return x; } @@ -666,11 +666,11 @@ function find(p, _param) { function find_opt(p, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return; } - var x = param.hd; + let x = param.hd; if (Curry._1(p, x)) { return Caml_option.some(x); } @@ -681,16 +681,16 @@ function find_opt(p, _param) { function find_all(p) { return function (param) { - var _accu = /* [] */0; - var _param = param; + let _accu = /* [] */0; + let _param = param; while(true) { - var param$1 = _param; - var accu = _accu; + let param$1 = _param; + let accu = _accu; if (!param$1) { return rev_append(accu, /* [] */0); } - var l = param$1.tl; - var x = param$1.hd; + let l = param$1.tl; + let x = param$1.hd; if (Curry._1(p, x)) { _param = l; _accu = { @@ -706,21 +706,21 @@ function find_all(p) { } function partition(p, l) { - var _yes = /* [] */0; - var _no = /* [] */0; - var _param = l; + let _yes = /* [] */0; + let _no = /* [] */0; + let _param = l; while(true) { - var param = _param; - var no = _no; - var yes = _yes; + let param = _param; + let no = _no; + let yes = _yes; if (!param) { return [ rev_append(yes, /* [] */0), rev_append(no, /* [] */0) ]; } - var l$1 = param.tl; - var x = param.hd; + let l$1 = param.tl; + let x = param.hd; if (Curry._1(p, x)) { _param = l$1; _yes = { @@ -745,8 +745,8 @@ function split(param) { /* [] */0 ]; } - var match = param.hd; - var match$1 = split(param.tl); + let match = param.hd; + let match$1 = split(param.tl); return [ { hd: match[0], @@ -793,8 +793,8 @@ function merge(cmp, l1, l2) { if (!l2) { return l1; } - var h2 = l2.hd; - var h1 = l1.hd; + let h2 = l2.hd; + let h1 = l1.hd; if (Curry._2(cmp, h1, h2) <= 0) { return { hd: h1, @@ -810,8 +810,8 @@ function merge(cmp, l1, l2) { function chop(_k, _l) { while(true) { - var l = _l; - var k = _k; + let l = _l; + let k = _k; if (k === 0) { return l; } @@ -833,16 +833,16 @@ function chop(_k, _l) { } function stable_sort(cmp, l) { - var sort = function (n, l) { + let sort = function (n, l) { if (n !== 2) { if (n === 3 && l) { - var match = l.tl; + let match = l.tl; if (match) { - var match$1 = match.tl; + let match$1 = match.tl; if (match$1) { - var x3 = match$1.hd; - var x2 = match.hd; - var x1 = l.hd; + let x3 = match$1.hd; + let x2 = match.hd; + let x1 = l.hd; if (Curry._2(cmp, x1, x2) <= 0) { if (Curry._2(cmp, x2, x3) <= 0) { return { @@ -919,10 +919,10 @@ function stable_sort(cmp, l) { } } else if (l) { - var match$2 = l.tl; + let match$2 = l.tl; if (match$2) { - var x2$1 = match$2.hd; - var x1$1 = l.hd; + let x2$1 = match$2.hd; + let x1$1 = l.hd; if (Curry._2(cmp, x1$1, x2$1) <= 0) { return { hd: x1$1, @@ -943,26 +943,26 @@ function stable_sort(cmp, l) { } } - var n1 = (n >> 1); - var n2 = n - n1 | 0; - var l2 = chop(n1, l); - var s1 = rev_sort(n1, l); - var s2 = rev_sort(n2, l2); - var _l1 = s1; - var _l2 = s2; - var _accu = /* [] */0; + let n1 = (n >> 1); + let n2 = n - n1 | 0; + let l2 = chop(n1, l); + let s1 = rev_sort(n1, l); + let s2 = rev_sort(n2, l2); + let _l1 = s1; + let _l2 = s2; + let _accu = /* [] */0; while(true) { - var accu = _accu; - var l2$1 = _l2; - var l1 = _l1; + let accu = _accu; + let l2$1 = _l2; + let l1 = _l1; if (!l1) { return rev_append(l2$1, accu); } if (!l2$1) { return rev_append(l1, accu); } - var h2 = l2$1.hd; - var h1 = l1.hd; + let h2 = l2$1.hd; + let h1 = l1.hd; if (Curry._2(cmp, h1, h2) > 0) { _accu = { hd: h1, @@ -979,16 +979,16 @@ function stable_sort(cmp, l) { continue ; }; }; - var rev_sort = function (n, l) { + let rev_sort = function (n, l) { if (n !== 2) { if (n === 3 && l) { - var match = l.tl; + let match = l.tl; if (match) { - var match$1 = match.tl; + let match$1 = match.tl; if (match$1) { - var x3 = match$1.hd; - var x2 = match.hd; - var x1 = l.hd; + let x3 = match$1.hd; + let x2 = match.hd; + let x1 = l.hd; if (Curry._2(cmp, x1, x2) > 0) { if (Curry._2(cmp, x2, x3) > 0) { return { @@ -1065,10 +1065,10 @@ function stable_sort(cmp, l) { } } else if (l) { - var match$2 = l.tl; + let match$2 = l.tl; if (match$2) { - var x2$1 = match$2.hd; - var x1$1 = l.hd; + let x2$1 = match$2.hd; + let x1$1 = l.hd; if (Curry._2(cmp, x1$1, x2$1) > 0) { return { hd: x1$1, @@ -1089,26 +1089,26 @@ function stable_sort(cmp, l) { } } - var n1 = (n >> 1); - var n2 = n - n1 | 0; - var l2 = chop(n1, l); - var s1 = sort(n1, l); - var s2 = sort(n2, l2); - var _l1 = s1; - var _l2 = s2; - var _accu = /* [] */0; + let n1 = (n >> 1); + let n2 = n - n1 | 0; + let l2 = chop(n1, l); + let s1 = sort(n1, l); + let s2 = sort(n2, l2); + let _l1 = s1; + let _l2 = s2; + let _accu = /* [] */0; while(true) { - var accu = _accu; - var l2$1 = _l2; - var l1 = _l1; + let accu = _accu; + let l2$1 = _l2; + let l1 = _l1; if (!l1) { return rev_append(l2$1, accu); } if (!l2$1) { return rev_append(l1, accu); } - var h2 = l2$1.hd; - var h1 = l1.hd; + let h2 = l2$1.hd; + let h1 = l1.hd; if (Curry._2(cmp, h1, h2) <= 0) { _accu = { hd: h1, @@ -1125,7 +1125,7 @@ function stable_sort(cmp, l) { continue ; }; }; - var len = length(l); + let len = length(l); if (len < 2) { return l; } else { @@ -1134,19 +1134,19 @@ function stable_sort(cmp, l) { } function sort_uniq(cmp, l) { - var sort = function (n, l) { + let sort = function (n, l) { if (n !== 2) { if (n === 3 && l) { - var match = l.tl; + let match = l.tl; if (match) { - var match$1 = match.tl; + let match$1 = match.tl; if (match$1) { - var x3 = match$1.hd; - var x2 = match.hd; - var x1 = l.hd; - var c = Curry._2(cmp, x1, x2); + let x3 = match$1.hd; + let x2 = match.hd; + let x1 = l.hd; + let c = Curry._2(cmp, x1, x2); if (c === 0) { - var c$1 = Curry._2(cmp, x2, x3); + let c$1 = Curry._2(cmp, x2, x3); if (c$1 === 0) { return { hd: x2, @@ -1171,7 +1171,7 @@ function sort_uniq(cmp, l) { } } if (c < 0) { - var c$2 = Curry._2(cmp, x2, x3); + let c$2 = Curry._2(cmp, x2, x3); if (c$2 === 0) { return { hd: x1, @@ -1193,7 +1193,7 @@ function sort_uniq(cmp, l) { } }; } - var c$3 = Curry._2(cmp, x1, x3); + let c$3 = Curry._2(cmp, x1, x3); if (c$3 === 0) { return { hd: x1, @@ -1226,7 +1226,7 @@ function sort_uniq(cmp, l) { }; } } - var c$4 = Curry._2(cmp, x1, x3); + let c$4 = Curry._2(cmp, x1, x3); if (c$4 === 0) { return { hd: x2, @@ -1248,7 +1248,7 @@ function sort_uniq(cmp, l) { } }; } - var c$5 = Curry._2(cmp, x2, x3); + let c$5 = Curry._2(cmp, x2, x3); if (c$5 === 0) { return { hd: x2, @@ -1287,11 +1287,11 @@ function sort_uniq(cmp, l) { } } else if (l) { - var match$2 = l.tl; + let match$2 = l.tl; if (match$2) { - var x2$1 = match$2.hd; - var x1$1 = l.hd; - var c$6 = Curry._2(cmp, x1$1, x2$1); + let x2$1 = match$2.hd; + let x1$1 = l.hd; + let c$6 = Curry._2(cmp, x1$1, x2$1); if (c$6 === 0) { return { hd: x1$1, @@ -1317,29 +1317,29 @@ function sort_uniq(cmp, l) { } } - var n1 = (n >> 1); - var n2 = n - n1 | 0; - var l2 = chop(n1, l); - var s1 = rev_sort(n1, l); - var s2 = rev_sort(n2, l2); - var _l1 = s1; - var _l2 = s2; - var _accu = /* [] */0; + let n1 = (n >> 1); + let n2 = n - n1 | 0; + let l2 = chop(n1, l); + let s1 = rev_sort(n1, l); + let s2 = rev_sort(n2, l2); + let _l1 = s1; + let _l2 = s2; + let _accu = /* [] */0; while(true) { - var accu = _accu; - var l2$1 = _l2; - var l1 = _l1; + let accu = _accu; + let l2$1 = _l2; + let l1 = _l1; if (!l1) { return rev_append(l2$1, accu); } if (!l2$1) { return rev_append(l1, accu); } - var t2 = l2$1.tl; - var h2 = l2$1.hd; - var t1 = l1.tl; - var h1 = l1.hd; - var c$7 = Curry._2(cmp, h1, h2); + let t2 = l2$1.tl; + let h2 = l2$1.hd; + let t1 = l1.tl; + let h1 = l1.hd; + let c$7 = Curry._2(cmp, h1, h2); if (c$7 === 0) { _accu = { hd: h1, @@ -1365,19 +1365,19 @@ function sort_uniq(cmp, l) { continue ; }; }; - var rev_sort = function (n, l) { + let rev_sort = function (n, l) { if (n !== 2) { if (n === 3 && l) { - var match = l.tl; + let match = l.tl; if (match) { - var match$1 = match.tl; + let match$1 = match.tl; if (match$1) { - var x3 = match$1.hd; - var x2 = match.hd; - var x1 = l.hd; - var c = Curry._2(cmp, x1, x2); + let x3 = match$1.hd; + let x2 = match.hd; + let x1 = l.hd; + let c = Curry._2(cmp, x1, x2); if (c === 0) { - var c$1 = Curry._2(cmp, x2, x3); + let c$1 = Curry._2(cmp, x2, x3); if (c$1 === 0) { return { hd: x2, @@ -1402,7 +1402,7 @@ function sort_uniq(cmp, l) { } } if (c > 0) { - var c$2 = Curry._2(cmp, x2, x3); + let c$2 = Curry._2(cmp, x2, x3); if (c$2 === 0) { return { hd: x1, @@ -1424,7 +1424,7 @@ function sort_uniq(cmp, l) { } }; } - var c$3 = Curry._2(cmp, x1, x3); + let c$3 = Curry._2(cmp, x1, x3); if (c$3 === 0) { return { hd: x1, @@ -1457,7 +1457,7 @@ function sort_uniq(cmp, l) { }; } } - var c$4 = Curry._2(cmp, x1, x3); + let c$4 = Curry._2(cmp, x1, x3); if (c$4 === 0) { return { hd: x2, @@ -1479,7 +1479,7 @@ function sort_uniq(cmp, l) { } }; } - var c$5 = Curry._2(cmp, x2, x3); + let c$5 = Curry._2(cmp, x2, x3); if (c$5 === 0) { return { hd: x2, @@ -1518,11 +1518,11 @@ function sort_uniq(cmp, l) { } } else if (l) { - var match$2 = l.tl; + let match$2 = l.tl; if (match$2) { - var x2$1 = match$2.hd; - var x1$1 = l.hd; - var c$6 = Curry._2(cmp, x1$1, x2$1); + let x2$1 = match$2.hd; + let x1$1 = l.hd; + let c$6 = Curry._2(cmp, x1$1, x2$1); if (c$6 === 0) { return { hd: x1$1, @@ -1548,29 +1548,29 @@ function sort_uniq(cmp, l) { } } - var n1 = (n >> 1); - var n2 = n - n1 | 0; - var l2 = chop(n1, l); - var s1 = sort(n1, l); - var s2 = sort(n2, l2); - var _l1 = s1; - var _l2 = s2; - var _accu = /* [] */0; + let n1 = (n >> 1); + let n2 = n - n1 | 0; + let l2 = chop(n1, l); + let s1 = sort(n1, l); + let s2 = sort(n2, l2); + let _l1 = s1; + let _l2 = s2; + let _accu = /* [] */0; while(true) { - var accu = _accu; - var l2$1 = _l2; - var l1 = _l1; + let accu = _accu; + let l2$1 = _l2; + let l1 = _l1; if (!l1) { return rev_append(l2$1, accu); } if (!l2$1) { return rev_append(l1, accu); } - var t2 = l2$1.tl; - var h2 = l2$1.hd; - var t1 = l1.tl; - var h1 = l1.hd; - var c$7 = Curry._2(cmp, h1, h2); + let t2 = l2$1.tl; + let h2 = l2$1.hd; + let t1 = l1.tl; + let h1 = l1.hd; + let c$7 = Curry._2(cmp, h1, h2); if (c$7 === 0) { _accu = { hd: h1, @@ -1596,7 +1596,7 @@ function sort_uniq(cmp, l) { continue ; }; }; - var len = length(l); + let len = length(l); if (len < 2) { return l; } else { @@ -1606,8 +1606,8 @@ function sort_uniq(cmp, l) { function compare_lengths(_l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { if (l2) { return -1; @@ -1626,8 +1626,8 @@ function compare_lengths(_l1, _l2) { function compare_length_with(_l, _n) { while(true) { - var n = _n; - var l = _l; + let n = _n; + let l = _l; if (!l) { if (n === 0) { return 0; @@ -1646,15 +1646,15 @@ function compare_length_with(_l, _n) { }; } -var append = Pervasives.$at; +let append = Pervasives.$at; -var concat = flatten; +let concat = flatten; -var filter = find_all; +let filter = find_all; -var sort = stable_sort; +let sort = stable_sort; -var fast_sort = stable_sort; +let fast_sort = stable_sort; export { length, diff --git a/lib/es6/listLabels.js b/lib/es6/listLabels.js index cf799c7b6c..651d67236d 100644 --- a/lib/es6/listLabels.js +++ b/lib/es6/listLabels.js @@ -6,11 +6,11 @@ import * as Pervasives from "./pervasives.js"; import * as Caml_option from "./caml_option.js"; function length(l) { - var _len = 0; - var _param = l; + let _len = 0; + let _param = l; while(true) { - var param = _param; - var len = _len; + let param = _param; + let len = _len; if (!param) { return len; } @@ -57,11 +57,11 @@ function nth(l, n) { Error: new Error() }; } - var _l = l; - var _n = n; + let _l = l; + let _n = n; while(true) { - var n$1 = _n; - var l$1 = _l; + let n$1 = _n; + let l$1 = _l; if (l$1) { if (n$1 === 0) { return l$1.hd; @@ -86,11 +86,11 @@ function nth_opt(l, n) { Error: new Error() }; } - var _l = l; - var _n = n; + let _l = l; + let _n = n; while(true) { - var n$1 = _n; - var l$1 = _l; + let n$1 = _n; + let l$1 = _l; if (!l$1) { return; } @@ -105,8 +105,8 @@ function nth_opt(l, n) { function rev_append(_l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { return l2; } @@ -125,8 +125,8 @@ function rev(l) { function init_tailrec_aux(_acc, _i, n, f) { while(true) { - var i = _i; - var acc = _acc; + let i = _i; + let acc = _acc; if (i >= n) { return acc; } @@ -143,7 +143,7 @@ function init_aux(i, n, f) { if (i >= n) { return /* [] */0; } - var r = Curry._1(f, i); + let r = Curry._1(f, i); return { hd: r, tl: init_aux(i + 1 | 0, n, f) @@ -177,7 +177,7 @@ function map(f, param) { if (!param) { return /* [] */0; } - var r = Curry._1(f, param.hd); + let r = Curry._1(f, param.hd); return { hd: r, tl: map(f, param.tl) @@ -188,7 +188,7 @@ function mapi(i, f, param) { if (!param) { return /* [] */0; } - var r = Curry._2(f, i, param.hd); + let r = Curry._2(f, i, param.hd); return { hd: r, tl: mapi(i + 1 | 0, f, param.tl) @@ -200,11 +200,11 @@ function mapi$1(f, l) { } function rev_map(f, l) { - var _accu = /* [] */0; - var _param = l; + let _accu = /* [] */0; + let _param = l; while(true) { - var param = _param; - var accu = _accu; + let param = _param; + let accu = _accu; if (!param) { return accu; } @@ -219,7 +219,7 @@ function rev_map(f, l) { function iter(f, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return; } @@ -230,11 +230,11 @@ function iter(f, _param) { } function iteri(f, l) { - var _i = 0; - var _param = l; + let _i = 0; + let _param = l; while(true) { - var param = _param; - var i = _i; + let param = _param; + let i = _i; if (!param) { return; } @@ -247,8 +247,8 @@ function iteri(f, l) { function fold_left(f, _accu, _l) { while(true) { - var l = _l; - var accu = _accu; + let l = _l; + let accu = _accu; if (!l) { return accu; } @@ -269,7 +269,7 @@ function fold_right(f, l, accu) { function map2(f, l1, l2) { if (l1) { if (l2) { - var r = Curry._2(f, l1.hd, l2.hd); + let r = Curry._2(f, l1.hd, l2.hd); return { hd: r, tl: map2(f, l1.tl, l2.tl) @@ -292,13 +292,13 @@ function map2(f, l1, l2) { } function rev_map2(f, l1, l2) { - var _accu = /* [] */0; - var _l1 = l1; - var _l2 = l2; + let _accu = /* [] */0; + let _l1 = l1; + let _l2 = l2; while(true) { - var l2$1 = _l2; - var l1$1 = _l1; - var accu = _accu; + let l2$1 = _l2; + let l1$1 = _l1; + let accu = _accu; if (l1$1) { if (l2$1) { _l2 = l2$1.tl; @@ -328,8 +328,8 @@ function rev_map2(f, l1, l2) { function iter2(f, _l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (l1) { if (l2) { Curry._2(f, l1.hd, l2.hd); @@ -356,9 +356,9 @@ function iter2(f, _l1, _l2) { function fold_left2(f, _accu, _l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; - var accu = _accu; + let l2 = _l2; + let l1 = _l1; + let accu = _accu; if (l1) { if (l2) { _l2 = l2.tl; @@ -406,7 +406,7 @@ function fold_right2(f, l1, l2, accu) { function for_all(p, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return true; } @@ -420,7 +420,7 @@ function for_all(p, _param) { function exists(p, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return false; } @@ -434,8 +434,8 @@ function exists(p, _param) { function for_all2(p, _l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (l1) { if (l2) { if (!Curry._2(p, l1.hd, l2.hd)) { @@ -464,8 +464,8 @@ function for_all2(p, _l1, _l2) { function exists2(p, _l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (l1) { if (l2) { if (Curry._2(p, l1.hd, l2.hd)) { @@ -494,7 +494,7 @@ function exists2(p, _l1, _l2) { function mem(x, _set) { while(true) { - var set = _set; + let set = _set; if (!set) { return false; } @@ -508,7 +508,7 @@ function mem(x, _set) { function memq(x, _set) { while(true) { - var set = _set; + let set = _set; if (!set) { return false; } @@ -522,9 +522,9 @@ function memq(x, _set) { function assoc(x, _param) { while(true) { - var param = _param; + let param = _param; if (param) { - var match = param.hd; + let match = param.hd; if (Caml_obj.equal(match[0], x)) { return match[1]; } @@ -540,11 +540,11 @@ function assoc(x, _param) { function assoc_opt(x, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return; } - var match = param.hd; + let match = param.hd; if (Caml_obj.equal(match[0], x)) { return Caml_option.some(match[1]); } @@ -555,9 +555,9 @@ function assoc_opt(x, _param) { function assq(x, _param) { while(true) { - var param = _param; + let param = _param; if (param) { - var match = param.hd; + let match = param.hd; if (match[0] === x) { return match[1]; } @@ -573,11 +573,11 @@ function assq(x, _param) { function assq_opt(x, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return; } - var match = param.hd; + let match = param.hd; if (match[0] === x) { return Caml_option.some(match[1]); } @@ -588,7 +588,7 @@ function assq_opt(x, _param) { function mem_assoc(x, _map) { while(true) { - var map = _map; + let map = _map; if (!map) { return false; } @@ -602,7 +602,7 @@ function mem_assoc(x, _map) { function mem_assq(x, _map) { while(true) { - var map = _map; + let map = _map; if (!map) { return false; } @@ -618,8 +618,8 @@ function remove_assoc(x, param) { if (!param) { return /* [] */0; } - var l = param.tl; - var pair = param.hd; + let l = param.tl; + let pair = param.hd; if (Caml_obj.equal(pair[0], x)) { return l; } else { @@ -634,8 +634,8 @@ function remove_assq(x, param) { if (!param) { return /* [] */0; } - var l = param.tl; - var pair = param.hd; + let l = param.tl; + let pair = param.hd; if (pair[0] === x) { return l; } else { @@ -648,9 +648,9 @@ function remove_assq(x, param) { function find(p, _param) { while(true) { - var param = _param; + let param = _param; if (param) { - var x = param.hd; + let x = param.hd; if (Curry._1(p, x)) { return x; } @@ -666,11 +666,11 @@ function find(p, _param) { function find_opt(p, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return; } - var x = param.hd; + let x = param.hd; if (Curry._1(p, x)) { return Caml_option.some(x); } @@ -681,16 +681,16 @@ function find_opt(p, _param) { function find_all(p) { return function (param) { - var _accu = /* [] */0; - var _param = param; + let _accu = /* [] */0; + let _param = param; while(true) { - var param$1 = _param; - var accu = _accu; + let param$1 = _param; + let accu = _accu; if (!param$1) { return rev_append(accu, /* [] */0); } - var l = param$1.tl; - var x = param$1.hd; + let l = param$1.tl; + let x = param$1.hd; if (Curry._1(p, x)) { _param = l; _accu = { @@ -706,21 +706,21 @@ function find_all(p) { } function partition(p, l) { - var _yes = /* [] */0; - var _no = /* [] */0; - var _param = l; + let _yes = /* [] */0; + let _no = /* [] */0; + let _param = l; while(true) { - var param = _param; - var no = _no; - var yes = _yes; + let param = _param; + let no = _no; + let yes = _yes; if (!param) { return [ rev_append(yes, /* [] */0), rev_append(no, /* [] */0) ]; } - var l$1 = param.tl; - var x = param.hd; + let l$1 = param.tl; + let x = param.hd; if (Curry._1(p, x)) { _param = l$1; _yes = { @@ -745,8 +745,8 @@ function split(param) { /* [] */0 ]; } - var match = param.hd; - var match$1 = split(param.tl); + let match = param.hd; + let match$1 = split(param.tl); return [ { hd: match[0], @@ -793,8 +793,8 @@ function merge(cmp, l1, l2) { if (!l2) { return l1; } - var h2 = l2.hd; - var h1 = l1.hd; + let h2 = l2.hd; + let h1 = l1.hd; if (Curry._2(cmp, h1, h2) <= 0) { return { hd: h1, @@ -810,8 +810,8 @@ function merge(cmp, l1, l2) { function chop(_k, _l) { while(true) { - var l = _l; - var k = _k; + let l = _l; + let k = _k; if (k === 0) { return l; } @@ -833,16 +833,16 @@ function chop(_k, _l) { } function stable_sort(cmp, l) { - var sort = function (n, l) { + let sort = function (n, l) { if (n !== 2) { if (n === 3 && l) { - var match = l.tl; + let match = l.tl; if (match) { - var match$1 = match.tl; + let match$1 = match.tl; if (match$1) { - var x3 = match$1.hd; - var x2 = match.hd; - var x1 = l.hd; + let x3 = match$1.hd; + let x2 = match.hd; + let x1 = l.hd; if (Curry._2(cmp, x1, x2) <= 0) { if (Curry._2(cmp, x2, x3) <= 0) { return { @@ -919,10 +919,10 @@ function stable_sort(cmp, l) { } } else if (l) { - var match$2 = l.tl; + let match$2 = l.tl; if (match$2) { - var x2$1 = match$2.hd; - var x1$1 = l.hd; + let x2$1 = match$2.hd; + let x1$1 = l.hd; if (Curry._2(cmp, x1$1, x2$1) <= 0) { return { hd: x1$1, @@ -943,26 +943,26 @@ function stable_sort(cmp, l) { } } - var n1 = (n >> 1); - var n2 = n - n1 | 0; - var l2 = chop(n1, l); - var s1 = rev_sort(n1, l); - var s2 = rev_sort(n2, l2); - var _l1 = s1; - var _l2 = s2; - var _accu = /* [] */0; + let n1 = (n >> 1); + let n2 = n - n1 | 0; + let l2 = chop(n1, l); + let s1 = rev_sort(n1, l); + let s2 = rev_sort(n2, l2); + let _l1 = s1; + let _l2 = s2; + let _accu = /* [] */0; while(true) { - var accu = _accu; - var l2$1 = _l2; - var l1 = _l1; + let accu = _accu; + let l2$1 = _l2; + let l1 = _l1; if (!l1) { return rev_append(l2$1, accu); } if (!l2$1) { return rev_append(l1, accu); } - var h2 = l2$1.hd; - var h1 = l1.hd; + let h2 = l2$1.hd; + let h1 = l1.hd; if (Curry._2(cmp, h1, h2) > 0) { _accu = { hd: h1, @@ -979,16 +979,16 @@ function stable_sort(cmp, l) { continue ; }; }; - var rev_sort = function (n, l) { + let rev_sort = function (n, l) { if (n !== 2) { if (n === 3 && l) { - var match = l.tl; + let match = l.tl; if (match) { - var match$1 = match.tl; + let match$1 = match.tl; if (match$1) { - var x3 = match$1.hd; - var x2 = match.hd; - var x1 = l.hd; + let x3 = match$1.hd; + let x2 = match.hd; + let x1 = l.hd; if (Curry._2(cmp, x1, x2) > 0) { if (Curry._2(cmp, x2, x3) > 0) { return { @@ -1065,10 +1065,10 @@ function stable_sort(cmp, l) { } } else if (l) { - var match$2 = l.tl; + let match$2 = l.tl; if (match$2) { - var x2$1 = match$2.hd; - var x1$1 = l.hd; + let x2$1 = match$2.hd; + let x1$1 = l.hd; if (Curry._2(cmp, x1$1, x2$1) > 0) { return { hd: x1$1, @@ -1089,26 +1089,26 @@ function stable_sort(cmp, l) { } } - var n1 = (n >> 1); - var n2 = n - n1 | 0; - var l2 = chop(n1, l); - var s1 = sort(n1, l); - var s2 = sort(n2, l2); - var _l1 = s1; - var _l2 = s2; - var _accu = /* [] */0; + let n1 = (n >> 1); + let n2 = n - n1 | 0; + let l2 = chop(n1, l); + let s1 = sort(n1, l); + let s2 = sort(n2, l2); + let _l1 = s1; + let _l2 = s2; + let _accu = /* [] */0; while(true) { - var accu = _accu; - var l2$1 = _l2; - var l1 = _l1; + let accu = _accu; + let l2$1 = _l2; + let l1 = _l1; if (!l1) { return rev_append(l2$1, accu); } if (!l2$1) { return rev_append(l1, accu); } - var h2 = l2$1.hd; - var h1 = l1.hd; + let h2 = l2$1.hd; + let h1 = l1.hd; if (Curry._2(cmp, h1, h2) <= 0) { _accu = { hd: h1, @@ -1125,7 +1125,7 @@ function stable_sort(cmp, l) { continue ; }; }; - var len = length(l); + let len = length(l); if (len < 2) { return l; } else { @@ -1134,19 +1134,19 @@ function stable_sort(cmp, l) { } function sort_uniq(cmp, l) { - var sort = function (n, l) { + let sort = function (n, l) { if (n !== 2) { if (n === 3 && l) { - var match = l.tl; + let match = l.tl; if (match) { - var match$1 = match.tl; + let match$1 = match.tl; if (match$1) { - var x3 = match$1.hd; - var x2 = match.hd; - var x1 = l.hd; - var c = Curry._2(cmp, x1, x2); + let x3 = match$1.hd; + let x2 = match.hd; + let x1 = l.hd; + let c = Curry._2(cmp, x1, x2); if (c === 0) { - var c$1 = Curry._2(cmp, x2, x3); + let c$1 = Curry._2(cmp, x2, x3); if (c$1 === 0) { return { hd: x2, @@ -1171,7 +1171,7 @@ function sort_uniq(cmp, l) { } } if (c < 0) { - var c$2 = Curry._2(cmp, x2, x3); + let c$2 = Curry._2(cmp, x2, x3); if (c$2 === 0) { return { hd: x1, @@ -1193,7 +1193,7 @@ function sort_uniq(cmp, l) { } }; } - var c$3 = Curry._2(cmp, x1, x3); + let c$3 = Curry._2(cmp, x1, x3); if (c$3 === 0) { return { hd: x1, @@ -1226,7 +1226,7 @@ function sort_uniq(cmp, l) { }; } } - var c$4 = Curry._2(cmp, x1, x3); + let c$4 = Curry._2(cmp, x1, x3); if (c$4 === 0) { return { hd: x2, @@ -1248,7 +1248,7 @@ function sort_uniq(cmp, l) { } }; } - var c$5 = Curry._2(cmp, x2, x3); + let c$5 = Curry._2(cmp, x2, x3); if (c$5 === 0) { return { hd: x2, @@ -1287,11 +1287,11 @@ function sort_uniq(cmp, l) { } } else if (l) { - var match$2 = l.tl; + let match$2 = l.tl; if (match$2) { - var x2$1 = match$2.hd; - var x1$1 = l.hd; - var c$6 = Curry._2(cmp, x1$1, x2$1); + let x2$1 = match$2.hd; + let x1$1 = l.hd; + let c$6 = Curry._2(cmp, x1$1, x2$1); if (c$6 === 0) { return { hd: x1$1, @@ -1317,29 +1317,29 @@ function sort_uniq(cmp, l) { } } - var n1 = (n >> 1); - var n2 = n - n1 | 0; - var l2 = chop(n1, l); - var s1 = rev_sort(n1, l); - var s2 = rev_sort(n2, l2); - var _l1 = s1; - var _l2 = s2; - var _accu = /* [] */0; + let n1 = (n >> 1); + let n2 = n - n1 | 0; + let l2 = chop(n1, l); + let s1 = rev_sort(n1, l); + let s2 = rev_sort(n2, l2); + let _l1 = s1; + let _l2 = s2; + let _accu = /* [] */0; while(true) { - var accu = _accu; - var l2$1 = _l2; - var l1 = _l1; + let accu = _accu; + let l2$1 = _l2; + let l1 = _l1; if (!l1) { return rev_append(l2$1, accu); } if (!l2$1) { return rev_append(l1, accu); } - var t2 = l2$1.tl; - var h2 = l2$1.hd; - var t1 = l1.tl; - var h1 = l1.hd; - var c$7 = Curry._2(cmp, h1, h2); + let t2 = l2$1.tl; + let h2 = l2$1.hd; + let t1 = l1.tl; + let h1 = l1.hd; + let c$7 = Curry._2(cmp, h1, h2); if (c$7 === 0) { _accu = { hd: h1, @@ -1365,19 +1365,19 @@ function sort_uniq(cmp, l) { continue ; }; }; - var rev_sort = function (n, l) { + let rev_sort = function (n, l) { if (n !== 2) { if (n === 3 && l) { - var match = l.tl; + let match = l.tl; if (match) { - var match$1 = match.tl; + let match$1 = match.tl; if (match$1) { - var x3 = match$1.hd; - var x2 = match.hd; - var x1 = l.hd; - var c = Curry._2(cmp, x1, x2); + let x3 = match$1.hd; + let x2 = match.hd; + let x1 = l.hd; + let c = Curry._2(cmp, x1, x2); if (c === 0) { - var c$1 = Curry._2(cmp, x2, x3); + let c$1 = Curry._2(cmp, x2, x3); if (c$1 === 0) { return { hd: x2, @@ -1402,7 +1402,7 @@ function sort_uniq(cmp, l) { } } if (c > 0) { - var c$2 = Curry._2(cmp, x2, x3); + let c$2 = Curry._2(cmp, x2, x3); if (c$2 === 0) { return { hd: x1, @@ -1424,7 +1424,7 @@ function sort_uniq(cmp, l) { } }; } - var c$3 = Curry._2(cmp, x1, x3); + let c$3 = Curry._2(cmp, x1, x3); if (c$3 === 0) { return { hd: x1, @@ -1457,7 +1457,7 @@ function sort_uniq(cmp, l) { }; } } - var c$4 = Curry._2(cmp, x1, x3); + let c$4 = Curry._2(cmp, x1, x3); if (c$4 === 0) { return { hd: x2, @@ -1479,7 +1479,7 @@ function sort_uniq(cmp, l) { } }; } - var c$5 = Curry._2(cmp, x2, x3); + let c$5 = Curry._2(cmp, x2, x3); if (c$5 === 0) { return { hd: x2, @@ -1518,11 +1518,11 @@ function sort_uniq(cmp, l) { } } else if (l) { - var match$2 = l.tl; + let match$2 = l.tl; if (match$2) { - var x2$1 = match$2.hd; - var x1$1 = l.hd; - var c$6 = Curry._2(cmp, x1$1, x2$1); + let x2$1 = match$2.hd; + let x1$1 = l.hd; + let c$6 = Curry._2(cmp, x1$1, x2$1); if (c$6 === 0) { return { hd: x1$1, @@ -1548,29 +1548,29 @@ function sort_uniq(cmp, l) { } } - var n1 = (n >> 1); - var n2 = n - n1 | 0; - var l2 = chop(n1, l); - var s1 = sort(n1, l); - var s2 = sort(n2, l2); - var _l1 = s1; - var _l2 = s2; - var _accu = /* [] */0; + let n1 = (n >> 1); + let n2 = n - n1 | 0; + let l2 = chop(n1, l); + let s1 = sort(n1, l); + let s2 = sort(n2, l2); + let _l1 = s1; + let _l2 = s2; + let _accu = /* [] */0; while(true) { - var accu = _accu; - var l2$1 = _l2; - var l1 = _l1; + let accu = _accu; + let l2$1 = _l2; + let l1 = _l1; if (!l1) { return rev_append(l2$1, accu); } if (!l2$1) { return rev_append(l1, accu); } - var t2 = l2$1.tl; - var h2 = l2$1.hd; - var t1 = l1.tl; - var h1 = l1.hd; - var c$7 = Curry._2(cmp, h1, h2); + let t2 = l2$1.tl; + let h2 = l2$1.hd; + let t1 = l1.tl; + let h1 = l1.hd; + let c$7 = Curry._2(cmp, h1, h2); if (c$7 === 0) { _accu = { hd: h1, @@ -1596,7 +1596,7 @@ function sort_uniq(cmp, l) { continue ; }; }; - var len = length(l); + let len = length(l); if (len < 2) { return l; } else { @@ -1606,8 +1606,8 @@ function sort_uniq(cmp, l) { function compare_lengths(_l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { if (l2) { return -1; @@ -1626,8 +1626,8 @@ function compare_lengths(_l1, _l2) { function compare_length_with(_l, _n) { while(true) { - var n = _n; - var l = _l; + let n = _n; + let l = _l; if (!l) { if (n === 0) { return 0; @@ -1646,15 +1646,15 @@ function compare_length_with(_l, _n) { }; } -var append = Pervasives.$at; +let append = Pervasives.$at; -var concat = flatten; +let concat = flatten; -var filter = find_all; +let filter = find_all; -var sort = stable_sort; +let sort = stable_sort; -var fast_sort = stable_sort; +let fast_sort = stable_sort; export { length, diff --git a/lib/es6/map.js b/lib/es6/map.js index 4c6cc71053..dac7b47369 100644 --- a/lib/es6/map.js +++ b/lib/es6/map.js @@ -4,16 +4,16 @@ import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; function Make(funarg) { - var height = function (param) { + let height = function (param) { if (typeof param !== "object") { return 0; } else { return param.h; } }; - var create = function (l, x, d, r) { - var hl = height(l); - var hr = height(r); + let create = function (l, x, d, r) { + let hl = height(l); + let hr = height(r); return { TAG: "Node", l: l, @@ -23,7 +23,7 @@ function Make(funarg) { h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0 }; }; - var singleton = function (x, d) { + let singleton = function (x, d) { return { TAG: "Node", l: "Empty", @@ -33,10 +33,10 @@ function Make(funarg) { h: 1 }; }; - var bal = function (l, x, d, r) { - var hl; + let bal = function (l, x, d, r) { + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -46,10 +46,10 @@ function Make(funarg) { Error: new Error() }; } - var lr = l.r; - var ld = l.d; - var lv = l.v; - var ll = l.l; + let lr = l.r; + let ld = l.d; + let lv = l.v; + let ll = l.l; if (height(ll) >= height(lr)) { return create(ll, lv, ld, create(lr, x, d, r)); } @@ -79,10 +79,10 @@ function Make(funarg) { Error: new Error() }; } - var rr = r.r; - var rd = r.d; - var rv = r.v; - var rl = r.l; + let rr = r.r; + let rd = r.d; + let rv = r.v; + let rl = r.l; if (height(rr) >= height(rl)) { return create(create(l, x, d, rl), rv, rd, rr); } @@ -95,14 +95,14 @@ function Make(funarg) { Error: new Error() }; }; - var is_empty = function (param) { + let is_empty = function (param) { if (typeof param !== "object") { return true; } else { return false; } }; - var add = function (x, data, param) { + let add = function (x, data, param) { if (typeof param !== "object") { return { TAG: "Node", @@ -113,11 +113,11 @@ function Make(funarg) { h: 1 }; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Curry._2(funarg.compare, x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { if (d === data) { return param; @@ -133,30 +133,30 @@ function Make(funarg) { } } if (c < 0) { - var ll = add(x, data, l); + let ll = add(x, data, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = add(x, data, r); + let rr = add(x, data, r); if (r === rr) { return param; } else { return bal(l, v, d, rr); } }; - var find = function (x, _param) { + let find = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var c = Curry._2(funarg.compare, x, param.v); + let c = Curry._2(funarg.compare, x, param.v); if (c === 0) { return param.d; } @@ -164,31 +164,31 @@ function Make(funarg) { continue ; }; }; - var find_first = function (f, _param) { + let find_first = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _d0 = param.d; - var _param$1 = param.l; + let _v0 = v; + let _d0 = param.d; + let _param$1 = param.l; while(true) { - var param$1 = _param$1; - var d0 = _d0; - var v0 = _v0; + let param$1 = _param$1; + let d0 = _d0; + let v0 = _v0; if (typeof param$1 !== "object") { return [ v0, d0 ]; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.l; _d0 = param$1.d; @@ -203,28 +203,28 @@ function Make(funarg) { continue ; }; }; - var find_first_opt = function (f, _param) { + let find_first_opt = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _d0 = param.d; - var _param$1 = param.l; + let _v0 = v; + let _d0 = param.d; + let _param$1 = param.l; while(true) { - var param$1 = _param$1; - var d0 = _d0; - var v0 = _v0; + let param$1 = _param$1; + let d0 = _d0; + let v0 = _v0; if (typeof param$1 !== "object") { return [ v0, d0 ]; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.l; _d0 = param$1.d; @@ -239,31 +239,31 @@ function Make(funarg) { continue ; }; }; - var find_last = function (f, _param) { + let find_last = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _d0 = param.d; - var _param$1 = param.r; + let _v0 = v; + let _d0 = param.d; + let _param$1 = param.r; while(true) { - var param$1 = _param$1; - var d0 = _d0; - var v0 = _v0; + let param$1 = _param$1; + let d0 = _d0; + let v0 = _v0; if (typeof param$1 !== "object") { return [ v0, d0 ]; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.r; _d0 = param$1.d; @@ -278,28 +278,28 @@ function Make(funarg) { continue ; }; }; - var find_last_opt = function (f, _param) { + let find_last_opt = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _d0 = param.d; - var _param$1 = param.r; + let _v0 = v; + let _d0 = param.d; + let _param$1 = param.r; while(true) { - var param$1 = _param$1; - var d0 = _d0; - var v0 = _v0; + let param$1 = _param$1; + let d0 = _d0; + let v0 = _v0; if (typeof param$1 !== "object") { return [ v0, d0 ]; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.r; _d0 = param$1.d; @@ -314,13 +314,13 @@ function Make(funarg) { continue ; }; }; - var find_opt = function (x, _param) { + let find_opt = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var c = Curry._2(funarg.compare, x, param.v); + let c = Curry._2(funarg.compare, x, param.v); if (c === 0) { return Caml_option.some(param.d); } @@ -328,13 +328,13 @@ function Make(funarg) { continue ; }; }; - var mem = function (x, _param) { + let mem = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } - var c = Curry._2(funarg.compare, x, param.v); + let c = Curry._2(funarg.compare, x, param.v); if (c === 0) { return true; } @@ -342,16 +342,16 @@ function Make(funarg) { continue ; }; }; - var min_binding = function (_param) { + let min_binding = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return [ param.v, @@ -362,13 +362,13 @@ function Make(funarg) { continue ; }; }; - var min_binding_opt = function (_param) { + let min_binding_opt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return [ param.v, @@ -379,16 +379,16 @@ function Make(funarg) { continue ; }; }; - var max_binding = function (_param) { + let max_binding = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return [ param.v, @@ -399,13 +399,13 @@ function Make(funarg) { continue ; }; }; - var max_binding_opt = function (_param) { + let max_binding_opt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return [ param.v, @@ -416,7 +416,7 @@ function Make(funarg) { continue ; }; }; - var remove_min_binding = function (param) { + let remove_min_binding = function (param) { if (typeof param !== "object") { throw { RE_EXN_ID: "Invalid_argument", @@ -424,53 +424,53 @@ function Make(funarg) { Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return param.r; } else { return bal(remove_min_binding(l), param.v, param.d, param.r); } }; - var merge = function (t1, t2) { + let merge = function (t1, t2) { if (typeof t1 !== "object") { return t2; } if (typeof t2 !== "object") { return t1; } - var match = min_binding(t2); + let match = min_binding(t2); return bal(t1, match[0], match[1], remove_min_binding(t2)); }; - var remove = function (x, param) { + let remove = function (x, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Curry._2(funarg.compare, x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { return merge(l, r); } if (c < 0) { - var ll = remove(x, l); + let ll = remove(x, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = remove(x, r); + let rr = remove(x, r); if (r === rr) { return param; } else { return bal(l, v, d, rr); } }; - var update = function (x, f, param) { + let update = function (x, f, param) { if (typeof param !== "object") { - var data = Curry._1(f, undefined); + let data = Curry._1(f, undefined); if (data !== undefined) { return { TAG: "Node", @@ -484,17 +484,17 @@ function Make(funarg) { return "Empty"; } } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Curry._2(funarg.compare, x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { - var data$1 = Curry._1(f, Caml_option.some(d)); + let data$1 = Curry._1(f, Caml_option.some(d)); if (data$1 === undefined) { return merge(l, r); } - var data$2 = Caml_option.valFromOption(data$1); + let data$2 = Caml_option.valFromOption(data$1); if (d === data$2) { return param; } else { @@ -509,23 +509,23 @@ function Make(funarg) { } } if (c < 0) { - var ll = update(x, f, l); + let ll = update(x, f, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = update(x, f, r); + let rr = update(x, f, r); if (r === rr) { return param; } else { return bal(l, v, d, rr); } }; - var iter = function (f, _param) { + let iter = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } @@ -535,13 +535,13 @@ function Make(funarg) { continue ; }; }; - var map = function (f, param) { + let map = function (f, param) { if (typeof param !== "object") { return "Empty"; } - var l$p = map(f, param.l); - var d$p = Curry._1(f, param.d); - var r$p = map(f, param.r); + let l$p = map(f, param.l); + let d$p = Curry._1(f, param.d); + let r$p = map(f, param.r); return { TAG: "Node", l: l$p, @@ -551,14 +551,14 @@ function Make(funarg) { h: param.h }; }; - var mapi = function (f, param) { + let mapi = function (f, param) { if (typeof param !== "object") { return "Empty"; } - var v = param.v; - var l$p = mapi(f, param.l); - var d$p = Curry._2(f, v, param.d); - var r$p = mapi(f, param.r); + let v = param.v; + let l$p = mapi(f, param.l); + let d$p = Curry._2(f, v, param.d); + let r$p = mapi(f, param.r); return { TAG: "Node", l: l$p, @@ -568,10 +568,10 @@ function Make(funarg) { h: param.h }; }; - var fold = function (f, _m, _accu) { + let fold = function (f, _m, _accu) { while(true) { - var accu = _accu; - var m = _m; + let accu = _accu; + let m = _m; if (typeof m !== "object") { return accu; } @@ -580,9 +580,9 @@ function Make(funarg) { continue ; }; }; - var for_all = function (p, _param) { + let for_all = function (p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return true; } @@ -596,9 +596,9 @@ function Make(funarg) { continue ; }; }; - var exists = function (p, _param) { + let exists = function (p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } @@ -612,29 +612,29 @@ function Make(funarg) { continue ; }; }; - var add_min_binding = function (k, x, param) { + let add_min_binding = function (k, x, param) { if (typeof param !== "object") { return singleton(k, x); } else { return bal(add_min_binding(k, x, param.l), param.v, param.d, param.r); } }; - var add_max_binding = function (k, x, param) { + let add_max_binding = function (k, x, param) { if (typeof param !== "object") { return singleton(k, x); } else { return bal(param.l, param.v, param.d, add_max_binding(k, x, param.r)); } }; - var join = function (l, v, d, r) { + let join = function (l, v, d, r) { if (typeof l !== "object") { return add_min_binding(v, d, r); } - var lh = l.h; + let lh = l.h; if (typeof r !== "object") { return add_max_binding(v, d, l); } - var rh = r.h; + let rh = r.h; if (lh > (rh + 2 | 0)) { return bal(l.l, l.v, l.d, join(l.r, v, d, r)); } else if (rh > (lh + 2 | 0)) { @@ -643,24 +643,24 @@ function Make(funarg) { return create(l, v, d, r); } }; - var concat = function (t1, t2) { + let concat = function (t1, t2) { if (typeof t1 !== "object") { return t2; } if (typeof t2 !== "object") { return t1; } - var match = min_binding(t2); + let match = min_binding(t2); return join(t1, match[0], match[1], remove_min_binding(t2)); }; - var concat_or_join = function (t1, v, d, t2) { + let concat_or_join = function (t1, v, d, t2) { if (d !== undefined) { return join(t1, v, Caml_option.valFromOption(d), t2); } else { return concat(t1, t2); } }; - var split = function (x, param) { + let split = function (x, param) { if (typeof param !== "object") { return [ "Empty", @@ -668,11 +668,11 @@ function Make(funarg) { "Empty" ]; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Curry._2(funarg.compare, x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { return [ l, @@ -681,30 +681,30 @@ function Make(funarg) { ]; } if (c < 0) { - var match = split(x, l); + let match = split(x, l); return [ match[0], match[1], join(match[2], v, d, r) ]; } - var match$1 = split(x, r); + let match$1 = split(x, r); return [ join(l, v, d, match$1[0]), match$1[1], match$1[2] ]; }; - var merge$1 = function (f, s1, s2) { + let merge$1 = function (f, s1, s2) { if (typeof s1 !== "object") { if (typeof s2 !== "object") { return "Empty"; } } else { - var v1 = s1.v; + let v1 = s1.v; if (s1.h >= height(s2)) { - var match = split(v1, s2); + let match = split(v1, s2); return concat_or_join(merge$1(f, s1.l, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2])); } @@ -720,53 +720,53 @@ function Make(funarg) { Error: new Error() }; } - var v2 = s2.v; - var match$1 = split(v2, s1); + let v2 = s2.v; + let match$1 = split(v2, s1); return concat_or_join(merge$1(f, match$1[0], s2.l), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r)); }; - var union = function (f, s1, s2) { + let union = function (f, s1, s2) { if (typeof s1 !== "object") { return s2; } - var d1 = s1.d; - var v1 = s1.v; + let d1 = s1.d; + let v1 = s1.v; if (typeof s2 !== "object") { return s1; } - var d2 = s2.d; - var v2 = s2.v; + let d2 = s2.d; + let v2 = s2.v; if (s1.h >= s2.h) { - var match = split(v1, s2); - var d2$1 = match[1]; - var l = union(f, s1.l, match[0]); - var r = union(f, s1.r, match[2]); + let match = split(v1, s2); + let d2$1 = match[1]; + let l = union(f, s1.l, match[0]); + let r = union(f, s1.r, match[2]); if (d2$1 !== undefined) { return concat_or_join(l, v1, Curry._3(f, v1, d1, Caml_option.valFromOption(d2$1)), r); } else { return join(l, v1, d1, r); } } - var match$1 = split(v2, s1); - var d1$1 = match$1[1]; - var l$1 = union(f, match$1[0], s2.l); - var r$1 = union(f, match$1[2], s2.r); + let match$1 = split(v2, s1); + let d1$1 = match$1[1]; + let l$1 = union(f, match$1[0], s2.l); + let r$1 = union(f, match$1[2], s2.r); if (d1$1 !== undefined) { return concat_or_join(l$1, v2, Curry._3(f, v2, Caml_option.valFromOption(d1$1), d2), r$1); } else { return join(l$1, v2, d2, r$1); } }; - var filter = function (p, param) { + let filter = function (p, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var l$p = filter(p, l); - var pvd = Curry._2(p, v, d); - var r$p = filter(p, r); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let l$p = filter(p, l); + let pvd = Curry._2(p, v, d); + let r$p = filter(p, r); if (pvd) { if (l === l$p && r === r$p) { return param; @@ -777,22 +777,22 @@ function Make(funarg) { return concat(l$p, r$p); } }; - var partition = function (p, param) { + let partition = function (p, param) { if (typeof param !== "object") { return [ "Empty", "Empty" ]; } - var d = param.d; - var v = param.v; - var match = partition(p, param.l); - var lf = match[1]; - var lt = match[0]; - var pvd = Curry._2(p, v, d); - var match$1 = partition(p, param.r); - var rf = match$1[1]; - var rt = match$1[0]; + let d = param.d; + let v = param.v; + let match = partition(p, param.l); + let lf = match[1]; + let lt = match[0]; + let pvd = Curry._2(p, v, d); + let match$1 = partition(p, param.r); + let rf = match$1[1]; + let rt = match$1[0]; if (pvd) { return [ join(lt, v, d, rt), @@ -805,10 +805,10 @@ function Make(funarg) { ]; } }; - var cons_enum = function (_m, _e) { + let cons_enum = function (_m, _e) { while(true) { - var e = _e; - var m = _m; + let e = _e; + let m = _m; if (typeof m !== "object") { return e; } @@ -823,12 +823,12 @@ function Make(funarg) { continue ; }; }; - var compare = function (cmp, m1, m2) { - var _e1 = cons_enum(m1, "End"); - var _e2 = cons_enum(m2, "End"); + let compare = function (cmp, m1, m2) { + let _e1 = cons_enum(m1, "End"); + let _e2 = cons_enum(m2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return 0; @@ -839,11 +839,11 @@ function Make(funarg) { if (typeof e2 !== "object") { return 1; } - var c = Curry._2(funarg.compare, e1._0, e2._0); + let c = Curry._2(funarg.compare, e1._0, e2._0); if (c !== 0) { return c; } - var c$1 = Curry._2(cmp, e1._1, e2._1); + let c$1 = Curry._2(cmp, e1._1, e2._1); if (c$1 !== 0) { return c$1; } @@ -852,12 +852,12 @@ function Make(funarg) { continue ; }; }; - var equal = function (cmp, m1, m2) { - var _e1 = cons_enum(m1, "End"); - var _e2 = cons_enum(m2, "End"); + let equal = function (cmp, m1, m2) { + let _e1 = cons_enum(m1, "End"); + let _e2 = cons_enum(m2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return true; @@ -879,17 +879,17 @@ function Make(funarg) { continue ; }; }; - var cardinal = function (param) { + let cardinal = function (param) { if (typeof param !== "object") { return 0; } else { return (cardinal(param.l) + 1 | 0) + cardinal(param.r) | 0; } }; - var bindings_aux = function (_accu, _param) { + let bindings_aux = function (_accu, _param) { while(true) { - var param = _param; - var accu = _accu; + let param = _param; + let accu = _accu; if (typeof param !== "object") { return accu; } @@ -904,7 +904,7 @@ function Make(funarg) { continue ; }; }; - var bindings = function (s) { + let bindings = function (s) { return bindings_aux(/* [] */0, s); }; return { diff --git a/lib/es6/mapLabels.js b/lib/es6/mapLabels.js index c9421d1cb3..2d2f67d5c4 100644 --- a/lib/es6/mapLabels.js +++ b/lib/es6/mapLabels.js @@ -4,16 +4,16 @@ import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; function Make(Ord) { - var height = function (param) { + let height = function (param) { if (typeof param !== "object") { return 0; } else { return param.h; } }; - var create = function (l, x, d, r) { - var hl = height(l); - var hr = height(r); + let create = function (l, x, d, r) { + let hl = height(l); + let hr = height(r); return { TAG: "Node", l: l, @@ -23,7 +23,7 @@ function Make(Ord) { h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0 }; }; - var singleton = function (x, d) { + let singleton = function (x, d) { return { TAG: "Node", l: "Empty", @@ -33,10 +33,10 @@ function Make(Ord) { h: 1 }; }; - var bal = function (l, x, d, r) { - var hl; + let bal = function (l, x, d, r) { + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -46,10 +46,10 @@ function Make(Ord) { Error: new Error() }; } - var lr = l.r; - var ld = l.d; - var lv = l.v; - var ll = l.l; + let lr = l.r; + let ld = l.d; + let lv = l.v; + let ll = l.l; if (height(ll) >= height(lr)) { return create(ll, lv, ld, create(lr, x, d, r)); } @@ -79,10 +79,10 @@ function Make(Ord) { Error: new Error() }; } - var rr = r.r; - var rd = r.d; - var rv = r.v; - var rl = r.l; + let rr = r.r; + let rd = r.d; + let rv = r.v; + let rl = r.l; if (height(rr) >= height(rl)) { return create(create(l, x, d, rl), rv, rd, rr); } @@ -95,14 +95,14 @@ function Make(Ord) { Error: new Error() }; }; - var is_empty = function (param) { + let is_empty = function (param) { if (typeof param !== "object") { return true; } else { return false; } }; - var add = function (x, data, param) { + let add = function (x, data, param) { if (typeof param !== "object") { return { TAG: "Node", @@ -113,11 +113,11 @@ function Make(Ord) { h: 1 }; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Curry._2(Ord.compare, x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Curry._2(Ord.compare, x, v); if (c === 0) { if (d === data) { return param; @@ -133,30 +133,30 @@ function Make(Ord) { } } if (c < 0) { - var ll = add(x, data, l); + let ll = add(x, data, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = add(x, data, r); + let rr = add(x, data, r); if (r === rr) { return param; } else { return bal(l, v, d, rr); } }; - var find = function (x, _param) { + let find = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var c = Curry._2(Ord.compare, x, param.v); + let c = Curry._2(Ord.compare, x, param.v); if (c === 0) { return param.d; } @@ -164,18 +164,18 @@ function Make(Ord) { continue ; }; }; - var find_first_aux = function (_v0, _d0, f, _param) { + let find_first_aux = function (_v0, _d0, f, _param) { while(true) { - var param = _param; - var d0 = _d0; - var v0 = _v0; + let param = _param; + let d0 = _d0; + let v0 = _v0; if (typeof param !== "object") { return [ v0, d0 ]; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.l; _d0 = param.d; @@ -186,16 +186,16 @@ function Make(Ord) { continue ; }; }; - var find_first = function (f, _param) { + let find_first = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_first_aux(v, param.d, f, param.l); } @@ -203,18 +203,18 @@ function Make(Ord) { continue ; }; }; - var find_first_opt_aux = function (_v0, _d0, f, _param) { + let find_first_opt_aux = function (_v0, _d0, f, _param) { while(true) { - var param = _param; - var d0 = _d0; - var v0 = _v0; + let param = _param; + let d0 = _d0; + let v0 = _v0; if (typeof param !== "object") { return [ v0, d0 ]; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.l; _d0 = param.d; @@ -225,13 +225,13 @@ function Make(Ord) { continue ; }; }; - var find_first_opt = function (f, _param) { + let find_first_opt = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_first_opt_aux(v, param.d, f, param.l); } @@ -239,18 +239,18 @@ function Make(Ord) { continue ; }; }; - var find_last_aux = function (_v0, _d0, f, _param) { + let find_last_aux = function (_v0, _d0, f, _param) { while(true) { - var param = _param; - var d0 = _d0; - var v0 = _v0; + let param = _param; + let d0 = _d0; + let v0 = _v0; if (typeof param !== "object") { return [ v0, d0 ]; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.r; _d0 = param.d; @@ -261,16 +261,16 @@ function Make(Ord) { continue ; }; }; - var find_last = function (f, _param) { + let find_last = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_last_aux(v, param.d, f, param.r); } @@ -278,18 +278,18 @@ function Make(Ord) { continue ; }; }; - var find_last_opt_aux = function (_v0, _d0, f, _param) { + let find_last_opt_aux = function (_v0, _d0, f, _param) { while(true) { - var param = _param; - var d0 = _d0; - var v0 = _v0; + let param = _param; + let d0 = _d0; + let v0 = _v0; if (typeof param !== "object") { return [ v0, d0 ]; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.r; _d0 = param.d; @@ -300,13 +300,13 @@ function Make(Ord) { continue ; }; }; - var find_last_opt = function (f, _param) { + let find_last_opt = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_last_opt_aux(v, param.d, f, param.r); } @@ -314,13 +314,13 @@ function Make(Ord) { continue ; }; }; - var find_opt = function (x, _param) { + let find_opt = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var c = Curry._2(Ord.compare, x, param.v); + let c = Curry._2(Ord.compare, x, param.v); if (c === 0) { return Caml_option.some(param.d); } @@ -328,13 +328,13 @@ function Make(Ord) { continue ; }; }; - var mem = function (x, _param) { + let mem = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } - var c = Curry._2(Ord.compare, x, param.v); + let c = Curry._2(Ord.compare, x, param.v); if (c === 0) { return true; } @@ -342,16 +342,16 @@ function Make(Ord) { continue ; }; }; - var min_binding = function (_param) { + let min_binding = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return [ param.v, @@ -362,13 +362,13 @@ function Make(Ord) { continue ; }; }; - var min_binding_opt = function (_param) { + let min_binding_opt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return [ param.v, @@ -379,16 +379,16 @@ function Make(Ord) { continue ; }; }; - var max_binding = function (_param) { + let max_binding = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return [ param.v, @@ -399,13 +399,13 @@ function Make(Ord) { continue ; }; }; - var max_binding_opt = function (_param) { + let max_binding_opt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return [ param.v, @@ -416,7 +416,7 @@ function Make(Ord) { continue ; }; }; - var remove_min_binding = function (param) { + let remove_min_binding = function (param) { if (typeof param !== "object") { throw { RE_EXN_ID: "Invalid_argument", @@ -424,53 +424,53 @@ function Make(Ord) { Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return param.r; } else { return bal(remove_min_binding(l), param.v, param.d, param.r); } }; - var merge = function (t1, t2) { + let merge = function (t1, t2) { if (typeof t1 !== "object") { return t2; } if (typeof t2 !== "object") { return t1; } - var match = min_binding(t2); + let match = min_binding(t2); return bal(t1, match[0], match[1], remove_min_binding(t2)); }; - var remove = function (x, param) { + let remove = function (x, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Curry._2(Ord.compare, x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Curry._2(Ord.compare, x, v); if (c === 0) { return merge(l, r); } if (c < 0) { - var ll = remove(x, l); + let ll = remove(x, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = remove(x, r); + let rr = remove(x, r); if (r === rr) { return param; } else { return bal(l, v, d, rr); } }; - var update = function (x, f, param) { + let update = function (x, f, param) { if (typeof param !== "object") { - var data = Curry._1(f, undefined); + let data = Curry._1(f, undefined); if (data !== undefined) { return { TAG: "Node", @@ -484,17 +484,17 @@ function Make(Ord) { return "Empty"; } } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Curry._2(Ord.compare, x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Curry._2(Ord.compare, x, v); if (c === 0) { - var data$1 = Curry._1(f, Caml_option.some(d)); + let data$1 = Curry._1(f, Caml_option.some(d)); if (data$1 === undefined) { return merge(l, r); } - var data$2 = Caml_option.valFromOption(data$1); + let data$2 = Caml_option.valFromOption(data$1); if (d === data$2) { return param; } else { @@ -509,23 +509,23 @@ function Make(Ord) { } } if (c < 0) { - var ll = update(x, f, l); + let ll = update(x, f, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = update(x, f, r); + let rr = update(x, f, r); if (r === rr) { return param; } else { return bal(l, v, d, rr); } }; - var iter = function (f, _param) { + let iter = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } @@ -535,13 +535,13 @@ function Make(Ord) { continue ; }; }; - var map = function (f, param) { + let map = function (f, param) { if (typeof param !== "object") { return "Empty"; } - var l$p = map(f, param.l); - var d$p = Curry._1(f, param.d); - var r$p = map(f, param.r); + let l$p = map(f, param.l); + let d$p = Curry._1(f, param.d); + let r$p = map(f, param.r); return { TAG: "Node", l: l$p, @@ -551,14 +551,14 @@ function Make(Ord) { h: param.h }; }; - var mapi = function (f, param) { + let mapi = function (f, param) { if (typeof param !== "object") { return "Empty"; } - var v = param.v; - var l$p = mapi(f, param.l); - var d$p = Curry._2(f, v, param.d); - var r$p = mapi(f, param.r); + let v = param.v; + let l$p = mapi(f, param.l); + let d$p = Curry._2(f, v, param.d); + let r$p = mapi(f, param.r); return { TAG: "Node", l: l$p, @@ -568,10 +568,10 @@ function Make(Ord) { h: param.h }; }; - var fold = function (f, _m, _accu) { + let fold = function (f, _m, _accu) { while(true) { - var accu = _accu; - var m = _m; + let accu = _accu; + let m = _m; if (typeof m !== "object") { return accu; } @@ -580,9 +580,9 @@ function Make(Ord) { continue ; }; }; - var for_all = function (p, _param) { + let for_all = function (p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return true; } @@ -596,9 +596,9 @@ function Make(Ord) { continue ; }; }; - var exists = function (p, _param) { + let exists = function (p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } @@ -612,29 +612,29 @@ function Make(Ord) { continue ; }; }; - var add_min_binding = function (k, x, param) { + let add_min_binding = function (k, x, param) { if (typeof param !== "object") { return singleton(k, x); } else { return bal(add_min_binding(k, x, param.l), param.v, param.d, param.r); } }; - var add_max_binding = function (k, x, param) { + let add_max_binding = function (k, x, param) { if (typeof param !== "object") { return singleton(k, x); } else { return bal(param.l, param.v, param.d, add_max_binding(k, x, param.r)); } }; - var join = function (l, v, d, r) { + let join = function (l, v, d, r) { if (typeof l !== "object") { return add_min_binding(v, d, r); } - var lh = l.h; + let lh = l.h; if (typeof r !== "object") { return add_max_binding(v, d, l); } - var rh = r.h; + let rh = r.h; if (lh > (rh + 2 | 0)) { return bal(l.l, l.v, l.d, join(l.r, v, d, r)); } else if (rh > (lh + 2 | 0)) { @@ -643,24 +643,24 @@ function Make(Ord) { return create(l, v, d, r); } }; - var concat = function (t1, t2) { + let concat = function (t1, t2) { if (typeof t1 !== "object") { return t2; } if (typeof t2 !== "object") { return t1; } - var match = min_binding(t2); + let match = min_binding(t2); return join(t1, match[0], match[1], remove_min_binding(t2)); }; - var concat_or_join = function (t1, v, d, t2) { + let concat_or_join = function (t1, v, d, t2) { if (d !== undefined) { return join(t1, v, Caml_option.valFromOption(d), t2); } else { return concat(t1, t2); } }; - var split = function (x, param) { + let split = function (x, param) { if (typeof param !== "object") { return [ "Empty", @@ -668,11 +668,11 @@ function Make(Ord) { "Empty" ]; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Curry._2(Ord.compare, x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Curry._2(Ord.compare, x, v); if (c === 0) { return [ l, @@ -681,30 +681,30 @@ function Make(Ord) { ]; } if (c < 0) { - var match = split(x, l); + let match = split(x, l); return [ match[0], match[1], join(match[2], v, d, r) ]; } - var match$1 = split(x, r); + let match$1 = split(x, r); return [ join(l, v, d, match$1[0]), match$1[1], match$1[2] ]; }; - var merge$1 = function (f, s1, s2) { + let merge$1 = function (f, s1, s2) { if (typeof s1 !== "object") { if (typeof s2 !== "object") { return "Empty"; } } else { - var v1 = s1.v; + let v1 = s1.v; if (s1.h >= height(s2)) { - var match = split(v1, s2); + let match = split(v1, s2); return concat_or_join(merge$1(f, s1.l, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2])); } @@ -720,53 +720,53 @@ function Make(Ord) { Error: new Error() }; } - var v2 = s2.v; - var match$1 = split(v2, s1); + let v2 = s2.v; + let match$1 = split(v2, s1); return concat_or_join(merge$1(f, match$1[0], s2.l), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r)); }; - var union = function (f, s1, s2) { + let union = function (f, s1, s2) { if (typeof s1 !== "object") { return s2; } - var d1 = s1.d; - var v1 = s1.v; + let d1 = s1.d; + let v1 = s1.v; if (typeof s2 !== "object") { return s1; } - var d2 = s2.d; - var v2 = s2.v; + let d2 = s2.d; + let v2 = s2.v; if (s1.h >= s2.h) { - var match = split(v1, s2); - var d2$1 = match[1]; - var l = union(f, s1.l, match[0]); - var r = union(f, s1.r, match[2]); + let match = split(v1, s2); + let d2$1 = match[1]; + let l = union(f, s1.l, match[0]); + let r = union(f, s1.r, match[2]); if (d2$1 !== undefined) { return concat_or_join(l, v1, Curry._3(f, v1, d1, Caml_option.valFromOption(d2$1)), r); } else { return join(l, v1, d1, r); } } - var match$1 = split(v2, s1); - var d1$1 = match$1[1]; - var l$1 = union(f, match$1[0], s2.l); - var r$1 = union(f, match$1[2], s2.r); + let match$1 = split(v2, s1); + let d1$1 = match$1[1]; + let l$1 = union(f, match$1[0], s2.l); + let r$1 = union(f, match$1[2], s2.r); if (d1$1 !== undefined) { return concat_or_join(l$1, v2, Curry._3(f, v2, Caml_option.valFromOption(d1$1), d2), r$1); } else { return join(l$1, v2, d2, r$1); } }; - var filter = function (p, param) { + let filter = function (p, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var l$p = filter(p, l); - var pvd = Curry._2(p, v, d); - var r$p = filter(p, r); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let l$p = filter(p, l); + let pvd = Curry._2(p, v, d); + let r$p = filter(p, r); if (pvd) { if (l === l$p && r === r$p) { return param; @@ -777,22 +777,22 @@ function Make(Ord) { return concat(l$p, r$p); } }; - var partition = function (p, param) { + let partition = function (p, param) { if (typeof param !== "object") { return [ "Empty", "Empty" ]; } - var d = param.d; - var v = param.v; - var match = partition(p, param.l); - var lf = match[1]; - var lt = match[0]; - var pvd = Curry._2(p, v, d); - var match$1 = partition(p, param.r); - var rf = match$1[1]; - var rt = match$1[0]; + let d = param.d; + let v = param.v; + let match = partition(p, param.l); + let lf = match[1]; + let lt = match[0]; + let pvd = Curry._2(p, v, d); + let match$1 = partition(p, param.r); + let rf = match$1[1]; + let rt = match$1[0]; if (pvd) { return [ join(lt, v, d, rt), @@ -805,10 +805,10 @@ function Make(Ord) { ]; } }; - var cons_enum = function (_m, _e) { + let cons_enum = function (_m, _e) { while(true) { - var e = _e; - var m = _m; + let e = _e; + let m = _m; if (typeof m !== "object") { return e; } @@ -823,12 +823,12 @@ function Make(Ord) { continue ; }; }; - var compare = function (cmp, m1, m2) { - var _e1 = cons_enum(m1, "End"); - var _e2 = cons_enum(m2, "End"); + let compare = function (cmp, m1, m2) { + let _e1 = cons_enum(m1, "End"); + let _e2 = cons_enum(m2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return 0; @@ -839,11 +839,11 @@ function Make(Ord) { if (typeof e2 !== "object") { return 1; } - var c = Curry._2(Ord.compare, e1._0, e2._0); + let c = Curry._2(Ord.compare, e1._0, e2._0); if (c !== 0) { return c; } - var c$1 = Curry._2(cmp, e1._1, e2._1); + let c$1 = Curry._2(cmp, e1._1, e2._1); if (c$1 !== 0) { return c$1; } @@ -852,12 +852,12 @@ function Make(Ord) { continue ; }; }; - var equal = function (cmp, m1, m2) { - var _e1 = cons_enum(m1, "End"); - var _e2 = cons_enum(m2, "End"); + let equal = function (cmp, m1, m2) { + let _e1 = cons_enum(m1, "End"); + let _e2 = cons_enum(m2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return true; @@ -879,17 +879,17 @@ function Make(Ord) { continue ; }; }; - var cardinal = function (param) { + let cardinal = function (param) { if (typeof param !== "object") { return 0; } else { return (cardinal(param.l) + 1 | 0) + cardinal(param.r) | 0; } }; - var bindings_aux = function (_accu, _param) { + let bindings_aux = function (_accu, _param) { while(true) { - var param = _param; - var accu = _accu; + let param = _param; + let accu = _accu; if (typeof param !== "object") { return accu; } @@ -904,7 +904,7 @@ function Make(Ord) { continue ; }; }; - var bindings = function (s) { + let bindings = function (s) { return bindings_aux(/* [] */0, s); }; return { diff --git a/lib/es6/moreLabels.js b/lib/es6/moreLabels.js index 014883343f..8048164a58 100644 --- a/lib/es6/moreLabels.js +++ b/lib/es6/moreLabels.js @@ -5,7 +5,7 @@ import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; import * as HashtblLabels from "./hashtblLabels.js"; -var Hashtbl = { +let Hashtbl = { create: HashtblLabels.create, clear: HashtblLabels.clear, reset: HashtblLabels.reset, @@ -32,18 +32,18 @@ var Hashtbl = { seeded_hash_param: HashtblLabels.seeded_hash_param }; -var $$Map = { +let $$Map = { Make: (function (funarg) { - var height = function (param) { + let height = function (param) { if (typeof param !== "object") { return 0; } else { return param.h; } }; - var create = function (l, x, d, r) { - var hl = height(l); - var hr = height(r); + let create = function (l, x, d, r) { + let hl = height(l); + let hr = height(r); return { TAG: "Node", l: l, @@ -53,7 +53,7 @@ var $$Map = { h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0 }; }; - var singleton = function (x, d) { + let singleton = function (x, d) { return { TAG: "Node", l: "Empty", @@ -63,10 +63,10 @@ var $$Map = { h: 1 }; }; - var bal = function (l, x, d, r) { - var hl; + let bal = function (l, x, d, r) { + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -76,10 +76,10 @@ var $$Map = { Error: new Error() }; } - var lr = l.r; - var ld = l.d; - var lv = l.v; - var ll = l.l; + let lr = l.r; + let ld = l.d; + let lv = l.v; + let ll = l.l; if (height(ll) >= height(lr)) { return create(ll, lv, ld, create(lr, x, d, r)); } @@ -109,10 +109,10 @@ var $$Map = { Error: new Error() }; } - var rr = r.r; - var rd = r.d; - var rv = r.v; - var rl = r.l; + let rr = r.r; + let rd = r.d; + let rv = r.v; + let rl = r.l; if (height(rr) >= height(rl)) { return create(create(l, x, d, rl), rv, rd, rr); } @@ -125,14 +125,14 @@ var $$Map = { Error: new Error() }; }; - var is_empty = function (param) { + let is_empty = function (param) { if (typeof param !== "object") { return true; } else { return false; } }; - var add = function (x, data, param) { + let add = function (x, data, param) { if (typeof param !== "object") { return { TAG: "Node", @@ -143,11 +143,11 @@ var $$Map = { h: 1 }; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Curry._2(funarg.compare, x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { if (d === data) { return param; @@ -163,30 +163,30 @@ var $$Map = { } } if (c < 0) { - var ll = add(x, data, l); + let ll = add(x, data, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = add(x, data, r); + let rr = add(x, data, r); if (r === rr) { return param; } else { return bal(l, v, d, rr); } }; - var find = function (x, _param) { + let find = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var c = Curry._2(funarg.compare, x, param.v); + let c = Curry._2(funarg.compare, x, param.v); if (c === 0) { return param.d; } @@ -194,18 +194,18 @@ var $$Map = { continue ; }; }; - var find_first_aux = function (_v0, _d0, f, _param) { + let find_first_aux = function (_v0, _d0, f, _param) { while(true) { - var param = _param; - var d0 = _d0; - var v0 = _v0; + let param = _param; + let d0 = _d0; + let v0 = _v0; if (typeof param !== "object") { return [ v0, d0 ]; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.l; _d0 = param.d; @@ -216,16 +216,16 @@ var $$Map = { continue ; }; }; - var find_first = function (f, _param) { + let find_first = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_first_aux(v, param.d, f, param.l); } @@ -233,18 +233,18 @@ var $$Map = { continue ; }; }; - var find_first_opt_aux = function (_v0, _d0, f, _param) { + let find_first_opt_aux = function (_v0, _d0, f, _param) { while(true) { - var param = _param; - var d0 = _d0; - var v0 = _v0; + let param = _param; + let d0 = _d0; + let v0 = _v0; if (typeof param !== "object") { return [ v0, d0 ]; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.l; _d0 = param.d; @@ -255,13 +255,13 @@ var $$Map = { continue ; }; }; - var find_first_opt = function (f, _param) { + let find_first_opt = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_first_opt_aux(v, param.d, f, param.l); } @@ -269,18 +269,18 @@ var $$Map = { continue ; }; }; - var find_last_aux = function (_v0, _d0, f, _param) { + let find_last_aux = function (_v0, _d0, f, _param) { while(true) { - var param = _param; - var d0 = _d0; - var v0 = _v0; + let param = _param; + let d0 = _d0; + let v0 = _v0; if (typeof param !== "object") { return [ v0, d0 ]; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.r; _d0 = param.d; @@ -291,16 +291,16 @@ var $$Map = { continue ; }; }; - var find_last = function (f, _param) { + let find_last = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_last_aux(v, param.d, f, param.r); } @@ -308,18 +308,18 @@ var $$Map = { continue ; }; }; - var find_last_opt_aux = function (_v0, _d0, f, _param) { + let find_last_opt_aux = function (_v0, _d0, f, _param) { while(true) { - var param = _param; - var d0 = _d0; - var v0 = _v0; + let param = _param; + let d0 = _d0; + let v0 = _v0; if (typeof param !== "object") { return [ v0, d0 ]; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.r; _d0 = param.d; @@ -330,13 +330,13 @@ var $$Map = { continue ; }; }; - var find_last_opt = function (f, _param) { + let find_last_opt = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_last_opt_aux(v, param.d, f, param.r); } @@ -344,13 +344,13 @@ var $$Map = { continue ; }; }; - var find_opt = function (x, _param) { + let find_opt = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var c = Curry._2(funarg.compare, x, param.v); + let c = Curry._2(funarg.compare, x, param.v); if (c === 0) { return Caml_option.some(param.d); } @@ -358,13 +358,13 @@ var $$Map = { continue ; }; }; - var mem = function (x, _param) { + let mem = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } - var c = Curry._2(funarg.compare, x, param.v); + let c = Curry._2(funarg.compare, x, param.v); if (c === 0) { return true; } @@ -372,16 +372,16 @@ var $$Map = { continue ; }; }; - var min_binding = function (_param) { + let min_binding = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return [ param.v, @@ -392,13 +392,13 @@ var $$Map = { continue ; }; }; - var min_binding_opt = function (_param) { + let min_binding_opt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return [ param.v, @@ -409,16 +409,16 @@ var $$Map = { continue ; }; }; - var max_binding = function (_param) { + let max_binding = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return [ param.v, @@ -429,13 +429,13 @@ var $$Map = { continue ; }; }; - var max_binding_opt = function (_param) { + let max_binding_opt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return [ param.v, @@ -446,7 +446,7 @@ var $$Map = { continue ; }; }; - var remove_min_binding = function (param) { + let remove_min_binding = function (param) { if (typeof param !== "object") { throw { RE_EXN_ID: "Invalid_argument", @@ -454,53 +454,53 @@ var $$Map = { Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return param.r; } else { return bal(remove_min_binding(l), param.v, param.d, param.r); } }; - var merge = function (t1, t2) { + let merge = function (t1, t2) { if (typeof t1 !== "object") { return t2; } if (typeof t2 !== "object") { return t1; } - var match = min_binding(t2); + let match = min_binding(t2); return bal(t1, match[0], match[1], remove_min_binding(t2)); }; - var remove = function (x, param) { + let remove = function (x, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Curry._2(funarg.compare, x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { return merge(l, r); } if (c < 0) { - var ll = remove(x, l); + let ll = remove(x, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = remove(x, r); + let rr = remove(x, r); if (r === rr) { return param; } else { return bal(l, v, d, rr); } }; - var update = function (x, f, param) { + let update = function (x, f, param) { if (typeof param !== "object") { - var data = Curry._1(f, undefined); + let data = Curry._1(f, undefined); if (data !== undefined) { return { TAG: "Node", @@ -514,17 +514,17 @@ var $$Map = { return "Empty"; } } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Curry._2(funarg.compare, x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { - var data$1 = Curry._1(f, Caml_option.some(d)); + let data$1 = Curry._1(f, Caml_option.some(d)); if (data$1 === undefined) { return merge(l, r); } - var data$2 = Caml_option.valFromOption(data$1); + let data$2 = Caml_option.valFromOption(data$1); if (d === data$2) { return param; } else { @@ -539,23 +539,23 @@ var $$Map = { } } if (c < 0) { - var ll = update(x, f, l); + let ll = update(x, f, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = update(x, f, r); + let rr = update(x, f, r); if (r === rr) { return param; } else { return bal(l, v, d, rr); } }; - var iter = function (f, _param) { + let iter = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } @@ -565,13 +565,13 @@ var $$Map = { continue ; }; }; - var map = function (f, param) { + let map = function (f, param) { if (typeof param !== "object") { return "Empty"; } - var l$p = map(f, param.l); - var d$p = Curry._1(f, param.d); - var r$p = map(f, param.r); + let l$p = map(f, param.l); + let d$p = Curry._1(f, param.d); + let r$p = map(f, param.r); return { TAG: "Node", l: l$p, @@ -581,14 +581,14 @@ var $$Map = { h: param.h }; }; - var mapi = function (f, param) { + let mapi = function (f, param) { if (typeof param !== "object") { return "Empty"; } - var v = param.v; - var l$p = mapi(f, param.l); - var d$p = Curry._2(f, v, param.d); - var r$p = mapi(f, param.r); + let v = param.v; + let l$p = mapi(f, param.l); + let d$p = Curry._2(f, v, param.d); + let r$p = mapi(f, param.r); return { TAG: "Node", l: l$p, @@ -598,10 +598,10 @@ var $$Map = { h: param.h }; }; - var fold = function (f, _m, _accu) { + let fold = function (f, _m, _accu) { while(true) { - var accu = _accu; - var m = _m; + let accu = _accu; + let m = _m; if (typeof m !== "object") { return accu; } @@ -610,9 +610,9 @@ var $$Map = { continue ; }; }; - var for_all = function (p, _param) { + let for_all = function (p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return true; } @@ -626,9 +626,9 @@ var $$Map = { continue ; }; }; - var exists = function (p, _param) { + let exists = function (p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } @@ -642,29 +642,29 @@ var $$Map = { continue ; }; }; - var add_min_binding = function (k, x, param) { + let add_min_binding = function (k, x, param) { if (typeof param !== "object") { return singleton(k, x); } else { return bal(add_min_binding(k, x, param.l), param.v, param.d, param.r); } }; - var add_max_binding = function (k, x, param) { + let add_max_binding = function (k, x, param) { if (typeof param !== "object") { return singleton(k, x); } else { return bal(param.l, param.v, param.d, add_max_binding(k, x, param.r)); } }; - var join = function (l, v, d, r) { + let join = function (l, v, d, r) { if (typeof l !== "object") { return add_min_binding(v, d, r); } - var lh = l.h; + let lh = l.h; if (typeof r !== "object") { return add_max_binding(v, d, l); } - var rh = r.h; + let rh = r.h; if (lh > (rh + 2 | 0)) { return bal(l.l, l.v, l.d, join(l.r, v, d, r)); } else if (rh > (lh + 2 | 0)) { @@ -673,24 +673,24 @@ var $$Map = { return create(l, v, d, r); } }; - var concat = function (t1, t2) { + let concat = function (t1, t2) { if (typeof t1 !== "object") { return t2; } if (typeof t2 !== "object") { return t1; } - var match = min_binding(t2); + let match = min_binding(t2); return join(t1, match[0], match[1], remove_min_binding(t2)); }; - var concat_or_join = function (t1, v, d, t2) { + let concat_or_join = function (t1, v, d, t2) { if (d !== undefined) { return join(t1, v, Caml_option.valFromOption(d), t2); } else { return concat(t1, t2); } }; - var split = function (x, param) { + let split = function (x, param) { if (typeof param !== "object") { return [ "Empty", @@ -698,11 +698,11 @@ var $$Map = { "Empty" ]; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Curry._2(funarg.compare, x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { return [ l, @@ -711,30 +711,30 @@ var $$Map = { ]; } if (c < 0) { - var match = split(x, l); + let match = split(x, l); return [ match[0], match[1], join(match[2], v, d, r) ]; } - var match$1 = split(x, r); + let match$1 = split(x, r); return [ join(l, v, d, match$1[0]), match$1[1], match$1[2] ]; }; - var merge$1 = function (f, s1, s2) { + let merge$1 = function (f, s1, s2) { if (typeof s1 !== "object") { if (typeof s2 !== "object") { return "Empty"; } } else { - var v1 = s1.v; + let v1 = s1.v; if (s1.h >= height(s2)) { - var match = split(v1, s2); + let match = split(v1, s2); return concat_or_join(merge$1(f, s1.l, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2])); } @@ -750,53 +750,53 @@ var $$Map = { Error: new Error() }; } - var v2 = s2.v; - var match$1 = split(v2, s1); + let v2 = s2.v; + let match$1 = split(v2, s1); return concat_or_join(merge$1(f, match$1[0], s2.l), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r)); }; - var union = function (f, s1, s2) { + let union = function (f, s1, s2) { if (typeof s1 !== "object") { return s2; } - var d1 = s1.d; - var v1 = s1.v; + let d1 = s1.d; + let v1 = s1.v; if (typeof s2 !== "object") { return s1; } - var d2 = s2.d; - var v2 = s2.v; + let d2 = s2.d; + let v2 = s2.v; if (s1.h >= s2.h) { - var match = split(v1, s2); - var d2$1 = match[1]; - var l = union(f, s1.l, match[0]); - var r = union(f, s1.r, match[2]); + let match = split(v1, s2); + let d2$1 = match[1]; + let l = union(f, s1.l, match[0]); + let r = union(f, s1.r, match[2]); if (d2$1 !== undefined) { return concat_or_join(l, v1, Curry._3(f, v1, d1, Caml_option.valFromOption(d2$1)), r); } else { return join(l, v1, d1, r); } } - var match$1 = split(v2, s1); - var d1$1 = match$1[1]; - var l$1 = union(f, match$1[0], s2.l); - var r$1 = union(f, match$1[2], s2.r); + let match$1 = split(v2, s1); + let d1$1 = match$1[1]; + let l$1 = union(f, match$1[0], s2.l); + let r$1 = union(f, match$1[2], s2.r); if (d1$1 !== undefined) { return concat_or_join(l$1, v2, Curry._3(f, v2, Caml_option.valFromOption(d1$1), d2), r$1); } else { return join(l$1, v2, d2, r$1); } }; - var filter = function (p, param) { + let filter = function (p, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var l$p = filter(p, l); - var pvd = Curry._2(p, v, d); - var r$p = filter(p, r); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let l$p = filter(p, l); + let pvd = Curry._2(p, v, d); + let r$p = filter(p, r); if (pvd) { if (l === l$p && r === r$p) { return param; @@ -807,22 +807,22 @@ var $$Map = { return concat(l$p, r$p); } }; - var partition = function (p, param) { + let partition = function (p, param) { if (typeof param !== "object") { return [ "Empty", "Empty" ]; } - var d = param.d; - var v = param.v; - var match = partition(p, param.l); - var lf = match[1]; - var lt = match[0]; - var pvd = Curry._2(p, v, d); - var match$1 = partition(p, param.r); - var rf = match$1[1]; - var rt = match$1[0]; + let d = param.d; + let v = param.v; + let match = partition(p, param.l); + let lf = match[1]; + let lt = match[0]; + let pvd = Curry._2(p, v, d); + let match$1 = partition(p, param.r); + let rf = match$1[1]; + let rt = match$1[0]; if (pvd) { return [ join(lt, v, d, rt), @@ -835,10 +835,10 @@ var $$Map = { ]; } }; - var cons_enum = function (_m, _e) { + let cons_enum = function (_m, _e) { while(true) { - var e = _e; - var m = _m; + let e = _e; + let m = _m; if (typeof m !== "object") { return e; } @@ -853,12 +853,12 @@ var $$Map = { continue ; }; }; - var compare = function (cmp, m1, m2) { - var _e1 = cons_enum(m1, "End"); - var _e2 = cons_enum(m2, "End"); + let compare = function (cmp, m1, m2) { + let _e1 = cons_enum(m1, "End"); + let _e2 = cons_enum(m2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return 0; @@ -869,11 +869,11 @@ var $$Map = { if (typeof e2 !== "object") { return 1; } - var c = Curry._2(funarg.compare, e1._0, e2._0); + let c = Curry._2(funarg.compare, e1._0, e2._0); if (c !== 0) { return c; } - var c$1 = Curry._2(cmp, e1._1, e2._1); + let c$1 = Curry._2(cmp, e1._1, e2._1); if (c$1 !== 0) { return c$1; } @@ -882,12 +882,12 @@ var $$Map = { continue ; }; }; - var equal = function (cmp, m1, m2) { - var _e1 = cons_enum(m1, "End"); - var _e2 = cons_enum(m2, "End"); + let equal = function (cmp, m1, m2) { + let _e1 = cons_enum(m1, "End"); + let _e2 = cons_enum(m2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return true; @@ -909,17 +909,17 @@ var $$Map = { continue ; }; }; - var cardinal = function (param) { + let cardinal = function (param) { if (typeof param !== "object") { return 0; } else { return (cardinal(param.l) + 1 | 0) + cardinal(param.r) | 0; } }; - var bindings_aux = function (_accu, _param) { + let bindings_aux = function (_accu, _param) { while(true) { - var param = _param; - var accu = _accu; + let param = _param; + let accu = _accu; if (typeof param !== "object") { return accu; } @@ -934,7 +934,7 @@ var $$Map = { continue ; }; }; - var bindings = function (s) { + let bindings = function (s) { return bindings_aux(/* [] */0, s); }; return { @@ -976,19 +976,19 @@ var $$Map = { }) }; -var $$Set = { +let $$Set = { Make: (function (funarg) { - var height = function (param) { + let height = function (param) { if (typeof param !== "object") { return 0; } else { return param.h; } }; - var create = function (l, v, r) { - var hl; + let create = function (l, v, r) { + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; return { TAG: "Node", @@ -998,10 +998,10 @@ var $$Set = { h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0 }; }; - var bal = function (l, v, r) { - var hl; + let bal = function (l, v, r) { + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -1011,9 +1011,9 @@ var $$Set = { Error: new Error() }; } - var lr = l.r; - var lv = l.v; - var ll = l.l; + let lr = l.r; + let lv = l.v; + let ll = l.l; if (height(ll) >= height(lr)) { return create(ll, lv, create(lr, v, r)); } @@ -1042,9 +1042,9 @@ var $$Set = { Error: new Error() }; } - var rr = r.r; - var rv = r.v; - var rl = r.l; + let rr = r.r; + let rv = r.v; + let rl = r.l; if (height(rr) >= height(rl)) { return create(create(l, v, rl), rv, rr); } @@ -1057,7 +1057,7 @@ var $$Set = { Error: new Error() }; }; - var add = function (x, param) { + let add = function (x, param) { if (typeof param !== "object") { return { TAG: "Node", @@ -1067,29 +1067,29 @@ var $$Set = { h: 1 }; } - var r = param.r; - var v = param.v; - var l = param.l; - var c = Curry._2(funarg.compare, x, v); + let r = param.r; + let v = param.v; + let l = param.l; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { return param; } if (c < 0) { - var ll = add(x, l); + let ll = add(x, l); if (l === ll) { return param; } else { return bal(ll, v, r); } } - var rr = add(x, r); + let rr = add(x, r); if (r === rr) { return param; } else { return bal(l, v, rr); } }; - var singleton = function (x) { + let singleton = function (x) { return { TAG: "Node", l: "Empty", @@ -1098,29 +1098,29 @@ var $$Set = { h: 1 }; }; - var add_min_element = function (x, param) { + let add_min_element = function (x, param) { if (typeof param !== "object") { return singleton(x); } else { return bal(add_min_element(x, param.l), param.v, param.r); } }; - var add_max_element = function (x, param) { + let add_max_element = function (x, param) { if (typeof param !== "object") { return singleton(x); } else { return bal(param.l, param.v, add_max_element(x, param.r)); } }; - var join = function (l, v, r) { + let join = function (l, v, r) { if (typeof l !== "object") { return add_min_element(v, r); } - var lh = l.h; + let lh = l.h; if (typeof r !== "object") { return add_max_element(v, l); } - var rh = r.h; + let rh = r.h; if (lh > (rh + 2 | 0)) { return bal(l.l, l.v, join(l.r, v, r)); } else if (rh > (lh + 2 | 0)) { @@ -1129,16 +1129,16 @@ var $$Set = { return create(l, v, r); } }; - var min_elt = function (_param) { + let min_elt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return param.v; } @@ -1146,13 +1146,13 @@ var $$Set = { continue ; }; }; - var min_elt_opt = function (_param) { + let min_elt_opt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return Caml_option.some(param.v); } @@ -1160,16 +1160,16 @@ var $$Set = { continue ; }; }; - var max_elt = function (_param) { + let max_elt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return param.v; } @@ -1177,13 +1177,13 @@ var $$Set = { continue ; }; }; - var max_elt_opt = function (_param) { + let max_elt_opt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return Caml_option.some(param.v); } @@ -1191,7 +1191,7 @@ var $$Set = { continue ; }; }; - var remove_min_elt = function (param) { + let remove_min_elt = function (param) { if (typeof param !== "object") { throw { RE_EXN_ID: "Invalid_argument", @@ -1199,14 +1199,14 @@ var $$Set = { Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return param.r; } else { return bal(remove_min_elt(l), param.v, param.r); } }; - var merge = function (t1, t2) { + let merge = function (t1, t2) { if (typeof t1 !== "object") { return t2; } else if (typeof t2 !== "object") { @@ -1215,7 +1215,7 @@ var $$Set = { return bal(t1, min_elt(t2), remove_min_elt(t2)); } }; - var concat = function (t1, t2) { + let concat = function (t1, t2) { if (typeof t1 !== "object") { return t2; } else if (typeof t2 !== "object") { @@ -1224,7 +1224,7 @@ var $$Set = { return join(t1, min_elt(t2), remove_min_elt(t2)); } }; - var split = function (x, param) { + let split = function (x, param) { if (typeof param !== "object") { return [ "Empty", @@ -1232,10 +1232,10 @@ var $$Set = { "Empty" ]; } - var r = param.r; - var v = param.v; - var l = param.l; - var c = Curry._2(funarg.compare, x, v); + let r = param.r; + let v = param.v; + let l = param.l; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { return [ l, @@ -1244,34 +1244,34 @@ var $$Set = { ]; } if (c < 0) { - var match = split(x, l); + let match = split(x, l); return [ match[0], match[1], join(match[2], v, r) ]; } - var match$1 = split(x, r); + let match$1 = split(x, r); return [ join(l, v, match$1[0]), match$1[1], match$1[2] ]; }; - var is_empty = function (param) { + let is_empty = function (param) { if (typeof param !== "object") { return true; } else { return false; } }; - var mem = function (x, _param) { + let mem = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } - var c = Curry._2(funarg.compare, x, param.v); + let c = Curry._2(funarg.compare, x, param.v); if (c === 0) { return true; } @@ -1279,96 +1279,96 @@ var $$Set = { continue ; }; }; - var remove = function (x, param) { + let remove = function (x, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var v = param.v; - var l = param.l; - var c = Curry._2(funarg.compare, x, v); + let r = param.r; + let v = param.v; + let l = param.l; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { return merge(l, r); } if (c < 0) { - var ll = remove(x, l); + let ll = remove(x, l); if (l === ll) { return param; } else { return bal(ll, v, r); } } - var rr = remove(x, r); + let rr = remove(x, r); if (r === rr) { return param; } else { return bal(l, v, rr); } }; - var union = function (s1, s2) { + let union = function (s1, s2) { if (typeof s1 !== "object") { return s2; } - var h1 = s1.h; - var v1 = s1.v; + let h1 = s1.h; + let v1 = s1.v; if (typeof s2 !== "object") { return s1; } - var h2 = s2.h; - var v2 = s2.v; + let h2 = s2.h; + let v2 = s2.v; if (h1 >= h2) { if (h2 === 1) { return add(v2, s1); } - var match = split(v1, s2); + let match = split(v1, s2); return join(union(s1.l, match[0]), v1, union(s1.r, match[2])); } if (h1 === 1) { return add(v1, s2); } - var match$1 = split(v2, s1); + let match$1 = split(v2, s1); return join(union(match$1[0], s2.l), v2, union(match$1[2], s2.r)); }; - var inter = function (s1, s2) { + let inter = function (s1, s2) { if (typeof s1 !== "object") { return "Empty"; } if (typeof s2 !== "object") { return "Empty"; } - var r1 = s1.r; - var v1 = s1.v; - var l1 = s1.l; - var match = split(v1, s2); - var l2 = match[0]; + let r1 = s1.r; + let v1 = s1.v; + let l1 = s1.l; + let match = split(v1, s2); + let l2 = match[0]; if (match[1]) { return join(inter(l1, l2), v1, inter(r1, match[2])); } else { return concat(inter(l1, l2), inter(r1, match[2])); } }; - var diff = function (s1, s2) { + let diff = function (s1, s2) { if (typeof s1 !== "object") { return "Empty"; } if (typeof s2 !== "object") { return s1; } - var r1 = s1.r; - var v1 = s1.v; - var l1 = s1.l; - var match = split(v1, s2); - var l2 = match[0]; + let r1 = s1.r; + let v1 = s1.v; + let l1 = s1.l; + let match = split(v1, s2); + let l2 = match[0]; if (match[1]) { return concat(diff(l1, l2), diff(r1, match[2])); } else { return join(diff(l1, l2), v1, diff(r1, match[2])); } }; - var cons_enum = function (_s, _e) { + let cons_enum = function (_s, _e) { while(true) { - var e = _e; - var s = _s; + let e = _e; + let s = _s; if (typeof s !== "object") { return e; } @@ -1382,10 +1382,10 @@ var $$Set = { continue ; }; }; - var compare_aux = function (_e1, _e2) { + let compare_aux = function (_e1, _e2) { while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return 0; @@ -1396,7 +1396,7 @@ var $$Set = { if (typeof e2 !== "object") { return 1; } - var c = Curry._2(funarg.compare, e1._0, e2._0); + let c = Curry._2(funarg.compare, e1._0, e2._0); if (c !== 0) { return c; } @@ -1405,28 +1405,28 @@ var $$Set = { continue ; }; }; - var compare = function (s1, s2) { + let compare = function (s1, s2) { return compare_aux(cons_enum(s1, "End"), cons_enum(s2, "End")); }; - var equal = function (s1, s2) { + let equal = function (s1, s2) { return compare(s1, s2) === 0; }; - var subset = function (_s1, _s2) { + let subset = function (_s1, _s2) { while(true) { - var s2 = _s2; - var s1 = _s1; + let s2 = _s2; + let s1 = _s1; if (typeof s1 !== "object") { return true; } - var r1 = s1.r; - var v1 = s1.v; - var l1 = s1.l; + let r1 = s1.r; + let v1 = s1.v; + let l1 = s1.l; if (typeof s2 !== "object") { return false; } - var r2 = s2.r; - var l2 = s2.l; - var c = Curry._2(funarg.compare, v1, s2.v); + let r2 = s2.r; + let l2 = s2.l; + let c = Curry._2(funarg.compare, v1, s2.v); if (c === 0) { if (!subset(l1, l2)) { return false; @@ -1461,9 +1461,9 @@ var $$Set = { continue ; }; }; - var iter = function (f, _param) { + let iter = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } @@ -1473,10 +1473,10 @@ var $$Set = { continue ; }; }; - var fold = function (f, _s, _accu) { + let fold = function (f, _s, _accu) { while(true) { - var accu = _accu; - var s = _s; + let accu = _accu; + let s = _s; if (typeof s !== "object") { return accu; } @@ -1485,9 +1485,9 @@ var $$Set = { continue ; }; }; - var for_all = function (p, _param) { + let for_all = function (p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return true; } @@ -1501,9 +1501,9 @@ var $$Set = { continue ; }; }; - var exists = function (p, _param) { + let exists = function (p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } @@ -1517,16 +1517,16 @@ var $$Set = { continue ; }; }; - var filter = function (p, param) { + let filter = function (p, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var v = param.v; - var l = param.l; - var l$p = filter(p, l); - var pv = Curry._1(p, v); - var r$p = filter(p, r); + let r = param.r; + let v = param.v; + let l = param.l; + let l$p = filter(p, l); + let pv = Curry._1(p, v); + let r$p = filter(p, r); if (pv) { if (l === l$p && r === r$p) { return param; @@ -1537,21 +1537,21 @@ var $$Set = { return concat(l$p, r$p); } }; - var partition = function (p, param) { + let partition = function (p, param) { if (typeof param !== "object") { return [ "Empty", "Empty" ]; } - var v = param.v; - var match = partition(p, param.l); - var lf = match[1]; - var lt = match[0]; - var pv = Curry._1(p, v); - var match$1 = partition(p, param.r); - var rf = match$1[1]; - var rt = match$1[0]; + let v = param.v; + let match = partition(p, param.l); + let lf = match[1]; + let lt = match[0]; + let pv = Curry._1(p, v); + let match$1 = partition(p, param.r); + let rf = match$1[1]; + let rt = match$1[0]; if (pv) { return [ join(lt, v, rt), @@ -1564,17 +1564,17 @@ var $$Set = { ]; } }; - var cardinal = function (param) { + let cardinal = function (param) { if (typeof param !== "object") { return 0; } else { return (cardinal(param.l) + 1 | 0) + cardinal(param.r) | 0; } }; - var elements_aux = function (_accu, _param) { + let elements_aux = function (_accu, _param) { while(true) { - var param = _param; - var accu = _accu; + let param = _param; + let accu = _accu; if (typeof param !== "object") { return accu; } @@ -1586,20 +1586,20 @@ var $$Set = { continue ; }; }; - var elements = function (s) { + let elements = function (s) { return elements_aux(/* [] */0, s); }; - var find = function (x, _param) { + let find = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; - var c = Curry._2(funarg.compare, x, v); + let v = param.v; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { return v; } @@ -1607,14 +1607,14 @@ var $$Set = { continue ; }; }; - var find_first_aux = function (_v0, f, _param) { + let find_first_aux = function (_v0, f, _param) { while(true) { - var param = _param; - var v0 = _v0; + let param = _param; + let v0 = _v0; if (typeof param !== "object") { return v0; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.l; _v0 = v; @@ -1624,16 +1624,16 @@ var $$Set = { continue ; }; }; - var find_first = function (f, _param) { + let find_first = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_first_aux(v, f, param.l); } @@ -1641,14 +1641,14 @@ var $$Set = { continue ; }; }; - var find_first_opt_aux = function (_v0, f, _param) { + let find_first_opt_aux = function (_v0, f, _param) { while(true) { - var param = _param; - var v0 = _v0; + let param = _param; + let v0 = _v0; if (typeof param !== "object") { return Caml_option.some(v0); } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.l; _v0 = v; @@ -1658,13 +1658,13 @@ var $$Set = { continue ; }; }; - var find_first_opt = function (f, _param) { + let find_first_opt = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_first_opt_aux(v, f, param.l); } @@ -1672,14 +1672,14 @@ var $$Set = { continue ; }; }; - var find_last_aux = function (_v0, f, _param) { + let find_last_aux = function (_v0, f, _param) { while(true) { - var param = _param; - var v0 = _v0; + let param = _param; + let v0 = _v0; if (typeof param !== "object") { return v0; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.r; _v0 = v; @@ -1689,16 +1689,16 @@ var $$Set = { continue ; }; }; - var find_last = function (f, _param) { + let find_last = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_last_aux(v, f, param.r); } @@ -1706,14 +1706,14 @@ var $$Set = { continue ; }; }; - var find_last_opt_aux = function (_v0, f, _param) { + let find_last_opt_aux = function (_v0, f, _param) { while(true) { - var param = _param; - var v0 = _v0; + let param = _param; + let v0 = _v0; if (typeof param !== "object") { return Caml_option.some(v0); } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.r; _v0 = v; @@ -1723,13 +1723,13 @@ var $$Set = { continue ; }; }; - var find_last_opt = function (f, _param) { + let find_last_opt = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_last_opt_aux(v, f, param.r); } @@ -1737,14 +1737,14 @@ var $$Set = { continue ; }; }; - var find_opt = function (x, _param) { + let find_opt = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; - var c = Curry._2(funarg.compare, x, v); + let v = param.v; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { return Caml_option.some(v); } @@ -1752,31 +1752,31 @@ var $$Set = { continue ; }; }; - var try_join = function (l, v, r) { + let try_join = function (l, v, r) { if ((l === "Empty" || Curry._2(funarg.compare, max_elt(l), v) < 0) && (r === "Empty" || Curry._2(funarg.compare, v, min_elt(r)) < 0)) { return join(l, v, r); } else { return union(l, add(v, r)); } }; - var map = function (f, param) { + let map = function (f, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var v = param.v; - var l = param.l; - var l$p = map(f, l); - var v$p = Curry._1(f, v); - var r$p = map(f, r); + let r = param.r; + let v = param.v; + let l = param.l; + let l$p = map(f, l); + let v$p = Curry._1(f, v); + let r$p = map(f, r); if (l === l$p && v === v$p && r === r$p) { return param; } else { return try_join(l$p, v$p, r$p); } }; - var of_sorted_list = function (l) { - var sub = function (n, l) { + let of_sorted_list = function (l) { + let sub = function (n, l) { switch (n) { case 0 : return [ @@ -1799,7 +1799,7 @@ var $$Set = { break; case 2 : if (l) { - var match = l.tl; + let match = l.tl; if (match) { return [ { @@ -1823,9 +1823,9 @@ var $$Set = { break; case 3 : if (l) { - var match$1 = l.tl; + let match$1 = l.tl; if (match$1) { - var match$2 = match$1.tl; + let match$2 = match$1.tl; if (match$2) { return [ { @@ -1858,11 +1858,11 @@ var $$Set = { default: } - var nl = n / 2 | 0; - var match$3 = sub(nl, l); - var l$1 = match$3[1]; + let nl = n / 2 | 0; + let match$3 = sub(nl, l); + let l$1 = match$3[1]; if (l$1) { - var match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl); + let match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl); return [ create(match$3[0], l$1.hd, match$4[0]), match$4[1] @@ -1880,27 +1880,27 @@ var $$Set = { }; return sub(List.length(l), l)[0]; }; - var of_list = function (l) { + let of_list = function (l) { if (!l) { return "Empty"; } - var match = l.tl; - var x0 = l.hd; + let match = l.tl; + let x0 = l.hd; if (!match) { return singleton(x0); } - var match$1 = match.tl; - var x1 = match.hd; + let match$1 = match.tl; + let x1 = match.hd; if (!match$1) { return add(x1, singleton(x0)); } - var match$2 = match$1.tl; - var x2 = match$1.hd; + let match$2 = match$1.tl; + let x2 = match$1.hd; if (!match$2) { return add(x2, add(x1, singleton(x0))); } - var match$3 = match$2.tl; - var x3 = match$2.hd; + let match$3 = match$2.tl; + let x3 = match$2.hd; if (match$3) { if (match$3.tl) { return of_sorted_list(List.sort_uniq(funarg.compare, l)); diff --git a/lib/es6/parsing.js b/lib/es6/parsing.js index 2042aca072..18516a846a 100644 --- a/lib/es6/parsing.js +++ b/lib/es6/parsing.js @@ -9,11 +9,11 @@ import * as Caml_parser from "./caml_parser.js"; import * as Caml_exceptions from "./caml_exceptions.js"; import * as Caml_js_exceptions from "./caml_js_exceptions.js"; -var YYexit = /* @__PURE__ */Caml_exceptions.create("Parsing.YYexit"); +let YYexit = /* @__PURE__ */Caml_exceptions.create("Parsing.YYexit"); -var Parse_error = /* @__PURE__ */Caml_exceptions.create("Parsing.Parse_error"); +let Parse_error = /* @__PURE__ */Caml_exceptions.create("Parsing.Parse_error"); -var env = { +let env = { s_stack: Caml_array.make(100, 0), v_stack: Caml_array.make(100, undefined), symb_start_stack: Caml_array.make(100, Lexing.dummy_pos), @@ -33,12 +33,12 @@ var env = { }; function grow_stacks(param) { - var oldsize = env.stacksize; - var newsize = (oldsize << 1); - var new_s = Caml_array.make(newsize, 0); - var new_v = Caml_array.make(newsize, undefined); - var new_start = Caml_array.make(newsize, Lexing.dummy_pos); - var new_end = Caml_array.make(newsize, Lexing.dummy_pos); + let oldsize = env.stacksize; + let newsize = (oldsize << 1); + let new_s = Caml_array.make(newsize, 0); + let new_v = Caml_array.make(newsize, undefined); + let new_start = Caml_array.make(newsize, Lexing.dummy_pos); + let new_end = Caml_array.make(newsize, Lexing.dummy_pos); $$Array.blit(env.s_stack, 0, new_s, 0, oldsize); env.s_stack = new_s; $$Array.blit(env.v_stack, 0, new_v, 0, oldsize); @@ -55,33 +55,33 @@ function clear_parser(param) { env.lval = undefined; } -var current_lookahead_fun = { +let current_lookahead_fun = { contents: (function (param) { return false; }) }; function yyparse(tables, start, lexer, lexbuf) { - var init_asp = env.asp; - var init_sp = env.sp; - var init_stackbase = env.stackbase; - var init_state = env.state; - var init_curr_char = env.curr_char; - var init_lval = env.lval; - var init_errflag = env.errflag; + let init_asp = env.asp; + let init_sp = env.sp; + let init_stackbase = env.stackbase; + let init_state = env.state; + let init_curr_char = env.curr_char; + let init_lval = env.lval; + let init_errflag = env.errflag; env.stackbase = env.sp + 1 | 0; env.curr_char = start; env.symb_end = lexbuf.lex_curr_p; try { - var _cmd = "Start"; - var _arg; + let _cmd = "Start"; + let _arg; while(true) { - var arg = _arg; - var cmd = _cmd; - var match = Caml_parser.parse_engine(tables, env, cmd, arg); + let arg = _arg; + let cmd = _cmd; + let match = Caml_parser.parse_engine(tables, env, cmd, arg); switch (match) { case "Read_token" : - var t = Curry._1(lexer, lexbuf); + let t = Curry._1(lexer, lexbuf); env.symb_start = lexbuf.lex_start_p; env.symb_end = lexbuf.lex_curr_p; _arg = t; @@ -103,7 +103,7 @@ function yyparse(tables, start, lexer, lexbuf) { _cmd = "Stacks_grown_2"; continue ; case "Compute_semantic_action" : - var match$1; + let match$1; try { match$1 = [ "Semantic_action_computed", @@ -111,7 +111,7 @@ function yyparse(tables, start, lexer, lexbuf) { ]; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === Parse_error) { match$1 = [ "Error_detected", @@ -134,8 +134,8 @@ function yyparse(tables, start, lexer, lexbuf) { }; } catch (raw_exn$1){ - var exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1); - var curr_char = env.curr_char; + let exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1); + let curr_char = env.curr_char; env.asp = init_asp; env.sp = init_sp; env.stackbase = init_stackbase; @@ -162,14 +162,14 @@ function peek_val(env, n) { } function symbol_start_pos(param) { - var _i = env.rule_len; + let _i = env.rule_len; while(true) { - var i = _i; + let i = _i; if (i <= 0) { return Caml_array.get(env.symb_end_stack, env.asp); } - var st = Caml_array.get(env.symb_start_stack, (env.asp - i | 0) + 1 | 0); - var en = Caml_array.get(env.symb_end_stack, (env.asp - i | 0) + 1 | 0); + let st = Caml_array.get(env.symb_start_stack, (env.asp - i | 0) + 1 | 0); + let en = Caml_array.get(env.symb_end_stack, (env.asp - i | 0) + 1 | 0); if (Caml_obj.notequal(st, en)) { return st; } @@ -214,7 +214,7 @@ function parse_error(param) { } -var set_trace = Caml_parser.set_parser_trace; +let set_trace = Caml_parser.set_parser_trace; export { symbol_start, diff --git a/lib/es6/pervasives.js b/lib/es6/pervasives.js index 9ebc7cac57..8cf6078478 100644 --- a/lib/es6/pervasives.js +++ b/lib/es6/pervasives.js @@ -7,7 +7,7 @@ import * as Caml_string from "./caml_string.js"; import * as Caml_exceptions from "./caml_exceptions.js"; import * as Caml_js_exceptions from "./caml_js_exceptions.js"; -var JsxModules = { +let JsxModules = { Jsx: undefined, JsxEvent: undefined, JsxDOM: undefined @@ -29,7 +29,7 @@ function invalid_arg(s) { }; } -var Exit = /* @__PURE__ */Caml_exceptions.create("Pervasives.Exit"); +let Exit = /* @__PURE__ */Caml_exceptions.create("Pervasives.Exit"); function abs(x) { if (x >= 0) { @@ -43,7 +43,7 @@ function lnot(x) { return x ^ -1; } -var min_int = -2147483648; +let min_int = -2147483648; function classify_float(x) { if (isFinite(x)) { @@ -111,7 +111,7 @@ function int_of_string_opt(s) { return Caml_format.int_of_string(s); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Failure") { return; } @@ -120,14 +120,14 @@ function int_of_string_opt(s) { } function valid_float_lexem(s) { - var l = s.length; - var _i = 0; + let l = s.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i >= l) { return s + "."; } - var match = Caml_string.get(s, i); + let match = Caml_string.get(s, i); if (match >= 48) { if (match >= 58) { return s; @@ -152,7 +152,7 @@ function float_of_string_opt(s) { return Caml_format.float_of_string(s); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Failure") { return; } @@ -191,14 +191,14 @@ function print_string(prim) { console.log(prim); } -var exit_function = { +let exit_function = { contents: (function (prim) { }) }; function at_exit(f) { - var g = exit_function.contents; + let g = exit_function.contents; exit_function.contents = (function (param) { Curry._1(f, undefined); Curry._1(g, undefined); @@ -210,25 +210,25 @@ function exit(retcode) { return Caml_sys.sys_exit(retcode); } -var Jsx; +let Jsx; -var JsxEvent; +let JsxEvent; -var JsxDOM; +let JsxDOM; -var JsxPPXReactSupport; +let JsxPPXReactSupport; -var max_int = 2147483647; +let max_int = 2147483647; -var infinity = Infinity; +let infinity = Infinity; -var neg_infinity = -Infinity; +let neg_infinity = -Infinity; -var max_float = 1.79769313486231571e+308; +let max_float = 1.79769313486231571e+308; -var min_float = 2.22507385850720138e-308; +let min_float = 2.22507385850720138e-308; -var epsilon_float = 2.22044604925031308e-16; +let epsilon_float = 2.22044604925031308e-16; export { Jsx, diff --git a/lib/es6/pervasivesU.js b/lib/es6/pervasivesU.js index 89c397588d..8d63399296 100644 --- a/lib/es6/pervasivesU.js +++ b/lib/es6/pervasivesU.js @@ -6,7 +6,7 @@ import * as Caml_string from "./caml_string.js"; import * as Caml_exceptions from "./caml_exceptions.js"; import * as Caml_js_exceptions from "./caml_js_exceptions.js"; -var JsxModules = { +let JsxModules = { Jsx: undefined, JsxEvent: undefined, JsxDOM: undefined @@ -28,7 +28,7 @@ function invalid_arg(s) { }; } -var Exit = /* @__PURE__ */Caml_exceptions.create("PervasivesU.Exit"); +let Exit = /* @__PURE__ */Caml_exceptions.create("PervasivesU.Exit"); function abs(x) { if (x >= 0) { @@ -42,7 +42,7 @@ function lnot(x) { return x ^ -1; } -var min_int = -2147483648; +let min_int = -2147483648; function classify_float(x) { if (isFinite(x)) { @@ -110,7 +110,7 @@ function int_of_string_opt(s) { return Caml_format.int_of_string(s); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Failure") { return; } @@ -119,14 +119,14 @@ function int_of_string_opt(s) { } function valid_float_lexem(s) { - var l = s.length; - var _i = 0; + let l = s.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i >= l) { return s + "."; } - var match = Caml_string.get(s, i); + let match = Caml_string.get(s, i); if (match >= 48) { if (match >= 58) { return s; @@ -151,7 +151,7 @@ function float_of_string_opt(s) { return Caml_format.float_of_string(s); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Failure") { return; } @@ -190,14 +190,14 @@ function print_string(prim) { console.log(prim); } -var exit_function = { +let exit_function = { contents: (function (prim) { }) }; function at_exit(f) { - var g = exit_function.contents; + let g = exit_function.contents; exit_function.contents = (function () { f(); g(); @@ -209,25 +209,25 @@ function exit(retcode) { return Caml_sys.sys_exit(retcode); } -var Jsx; +let Jsx; -var JsxEvent; +let JsxEvent; -var JsxDOM; +let JsxDOM; -var JsxPPXReactSupport; +let JsxPPXReactSupport; -var max_int = 2147483647; +let max_int = 2147483647; -var infinity = Infinity; +let infinity = Infinity; -var neg_infinity = -Infinity; +let neg_infinity = -Infinity; -var max_float = 1.79769313486231571e+308; +let max_float = 1.79769313486231571e+308; -var min_float = 2.22507385850720138e-308; +let min_float = 2.22507385850720138e-308; -var epsilon_float = 2.22044604925031308e-16; +let epsilon_float = 2.22044604925031308e-16; export { Jsx, diff --git a/lib/es6/queue.js b/lib/es6/queue.js index 05d502d4a6..7c30db70b0 100644 --- a/lib/es6/queue.js +++ b/lib/es6/queue.js @@ -3,7 +3,7 @@ import * as Curry from "./curry.js"; import * as Caml_exceptions from "./caml_exceptions.js"; -var Empty = /* @__PURE__ */Caml_exceptions.create("Queue.Empty"); +let Empty = /* @__PURE__ */Caml_exceptions.create("Queue.Empty"); function create(param) { return { @@ -20,12 +20,12 @@ function clear(q) { } function add(x, q) { - var cell = { + let cell = { TAG: "Cons", content: x, next: "Nil" }; - var last = q.last; + let last = q.last; if (typeof last !== "object") { q.length = 1; q.first = cell; @@ -38,7 +38,7 @@ function add(x, q) { } function peek(q) { - var match = q.first; + let match = q.first; if (typeof match === "object") { return match.content; } @@ -49,15 +49,15 @@ function peek(q) { } function take(q) { - var match = q.first; + let match = q.first; if (typeof match !== "object") { throw { RE_EXN_ID: Empty, Error: new Error() }; } - var content = match.content; - var next = match.next; + let content = match.content; + let next = match.next; if (typeof next !== "object") { clear(q); return content; @@ -68,22 +68,22 @@ function take(q) { } function copy(q) { - var q_res = { + let q_res = { length: q.length, first: "Nil", last: "Nil" }; - var _prev = "Nil"; - var _cell = q.first; + let _prev = "Nil"; + let _cell = q.first; while(true) { - var cell = _cell; - var prev = _prev; + let cell = _cell; + let prev = _prev; if (typeof cell !== "object") { q_res.last = prev; return q_res; } - var next = cell.next; - var res = { + let next = cell.next; + let res = { TAG: "Cons", content: cell.content, next: "Nil" @@ -108,13 +108,13 @@ function length(q) { } function iter(f, q) { - var _cell = q.first; + let _cell = q.first; while(true) { - var cell = _cell; + let cell = _cell; if (typeof cell !== "object") { return; } - var next = cell.next; + let next = cell.next; Curry._1(f, cell.content); _cell = next; continue ; @@ -122,16 +122,16 @@ function iter(f, q) { } function fold(f, accu, q) { - var _accu = accu; - var _cell = q.first; + let _accu = accu; + let _cell = q.first; while(true) { - var cell = _cell; - var accu$1 = _accu; + let cell = _cell; + let accu$1 = _accu; if (typeof cell !== "object") { return accu$1; } - var next = cell.next; - var accu$2 = Curry._2(f, accu$1, cell.content); + let next = cell.next; + let accu$2 = Curry._2(f, accu$1, cell.content); _cell = next; _accu = accu$2; continue ; @@ -142,7 +142,7 @@ function transfer(q1, q2) { if (q1.length <= 0) { return; } - var last = q2.last; + let last = q2.last; if (typeof last !== "object") { q2.length = q1.length; q2.first = q1.first; @@ -155,11 +155,11 @@ function transfer(q1, q2) { clear(q1); } -var push = add; +let push = add; -var pop = take; +let pop = take; -var top = peek; +let top = peek; export { Empty, diff --git a/lib/es6/random.js b/lib/es6/random.js index d91fca26d1..85a0f47fca 100644 --- a/lib/es6/random.js +++ b/lib/es6/random.js @@ -19,23 +19,23 @@ function assign(st1, st2) { } function full_init(s, seed) { - var combine = function (accu, x) { + let combine = function (accu, x) { return Digest.string(accu + String(x)); }; - var extract = function (d) { + let extract = function (d) { return ((Caml_string.get(d, 0) + (Caml_string.get(d, 1) << 8) | 0) + (Caml_string.get(d, 2) << 16) | 0) + (Caml_string.get(d, 3) << 24) | 0; }; - var seed$1 = seed.length === 0 ? [0] : seed; - var l = seed$1.length; - for(var i = 0; i <= 54; ++i){ + let seed$1 = seed.length === 0 ? [0] : seed; + let l = seed$1.length; + for(let i = 0; i <= 54; ++i){ Caml_array.set(s.st, i, i); } - var accu = "x"; - for(var i$1 = 0 ,i_finish = 54 + ( + let accu = "x"; + for(let i$1 = 0 ,i_finish = 54 + ( 55 > l ? 55 : l ) | 0; i$1 <= i_finish; ++i$1){ - var j = i$1 % 55; - var k = i$1 % l; + let j = i$1 % 55; + let k = i$1 % l; accu = combine(accu, Caml_array.get(seed$1, k)); Caml_array.set(s.st, j, (Caml_array.get(s.st, j) ^ extract(accu)) & 1073741823); } @@ -43,7 +43,7 @@ function full_init(s, seed) { } function make(seed) { - var result = { + let result = { st: Caml_array.make(55, 0), idx: 0 }; @@ -56,7 +56,7 @@ function make_self_init(param) { } function copy(s) { - var result = { + let result = { st: Caml_array.make(55, 0), idx: 0 }; @@ -66,9 +66,9 @@ function copy(s) { function bits(s) { s.idx = (s.idx + 1 | 0) % 55; - var curval = Caml_array.get(s.st, s.idx); - var newval = Caml_array.get(s.st, (s.idx + 24 | 0) % 55) + (curval ^ (curval >>> 25) & 31) | 0; - var newval30 = newval & 1073741823; + let curval = Caml_array.get(s.st, s.idx); + let newval = Caml_array.get(s.st, (s.idx + 24 | 0) % 55) + (curval ^ (curval >>> 25) & 31) | 0; + let newval30 = newval & 1073741823; Caml_array.set(s.st, s.idx, newval30); return newval30; } @@ -82,8 +82,8 @@ function $$int(s, bound) { }; } while(true) { - var r = bits(s); - var v = r % bound; + let r = bits(s); + let v = r % bound; if ((r - v | 0) <= ((1073741823 - bound | 0) + 1 | 0)) { return v; } @@ -100,10 +100,10 @@ function int32(s, bound) { }; } while(true) { - var b1 = bits(s); - var b2 = ((bits(s) & 1) << 30); - var r = b1 | b2; - var v = r % bound; + let b1 = bits(s); + let b2 = ((bits(s) & 1) << 30); + let r = b1 | b2; + let v = r % bound; if ((r - v | 0) <= ((Int32.max_int - bound | 0) + 1 | 0)) { return v; } @@ -120,11 +120,11 @@ function int64(s, bound) { }; } while(true) { - var b1 = Caml_int64.of_int32(bits(s)); - var b2 = Caml_int64.lsl_(Caml_int64.of_int32(bits(s)), 30); - var b3 = Caml_int64.lsl_(Caml_int64.of_int32(bits(s) & 7), 60); - var r = Caml_int64.or_(b1, Caml_int64.or_(b2, b3)); - var v = Caml_int64.mod_(r, bound); + let b1 = Caml_int64.of_int32(bits(s)); + let b2 = Caml_int64.lsl_(Caml_int64.of_int32(bits(s)), 30); + let b3 = Caml_int64.lsl_(Caml_int64.of_int32(bits(s) & 7), 60); + let r = Caml_int64.or_(b1, Caml_int64.or_(b2, b3)); + let v = Caml_int64.mod_(r, bound); if (!Caml.i64_gt(Caml_int64.sub(r, v), Caml_int64.add(Caml_int64.sub(Int64.max_int, bound), Caml_int64.one))) { return v; } @@ -133,8 +133,8 @@ function int64(s, bound) { } function rawfloat(s) { - var r1 = bits(s); - var r2 = bits(s); + let r1 = bits(s); + let r2 = bits(s); return (r1 / 1073741824.0 + r2) / 1073741824.0; } @@ -146,7 +146,7 @@ function bool(s) { return (bits(s) & 1) === 0; } -var $$default = { +let $$default = { st: [ 987910699, 495797812, @@ -251,7 +251,7 @@ function set_state(s) { assign($$default, s); } -var State = { +let State = { make: make, make_self_init: make_self_init, copy: copy, diff --git a/lib/es6/set.js b/lib/es6/set.js index 912700c621..ca794319ea 100644 --- a/lib/es6/set.js +++ b/lib/es6/set.js @@ -5,17 +5,17 @@ import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; function Make(funarg) { - var height = function (param) { + let height = function (param) { if (typeof param !== "object") { return 0; } else { return param.h; } }; - var create = function (l, v, r) { - var hl; + let create = function (l, v, r) { + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; return { TAG: "Node", @@ -25,10 +25,10 @@ function Make(funarg) { h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0 }; }; - var bal = function (l, v, r) { - var hl; + let bal = function (l, v, r) { + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -38,9 +38,9 @@ function Make(funarg) { Error: new Error() }; } - var lr = l.r; - var lv = l.v; - var ll = l.l; + let lr = l.r; + let lv = l.v; + let ll = l.l; if (height(ll) >= height(lr)) { return create(ll, lv, create(lr, v, r)); } @@ -69,9 +69,9 @@ function Make(funarg) { Error: new Error() }; } - var rr = r.r; - var rv = r.v; - var rl = r.l; + let rr = r.r; + let rv = r.v; + let rl = r.l; if (height(rr) >= height(rl)) { return create(create(l, v, rl), rv, rr); } @@ -84,7 +84,7 @@ function Make(funarg) { Error: new Error() }; }; - var add = function (x, param) { + let add = function (x, param) { if (typeof param !== "object") { return { TAG: "Node", @@ -94,29 +94,29 @@ function Make(funarg) { h: 1 }; } - var r = param.r; - var v = param.v; - var l = param.l; - var c = Curry._2(funarg.compare, x, v); + let r = param.r; + let v = param.v; + let l = param.l; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { return param; } if (c < 0) { - var ll = add(x, l); + let ll = add(x, l); if (l === ll) { return param; } else { return bal(ll, v, r); } } - var rr = add(x, r); + let rr = add(x, r); if (r === rr) { return param; } else { return bal(l, v, rr); } }; - var singleton = function (x) { + let singleton = function (x) { return { TAG: "Node", l: "Empty", @@ -125,29 +125,29 @@ function Make(funarg) { h: 1 }; }; - var add_min_element = function (x, param) { + let add_min_element = function (x, param) { if (typeof param !== "object") { return singleton(x); } else { return bal(add_min_element(x, param.l), param.v, param.r); } }; - var add_max_element = function (x, param) { + let add_max_element = function (x, param) { if (typeof param !== "object") { return singleton(x); } else { return bal(param.l, param.v, add_max_element(x, param.r)); } }; - var join = function (l, v, r) { + let join = function (l, v, r) { if (typeof l !== "object") { return add_min_element(v, r); } - var lh = l.h; + let lh = l.h; if (typeof r !== "object") { return add_max_element(v, l); } - var rh = r.h; + let rh = r.h; if (lh > (rh + 2 | 0)) { return bal(l.l, l.v, join(l.r, v, r)); } else if (rh > (lh + 2 | 0)) { @@ -156,16 +156,16 @@ function Make(funarg) { return create(l, v, r); } }; - var min_elt = function (_param) { + let min_elt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return param.v; } @@ -173,13 +173,13 @@ function Make(funarg) { continue ; }; }; - var min_elt_opt = function (_param) { + let min_elt_opt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return Caml_option.some(param.v); } @@ -187,16 +187,16 @@ function Make(funarg) { continue ; }; }; - var max_elt = function (_param) { + let max_elt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return param.v; } @@ -204,13 +204,13 @@ function Make(funarg) { continue ; }; }; - var max_elt_opt = function (_param) { + let max_elt_opt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return Caml_option.some(param.v); } @@ -218,7 +218,7 @@ function Make(funarg) { continue ; }; }; - var remove_min_elt = function (param) { + let remove_min_elt = function (param) { if (typeof param !== "object") { throw { RE_EXN_ID: "Invalid_argument", @@ -226,14 +226,14 @@ function Make(funarg) { Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return param.r; } else { return bal(remove_min_elt(l), param.v, param.r); } }; - var concat = function (t1, t2) { + let concat = function (t1, t2) { if (typeof t1 !== "object") { return t2; } else if (typeof t2 !== "object") { @@ -242,7 +242,7 @@ function Make(funarg) { return join(t1, min_elt(t2), remove_min_elt(t2)); } }; - var split = function (x, param) { + let split = function (x, param) { if (typeof param !== "object") { return [ "Empty", @@ -250,10 +250,10 @@ function Make(funarg) { "Empty" ]; } - var r = param.r; - var v = param.v; - var l = param.l; - var c = Curry._2(funarg.compare, x, v); + let r = param.r; + let v = param.v; + let l = param.l; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { return [ l, @@ -262,34 +262,34 @@ function Make(funarg) { ]; } if (c < 0) { - var match = split(x, l); + let match = split(x, l); return [ match[0], match[1], join(match[2], v, r) ]; } - var match$1 = split(x, r); + let match$1 = split(x, r); return [ join(l, v, match$1[0]), match$1[1], match$1[2] ]; }; - var is_empty = function (param) { + let is_empty = function (param) { if (typeof param !== "object") { return true; } else { return false; } }; - var mem = function (x, _param) { + let mem = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } - var c = Curry._2(funarg.compare, x, param.v); + let c = Curry._2(funarg.compare, x, param.v); if (c === 0) { return true; } @@ -297,14 +297,14 @@ function Make(funarg) { continue ; }; }; - var remove = function (x, param) { + let remove = function (x, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var v = param.v; - var l = param.l; - var c = Curry._2(funarg.compare, x, v); + let r = param.r; + let v = param.v; + let l = param.l; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { if (typeof l !== "object") { return r; @@ -315,84 +315,84 @@ function Make(funarg) { } } if (c < 0) { - var ll = remove(x, l); + let ll = remove(x, l); if (l === ll) { return param; } else { return bal(ll, v, r); } } - var rr = remove(x, r); + let rr = remove(x, r); if (r === rr) { return param; } else { return bal(l, v, rr); } }; - var union = function (s1, s2) { + let union = function (s1, s2) { if (typeof s1 !== "object") { return s2; } - var h1 = s1.h; - var v1 = s1.v; + let h1 = s1.h; + let v1 = s1.v; if (typeof s2 !== "object") { return s1; } - var h2 = s2.h; - var v2 = s2.v; + let h2 = s2.h; + let v2 = s2.v; if (h1 >= h2) { if (h2 === 1) { return add(v2, s1); } - var match = split(v1, s2); + let match = split(v1, s2); return join(union(s1.l, match[0]), v1, union(s1.r, match[2])); } if (h1 === 1) { return add(v1, s2); } - var match$1 = split(v2, s1); + let match$1 = split(v2, s1); return join(union(match$1[0], s2.l), v2, union(match$1[2], s2.r)); }; - var inter = function (s1, s2) { + let inter = function (s1, s2) { if (typeof s1 !== "object") { return "Empty"; } if (typeof s2 !== "object") { return "Empty"; } - var r1 = s1.r; - var v1 = s1.v; - var l1 = s1.l; - var match = split(v1, s2); - var l2 = match[0]; + let r1 = s1.r; + let v1 = s1.v; + let l1 = s1.l; + let match = split(v1, s2); + let l2 = match[0]; if (match[1]) { return join(inter(l1, l2), v1, inter(r1, match[2])); } else { return concat(inter(l1, l2), inter(r1, match[2])); } }; - var diff = function (s1, s2) { + let diff = function (s1, s2) { if (typeof s1 !== "object") { return "Empty"; } if (typeof s2 !== "object") { return s1; } - var r1 = s1.r; - var v1 = s1.v; - var l1 = s1.l; - var match = split(v1, s2); - var l2 = match[0]; + let r1 = s1.r; + let v1 = s1.v; + let l1 = s1.l; + let match = split(v1, s2); + let l2 = match[0]; if (match[1]) { return concat(diff(l1, l2), diff(r1, match[2])); } else { return join(diff(l1, l2), v1, diff(r1, match[2])); } }; - var cons_enum = function (_s, _e) { + let cons_enum = function (_s, _e) { while(true) { - var e = _e; - var s = _s; + let e = _e; + let s = _s; if (typeof s !== "object") { return e; } @@ -406,12 +406,12 @@ function Make(funarg) { continue ; }; }; - var compare = function (s1, s2) { - var _e1 = cons_enum(s1, "End"); - var _e2 = cons_enum(s2, "End"); + let compare = function (s1, s2) { + let _e1 = cons_enum(s1, "End"); + let _e2 = cons_enum(s2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return 0; @@ -422,7 +422,7 @@ function Make(funarg) { if (typeof e2 !== "object") { return 1; } - var c = Curry._2(funarg.compare, e1._0, e2._0); + let c = Curry._2(funarg.compare, e1._0, e2._0); if (c !== 0) { return c; } @@ -431,25 +431,25 @@ function Make(funarg) { continue ; }; }; - var equal = function (s1, s2) { + let equal = function (s1, s2) { return compare(s1, s2) === 0; }; - var subset = function (_s1, _s2) { + let subset = function (_s1, _s2) { while(true) { - var s2 = _s2; - var s1 = _s1; + let s2 = _s2; + let s1 = _s1; if (typeof s1 !== "object") { return true; } - var r1 = s1.r; - var v1 = s1.v; - var l1 = s1.l; + let r1 = s1.r; + let v1 = s1.v; + let l1 = s1.l; if (typeof s2 !== "object") { return false; } - var r2 = s2.r; - var l2 = s2.l; - var c = Curry._2(funarg.compare, v1, s2.v); + let r2 = s2.r; + let l2 = s2.l; + let c = Curry._2(funarg.compare, v1, s2.v); if (c === 0) { if (!subset(l1, l2)) { return false; @@ -484,9 +484,9 @@ function Make(funarg) { continue ; }; }; - var iter = function (f, _param) { + let iter = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } @@ -496,10 +496,10 @@ function Make(funarg) { continue ; }; }; - var fold = function (f, _s, _accu) { + let fold = function (f, _s, _accu) { while(true) { - var accu = _accu; - var s = _s; + let accu = _accu; + let s = _s; if (typeof s !== "object") { return accu; } @@ -508,9 +508,9 @@ function Make(funarg) { continue ; }; }; - var for_all = function (p, _param) { + let for_all = function (p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return true; } @@ -524,9 +524,9 @@ function Make(funarg) { continue ; }; }; - var exists = function (p, _param) { + let exists = function (p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } @@ -540,16 +540,16 @@ function Make(funarg) { continue ; }; }; - var filter = function (p, param) { + let filter = function (p, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var v = param.v; - var l = param.l; - var l$p = filter(p, l); - var pv = Curry._1(p, v); - var r$p = filter(p, r); + let r = param.r; + let v = param.v; + let l = param.l; + let l$p = filter(p, l); + let pv = Curry._1(p, v); + let r$p = filter(p, r); if (pv) { if (l === l$p && r === r$p) { return param; @@ -560,21 +560,21 @@ function Make(funarg) { return concat(l$p, r$p); } }; - var partition = function (p, param) { + let partition = function (p, param) { if (typeof param !== "object") { return [ "Empty", "Empty" ]; } - var v = param.v; - var match = partition(p, param.l); - var lf = match[1]; - var lt = match[0]; - var pv = Curry._1(p, v); - var match$1 = partition(p, param.r); - var rf = match$1[1]; - var rt = match$1[0]; + let v = param.v; + let match = partition(p, param.l); + let lf = match[1]; + let lt = match[0]; + let pv = Curry._1(p, v); + let match$1 = partition(p, param.r); + let rf = match$1[1]; + let rt = match$1[0]; if (pv) { return [ join(lt, v, rt), @@ -587,17 +587,17 @@ function Make(funarg) { ]; } }; - var cardinal = function (param) { + let cardinal = function (param) { if (typeof param !== "object") { return 0; } else { return (cardinal(param.l) + 1 | 0) + cardinal(param.r) | 0; } }; - var elements_aux = function (_accu, _param) { + let elements_aux = function (_accu, _param) { while(true) { - var param = _param; - var accu = _accu; + let param = _param; + let accu = _accu; if (typeof param !== "object") { return accu; } @@ -609,20 +609,20 @@ function Make(funarg) { continue ; }; }; - var elements = function (s) { + let elements = function (s) { return elements_aux(/* [] */0, s); }; - var find = function (x, _param) { + let find = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; - var c = Curry._2(funarg.compare, x, v); + let v = param.v; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { return v; } @@ -630,26 +630,26 @@ function Make(funarg) { continue ; }; }; - var find_first = function (f, _param) { + let find_first = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _param$1 = param.l; + let _v0 = v; + let _param$1 = param.l; while(true) { - var param$1 = _param$1; - var v0 = _v0; + let param$1 = _param$1; + let v0 = _v0; if (typeof param$1 !== "object") { return v0; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.l; _v0 = v$1; @@ -663,23 +663,23 @@ function Make(funarg) { continue ; }; }; - var find_first_opt = function (f, _param) { + let find_first_opt = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _param$1 = param.l; + let _v0 = v; + let _param$1 = param.l; while(true) { - var param$1 = _param$1; - var v0 = _v0; + let param$1 = _param$1; + let v0 = _v0; if (typeof param$1 !== "object") { return Caml_option.some(v0); } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.l; _v0 = v$1; @@ -693,26 +693,26 @@ function Make(funarg) { continue ; }; }; - var find_last = function (f, _param) { + let find_last = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _param$1 = param.r; + let _v0 = v; + let _param$1 = param.r; while(true) { - var param$1 = _param$1; - var v0 = _v0; + let param$1 = _param$1; + let v0 = _v0; if (typeof param$1 !== "object") { return v0; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.r; _v0 = v$1; @@ -726,23 +726,23 @@ function Make(funarg) { continue ; }; }; - var find_last_opt = function (f, _param) { + let find_last_opt = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _param$1 = param.r; + let _v0 = v; + let _param$1 = param.r; while(true) { - var param$1 = _param$1; - var v0 = _v0; + let param$1 = _param$1; + let v0 = _v0; if (typeof param$1 !== "object") { return Caml_option.some(v0); } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.r; _v0 = v$1; @@ -756,14 +756,14 @@ function Make(funarg) { continue ; }; }; - var find_opt = function (x, _param) { + let find_opt = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; - var c = Curry._2(funarg.compare, x, v); + let v = param.v; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { return Caml_option.some(v); } @@ -771,16 +771,16 @@ function Make(funarg) { continue ; }; }; - var map = function (f, param) { + let map = function (f, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var v = param.v; - var l = param.l; - var l$p = map(f, l); - var v$p = Curry._1(f, v); - var r$p = map(f, r); + let r = param.r; + let v = param.v; + let l = param.l; + let l$p = map(f, l); + let v$p = Curry._1(f, v); + let r$p = map(f, r); if (l === l$p && v === v$p && r === r$p) { return param; } else if ((l$p === "Empty" || Curry._2(funarg.compare, max_elt(l$p), v$p) < 0) && (r$p === "Empty" || Curry._2(funarg.compare, v$p, min_elt(r$p)) < 0)) { @@ -789,31 +789,31 @@ function Make(funarg) { return union(l$p, add(v$p, r$p)); } }; - var of_list = function (l) { + let of_list = function (l) { if (!l) { return "Empty"; } - var match = l.tl; - var x0 = l.hd; + let match = l.tl; + let x0 = l.hd; if (!match) { return singleton(x0); } - var match$1 = match.tl; - var x1 = match.hd; + let match$1 = match.tl; + let x1 = match.hd; if (!match$1) { return add(x1, singleton(x0)); } - var match$2 = match$1.tl; - var x2 = match$1.hd; + let match$2 = match$1.tl; + let x2 = match$1.hd; if (!match$2) { return add(x2, add(x1, singleton(x0))); } - var match$3 = match$2.tl; - var x3 = match$2.hd; + let match$3 = match$2.tl; + let x3 = match$2.hd; if (match$3) { if (match$3.tl) { - var l$1 = List.sort_uniq(funarg.compare, l); - var sub = function (n, l) { + let l$1 = List.sort_uniq(funarg.compare, l); + let sub = function (n, l) { switch (n) { case 0 : return [ @@ -836,7 +836,7 @@ function Make(funarg) { break; case 2 : if (l) { - var match = l.tl; + let match = l.tl; if (match) { return [ { @@ -860,9 +860,9 @@ function Make(funarg) { break; case 3 : if (l) { - var match$1 = l.tl; + let match$1 = l.tl; if (match$1) { - var match$2 = match$1.tl; + let match$2 = match$1.tl; if (match$2) { return [ { @@ -895,11 +895,11 @@ function Make(funarg) { default: } - var nl = n / 2 | 0; - var match$3 = sub(nl, l); - var l$1 = match$3[1]; + let nl = n / 2 | 0; + let match$3 = sub(nl, l); + let l$1 = match$3[1]; if (l$1) { - var match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl); + let match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl); return [ create(match$3[0], l$1.hd, match$4[0]), match$4[1] diff --git a/lib/es6/setLabels.js b/lib/es6/setLabels.js index 86e0bd0cb9..0ffee825bb 100644 --- a/lib/es6/setLabels.js +++ b/lib/es6/setLabels.js @@ -5,17 +5,17 @@ import * as Curry from "./curry.js"; import * as Caml_option from "./caml_option.js"; function Make(Ord) { - var height = function (param) { + let height = function (param) { if (typeof param !== "object") { return 0; } else { return param.h; } }; - var create = function (l, v, r) { - var hl; + let create = function (l, v, r) { + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; return { TAG: "Node", @@ -25,10 +25,10 @@ function Make(Ord) { h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0 }; }; - var bal = function (l, v, r) { - var hl; + let bal = function (l, v, r) { + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -38,9 +38,9 @@ function Make(Ord) { Error: new Error() }; } - var lr = l.r; - var lv = l.v; - var ll = l.l; + let lr = l.r; + let lv = l.v; + let ll = l.l; if (height(ll) >= height(lr)) { return create(ll, lv, create(lr, v, r)); } @@ -69,9 +69,9 @@ function Make(Ord) { Error: new Error() }; } - var rr = r.r; - var rv = r.v; - var rl = r.l; + let rr = r.r; + let rv = r.v; + let rl = r.l; if (height(rr) >= height(rl)) { return create(create(l, v, rl), rv, rr); } @@ -84,7 +84,7 @@ function Make(Ord) { Error: new Error() }; }; - var add = function (x, param) { + let add = function (x, param) { if (typeof param !== "object") { return { TAG: "Node", @@ -94,29 +94,29 @@ function Make(Ord) { h: 1 }; } - var r = param.r; - var v = param.v; - var l = param.l; - var c = Curry._2(Ord.compare, x, v); + let r = param.r; + let v = param.v; + let l = param.l; + let c = Curry._2(Ord.compare, x, v); if (c === 0) { return param; } if (c < 0) { - var ll = add(x, l); + let ll = add(x, l); if (l === ll) { return param; } else { return bal(ll, v, r); } } - var rr = add(x, r); + let rr = add(x, r); if (r === rr) { return param; } else { return bal(l, v, rr); } }; - var singleton = function (x) { + let singleton = function (x) { return { TAG: "Node", l: "Empty", @@ -125,29 +125,29 @@ function Make(Ord) { h: 1 }; }; - var add_min_element = function (x, param) { + let add_min_element = function (x, param) { if (typeof param !== "object") { return singleton(x); } else { return bal(add_min_element(x, param.l), param.v, param.r); } }; - var add_max_element = function (x, param) { + let add_max_element = function (x, param) { if (typeof param !== "object") { return singleton(x); } else { return bal(param.l, param.v, add_max_element(x, param.r)); } }; - var join = function (l, v, r) { + let join = function (l, v, r) { if (typeof l !== "object") { return add_min_element(v, r); } - var lh = l.h; + let lh = l.h; if (typeof r !== "object") { return add_max_element(v, l); } - var rh = r.h; + let rh = r.h; if (lh > (rh + 2 | 0)) { return bal(l.l, l.v, join(l.r, v, r)); } else if (rh > (lh + 2 | 0)) { @@ -156,16 +156,16 @@ function Make(Ord) { return create(l, v, r); } }; - var min_elt = function (_param) { + let min_elt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return param.v; } @@ -173,13 +173,13 @@ function Make(Ord) { continue ; }; }; - var min_elt_opt = function (_param) { + let min_elt_opt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return Caml_option.some(param.v); } @@ -187,16 +187,16 @@ function Make(Ord) { continue ; }; }; - var max_elt = function (_param) { + let max_elt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return param.v; } @@ -204,13 +204,13 @@ function Make(Ord) { continue ; }; }; - var max_elt_opt = function (_param) { + let max_elt_opt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return Caml_option.some(param.v); } @@ -218,7 +218,7 @@ function Make(Ord) { continue ; }; }; - var remove_min_elt = function (param) { + let remove_min_elt = function (param) { if (typeof param !== "object") { throw { RE_EXN_ID: "Invalid_argument", @@ -226,14 +226,14 @@ function Make(Ord) { Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return param.r; } else { return bal(remove_min_elt(l), param.v, param.r); } }; - var merge = function (t1, t2) { + let merge = function (t1, t2) { if (typeof t1 !== "object") { return t2; } else if (typeof t2 !== "object") { @@ -242,7 +242,7 @@ function Make(Ord) { return bal(t1, min_elt(t2), remove_min_elt(t2)); } }; - var concat = function (t1, t2) { + let concat = function (t1, t2) { if (typeof t1 !== "object") { return t2; } else if (typeof t2 !== "object") { @@ -251,7 +251,7 @@ function Make(Ord) { return join(t1, min_elt(t2), remove_min_elt(t2)); } }; - var split = function (x, param) { + let split = function (x, param) { if (typeof param !== "object") { return [ "Empty", @@ -259,10 +259,10 @@ function Make(Ord) { "Empty" ]; } - var r = param.r; - var v = param.v; - var l = param.l; - var c = Curry._2(Ord.compare, x, v); + let r = param.r; + let v = param.v; + let l = param.l; + let c = Curry._2(Ord.compare, x, v); if (c === 0) { return [ l, @@ -271,34 +271,34 @@ function Make(Ord) { ]; } if (c < 0) { - var match = split(x, l); + let match = split(x, l); return [ match[0], match[1], join(match[2], v, r) ]; } - var match$1 = split(x, r); + let match$1 = split(x, r); return [ join(l, v, match$1[0]), match$1[1], match$1[2] ]; }; - var is_empty = function (param) { + let is_empty = function (param) { if (typeof param !== "object") { return true; } else { return false; } }; - var mem = function (x, _param) { + let mem = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } - var c = Curry._2(Ord.compare, x, param.v); + let c = Curry._2(Ord.compare, x, param.v); if (c === 0) { return true; } @@ -306,96 +306,96 @@ function Make(Ord) { continue ; }; }; - var remove = function (x, param) { + let remove = function (x, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var v = param.v; - var l = param.l; - var c = Curry._2(Ord.compare, x, v); + let r = param.r; + let v = param.v; + let l = param.l; + let c = Curry._2(Ord.compare, x, v); if (c === 0) { return merge(l, r); } if (c < 0) { - var ll = remove(x, l); + let ll = remove(x, l); if (l === ll) { return param; } else { return bal(ll, v, r); } } - var rr = remove(x, r); + let rr = remove(x, r); if (r === rr) { return param; } else { return bal(l, v, rr); } }; - var union = function (s1, s2) { + let union = function (s1, s2) { if (typeof s1 !== "object") { return s2; } - var h1 = s1.h; - var v1 = s1.v; + let h1 = s1.h; + let v1 = s1.v; if (typeof s2 !== "object") { return s1; } - var h2 = s2.h; - var v2 = s2.v; + let h2 = s2.h; + let v2 = s2.v; if (h1 >= h2) { if (h2 === 1) { return add(v2, s1); } - var match = split(v1, s2); + let match = split(v1, s2); return join(union(s1.l, match[0]), v1, union(s1.r, match[2])); } if (h1 === 1) { return add(v1, s2); } - var match$1 = split(v2, s1); + let match$1 = split(v2, s1); return join(union(match$1[0], s2.l), v2, union(match$1[2], s2.r)); }; - var inter = function (s1, s2) { + let inter = function (s1, s2) { if (typeof s1 !== "object") { return "Empty"; } if (typeof s2 !== "object") { return "Empty"; } - var r1 = s1.r; - var v1 = s1.v; - var l1 = s1.l; - var match = split(v1, s2); - var l2 = match[0]; + let r1 = s1.r; + let v1 = s1.v; + let l1 = s1.l; + let match = split(v1, s2); + let l2 = match[0]; if (match[1]) { return join(inter(l1, l2), v1, inter(r1, match[2])); } else { return concat(inter(l1, l2), inter(r1, match[2])); } }; - var diff = function (s1, s2) { + let diff = function (s1, s2) { if (typeof s1 !== "object") { return "Empty"; } if (typeof s2 !== "object") { return s1; } - var r1 = s1.r; - var v1 = s1.v; - var l1 = s1.l; - var match = split(v1, s2); - var l2 = match[0]; + let r1 = s1.r; + let v1 = s1.v; + let l1 = s1.l; + let match = split(v1, s2); + let l2 = match[0]; if (match[1]) { return concat(diff(l1, l2), diff(r1, match[2])); } else { return join(diff(l1, l2), v1, diff(r1, match[2])); } }; - var cons_enum = function (_s, _e) { + let cons_enum = function (_s, _e) { while(true) { - var e = _e; - var s = _s; + let e = _e; + let s = _s; if (typeof s !== "object") { return e; } @@ -409,10 +409,10 @@ function Make(Ord) { continue ; }; }; - var compare_aux = function (_e1, _e2) { + let compare_aux = function (_e1, _e2) { while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return 0; @@ -423,7 +423,7 @@ function Make(Ord) { if (typeof e2 !== "object") { return 1; } - var c = Curry._2(Ord.compare, e1._0, e2._0); + let c = Curry._2(Ord.compare, e1._0, e2._0); if (c !== 0) { return c; } @@ -432,28 +432,28 @@ function Make(Ord) { continue ; }; }; - var compare = function (s1, s2) { + let compare = function (s1, s2) { return compare_aux(cons_enum(s1, "End"), cons_enum(s2, "End")); }; - var equal = function (s1, s2) { + let equal = function (s1, s2) { return compare(s1, s2) === 0; }; - var subset = function (_s1, _s2) { + let subset = function (_s1, _s2) { while(true) { - var s2 = _s2; - var s1 = _s1; + let s2 = _s2; + let s1 = _s1; if (typeof s1 !== "object") { return true; } - var r1 = s1.r; - var v1 = s1.v; - var l1 = s1.l; + let r1 = s1.r; + let v1 = s1.v; + let l1 = s1.l; if (typeof s2 !== "object") { return false; } - var r2 = s2.r; - var l2 = s2.l; - var c = Curry._2(Ord.compare, v1, s2.v); + let r2 = s2.r; + let l2 = s2.l; + let c = Curry._2(Ord.compare, v1, s2.v); if (c === 0) { if (!subset(l1, l2)) { return false; @@ -488,9 +488,9 @@ function Make(Ord) { continue ; }; }; - var iter = function (f, _param) { + let iter = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } @@ -500,10 +500,10 @@ function Make(Ord) { continue ; }; }; - var fold = function (f, _s, _accu) { + let fold = function (f, _s, _accu) { while(true) { - var accu = _accu; - var s = _s; + let accu = _accu; + let s = _s; if (typeof s !== "object") { return accu; } @@ -512,9 +512,9 @@ function Make(Ord) { continue ; }; }; - var for_all = function (p, _param) { + let for_all = function (p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return true; } @@ -528,9 +528,9 @@ function Make(Ord) { continue ; }; }; - var exists = function (p, _param) { + let exists = function (p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } @@ -544,16 +544,16 @@ function Make(Ord) { continue ; }; }; - var filter = function (p, param) { + let filter = function (p, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var v = param.v; - var l = param.l; - var l$p = filter(p, l); - var pv = Curry._1(p, v); - var r$p = filter(p, r); + let r = param.r; + let v = param.v; + let l = param.l; + let l$p = filter(p, l); + let pv = Curry._1(p, v); + let r$p = filter(p, r); if (pv) { if (l === l$p && r === r$p) { return param; @@ -564,21 +564,21 @@ function Make(Ord) { return concat(l$p, r$p); } }; - var partition = function (p, param) { + let partition = function (p, param) { if (typeof param !== "object") { return [ "Empty", "Empty" ]; } - var v = param.v; - var match = partition(p, param.l); - var lf = match[1]; - var lt = match[0]; - var pv = Curry._1(p, v); - var match$1 = partition(p, param.r); - var rf = match$1[1]; - var rt = match$1[0]; + let v = param.v; + let match = partition(p, param.l); + let lf = match[1]; + let lt = match[0]; + let pv = Curry._1(p, v); + let match$1 = partition(p, param.r); + let rf = match$1[1]; + let rt = match$1[0]; if (pv) { return [ join(lt, v, rt), @@ -591,17 +591,17 @@ function Make(Ord) { ]; } }; - var cardinal = function (param) { + let cardinal = function (param) { if (typeof param !== "object") { return 0; } else { return (cardinal(param.l) + 1 | 0) + cardinal(param.r) | 0; } }; - var elements_aux = function (_accu, _param) { + let elements_aux = function (_accu, _param) { while(true) { - var param = _param; - var accu = _accu; + let param = _param; + let accu = _accu; if (typeof param !== "object") { return accu; } @@ -613,20 +613,20 @@ function Make(Ord) { continue ; }; }; - var elements = function (s) { + let elements = function (s) { return elements_aux(/* [] */0, s); }; - var find = function (x, _param) { + let find = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; - var c = Curry._2(Ord.compare, x, v); + let v = param.v; + let c = Curry._2(Ord.compare, x, v); if (c === 0) { return v; } @@ -634,14 +634,14 @@ function Make(Ord) { continue ; }; }; - var find_first_aux = function (_v0, f, _param) { + let find_first_aux = function (_v0, f, _param) { while(true) { - var param = _param; - var v0 = _v0; + let param = _param; + let v0 = _v0; if (typeof param !== "object") { return v0; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.l; _v0 = v; @@ -651,16 +651,16 @@ function Make(Ord) { continue ; }; }; - var find_first = function (f, _param) { + let find_first = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_first_aux(v, f, param.l); } @@ -668,14 +668,14 @@ function Make(Ord) { continue ; }; }; - var find_first_opt_aux = function (_v0, f, _param) { + let find_first_opt_aux = function (_v0, f, _param) { while(true) { - var param = _param; - var v0 = _v0; + let param = _param; + let v0 = _v0; if (typeof param !== "object") { return Caml_option.some(v0); } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.l; _v0 = v; @@ -685,13 +685,13 @@ function Make(Ord) { continue ; }; }; - var find_first_opt = function (f, _param) { + let find_first_opt = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_first_opt_aux(v, f, param.l); } @@ -699,14 +699,14 @@ function Make(Ord) { continue ; }; }; - var find_last_aux = function (_v0, f, _param) { + let find_last_aux = function (_v0, f, _param) { while(true) { - var param = _param; - var v0 = _v0; + let param = _param; + let v0 = _v0; if (typeof param !== "object") { return v0; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.r; _v0 = v; @@ -716,16 +716,16 @@ function Make(Ord) { continue ; }; }; - var find_last = function (f, _param) { + let find_last = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_last_aux(v, f, param.r); } @@ -733,14 +733,14 @@ function Make(Ord) { continue ; }; }; - var find_last_opt_aux = function (_v0, f, _param) { + let find_last_opt_aux = function (_v0, f, _param) { while(true) { - var param = _param; - var v0 = _v0; + let param = _param; + let v0 = _v0; if (typeof param !== "object") { return Caml_option.some(v0); } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.r; _v0 = v; @@ -750,13 +750,13 @@ function Make(Ord) { continue ; }; }; - var find_last_opt = function (f, _param) { + let find_last_opt = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_last_opt_aux(v, f, param.r); } @@ -764,14 +764,14 @@ function Make(Ord) { continue ; }; }; - var find_opt = function (x, _param) { + let find_opt = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; - var c = Curry._2(Ord.compare, x, v); + let v = param.v; + let c = Curry._2(Ord.compare, x, v); if (c === 0) { return Caml_option.some(v); } @@ -779,31 +779,31 @@ function Make(Ord) { continue ; }; }; - var try_join = function (l, v, r) { + let try_join = function (l, v, r) { if ((l === "Empty" || Curry._2(Ord.compare, max_elt(l), v) < 0) && (r === "Empty" || Curry._2(Ord.compare, v, min_elt(r)) < 0)) { return join(l, v, r); } else { return union(l, add(v, r)); } }; - var map = function (f, param) { + let map = function (f, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var v = param.v; - var l = param.l; - var l$p = map(f, l); - var v$p = Curry._1(f, v); - var r$p = map(f, r); + let r = param.r; + let v = param.v; + let l = param.l; + let l$p = map(f, l); + let v$p = Curry._1(f, v); + let r$p = map(f, r); if (l === l$p && v === v$p && r === r$p) { return param; } else { return try_join(l$p, v$p, r$p); } }; - var of_sorted_list = function (l) { - var sub = function (n, l) { + let of_sorted_list = function (l) { + let sub = function (n, l) { switch (n) { case 0 : return [ @@ -826,7 +826,7 @@ function Make(Ord) { break; case 2 : if (l) { - var match = l.tl; + let match = l.tl; if (match) { return [ { @@ -850,9 +850,9 @@ function Make(Ord) { break; case 3 : if (l) { - var match$1 = l.tl; + let match$1 = l.tl; if (match$1) { - var match$2 = match$1.tl; + let match$2 = match$1.tl; if (match$2) { return [ { @@ -885,11 +885,11 @@ function Make(Ord) { default: } - var nl = n / 2 | 0; - var match$3 = sub(nl, l); - var l$1 = match$3[1]; + let nl = n / 2 | 0; + let match$3 = sub(nl, l); + let l$1 = match$3[1]; if (l$1) { - var match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl); + let match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl); return [ create(match$3[0], l$1.hd, match$4[0]), match$4[1] @@ -907,27 +907,27 @@ function Make(Ord) { }; return sub(List.length(l), l)[0]; }; - var of_list = function (l) { + let of_list = function (l) { if (!l) { return "Empty"; } - var match = l.tl; - var x0 = l.hd; + let match = l.tl; + let x0 = l.hd; if (!match) { return singleton(x0); } - var match$1 = match.tl; - var x1 = match.hd; + let match$1 = match.tl; + let x1 = match.hd; if (!match$1) { return add(x1, singleton(x0)); } - var match$2 = match$1.tl; - var x2 = match$1.hd; + let match$2 = match$1.tl; + let x2 = match$1.hd; if (!match$2) { return add(x2, add(x1, singleton(x0))); } - var match$3 = match$2.tl; - var x3 = match$2.hd; + let match$3 = match$2.tl; + let x3 = match$2.hd; if (match$3) { if (match$3.tl) { return of_sorted_list(List.sort_uniq(Ord.compare, l)); diff --git a/lib/es6/sort.js b/lib/es6/sort.js index 1baceba376..90435e1bb2 100644 --- a/lib/es6/sort.js +++ b/lib/es6/sort.js @@ -9,8 +9,8 @@ function merge(order, l1, l2) { if (!l2) { return l1; } - var h2 = l2.hd; - var h1 = l1.hd; + let h2 = l2.hd; + let h1 = l1.hd; if (Curry._2(order, h1, h2)) { return { hd: h1, @@ -25,12 +25,12 @@ function merge(order, l1, l2) { } function list(order, l) { - var initlist = function (param) { + let initlist = function (param) { if (!param) { return /* [] */0; } - var match = param.tl; - var e = param.hd; + let match = param.tl; + let e = param.hd; if (!match) { return { hd: { @@ -40,7 +40,7 @@ function list(order, l) { tl: /* [] */0 }; } - var e2 = match.hd; + let e2 = match.hd; return { hd: Curry._2(order, e, e2) ? ({ hd: e, @@ -58,11 +58,11 @@ function list(order, l) { tl: initlist(match.tl) }; }; - var merge2 = function (param) { + let merge2 = function (param) { if (!param) { return param; } - var match = param.tl; + let match = param.tl; if (match) { return { hd: merge(order, param.hd, match.hd), @@ -72,9 +72,9 @@ function list(order, l) { return param; } }; - var _param = initlist(l); + let _param = initlist(l); while(true) { - var param = _param; + let param = _param; if (!param) { return /* [] */0; } @@ -87,20 +87,20 @@ function list(order, l) { } function swap(arr, i, j) { - var tmp = arr[i]; + let tmp = arr[i]; arr[i] = arr[j]; arr[j] = tmp; } function array(cmp, arr) { - var qsort = function (_lo, _hi) { + let qsort = function (_lo, _hi) { while(true) { - var hi = _hi; - var lo = _lo; + let hi = _hi; + let lo = _lo; if ((hi - lo | 0) < 6) { return; } - var mid = ((lo + hi | 0) >>> 1); + let mid = ((lo + hi | 0) >>> 1); if (Curry._2(cmp, arr[mid], arr[lo])) { swap(arr, mid, lo); } @@ -111,9 +111,9 @@ function array(cmp, arr) { } } - var pivot = arr[mid]; - var i = lo + 1 | 0; - var j = hi - 1 | 0; + let pivot = arr[mid]; + let i = lo + 1 | 0; + let j = hi - 1 | 0; if (!Curry._2(cmp, pivot, arr[hi]) || !Curry._2(cmp, arr[lo], pivot)) { throw { RE_EXN_ID: "Invalid_argument", @@ -145,11 +145,11 @@ function array(cmp, arr) { }; }; qsort(0, arr.length - 1 | 0); - for(var i = 1 ,i_finish = arr.length; i < i_finish; ++i){ - var val_i = arr[i]; + for(let i = 1 ,i_finish = arr.length; i < i_finish; ++i){ + let val_i = arr[i]; if (!Curry._2(cmp, arr[i - 1 | 0], val_i)) { arr[i] = arr[i - 1 | 0]; - var j = i - 1 | 0; + let j = i - 1 | 0; while(j >= 1 && !Curry._2(cmp, arr[j - 1 | 0], val_i)) { arr[j] = arr[j - 1 | 0]; j = j - 1 | 0; diff --git a/lib/es6/stack.js b/lib/es6/stack.js index ded2024b68..1f886bf6b9 100644 --- a/lib/es6/stack.js +++ b/lib/es6/stack.js @@ -3,7 +3,7 @@ import * as List from "./list.js"; import * as Caml_exceptions from "./caml_exceptions.js"; -var Empty = /* @__PURE__ */Caml_exceptions.create("Stack.Empty"); +let Empty = /* @__PURE__ */Caml_exceptions.create("Stack.Empty"); function create(param) { return { @@ -33,7 +33,7 @@ function push(x, s) { } function pop(s) { - var match = s.c; + let match = s.c; if (match) { s.c = match.tl; s.len = s.len - 1 | 0; @@ -46,7 +46,7 @@ function pop(s) { } function top(s) { - var match = s.c; + let match = s.c; if (match) { return match.hd; } diff --git a/lib/es6/stdLabels.js b/lib/es6/stdLabels.js index d94837e2e3..0c1119f91d 100644 --- a/lib/es6/stdLabels.js +++ b/lib/es6/stdLabels.js @@ -1,13 +1,13 @@ -var $$Array; +let $$Array; -var Bytes; +let Bytes; -var List; +let List; -var $$String; +let $$String; export { $$Array, diff --git a/lib/es6/stream.js b/lib/es6/stream.js index 885f829168..b8e61172c9 100644 --- a/lib/es6/stream.js +++ b/lib/es6/stream.js @@ -8,9 +8,9 @@ import * as Caml_string from "./caml_string.js"; import * as Caml_exceptions from "./caml_exceptions.js"; import * as CamlinternalLazy from "./camlinternalLazy.js"; -var Failure = /* @__PURE__ */Caml_exceptions.create("Stream.Failure"); +let Failure = /* @__PURE__ */Caml_exceptions.create("Stream.Failure"); -var $$Error = /* @__PURE__ */Caml_exceptions.create("Stream.Error"); +let $$Error = /* @__PURE__ */Caml_exceptions.create("Stream.Error"); function count(param) { if (param !== undefined) { @@ -30,7 +30,7 @@ function data(param) { function get_data(count, _d) { while(true) { - var d = _d; + let d = _d; if (typeof d !== "object") { return d; } @@ -38,8 +38,8 @@ function get_data(count, _d) { case "Scons" : return d; case "Sapp" : - var d2 = d._1; - var match = get_data(count, d._0); + let d2 = d._1; + let match = get_data(count, d._0); if (typeof match !== "object") { _d = d2; continue ; @@ -68,10 +68,10 @@ function get_data(count, _d) { _d = CamlinternalLazy.force(d._0); continue ; case "Sgen" : - var g = d._0; - var match$1 = g.curr; + let g = d._0; + let match$1 = g.curr; if (match$1 !== undefined) { - var a = Caml_option.valFromOption(match$1); + let a = Caml_option.valFromOption(match$1); if (a !== undefined) { g.curr = undefined; return { @@ -83,7 +83,7 @@ function get_data(count, _d) { return "Sempty"; } } - var a$1 = Curry._1(g.func, count); + let a$1 = Curry._1(g.func, count); if (a$1 !== undefined) { return { TAG: "Scons", @@ -101,7 +101,7 @@ function get_data(count, _d) { function peek_data(s) { while(true) { - var f = s.data; + let f = s.data; if (typeof f !== "object") { return; } @@ -109,7 +109,7 @@ function peek_data(s) { case "Scons" : return Caml_option.some(f._0); case "Sapp" : - var d = get_data(s.count, s.data); + let d = get_data(s.count, s.data); if (typeof d !== "object") { return; } @@ -130,12 +130,12 @@ function peek_data(s) { s.data = CamlinternalLazy.force(f._0); continue ; case "Sgen" : - var g = f._0; - var a = g.curr; + let g = f._0; + let a = g.curr; if (a !== undefined) { return Caml_option.valFromOption(a); } - var x = Curry._1(g.func, s.count); + let x = Curry._1(g.func, s.count); g.curr = Caml_option.some(x); return x; @@ -152,7 +152,7 @@ function peek(param) { function junk_data(s) { while(true) { - var g = s.data; + let g = s.data; if (typeof g === "object") { switch (g.TAG) { case "Scons" : @@ -160,8 +160,8 @@ function junk_data(s) { s.data = g._1; return; case "Sgen" : - var g$1 = g._0; - var match = g$1.curr; + let g$1 = g._0; + let match = g$1.curr; if (match !== undefined) { s.count = s.count + 1 | 0; g$1.curr = undefined; @@ -172,7 +172,7 @@ function junk_data(s) { } } - var match$1 = peek_data(s); + let match$1 = peek_data(s); if (match$1 === undefined) { return; } @@ -195,7 +195,7 @@ function nget_data(n, s) { 0 ]; } - var a = peek_data(s); + let a = peek_data(s); if (a === undefined) { return [ /* [] */0, @@ -203,9 +203,9 @@ function nget_data(n, s) { 0 ]; } - var a$1 = Caml_option.valFromOption(a); + let a$1 = Caml_option.valFromOption(a); junk_data(s); - var match = nget_data(n - 1 | 0, s); + let match = nget_data(n - 1 | 0, s); return [ { hd: a$1, @@ -222,7 +222,7 @@ function nget_data(n, s) { function npeek(n, param) { if (param !== undefined) { - var match = nget_data(n, param); + let match = nget_data(n, param); param.count = param.count - match[2] | 0; param.data = match[1]; return match[0]; @@ -232,7 +232,7 @@ function npeek(n, param) { } function next(s) { - var a = peek(s); + let a = peek(s); if (a !== undefined) { junk(s); return Caml_option.valFromOption(a); @@ -244,7 +244,7 @@ function next(s) { } function empty(s) { - var match = peek(s); + let match = peek(s); if (match === undefined) { return; } @@ -255,9 +255,9 @@ function empty(s) { } function iter(f, strm) { - var _param; + let _param; while(true) { - var a = peek(strm); + let a = peek(strm); if (a === undefined) { return; } @@ -295,11 +295,11 @@ function of_list(l) { } function of_string(s) { - var count = { + let count = { contents: 0 }; return from(function (param) { - var c = count.contents; + let c = count.contents; if (c < s.length) { count.contents = count.contents + 1 | 0; return Caml_string.get(s, c); @@ -309,11 +309,11 @@ function of_string(s) { } function of_bytes(s) { - var count = { + let count = { contents: 0 }; return from(function (param) { - var c = count.contents; + let c = count.contents; if (c < s.length) { count.contents = count.contents + 1 | 0; return Caml_bytes.get(s, c); @@ -447,7 +447,7 @@ function dump_data(f, param) { function dump(f, s) { console.log("{count = "); - var i = count(s); + let i = count(s); console.log(String(i)); console.log("; data = "); dump_data(f, data(s)); @@ -455,7 +455,7 @@ function dump(f, s) { console.log(""); } -var sempty; +let sempty; export { Failure, diff --git a/lib/es6/string.js b/lib/es6/string.js index a7dc394e98..9b315fbf7c 100644 --- a/lib/es6/string.js +++ b/lib/es6/string.js @@ -20,13 +20,13 @@ function concat(sep, xs) { } function iter(f, s) { - for(var i = 0 ,i_finish = s.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = s.length; i < i_finish; ++i){ Curry._1(f, s.codePointAt(i)); } } function iteri(f, s) { - for(var i = 0 ,i_finish = s.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = s.length; i < i_finish; ++i){ Curry._2(f, i, s.codePointAt(i)); } } @@ -56,13 +56,13 @@ function trim(s) { } function escaped(s) { - var needs_escape = function (_i) { + let needs_escape = function (_i) { while(true) { - var i = _i; + let i = _i; if (i >= s.length) { return false; } - var match = s.codePointAt(i); + let match = s.codePointAt(i); if (match < 32) { return true; } @@ -89,7 +89,7 @@ function escaped(s) { function index_rec(s, lim, _i, c) { while(true) { - var i = _i; + let i = _i; if (i >= lim) { throw { RE_EXN_ID: "Not_found", @@ -110,7 +110,7 @@ function index(s, c) { function index_rec_opt(s, lim, _i, c) { while(true) { - var i = _i; + let i = _i; if (i >= lim) { return; } @@ -127,7 +127,7 @@ function index_opt(s, c) { } function index_from(s, i, c) { - var l = s.length; + let l = s.length; if (i < 0 || i > l) { throw { RE_EXN_ID: "Invalid_argument", @@ -139,7 +139,7 @@ function index_from(s, i, c) { } function index_from_opt(s, i, c) { - var l = s.length; + let l = s.length; if (i < 0 || i > l) { throw { RE_EXN_ID: "Invalid_argument", @@ -152,7 +152,7 @@ function index_from_opt(s, i, c) { function rindex_rec(s, _i, c) { while(true) { - var i = _i; + let i = _i; if (i < 0) { throw { RE_EXN_ID: "Not_found", @@ -184,7 +184,7 @@ function rindex_from(s, i, c) { function rindex_rec_opt(s, _i, c) { while(true) { - var i = _i; + let i = _i; if (i < 0) { return; } @@ -212,7 +212,7 @@ function rindex_from_opt(s, i, c) { } function contains_from(s, i, c) { - var l = s.length; + let l = s.length; if (i < 0 || i > l) { throw { RE_EXN_ID: "Invalid_argument", @@ -225,7 +225,7 @@ function contains_from(s, i, c) { return true; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { return false; } @@ -250,7 +250,7 @@ function rcontains_from(s, i, c) { return true; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { return false; } @@ -274,16 +274,16 @@ function uncapitalize_ascii(s) { return Bytes.unsafe_to_string(Bytes.uncapitalize_ascii(Bytes.unsafe_of_string(s))); } -var compare = Caml.string_compare; +let compare = Caml.string_compare; function equal(a, b) { return a === b; } function split_on_char(sep, s) { - var r = /* [] */0; - var j = s.length; - for(var i = s.length - 1 | 0; i >= 0; --i){ + let r = /* [] */0; + let j = s.length; + for(let i = s.length - 1 | 0; i >= 0; --i){ if (s.codePointAt(i) === sep) { r = { hd: sub(s, i + 1 | 0, (j - i | 0) - 1 | 0), @@ -299,9 +299,9 @@ function split_on_char(sep, s) { }; } -var make = Caml_string.make; +let make = Caml_string.make; -var blit = Bytes.blit_string; +let blit = Bytes.blit_string; export { make, diff --git a/lib/es6/stringLabels.js b/lib/es6/stringLabels.js index 4573393590..fdd59a7f71 100644 --- a/lib/es6/stringLabels.js +++ b/lib/es6/stringLabels.js @@ -15,20 +15,20 @@ function sub(s, ofs, len) { return Bytes.unsafe_to_string(Bytes.sub(Bytes.unsafe_of_string(s), ofs, len)); } -var blit = Bytes.blit_string; +let blit = Bytes.blit_string; function concat(sep, xs) { return $$Array.of_list(xs).join(sep); } function iter(f, s) { - for(var i = 0 ,i_finish = s.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = s.length; i < i_finish; ++i){ Curry._1(f, s.codePointAt(i)); } } function iteri(f, s) { - for(var i = 0 ,i_finish = s.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = s.length; i < i_finish; ++i){ Curry._2(f, i, s.codePointAt(i)); } } @@ -58,13 +58,13 @@ function trim(s) { } function escaped(s) { - var needs_escape = function (_i) { + let needs_escape = function (_i) { while(true) { - var i = _i; + let i = _i; if (i >= s.length) { return false; } - var match = s.codePointAt(i); + let match = s.codePointAt(i); if (match < 32) { return true; } @@ -91,7 +91,7 @@ function escaped(s) { function index_rec(s, lim, _i, c) { while(true) { - var i = _i; + let i = _i; if (i >= lim) { throw { RE_EXN_ID: "Not_found", @@ -112,7 +112,7 @@ function index(s, c) { function index_rec_opt(s, lim, _i, c) { while(true) { - var i = _i; + let i = _i; if (i >= lim) { return; } @@ -129,7 +129,7 @@ function index_opt(s, c) { } function index_from(s, i, c) { - var l = s.length; + let l = s.length; if (i < 0 || i > l) { throw { RE_EXN_ID: "Invalid_argument", @@ -141,7 +141,7 @@ function index_from(s, i, c) { } function index_from_opt(s, i, c) { - var l = s.length; + let l = s.length; if (i < 0 || i > l) { throw { RE_EXN_ID: "Invalid_argument", @@ -154,7 +154,7 @@ function index_from_opt(s, i, c) { function rindex_rec(s, _i, c) { while(true) { - var i = _i; + let i = _i; if (i < 0) { throw { RE_EXN_ID: "Not_found", @@ -186,7 +186,7 @@ function rindex_from(s, i, c) { function rindex_rec_opt(s, _i, c) { while(true) { - var i = _i; + let i = _i; if (i < 0) { return; } @@ -214,7 +214,7 @@ function rindex_from_opt(s, i, c) { } function contains_from(s, i, c) { - var l = s.length; + let l = s.length; if (i < 0 || i > l) { throw { RE_EXN_ID: "Invalid_argument", @@ -227,7 +227,7 @@ function contains_from(s, i, c) { return true; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { return false; } @@ -252,7 +252,7 @@ function rcontains_from(s, i, c) { return true; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { return false; } @@ -276,16 +276,16 @@ function uncapitalize_ascii(s) { return Bytes.unsafe_to_string(Bytes.uncapitalize_ascii(Bytes.unsafe_of_string(s))); } -var compare = Caml.string_compare; +let compare = Caml.string_compare; function equal(a, b) { return a === b; } function split_on_char(sep, s) { - var r = /* [] */0; - var j = s.length; - for(var i = s.length - 1 | 0; i >= 0; --i){ + let r = /* [] */0; + let j = s.length; + for(let i = s.length - 1 | 0; i >= 0; --i){ if (s.codePointAt(i) === sep) { r = { hd: sub(s, i + 1 | 0, (j - i | 0) - 1 | 0), @@ -301,7 +301,7 @@ function split_on_char(sep, s) { }; } -var make = Caml_string.make; +let make = Caml_string.make; export { make, diff --git a/lib/es6/sys.js b/lib/es6/sys.js index e0411f39b9..4560a77f53 100644 --- a/lib/es6/sys.js +++ b/lib/es6/sys.js @@ -3,23 +3,23 @@ import * as Caml_sys from "./caml_sys.js"; import * as Caml_exceptions from "./caml_exceptions.js"; -var match = Caml_sys.sys_get_argv(); +let match = Caml_sys.sys_get_argv(); -var os_type = Caml_sys.os_type(); +let os_type = Caml_sys.os_type(); -var backend_type = { +let backend_type = { TAG: "Other", _0: "BS" }; -var big_endian = false; +let big_endian = false; -var unix = Caml_sys.os_type() === "Unix"; +let unix = Caml_sys.os_type() === "Unix"; -var win32 = Caml_sys.os_type() === "Win32"; +let win32 = Caml_sys.os_type() === "Win32"; function getenv_opt(s) { - var x = typeof process === "undefined" ? undefined : process; + let x = typeof process === "undefined" ? undefined : process; if (x !== undefined) { return x.env[s]; } @@ -30,7 +30,7 @@ function command(param) { return 127; } -var interactive = { +let interactive = { contents: false }; @@ -42,7 +42,7 @@ function set_signal(sig_num, sig_beh) { } -var Break = /* @__PURE__ */Caml_exceptions.create("Sys.Break"); +let Break = /* @__PURE__ */Caml_exceptions.create("Sys.Break"); function catch_break(on) { @@ -56,77 +56,77 @@ function runtime_warnings_enabled(param) { return false; } -var argv = match[1]; +let argv = match[1]; -var executable_name = match[0]; +let executable_name = match[0]; -var cygwin = false; +let cygwin = false; -var word_size = 32; +let word_size = 32; -var int_size = 32; +let int_size = 32; -var max_string_length = 2147483647; +let max_string_length = 2147483647; -var max_array_length = 2147483647; +let max_array_length = 2147483647; -var sigabrt = -1; +let sigabrt = -1; -var sigalrm = -2; +let sigalrm = -2; -var sigfpe = -3; +let sigfpe = -3; -var sighup = -4; +let sighup = -4; -var sigill = -5; +let sigill = -5; -var sigint = -6; +let sigint = -6; -var sigkill = -7; +let sigkill = -7; -var sigpipe = -8; +let sigpipe = -8; -var sigquit = -9; +let sigquit = -9; -var sigsegv = -10; +let sigsegv = -10; -var sigterm = -11; +let sigterm = -11; -var sigusr1 = -12; +let sigusr1 = -12; -var sigusr2 = -13; +let sigusr2 = -13; -var sigchld = -14; +let sigchld = -14; -var sigcont = -15; +let sigcont = -15; -var sigstop = -16; +let sigstop = -16; -var sigtstp = -17; +let sigtstp = -17; -var sigttin = -18; +let sigttin = -18; -var sigttou = -19; +let sigttou = -19; -var sigvtalrm = -20; +let sigvtalrm = -20; -var sigprof = -21; +let sigprof = -21; -var sigbus = -22; +let sigbus = -22; -var sigpoll = -23; +let sigpoll = -23; -var sigsys = -24; +let sigsys = -24; -var sigtrap = -25; +let sigtrap = -25; -var sigurg = -26; +let sigurg = -26; -var sigxcpu = -27; +let sigxcpu = -27; -var sigxfsz = -28; +let sigxfsz = -28; -var ocaml_version = "4.06.2+BS"; +let ocaml_version = "4.06.2+BS"; export { argv, diff --git a/lib/es6/uchar.js b/lib/es6/uchar.js index 1d56bc00bc..8ffb9e2054 100644 --- a/lib/es6/uchar.js +++ b/lib/es6/uchar.js @@ -53,7 +53,7 @@ function of_int(i) { if (is_valid(i)) { return i; } - var s = err_not_sv(i); + let s = err_not_sv(i); throw { RE_EXN_ID: "Invalid_argument", _1: s, @@ -73,7 +73,7 @@ function to_char(u) { if (u <= 255) { return u; } - var s = err_not_latin1(u); + let s = err_not_latin1(u); throw { RE_EXN_ID: "Invalid_argument", _1: s, @@ -89,19 +89,19 @@ function equal(prim0, prim1) { return prim0 === prim1; } -var compare = Caml.int_compare; +let compare = Caml.int_compare; function hash(prim) { return prim; } -var min = 0; +let min = 0; -var max = 1114111; +let max = 1114111; -var bom = 65279; +let bom = 65279; -var rep = 65533; +let rep = 65533; function unsafe_of_int(prim) { return prim; diff --git a/lib/js/arg.js b/lib/js/arg.js index 1d38f756af..9b76941676 100644 --- a/lib/js/arg.js +++ b/lib/js/arg.js @@ -1,31 +1,31 @@ 'use strict'; -var Sys = require("./sys.js"); -var Caml = require("./caml.js"); -var List = require("./list.js"); -var $$Array = require("./array.js"); -var Curry = require("./curry.js"); -var $$Buffer = require("./buffer.js"); -var $$String = require("./string.js"); -var Caml_obj = require("./caml_obj.js"); -var Caml_array = require("./caml_array.js"); -var Pervasives = require("./pervasives.js"); -var Caml_format = require("./caml_format.js"); -var Caml_string = require("./caml_string.js"); -var Caml_exceptions = require("./caml_exceptions.js"); -var Caml_js_exceptions = require("./caml_js_exceptions.js"); +let Sys = require("./sys.js"); +let Caml = require("./caml.js"); +let List = require("./list.js"); +let $$Array = require("./array.js"); +let Curry = require("./curry.js"); +let $$Buffer = require("./buffer.js"); +let $$String = require("./string.js"); +let Caml_obj = require("./caml_obj.js"); +let Caml_array = require("./caml_array.js"); +let Pervasives = require("./pervasives.js"); +let Caml_format = require("./caml_format.js"); +let Caml_string = require("./caml_string.js"); +let Caml_exceptions = require("./caml_exceptions.js"); +let Caml_js_exceptions = require("./caml_js_exceptions.js"); -var Bad = /* @__PURE__ */Caml_exceptions.create("Arg.Bad"); +let Bad = /* @__PURE__ */Caml_exceptions.create("Arg.Bad"); -var Help = /* @__PURE__ */Caml_exceptions.create("Arg.Help"); +let Help = /* @__PURE__ */Caml_exceptions.create("Arg.Help"); -var Stop = /* @__PURE__ */Caml_exceptions.create("Arg.Stop"); +let Stop = /* @__PURE__ */Caml_exceptions.create("Arg.Stop"); function assoc3(x, _l) { while(true) { - var l = _l; + let l = _l; if (l) { - var match = l.hd; + let match = l.hd; if (Caml_obj.equal(match[0], x)) { return match[1]; } @@ -40,8 +40,8 @@ function assoc3(x, _l) { } function split(s) { - var i = $$String.index(s, /* '=' */61); - var len = s.length; + let i = $$String.index(s, /* '=' */61); + let len = s.length; return [ $$String.sub(s, 0, i), $$String.sub(s, i + 1 | 0, len - (i + 1 | 0) | 0) @@ -70,13 +70,13 @@ function help_action(param) { } function add_help(speclist) { - var add1; + let add1; try { assoc3("-help", speclist); add1 = /* [] */0; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { add1 = { hd: [ @@ -93,13 +93,13 @@ function add_help(speclist) { throw exn; } } - var add2; + let add2; try { assoc3("--help", speclist); add2 = /* [] */0; } catch (raw_exn$1){ - var exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1); + let exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1); if (exn$1.RE_EXN_ID === "Not_found") { add2 = { hd: [ @@ -122,22 +122,22 @@ function add_help(speclist) { function usage_b(buf, speclist, errmsg) { $$Buffer.add_string(buf, errmsg + "\n"); List.iter((function (param) { - var doc = param[2]; + let doc = param[2]; if (doc.length === 0) { return; } - var spec = param[1]; - var key = param[0]; + let spec = param[1]; + let key = param[0]; if (spec.TAG !== "Symbol") { return $$Buffer.add_string(buf, " " + key + " " + doc + "\n"); } - var sym = make_symlist("{", "|", "}", spec._0); + let sym = make_symlist("{", "|", "}", spec._0); return $$Buffer.add_string(buf, " " + key + " " + sym + doc + "\n"); }), add_help(speclist)); } function usage_string(speclist, errmsg) { - var b = $$Buffer.create(200); + let b = $$Buffer.create(200); usage_b(b, speclist, errmsg); return $$Buffer.contents(b); } @@ -146,7 +146,7 @@ function usage(speclist, errmsg) { console.log(usage_string(speclist, errmsg)); } -var current = { +let current = { contents: 0 }; @@ -155,7 +155,7 @@ function bool_of_string_opt(x) { return Pervasives.bool_of_string(x); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Invalid_argument") { return; } @@ -168,7 +168,7 @@ function int_of_string_opt(x) { return Caml_format.int_of_string(x); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Failure") { return; } @@ -181,7 +181,7 @@ function float_of_string_opt(x) { return Caml_format.float_of_string(x); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Failure") { return; } @@ -190,13 +190,13 @@ function float_of_string_opt(x) { } function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist, anonfun, errmsg) { - var initpos = current.contents; - var convert_error = function (error) { - var b = $$Buffer.create(200); - var progname = initpos < argv.contents.length ? Caml_array.get(argv.contents, initpos) : "(?)"; + let initpos = current.contents; + let convert_error = function (error) { + let b = $$Buffer.create(200); + let progname = initpos < argv.contents.length ? Caml_array.get(argv.contents, initpos) : "(?)"; switch (error.TAG) { case "Unknown" : - var s = error._0; + let s = error._0; switch (s) { case "--help" : case "-help" : @@ -238,9 +238,9 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist current.contents = current.contents + 1 | 0; while(current.contents < argv.contents.length) { try { - var s = Caml_array.get(argv.contents, current.contents); + let s = Caml_array.get(argv.contents, current.contents); if (s.length >= 1 && Caml_string.get(s, 0) === /* '-' */45) { - var match; + let match; try { match = [ assoc3(s, speclist.contents), @@ -248,17 +248,17 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist ]; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { try { - var match$1 = split(s); + let match$1 = split(s); match = [ assoc3(match$1[0], speclist.contents), match$1[1] ]; } catch (raw_exn$1){ - var exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1); + let exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1); if (exn$1.RE_EXN_ID === "Not_found") { throw { RE_EXN_ID: Stop, @@ -275,8 +275,8 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist throw exn; } } - var follow = match[1]; - var no_arg = (function(s,follow){ + let follow = match[1]; + let no_arg = (function(s,follow){ return function no_arg(param) { if (follow === undefined) { return; @@ -293,7 +293,7 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist }; } }(s,follow)); - var get_arg = (function(s,follow){ + let get_arg = (function(s,follow){ return function get_arg(param) { if (follow !== undefined) { return follow; @@ -311,7 +311,7 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist }; } }(s,follow)); - var consume_arg = (function(follow){ + let consume_arg = (function(follow){ return function consume_arg(param) { if (follow !== undefined) { return; @@ -321,14 +321,14 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist } } }(follow)); - var treat_action = (function(s){ + let treat_action = (function(s){ return function treat_action(f) { switch (f.TAG) { case "Unit" : return Curry._1(f._0, undefined); case "Bool" : - var arg = get_arg(); - var s$1 = bool_of_string_opt(arg); + let arg = get_arg(); + let s$1 = bool_of_string_opt(arg); if (s$1 !== undefined) { Curry._1(f._0, s$1); } else { @@ -353,15 +353,15 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist f._0.contents = false; return; case "String" : - var arg$1 = get_arg(); + let arg$1 = get_arg(); Curry._1(f._0, arg$1); return consume_arg(); case "Set_string" : f._0.contents = get_arg(); return consume_arg(); case "Int" : - var arg$2 = get_arg(); - var x = int_of_string_opt(arg$2); + let arg$2 = get_arg(); + let x = int_of_string_opt(arg$2); if (x !== undefined) { Curry._1(f._0, x); } else { @@ -378,8 +378,8 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist } return consume_arg(); case "Set_int" : - var arg$3 = get_arg(); - var x$1 = int_of_string_opt(arg$3); + let arg$3 = get_arg(); + let x$1 = int_of_string_opt(arg$3); if (x$1 !== undefined) { f._0.contents = x$1; } else { @@ -396,8 +396,8 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist } return consume_arg(); case "Float" : - var arg$4 = get_arg(); - var x$2 = float_of_string_opt(arg$4); + let arg$4 = get_arg(); + let x$2 = float_of_string_opt(arg$4); if (x$2 !== undefined) { Curry._1(f._0, x$2); } else { @@ -414,8 +414,8 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist } return consume_arg(); case "Set_float" : - var arg$5 = get_arg(); - var x$3 = float_of_string_opt(arg$5); + let arg$5 = get_arg(); + let x$3 = float_of_string_opt(arg$5); if (x$3 !== undefined) { f._0.contents = x$3; } else { @@ -434,8 +434,8 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist case "Tuple" : return List.iter(treat_action, f._0); case "Symbol" : - var symb = f._0; - var arg$6 = get_arg(); + let symb = f._0; + let arg$6 = get_arg(); if (List.mem(arg$6, symb)) { Curry._1(f._1, arg$6); return consume_arg(); @@ -451,7 +451,7 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist Error: new Error() }; case "Rest" : - var f$1 = f._0; + let f$1 = f._0; while(current.contents < (argv.contents.length - 1 | 0)) { Curry._1(f$1, Caml_array.get(argv.contents, current.contents + 1 | 0)); consume_arg(); @@ -465,11 +465,11 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist Error: new Error() }; } - var arg$7 = get_arg(); - var newarg = Curry._1(f._0, arg$7); + let arg$7 = get_arg(); + let newarg = Curry._1(f._0, arg$7); consume_arg(); - var before = $$Array.sub(argv.contents, 0, current.contents + 1 | 0); - var after = $$Array.sub(argv.contents, current.contents + 1 | 0, (argv.contents.length - current.contents | 0) - 1 | 0); + let before = $$Array.sub(argv.contents, 0, current.contents + 1 | 0); + let after = $$Array.sub(argv.contents, current.contents + 1 | 0, (argv.contents.length - current.contents | 0) - 1 | 0); argv.contents = Caml_array.concat({ hd: before, tl: { @@ -491,7 +491,7 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist } } catch (raw_m){ - var m = Caml_js_exceptions.internalToOCamlException(raw_m); + let m = Caml_js_exceptions.internalToOCamlException(raw_m); if (m.RE_EXN_ID === Bad) { throw convert_error({ TAG: "Message", @@ -512,14 +512,14 @@ function parse_and_expand_argv_dynamic(current, argv, speclist, anonfun, errmsg) } function parse_argv_dynamic(currentOpt, argv, speclist, anonfun, errmsg) { - var current$1 = currentOpt !== undefined ? currentOpt : current; + let current$1 = currentOpt !== undefined ? currentOpt : current; parse_and_expand_argv_dynamic_aux(false, current$1, { contents: argv }, speclist, anonfun, errmsg); } function parse_argv(currentOpt, argv, speclist, anonfun, errmsg) { - var current$1 = currentOpt !== undefined ? currentOpt : current; + let current$1 = currentOpt !== undefined ? currentOpt : current; parse_argv_dynamic(current$1, argv, { contents: speclist }, anonfun, errmsg); @@ -530,7 +530,7 @@ function parse(l, f, msg) { return parse_argv(undefined, Sys.argv, l, f, msg); } catch (raw_msg){ - var msg$1 = Caml_js_exceptions.internalToOCamlException(raw_msg); + let msg$1 = Caml_js_exceptions.internalToOCamlException(raw_msg); if (msg$1.RE_EXN_ID === Bad) { console.log(msg$1._1); return Pervasives.exit(2); @@ -548,7 +548,7 @@ function parse_dynamic(l, f, msg) { return parse_argv_dynamic(undefined, Sys.argv, l, f, msg); } catch (raw_msg){ - var msg$1 = Caml_js_exceptions.internalToOCamlException(raw_msg); + let msg$1 = Caml_js_exceptions.internalToOCamlException(raw_msg); if (msg$1.RE_EXN_ID === Bad) { console.log(msg$1._1); return Pervasives.exit(2); @@ -563,19 +563,19 @@ function parse_dynamic(l, f, msg) { function parse_expand(l, f, msg) { try { - var argv = { + let argv = { contents: Sys.argv }; - var spec = { + let spec = { contents: l }; - var current$1 = { + let current$1 = { contents: current.contents }; return parse_and_expand_argv_dynamic(current$1, argv, spec, f, msg); } catch (raw_msg){ - var msg$1 = Caml_js_exceptions.internalToOCamlException(raw_msg); + let msg$1 = Caml_js_exceptions.internalToOCamlException(raw_msg); if (msg$1.RE_EXN_ID === Bad) { console.log(msg$1._1); return Pervasives.exit(2); @@ -589,10 +589,10 @@ function parse_expand(l, f, msg) { } function second_word(s) { - var len = s.length; - var loop = function (_n) { + let len = s.length; + let loop = function (_n) { while(true) { - var n = _n; + let n = _n; if (n >= len) { return len; } @@ -603,21 +603,21 @@ function second_word(s) { continue ; }; }; - var n; + let n; try { n = $$String.index(s, /* '\t' */9); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { - var exit = 0; - var n$1; + let exit = 0; + let n$1; try { n$1 = $$String.index(s, /* ' ' */32); exit = 2; } catch (raw_exn$1){ - var exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1); + let exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1); if (exn$1.RE_EXN_ID === "Not_found") { return len; } @@ -635,7 +635,7 @@ function second_word(s) { } function max_arg_len(cur, param) { - var kwd = param[0]; + let kwd = param[0]; if (param[1].TAG === "Symbol") { return Caml.int_max(cur, kwd.length); } else { @@ -644,7 +644,7 @@ function max_arg_len(cur, param) { } function replace_leading_tab(s) { - var seen = { + let seen = { contents: false }; return $$String.map((function (c) { @@ -658,30 +658,30 @@ function replace_leading_tab(s) { } function align(limitOpt, speclist) { - var limit = limitOpt !== undefined ? limitOpt : Pervasives.max_int; - var completed = add_help(speclist); - var len = List.fold_left(max_arg_len, 0, completed); - var len$1 = len < limit ? len : limit; + let limit = limitOpt !== undefined ? limitOpt : Pervasives.max_int; + let completed = add_help(speclist); + let len = List.fold_left(max_arg_len, 0, completed); + let len$1 = len < limit ? len : limit; return List.map((function (param) { - var spec = param[1]; - var kwd = param[0]; + let spec = param[1]; + let kwd = param[0]; if (param[2] === "") { return param; } if (spec.TAG === "Symbol") { - var msg = param[2]; - var cutcol = second_word(msg); - var spaces = " ".repeat(Caml.int_max(0, len$1 - cutcol | 0) + 3 | 0); + let msg = param[2]; + let cutcol = second_word(msg); + let spaces = " ".repeat(Caml.int_max(0, len$1 - cutcol | 0) + 3 | 0); return [ kwd, spec, "\n" + (spaces + replace_leading_tab(msg)) ]; } - var msg$1 = param[2]; - var cutcol$1 = second_word(msg$1); - var kwd_len = kwd.length; - var diff = (len$1 - kwd_len | 0) - cutcol$1 | 0; + let msg$1 = param[2]; + let cutcol$1 = second_word(msg$1); + let kwd_len = kwd.length; + let diff = (len$1 - kwd_len | 0) - cutcol$1 | 0; if (diff <= 0) { return [ kwd, @@ -689,9 +689,9 @@ function align(limitOpt, speclist) { replace_leading_tab(msg$1) ]; } - var spaces$1 = " ".repeat(diff); - var prefix = $$String.sub(replace_leading_tab(msg$1), 0, cutcol$1); - var suffix = $$String.sub(msg$1, cutcol$1, msg$1.length - cutcol$1 | 0); + let spaces$1 = " ".repeat(diff); + let prefix = $$String.sub(replace_leading_tab(msg$1), 0, cutcol$1); + let suffix = $$String.sub(msg$1, cutcol$1, msg$1.length - cutcol$1 | 0); return [ kwd, spec, diff --git a/lib/js/array.js b/lib/js/array.js index 4226060b28..d68763211c 100644 --- a/lib/js/array.js +++ b/lib/js/array.js @@ -1,14 +1,14 @@ 'use strict'; -var Curry = require("./curry.js"); -var Caml_obj = require("./caml_obj.js"); -var Caml_array = require("./caml_array.js"); -var Caml_exceptions = require("./caml_exceptions.js"); -var Caml_js_exceptions = require("./caml_js_exceptions.js"); +let Curry = require("./curry.js"); +let Caml_obj = require("./caml_obj.js"); +let Caml_array = require("./caml_array.js"); +let Caml_exceptions = require("./caml_exceptions.js"); +let Caml_js_exceptions = require("./caml_js_exceptions.js"); -var make_float = Caml_array.make_float; +let make_float = Caml_array.make_float; -var Floatarray = {}; +let Floatarray = {}; function init(l, f) { if (l === 0) { @@ -21,23 +21,23 @@ function init(l, f) { Error: new Error() }; } - var res = Caml_array.make(l, Curry._1(f, 0)); - for(var i = 1; i < l; ++i){ + let res = Caml_array.make(l, Curry._1(f, 0)); + for(let i = 1; i < l; ++i){ res[i] = Curry._1(f, i); } return res; } function make_matrix(sx, sy, init) { - var res = Caml_array.make(sx, []); - for(var x = 0; x < sx; ++x){ + let res = Caml_array.make(sx, []); + for(let x = 0; x < sx; ++x){ res[x] = Caml_array.make(sy, init); } return res; } function copy(a) { - var l = a.length; + let l = a.length; if (l === 0) { return []; } else { @@ -46,7 +46,7 @@ function copy(a) { } function append(a1, a2) { - var l1 = a1.length; + let l1 = a1.length; if (l1 === 0) { return copy(a2); } else if (a2.length === 0) { @@ -75,7 +75,7 @@ function fill(a, ofs, len, v) { Error: new Error() }; } - for(var i = ofs ,i_finish = ofs + len | 0; i < i_finish; ++i){ + for(let i = ofs ,i_finish = ofs + len | 0; i < i_finish; ++i){ a[i] = v; } } @@ -92,7 +92,7 @@ function blit(a1, ofs1, a2, ofs2, len) { } function iter(f, a) { - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ Curry._1(f, a[i]); } } @@ -105,26 +105,26 @@ function iter2(f, a, b) { Error: new Error() }; } - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ Curry._2(f, a[i], b[i]); } } function map(f, a) { - var l = a.length; + let l = a.length; if (l === 0) { return []; } - var r = Caml_array.make(l, Curry._1(f, a[0])); - for(var i = 1; i < l; ++i){ + let r = Caml_array.make(l, Curry._1(f, a[0])); + for(let i = 1; i < l; ++i){ r[i] = Curry._1(f, a[i]); } return r; } function map2(f, a, b) { - var la = a.length; - var lb = b.length; + let la = a.length; + let lb = b.length; if (la !== lb) { throw { RE_EXN_ID: "Invalid_argument", @@ -135,37 +135,37 @@ function map2(f, a, b) { if (la === 0) { return []; } - var r = Caml_array.make(la, Curry._2(f, a[0], b[0])); - for(var i = 1; i < la; ++i){ + let r = Caml_array.make(la, Curry._2(f, a[0], b[0])); + for(let i = 1; i < la; ++i){ r[i] = Curry._2(f, a[i], b[i]); } return r; } function iteri(f, a) { - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ Curry._2(f, i, a[i]); } } function mapi(f, a) { - var l = a.length; + let l = a.length; if (l === 0) { return []; } - var r = Caml_array.make(l, Curry._2(f, 0, a[0])); - for(var i = 1; i < l; ++i){ + let r = Caml_array.make(l, Curry._2(f, 0, a[0])); + for(let i = 1; i < l; ++i){ r[i] = Curry._2(f, i, a[i]); } return r; } function to_list(a) { - var _i = a.length - 1 | 0; - var _res = /* [] */0; + let _i = a.length - 1 | 0; + let _res = /* [] */0; while(true) { - var res = _res; - var i = _i; + let res = _res; + let i = _i; if (i < 0) { return res; } @@ -180,8 +180,8 @@ function to_list(a) { function list_length(_accu, _param) { while(true) { - var param = _param; - var accu = _accu; + let param = _param; + let accu = _accu; if (!param) { return accu; } @@ -195,12 +195,12 @@ function of_list(param) { if (!param) { return []; } - var a = Caml_array.make(list_length(0, param), param.hd); - var _i = 1; - var _param = param.tl; + let a = Caml_array.make(list_length(0, param), param.hd); + let _i = 1; + let _param = param.tl; while(true) { - var param$1 = _param; - var i = _i; + let param$1 = _param; + let i = _i; if (!param$1) { return a; } @@ -212,26 +212,26 @@ function of_list(param) { } function fold_left(f, x, a) { - var r = x; - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + let r = x; + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ r = Curry._2(f, r, a[i]); } return r; } function fold_right(f, a, x) { - var r = x; - for(var i = a.length - 1 | 0; i >= 0; --i){ + let r = x; + for(let i = a.length - 1 | 0; i >= 0; --i){ r = Curry._2(f, a[i], r); } return r; } function exists(p, a) { - var n = a.length; - var _i = 0; + let n = a.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === n) { return false; } @@ -244,10 +244,10 @@ function exists(p, a) { } function for_all(p, a) { - var n = a.length; - var _i = 0; + let n = a.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === n) { return true; } @@ -260,10 +260,10 @@ function for_all(p, a) { } function mem(x, a) { - var n = a.length; - var _i = 0; + let n = a.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === n) { return false; } @@ -276,10 +276,10 @@ function mem(x, a) { } function memq(x, a) { - var n = a.length; - var _i = 0; + let n = a.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === n) { return false; } @@ -291,12 +291,12 @@ function memq(x, a) { }; } -var Bottom = /* @__PURE__ */Caml_exceptions.create("Array.Bottom"); +let Bottom = /* @__PURE__ */Caml_exceptions.create("Array.Bottom"); function sort(cmp, a) { - var maxson = function (l, i) { - var i31 = ((i + i | 0) + i | 0) + 1 | 0; - var x = i31; + let maxson = function (l, i) { + let i31 = ((i + i | 0) + i | 0) + 1 | 0; + let x = i31; if ((i31 + 2 | 0) < l) { if (Curry._2(cmp, Caml_array.get(a, i31), Caml_array.get(a, i31 + 1 | 0)) < 0) { x = i31 + 1 | 0; @@ -318,12 +318,12 @@ function sort(cmp, a) { Error: new Error() }; }; - var trickle = function (l, i, e) { + let trickle = function (l, i, e) { try { - var _i = i; + let _i = i; while(true) { - var i$1 = _i; - var j = maxson(l, i$1); + let i$1 = _i; + let j = maxson(l, i$1); if (Curry._2(cmp, Caml_array.get(a, j), e) <= 0) { return Caml_array.set(a, i$1, e); } @@ -333,36 +333,36 @@ function sort(cmp, a) { }; } catch (raw_i){ - var i$2 = Caml_js_exceptions.internalToOCamlException(raw_i); + let i$2 = Caml_js_exceptions.internalToOCamlException(raw_i); if (i$2.RE_EXN_ID === Bottom) { return Caml_array.set(a, i$2._1, e); } throw i$2; } }; - var bubble = function (l, i) { + let bubble = function (l, i) { try { - var _i = i; + let _i = i; while(true) { - var i$1 = _i; - var j = maxson(l, i$1); + let i$1 = _i; + let j = maxson(l, i$1); Caml_array.set(a, i$1, Caml_array.get(a, j)); _i = j; continue ; }; } catch (raw_i){ - var i$2 = Caml_js_exceptions.internalToOCamlException(raw_i); + let i$2 = Caml_js_exceptions.internalToOCamlException(raw_i); if (i$2.RE_EXN_ID === Bottom) { return i$2._1; } throw i$2; } }; - var trickleup = function (_i, e) { + let trickleup = function (_i, e) { while(true) { - var i = _i; - var father = (i - 1 | 0) / 3 | 0; + let i = _i; + let father = (i - 1 | 0) / 3 | 0; if (i === father) { throw { RE_EXN_ID: "Assert_failure", @@ -385,41 +385,41 @@ function sort(cmp, a) { continue ; }; }; - var l = a.length; - for(var i = ((l + 1 | 0) / 3 | 0) - 1 | 0; i >= 0; --i){ + let l = a.length; + for(let i = ((l + 1 | 0) / 3 | 0) - 1 | 0; i >= 0; --i){ trickle(l, i, Caml_array.get(a, i)); } - for(var i$1 = l - 1 | 0; i$1 >= 2; --i$1){ - var e = Caml_array.get(a, i$1); + for(let i$1 = l - 1 | 0; i$1 >= 2; --i$1){ + let e = Caml_array.get(a, i$1); Caml_array.set(a, i$1, Caml_array.get(a, 0)); trickleup(bubble(i$1, 0), e); } if (l <= 1) { return; } - var e$1 = Caml_array.get(a, 1); + let e$1 = Caml_array.get(a, 1); Caml_array.set(a, 1, Caml_array.get(a, 0)); Caml_array.set(a, 0, e$1); } function stable_sort(cmp, a) { - var merge = function (src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = Caml_array.get(a, src1ofs); - var _i2 = src2ofs; - var _s2 = Caml_array.get(src2, src2ofs); - var _d = dstofs; + let merge = function (src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = Caml_array.get(a, src1ofs); + let _i2 = src2ofs; + let _s2 = Caml_array.get(src2, src2ofs); + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (Curry._2(cmp, s1, s2) <= 0) { Caml_array.set(dst, d, s1); - var i1$1 = i1 + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return blit(src2, i2, dst, d + 1 | 0, src2r - i2 | 0); } @@ -429,7 +429,7 @@ function stable_sort(cmp, a) { continue ; } Caml_array.set(dst, d, s2); - var i2$1 = i2 + 1 | 0; + let i2$1 = i2 + 1 | 0; if (i2$1 >= src2r) { return blit(a, i1, dst, d + 1 | 0, src1r - i1 | 0); } @@ -439,10 +439,10 @@ function stable_sort(cmp, a) { continue ; }; }; - var isortto = function (srcofs, dst, dstofs, len) { - for(var i = 0; i < len; ++i){ - var e = Caml_array.get(a, srcofs + i | 0); - var j = (dstofs + i | 0) - 1 | 0; + let isortto = function (srcofs, dst, dstofs, len) { + for(let i = 0; i < len; ++i){ + let e = Caml_array.get(a, srcofs + i | 0); + let j = (dstofs + i | 0) - 1 | 0; while(j >= dstofs && Curry._2(cmp, Caml_array.get(dst, j), e) > 0) { Caml_array.set(dst, j + 1 | 0, Caml_array.get(dst, j)); j = j - 1 | 0; @@ -450,33 +450,33 @@ function stable_sort(cmp, a) { Caml_array.set(dst, j + 1 | 0, e); } }; - var sortto = function (srcofs, dst, dstofs, len) { + let sortto = function (srcofs, dst, dstofs, len) { if (len <= 5) { return isortto(srcofs, dst, dstofs, len); } - var l1 = len / 2 | 0; - var l2 = len - l1 | 0; + let l1 = len / 2 | 0; + let l2 = len - l1 | 0; sortto(srcofs + l1 | 0, dst, dstofs + l1 | 0, l2); sortto(srcofs, a, srcofs + l2 | 0, l1); merge(srcofs + l2 | 0, l1, dst, dstofs + l1 | 0, l2, dst, dstofs); }; - var l = a.length; + let l = a.length; if (l <= 5) { return isortto(0, a, 0, l); } - var l1 = l / 2 | 0; - var l2 = l - l1 | 0; - var t = Caml_array.make(l2, Caml_array.get(a, 0)); + let l1 = l / 2 | 0; + let l2 = l - l1 | 0; + let t = Caml_array.make(l2, Caml_array.get(a, 0)); sortto(l1, t, 0, l2); sortto(0, a, l2, l1); merge(l2, l1, t, 0, l2, a, 0); } -var create_matrix = make_matrix; +let create_matrix = make_matrix; -var concat = Caml_array.concat; +let concat = Caml_array.concat; -var fast_sort = stable_sort; +let fast_sort = stable_sort; exports.make_float = make_float; exports.init = init; diff --git a/lib/js/arrayLabels.js b/lib/js/arrayLabels.js index 538e3b958a..196d851486 100644 --- a/lib/js/arrayLabels.js +++ b/lib/js/arrayLabels.js @@ -1,14 +1,14 @@ 'use strict'; -var Curry = require("./curry.js"); -var Caml_obj = require("./caml_obj.js"); -var Caml_array = require("./caml_array.js"); -var Caml_exceptions = require("./caml_exceptions.js"); -var Caml_js_exceptions = require("./caml_js_exceptions.js"); +let Curry = require("./curry.js"); +let Caml_obj = require("./caml_obj.js"); +let Caml_array = require("./caml_array.js"); +let Caml_exceptions = require("./caml_exceptions.js"); +let Caml_js_exceptions = require("./caml_js_exceptions.js"); -var make_float = Caml_array.make_float; +let make_float = Caml_array.make_float; -var Floatarray = {}; +let Floatarray = {}; function init(l, f) { if (l === 0) { @@ -21,23 +21,23 @@ function init(l, f) { Error: new Error() }; } - var res = Caml_array.make(l, Curry._1(f, 0)); - for(var i = 1; i < l; ++i){ + let res = Caml_array.make(l, Curry._1(f, 0)); + for(let i = 1; i < l; ++i){ res[i] = Curry._1(f, i); } return res; } function make_matrix(sx, sy, init) { - var res = Caml_array.make(sx, []); - for(var x = 0; x < sx; ++x){ + let res = Caml_array.make(sx, []); + for(let x = 0; x < sx; ++x){ res[x] = Caml_array.make(sy, init); } return res; } function copy(a) { - var l = a.length; + let l = a.length; if (l === 0) { return []; } else { @@ -46,7 +46,7 @@ function copy(a) { } function append(a1, a2) { - var l1 = a1.length; + let l1 = a1.length; if (l1 === 0) { return copy(a2); } else if (a2.length === 0) { @@ -75,7 +75,7 @@ function fill(a, ofs, len, v) { Error: new Error() }; } - for(var i = ofs ,i_finish = ofs + len | 0; i < i_finish; ++i){ + for(let i = ofs ,i_finish = ofs + len | 0; i < i_finish; ++i){ a[i] = v; } } @@ -92,7 +92,7 @@ function blit(a1, ofs1, a2, ofs2, len) { } function iter(f, a) { - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ Curry._1(f, a[i]); } } @@ -105,26 +105,26 @@ function iter2(f, a, b) { Error: new Error() }; } - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ Curry._2(f, a[i], b[i]); } } function map(f, a) { - var l = a.length; + let l = a.length; if (l === 0) { return []; } - var r = Caml_array.make(l, Curry._1(f, a[0])); - for(var i = 1; i < l; ++i){ + let r = Caml_array.make(l, Curry._1(f, a[0])); + for(let i = 1; i < l; ++i){ r[i] = Curry._1(f, a[i]); } return r; } function map2(f, a, b) { - var la = a.length; - var lb = b.length; + let la = a.length; + let lb = b.length; if (la !== lb) { throw { RE_EXN_ID: "Invalid_argument", @@ -135,37 +135,37 @@ function map2(f, a, b) { if (la === 0) { return []; } - var r = Caml_array.make(la, Curry._2(f, a[0], b[0])); - for(var i = 1; i < la; ++i){ + let r = Caml_array.make(la, Curry._2(f, a[0], b[0])); + for(let i = 1; i < la; ++i){ r[i] = Curry._2(f, a[i], b[i]); } return r; } function iteri(f, a) { - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ Curry._2(f, i, a[i]); } } function mapi(f, a) { - var l = a.length; + let l = a.length; if (l === 0) { return []; } - var r = Caml_array.make(l, Curry._2(f, 0, a[0])); - for(var i = 1; i < l; ++i){ + let r = Caml_array.make(l, Curry._2(f, 0, a[0])); + for(let i = 1; i < l; ++i){ r[i] = Curry._2(f, i, a[i]); } return r; } function to_list(a) { - var _i = a.length - 1 | 0; - var _res = /* [] */0; + let _i = a.length - 1 | 0; + let _res = /* [] */0; while(true) { - var res = _res; - var i = _i; + let res = _res; + let i = _i; if (i < 0) { return res; } @@ -180,8 +180,8 @@ function to_list(a) { function list_length(_accu, _param) { while(true) { - var param = _param; - var accu = _accu; + let param = _param; + let accu = _accu; if (!param) { return accu; } @@ -195,12 +195,12 @@ function of_list(param) { if (!param) { return []; } - var a = Caml_array.make(list_length(0, param), param.hd); - var _i = 1; - var _param = param.tl; + let a = Caml_array.make(list_length(0, param), param.hd); + let _i = 1; + let _param = param.tl; while(true) { - var param$1 = _param; - var i = _i; + let param$1 = _param; + let i = _i; if (!param$1) { return a; } @@ -212,26 +212,26 @@ function of_list(param) { } function fold_left(f, x, a) { - var r = x; - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + let r = x; + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ r = Curry._2(f, r, a[i]); } return r; } function fold_right(f, a, x) { - var r = x; - for(var i = a.length - 1 | 0; i >= 0; --i){ + let r = x; + for(let i = a.length - 1 | 0; i >= 0; --i){ r = Curry._2(f, a[i], r); } return r; } function exists(p, a) { - var n = a.length; - var _i = 0; + let n = a.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === n) { return false; } @@ -244,10 +244,10 @@ function exists(p, a) { } function for_all(p, a) { - var n = a.length; - var _i = 0; + let n = a.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === n) { return true; } @@ -260,10 +260,10 @@ function for_all(p, a) { } function mem(x, a) { - var n = a.length; - var _i = 0; + let n = a.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === n) { return false; } @@ -276,10 +276,10 @@ function mem(x, a) { } function memq(x, a) { - var n = a.length; - var _i = 0; + let n = a.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === n) { return false; } @@ -291,12 +291,12 @@ function memq(x, a) { }; } -var Bottom = /* @__PURE__ */Caml_exceptions.create("ArrayLabels.Bottom"); +let Bottom = /* @__PURE__ */Caml_exceptions.create("ArrayLabels.Bottom"); function sort(cmp, a) { - var maxson = function (l, i) { - var i31 = ((i + i | 0) + i | 0) + 1 | 0; - var x = i31; + let maxson = function (l, i) { + let i31 = ((i + i | 0) + i | 0) + 1 | 0; + let x = i31; if ((i31 + 2 | 0) < l) { if (Curry._2(cmp, Caml_array.get(a, i31), Caml_array.get(a, i31 + 1 | 0)) < 0) { x = i31 + 1 | 0; @@ -318,12 +318,12 @@ function sort(cmp, a) { Error: new Error() }; }; - var trickle = function (l, i, e) { + let trickle = function (l, i, e) { try { - var _i = i; + let _i = i; while(true) { - var i$1 = _i; - var j = maxson(l, i$1); + let i$1 = _i; + let j = maxson(l, i$1); if (Curry._2(cmp, Caml_array.get(a, j), e) <= 0) { return Caml_array.set(a, i$1, e); } @@ -333,36 +333,36 @@ function sort(cmp, a) { }; } catch (raw_i){ - var i$2 = Caml_js_exceptions.internalToOCamlException(raw_i); + let i$2 = Caml_js_exceptions.internalToOCamlException(raw_i); if (i$2.RE_EXN_ID === Bottom) { return Caml_array.set(a, i$2._1, e); } throw i$2; } }; - var bubble = function (l, i) { + let bubble = function (l, i) { try { - var _i = i; + let _i = i; while(true) { - var i$1 = _i; - var j = maxson(l, i$1); + let i$1 = _i; + let j = maxson(l, i$1); Caml_array.set(a, i$1, Caml_array.get(a, j)); _i = j; continue ; }; } catch (raw_i){ - var i$2 = Caml_js_exceptions.internalToOCamlException(raw_i); + let i$2 = Caml_js_exceptions.internalToOCamlException(raw_i); if (i$2.RE_EXN_ID === Bottom) { return i$2._1; } throw i$2; } }; - var trickleup = function (_i, e) { + let trickleup = function (_i, e) { while(true) { - var i = _i; - var father = (i - 1 | 0) / 3 | 0; + let i = _i; + let father = (i - 1 | 0) / 3 | 0; if (i === father) { throw { RE_EXN_ID: "Assert_failure", @@ -385,41 +385,41 @@ function sort(cmp, a) { continue ; }; }; - var l = a.length; - for(var i = ((l + 1 | 0) / 3 | 0) - 1 | 0; i >= 0; --i){ + let l = a.length; + for(let i = ((l + 1 | 0) / 3 | 0) - 1 | 0; i >= 0; --i){ trickle(l, i, Caml_array.get(a, i)); } - for(var i$1 = l - 1 | 0; i$1 >= 2; --i$1){ - var e = Caml_array.get(a, i$1); + for(let i$1 = l - 1 | 0; i$1 >= 2; --i$1){ + let e = Caml_array.get(a, i$1); Caml_array.set(a, i$1, Caml_array.get(a, 0)); trickleup(bubble(i$1, 0), e); } if (l <= 1) { return; } - var e$1 = Caml_array.get(a, 1); + let e$1 = Caml_array.get(a, 1); Caml_array.set(a, 1, Caml_array.get(a, 0)); Caml_array.set(a, 0, e$1); } function stable_sort(cmp, a) { - var merge = function (src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = Caml_array.get(a, src1ofs); - var _i2 = src2ofs; - var _s2 = Caml_array.get(src2, src2ofs); - var _d = dstofs; + let merge = function (src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = Caml_array.get(a, src1ofs); + let _i2 = src2ofs; + let _s2 = Caml_array.get(src2, src2ofs); + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (Curry._2(cmp, s1, s2) <= 0) { Caml_array.set(dst, d, s1); - var i1$1 = i1 + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return blit(src2, i2, dst, d + 1 | 0, src2r - i2 | 0); } @@ -429,7 +429,7 @@ function stable_sort(cmp, a) { continue ; } Caml_array.set(dst, d, s2); - var i2$1 = i2 + 1 | 0; + let i2$1 = i2 + 1 | 0; if (i2$1 >= src2r) { return blit(a, i1, dst, d + 1 | 0, src1r - i1 | 0); } @@ -439,10 +439,10 @@ function stable_sort(cmp, a) { continue ; }; }; - var isortto = function (srcofs, dst, dstofs, len) { - for(var i = 0; i < len; ++i){ - var e = Caml_array.get(a, srcofs + i | 0); - var j = (dstofs + i | 0) - 1 | 0; + let isortto = function (srcofs, dst, dstofs, len) { + for(let i = 0; i < len; ++i){ + let e = Caml_array.get(a, srcofs + i | 0); + let j = (dstofs + i | 0) - 1 | 0; while(j >= dstofs && Curry._2(cmp, Caml_array.get(dst, j), e) > 0) { Caml_array.set(dst, j + 1 | 0, Caml_array.get(dst, j)); j = j - 1 | 0; @@ -450,33 +450,33 @@ function stable_sort(cmp, a) { Caml_array.set(dst, j + 1 | 0, e); } }; - var sortto = function (srcofs, dst, dstofs, len) { + let sortto = function (srcofs, dst, dstofs, len) { if (len <= 5) { return isortto(srcofs, dst, dstofs, len); } - var l1 = len / 2 | 0; - var l2 = len - l1 | 0; + let l1 = len / 2 | 0; + let l2 = len - l1 | 0; sortto(srcofs + l1 | 0, dst, dstofs + l1 | 0, l2); sortto(srcofs, a, srcofs + l2 | 0, l1); merge(srcofs + l2 | 0, l1, dst, dstofs + l1 | 0, l2, dst, dstofs); }; - var l = a.length; + let l = a.length; if (l <= 5) { return isortto(0, a, 0, l); } - var l1 = l / 2 | 0; - var l2 = l - l1 | 0; - var t = Caml_array.make(l2, Caml_array.get(a, 0)); + let l1 = l / 2 | 0; + let l2 = l - l1 | 0; + let t = Caml_array.make(l2, Caml_array.get(a, 0)); sortto(l1, t, 0, l2); sortto(0, a, l2, l1); merge(l2, l1, t, 0, l2, a, 0); } -var create_matrix = make_matrix; +let create_matrix = make_matrix; -var concat = Caml_array.concat; +let concat = Caml_array.concat; -var fast_sort = stable_sort; +let fast_sort = stable_sort; exports.init = init; exports.make_matrix = make_matrix; diff --git a/lib/js/belt.js b/lib/js/belt.js index fab992f786..f240b450cd 100644 --- a/lib/js/belt.js +++ b/lib/js/belt.js @@ -1,39 +1,39 @@ 'use strict'; -var Id; +let Id; -var $$Array; +let $$Array; -var SortArray; +let SortArray; -var MutableQueue; +let MutableQueue; -var MutableStack; +let MutableStack; -var List; +let List; -var $$Range; +let $$Range; -var $$Set; +let $$Set; -var $$Map; +let $$Map; -var MutableSet; +let MutableSet; -var MutableMap; +let MutableMap; -var HashSet; +let HashSet; -var HashMap; +let HashMap; -var $$Option; +let $$Option; -var Result; +let Result; -var Int; +let Int; -var Float; +let Float; exports.Id = Id; exports.$$Array = $$Array; diff --git a/lib/js/belt_Array.js b/lib/js/belt_Array.js index 4362dc4b69..8e35e03d44 100644 --- a/lib/js/belt_Array.js +++ b/lib/js/belt_Array.js @@ -1,9 +1,9 @@ 'use strict'; -var Caml = require("./caml.js"); -var Curry = require("./curry.js"); -var Js_math = require("./js_math.js"); -var Caml_option = require("./caml_option.js"); +let Caml = require("./caml.js"); +let Curry = require("./curry.js"); +let Js_math = require("./js_math.js"); +let Caml_option = require("./caml_option.js"); function get(arr, i) { if (i >= 0 && i < arr.length) { @@ -52,36 +52,36 @@ function setExn(arr, i, v) { } function swapUnsafe(xs, i, j) { - var tmp = xs[i]; + let tmp = xs[i]; xs[i] = xs[j]; xs[j] = tmp; } function shuffleInPlace(xs) { - var len = xs.length; - for(var i = 0; i < len; ++i){ + let len = xs.length; + for(let i = 0; i < len; ++i){ swapUnsafe(xs, i, Js_math.random_int(i, len)); } } function shuffle(xs) { - var result = xs.slice(0); + let result = xs.slice(0); shuffleInPlace(result); return result; } function reverseInPlace(xs) { - var len = xs.length; - var ofs = 0; - for(var i = 0 ,i_finish = len / 2 | 0; i < i_finish; ++i){ + let len = xs.length; + let ofs = 0; + for(let i = 0 ,i_finish = len / 2 | 0; i < i_finish; ++i){ swapUnsafe(xs, ofs + i | 0, ((ofs + len | 0) - i | 0) - 1 | 0); } } function reverse(xs) { - var len = xs.length; - var result = new Array(len); - for(var i = 0; i < len; ++i){ + let len = xs.length; + let result = new Array(len); + for(let i = 0; i < len; ++i){ result[i] = xs[(len - 1 | 0) - i | 0]; } return result; @@ -91,8 +91,8 @@ function make(l, f) { if (l <= 0) { return []; } - var res = new Array(l); - for(var i = 0; i < l; ++i){ + let res = new Array(l); + for(let i = 0; i < l; ++i){ res[i] = f; } return res; @@ -102,8 +102,8 @@ function makeByU(l, f) { if (l <= 0) { return []; } - var res = new Array(l); - for(var i = 0; i < l; ++i){ + let res = new Array(l); + for(let i = 0; i < l; ++i){ res[i] = f(i); } return res; @@ -114,7 +114,7 @@ function makeBy(l, f) { } function makeByAndShuffleU(l, f) { - var u = makeByU(l, f); + let u = makeByU(l, f); shuffleInPlace(u); return u; } @@ -124,26 +124,26 @@ function makeByAndShuffle(l, f) { } function range(start, finish) { - var cut = finish - start | 0; + let cut = finish - start | 0; if (cut < 0) { return []; } - var arr = new Array(cut + 1 | 0); - for(var i = 0; i <= cut; ++i){ + let arr = new Array(cut + 1 | 0); + for(let i = 0; i <= cut; ++i){ arr[i] = start + i | 0; } return arr; } function rangeBy(start, finish, step) { - var cut = finish - start | 0; + let cut = finish - start | 0; if (cut < 0 || step <= 0) { return []; } - var nb = (cut / step | 0) + 1 | 0; - var arr = new Array(nb); - var cur = start; - for(var i = 0; i < nb; ++i){ + let nb = (cut / step | 0) + 1 | 0; + let arr = new Array(nb); + let cur = start; + for(let i = 0; i < nb; ++i){ arr[i] = cur; cur = cur + step | 0; } @@ -151,11 +151,11 @@ function rangeBy(start, finish, step) { } function zip(xs, ys) { - var lenx = xs.length; - var leny = ys.length; - var len = lenx < leny ? lenx : leny; - var s = new Array(len); - for(var i = 0; i < len; ++i){ + let lenx = xs.length; + let leny = ys.length; + let len = lenx < leny ? lenx : leny; + let s = new Array(len); + for(let i = 0; i < len; ++i){ s[i] = [ xs[i], ys[i] @@ -165,11 +165,11 @@ function zip(xs, ys) { } function zipByU(xs, ys, f) { - var lenx = xs.length; - var leny = ys.length; - var len = lenx < leny ? lenx : leny; - var s = new Array(len); - for(var i = 0; i < len; ++i){ + let lenx = xs.length; + let leny = ys.length; + let len = lenx < leny ? lenx : leny; + let s = new Array(len); + for(let i = 0; i < len; ++i){ s[i] = f(xs[i], ys[i]); } return s; @@ -180,29 +180,29 @@ function zipBy(xs, ys, f) { } function concat(a1, a2) { - var l1 = a1.length; - var l2 = a2.length; - var a1a2 = new Array(l1 + l2 | 0); - for(var i = 0; i < l1; ++i){ + let l1 = a1.length; + let l2 = a2.length; + let a1a2 = new Array(l1 + l2 | 0); + for(let i = 0; i < l1; ++i){ a1a2[i] = a1[i]; } - for(var i$1 = 0; i$1 < l2; ++i$1){ + for(let i$1 = 0; i$1 < l2; ++i$1){ a1a2[l1 + i$1 | 0] = a2[i$1]; } return a1a2; } function concatMany(arrs) { - var lenArrs = arrs.length; - var totalLen = 0; - for(var i = 0; i < lenArrs; ++i){ + let lenArrs = arrs.length; + let totalLen = 0; + for(let i = 0; i < lenArrs; ++i){ totalLen = totalLen + arrs[i].length | 0; } - var result = new Array(totalLen); + let result = new Array(totalLen); totalLen = 0; - for(var j = 0; j < lenArrs; ++j){ - var cur = arrs[j]; - for(var k = 0 ,k_finish = cur.length; k < k_finish; ++k){ + for(let j = 0; j < lenArrs; ++j){ + let cur = arrs[j]; + for(let k = 0 ,k_finish = cur.length; k < k_finish; ++k){ result[totalLen] = cur[k]; totalLen = totalLen + 1 | 0; } @@ -214,26 +214,26 @@ function slice(a, offset, len) { if (len <= 0) { return []; } - var lena = a.length; - var ofs = offset < 0 ? Caml.int_max(lena + offset | 0, 0) : offset; - var hasLen = lena - ofs | 0; - var copyLength = hasLen < len ? hasLen : len; + let lena = a.length; + let ofs = offset < 0 ? Caml.int_max(lena + offset | 0, 0) : offset; + let hasLen = lena - ofs | 0; + let copyLength = hasLen < len ? hasLen : len; if (copyLength <= 0) { return []; } - var result = new Array(copyLength); - for(var i = 0; i < copyLength; ++i){ + let result = new Array(copyLength); + for(let i = 0; i < copyLength; ++i){ result[i] = a[ofs + i | 0]; } return result; } function sliceToEnd(a, offset) { - var lena = a.length; - var ofs = offset < 0 ? Caml.int_max(lena + offset | 0, 0) : offset; - var len = lena > ofs ? lena - ofs | 0 : 0; - var result = new Array(len); - for(var i = 0; i < len; ++i){ + let lena = a.length; + let ofs = offset < 0 ? Caml.int_max(lena + offset | 0, 0) : offset; + let len = lena > ofs ? lena - ofs | 0 : 0; + let result = new Array(len); + for(let i = 0; i < len; ++i){ result[i] = a[ofs + i | 0]; } return result; @@ -243,49 +243,49 @@ function fill(a, offset, len, v) { if (len <= 0) { return; } - var lena = a.length; - var ofs = offset < 0 ? Caml.int_max(lena + offset | 0, 0) : offset; - var hasLen = lena - ofs | 0; - var fillLength = hasLen < len ? hasLen : len; + let lena = a.length; + let ofs = offset < 0 ? Caml.int_max(lena + offset | 0, 0) : offset; + let hasLen = lena - ofs | 0; + let fillLength = hasLen < len ? hasLen : len; if (fillLength <= 0) { return; } - for(var i = ofs ,i_finish = ofs + fillLength | 0; i < i_finish; ++i){ + for(let i = ofs ,i_finish = ofs + fillLength | 0; i < i_finish; ++i){ a[i] = v; } } function blitUnsafe(a1, srcofs1, a2, srcofs2, blitLength) { if (srcofs2 <= srcofs1) { - for(var j = 0; j < blitLength; ++j){ + for(let j = 0; j < blitLength; ++j){ a2[j + srcofs2 | 0] = a1[j + srcofs1 | 0]; } return; } - for(var j$1 = blitLength - 1 | 0; j$1 >= 0; --j$1){ + for(let j$1 = blitLength - 1 | 0; j$1 >= 0; --j$1){ a2[j$1 + srcofs2 | 0] = a1[j$1 + srcofs1 | 0]; } } function blit(a1, ofs1, a2, ofs2, len) { - var lena1 = a1.length; - var lena2 = a2.length; - var srcofs1 = ofs1 < 0 ? Caml.int_max(lena1 + ofs1 | 0, 0) : ofs1; - var srcofs2 = ofs2 < 0 ? Caml.int_max(lena2 + ofs2 | 0, 0) : ofs2; - var blitLength = Caml.int_min(len, Caml.int_min(lena1 - srcofs1 | 0, lena2 - srcofs2 | 0)); + let lena1 = a1.length; + let lena2 = a2.length; + let srcofs1 = ofs1 < 0 ? Caml.int_max(lena1 + ofs1 | 0, 0) : ofs1; + let srcofs2 = ofs2 < 0 ? Caml.int_max(lena2 + ofs2 | 0, 0) : ofs2; + let blitLength = Caml.int_min(len, Caml.int_min(lena1 - srcofs1 | 0, lena2 - srcofs2 | 0)); if (srcofs2 <= srcofs1) { - for(var j = 0; j < blitLength; ++j){ + for(let j = 0; j < blitLength; ++j){ a2[j + srcofs2 | 0] = a1[j + srcofs1 | 0]; } return; } - for(var j$1 = blitLength - 1 | 0; j$1 >= 0; --j$1){ + for(let j$1 = blitLength - 1 | 0; j$1 >= 0; --j$1){ a2[j$1 + srcofs2 | 0] = a1[j$1 + srcofs1 | 0]; } } function forEachU(a, f) { - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ f(a[i]); } } @@ -295,9 +295,9 @@ function forEach(a, f) { } function mapU(a, f) { - var l = a.length; - var r = new Array(l); - for(var i = 0; i < l; ++i){ + let l = a.length; + let r = new Array(l); + for(let i = 0; i < l; ++i){ r[i] = f(a[i]); } return r; @@ -316,11 +316,11 @@ function flatMap(a, f) { } function getByU(a, p) { - var l = a.length; - var i = 0; - var r; + let l = a.length; + let i = 0; + let r; while(r === undefined && i < l) { - var v = a[i]; + let v = a[i]; if (p(v)) { r = Caml_option.some(v); } @@ -334,11 +334,11 @@ function getBy(a, p) { } function getIndexByU(a, p) { - var l = a.length; - var i = 0; - var r; + let l = a.length; + let i = 0; + let r; while(r === undefined && i < l) { - var v = a[i]; + let v = a[i]; if (p(v)) { r = i; } @@ -352,11 +352,11 @@ function getIndexBy(a, p) { } function keepU(a, f) { - var l = a.length; - var r = new Array(l); - var j = 0; - for(var i = 0; i < l; ++i){ - var v = a[i]; + let l = a.length; + let r = new Array(l); + let j = 0; + for(let i = 0; i < l; ++i){ + let v = a[i]; if (f(v)) { r[j] = v; j = j + 1 | 0; @@ -372,11 +372,11 @@ function keep(a, f) { } function keepWithIndexU(a, f) { - var l = a.length; - var r = new Array(l); - var j = 0; - for(var i = 0; i < l; ++i){ - var v = a[i]; + let l = a.length; + let r = new Array(l); + let j = 0; + for(let i = 0; i < l; ++i){ + let v = a[i]; if (f(v, i)) { r[j] = v; j = j + 1 | 0; @@ -392,12 +392,12 @@ function keepWithIndex(a, f) { } function keepMapU(a, f) { - var l = a.length; - var r = new Array(l); - var j = 0; - for(var i = 0; i < l; ++i){ - var v = a[i]; - var v$1 = f(v); + let l = a.length; + let r = new Array(l); + let j = 0; + for(let i = 0; i < l; ++i){ + let v = a[i]; + let v$1 = f(v); if (v$1 !== undefined) { r[j] = Caml_option.valFromOption(v$1); j = j + 1 | 0; @@ -413,7 +413,7 @@ function keepMap(a, f) { } function forEachWithIndexU(a, f) { - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ f(i, a[i]); } } @@ -423,9 +423,9 @@ function forEachWithIndex(a, f) { } function mapWithIndexU(a, f) { - var l = a.length; - var r = new Array(l); - for(var i = 0; i < l; ++i){ + let l = a.length; + let r = new Array(l); + for(let i = 0; i < l; ++i){ r[i] = f(i, a[i]); } return r; @@ -436,8 +436,8 @@ function mapWithIndex(a, f) { } function reduceU(a, x, f) { - var r = x; - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + let r = x; + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ r = f(r, a[i]); } return r; @@ -448,8 +448,8 @@ function reduce(a, x, f) { } function reduceReverseU(a, x, f) { - var r = x; - for(var i = a.length - 1 | 0; i >= 0; --i){ + let r = x; + for(let i = a.length - 1 | 0; i >= 0; --i){ r = f(r, a[i]); } return r; @@ -460,9 +460,9 @@ function reduceReverse(a, x, f) { } function reduceReverse2U(a, b, x, f) { - var r = x; - var len = Caml.int_min(a.length, b.length); - for(var i = len - 1 | 0; i >= 0; --i){ + let r = x; + let len = Caml.int_min(a.length, b.length); + for(let i = len - 1 | 0; i >= 0; --i){ r = f(r, a[i], b[i]); } return r; @@ -473,8 +473,8 @@ function reduceReverse2(a, b, x, f) { } function reduceWithIndexU(a, x, f) { - var r = x; - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + let r = x; + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ r = f(r, a[i], i); } return r; @@ -485,10 +485,10 @@ function reduceWithIndex(a, x, f) { } function everyU(arr, b) { - var len = arr.length; - var _i = 0; + let len = arr.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === len) { return true; } @@ -505,10 +505,10 @@ function every(arr, f) { } function someU(arr, b) { - var len = arr.length; - var _i = 0; + let len = arr.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === len) { return false; } @@ -526,7 +526,7 @@ function some(arr, f) { function everyAux2(arr1, arr2, _i, b, len) { while(true) { - var i = _i; + let i = _i; if (i === len) { return true; } @@ -547,10 +547,10 @@ function every2(a, b, p) { } function some2U(a, b, p) { - var _i = 0; - var len = Caml.int_min(a.length, b.length); + let _i = 0; + let len = Caml.int_min(a.length, b.length); while(true) { - var i = _i; + let i = _i; if (i === len) { return false; } @@ -567,8 +567,8 @@ function some2(a, b, p) { } function eqU(a, b, p) { - var lena = a.length; - var lenb = b.length; + let lena = a.length; + let lenb = b.length; if (lena === lenb) { return everyAux2(a, b, 0, p, lena); } else { @@ -581,20 +581,20 @@ function eq(a, b, p) { } function cmpU(a, b, p) { - var lena = a.length; - var lenb = b.length; + let lena = a.length; + let lenb = b.length; if (lena > lenb) { return 1; } else if (lena < lenb) { return -1; } else { - var _i = 0; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === lena) { return 0; } - var c = p(a[i], b[i]); + let c = p(a[i], b[i]); if (c !== 0) { return c; } @@ -609,13 +609,13 @@ function cmp(a, b, p) { } function partitionU(a, f) { - var l = a.length; - var i = 0; - var j = 0; - var a1 = new Array(l); - var a2 = new Array(l); - for(var ii = 0; ii < l; ++ii){ - var v = a[ii]; + let l = a.length; + let i = 0; + let j = 0; + let a1 = new Array(l); + let a2 = new Array(l); + for(let ii = 0; ii < l; ++ii){ + let v = a[ii]; if (f(v)) { a1[i] = v; i = i + 1 | 0; @@ -637,11 +637,11 @@ function partition(a, f) { } function unzip(a) { - var l = a.length; - var a1 = new Array(l); - var a2 = new Array(l); - for(var i = 0; i < l; ++i){ - var match = a[i]; + let l = a.length; + let a1 = new Array(l); + let a2 = new Array(l); + for(let i = 0; i < l; ++i){ + let match = a[i]; a1[i] = match[0]; a2[i] = match[1]; } @@ -652,16 +652,16 @@ function unzip(a) { } function joinWithU(a, sep, toString) { - var l = a.length; + let l = a.length; if (l === 0) { return ""; } - var lastIndex = l - 1 | 0; - var _i = 0; - var _res = ""; + let lastIndex = l - 1 | 0; + let _i = 0; + let _res = ""; while(true) { - var res = _res; - var i = _i; + let res = _res; + let i = _i; if (i === lastIndex) { return res + toString(a[i]); } @@ -676,8 +676,8 @@ function joinWith(a, sep, toString) { } function initU(n, f) { - var v = new Array(n); - for(var i = 0; i < n; ++i){ + let v = new Array(n); + for(let i = 0; i < n; ++i){ v[i] = f(i); } return v; diff --git a/lib/js/belt_Float.js b/lib/js/belt_Float.js index fa12f4ce89..4859867af1 100644 --- a/lib/js/belt_Float.js +++ b/lib/js/belt_Float.js @@ -2,7 +2,7 @@ function fromString(i) { - var i$1 = parseFloat(i); + let i$1 = parseFloat(i); if (isNaN(i$1)) { return; } else { diff --git a/lib/js/belt_HashMap.js b/lib/js/belt_HashMap.js index 5ccd56ea40..f9d0ec30f3 100644 --- a/lib/js/belt_HashMap.js +++ b/lib/js/belt_HashMap.js @@ -1,8 +1,8 @@ 'use strict'; -var Caml_option = require("./caml_option.js"); -var Belt_internalBuckets = require("./belt_internalBuckets.js"); -var Belt_internalBucketsType = require("./belt_internalBucketsType.js"); +let Caml_option = require("./caml_option.js"); +let Belt_internalBuckets = require("./belt_internalBuckets.js"); +let Belt_internalBucketsType = require("./belt_internalBucketsType.js"); function size(h) { return h.size; @@ -10,12 +10,12 @@ function size(h) { function copyBucketReHash(hash, h_buckets, ndata_tail, _old_bucket) { while(true) { - var old_bucket = _old_bucket; + let old_bucket = _old_bucket; if (old_bucket === undefined) { return; } - var nidx = hash(old_bucket.key) & (h_buckets.length - 1 | 0); - var tail = ndata_tail[nidx]; + let nidx = hash(old_bucket.key) & (h_buckets.length - 1 | 0); + let tail = ndata_tail[nidx]; if (tail !== undefined) { tail.next = old_bucket; } else { @@ -29,12 +29,12 @@ function copyBucketReHash(hash, h_buckets, ndata_tail, _old_bucket) { function replaceInBucket(eq, key, info, _cell) { while(true) { - var cell = _cell; + let cell = _cell; if (eq(cell.key, key)) { cell.value = info; return false; } - var cell$1 = cell.next; + let cell$1 = cell.next; if (cell$1 === undefined) { return true; } @@ -44,10 +44,10 @@ function replaceInBucket(eq, key, info, _cell) { } function set0(h, key, value, eq, hash) { - var h_buckets = h.buckets; - var buckets_len = h_buckets.length; - var i = hash(key) & (buckets_len - 1 | 0); - var l = h_buckets[i]; + let h_buckets = h.buckets; + let buckets_len = h_buckets.length; + let i = hash(key) & (buckets_len - 1 | 0); + let l = h_buckets[i]; if (l !== undefined) { if (replaceInBucket(eq, key, value, l)) { h_buckets[i] = { @@ -67,20 +67,20 @@ function set0(h, key, value, eq, hash) { h.size = h.size + 1 | 0; } if (h.size > (buckets_len << 1)) { - var odata = h.buckets; - var osize = odata.length; - var nsize = (osize << 1); + let odata = h.buckets; + let osize = odata.length; + let nsize = (osize << 1); if (nsize < osize) { return; } - var h_buckets$1 = new Array(nsize); - var ndata_tail = new Array(nsize); + let h_buckets$1 = new Array(nsize); + let ndata_tail = new Array(nsize); h.buckets = h_buckets$1; - for(var i$1 = 0; i$1 < osize; ++i$1){ + for(let i$1 = 0; i$1 < osize; ++i$1){ copyBucketReHash(hash, h_buckets$1, ndata_tail, odata[i$1]); } - for(var i$2 = 0; i$2 < nsize; ++i$2){ - var tail = ndata_tail[i$2]; + for(let i$2 = 0; i$2 < nsize; ++i$2){ + let tail = ndata_tail[i$2]; if (tail !== undefined) { tail.next = undefined; } @@ -96,27 +96,27 @@ function set(h, key, value) { } function remove(h, key) { - var h_buckets = h.buckets; - var i = h.hash(key) & (h_buckets.length - 1 | 0); - var bucket = h_buckets[i]; + let h_buckets = h.buckets; + let i = h.hash(key) & (h_buckets.length - 1 | 0); + let bucket = h_buckets[i]; if (bucket === undefined) { return; } - var eq = h.eq; + let eq = h.eq; if (eq(bucket.key, key)) { h_buckets[i] = bucket.next; h.size = h.size - 1 | 0; return; } else { - var _prec = bucket; - var _bucket = bucket.next; + let _prec = bucket; + let _bucket = bucket.next; while(true) { - var bucket$1 = _bucket; - var prec = _prec; + let bucket$1 = _bucket; + let prec = _prec; if (bucket$1 === undefined) { return; } - var cell_next = bucket$1.next; + let cell_next = bucket$1.next; if (eq(bucket$1.key, key)) { prec.next = cell_next; h.size = h.size - 1 | 0; @@ -130,31 +130,31 @@ function remove(h, key) { } function get(h, key) { - var h_buckets = h.buckets; - var nid = h.hash(key) & (h_buckets.length - 1 | 0); - var cell1 = h_buckets[nid]; + let h_buckets = h.buckets; + let nid = h.hash(key) & (h_buckets.length - 1 | 0); + let cell1 = h_buckets[nid]; if (cell1 === undefined) { return; } - var eq = h.eq; + let eq = h.eq; if (eq(key, cell1.key)) { return Caml_option.some(cell1.value); } - var cell2 = cell1.next; + let cell2 = cell1.next; if (cell2 === undefined) { return; } if (eq(key, cell2.key)) { return Caml_option.some(cell2.value); } - var cell3 = cell2.next; + let cell3 = cell2.next; if (cell3 !== undefined) { if (eq(key, cell3.key)) { return Caml_option.some(cell3.value); } else { - var _buckets = cell3.next; + let _buckets = cell3.next; while(true) { - var buckets = _buckets; + let buckets = _buckets; if (buckets === undefined) { return; } @@ -170,18 +170,18 @@ function get(h, key) { } function has(h, key) { - var h_buckets = h.buckets; - var nid = h.hash(key) & (h_buckets.length - 1 | 0); - var bucket = h_buckets[nid]; + let h_buckets = h.buckets; + let nid = h.hash(key) & (h_buckets.length - 1 | 0); + let bucket = h_buckets[nid]; if (bucket !== undefined) { - var _cell = bucket; - var eq = h.eq; + let _cell = bucket; + let eq = h.eq; while(true) { - var cell = _cell; + let cell = _cell; if (eq(cell.key, key)) { return true; } - var nextCell = cell.next; + let nextCell = cell.next; if (nextCell === undefined) { return false; } @@ -198,58 +198,58 @@ function make(hintSize, id) { } function fromArray(arr, id) { - var hash = id.hash; - var eq = id.eq; - var len = arr.length; - var v = Belt_internalBucketsType.make(hash, eq, len); - for(var i = 0; i < len; ++i){ - var match = arr[i]; + let hash = id.hash; + let eq = id.eq; + let len = arr.length; + let v = Belt_internalBucketsType.make(hash, eq, len); + for(let i = 0; i < len; ++i){ + let match = arr[i]; set0(v, match[0], match[1], eq, hash); } return v; } function mergeMany(h, arr) { - var hash = h.hash; - var eq = h.eq; - var len = arr.length; - for(var i = 0; i < len; ++i){ - var match = arr[i]; + let hash = h.hash; + let eq = h.eq; + let len = arr.length; + for(let i = 0; i < len; ++i){ + let match = arr[i]; set0(h, match[0], match[1], eq, hash); } } -var Int; +let Int; -var $$String; +let $$String; -var clear = Belt_internalBucketsType.clear; +let clear = Belt_internalBucketsType.clear; -var isEmpty = Belt_internalBucketsType.isEmpty; +let isEmpty = Belt_internalBucketsType.isEmpty; -var copy = Belt_internalBuckets.copy; +let copy = Belt_internalBuckets.copy; -var forEachU = Belt_internalBuckets.forEachU; +let forEachU = Belt_internalBuckets.forEachU; -var forEach = Belt_internalBuckets.forEach; +let forEach = Belt_internalBuckets.forEach; -var reduceU = Belt_internalBuckets.reduceU; +let reduceU = Belt_internalBuckets.reduceU; -var reduce = Belt_internalBuckets.reduce; +let reduce = Belt_internalBuckets.reduce; -var keepMapInPlaceU = Belt_internalBuckets.keepMapInPlaceU; +let keepMapInPlaceU = Belt_internalBuckets.keepMapInPlaceU; -var keepMapInPlace = Belt_internalBuckets.keepMapInPlace; +let keepMapInPlace = Belt_internalBuckets.keepMapInPlace; -var toArray = Belt_internalBuckets.toArray; +let toArray = Belt_internalBuckets.toArray; -var keysToArray = Belt_internalBuckets.keysToArray; +let keysToArray = Belt_internalBuckets.keysToArray; -var valuesToArray = Belt_internalBuckets.valuesToArray; +let valuesToArray = Belt_internalBuckets.valuesToArray; -var getBucketHistogram = Belt_internalBuckets.getBucketHistogram; +let getBucketHistogram = Belt_internalBuckets.getBucketHistogram; -var logStats = Belt_internalBuckets.logStats; +let logStats = Belt_internalBuckets.logStats; exports.Int = Int; exports.$$String = $$String; diff --git a/lib/js/belt_HashMapInt.js b/lib/js/belt_HashMapInt.js index 81c242a846..94ee32c1d1 100644 --- a/lib/js/belt_HashMapInt.js +++ b/lib/js/belt_HashMapInt.js @@ -1,18 +1,18 @@ 'use strict'; -var Caml_option = require("./caml_option.js"); -var Caml_hash_primitive = require("./caml_hash_primitive.js"); -var Belt_internalBuckets = require("./belt_internalBuckets.js"); -var Belt_internalBucketsType = require("./belt_internalBucketsType.js"); +let Caml_option = require("./caml_option.js"); +let Caml_hash_primitive = require("./caml_hash_primitive.js"); +let Belt_internalBuckets = require("./belt_internalBuckets.js"); +let Belt_internalBucketsType = require("./belt_internalBucketsType.js"); function copyBucketReHash(h_buckets, ndata_tail, _old_bucket) { while(true) { - var old_bucket = _old_bucket; + let old_bucket = _old_bucket; if (old_bucket === undefined) { return; } - var nidx = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, old_bucket.key)) & (h_buckets.length - 1 | 0); - var tail = ndata_tail[nidx]; + let nidx = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, old_bucket.key)) & (h_buckets.length - 1 | 0); + let tail = ndata_tail[nidx]; if (tail !== undefined) { tail.next = old_bucket; } else { @@ -26,12 +26,12 @@ function copyBucketReHash(h_buckets, ndata_tail, _old_bucket) { function replaceInBucket(key, info, _cell) { while(true) { - var cell = _cell; + let cell = _cell; if (cell.key === key) { cell.value = info; return false; } - var cell$1 = cell.next; + let cell$1 = cell.next; if (cell$1 === undefined) { return true; } @@ -41,10 +41,10 @@ function replaceInBucket(key, info, _cell) { } function set(h, key, value) { - var h_buckets = h.buckets; - var buckets_len = h_buckets.length; - var i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (buckets_len - 1 | 0); - var l = h_buckets[i]; + let h_buckets = h.buckets; + let buckets_len = h_buckets.length; + let i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (buckets_len - 1 | 0); + let l = h_buckets[i]; if (l !== undefined) { if (replaceInBucket(key, value, l)) { h_buckets[i] = { @@ -64,20 +64,20 @@ function set(h, key, value) { h.size = h.size + 1 | 0; } if (h.size > (buckets_len << 1)) { - var odata = h.buckets; - var osize = odata.length; - var nsize = (osize << 1); + let odata = h.buckets; + let osize = odata.length; + let nsize = (osize << 1); if (nsize < osize) { return; } - var h_buckets$1 = new Array(nsize); - var ndata_tail = new Array(nsize); + let h_buckets$1 = new Array(nsize); + let ndata_tail = new Array(nsize); h.buckets = h_buckets$1; - for(var i$1 = 0; i$1 < osize; ++i$1){ + for(let i$1 = 0; i$1 < osize; ++i$1){ copyBucketReHash(h_buckets$1, ndata_tail, odata[i$1]); } - for(var i$2 = 0; i$2 < nsize; ++i$2){ - var tail = ndata_tail[i$2]; + for(let i$2 = 0; i$2 < nsize; ++i$2){ + let tail = ndata_tail[i$2]; if (tail !== undefined) { tail.next = undefined; } @@ -89,24 +89,24 @@ function set(h, key, value) { } function remove(h, key) { - var h_buckets = h.buckets; - var i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); - var bucket = h_buckets[i]; + let h_buckets = h.buckets; + let i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); + let bucket = h_buckets[i]; if (bucket !== undefined) { if (bucket.key === key) { h_buckets[i] = bucket.next; h.size = h.size - 1 | 0; return; } else { - var _prec = bucket; - var _buckets = bucket.next; + let _prec = bucket; + let _buckets = bucket.next; while(true) { - var buckets = _buckets; - var prec = _prec; + let buckets = _buckets; + let prec = _prec; if (buckets === undefined) { return; } - var cell_next = buckets.next; + let cell_next = buckets.next; if (buckets.key === key) { prec.next = cell_next; h.size = h.size - 1 | 0; @@ -122,30 +122,30 @@ function remove(h, key) { } function get(h, key) { - var h_buckets = h.buckets; - var nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); - var cell1 = h_buckets[nid]; + let h_buckets = h.buckets; + let nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); + let cell1 = h_buckets[nid]; if (cell1 === undefined) { return; } if (key === cell1.key) { return Caml_option.some(cell1.value); } - var cell2 = cell1.next; + let cell2 = cell1.next; if (cell2 === undefined) { return; } if (key === cell2.key) { return Caml_option.some(cell2.value); } - var cell3 = cell2.next; + let cell3 = cell2.next; if (cell3 !== undefined) { if (key === cell3.key) { return Caml_option.some(cell3.value); } else { - var _buckets = cell3.next; + let _buckets = cell3.next; while(true) { - var buckets = _buckets; + let buckets = _buckets; if (buckets === undefined) { return; } @@ -161,17 +161,17 @@ function get(h, key) { } function has(h, key) { - var h_buckets = h.buckets; - var nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); - var bucket = h_buckets[nid]; + let h_buckets = h.buckets; + let nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); + let bucket = h_buckets[nid]; if (bucket !== undefined) { - var _cell = bucket; + let _cell = bucket; while(true) { - var cell = _cell; + let cell = _cell; if (cell.key === key) { return true; } - var nextCell = cell.next; + let nextCell = cell.next; if (nextCell === undefined) { return false; } @@ -192,50 +192,50 @@ function size(h) { } function fromArray(arr) { - var len = arr.length; - var v = Belt_internalBucketsType.make(undefined, undefined, len); - for(var i = 0; i < len; ++i){ - var match = arr[i]; + let len = arr.length; + let v = Belt_internalBucketsType.make(undefined, undefined, len); + for(let i = 0; i < len; ++i){ + let match = arr[i]; set(v, match[0], match[1]); } return v; } function mergeMany(h, arr) { - var len = arr.length; - for(var i = 0; i < len; ++i){ - var match = arr[i]; + let len = arr.length; + for(let i = 0; i < len; ++i){ + let match = arr[i]; set(h, match[0], match[1]); } } -var clear = Belt_internalBucketsType.clear; +let clear = Belt_internalBucketsType.clear; -var isEmpty = Belt_internalBucketsType.isEmpty; +let isEmpty = Belt_internalBucketsType.isEmpty; -var copy = Belt_internalBuckets.copy; +let copy = Belt_internalBuckets.copy; -var forEachU = Belt_internalBuckets.forEachU; +let forEachU = Belt_internalBuckets.forEachU; -var forEach = Belt_internalBuckets.forEach; +let forEach = Belt_internalBuckets.forEach; -var reduceU = Belt_internalBuckets.reduceU; +let reduceU = Belt_internalBuckets.reduceU; -var reduce = Belt_internalBuckets.reduce; +let reduce = Belt_internalBuckets.reduce; -var keepMapInPlaceU = Belt_internalBuckets.keepMapInPlaceU; +let keepMapInPlaceU = Belt_internalBuckets.keepMapInPlaceU; -var keepMapInPlace = Belt_internalBuckets.keepMapInPlace; +let keepMapInPlace = Belt_internalBuckets.keepMapInPlace; -var toArray = Belt_internalBuckets.toArray; +let toArray = Belt_internalBuckets.toArray; -var keysToArray = Belt_internalBuckets.keysToArray; +let keysToArray = Belt_internalBuckets.keysToArray; -var valuesToArray = Belt_internalBuckets.valuesToArray; +let valuesToArray = Belt_internalBuckets.valuesToArray; -var getBucketHistogram = Belt_internalBuckets.getBucketHistogram; +let getBucketHistogram = Belt_internalBuckets.getBucketHistogram; -var logStats = Belt_internalBuckets.logStats; +let logStats = Belt_internalBuckets.logStats; exports.make = make; exports.clear = clear; diff --git a/lib/js/belt_HashMapString.js b/lib/js/belt_HashMapString.js index 3a62f15254..5f088b503d 100644 --- a/lib/js/belt_HashMapString.js +++ b/lib/js/belt_HashMapString.js @@ -1,18 +1,18 @@ 'use strict'; -var Caml_option = require("./caml_option.js"); -var Caml_hash_primitive = require("./caml_hash_primitive.js"); -var Belt_internalBuckets = require("./belt_internalBuckets.js"); -var Belt_internalBucketsType = require("./belt_internalBucketsType.js"); +let Caml_option = require("./caml_option.js"); +let Caml_hash_primitive = require("./caml_hash_primitive.js"); +let Belt_internalBuckets = require("./belt_internalBuckets.js"); +let Belt_internalBucketsType = require("./belt_internalBucketsType.js"); function copyBucketReHash(h_buckets, ndata_tail, _old_bucket) { while(true) { - var old_bucket = _old_bucket; + let old_bucket = _old_bucket; if (old_bucket === undefined) { return; } - var nidx = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, old_bucket.key)) & (h_buckets.length - 1 | 0); - var tail = ndata_tail[nidx]; + let nidx = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, old_bucket.key)) & (h_buckets.length - 1 | 0); + let tail = ndata_tail[nidx]; if (tail !== undefined) { tail.next = old_bucket; } else { @@ -26,12 +26,12 @@ function copyBucketReHash(h_buckets, ndata_tail, _old_bucket) { function replaceInBucket(key, info, _cell) { while(true) { - var cell = _cell; + let cell = _cell; if (cell.key === key) { cell.value = info; return false; } - var cell$1 = cell.next; + let cell$1 = cell.next; if (cell$1 === undefined) { return true; } @@ -41,10 +41,10 @@ function replaceInBucket(key, info, _cell) { } function set(h, key, value) { - var h_buckets = h.buckets; - var buckets_len = h_buckets.length; - var i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (buckets_len - 1 | 0); - var l = h_buckets[i]; + let h_buckets = h.buckets; + let buckets_len = h_buckets.length; + let i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (buckets_len - 1 | 0); + let l = h_buckets[i]; if (l !== undefined) { if (replaceInBucket(key, value, l)) { h_buckets[i] = { @@ -64,20 +64,20 @@ function set(h, key, value) { h.size = h.size + 1 | 0; } if (h.size > (buckets_len << 1)) { - var odata = h.buckets; - var osize = odata.length; - var nsize = (osize << 1); + let odata = h.buckets; + let osize = odata.length; + let nsize = (osize << 1); if (nsize < osize) { return; } - var h_buckets$1 = new Array(nsize); - var ndata_tail = new Array(nsize); + let h_buckets$1 = new Array(nsize); + let ndata_tail = new Array(nsize); h.buckets = h_buckets$1; - for(var i$1 = 0; i$1 < osize; ++i$1){ + for(let i$1 = 0; i$1 < osize; ++i$1){ copyBucketReHash(h_buckets$1, ndata_tail, odata[i$1]); } - for(var i$2 = 0; i$2 < nsize; ++i$2){ - var tail = ndata_tail[i$2]; + for(let i$2 = 0; i$2 < nsize; ++i$2){ + let tail = ndata_tail[i$2]; if (tail !== undefined) { tail.next = undefined; } @@ -89,24 +89,24 @@ function set(h, key, value) { } function remove(h, key) { - var h_buckets = h.buckets; - var i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); - var bucket = h_buckets[i]; + let h_buckets = h.buckets; + let i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); + let bucket = h_buckets[i]; if (bucket !== undefined) { if (bucket.key === key) { h_buckets[i] = bucket.next; h.size = h.size - 1 | 0; return; } else { - var _prec = bucket; - var _buckets = bucket.next; + let _prec = bucket; + let _buckets = bucket.next; while(true) { - var buckets = _buckets; - var prec = _prec; + let buckets = _buckets; + let prec = _prec; if (buckets === undefined) { return; } - var cell_next = buckets.next; + let cell_next = buckets.next; if (buckets.key === key) { prec.next = cell_next; h.size = h.size - 1 | 0; @@ -122,30 +122,30 @@ function remove(h, key) { } function get(h, key) { - var h_buckets = h.buckets; - var nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); - var cell1 = h_buckets[nid]; + let h_buckets = h.buckets; + let nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); + let cell1 = h_buckets[nid]; if (cell1 === undefined) { return; } if (key === cell1.key) { return Caml_option.some(cell1.value); } - var cell2 = cell1.next; + let cell2 = cell1.next; if (cell2 === undefined) { return; } if (key === cell2.key) { return Caml_option.some(cell2.value); } - var cell3 = cell2.next; + let cell3 = cell2.next; if (cell3 !== undefined) { if (key === cell3.key) { return Caml_option.some(cell3.value); } else { - var _buckets = cell3.next; + let _buckets = cell3.next; while(true) { - var buckets = _buckets; + let buckets = _buckets; if (buckets === undefined) { return; } @@ -161,17 +161,17 @@ function get(h, key) { } function has(h, key) { - var h_buckets = h.buckets; - var nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); - var bucket = h_buckets[nid]; + let h_buckets = h.buckets; + let nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); + let bucket = h_buckets[nid]; if (bucket !== undefined) { - var _cell = bucket; + let _cell = bucket; while(true) { - var cell = _cell; + let cell = _cell; if (cell.key === key) { return true; } - var nextCell = cell.next; + let nextCell = cell.next; if (nextCell === undefined) { return false; } @@ -192,50 +192,50 @@ function size(h) { } function fromArray(arr) { - var len = arr.length; - var v = Belt_internalBucketsType.make(undefined, undefined, len); - for(var i = 0; i < len; ++i){ - var match = arr[i]; + let len = arr.length; + let v = Belt_internalBucketsType.make(undefined, undefined, len); + for(let i = 0; i < len; ++i){ + let match = arr[i]; set(v, match[0], match[1]); } return v; } function mergeMany(h, arr) { - var len = arr.length; - for(var i = 0; i < len; ++i){ - var match = arr[i]; + let len = arr.length; + for(let i = 0; i < len; ++i){ + let match = arr[i]; set(h, match[0], match[1]); } } -var clear = Belt_internalBucketsType.clear; +let clear = Belt_internalBucketsType.clear; -var isEmpty = Belt_internalBucketsType.isEmpty; +let isEmpty = Belt_internalBucketsType.isEmpty; -var copy = Belt_internalBuckets.copy; +let copy = Belt_internalBuckets.copy; -var forEachU = Belt_internalBuckets.forEachU; +let forEachU = Belt_internalBuckets.forEachU; -var forEach = Belt_internalBuckets.forEach; +let forEach = Belt_internalBuckets.forEach; -var reduceU = Belt_internalBuckets.reduceU; +let reduceU = Belt_internalBuckets.reduceU; -var reduce = Belt_internalBuckets.reduce; +let reduce = Belt_internalBuckets.reduce; -var keepMapInPlaceU = Belt_internalBuckets.keepMapInPlaceU; +let keepMapInPlaceU = Belt_internalBuckets.keepMapInPlaceU; -var keepMapInPlace = Belt_internalBuckets.keepMapInPlace; +let keepMapInPlace = Belt_internalBuckets.keepMapInPlace; -var toArray = Belt_internalBuckets.toArray; +let toArray = Belt_internalBuckets.toArray; -var keysToArray = Belt_internalBuckets.keysToArray; +let keysToArray = Belt_internalBuckets.keysToArray; -var valuesToArray = Belt_internalBuckets.valuesToArray; +let valuesToArray = Belt_internalBuckets.valuesToArray; -var getBucketHistogram = Belt_internalBuckets.getBucketHistogram; +let getBucketHistogram = Belt_internalBuckets.getBucketHistogram; -var logStats = Belt_internalBuckets.logStats; +let logStats = Belt_internalBuckets.logStats; exports.make = make; exports.clear = clear; diff --git a/lib/js/belt_HashSet.js b/lib/js/belt_HashSet.js index bc1a72d5fc..58f4b69710 100644 --- a/lib/js/belt_HashSet.js +++ b/lib/js/belt_HashSet.js @@ -1,16 +1,16 @@ 'use strict'; -var Belt_internalSetBuckets = require("./belt_internalSetBuckets.js"); -var Belt_internalBucketsType = require("./belt_internalBucketsType.js"); +let Belt_internalSetBuckets = require("./belt_internalSetBuckets.js"); +let Belt_internalBucketsType = require("./belt_internalBucketsType.js"); function copyBucket(hash, h_buckets, ndata_tail, _old_bucket) { while(true) { - var old_bucket = _old_bucket; + let old_bucket = _old_bucket; if (old_bucket === undefined) { return; } - var nidx = hash(old_bucket.key) & (h_buckets.length - 1 | 0); - var tail = ndata_tail[nidx]; + let nidx = hash(old_bucket.key) & (h_buckets.length - 1 | 0); + let tail = ndata_tail[nidx]; if (tail !== undefined) { tail.next = old_bucket; } else { @@ -23,25 +23,25 @@ function copyBucket(hash, h_buckets, ndata_tail, _old_bucket) { } function remove(h, key) { - var eq = h.eq; - var h_buckets = h.buckets; - var i = h.hash(key) & (h_buckets.length - 1 | 0); - var l = h_buckets[i]; + let eq = h.eq; + let h_buckets = h.buckets; + let i = h.hash(key) & (h_buckets.length - 1 | 0); + let l = h_buckets[i]; if (l === undefined) { return; } - var next_cell = l.next; + let next_cell = l.next; if (eq(l.key, key)) { h.size = h.size - 1 | 0; h_buckets[i] = next_cell; return; } else if (next_cell !== undefined) { - var _prec = l; - var _cell = next_cell; + let _prec = l; + let _cell = next_cell; while(true) { - var cell = _cell; - var prec = _prec; - var cell_next = cell.next; + let cell = _cell; + let prec = _prec; + let cell_next = cell.next; if (eq(cell.key, key)) { prec.next = cell_next; h.size = h.size - 1 | 0; @@ -61,11 +61,11 @@ function remove(h, key) { function addBucket(h, key, _cell, eq) { while(true) { - var cell = _cell; + let cell = _cell; if (eq(cell.key, key)) { return; } - var n = cell.next; + let n = cell.next; if (n !== undefined) { _cell = n; continue ; @@ -80,10 +80,10 @@ function addBucket(h, key, _cell, eq) { } function add0(h, key, hash, eq) { - var h_buckets = h.buckets; - var buckets_len = h_buckets.length; - var i = hash(key) & (buckets_len - 1 | 0); - var l = h_buckets[i]; + let h_buckets = h.buckets; + let buckets_len = h_buckets.length; + let i = hash(key) & (buckets_len - 1 | 0); + let l = h_buckets[i]; if (l !== undefined) { addBucket(h, key, l, eq); } else { @@ -94,20 +94,20 @@ function add0(h, key, hash, eq) { }; } if (h.size > (buckets_len << 1)) { - var odata = h.buckets; - var osize = odata.length; - var nsize = (osize << 1); + let odata = h.buckets; + let osize = odata.length; + let nsize = (osize << 1); if (nsize < osize) { return; } - var h_buckets$1 = new Array(nsize); - var ndata_tail = new Array(nsize); + let h_buckets$1 = new Array(nsize); + let ndata_tail = new Array(nsize); h.buckets = h_buckets$1; - for(var i$1 = 0; i$1 < osize; ++i$1){ + for(let i$1 = 0; i$1 < osize; ++i$1){ copyBucket(hash, h_buckets$1, ndata_tail, odata[i$1]); } - for(var i$2 = 0; i$2 < nsize; ++i$2){ - var tail = ndata_tail[i$2]; + for(let i$2 = 0; i$2 < nsize; ++i$2){ + let tail = ndata_tail[i$2]; if (tail !== undefined) { tail.next = undefined; } @@ -123,18 +123,18 @@ function add(h, key) { } function has(h, key) { - var eq = h.eq; - var h_buckets = h.buckets; - var nid = h.hash(key) & (h_buckets.length - 1 | 0); - var bucket = h_buckets[nid]; + let eq = h.eq; + let h_buckets = h.buckets; + let nid = h.hash(key) & (h_buckets.length - 1 | 0); + let bucket = h_buckets[nid]; if (bucket !== undefined) { - var _cell = bucket; + let _cell = bucket; while(true) { - var cell = _cell; + let cell = _cell; if (eq(cell.key, key)) { return true; } - var nextCell = cell.next; + let nextCell = cell.next; if (nextCell === undefined) { return false; } @@ -155,48 +155,48 @@ function size(h) { } function fromArray(arr, id) { - var eq = id.eq; - var hash = id.hash; - var len = arr.length; - var v = Belt_internalBucketsType.make(hash, eq, len); - for(var i = 0; i < len; ++i){ + let eq = id.eq; + let hash = id.hash; + let len = arr.length; + let v = Belt_internalBucketsType.make(hash, eq, len); + for(let i = 0; i < len; ++i){ add0(v, arr[i], hash, eq); } return v; } function mergeMany(h, arr) { - var eq = h.eq; - var hash = h.hash; - var len = arr.length; - for(var i = 0; i < len; ++i){ + let eq = h.eq; + let hash = h.hash; + let len = arr.length; + for(let i = 0; i < len; ++i){ add0(h, arr[i], hash, eq); } } -var Int; +let Int; -var $$String; +let $$String; -var clear = Belt_internalBucketsType.clear; +let clear = Belt_internalBucketsType.clear; -var isEmpty = Belt_internalBucketsType.isEmpty; +let isEmpty = Belt_internalBucketsType.isEmpty; -var copy = Belt_internalSetBuckets.copy; +let copy = Belt_internalSetBuckets.copy; -var forEachU = Belt_internalSetBuckets.forEachU; +let forEachU = Belt_internalSetBuckets.forEachU; -var forEach = Belt_internalSetBuckets.forEach; +let forEach = Belt_internalSetBuckets.forEach; -var reduceU = Belt_internalSetBuckets.reduceU; +let reduceU = Belt_internalSetBuckets.reduceU; -var reduce = Belt_internalSetBuckets.reduce; +let reduce = Belt_internalSetBuckets.reduce; -var logStats = Belt_internalSetBuckets.logStats; +let logStats = Belt_internalSetBuckets.logStats; -var toArray = Belt_internalSetBuckets.toArray; +let toArray = Belt_internalSetBuckets.toArray; -var getBucketHistogram = Belt_internalSetBuckets.getBucketHistogram; +let getBucketHistogram = Belt_internalSetBuckets.getBucketHistogram; exports.Int = Int; exports.$$String = $$String; diff --git a/lib/js/belt_HashSetInt.js b/lib/js/belt_HashSetInt.js index 0014b66db0..7762902c4d 100644 --- a/lib/js/belt_HashSetInt.js +++ b/lib/js/belt_HashSetInt.js @@ -1,17 +1,17 @@ 'use strict'; -var Caml_hash_primitive = require("./caml_hash_primitive.js"); -var Belt_internalSetBuckets = require("./belt_internalSetBuckets.js"); -var Belt_internalBucketsType = require("./belt_internalBucketsType.js"); +let Caml_hash_primitive = require("./caml_hash_primitive.js"); +let Belt_internalSetBuckets = require("./belt_internalSetBuckets.js"); +let Belt_internalBucketsType = require("./belt_internalBucketsType.js"); function copyBucket(h_buckets, ndata_tail, _old_bucket) { while(true) { - var old_bucket = _old_bucket; + let old_bucket = _old_bucket; if (old_bucket === undefined) { return; } - var nidx = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, old_bucket.key)) & (h_buckets.length - 1 | 0); - var tail = ndata_tail[nidx]; + let nidx = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, old_bucket.key)) & (h_buckets.length - 1 | 0); + let tail = ndata_tail[nidx]; if (tail !== undefined) { tail.next = old_bucket; } else { @@ -24,24 +24,24 @@ function copyBucket(h_buckets, ndata_tail, _old_bucket) { } function remove(h, key) { - var h_buckets = h.buckets; - var i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); - var l = h_buckets[i]; + let h_buckets = h.buckets; + let i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); + let l = h_buckets[i]; if (l === undefined) { return; } - var next_cell = l.next; + let next_cell = l.next; if (l.key === key) { h.size = h.size - 1 | 0; h_buckets[i] = next_cell; return; } else if (next_cell !== undefined) { - var _prec = l; - var _cell = next_cell; + let _prec = l; + let _cell = next_cell; while(true) { - var cell = _cell; - var prec = _prec; - var cell_next = cell.next; + let cell = _cell; + let prec = _prec; + let cell_next = cell.next; if (cell.key === key) { prec.next = cell_next; h.size = h.size - 1 | 0; @@ -61,11 +61,11 @@ function remove(h, key) { function addBucket(h, key, _cell) { while(true) { - var cell = _cell; + let cell = _cell; if (cell.key === key) { return; } - var n = cell.next; + let n = cell.next; if (n !== undefined) { _cell = n; continue ; @@ -80,10 +80,10 @@ function addBucket(h, key, _cell) { } function add(h, key) { - var h_buckets = h.buckets; - var buckets_len = h_buckets.length; - var i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (buckets_len - 1 | 0); - var l = h_buckets[i]; + let h_buckets = h.buckets; + let buckets_len = h_buckets.length; + let i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (buckets_len - 1 | 0); + let l = h_buckets[i]; if (l !== undefined) { addBucket(h, key, l); } else { @@ -94,20 +94,20 @@ function add(h, key) { h.size = h.size + 1 | 0; } if (h.size > (buckets_len << 1)) { - var odata = h.buckets; - var osize = odata.length; - var nsize = (osize << 1); + let odata = h.buckets; + let osize = odata.length; + let nsize = (osize << 1); if (nsize < osize) { return; } - var h_buckets$1 = new Array(nsize); - var ndata_tail = new Array(nsize); + let h_buckets$1 = new Array(nsize); + let ndata_tail = new Array(nsize); h.buckets = h_buckets$1; - for(var i$1 = 0; i$1 < osize; ++i$1){ + for(let i$1 = 0; i$1 < osize; ++i$1){ copyBucket(h_buckets$1, ndata_tail, odata[i$1]); } - for(var i$2 = 0; i$2 < nsize; ++i$2){ - var tail = ndata_tail[i$2]; + for(let i$2 = 0; i$2 < nsize; ++i$2){ + let tail = ndata_tail[i$2]; if (tail !== undefined) { tail.next = undefined; } @@ -119,17 +119,17 @@ function add(h, key) { } function has(h, key) { - var h_buckets = h.buckets; - var nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); - var bucket = h_buckets[nid]; + let h_buckets = h.buckets; + let nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); + let bucket = h_buckets[nid]; if (bucket !== undefined) { - var _cell = bucket; + let _cell = bucket; while(true) { - var cell = _cell; + let cell = _cell; if (cell.key === key) { return true; } - var nextCell = cell.next; + let nextCell = cell.next; if (nextCell === undefined) { return false; } @@ -150,40 +150,40 @@ function size(h) { } function fromArray(arr) { - var len = arr.length; - var v = Belt_internalBucketsType.make(undefined, undefined, len); - for(var i = 0; i < len; ++i){ + let len = arr.length; + let v = Belt_internalBucketsType.make(undefined, undefined, len); + for(let i = 0; i < len; ++i){ add(v, arr[i]); } return v; } function mergeMany(h, arr) { - var len = arr.length; - for(var i = 0; i < len; ++i){ + let len = arr.length; + for(let i = 0; i < len; ++i){ add(h, arr[i]); } } -var clear = Belt_internalBucketsType.clear; +let clear = Belt_internalBucketsType.clear; -var isEmpty = Belt_internalBucketsType.isEmpty; +let isEmpty = Belt_internalBucketsType.isEmpty; -var copy = Belt_internalSetBuckets.copy; +let copy = Belt_internalSetBuckets.copy; -var forEachU = Belt_internalSetBuckets.forEachU; +let forEachU = Belt_internalSetBuckets.forEachU; -var forEach = Belt_internalSetBuckets.forEach; +let forEach = Belt_internalSetBuckets.forEach; -var reduceU = Belt_internalSetBuckets.reduceU; +let reduceU = Belt_internalSetBuckets.reduceU; -var reduce = Belt_internalSetBuckets.reduce; +let reduce = Belt_internalSetBuckets.reduce; -var logStats = Belt_internalSetBuckets.logStats; +let logStats = Belt_internalSetBuckets.logStats; -var toArray = Belt_internalSetBuckets.toArray; +let toArray = Belt_internalSetBuckets.toArray; -var getBucketHistogram = Belt_internalSetBuckets.getBucketHistogram; +let getBucketHistogram = Belt_internalSetBuckets.getBucketHistogram; exports.make = make; exports.clear = clear; diff --git a/lib/js/belt_HashSetString.js b/lib/js/belt_HashSetString.js index 4b0cd0f75d..af934f57e4 100644 --- a/lib/js/belt_HashSetString.js +++ b/lib/js/belt_HashSetString.js @@ -1,17 +1,17 @@ 'use strict'; -var Caml_hash_primitive = require("./caml_hash_primitive.js"); -var Belt_internalSetBuckets = require("./belt_internalSetBuckets.js"); -var Belt_internalBucketsType = require("./belt_internalBucketsType.js"); +let Caml_hash_primitive = require("./caml_hash_primitive.js"); +let Belt_internalSetBuckets = require("./belt_internalSetBuckets.js"); +let Belt_internalBucketsType = require("./belt_internalBucketsType.js"); function copyBucket(h_buckets, ndata_tail, _old_bucket) { while(true) { - var old_bucket = _old_bucket; + let old_bucket = _old_bucket; if (old_bucket === undefined) { return; } - var nidx = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, old_bucket.key)) & (h_buckets.length - 1 | 0); - var tail = ndata_tail[nidx]; + let nidx = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, old_bucket.key)) & (h_buckets.length - 1 | 0); + let tail = ndata_tail[nidx]; if (tail !== undefined) { tail.next = old_bucket; } else { @@ -24,24 +24,24 @@ function copyBucket(h_buckets, ndata_tail, _old_bucket) { } function remove(h, key) { - var h_buckets = h.buckets; - var i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); - var l = h_buckets[i]; + let h_buckets = h.buckets; + let i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); + let l = h_buckets[i]; if (l === undefined) { return; } - var next_cell = l.next; + let next_cell = l.next; if (l.key === key) { h.size = h.size - 1 | 0; h_buckets[i] = next_cell; return; } else if (next_cell !== undefined) { - var _prec = l; - var _cell = next_cell; + let _prec = l; + let _cell = next_cell; while(true) { - var cell = _cell; - var prec = _prec; - var cell_next = cell.next; + let cell = _cell; + let prec = _prec; + let cell_next = cell.next; if (cell.key === key) { prec.next = cell_next; h.size = h.size - 1 | 0; @@ -61,11 +61,11 @@ function remove(h, key) { function addBucket(h, key, _cell) { while(true) { - var cell = _cell; + let cell = _cell; if (cell.key === key) { return; } - var n = cell.next; + let n = cell.next; if (n !== undefined) { _cell = n; continue ; @@ -80,10 +80,10 @@ function addBucket(h, key, _cell) { } function add(h, key) { - var h_buckets = h.buckets; - var buckets_len = h_buckets.length; - var i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (buckets_len - 1 | 0); - var l = h_buckets[i]; + let h_buckets = h.buckets; + let buckets_len = h_buckets.length; + let i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (buckets_len - 1 | 0); + let l = h_buckets[i]; if (l !== undefined) { addBucket(h, key, l); } else { @@ -94,20 +94,20 @@ function add(h, key) { h.size = h.size + 1 | 0; } if (h.size > (buckets_len << 1)) { - var odata = h.buckets; - var osize = odata.length; - var nsize = (osize << 1); + let odata = h.buckets; + let osize = odata.length; + let nsize = (osize << 1); if (nsize < osize) { return; } - var h_buckets$1 = new Array(nsize); - var ndata_tail = new Array(nsize); + let h_buckets$1 = new Array(nsize); + let ndata_tail = new Array(nsize); h.buckets = h_buckets$1; - for(var i$1 = 0; i$1 < osize; ++i$1){ + for(let i$1 = 0; i$1 < osize; ++i$1){ copyBucket(h_buckets$1, ndata_tail, odata[i$1]); } - for(var i$2 = 0; i$2 < nsize; ++i$2){ - var tail = ndata_tail[i$2]; + for(let i$2 = 0; i$2 < nsize; ++i$2){ + let tail = ndata_tail[i$2]; if (tail !== undefined) { tail.next = undefined; } @@ -119,17 +119,17 @@ function add(h, key) { } function has(h, key) { - var h_buckets = h.buckets; - var nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); - var bucket = h_buckets[nid]; + let h_buckets = h.buckets; + let nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); + let bucket = h_buckets[nid]; if (bucket !== undefined) { - var _cell = bucket; + let _cell = bucket; while(true) { - var cell = _cell; + let cell = _cell; if (cell.key === key) { return true; } - var nextCell = cell.next; + let nextCell = cell.next; if (nextCell === undefined) { return false; } @@ -150,40 +150,40 @@ function size(h) { } function fromArray(arr) { - var len = arr.length; - var v = Belt_internalBucketsType.make(undefined, undefined, len); - for(var i = 0; i < len; ++i){ + let len = arr.length; + let v = Belt_internalBucketsType.make(undefined, undefined, len); + for(let i = 0; i < len; ++i){ add(v, arr[i]); } return v; } function mergeMany(h, arr) { - var len = arr.length; - for(var i = 0; i < len; ++i){ + let len = arr.length; + for(let i = 0; i < len; ++i){ add(h, arr[i]); } } -var clear = Belt_internalBucketsType.clear; +let clear = Belt_internalBucketsType.clear; -var isEmpty = Belt_internalBucketsType.isEmpty; +let isEmpty = Belt_internalBucketsType.isEmpty; -var copy = Belt_internalSetBuckets.copy; +let copy = Belt_internalSetBuckets.copy; -var forEachU = Belt_internalSetBuckets.forEachU; +let forEachU = Belt_internalSetBuckets.forEachU; -var forEach = Belt_internalSetBuckets.forEach; +let forEach = Belt_internalSetBuckets.forEach; -var reduceU = Belt_internalSetBuckets.reduceU; +let reduceU = Belt_internalSetBuckets.reduceU; -var reduce = Belt_internalSetBuckets.reduce; +let reduce = Belt_internalSetBuckets.reduce; -var logStats = Belt_internalSetBuckets.logStats; +let logStats = Belt_internalSetBuckets.logStats; -var toArray = Belt_internalSetBuckets.toArray; +let toArray = Belt_internalSetBuckets.toArray; -var getBucketHistogram = Belt_internalSetBuckets.getBucketHistogram; +let getBucketHistogram = Belt_internalSetBuckets.getBucketHistogram; exports.make = make; exports.clear = clear; diff --git a/lib/js/belt_Id.js b/lib/js/belt_Id.js index 6536e3f4b5..2a855d8e40 100644 --- a/lib/js/belt_Id.js +++ b/lib/js/belt_Id.js @@ -1,14 +1,14 @@ 'use strict'; -var Curry = require("./curry.js"); +let Curry = require("./curry.js"); function MakeComparableU(M) { return M; } function MakeComparable(M) { - var cmp = M.cmp; - var cmp$1 = Curry.__2(cmp); + let cmp = M.cmp; + let cmp$1 = Curry.__2(cmp); return { cmp: cmp$1 }; @@ -21,7 +21,7 @@ function comparableU(cmp) { } function comparable(cmp) { - var cmp$1 = Curry.__2(cmp); + let cmp$1 = Curry.__2(cmp); return { cmp: cmp$1 }; @@ -32,10 +32,10 @@ function MakeHashableU(M) { } function MakeHashable(M) { - var hash = M.hash; - var hash$1 = Curry.__1(hash); - var eq = M.eq; - var eq$1 = Curry.__2(eq); + let hash = M.hash; + let hash$1 = Curry.__1(hash); + let eq = M.eq; + let eq$1 = Curry.__2(eq); return { hash: hash$1, eq: eq$1 @@ -50,8 +50,8 @@ function hashableU(hash, eq) { } function hashable(hash, eq) { - var hash$1 = Curry.__1(hash); - var eq$1 = Curry.__2(eq); + let hash$1 = Curry.__1(hash); + let eq$1 = Curry.__2(eq); return { hash: hash$1, eq: eq$1 diff --git a/lib/js/belt_Int.js b/lib/js/belt_Int.js index 63db421977..f90c0798b4 100644 --- a/lib/js/belt_Int.js +++ b/lib/js/belt_Int.js @@ -2,7 +2,7 @@ function fromString(i) { - var i$1 = parseInt(i, 10); + let i$1 = parseInt(i, 10); if (isNaN(i$1)) { return; } else { diff --git a/lib/js/belt_List.js b/lib/js/belt_List.js index ecf89d068d..650026be49 100644 --- a/lib/js/belt_List.js +++ b/lib/js/belt_List.js @@ -1,9 +1,9 @@ 'use strict'; -var Curry = require("./curry.js"); -var Belt_Array = require("./belt_Array.js"); -var Caml_option = require("./caml_option.js"); -var Belt_SortArray = require("./belt_SortArray.js"); +let Curry = require("./curry.js"); +let Belt_Array = require("./belt_Array.js"); +let Caml_option = require("./caml_option.js"); +let Belt_SortArray = require("./belt_SortArray.js"); function head(x) { if (x) { @@ -50,11 +50,11 @@ function get(x, n) { if (n < 0) { return; } else { - var _x = x; - var _n = n; + let _x = x; + let _n = n; while(true) { - var n$1 = _n; - var x$1 = _x; + let n$1 = _n; + let x$1 = _x; if (!x$1) { return; } @@ -75,11 +75,11 @@ function getExn(x, n) { Error: new Error() }; } - var _x = x; - var _n = n; + let _x = x; + let _n = n; while(true) { - var n$1 = _n; - var x$1 = _x; + let n$1 = _n; + let x$1 = _x; if (x$1) { if (n$1 === 0) { return x$1.hd; @@ -97,15 +97,15 @@ function getExn(x, n) { function partitionAux(p, _cell, _precX, _precY) { while(true) { - var precY = _precY; - var precX = _precX; - var cell = _cell; + let precY = _precY; + let precX = _precX; + let cell = _cell; if (!cell) { return; } - var t = cell.tl; - var h = cell.hd; - var next = { + let t = cell.tl; + let h = cell.hd; + let next = { hd: h, tl: /* [] */0 }; @@ -124,18 +124,18 @@ function partitionAux(p, _cell, _precX, _precY) { function splitAux(_cell, _precX, _precY) { while(true) { - var precY = _precY; - var precX = _precX; - var cell = _cell; + let precY = _precY; + let precX = _precX; + let cell = _cell; if (!cell) { return; } - var match = cell.hd; - var nextA = { + let match = cell.hd; + let nextA = { hd: match[0], tl: /* [] */0 }; - var nextB = { + let nextB = { hd: match[1], tl: /* [] */0 }; @@ -150,12 +150,12 @@ function splitAux(_cell, _precX, _precY) { function copyAuxCont(_cellX, _prec) { while(true) { - var prec = _prec; - var cellX = _cellX; + let prec = _prec; + let cellX = _cellX; if (!cellX) { return prec; } - var next = { + let next = { hd: cellX.hd, tl: /* [] */0 }; @@ -168,15 +168,15 @@ function copyAuxCont(_cellX, _prec) { function copyAuxWitFilter(f, _cellX, _prec) { while(true) { - var prec = _prec; - var cellX = _cellX; + let prec = _prec; + let cellX = _cellX; if (!cellX) { return; } - var t = cellX.tl; - var h = cellX.hd; + let t = cellX.tl; + let h = cellX.hd; if (f(h)) { - var next = { + let next = { hd: h, tl: /* [] */0 }; @@ -192,16 +192,16 @@ function copyAuxWitFilter(f, _cellX, _prec) { function copyAuxWithFilterIndex(f, _cellX, _prec, _i) { while(true) { - var i = _i; - var prec = _prec; - var cellX = _cellX; + let i = _i; + let prec = _prec; + let cellX = _cellX; if (!cellX) { return; } - var t = cellX.tl; - var h = cellX.hd; + let t = cellX.tl; + let h = cellX.hd; if (f(h, i)) { - var next = { + let next = { hd: h, tl: /* [] */0 }; @@ -219,15 +219,15 @@ function copyAuxWithFilterIndex(f, _cellX, _prec, _i) { function copyAuxWitFilterMap(f, _cellX, _prec) { while(true) { - var prec = _prec; - var cellX = _cellX; + let prec = _prec; + let cellX = _cellX; if (!cellX) { return; } - var t = cellX.tl; - var h = f(cellX.hd); + let t = cellX.tl; + let h = f(cellX.hd); if (h !== undefined) { - var next = { + let next = { hd: Caml_option.valFromOption(h), tl: /* [] */0 }; @@ -243,18 +243,18 @@ function copyAuxWitFilterMap(f, _cellX, _prec) { function removeAssocAuxWithMap(_cellX, x, _prec, f) { while(true) { - var prec = _prec; - var cellX = _cellX; + let prec = _prec; + let cellX = _cellX; if (!cellX) { return false; } - var t = cellX.tl; - var h = cellX.hd; + let t = cellX.tl; + let h = cellX.hd; if (f(h[0], x)) { prec.tl = t; return true; } - var next = { + let next = { hd: h, tl: /* [] */0 }; @@ -267,13 +267,13 @@ function removeAssocAuxWithMap(_cellX, x, _prec, f) { function setAssocAuxWithMap(_cellX, x, k, _prec, eq) { while(true) { - var prec = _prec; - var cellX = _cellX; + let prec = _prec; + let cellX = _cellX; if (!cellX) { return false; } - var t = cellX.tl; - var h = cellX.hd; + let t = cellX.tl; + let h = cellX.hd; if (eq(h[0], x)) { prec.tl = { hd: [ @@ -284,7 +284,7 @@ function setAssocAuxWithMap(_cellX, x, k, _prec, eq) { }; return true; } - var next = { + let next = { hd: h, tl: /* [] */0 }; @@ -297,12 +297,12 @@ function setAssocAuxWithMap(_cellX, x, k, _prec, eq) { function copyAuxWithMap(_cellX, _prec, f) { while(true) { - var prec = _prec; - var cellX = _cellX; + let prec = _prec; + let cellX = _cellX; if (!cellX) { return; } - var next = { + let next = { hd: f(cellX.hd), tl: /* [] */0 }; @@ -315,16 +315,16 @@ function copyAuxWithMap(_cellX, _prec, f) { function zipAux(_cellX, _cellY, _prec) { while(true) { - var prec = _prec; - var cellY = _cellY; - var cellX = _cellX; + let prec = _prec; + let cellY = _cellY; + let cellX = _cellX; if (!cellX) { return; } if (!cellY) { return; } - var next = { + let next = { hd: [ cellX.hd, cellY.hd @@ -341,16 +341,16 @@ function zipAux(_cellX, _cellY, _prec) { function copyAuxWithMap2(f, _cellX, _cellY, _prec) { while(true) { - var prec = _prec; - var cellY = _cellY; - var cellX = _cellX; + let prec = _prec; + let cellY = _cellY; + let cellX = _cellX; if (!cellX) { return; } if (!cellY) { return; } - var next = { + let next = { hd: f(cellX.hd, cellY.hd), tl: /* [] */0 }; @@ -364,13 +364,13 @@ function copyAuxWithMap2(f, _cellX, _cellY, _prec) { function copyAuxWithMapI(f, _i, _cellX, _prec) { while(true) { - var prec = _prec; - var cellX = _cellX; - var i = _i; + let prec = _prec; + let cellX = _cellX; + let i = _i; if (!cellX) { return; } - var next = { + let next = { hd: f(i, cellX.hd), tl: /* [] */0 }; @@ -384,16 +384,16 @@ function copyAuxWithMapI(f, _i, _cellX, _prec) { function takeAux(_n, _cell, _prec) { while(true) { - var prec = _prec; - var cell = _cell; - var n = _n; + let prec = _prec; + let cell = _cell; + let n = _n; if (n === 0) { return true; } if (!cell) { return false; } - var cell$1 = { + let cell$1 = { hd: cell.hd, tl: /* [] */0 }; @@ -407,16 +407,16 @@ function takeAux(_n, _cell, _prec) { function splitAtAux(_n, _cell, _prec) { while(true) { - var prec = _prec; - var cell = _cell; - var n = _n; + let prec = _prec; + let cell = _cell; + let n = _n; if (n === 0) { return cell; } if (!cell) { return; } - var cell$1 = { + let cell$1 = { hd: cell.hd, tl: /* [] */0 }; @@ -438,11 +438,11 @@ function take(lst, n) { if (!lst) { return; } - var cell = { + let cell = { hd: lst.hd, tl: /* [] */0 }; - var has = takeAux(n - 1 | 0, lst.tl, cell); + let has = takeAux(n - 1 | 0, lst.tl, cell); if (has) { return cell; } @@ -453,11 +453,11 @@ function drop(lst, n) { if (n < 0) { return; } else { - var _l = lst; - var _n = n; + let _l = lst; + let _n = n; while(true) { - var n$1 = _n; - var l = _l; + let n$1 = _n; + let l = _l; if (n$1 === 0) { return l; } @@ -484,11 +484,11 @@ function splitAt(lst, n) { if (!lst) { return; } - var cell = { + let cell = { hd: lst.hd, tl: /* [] */0 }; - var rest = splitAtAux(n - 1 | 0, lst.tl, cell); + let rest = splitAtAux(n - 1 | 0, lst.tl, cell); if (rest !== undefined) { return [ cell, @@ -502,7 +502,7 @@ function concat(xs, ys) { if (!xs) { return ys; } - var cell = { + let cell = { hd: xs.hd, tl: /* [] */0 }; @@ -514,7 +514,7 @@ function mapU(xs, f) { if (!xs) { return /* [] */0; } - var cell = { + let cell = { hd: f(xs.hd), tl: /* [] */0 }; @@ -533,7 +533,7 @@ function zipByU(l1, l2, f) { if (!l2) { return /* [] */0; } - var cell = { + let cell = { hd: f(l1.hd, l2.hd), tl: /* [] */0 }; @@ -549,7 +549,7 @@ function mapWithIndexU(xs, f) { if (!xs) { return /* [] */0; } - var cell = { + let cell = { hd: f(0, xs.hd), tl: /* [] */0 }; @@ -565,14 +565,14 @@ function makeByU(n, f) { if (n <= 0) { return /* [] */0; } - var headX = { + let headX = { hd: f(0), tl: /* [] */0 }; - var cur = headX; - var i = 1; + let cur = headX; + let i = 1; while(i < n) { - var v = { + let v = { hd: f(i), tl: /* [] */0 }; @@ -591,14 +591,14 @@ function make(n, v) { if (n <= 0) { return /* [] */0; } - var headX = { + let headX = { hd: v, tl: /* [] */0 }; - var cur = headX; - var i = 1; + let cur = headX; + let i = 1; while(i < n) { - var v$1 = { + let v$1 = { hd: v, tl: /* [] */0 }; @@ -610,11 +610,11 @@ function make(n, v) { } function length(xs) { - var _x = xs; - var _acc = 0; + let _x = xs; + let _acc = 0; while(true) { - var acc = _acc; - var x = _x; + let acc = _acc; + let x = _x; if (!x) { return acc; } @@ -626,8 +626,8 @@ function length(xs) { function fillAux(arr, _i, _x) { while(true) { - var x = _x; - var i = _i; + let x = _x; + let i = _i; if (!x) { return; } @@ -639,11 +639,11 @@ function fillAux(arr, _i, _x) { } function fromArray(a) { - var _i = a.length - 1 | 0; - var _res = /* [] */0; + let _i = a.length - 1 | 0; + let _res = /* [] */0; while(true) { - var res = _res; - var i = _i; + let res = _res; + let i = _i; if (i < 0) { return res; } @@ -657,22 +657,22 @@ function fromArray(a) { } function toArray(x) { - var len = length(x); - var arr = new Array(len); + let len = length(x); + let arr = new Array(len); fillAux(arr, 0, x); return arr; } function shuffle(xs) { - var v = toArray(xs); + let v = toArray(xs); Belt_Array.shuffleInPlace(v); return fromArray(v); } function reverseConcat(_l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { return l2; } @@ -691,8 +691,8 @@ function reverse(l) { function flattenAux(_prec, _xs) { while(true) { - var xs = _xs; - var prec = _prec; + let xs = _xs; + let prec = _prec; if (xs) { _xs = xs.tl; _prec = copyAuxCont(xs.hd, prec); @@ -705,13 +705,13 @@ function flattenAux(_prec, _xs) { function flatten(_xs) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return /* [] */0; } - var match = xs.hd; + let match = xs.hd; if (match) { - var cell = { + let cell = { hd: match.hd, tl: /* [] */0 }; @@ -724,27 +724,27 @@ function flatten(_xs) { } function concatMany(xs) { - var len = xs.length; + let len = xs.length; if (len === 1) { return xs[0]; } if (len === 0) { return /* [] */0; } - var len$1 = xs.length; - var v = xs[len$1 - 1 | 0]; - for(var i = len$1 - 2 | 0; i >= 0; --i){ + let len$1 = xs.length; + let v = xs[len$1 - 1 | 0]; + for(let i = len$1 - 2 | 0; i >= 0; --i){ v = concat(xs[i], v); } return v; } function mapReverseU(l, f) { - var _accu = /* [] */0; - var _xs = l; + let _accu = /* [] */0; + let _xs = l; while(true) { - var xs = _xs; - var accu = _accu; + let xs = _xs; + let accu = _accu; if (!xs) { return accu; } @@ -763,7 +763,7 @@ function mapReverse(l, f) { function forEachU(_xs, f) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return; } @@ -778,11 +778,11 @@ function forEach(xs, f) { } function forEachWithIndexU(l, f) { - var _xs = l; - var _i = 0; + let _xs = l; + let _i = 0; while(true) { - var i = _i; - var xs = _xs; + let i = _i; + let xs = _xs; if (!xs) { return; } @@ -799,8 +799,8 @@ function forEachWithIndex(l, f) { function reduceU(_l, _accu, f) { while(true) { - var accu = _accu; - var l = _l; + let accu = _accu; + let l = _l; if (!l) { return accu; } @@ -823,7 +823,7 @@ function reduceReverseUnsafeU(l, accu, f) { } function reduceReverseU(l, acc, f) { - var len = length(l); + let len = length(l); if (len < 1000) { return reduceReverseUnsafeU(l, acc, f); } else { @@ -836,13 +836,13 @@ function reduceReverse(l, accu, f) { } function reduceWithIndexU(l, acc, f) { - var _l = l; - var _acc = acc; - var _i = 0; + let _l = l; + let _acc = acc; + let _i = 0; while(true) { - var i = _i; - var acc$1 = _acc; - var l$1 = _l; + let i = _i; + let acc$1 = _acc; + let l$1 = _l; if (!l$1) { return acc$1; } @@ -858,13 +858,13 @@ function reduceWithIndex(l, acc, f) { } function mapReverse2U(l1, l2, f) { - var _l1 = l1; - var _l2 = l2; - var _accu = /* [] */0; + let _l1 = l1; + let _l2 = l2; + let _accu = /* [] */0; while(true) { - var accu = _accu; - var l2$1 = _l2; - var l1$1 = _l1; + let accu = _accu; + let l2$1 = _l2; + let l1$1 = _l1; if (!l1$1) { return accu; } @@ -887,8 +887,8 @@ function mapReverse2(l1, l2, f) { function forEach2U(_l1, _l2, f) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { return; } @@ -908,9 +908,9 @@ function forEach2(l1, l2, f) { function reduce2U(_l1, _l2, _accu, f) { while(true) { - var accu = _accu; - var l2 = _l2; - var l1 = _l1; + let accu = _accu; + let l2 = _l2; + let l1 = _l1; if (!l1) { return accu; } @@ -937,7 +937,7 @@ function reduceReverse2UnsafeU(l1, l2, accu, f) { } function reduceReverse2U(l1, l2, acc, f) { - var len = length(l1); + let len = length(l1); if (len < 1000) { return reduceReverse2UnsafeU(l1, l2, acc, f); } else { @@ -951,7 +951,7 @@ function reduceReverse2(l1, l2, acc, f) { function everyU(_xs, p) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return true; } @@ -969,7 +969,7 @@ function every(xs, p) { function someU(_xs, p) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return false; } @@ -987,8 +987,8 @@ function some(xs, p) { function every2U(_l1, _l2, p) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { return true; } @@ -1010,8 +1010,8 @@ function every2(l1, l2, p) { function cmpByLength(_l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { if (l2) { return -1; @@ -1030,8 +1030,8 @@ function cmpByLength(_l1, _l2) { function cmpU(_l1, _l2, p) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { if (l2) { return -1; @@ -1042,7 +1042,7 @@ function cmpU(_l1, _l2, p) { if (!l2) { return 1; } - var c = p(l1.hd, l2.hd); + let c = p(l1.hd, l2.hd); if (c !== 0) { return c; } @@ -1058,8 +1058,8 @@ function cmp(l1, l2, f) { function eqU(_l1, _l2, p) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { if (l2) { return false; @@ -1085,8 +1085,8 @@ function eq(l1, l2, f) { function some2U(_l1, _l2, p) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { return false; } @@ -1108,7 +1108,7 @@ function some2(l1, l2, p) { function hasU(_xs, x, eq) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return false; } @@ -1126,11 +1126,11 @@ function has(xs, x, eq) { function getAssocU(_xs, x, eq) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return; } - var match = xs.hd; + let match = xs.hd; if (eq(match[0], x)) { return Caml_option.some(match[1]); } @@ -1145,7 +1145,7 @@ function getAssoc(xs, x, eq) { function hasAssocU(_xs, x, eq) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return false; } @@ -1165,16 +1165,16 @@ function removeAssocU(xs, x, eq) { if (!xs) { return /* [] */0; } - var l = xs.tl; - var pair = xs.hd; + let l = xs.tl; + let pair = xs.hd; if (eq(pair[0], x)) { return l; } - var cell = { + let cell = { hd: pair, tl: /* [] */0 }; - var removed = removeAssocAuxWithMap(l, x, cell, eq); + let removed = removeAssocAuxWithMap(l, x, cell, eq); if (removed) { return cell; } else { @@ -1196,8 +1196,8 @@ function setAssocU(xs, x, k, eq) { tl: /* [] */0 }; } - var l = xs.tl; - var pair = xs.hd; + let l = xs.tl; + let pair = xs.hd; if (eq(pair[0], x)) { return { hd: [ @@ -1207,11 +1207,11 @@ function setAssocU(xs, x, k, eq) { tl: l }; } - var cell = { + let cell = { hd: pair, tl: /* [] */0 }; - var replaced = setAssocAuxWithMap(l, x, k, cell, eq); + let replaced = setAssocAuxWithMap(l, x, k, cell, eq); if (replaced) { return cell; } else { @@ -1230,7 +1230,7 @@ function setAssoc(xs, x, k, eq) { } function sortU(xs, cmp) { - var arr = toArray(xs); + let arr = toArray(xs); Belt_SortArray.stableSortInPlaceByU(arr, cmp); return fromArray(arr); } @@ -1241,11 +1241,11 @@ function sort(xs, cmp) { function getByU(_xs, p) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return; } - var x = xs.hd; + let x = xs.hd; if (p(x)) { return Caml_option.some(x); } @@ -1260,14 +1260,14 @@ function getBy(xs, p) { function keepU(_xs, p) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return /* [] */0; } - var t = xs.tl; - var h = xs.hd; + let t = xs.tl; + let h = xs.hd; if (p(h)) { - var cell = { + let cell = { hd: h, tl: /* [] */0 }; @@ -1284,18 +1284,18 @@ function keep(xs, p) { } function keepWithIndexU(xs, p) { - var _xs = xs; - var _i = 0; + let _xs = xs; + let _i = 0; while(true) { - var i = _i; - var xs$1 = _xs; + let i = _i; + let xs$1 = _xs; if (!xs$1) { return /* [] */0; } - var t = xs$1.tl; - var h = xs$1.hd; + let t = xs$1.tl; + let h = xs$1.hd; if (p(h, i)) { - var cell = { + let cell = { hd: h, tl: /* [] */0 }; @@ -1314,14 +1314,14 @@ function keepWithIndex(xs, p) { function keepMapU(_xs, p) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return /* [] */0; } - var t = xs.tl; - var h = p(xs.hd); + let t = xs.tl; + let h = p(xs.hd); if (h !== undefined) { - var cell = { + let cell = { hd: Caml_option.valFromOption(h), tl: /* [] */0 }; @@ -1344,16 +1344,16 @@ function partitionU(l, p) { /* [] */0 ]; } - var h = l.hd; - var nextX = { + let h = l.hd; + let nextX = { hd: h, tl: /* [] */0 }; - var nextY = { + let nextY = { hd: h, tl: /* [] */0 }; - var b = p(h); + let b = p(h); partitionAux(p, l.tl, nextX, nextY); if (b) { return [ @@ -1379,12 +1379,12 @@ function unzip(xs) { /* [] */0 ]; } - var match = xs.hd; - var cellX = { + let match = xs.hd; + let cellX = { hd: match[0], tl: /* [] */0 }; - var cellY = { + let cellY = { hd: match[1], tl: /* [] */0 }; @@ -1402,7 +1402,7 @@ function zip(l1, l2) { if (!l2) { return /* [] */0; } - var cell = { + let cell = { hd: [ l1.hd, l2.hd @@ -1413,11 +1413,11 @@ function zip(l1, l2) { return cell; } -var size = length; +let size = length; -var filter = keep; +let filter = keep; -var filterWithIndex = keepWithIndex; +let filterWithIndex = keepWithIndex; exports.length = length; exports.size = size; diff --git a/lib/js/belt_Map.js b/lib/js/belt_Map.js index 29b1912b38..eb96116851 100644 --- a/lib/js/belt_Map.js +++ b/lib/js/belt_Map.js @@ -1,10 +1,10 @@ 'use strict'; -var Curry = require("./curry.js"); -var Belt_MapDict = require("./belt_MapDict.js"); +let Curry = require("./curry.js"); +let Belt_MapDict = require("./belt_MapDict.js"); function fromArray(data, id) { - var cmp = id.cmp; + let cmp = id.cmp; return { cmp: cmp, data: Belt_MapDict.fromArray(data, cmp) @@ -12,9 +12,9 @@ function fromArray(data, id) { } function remove(m, x) { - var odata = m.data; - var cmp = m.cmp; - var newData = Belt_MapDict.remove(odata, x, cmp); + let odata = m.data; + let cmp = m.cmp; + let newData = Belt_MapDict.remove(odata, x, cmp); if (newData === odata) { return m; } else { @@ -26,8 +26,8 @@ function remove(m, x) { } function removeMany(m, x) { - var cmp = m.cmp; - var newData = Belt_MapDict.removeMany(m.data, x, cmp); + let cmp = m.cmp; + let newData = Belt_MapDict.removeMany(m.data, x, cmp); return { cmp: cmp, data: newData @@ -35,7 +35,7 @@ function removeMany(m, x) { } function set(m, key, d) { - var cmp = m.cmp; + let cmp = m.cmp; return { cmp: cmp, data: Belt_MapDict.set(m.data, key, d, cmp) @@ -43,7 +43,7 @@ function set(m, key, d) { } function mergeMany(m, e) { - var cmp = m.cmp; + let cmp = m.cmp; return { cmp: cmp, data: Belt_MapDict.mergeMany(m.data, e, cmp) @@ -51,7 +51,7 @@ function mergeMany(m, e) { } function updateU(m, key, f) { - var cmp = m.cmp; + let cmp = m.cmp; return { cmp: cmp, data: Belt_MapDict.updateU(m.data, key, f, cmp) @@ -63,9 +63,9 @@ function update(m, key, f) { } function split(m, x) { - var cmp = m.cmp; - var match = Belt_MapDict.split(m.data, x, cmp); - var match$1 = match[0]; + let cmp = m.cmp; + let match = Belt_MapDict.split(m.data, x, cmp); + let match$1 = match[0]; return [ [ { @@ -82,7 +82,7 @@ function split(m, x) { } function mergeU(s1, s2, f) { - var cmp = s1.cmp; + let cmp = s1.cmp; return { cmp: cmp, data: Belt_MapDict.mergeU(s1.data, s2.data, f, cmp) @@ -156,8 +156,8 @@ function keep(m, f) { } function partitionU(m, p) { - var cmp = m.cmp; - var match = Belt_MapDict.partitionU(m.data, p); + let cmp = m.cmp; + let match = Belt_MapDict.partitionU(m.data, p); return [ { cmp: cmp, @@ -293,7 +293,7 @@ function getData(m) { } function getId(m) { - var cmp = m.cmp; + let cmp = m.cmp; return { cmp: cmp }; @@ -306,11 +306,11 @@ function packIdData(id, data) { }; } -var Int; +let Int; -var $$String; +let $$String; -var Dict; +let Dict; exports.Int = Int; exports.$$String = $$String; diff --git a/lib/js/belt_MapDict.js b/lib/js/belt_MapDict.js index b49b728613..bbaf44782c 100644 --- a/lib/js/belt_MapDict.js +++ b/lib/js/belt_MapDict.js @@ -1,21 +1,21 @@ 'use strict'; -var Curry = require("./curry.js"); -var Caml_option = require("./caml_option.js"); -var Belt_internalAVLtree = require("./belt_internalAVLtree.js"); +let Curry = require("./curry.js"); +let Caml_option = require("./caml_option.js"); +let Belt_internalAVLtree = require("./belt_internalAVLtree.js"); function set(t, newK, newD, cmp) { if (t === undefined) { return Belt_internalAVLtree.singleton(newK, newD); } - var k = t.k; - var c = cmp(newK, k); + let k = t.k; + let c = cmp(newK, k); if (c === 0) { return Belt_internalAVLtree.updateValue(t, newD); } - var l = t.l; - var r = t.r; - var v = t.v; + let l = t.l; + let r = t.r; + let v = t.v; if (c < 0) { return Belt_internalAVLtree.bal(set(l, newK, newD, cmp), k, v, r); } else { @@ -25,49 +25,49 @@ function set(t, newK, newD, cmp) { function updateU(t, newK, f, cmp) { if (t !== undefined) { - var k = t.k; - var c = cmp(newK, k); + let k = t.k; + let c = cmp(newK, k); if (c === 0) { - var newD = f(Caml_option.some(t.v)); + let newD = f(Caml_option.some(t.v)); if (newD !== undefined) { return Belt_internalAVLtree.updateValue(t, Caml_option.valFromOption(newD)); } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (l === undefined) { return r; } if (r === undefined) { return l; } - var kr = { + let kr = { contents: r.k }; - var vr = { + let vr = { contents: r.v }; - var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); + let r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1); } - var l$1 = t.l; - var r$2 = t.r; - var v = t.v; + let l$1 = t.l; + let r$2 = t.r; + let v = t.v; if (c < 0) { - var ll = updateU(l$1, newK, f, cmp); + let ll = updateU(l$1, newK, f, cmp); if (l$1 === ll) { return t; } else { return Belt_internalAVLtree.bal(ll, k, v, r$2); } } - var rr = updateU(r$2, newK, f, cmp); + let rr = updateU(r$2, newK, f, cmp); if (r$2 === rr) { return t; } else { return Belt_internalAVLtree.bal(l$1, k, v, rr); } } - var newD$1 = f(undefined); + let newD$1 = f(undefined); if (newD$1 !== undefined) { return Belt_internalAVLtree.singleton(newK, Caml_option.valFromOption(newD$1)); } else { @@ -80,10 +80,10 @@ function update(t, newK, f, cmp) { } function removeAux0(n, x, cmp) { - var v = n.k; - var l = n.l; - var r = n.r; - var c = cmp(x, v); + let v = n.k; + let l = n.l; + let r = n.r; + let c = cmp(x, v); if (c === 0) { if (l === undefined) { return r; @@ -91,20 +91,20 @@ function removeAux0(n, x, cmp) { if (r === undefined) { return l; } - var kr = { + let kr = { contents: r.k }; - var vr = { + let vr = { contents: r.v }; - var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); + let r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1); } if (c < 0) { if (l === undefined) { return n; } - var ll = removeAux0(l, x, cmp); + let ll = removeAux0(l, x, cmp); if (ll === l) { return n; } else { @@ -114,7 +114,7 @@ function removeAux0(n, x, cmp) { if (r === undefined) { return n; } - var rr = removeAux0(r, x, cmp); + let rr = removeAux0(r, x, cmp); if (rr === r) { return n; } else { @@ -130,21 +130,21 @@ function remove(n, x, cmp) { } function mergeMany(h, arr, cmp) { - var len = arr.length; - var v = h; - for(var i = 0; i < len; ++i){ - var match = arr[i]; + let len = arr.length; + let v = h; + for(let i = 0; i < len; ++i){ + let match = arr[i]; v = set(v, match[0], match[1], cmp); } return v; } function splitAuxPivot(n, x, pres, cmp) { - var v = n.k; - var d = n.v; - var l = n.l; - var r = n.r; - var c = cmp(x, v); + let v = n.k; + let d = n.v; + let l = n.l; + let r = n.r; + let c = cmp(x, v); if (c === 0) { pres.contents = Caml_option.some(d); return [ @@ -159,7 +159,7 @@ function splitAuxPivot(n, x, pres, cmp) { n ]; } - var match = splitAuxPivot(l, x, pres, cmp); + let match = splitAuxPivot(l, x, pres, cmp); return [ match[0], Belt_internalAVLtree.join(match[1], v, d, r) @@ -171,7 +171,7 @@ function splitAuxPivot(n, x, pres, cmp) { undefined ]; } - var match$1 = splitAuxPivot(r, x, pres, cmp); + let match$1 = splitAuxPivot(r, x, pres, cmp); return [ Belt_internalAVLtree.join(l, v, d, match$1[0]), match$1[1] @@ -188,10 +188,10 @@ function split(n, x, cmp) { undefined ]; } - var pres = { + let pres = { contents: undefined }; - var v = splitAuxPivot(n, x, pres, cmp); + let v = splitAuxPivot(n, x, pres, cmp); return [ v, pres.contents @@ -214,32 +214,32 @@ function mergeU(s1, s2, f, cmp) { })); } if (s1.h >= s2.h) { - var v1 = s1.k; - var d1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var d2 = { + let v1 = s1.k; + let d1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let d2 = { contents: undefined }; - var match = splitAuxPivot(s2, v1, d2, cmp); - var d2$1 = d2.contents; - var newLeft = mergeU(l1, match[0], f, cmp); - var newD = f(v1, Caml_option.some(d1), d2$1); - var newRight = mergeU(r1, match[1], f, cmp); + let match = splitAuxPivot(s2, v1, d2, cmp); + let d2$1 = d2.contents; + let newLeft = mergeU(l1, match[0], f, cmp); + let newD = f(v1, Caml_option.some(d1), d2$1); + let newRight = mergeU(r1, match[1], f, cmp); return Belt_internalAVLtree.concatOrJoin(newLeft, v1, newD, newRight); } - var v2 = s2.k; - var d2$2 = s2.v; - var l2 = s2.l; - var r2 = s2.r; - var d1$1 = { + let v2 = s2.k; + let d2$2 = s2.v; + let l2 = s2.l; + let r2 = s2.r; + let d1$1 = { contents: undefined }; - var match$1 = splitAuxPivot(s1, v2, d1$1, cmp); - var d1$2 = d1$1.contents; - var newLeft$1 = mergeU(match$1[0], l2, f, cmp); - var newD$1 = f(v2, d1$2, Caml_option.some(d2$2)); - var newRight$1 = mergeU(match$1[1], r2, f, cmp); + let match$1 = splitAuxPivot(s1, v2, d1$1, cmp); + let d1$2 = d1$1.contents; + let newLeft$1 = mergeU(match$1[0], l2, f, cmp); + let newD$1 = f(v2, d1$2, Caml_option.some(d2$2)); + let newRight$1 = mergeU(match$1[1], r2, f, cmp); return Belt_internalAVLtree.concatOrJoin(newLeft$1, v2, newD$1, newRight$1); } @@ -248,18 +248,18 @@ function merge(s1, s2, f, cmp) { } function removeMany(t, keys, cmp) { - var len = keys.length; + let len = keys.length; if (t !== undefined) { - var _t = t; - var _i = 0; + let _t = t; + let _i = 0; while(true) { - var i = _i; - var t$1 = _t; + let i = _i; + let t$1 = _t; if (i >= len) { return t$1; } - var ele = keys[i]; - var u = removeAux0(t$1, ele, cmp); + let ele = keys[i]; + let u = removeAux0(t$1, ele, cmp); if (u === undefined) { return u; } @@ -271,93 +271,93 @@ function removeMany(t, keys, cmp) { } -var empty; +let empty; -var isEmpty = Belt_internalAVLtree.isEmpty; +let isEmpty = Belt_internalAVLtree.isEmpty; -var has = Belt_internalAVLtree.has; +let has = Belt_internalAVLtree.has; -var cmpU = Belt_internalAVLtree.cmpU; +let cmpU = Belt_internalAVLtree.cmpU; -var cmp = Belt_internalAVLtree.cmp; +let cmp = Belt_internalAVLtree.cmp; -var eqU = Belt_internalAVLtree.eqU; +let eqU = Belt_internalAVLtree.eqU; -var eq = Belt_internalAVLtree.eq; +let eq = Belt_internalAVLtree.eq; -var findFirstByU = Belt_internalAVLtree.findFirstByU; +let findFirstByU = Belt_internalAVLtree.findFirstByU; -var findFirstBy = Belt_internalAVLtree.findFirstBy; +let findFirstBy = Belt_internalAVLtree.findFirstBy; -var forEachU = Belt_internalAVLtree.forEachU; +let forEachU = Belt_internalAVLtree.forEachU; -var forEach = Belt_internalAVLtree.forEach; +let forEach = Belt_internalAVLtree.forEach; -var reduceU = Belt_internalAVLtree.reduceU; +let reduceU = Belt_internalAVLtree.reduceU; -var reduce = Belt_internalAVLtree.reduce; +let reduce = Belt_internalAVLtree.reduce; -var everyU = Belt_internalAVLtree.everyU; +let everyU = Belt_internalAVLtree.everyU; -var every = Belt_internalAVLtree.every; +let every = Belt_internalAVLtree.every; -var someU = Belt_internalAVLtree.someU; +let someU = Belt_internalAVLtree.someU; -var some = Belt_internalAVLtree.some; +let some = Belt_internalAVLtree.some; -var size = Belt_internalAVLtree.size; +let size = Belt_internalAVLtree.size; -var toList = Belt_internalAVLtree.toList; +let toList = Belt_internalAVLtree.toList; -var toArray = Belt_internalAVLtree.toArray; +let toArray = Belt_internalAVLtree.toArray; -var fromArray = Belt_internalAVLtree.fromArray; +let fromArray = Belt_internalAVLtree.fromArray; -var keysToArray = Belt_internalAVLtree.keysToArray; +let keysToArray = Belt_internalAVLtree.keysToArray; -var valuesToArray = Belt_internalAVLtree.valuesToArray; +let valuesToArray = Belt_internalAVLtree.valuesToArray; -var minKey = Belt_internalAVLtree.minKey; +let minKey = Belt_internalAVLtree.minKey; -var minKeyUndefined = Belt_internalAVLtree.minKeyUndefined; +let minKeyUndefined = Belt_internalAVLtree.minKeyUndefined; -var maxKey = Belt_internalAVLtree.maxKey; +let maxKey = Belt_internalAVLtree.maxKey; -var maxKeyUndefined = Belt_internalAVLtree.maxKeyUndefined; +let maxKeyUndefined = Belt_internalAVLtree.maxKeyUndefined; -var minimum = Belt_internalAVLtree.minimum; +let minimum = Belt_internalAVLtree.minimum; -var minUndefined = Belt_internalAVLtree.minUndefined; +let minUndefined = Belt_internalAVLtree.minUndefined; -var maximum = Belt_internalAVLtree.maximum; +let maximum = Belt_internalAVLtree.maximum; -var maxUndefined = Belt_internalAVLtree.maxUndefined; +let maxUndefined = Belt_internalAVLtree.maxUndefined; -var get = Belt_internalAVLtree.get; +let get = Belt_internalAVLtree.get; -var getUndefined = Belt_internalAVLtree.getUndefined; +let getUndefined = Belt_internalAVLtree.getUndefined; -var getWithDefault = Belt_internalAVLtree.getWithDefault; +let getWithDefault = Belt_internalAVLtree.getWithDefault; -var getExn = Belt_internalAVLtree.getExn; +let getExn = Belt_internalAVLtree.getExn; -var checkInvariantInternal = Belt_internalAVLtree.checkInvariantInternal; +let checkInvariantInternal = Belt_internalAVLtree.checkInvariantInternal; -var keepU = Belt_internalAVLtree.keepSharedU; +let keepU = Belt_internalAVLtree.keepSharedU; -var keep = Belt_internalAVLtree.keepShared; +let keep = Belt_internalAVLtree.keepShared; -var partitionU = Belt_internalAVLtree.partitionSharedU; +let partitionU = Belt_internalAVLtree.partitionSharedU; -var partition = Belt_internalAVLtree.partitionShared; +let partition = Belt_internalAVLtree.partitionShared; -var mapU = Belt_internalAVLtree.mapU; +let mapU = Belt_internalAVLtree.mapU; -var map = Belt_internalAVLtree.map; +let map = Belt_internalAVLtree.map; -var mapWithKeyU = Belt_internalAVLtree.mapWithKeyU; +let mapWithKeyU = Belt_internalAVLtree.mapWithKeyU; -var mapWithKey = Belt_internalAVLtree.mapWithKey; +let mapWithKey = Belt_internalAVLtree.mapWithKey; exports.empty = empty; exports.isEmpty = isEmpty; diff --git a/lib/js/belt_MapInt.js b/lib/js/belt_MapInt.js index 05bcf2fd5e..be80d04159 100644 --- a/lib/js/belt_MapInt.js +++ b/lib/js/belt_MapInt.js @@ -1,19 +1,19 @@ 'use strict'; -var Curry = require("./curry.js"); -var Caml_option = require("./caml_option.js"); -var Belt_internalMapInt = require("./belt_internalMapInt.js"); -var Belt_internalAVLtree = require("./belt_internalAVLtree.js"); +let Curry = require("./curry.js"); +let Caml_option = require("./caml_option.js"); +let Belt_internalMapInt = require("./belt_internalMapInt.js"); +let Belt_internalAVLtree = require("./belt_internalAVLtree.js"); function set(t, newK, newD) { if (t === undefined) { return Belt_internalAVLtree.singleton(newK, newD); } - var k = t.k; + let k = t.k; if (newK === k) { return Belt_internalAVLtree.updateValue(t, newD); } - var v = t.v; + let v = t.v; if (newK < k) { return Belt_internalAVLtree.bal(set(t.l, newK, newD), k, v, t.r); } else { @@ -23,48 +23,48 @@ function set(t, newK, newD) { function updateU(t, x, f) { if (t !== undefined) { - var k = t.k; + let k = t.k; if (x === k) { - var data = f(Caml_option.some(t.v)); + let data = f(Caml_option.some(t.v)); if (data !== undefined) { return Belt_internalAVLtree.updateValue(t, Caml_option.valFromOption(data)); } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (l === undefined) { return r; } if (r === undefined) { return l; } - var kr = { + let kr = { contents: r.k }; - var vr = { + let vr = { contents: r.v }; - var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); + let r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1); } - var v = t.v; - var l$1 = t.l; - var r$2 = t.r; + let v = t.v; + let l$1 = t.l; + let r$2 = t.r; if (x < k) { - var ll = updateU(l$1, x, f); + let ll = updateU(l$1, x, f); if (l$1 === ll) { return t; } else { return Belt_internalAVLtree.bal(ll, k, v, r$2); } } - var rr = updateU(r$2, x, f); + let rr = updateU(r$2, x, f); if (r$2 === rr) { return t; } else { return Belt_internalAVLtree.bal(l$1, k, v, rr); } } - var data$1 = f(undefined); + let data$1 = f(undefined); if (data$1 !== undefined) { return Belt_internalAVLtree.singleton(x, Caml_option.valFromOption(data$1)); } else { @@ -77,9 +77,9 @@ function update(t, x, f) { } function removeAux(n, x) { - var v = n.k; - var l = n.l; - var r = n.r; + let v = n.k; + let l = n.l; + let r = n.r; if (x === v) { if (l === undefined) { return r; @@ -87,20 +87,20 @@ function removeAux(n, x) { if (r === undefined) { return l; } - var kr = { + let kr = { contents: r.k }; - var vr = { + let vr = { contents: r.v }; - var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); + let r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1); } if (x < v) { if (l === undefined) { return n; } - var ll = removeAux(l, x); + let ll = removeAux(l, x); if (ll === l) { return n; } else { @@ -110,7 +110,7 @@ function removeAux(n, x) { if (r === undefined) { return n; } - var rr = removeAux(r, x); + let rr = removeAux(r, x); return Belt_internalAVLtree.bal(l, v, n.v, rr); } @@ -122,18 +122,18 @@ function remove(n, x) { } function removeMany(t, keys) { - var len = keys.length; + let len = keys.length; if (t !== undefined) { - var _t = t; - var _i = 0; + let _t = t; + let _i = 0; while(true) { - var i = _i; - var t$1 = _t; + let i = _i; + let t$1 = _t; if (i >= len) { return t$1; } - var ele = keys[i]; - var u = removeAux(t$1, ele); + let ele = keys[i]; + let u = removeAux(t$1, ele); if (u === undefined) { return u; } @@ -146,108 +146,108 @@ function removeMany(t, keys) { } function mergeMany(h, arr) { - var len = arr.length; - var v = h; - for(var i = 0; i < len; ++i){ - var match = arr[i]; + let len = arr.length; + let v = h; + for(let i = 0; i < len; ++i){ + let match = arr[i]; v = set(v, match[0], match[1]); } return v; } -var empty; +let empty; -var isEmpty = Belt_internalAVLtree.isEmpty; +let isEmpty = Belt_internalAVLtree.isEmpty; -var has = Belt_internalMapInt.has; +let has = Belt_internalMapInt.has; -var cmpU = Belt_internalMapInt.cmpU; +let cmpU = Belt_internalMapInt.cmpU; -var cmp = Belt_internalMapInt.cmp; +let cmp = Belt_internalMapInt.cmp; -var eqU = Belt_internalMapInt.eqU; +let eqU = Belt_internalMapInt.eqU; -var eq = Belt_internalMapInt.eq; +let eq = Belt_internalMapInt.eq; -var findFirstByU = Belt_internalAVLtree.findFirstByU; +let findFirstByU = Belt_internalAVLtree.findFirstByU; -var findFirstBy = Belt_internalAVLtree.findFirstBy; +let findFirstBy = Belt_internalAVLtree.findFirstBy; -var forEachU = Belt_internalAVLtree.forEachU; +let forEachU = Belt_internalAVLtree.forEachU; -var forEach = Belt_internalAVLtree.forEach; +let forEach = Belt_internalAVLtree.forEach; -var reduceU = Belt_internalAVLtree.reduceU; +let reduceU = Belt_internalAVLtree.reduceU; -var reduce = Belt_internalAVLtree.reduce; +let reduce = Belt_internalAVLtree.reduce; -var everyU = Belt_internalAVLtree.everyU; +let everyU = Belt_internalAVLtree.everyU; -var every = Belt_internalAVLtree.every; +let every = Belt_internalAVLtree.every; -var someU = Belt_internalAVLtree.someU; +let someU = Belt_internalAVLtree.someU; -var some = Belt_internalAVLtree.some; +let some = Belt_internalAVLtree.some; -var size = Belt_internalAVLtree.size; +let size = Belt_internalAVLtree.size; -var toList = Belt_internalAVLtree.toList; +let toList = Belt_internalAVLtree.toList; -var toArray = Belt_internalAVLtree.toArray; +let toArray = Belt_internalAVLtree.toArray; -var fromArray = Belt_internalMapInt.fromArray; +let fromArray = Belt_internalMapInt.fromArray; -var keysToArray = Belt_internalAVLtree.keysToArray; +let keysToArray = Belt_internalAVLtree.keysToArray; -var valuesToArray = Belt_internalAVLtree.valuesToArray; +let valuesToArray = Belt_internalAVLtree.valuesToArray; -var minKey = Belt_internalAVLtree.minKey; +let minKey = Belt_internalAVLtree.minKey; -var minKeyUndefined = Belt_internalAVLtree.minKeyUndefined; +let minKeyUndefined = Belt_internalAVLtree.minKeyUndefined; -var maxKey = Belt_internalAVLtree.maxKey; +let maxKey = Belt_internalAVLtree.maxKey; -var maxKeyUndefined = Belt_internalAVLtree.maxKeyUndefined; +let maxKeyUndefined = Belt_internalAVLtree.maxKeyUndefined; -var minimum = Belt_internalAVLtree.minimum; +let minimum = Belt_internalAVLtree.minimum; -var minUndefined = Belt_internalAVLtree.minUndefined; +let minUndefined = Belt_internalAVLtree.minUndefined; -var maximum = Belt_internalAVLtree.maximum; +let maximum = Belt_internalAVLtree.maximum; -var maxUndefined = Belt_internalAVLtree.maxUndefined; +let maxUndefined = Belt_internalAVLtree.maxUndefined; -var get = Belt_internalMapInt.get; +let get = Belt_internalMapInt.get; -var getUndefined = Belt_internalMapInt.getUndefined; +let getUndefined = Belt_internalMapInt.getUndefined; -var getWithDefault = Belt_internalMapInt.getWithDefault; +let getWithDefault = Belt_internalMapInt.getWithDefault; -var getExn = Belt_internalMapInt.getExn; +let getExn = Belt_internalMapInt.getExn; -var checkInvariantInternal = Belt_internalAVLtree.checkInvariantInternal; +let checkInvariantInternal = Belt_internalAVLtree.checkInvariantInternal; -var mergeU = Belt_internalMapInt.mergeU; +let mergeU = Belt_internalMapInt.mergeU; -var merge = Belt_internalMapInt.merge; +let merge = Belt_internalMapInt.merge; -var keepU = Belt_internalAVLtree.keepSharedU; +let keepU = Belt_internalAVLtree.keepSharedU; -var keep = Belt_internalAVLtree.keepShared; +let keep = Belt_internalAVLtree.keepShared; -var partitionU = Belt_internalAVLtree.partitionSharedU; +let partitionU = Belt_internalAVLtree.partitionSharedU; -var partition = Belt_internalAVLtree.partitionShared; +let partition = Belt_internalAVLtree.partitionShared; -var split = Belt_internalMapInt.split; +let split = Belt_internalMapInt.split; -var mapU = Belt_internalAVLtree.mapU; +let mapU = Belt_internalAVLtree.mapU; -var map = Belt_internalAVLtree.map; +let map = Belt_internalAVLtree.map; -var mapWithKeyU = Belt_internalAVLtree.mapWithKeyU; +let mapWithKeyU = Belt_internalAVLtree.mapWithKeyU; -var mapWithKey = Belt_internalAVLtree.mapWithKey; +let mapWithKey = Belt_internalAVLtree.mapWithKey; exports.empty = empty; exports.isEmpty = isEmpty; diff --git a/lib/js/belt_MapString.js b/lib/js/belt_MapString.js index aac72f8822..345b885af7 100644 --- a/lib/js/belt_MapString.js +++ b/lib/js/belt_MapString.js @@ -1,19 +1,19 @@ 'use strict'; -var Curry = require("./curry.js"); -var Caml_option = require("./caml_option.js"); -var Belt_internalAVLtree = require("./belt_internalAVLtree.js"); -var Belt_internalMapString = require("./belt_internalMapString.js"); +let Curry = require("./curry.js"); +let Caml_option = require("./caml_option.js"); +let Belt_internalAVLtree = require("./belt_internalAVLtree.js"); +let Belt_internalMapString = require("./belt_internalMapString.js"); function set(t, newK, newD) { if (t === undefined) { return Belt_internalAVLtree.singleton(newK, newD); } - var k = t.k; + let k = t.k; if (newK === k) { return Belt_internalAVLtree.updateValue(t, newD); } - var v = t.v; + let v = t.v; if (newK < k) { return Belt_internalAVLtree.bal(set(t.l, newK, newD), k, v, t.r); } else { @@ -23,48 +23,48 @@ function set(t, newK, newD) { function updateU(t, x, f) { if (t !== undefined) { - var k = t.k; + let k = t.k; if (x === k) { - var data = f(Caml_option.some(t.v)); + let data = f(Caml_option.some(t.v)); if (data !== undefined) { return Belt_internalAVLtree.updateValue(t, Caml_option.valFromOption(data)); } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (l === undefined) { return r; } if (r === undefined) { return l; } - var kr = { + let kr = { contents: r.k }; - var vr = { + let vr = { contents: r.v }; - var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); + let r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1); } - var v = t.v; - var l$1 = t.l; - var r$2 = t.r; + let v = t.v; + let l$1 = t.l; + let r$2 = t.r; if (x < k) { - var ll = updateU(l$1, x, f); + let ll = updateU(l$1, x, f); if (l$1 === ll) { return t; } else { return Belt_internalAVLtree.bal(ll, k, v, r$2); } } - var rr = updateU(r$2, x, f); + let rr = updateU(r$2, x, f); if (r$2 === rr) { return t; } else { return Belt_internalAVLtree.bal(l$1, k, v, rr); } } - var data$1 = f(undefined); + let data$1 = f(undefined); if (data$1 !== undefined) { return Belt_internalAVLtree.singleton(x, Caml_option.valFromOption(data$1)); } else { @@ -77,9 +77,9 @@ function update(t, x, f) { } function removeAux(n, x) { - var v = n.k; - var l = n.l; - var r = n.r; + let v = n.k; + let l = n.l; + let r = n.r; if (x === v) { if (l === undefined) { return r; @@ -87,20 +87,20 @@ function removeAux(n, x) { if (r === undefined) { return l; } - var kr = { + let kr = { contents: r.k }; - var vr = { + let vr = { contents: r.v }; - var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); + let r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1); } if (x < v) { if (l === undefined) { return n; } - var ll = removeAux(l, x); + let ll = removeAux(l, x); if (ll === l) { return n; } else { @@ -110,7 +110,7 @@ function removeAux(n, x) { if (r === undefined) { return n; } - var rr = removeAux(r, x); + let rr = removeAux(r, x); return Belt_internalAVLtree.bal(l, v, n.v, rr); } @@ -122,18 +122,18 @@ function remove(n, x) { } function removeMany(t, keys) { - var len = keys.length; + let len = keys.length; if (t !== undefined) { - var _t = t; - var _i = 0; + let _t = t; + let _i = 0; while(true) { - var i = _i; - var t$1 = _t; + let i = _i; + let t$1 = _t; if (i >= len) { return t$1; } - var ele = keys[i]; - var u = removeAux(t$1, ele); + let ele = keys[i]; + let u = removeAux(t$1, ele); if (u === undefined) { return u; } @@ -146,108 +146,108 @@ function removeMany(t, keys) { } function mergeMany(h, arr) { - var len = arr.length; - var v = h; - for(var i = 0; i < len; ++i){ - var match = arr[i]; + let len = arr.length; + let v = h; + for(let i = 0; i < len; ++i){ + let match = arr[i]; v = set(v, match[0], match[1]); } return v; } -var empty; +let empty; -var isEmpty = Belt_internalAVLtree.isEmpty; +let isEmpty = Belt_internalAVLtree.isEmpty; -var has = Belt_internalMapString.has; +let has = Belt_internalMapString.has; -var cmpU = Belt_internalMapString.cmpU; +let cmpU = Belt_internalMapString.cmpU; -var cmp = Belt_internalMapString.cmp; +let cmp = Belt_internalMapString.cmp; -var eqU = Belt_internalMapString.eqU; +let eqU = Belt_internalMapString.eqU; -var eq = Belt_internalMapString.eq; +let eq = Belt_internalMapString.eq; -var findFirstByU = Belt_internalAVLtree.findFirstByU; +let findFirstByU = Belt_internalAVLtree.findFirstByU; -var findFirstBy = Belt_internalAVLtree.findFirstBy; +let findFirstBy = Belt_internalAVLtree.findFirstBy; -var forEachU = Belt_internalAVLtree.forEachU; +let forEachU = Belt_internalAVLtree.forEachU; -var forEach = Belt_internalAVLtree.forEach; +let forEach = Belt_internalAVLtree.forEach; -var reduceU = Belt_internalAVLtree.reduceU; +let reduceU = Belt_internalAVLtree.reduceU; -var reduce = Belt_internalAVLtree.reduce; +let reduce = Belt_internalAVLtree.reduce; -var everyU = Belt_internalAVLtree.everyU; +let everyU = Belt_internalAVLtree.everyU; -var every = Belt_internalAVLtree.every; +let every = Belt_internalAVLtree.every; -var someU = Belt_internalAVLtree.someU; +let someU = Belt_internalAVLtree.someU; -var some = Belt_internalAVLtree.some; +let some = Belt_internalAVLtree.some; -var size = Belt_internalAVLtree.size; +let size = Belt_internalAVLtree.size; -var toList = Belt_internalAVLtree.toList; +let toList = Belt_internalAVLtree.toList; -var toArray = Belt_internalAVLtree.toArray; +let toArray = Belt_internalAVLtree.toArray; -var fromArray = Belt_internalMapString.fromArray; +let fromArray = Belt_internalMapString.fromArray; -var keysToArray = Belt_internalAVLtree.keysToArray; +let keysToArray = Belt_internalAVLtree.keysToArray; -var valuesToArray = Belt_internalAVLtree.valuesToArray; +let valuesToArray = Belt_internalAVLtree.valuesToArray; -var minKey = Belt_internalAVLtree.minKey; +let minKey = Belt_internalAVLtree.minKey; -var minKeyUndefined = Belt_internalAVLtree.minKeyUndefined; +let minKeyUndefined = Belt_internalAVLtree.minKeyUndefined; -var maxKey = Belt_internalAVLtree.maxKey; +let maxKey = Belt_internalAVLtree.maxKey; -var maxKeyUndefined = Belt_internalAVLtree.maxKeyUndefined; +let maxKeyUndefined = Belt_internalAVLtree.maxKeyUndefined; -var minimum = Belt_internalAVLtree.minimum; +let minimum = Belt_internalAVLtree.minimum; -var minUndefined = Belt_internalAVLtree.minUndefined; +let minUndefined = Belt_internalAVLtree.minUndefined; -var maximum = Belt_internalAVLtree.maximum; +let maximum = Belt_internalAVLtree.maximum; -var maxUndefined = Belt_internalAVLtree.maxUndefined; +let maxUndefined = Belt_internalAVLtree.maxUndefined; -var get = Belt_internalMapString.get; +let get = Belt_internalMapString.get; -var getUndefined = Belt_internalMapString.getUndefined; +let getUndefined = Belt_internalMapString.getUndefined; -var getWithDefault = Belt_internalMapString.getWithDefault; +let getWithDefault = Belt_internalMapString.getWithDefault; -var getExn = Belt_internalMapString.getExn; +let getExn = Belt_internalMapString.getExn; -var checkInvariantInternal = Belt_internalAVLtree.checkInvariantInternal; +let checkInvariantInternal = Belt_internalAVLtree.checkInvariantInternal; -var mergeU = Belt_internalMapString.mergeU; +let mergeU = Belt_internalMapString.mergeU; -var merge = Belt_internalMapString.merge; +let merge = Belt_internalMapString.merge; -var keepU = Belt_internalAVLtree.keepSharedU; +let keepU = Belt_internalAVLtree.keepSharedU; -var keep = Belt_internalAVLtree.keepShared; +let keep = Belt_internalAVLtree.keepShared; -var partitionU = Belt_internalAVLtree.partitionSharedU; +let partitionU = Belt_internalAVLtree.partitionSharedU; -var partition = Belt_internalAVLtree.partitionShared; +let partition = Belt_internalAVLtree.partitionShared; -var split = Belt_internalMapString.split; +let split = Belt_internalMapString.split; -var mapU = Belt_internalAVLtree.mapU; +let mapU = Belt_internalAVLtree.mapU; -var map = Belt_internalAVLtree.map; +let map = Belt_internalAVLtree.map; -var mapWithKeyU = Belt_internalAVLtree.mapWithKeyU; +let mapWithKeyU = Belt_internalAVLtree.mapWithKeyU; -var mapWithKey = Belt_internalAVLtree.mapWithKey; +let mapWithKey = Belt_internalAVLtree.mapWithKey; exports.empty = empty; exports.isEmpty = isEmpty; diff --git a/lib/js/belt_MutableMap.js b/lib/js/belt_MutableMap.js index ee24b97802..308ed685ef 100644 --- a/lib/js/belt_MutableMap.js +++ b/lib/js/belt_MutableMap.js @@ -1,15 +1,15 @@ 'use strict'; -var Curry = require("./curry.js"); -var Caml_option = require("./caml_option.js"); -var Belt_internalAVLtree = require("./belt_internalAVLtree.js"); +let Curry = require("./curry.js"); +let Caml_option = require("./caml_option.js"); +let Belt_internalAVLtree = require("./belt_internalAVLtree.js"); function removeMutateAux(nt, x, cmp) { - var k = nt.k; - var c = cmp(x, k); + let k = nt.k; + let c = cmp(x, k); if (c === 0) { - var l = nt.l; - var r = nt.r; + let l = nt.l; + let r = nt.r; if (l !== undefined) { if (r !== undefined) { nt.r = Belt_internalAVLtree.removeMinAuxWithRootMutate(nt, r); @@ -24,7 +24,7 @@ function removeMutateAux(nt, x, cmp) { } } if (c < 0) { - var l$1 = nt.l; + let l$1 = nt.l; if (l$1 !== undefined) { nt.l = removeMutateAux(l$1, x, cmp); return Belt_internalAVLtree.balMutate(nt); @@ -32,7 +32,7 @@ function removeMutateAux(nt, x, cmp) { return nt; } } - var r$1 = nt.r; + let r$1 = nt.r; if (r$1 !== undefined) { nt.r = removeMutateAux(r$1, x, cmp); return Belt_internalAVLtree.balMutate(nt); @@ -42,11 +42,11 @@ function removeMutateAux(nt, x, cmp) { } function remove(d, k) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return; } - var newRoot = removeMutateAux(oldRoot, k, d.cmp); + let newRoot = removeMutateAux(oldRoot, k, d.cmp); if (newRoot !== oldRoot) { d.data = newRoot; return; @@ -56,13 +56,13 @@ function remove(d, k) { function removeArrayMutateAux(_t, xs, _i, len, cmp) { while(true) { - var i = _i; - var t = _t; + let i = _i; + let t = _t; if (i >= len) { return t; } - var ele = xs[i]; - var u = removeMutateAux(t, ele, cmp); + let ele = xs[i]; + let u = removeMutateAux(t, ele, cmp); if (u === undefined) { return; } @@ -73,12 +73,12 @@ function removeArrayMutateAux(_t, xs, _i, len, cmp) { } function removeMany(d, xs) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return; } - var len = xs.length; - var newRoot = removeArrayMutateAux(oldRoot, xs, 0, len, d.cmp); + let len = xs.length; + let newRoot = removeArrayMutateAux(oldRoot, xs, 0, len, d.cmp); if (newRoot !== oldRoot) { d.data = newRoot; return; @@ -88,16 +88,16 @@ function removeMany(d, xs) { function updateDone(t, x, f, cmp) { if (t !== undefined) { - var k = t.k; - var c = cmp(x, k); + let k = t.k; + let c = cmp(x, k); if (c === 0) { - var data = f(Caml_option.some(t.v)); + let data = f(Caml_option.some(t.v)); if (data !== undefined) { t.v = Caml_option.valFromOption(data); return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (l !== undefined) { if (r !== undefined) { t.r = Belt_internalAVLtree.removeMinAuxWithRootMutate(t, r); @@ -118,7 +118,7 @@ function updateDone(t, x, f, cmp) { } return Belt_internalAVLtree.balMutate(t); } - var data$1 = f(undefined); + let data$1 = f(undefined); if (data$1 !== undefined) { return Belt_internalAVLtree.singleton(x, Caml_option.valFromOption(data$1)); } else { @@ -127,8 +127,8 @@ function updateDone(t, x, f, cmp) { } function updateU(t, x, f) { - var oldRoot = t.data; - var newRoot = updateDone(oldRoot, x, f, t.cmp); + let oldRoot = t.data; + let newRoot = updateDone(oldRoot, x, f, t.cmp); if (newRoot !== oldRoot) { t.data = newRoot; return; @@ -152,7 +152,7 @@ function clear(m) { } function isEmpty(d) { - var x = d.data; + let x = d.data; return x === undefined; } @@ -303,7 +303,7 @@ function has(m, x) { } function fromArray(data, id) { - var cmp = id.cmp; + let cmp = id.cmp; return { cmp: cmp, data: Belt_internalAVLtree.fromArray(data, cmp) @@ -311,8 +311,8 @@ function fromArray(data, id) { } function set(m, e, v) { - var oldRoot = m.data; - var newRoot = Belt_internalAVLtree.updateMutate(oldRoot, e, v, m.cmp); + let oldRoot = m.data; + let newRoot = Belt_internalAVLtree.updateMutate(oldRoot, e, v, m.cmp); if (newRoot !== oldRoot) { m.data = newRoot; return; @@ -321,17 +321,17 @@ function set(m, e, v) { } function mergeManyAux(t, xs, cmp) { - var v = t; - for(var i = 0 ,i_finish = xs.length; i < i_finish; ++i){ - var match = xs[i]; + let v = t; + for(let i = 0 ,i_finish = xs.length; i < i_finish; ++i){ + let match = xs[i]; v = Belt_internalAVLtree.updateMutate(v, match[0], match[1], cmp); } return v; } function mergeMany(d, xs) { - var oldRoot = d.data; - var newRoot = mergeManyAux(oldRoot, xs, d.cmp); + let oldRoot = d.data; + let newRoot = mergeManyAux(oldRoot, xs, d.cmp); if (newRoot !== oldRoot) { d.data = newRoot; return; @@ -339,9 +339,9 @@ function mergeMany(d, xs) { } -var Int; +let Int; -var $$String; +let $$String; exports.Int = Int; exports.$$String = $$String; diff --git a/lib/js/belt_MutableMapInt.js b/lib/js/belt_MutableMapInt.js index c6a2d38e3c..ad899a11a9 100644 --- a/lib/js/belt_MutableMapInt.js +++ b/lib/js/belt_MutableMapInt.js @@ -1,9 +1,9 @@ 'use strict'; -var Curry = require("./curry.js"); -var Caml_option = require("./caml_option.js"); -var Belt_internalMapInt = require("./belt_internalMapInt.js"); -var Belt_internalAVLtree = require("./belt_internalAVLtree.js"); +let Curry = require("./curry.js"); +let Caml_option = require("./caml_option.js"); +let Belt_internalMapInt = require("./belt_internalMapInt.js"); +let Belt_internalAVLtree = require("./belt_internalAVLtree.js"); function make(param) { return { @@ -12,7 +12,7 @@ function make(param) { } function isEmpty(m) { - var x = m.data; + let x = m.data; return x === undefined; } @@ -53,8 +53,8 @@ function maxUndefined(m) { } function set(m, k, v) { - var old_data = m.data; - var v$1 = Belt_internalMapInt.addMutate(old_data, k, v); + let old_data = m.data; + let v$1 = Belt_internalMapInt.addMutate(old_data, k, v); if (v$1 !== old_data) { m.data = v$1; return; @@ -143,10 +143,10 @@ function has(d, v) { } function removeMutateAux(nt, x) { - var k = nt.k; + let k = nt.k; if (x === k) { - var l = nt.l; - var r = nt.r; + let l = nt.l; + let r = nt.r; if (l !== undefined) { if (r !== undefined) { nt.r = Belt_internalAVLtree.removeMinAuxWithRootMutate(nt, r); @@ -159,7 +159,7 @@ function removeMutateAux(nt, x) { } } if (x < k) { - var l$1 = nt.l; + let l$1 = nt.l; if (l$1 !== undefined) { nt.l = removeMutateAux(l$1, x); return Belt_internalAVLtree.balMutate(nt); @@ -167,7 +167,7 @@ function removeMutateAux(nt, x) { return nt; } } - var r$1 = nt.r; + let r$1 = nt.r; if (r$1 !== undefined) { nt.r = removeMutateAux(r$1, x); return Belt_internalAVLtree.balMutate(nt); @@ -177,11 +177,11 @@ function removeMutateAux(nt, x) { } function remove(d, v) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return; } - var newRoot = removeMutateAux(oldRoot, v); + let newRoot = removeMutateAux(oldRoot, v); if (newRoot !== oldRoot) { d.data = newRoot; return; @@ -191,15 +191,15 @@ function remove(d, v) { function updateDone(t, x, f) { if (t !== undefined) { - var k = t.k; + let k = t.k; if (k === x) { - var data = f(Caml_option.some(t.v)); + let data = f(Caml_option.some(t.v)); if (data !== undefined) { t.v = Caml_option.valFromOption(data); return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (l !== undefined) { if (r !== undefined) { t.r = Belt_internalAVLtree.removeMinAuxWithRootMutate(t, r); @@ -211,17 +211,17 @@ function updateDone(t, x, f) { return r; } } - var l$1 = t.l; - var r$1 = t.r; + let l$1 = t.l; + let r$1 = t.r; if (x < k) { - var ll = updateDone(l$1, x, f); + let ll = updateDone(l$1, x, f); t.l = ll; } else { t.r = updateDone(r$1, x, f); } return Belt_internalAVLtree.balMutate(t); } - var data$1 = f(undefined); + let data$1 = f(undefined); if (data$1 !== undefined) { return Belt_internalAVLtree.singleton(x, Caml_option.valFromOption(data$1)); } else { @@ -230,8 +230,8 @@ function updateDone(t, x, f) { } function updateU(t, x, f) { - var oldRoot = t.data; - var newRoot = updateDone(oldRoot, x, f); + let oldRoot = t.data; + let newRoot = updateDone(oldRoot, x, f); if (newRoot !== oldRoot) { t.data = newRoot; return; @@ -245,13 +245,13 @@ function update(t, x, f) { function removeArrayMutateAux(_t, xs, _i, len) { while(true) { - var i = _i; - var t = _t; + let i = _i; + let t = _t; if (i >= len) { return t; } - var ele = xs[i]; - var u = removeMutateAux(t, ele); + let ele = xs[i]; + let u = removeMutateAux(t, ele); if (u === undefined) { return; } @@ -262,12 +262,12 @@ function removeArrayMutateAux(_t, xs, _i, len) { } function removeMany(d, xs) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return; } - var len = xs.length; - var newRoot = removeArrayMutateAux(oldRoot, xs, 0, len); + let len = xs.length; + let newRoot = removeArrayMutateAux(oldRoot, xs, 0, len); if (newRoot !== oldRoot) { d.data = newRoot; return; diff --git a/lib/js/belt_MutableMapString.js b/lib/js/belt_MutableMapString.js index 5d6cab455b..b2b9d28a8e 100644 --- a/lib/js/belt_MutableMapString.js +++ b/lib/js/belt_MutableMapString.js @@ -1,9 +1,9 @@ 'use strict'; -var Curry = require("./curry.js"); -var Caml_option = require("./caml_option.js"); -var Belt_internalAVLtree = require("./belt_internalAVLtree.js"); -var Belt_internalMapString = require("./belt_internalMapString.js"); +let Curry = require("./curry.js"); +let Caml_option = require("./caml_option.js"); +let Belt_internalAVLtree = require("./belt_internalAVLtree.js"); +let Belt_internalMapString = require("./belt_internalMapString.js"); function make(param) { return { @@ -12,7 +12,7 @@ function make(param) { } function isEmpty(m) { - var x = m.data; + let x = m.data; return x === undefined; } @@ -53,8 +53,8 @@ function maxUndefined(m) { } function set(m, k, v) { - var old_data = m.data; - var v$1 = Belt_internalMapString.addMutate(old_data, k, v); + let old_data = m.data; + let v$1 = Belt_internalMapString.addMutate(old_data, k, v); if (v$1 !== old_data) { m.data = v$1; return; @@ -143,10 +143,10 @@ function has(d, v) { } function removeMutateAux(nt, x) { - var k = nt.k; + let k = nt.k; if (x === k) { - var l = nt.l; - var r = nt.r; + let l = nt.l; + let r = nt.r; if (l !== undefined) { if (r !== undefined) { nt.r = Belt_internalAVLtree.removeMinAuxWithRootMutate(nt, r); @@ -159,7 +159,7 @@ function removeMutateAux(nt, x) { } } if (x < k) { - var l$1 = nt.l; + let l$1 = nt.l; if (l$1 !== undefined) { nt.l = removeMutateAux(l$1, x); return Belt_internalAVLtree.balMutate(nt); @@ -167,7 +167,7 @@ function removeMutateAux(nt, x) { return nt; } } - var r$1 = nt.r; + let r$1 = nt.r; if (r$1 !== undefined) { nt.r = removeMutateAux(r$1, x); return Belt_internalAVLtree.balMutate(nt); @@ -177,11 +177,11 @@ function removeMutateAux(nt, x) { } function remove(d, v) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return; } - var newRoot = removeMutateAux(oldRoot, v); + let newRoot = removeMutateAux(oldRoot, v); if (newRoot !== oldRoot) { d.data = newRoot; return; @@ -191,15 +191,15 @@ function remove(d, v) { function updateDone(t, x, f) { if (t !== undefined) { - var k = t.k; + let k = t.k; if (k === x) { - var data = f(Caml_option.some(t.v)); + let data = f(Caml_option.some(t.v)); if (data !== undefined) { t.v = Caml_option.valFromOption(data); return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (l !== undefined) { if (r !== undefined) { t.r = Belt_internalAVLtree.removeMinAuxWithRootMutate(t, r); @@ -211,17 +211,17 @@ function updateDone(t, x, f) { return r; } } - var l$1 = t.l; - var r$1 = t.r; + let l$1 = t.l; + let r$1 = t.r; if (x < k) { - var ll = updateDone(l$1, x, f); + let ll = updateDone(l$1, x, f); t.l = ll; } else { t.r = updateDone(r$1, x, f); } return Belt_internalAVLtree.balMutate(t); } - var data$1 = f(undefined); + let data$1 = f(undefined); if (data$1 !== undefined) { return Belt_internalAVLtree.singleton(x, Caml_option.valFromOption(data$1)); } else { @@ -230,8 +230,8 @@ function updateDone(t, x, f) { } function updateU(t, x, f) { - var oldRoot = t.data; - var newRoot = updateDone(oldRoot, x, f); + let oldRoot = t.data; + let newRoot = updateDone(oldRoot, x, f); if (newRoot !== oldRoot) { t.data = newRoot; return; @@ -245,13 +245,13 @@ function update(t, x, f) { function removeArrayMutateAux(_t, xs, _i, len) { while(true) { - var i = _i; - var t = _t; + let i = _i; + let t = _t; if (i >= len) { return t; } - var ele = xs[i]; - var u = removeMutateAux(t, ele); + let ele = xs[i]; + let u = removeMutateAux(t, ele); if (u === undefined) { return; } @@ -262,12 +262,12 @@ function removeArrayMutateAux(_t, xs, _i, len) { } function removeMany(d, xs) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return; } - var len = xs.length; - var newRoot = removeArrayMutateAux(oldRoot, xs, 0, len); + let len = xs.length; + let newRoot = removeArrayMutateAux(oldRoot, xs, 0, len); if (newRoot !== oldRoot) { d.data = newRoot; return; diff --git a/lib/js/belt_MutableQueue.js b/lib/js/belt_MutableQueue.js index 87faf275f7..dd1485ab50 100644 --- a/lib/js/belt_MutableQueue.js +++ b/lib/js/belt_MutableQueue.js @@ -1,7 +1,7 @@ 'use strict'; -var Curry = require("./curry.js"); -var Caml_option = require("./caml_option.js"); +let Curry = require("./curry.js"); +let Caml_option = require("./caml_option.js"); function make(param) { return { @@ -18,11 +18,11 @@ function clear(q) { } function add(q, x) { - var cell = { + let cell = { content: x, next: undefined }; - var last = q.last; + let last = q.last; if (last !== undefined) { q.length = q.length + 1 | 0; last.next = cell; @@ -35,7 +35,7 @@ function add(q, x) { } function peek(q) { - var v = q.first; + let v = q.first; if (v !== undefined) { return Caml_option.some(v.content); } @@ -43,7 +43,7 @@ function peek(q) { } function peekUndefined(q) { - var v = q.first; + let v = q.first; if (v !== undefined) { return v.content; } @@ -51,7 +51,7 @@ function peekUndefined(q) { } function peekExn(q) { - var v = q.first; + let v = q.first; if (v !== undefined) { return v.content; } @@ -62,11 +62,11 @@ function peekExn(q) { } function pop(q) { - var x = q.first; + let x = q.first; if (x === undefined) { return; } - var next = x.next; + let next = x.next; if (next === undefined) { clear(q); return Caml_option.some(x.content); @@ -78,9 +78,9 @@ function pop(q) { } function popExn(q) { - var x = q.first; + let x = q.first; if (x !== undefined) { - var next = x.next; + let next = x.next; if (next === undefined) { clear(q); return x.content; @@ -97,11 +97,11 @@ function popExn(q) { } function popUndefined(q) { - var x = q.first; + let x = q.first; if (x === undefined) { return; } - var next = x.next; + let next = x.next; if (next === undefined) { clear(q); return x.content; @@ -113,19 +113,19 @@ function popUndefined(q) { } function copy(q) { - var qRes = { + let qRes = { length: q.length, first: undefined, last: undefined }; - var _prev; - var _cell = q.first; + let _prev; + let _cell = q.first; while(true) { - var cell = _cell; - var prev = _prev; + let cell = _cell; + let prev = _prev; if (cell !== undefined) { - var content = cell.content; - var res = { + let content = cell.content; + let res = { content: content, next: undefined }; @@ -144,19 +144,19 @@ function copy(q) { } function mapU(q, f) { - var qRes = { + let qRes = { length: q.length, first: undefined, last: undefined }; - var _prev; - var _cell = q.first; + let _prev; + let _cell = q.first; while(true) { - var cell = _cell; - var prev = _prev; + let cell = _cell; + let prev = _prev; if (cell !== undefined) { - var content = f(cell.content); - var res = { + let content = f(cell.content); + let res = { content: content, next: undefined }; @@ -187,9 +187,9 @@ function size(q) { } function forEachU(q, f) { - var _cell = q.first; + let _cell = q.first; while(true) { - var cell = _cell; + let cell = _cell; if (cell === undefined) { return; } @@ -204,15 +204,15 @@ function forEach(q, f) { } function reduceU(q, accu, f) { - var _accu = accu; - var _cell = q.first; + let _accu = accu; + let _cell = q.first; while(true) { - var cell = _cell; - var accu$1 = _accu; + let cell = _cell; + let accu$1 = _accu; if (cell === undefined) { return accu$1; } - var accu$2 = f(accu$1, cell.content); + let accu$2 = f(accu$1, cell.content); _cell = cell.next; _accu = accu$2; continue ; @@ -227,7 +227,7 @@ function transfer(q1, q2) { if (q1.length <= 0) { return; } - var l = q2.last; + let l = q2.last; if (l !== undefined) { q2.length = q2.length + q1.length | 0; l.next = q1.first; @@ -243,8 +243,8 @@ function transfer(q1, q2) { function fillAux(_i, arr, _cell) { while(true) { - var cell = _cell; - var i = _i; + let cell = _cell; + let i = _i; if (cell === undefined) { return; } @@ -256,18 +256,18 @@ function fillAux(_i, arr, _cell) { } function toArray(x) { - var v = new Array(x.length); + let v = new Array(x.length); fillAux(0, v, x.first); return v; } function fromArray(arr) { - var q = { + let q = { length: 0, first: undefined, last: undefined }; - for(var i = 0 ,i_finish = arr.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = arr.length; i < i_finish; ++i){ add(q, arr[i]); } return q; diff --git a/lib/js/belt_MutableSet.js b/lib/js/belt_MutableSet.js index 9580255090..c65e479352 100644 --- a/lib/js/belt_MutableSet.js +++ b/lib/js/belt_MutableSet.js @@ -1,15 +1,15 @@ 'use strict'; -var Curry = require("./curry.js"); -var Belt_SortArray = require("./belt_SortArray.js"); -var Belt_internalAVLset = require("./belt_internalAVLset.js"); +let Curry = require("./curry.js"); +let Belt_SortArray = require("./belt_SortArray.js"); +let Belt_internalAVLset = require("./belt_internalAVLset.js"); function remove0(nt, x, cmp) { - var k = nt.v; - var c = cmp(x, k); + let k = nt.v; + let c = cmp(x, k); if (c === 0) { - var l = nt.l; - var r = nt.r; + let l = nt.l; + let r = nt.r; if (l !== undefined) { if (r !== undefined) { nt.r = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r); @@ -22,7 +22,7 @@ function remove0(nt, x, cmp) { } } if (c < 0) { - var l$1 = nt.l; + let l$1 = nt.l; if (l$1 !== undefined) { nt.l = remove0(l$1, x, cmp); return Belt_internalAVLset.balMutate(nt); @@ -30,7 +30,7 @@ function remove0(nt, x, cmp) { return nt; } } - var r$1 = nt.r; + let r$1 = nt.r; if (r$1 !== undefined) { nt.r = remove0(r$1, x, cmp); return Belt_internalAVLset.balMutate(nt); @@ -40,11 +40,11 @@ function remove0(nt, x, cmp) { } function remove(d, v) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return; } - var newRoot = remove0(oldRoot, v, d.cmp); + let newRoot = remove0(oldRoot, v, d.cmp); if (newRoot !== oldRoot) { d.data = newRoot; return; @@ -54,13 +54,13 @@ function remove(d, v) { function removeMany0(_t, xs, _i, len, cmp) { while(true) { - var i = _i; - var t = _t; + let i = _i; + let t = _t; if (i >= len) { return t; } - var ele = xs[i]; - var u = remove0(t, ele, cmp); + let ele = xs[i]; + let u = remove0(t, ele, cmp); if (u === undefined) { return; } @@ -71,21 +71,21 @@ function removeMany0(_t, xs, _i, len, cmp) { } function removeMany(d, xs) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return; } - var len = xs.length; + let len = xs.length; d.data = removeMany0(oldRoot, xs, 0, len, d.cmp); } function removeCheck0(nt, x, removed, cmp) { - var k = nt.v; - var c = cmp(x, k); + let k = nt.v; + let c = cmp(x, k); if (c === 0) { removed.contents = true; - var l = nt.l; - var r = nt.r; + let l = nt.l; + let r = nt.r; if (l !== undefined) { if (r !== undefined) { nt.r = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r); @@ -98,7 +98,7 @@ function removeCheck0(nt, x, removed, cmp) { } } if (c < 0) { - var l$1 = nt.l; + let l$1 = nt.l; if (l$1 !== undefined) { nt.l = removeCheck0(l$1, x, removed, cmp); return Belt_internalAVLset.balMutate(nt); @@ -106,7 +106,7 @@ function removeCheck0(nt, x, removed, cmp) { return nt; } } - var r$1 = nt.r; + let r$1 = nt.r; if (r$1 !== undefined) { nt.r = removeCheck0(r$1, x, removed, cmp); return Belt_internalAVLset.balMutate(nt); @@ -116,14 +116,14 @@ function removeCheck0(nt, x, removed, cmp) { } function removeCheck(d, v) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return false; } - var removed = { + let removed = { contents: false }; - var newRoot = removeCheck0(oldRoot, v, removed, d.cmp); + let newRoot = removeCheck0(oldRoot, v, removed, d.cmp); if (newRoot !== oldRoot) { d.data = newRoot; } @@ -132,15 +132,15 @@ function removeCheck(d, v) { function addCheck0(t, x, added, cmp) { if (t !== undefined) { - var k = t.v; - var c = cmp(x, k); + let k = t.v; + let c = cmp(x, k); if (c === 0) { return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (c < 0) { - var ll = addCheck0(l, x, added, cmp); + let ll = addCheck0(l, x, added, cmp); t.l = ll; } else { t.r = addCheck0(r, x, added, cmp); @@ -152,11 +152,11 @@ function addCheck0(t, x, added, cmp) { } function addCheck(m, e) { - var oldRoot = m.data; - var added = { + let oldRoot = m.data; + let added = { contents: false }; - var newRoot = addCheck0(oldRoot, e, added, m.cmp); + let newRoot = addCheck0(oldRoot, e, added, m.cmp); if (newRoot !== oldRoot) { m.data = newRoot; } @@ -164,8 +164,8 @@ function addCheck(m, e) { } function add(m, e) { - var oldRoot = m.data; - var newRoot = Belt_internalAVLset.addMutate(m.cmp, oldRoot, e); + let oldRoot = m.data; + let newRoot = Belt_internalAVLset.addMutate(m.cmp, oldRoot, e); if (newRoot !== oldRoot) { m.data = newRoot; return; @@ -174,8 +174,8 @@ function add(m, e) { } function addArrayMutate(t, xs, cmp) { - var v = t; - for(var i = 0 ,i_finish = xs.length; i < i_finish; ++i){ + let v = t; + for(let i = 0 ,i_finish = xs.length; i < i_finish; ++i){ v = Belt_internalAVLset.addMutate(cmp, v, xs[i]); } return v; @@ -193,7 +193,7 @@ function make(id) { } function isEmpty(d) { - var n = d.data; + let n = d.data; return n === undefined; } @@ -269,7 +269,7 @@ function checkInvariantInternal(d) { } function fromArray(data, id) { - var cmp = id.cmp; + let cmp = id.cmp; return { cmp: cmp, data: Belt_internalAVLset.fromArray(data, cmp) @@ -297,10 +297,10 @@ function getExn(d, x) { } function split(d, key) { - var arr = Belt_internalAVLset.toArray(d.data); - var cmp = d.cmp; - var i = Belt_SortArray.binarySearchByU(arr, key, cmp); - var len = arr.length; + let arr = Belt_internalAVLset.toArray(d.data); + let cmp = d.cmp; + let i = Belt_SortArray.binarySearchByU(arr, key, cmp); + let len = arr.length; if (i >= 0) { return [ [ @@ -316,7 +316,7 @@ function split(d, key) { true ]; } - var next = (-i | 0) - 1 | 0; + let next = (-i | 0) - 1 | 0; return [ [ { @@ -344,8 +344,8 @@ function keep(d, p) { } function partitionU(d, p) { - var cmp = d.cmp; - var match = Belt_internalAVLset.partitionCopyU(d.data, p); + let cmp = d.cmp; + let match = Belt_internalAVLset.partitionCopyU(d.data, p); return [ { cmp: cmp, @@ -367,9 +367,9 @@ function subset(a, b) { } function intersect(a, b) { - var cmp = a.cmp; - var match = a.data; - var match$1 = b.data; + let cmp = a.cmp; + let match = a.data; + let match$1 = b.data; if (match === undefined) { return { cmp: cmp, @@ -382,10 +382,10 @@ function intersect(a, b) { data: undefined }; } - var sizea = Belt_internalAVLset.lengthNode(match); - var sizeb = Belt_internalAVLset.lengthNode(match$1); - var totalSize = sizea + sizeb | 0; - var tmp = new Array(totalSize); + let sizea = Belt_internalAVLset.lengthNode(match); + let sizeb = Belt_internalAVLset.lengthNode(match$1); + let totalSize = sizea + sizeb | 0; + let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(match, 0, tmp); Belt_internalAVLset.fillArray(match$1, sizea, tmp); if (cmp(tmp[sizea - 1 | 0], tmp[sizea]) < 0 || cmp(tmp[totalSize - 1 | 0], tmp[0]) < 0) { @@ -394,8 +394,8 @@ function intersect(a, b) { data: undefined }; } - var tmp2 = new Array(sizea < sizeb ? sizea : sizeb); - var k = Belt_SortArray.intersectU(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0, cmp); + let tmp2 = new Array(sizea < sizeb ? sizea : sizeb); + let k = Belt_SortArray.intersectU(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0, cmp); return { cmp: cmp, data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) @@ -403,9 +403,9 @@ function intersect(a, b) { } function diff(a, b) { - var cmp = a.cmp; - var dataa = a.data; - var match = b.data; + let cmp = a.cmp; + let dataa = a.data; + let match = b.data; if (dataa === undefined) { return { cmp: cmp, @@ -418,10 +418,10 @@ function diff(a, b) { data: Belt_internalAVLset.copy(dataa) }; } - var sizea = Belt_internalAVLset.lengthNode(dataa); - var sizeb = Belt_internalAVLset.lengthNode(match); - var totalSize = sizea + sizeb | 0; - var tmp = new Array(totalSize); + let sizea = Belt_internalAVLset.lengthNode(dataa); + let sizeb = Belt_internalAVLset.lengthNode(match); + let totalSize = sizea + sizeb | 0; + let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(dataa, 0, tmp); Belt_internalAVLset.fillArray(match, sizea, tmp); if (cmp(tmp[sizea - 1 | 0], tmp[sizea]) < 0 || cmp(tmp[totalSize - 1 | 0], tmp[0]) < 0) { @@ -430,8 +430,8 @@ function diff(a, b) { data: Belt_internalAVLset.copy(dataa) }; } - var tmp2 = new Array(sizea); - var k = Belt_SortArray.diffU(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0, cmp); + let tmp2 = new Array(sizea); + let k = Belt_SortArray.diffU(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0, cmp); return { cmp: cmp, data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) @@ -439,9 +439,9 @@ function diff(a, b) { } function union(a, b) { - var cmp = a.cmp; - var dataa = a.data; - var datab = b.data; + let cmp = a.cmp; + let dataa = a.data; + let datab = b.data; if (dataa === undefined) { return { cmp: cmp, @@ -454,10 +454,10 @@ function union(a, b) { data: Belt_internalAVLset.copy(dataa) }; } - var sizea = Belt_internalAVLset.lengthNode(dataa); - var sizeb = Belt_internalAVLset.lengthNode(datab); - var totalSize = sizea + sizeb | 0; - var tmp = new Array(totalSize); + let sizea = Belt_internalAVLset.lengthNode(dataa); + let sizeb = Belt_internalAVLset.lengthNode(datab); + let totalSize = sizea + sizeb | 0; + let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(dataa, 0, tmp); Belt_internalAVLset.fillArray(datab, sizea, tmp); if (cmp(tmp[sizea - 1 | 0], tmp[sizea]) < 0) { @@ -466,8 +466,8 @@ function union(a, b) { data: Belt_internalAVLset.fromSortedArrayAux(tmp, 0, totalSize) }; } - var tmp2 = new Array(totalSize); - var k = Belt_SortArray.unionU(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0, cmp); + let tmp2 = new Array(totalSize); + let k = Belt_SortArray.unionU(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0, cmp); return { cmp: cmp, data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) @@ -485,9 +485,9 @@ function copy(d) { }; } -var Int; +let Int; -var $$String; +let $$String; exports.Int = Int; exports.$$String = $$String; diff --git a/lib/js/belt_MutableSetInt.js b/lib/js/belt_MutableSetInt.js index 6db1c502f6..4bcdb0cf6d 100644 --- a/lib/js/belt_MutableSetInt.js +++ b/lib/js/belt_MutableSetInt.js @@ -1,15 +1,15 @@ 'use strict'; -var Curry = require("./curry.js"); -var Belt_SortArrayInt = require("./belt_SortArrayInt.js"); -var Belt_internalAVLset = require("./belt_internalAVLset.js"); -var Belt_internalSetInt = require("./belt_internalSetInt.js"); +let Curry = require("./curry.js"); +let Belt_SortArrayInt = require("./belt_SortArrayInt.js"); +let Belt_internalAVLset = require("./belt_internalAVLset.js"); +let Belt_internalSetInt = require("./belt_internalSetInt.js"); function remove0(nt, x) { - var k = nt.v; + let k = nt.v; if (x === k) { - var l = nt.l; - var r = nt.r; + let l = nt.l; + let r = nt.r; if (l !== undefined) { if (r !== undefined) { nt.r = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r); @@ -22,7 +22,7 @@ function remove0(nt, x) { } } if (x < k) { - var l$1 = nt.l; + let l$1 = nt.l; if (l$1 !== undefined) { nt.l = remove0(l$1, x); return Belt_internalAVLset.balMutate(nt); @@ -30,7 +30,7 @@ function remove0(nt, x) { return nt; } } - var r$1 = nt.r; + let r$1 = nt.r; if (r$1 !== undefined) { nt.r = remove0(r$1, x); return Belt_internalAVLset.balMutate(nt); @@ -40,11 +40,11 @@ function remove0(nt, x) { } function remove(d, v) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return; } - var newRoot = remove0(oldRoot, v); + let newRoot = remove0(oldRoot, v); if (newRoot !== oldRoot) { d.data = newRoot; return; @@ -54,13 +54,13 @@ function remove(d, v) { function removeMany0(_t, xs, _i, len) { while(true) { - var i = _i; - var t = _t; + let i = _i; + let t = _t; if (i >= len) { return t; } - var ele = xs[i]; - var u = remove0(t, ele); + let ele = xs[i]; + let u = remove0(t, ele); if (u === undefined) { return; } @@ -71,20 +71,20 @@ function removeMany0(_t, xs, _i, len) { } function removeMany(d, xs) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return; } - var len = xs.length; + let len = xs.length; d.data = removeMany0(oldRoot, xs, 0, len); } function removeCheck0(nt, x, removed) { - var k = nt.v; + let k = nt.v; if (x === k) { removed.contents = true; - var l = nt.l; - var r = nt.r; + let l = nt.l; + let r = nt.r; if (l !== undefined) { if (r !== undefined) { nt.r = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r); @@ -97,7 +97,7 @@ function removeCheck0(nt, x, removed) { } } if (x < k) { - var l$1 = nt.l; + let l$1 = nt.l; if (l$1 !== undefined) { nt.l = removeCheck0(l$1, x, removed); return Belt_internalAVLset.balMutate(nt); @@ -105,7 +105,7 @@ function removeCheck0(nt, x, removed) { return nt; } } - var r$1 = nt.r; + let r$1 = nt.r; if (r$1 !== undefined) { nt.r = removeCheck0(r$1, x, removed); return Belt_internalAVLset.balMutate(nt); @@ -115,14 +115,14 @@ function removeCheck0(nt, x, removed) { } function removeCheck(d, v) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return false; } - var removed = { + let removed = { contents: false }; - var newRoot = removeCheck0(oldRoot, v, removed); + let newRoot = removeCheck0(oldRoot, v, removed); if (newRoot !== oldRoot) { d.data = newRoot; } @@ -131,14 +131,14 @@ function removeCheck(d, v) { function addCheck0(t, x, added) { if (t !== undefined) { - var k = t.v; + let k = t.v; if (x === k) { return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (x < k) { - var ll = addCheck0(l, x, added); + let ll = addCheck0(l, x, added); t.l = ll; } else { t.r = addCheck0(r, x, added); @@ -150,11 +150,11 @@ function addCheck0(t, x, added) { } function addCheck(m, e) { - var oldRoot = m.data; - var added = { + let oldRoot = m.data; + let added = { contents: false }; - var newRoot = addCheck0(oldRoot, e, added); + let newRoot = addCheck0(oldRoot, e, added); if (newRoot !== oldRoot) { m.data = newRoot; } @@ -162,8 +162,8 @@ function addCheck(m, e) { } function add(d, k) { - var oldRoot = d.data; - var v = Belt_internalSetInt.addMutate(oldRoot, k); + let oldRoot = d.data; + let v = Belt_internalSetInt.addMutate(oldRoot, k); if (v !== oldRoot) { d.data = v; return; @@ -172,8 +172,8 @@ function add(d, k) { } function addArrayMutate(t, xs) { - var v = t; - for(var i = 0 ,i_finish = xs.length; i < i_finish; ++i){ + let v = t; + for(let i = 0 ,i_finish = xs.length; i < i_finish; ++i){ v = Belt_internalSetInt.addMutate(v, xs[i]); } return v; @@ -190,7 +190,7 @@ function make(param) { } function isEmpty(d) { - var n = d.data; + let n = d.data; return n === undefined; } @@ -291,9 +291,9 @@ function getExn(d, x) { } function split(d, key) { - var arr = Belt_internalAVLset.toArray(d.data); - var i = Belt_SortArrayInt.binarySearch(arr, key); - var len = arr.length; + let arr = Belt_internalAVLset.toArray(d.data); + let i = Belt_SortArrayInt.binarySearch(arr, key); + let len = arr.length; if (i >= 0) { return [ [ @@ -307,7 +307,7 @@ function split(d, key) { true ]; } - var next = (-i | 0) - 1 | 0; + let next = (-i | 0) - 1 | 0; return [ [ { @@ -332,7 +332,7 @@ function keep(d, p) { } function partitionU(d, p) { - var match = Belt_internalAVLset.partitionCopyU(d.data, p); + let match = Belt_internalAVLset.partitionCopyU(d.data, p); return [ { data: match[0] @@ -352,8 +352,8 @@ function subset(a, b) { } function intersect(dataa, datab) { - var dataa$1 = dataa.data; - var datab$1 = datab.data; + let dataa$1 = dataa.data; + let datab$1 = datab.data; if (dataa$1 === undefined) { return { data: undefined @@ -364,10 +364,10 @@ function intersect(dataa, datab) { data: undefined }; } - var sizea = Belt_internalAVLset.lengthNode(dataa$1); - var sizeb = Belt_internalAVLset.lengthNode(datab$1); - var totalSize = sizea + sizeb | 0; - var tmp = new Array(totalSize); + let sizea = Belt_internalAVLset.lengthNode(dataa$1); + let sizeb = Belt_internalAVLset.lengthNode(datab$1); + let totalSize = sizea + sizeb | 0; + let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(dataa$1, 0, tmp); Belt_internalAVLset.fillArray(datab$1, sizea, tmp); if (tmp[sizea - 1 | 0] < tmp[sizea] || tmp[totalSize - 1 | 0] < tmp[0]) { @@ -375,16 +375,16 @@ function intersect(dataa, datab) { data: undefined }; } - var tmp2 = new Array(sizea < sizeb ? sizea : sizeb); - var k = Belt_SortArrayInt.intersect(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); + let tmp2 = new Array(sizea < sizeb ? sizea : sizeb); + let k = Belt_SortArrayInt.intersect(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); return { data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) }; } function diff(dataa, datab) { - var dataa$1 = dataa.data; - var datab$1 = datab.data; + let dataa$1 = dataa.data; + let datab$1 = datab.data; if (dataa$1 === undefined) { return { data: undefined @@ -395,10 +395,10 @@ function diff(dataa, datab) { data: Belt_internalAVLset.copy(dataa$1) }; } - var sizea = Belt_internalAVLset.lengthNode(dataa$1); - var sizeb = Belt_internalAVLset.lengthNode(datab$1); - var totalSize = sizea + sizeb | 0; - var tmp = new Array(totalSize); + let sizea = Belt_internalAVLset.lengthNode(dataa$1); + let sizeb = Belt_internalAVLset.lengthNode(datab$1); + let totalSize = sizea + sizeb | 0; + let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(dataa$1, 0, tmp); Belt_internalAVLset.fillArray(datab$1, sizea, tmp); if (tmp[sizea - 1 | 0] < tmp[sizea] || tmp[totalSize - 1 | 0] < tmp[0]) { @@ -406,16 +406,16 @@ function diff(dataa, datab) { data: Belt_internalAVLset.copy(dataa$1) }; } - var tmp2 = new Array(sizea); - var k = Belt_SortArrayInt.diff(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); + let tmp2 = new Array(sizea); + let k = Belt_SortArrayInt.diff(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); return { data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) }; } function union(dataa, datab) { - var dataa$1 = dataa.data; - var datab$1 = datab.data; + let dataa$1 = dataa.data; + let datab$1 = datab.data; if (dataa$1 === undefined) { return { data: Belt_internalAVLset.copy(datab$1) @@ -426,10 +426,10 @@ function union(dataa, datab) { data: Belt_internalAVLset.copy(dataa$1) }; } - var sizea = Belt_internalAVLset.lengthNode(dataa$1); - var sizeb = Belt_internalAVLset.lengthNode(datab$1); - var totalSize = sizea + sizeb | 0; - var tmp = new Array(totalSize); + let sizea = Belt_internalAVLset.lengthNode(dataa$1); + let sizeb = Belt_internalAVLset.lengthNode(datab$1); + let totalSize = sizea + sizeb | 0; + let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(dataa$1, 0, tmp); Belt_internalAVLset.fillArray(datab$1, sizea, tmp); if (tmp[sizea - 1 | 0] < tmp[sizea]) { @@ -437,8 +437,8 @@ function union(dataa, datab) { data: Belt_internalAVLset.fromSortedArrayAux(tmp, 0, totalSize) }; } - var tmp2 = new Array(totalSize); - var k = Belt_SortArrayInt.union(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); + let tmp2 = new Array(totalSize); + let k = Belt_SortArrayInt.union(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); return { data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) }; diff --git a/lib/js/belt_MutableSetString.js b/lib/js/belt_MutableSetString.js index b43cfb6df1..41ec76ee9e 100644 --- a/lib/js/belt_MutableSetString.js +++ b/lib/js/belt_MutableSetString.js @@ -1,15 +1,15 @@ 'use strict'; -var Curry = require("./curry.js"); -var Belt_internalAVLset = require("./belt_internalAVLset.js"); -var Belt_SortArrayString = require("./belt_SortArrayString.js"); -var Belt_internalSetString = require("./belt_internalSetString.js"); +let Curry = require("./curry.js"); +let Belt_internalAVLset = require("./belt_internalAVLset.js"); +let Belt_SortArrayString = require("./belt_SortArrayString.js"); +let Belt_internalSetString = require("./belt_internalSetString.js"); function remove0(nt, x) { - var k = nt.v; + let k = nt.v; if (x === k) { - var l = nt.l; - var r = nt.r; + let l = nt.l; + let r = nt.r; if (l !== undefined) { if (r !== undefined) { nt.r = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r); @@ -22,7 +22,7 @@ function remove0(nt, x) { } } if (x < k) { - var l$1 = nt.l; + let l$1 = nt.l; if (l$1 !== undefined) { nt.l = remove0(l$1, x); return Belt_internalAVLset.balMutate(nt); @@ -30,7 +30,7 @@ function remove0(nt, x) { return nt; } } - var r$1 = nt.r; + let r$1 = nt.r; if (r$1 !== undefined) { nt.r = remove0(r$1, x); return Belt_internalAVLset.balMutate(nt); @@ -40,11 +40,11 @@ function remove0(nt, x) { } function remove(d, v) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return; } - var newRoot = remove0(oldRoot, v); + let newRoot = remove0(oldRoot, v); if (newRoot !== oldRoot) { d.data = newRoot; return; @@ -54,13 +54,13 @@ function remove(d, v) { function removeMany0(_t, xs, _i, len) { while(true) { - var i = _i; - var t = _t; + let i = _i; + let t = _t; if (i >= len) { return t; } - var ele = xs[i]; - var u = remove0(t, ele); + let ele = xs[i]; + let u = remove0(t, ele); if (u === undefined) { return; } @@ -71,20 +71,20 @@ function removeMany0(_t, xs, _i, len) { } function removeMany(d, xs) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return; } - var len = xs.length; + let len = xs.length; d.data = removeMany0(oldRoot, xs, 0, len); } function removeCheck0(nt, x, removed) { - var k = nt.v; + let k = nt.v; if (x === k) { removed.contents = true; - var l = nt.l; - var r = nt.r; + let l = nt.l; + let r = nt.r; if (l !== undefined) { if (r !== undefined) { nt.r = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r); @@ -97,7 +97,7 @@ function removeCheck0(nt, x, removed) { } } if (x < k) { - var l$1 = nt.l; + let l$1 = nt.l; if (l$1 !== undefined) { nt.l = removeCheck0(l$1, x, removed); return Belt_internalAVLset.balMutate(nt); @@ -105,7 +105,7 @@ function removeCheck0(nt, x, removed) { return nt; } } - var r$1 = nt.r; + let r$1 = nt.r; if (r$1 !== undefined) { nt.r = removeCheck0(r$1, x, removed); return Belt_internalAVLset.balMutate(nt); @@ -115,14 +115,14 @@ function removeCheck0(nt, x, removed) { } function removeCheck(d, v) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return false; } - var removed = { + let removed = { contents: false }; - var newRoot = removeCheck0(oldRoot, v, removed); + let newRoot = removeCheck0(oldRoot, v, removed); if (newRoot !== oldRoot) { d.data = newRoot; } @@ -131,14 +131,14 @@ function removeCheck(d, v) { function addCheck0(t, x, added) { if (t !== undefined) { - var k = t.v; + let k = t.v; if (x === k) { return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (x < k) { - var ll = addCheck0(l, x, added); + let ll = addCheck0(l, x, added); t.l = ll; } else { t.r = addCheck0(r, x, added); @@ -150,11 +150,11 @@ function addCheck0(t, x, added) { } function addCheck(m, e) { - var oldRoot = m.data; - var added = { + let oldRoot = m.data; + let added = { contents: false }; - var newRoot = addCheck0(oldRoot, e, added); + let newRoot = addCheck0(oldRoot, e, added); if (newRoot !== oldRoot) { m.data = newRoot; } @@ -162,8 +162,8 @@ function addCheck(m, e) { } function add(d, k) { - var oldRoot = d.data; - var v = Belt_internalSetString.addMutate(oldRoot, k); + let oldRoot = d.data; + let v = Belt_internalSetString.addMutate(oldRoot, k); if (v !== oldRoot) { d.data = v; return; @@ -172,8 +172,8 @@ function add(d, k) { } function addArrayMutate(t, xs) { - var v = t; - for(var i = 0 ,i_finish = xs.length; i < i_finish; ++i){ + let v = t; + for(let i = 0 ,i_finish = xs.length; i < i_finish; ++i){ v = Belt_internalSetString.addMutate(v, xs[i]); } return v; @@ -190,7 +190,7 @@ function make(param) { } function isEmpty(d) { - var n = d.data; + let n = d.data; return n === undefined; } @@ -291,9 +291,9 @@ function getExn(d, x) { } function split(d, key) { - var arr = Belt_internalAVLset.toArray(d.data); - var i = Belt_SortArrayString.binarySearch(arr, key); - var len = arr.length; + let arr = Belt_internalAVLset.toArray(d.data); + let i = Belt_SortArrayString.binarySearch(arr, key); + let len = arr.length; if (i >= 0) { return [ [ @@ -307,7 +307,7 @@ function split(d, key) { true ]; } - var next = (-i | 0) - 1 | 0; + let next = (-i | 0) - 1 | 0; return [ [ { @@ -332,7 +332,7 @@ function keep(d, p) { } function partitionU(d, p) { - var match = Belt_internalAVLset.partitionCopyU(d.data, p); + let match = Belt_internalAVLset.partitionCopyU(d.data, p); return [ { data: match[0] @@ -352,8 +352,8 @@ function subset(a, b) { } function intersect(dataa, datab) { - var dataa$1 = dataa.data; - var datab$1 = datab.data; + let dataa$1 = dataa.data; + let datab$1 = datab.data; if (dataa$1 === undefined) { return { data: undefined @@ -364,10 +364,10 @@ function intersect(dataa, datab) { data: undefined }; } - var sizea = Belt_internalAVLset.lengthNode(dataa$1); - var sizeb = Belt_internalAVLset.lengthNode(datab$1); - var totalSize = sizea + sizeb | 0; - var tmp = new Array(totalSize); + let sizea = Belt_internalAVLset.lengthNode(dataa$1); + let sizeb = Belt_internalAVLset.lengthNode(datab$1); + let totalSize = sizea + sizeb | 0; + let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(dataa$1, 0, tmp); Belt_internalAVLset.fillArray(datab$1, sizea, tmp); if (tmp[sizea - 1 | 0] < tmp[sizea] || tmp[totalSize - 1 | 0] < tmp[0]) { @@ -375,16 +375,16 @@ function intersect(dataa, datab) { data: undefined }; } - var tmp2 = new Array(sizea < sizeb ? sizea : sizeb); - var k = Belt_SortArrayString.intersect(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); + let tmp2 = new Array(sizea < sizeb ? sizea : sizeb); + let k = Belt_SortArrayString.intersect(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); return { data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) }; } function diff(dataa, datab) { - var dataa$1 = dataa.data; - var datab$1 = datab.data; + let dataa$1 = dataa.data; + let datab$1 = datab.data; if (dataa$1 === undefined) { return { data: undefined @@ -395,10 +395,10 @@ function diff(dataa, datab) { data: Belt_internalAVLset.copy(dataa$1) }; } - var sizea = Belt_internalAVLset.lengthNode(dataa$1); - var sizeb = Belt_internalAVLset.lengthNode(datab$1); - var totalSize = sizea + sizeb | 0; - var tmp = new Array(totalSize); + let sizea = Belt_internalAVLset.lengthNode(dataa$1); + let sizeb = Belt_internalAVLset.lengthNode(datab$1); + let totalSize = sizea + sizeb | 0; + let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(dataa$1, 0, tmp); Belt_internalAVLset.fillArray(datab$1, sizea, tmp); if (tmp[sizea - 1 | 0] < tmp[sizea] || tmp[totalSize - 1 | 0] < tmp[0]) { @@ -406,16 +406,16 @@ function diff(dataa, datab) { data: Belt_internalAVLset.copy(dataa$1) }; } - var tmp2 = new Array(sizea); - var k = Belt_SortArrayString.diff(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); + let tmp2 = new Array(sizea); + let k = Belt_SortArrayString.diff(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); return { data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) }; } function union(dataa, datab) { - var dataa$1 = dataa.data; - var datab$1 = datab.data; + let dataa$1 = dataa.data; + let datab$1 = datab.data; if (dataa$1 === undefined) { return { data: Belt_internalAVLset.copy(datab$1) @@ -426,10 +426,10 @@ function union(dataa, datab) { data: Belt_internalAVLset.copy(dataa$1) }; } - var sizea = Belt_internalAVLset.lengthNode(dataa$1); - var sizeb = Belt_internalAVLset.lengthNode(datab$1); - var totalSize = sizea + sizeb | 0; - var tmp = new Array(totalSize); + let sizea = Belt_internalAVLset.lengthNode(dataa$1); + let sizeb = Belt_internalAVLset.lengthNode(datab$1); + let totalSize = sizea + sizeb | 0; + let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(dataa$1, 0, tmp); Belt_internalAVLset.fillArray(datab$1, sizea, tmp); if (tmp[sizea - 1 | 0] < tmp[sizea]) { @@ -437,8 +437,8 @@ function union(dataa, datab) { data: Belt_internalAVLset.fromSortedArrayAux(tmp, 0, totalSize) }; } - var tmp2 = new Array(totalSize); - var k = Belt_SortArrayString.union(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); + let tmp2 = new Array(totalSize); + let k = Belt_SortArrayString.union(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); return { data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) }; diff --git a/lib/js/belt_MutableStack.js b/lib/js/belt_MutableStack.js index 44335f9540..e8e38fd830 100644 --- a/lib/js/belt_MutableStack.js +++ b/lib/js/belt_MutableStack.js @@ -1,7 +1,7 @@ 'use strict'; -var Curry = require("./curry.js"); -var Caml_option = require("./caml_option.js"); +let Curry = require("./curry.js"); +let Caml_option = require("./caml_option.js"); function make(param) { return { @@ -27,7 +27,7 @@ function push(s, x) { } function topUndefined(s) { - var x = s.root; + let x = s.root; if (x !== undefined) { return x.head; } @@ -35,7 +35,7 @@ function topUndefined(s) { } function top(s) { - var x = s.root; + let x = s.root; if (x !== undefined) { return Caml_option.some(x.head); } @@ -47,7 +47,7 @@ function isEmpty(s) { } function popUndefined(s) { - var x = s.root; + let x = s.root; if (x !== undefined) { s.root = x.tail; return x.head; @@ -56,7 +56,7 @@ function popUndefined(s) { } function pop(s) { - var x = s.root; + let x = s.root; if (x !== undefined) { s.root = x.tail; return Caml_option.some(x.head); @@ -65,14 +65,14 @@ function pop(s) { } function size(s) { - var x = s.root; + let x = s.root; if (x !== undefined) { - var _x = x; - var _acc = 0; + let _x = x; + let _acc = 0; while(true) { - var acc = _acc; - var x$1 = _x; - var x$2 = x$1.tail; + let acc = _acc; + let x$1 = _x; + let x$2 = x$1.tail; if (x$2 === undefined) { return acc + 1 | 0; } @@ -86,9 +86,9 @@ function size(s) { } function forEachU(s, f) { - var _s = s.root; + let _s = s.root; while(true) { - var s$1 = _s; + let s$1 = _s; if (s$1 === undefined) { return; } @@ -104,7 +104,7 @@ function forEach(s, f) { function dynamicPopIterU(s, f) { while(true) { - var match = s.root; + let match = s.root; if (match === undefined) { return; } diff --git a/lib/js/belt_Option.js b/lib/js/belt_Option.js index 072be465b0..3f526210c8 100644 --- a/lib/js/belt_Option.js +++ b/lib/js/belt_Option.js @@ -1,7 +1,7 @@ 'use strict'; -var Curry = require("./curry.js"); -var Caml_option = require("./caml_option.js"); +let Curry = require("./curry.js"); +let Caml_option = require("./caml_option.js"); function keepU(opt, p) { if (opt !== undefined && p(Caml_option.valFromOption(opt))) { diff --git a/lib/js/belt_Range.js b/lib/js/belt_Range.js index acff5ec0b0..50e70732ce 100644 --- a/lib/js/belt_Range.js +++ b/lib/js/belt_Range.js @@ -1,9 +1,9 @@ 'use strict'; -var Curry = require("./curry.js"); +let Curry = require("./curry.js"); function forEachU(s, f, action) { - for(var i = s; i <= f; ++i){ + for(let i = s; i <= f; ++i){ action(i); } } @@ -14,7 +14,7 @@ function forEach(s, f, action) { function everyU(_s, f, p) { while(true) { - var s = _s; + let s = _s; if (s > f) { return true; } @@ -32,9 +32,9 @@ function every(s, f, p) { function everyByU(s, f, step, p) { if (step > 0) { - var _s = s; + let _s = s; while(true) { - var s$1 = _s; + let s$1 = _s; if (s$1 > f) { return true; } @@ -55,7 +55,7 @@ function everyBy(s, f, step, p) { function someU(_s, f, p) { while(true) { - var s = _s; + let s = _s; if (s > f) { return false; } @@ -73,9 +73,9 @@ function some(s, f, p) { function someByU(s, f, step, p) { if (step > 0) { - var _s = s; + let _s = s; while(true) { - var s$1 = _s; + let s$1 = _s; if (s$1 > f) { return false; } diff --git a/lib/js/belt_Result.js b/lib/js/belt_Result.js index beaccf63f9..b48d49f92a 100644 --- a/lib/js/belt_Result.js +++ b/lib/js/belt_Result.js @@ -1,6 +1,6 @@ 'use strict'; -var Curry = require("./curry.js"); +let Curry = require("./curry.js"); function getExn(x) { if (x.TAG === "Ok") { diff --git a/lib/js/belt_Set.js b/lib/js/belt_Set.js index 2feaf204d7..a48d9ad746 100644 --- a/lib/js/belt_Set.js +++ b/lib/js/belt_Set.js @@ -1,10 +1,10 @@ 'use strict'; -var Curry = require("./curry.js"); -var Belt_SetDict = require("./belt_SetDict.js"); +let Curry = require("./curry.js"); +let Belt_SetDict = require("./belt_SetDict.js"); function fromArray(data, id) { - var cmp = id.cmp; + let cmp = id.cmp; return { cmp: cmp, data: Belt_SetDict.fromArray(data, cmp) @@ -12,9 +12,9 @@ function fromArray(data, id) { } function remove(m, e) { - var data = m.data; - var cmp = m.cmp; - var newData = Belt_SetDict.remove(data, e, cmp); + let data = m.data; + let cmp = m.cmp; + let newData = Belt_SetDict.remove(data, e, cmp); if (newData === data) { return m; } else { @@ -26,9 +26,9 @@ function remove(m, e) { } function add(m, e) { - var data = m.data; - var cmp = m.cmp; - var newData = Belt_SetDict.add(data, e, cmp); + let data = m.data; + let cmp = m.cmp; + let newData = Belt_SetDict.add(data, e, cmp); if (newData === data) { return m; } else { @@ -40,7 +40,7 @@ function add(m, e) { } function mergeMany(m, e) { - var cmp = m.cmp; + let cmp = m.cmp; return { cmp: cmp, data: Belt_SetDict.mergeMany(m.data, e, cmp) @@ -48,7 +48,7 @@ function mergeMany(m, e) { } function removeMany(m, e) { - var cmp = m.cmp; + let cmp = m.cmp; return { cmp: cmp, data: Belt_SetDict.removeMany(m.data, e, cmp) @@ -56,7 +56,7 @@ function removeMany(m, e) { } function union(m, n) { - var cmp = m.cmp; + let cmp = m.cmp; return { cmp: cmp, data: Belt_SetDict.union(m.data, n.data, cmp) @@ -64,7 +64,7 @@ function union(m, n) { } function intersect(m, n) { - var cmp = m.cmp; + let cmp = m.cmp; return { cmp: cmp, data: Belt_SetDict.intersect(m.data, n.data, cmp) @@ -72,7 +72,7 @@ function intersect(m, n) { } function diff(m, n) { - var cmp = m.cmp; + let cmp = m.cmp; return { cmp: cmp, data: Belt_SetDict.diff(m.data, n.data, cmp) @@ -80,14 +80,14 @@ function diff(m, n) { } function subset(m, n) { - var cmp = m.cmp; + let cmp = m.cmp; return Belt_SetDict.subset(m.data, n.data, cmp); } function split(m, e) { - var cmp = m.cmp; - var match = Belt_SetDict.split(m.data, e, cmp); - var match$1 = match[0]; + let cmp = m.cmp; + let match = Belt_SetDict.split(m.data, e, cmp); + let match$1 = match[0]; return [ [ { @@ -115,7 +115,7 @@ function isEmpty(m) { } function cmp(m, n) { - var cmp$1 = m.cmp; + let cmp$1 = m.cmp; return Belt_SetDict.cmp(m.data, n.data, cmp$1); } @@ -167,8 +167,8 @@ function keep(m, f) { } function partitionU(m, f) { - var match = Belt_SetDict.partitionU(m.data, f); - var cmp = m.cmp; + let match = Belt_SetDict.partitionU(m.data, f); + let cmp = m.cmp; return [ { cmp: cmp, @@ -241,7 +241,7 @@ function getData(m) { } function getId(m) { - var cmp = m.cmp; + let cmp = m.cmp; return { cmp: cmp }; @@ -258,11 +258,11 @@ function checkInvariantInternal(d) { Belt_SetDict.checkInvariantInternal(d.data); } -var Int; +let Int; -var $$String; +let $$String; -var Dict; +let Dict; exports.Int = Int; exports.$$String = $$String; diff --git a/lib/js/belt_SetDict.js b/lib/js/belt_SetDict.js index d69db2c1e3..f9fcded08d 100644 --- a/lib/js/belt_SetDict.js +++ b/lib/js/belt_SetDict.js @@ -1,27 +1,27 @@ 'use strict'; -var Belt_internalAVLset = require("./belt_internalAVLset.js"); +let Belt_internalAVLset = require("./belt_internalAVLset.js"); function add(t, x, cmp) { if (t === undefined) { return Belt_internalAVLset.singleton(x); } - var k = t.v; - var c = cmp(x, k); + let k = t.v; + let c = cmp(x, k); if (c === 0) { return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (c < 0) { - var ll = add(l, x, cmp); + let ll = add(l, x, cmp); if (ll === l) { return t; } else { return Belt_internalAVLset.bal(ll, k, r); } } - var rr = add(r, x, cmp); + let rr = add(r, x, cmp); if (rr === r) { return t; } else { @@ -33,10 +33,10 @@ function remove(t, x, cmp) { if (t === undefined) { return t; } - var v = t.v; - var l = t.l; - var r = t.r; - var c = cmp(x, v); + let v = t.v; + let l = t.l; + let r = t.r; + let c = cmp(x, v); if (c === 0) { if (l === undefined) { return r; @@ -44,21 +44,21 @@ function remove(t, x, cmp) { if (r === undefined) { return l; } - var v$1 = { + let v$1 = { contents: r.v }; - var r$1 = Belt_internalAVLset.removeMinAuxWithRef(r, v$1); + let r$1 = Belt_internalAVLset.removeMinAuxWithRef(r, v$1); return Belt_internalAVLset.bal(l, v$1.contents, r$1); } if (c < 0) { - var ll = remove(l, x, cmp); + let ll = remove(l, x, cmp); if (ll === l) { return t; } else { return Belt_internalAVLset.bal(ll, v, r); } } - var rr = remove(r, x, cmp); + let rr = remove(r, x, cmp); if (rr === r) { return t; } else { @@ -67,30 +67,30 @@ function remove(t, x, cmp) { } function mergeMany(h, arr, cmp) { - var len = arr.length; - var v = h; - for(var i = 0; i < len; ++i){ - var key = arr[i]; + let len = arr.length; + let v = h; + for(let i = 0; i < len; ++i){ + let key = arr[i]; v = add(v, key, cmp); } return v; } function removeMany(h, arr, cmp) { - var len = arr.length; - var v = h; - for(var i = 0; i < len; ++i){ - var key = arr[i]; + let len = arr.length; + let v = h; + for(let i = 0; i < len; ++i){ + let key = arr[i]; v = remove(v, key, cmp); } return v; } function splitAuxNoPivot(cmp, n, x) { - var v = n.v; - var l = n.l; - var r = n.r; - var c = cmp(x, v); + let v = n.v; + let l = n.l; + let r = n.r; + let c = cmp(x, v); if (c === 0) { return [ l, @@ -104,7 +104,7 @@ function splitAuxNoPivot(cmp, n, x) { n ]; } - var match = splitAuxNoPivot(cmp, l, x); + let match = splitAuxNoPivot(cmp, l, x); return [ match[0], Belt_internalAVLset.joinShared(match[1], v, r) @@ -116,7 +116,7 @@ function splitAuxNoPivot(cmp, n, x) { undefined ]; } - var match$1 = splitAuxNoPivot(cmp, r, x); + let match$1 = splitAuxNoPivot(cmp, r, x); return [ Belt_internalAVLset.joinShared(l, v, match$1[0]), match$1[1] @@ -124,10 +124,10 @@ function splitAuxNoPivot(cmp, n, x) { } function splitAuxPivot(cmp, n, x, pres) { - var v = n.v; - var l = n.l; - var r = n.r; - var c = cmp(x, v); + let v = n.v; + let l = n.l; + let r = n.r; + let c = cmp(x, v); if (c === 0) { pres.contents = true; return [ @@ -142,7 +142,7 @@ function splitAuxPivot(cmp, n, x, pres) { n ]; } - var match = splitAuxPivot(cmp, l, x, pres); + let match = splitAuxPivot(cmp, l, x, pres); return [ match[0], Belt_internalAVLset.joinShared(match[1], v, r) @@ -154,7 +154,7 @@ function splitAuxPivot(cmp, n, x, pres) { undefined ]; } - var match$1 = splitAuxPivot(cmp, r, x, pres); + let match$1 = splitAuxPivot(cmp, r, x, pres); return [ Belt_internalAVLset.joinShared(l, v, match$1[0]), match$1[1] @@ -171,10 +171,10 @@ function split(t, x, cmp) { false ]; } - var pres = { + let pres = { contents: false }; - var v = splitAuxPivot(cmp, t, x, pres); + let v = splitAuxPivot(cmp, t, x, pres); return [ v, pres.contents @@ -188,25 +188,25 @@ function union(s1, s2, cmp) { if (s2 === undefined) { return s1; } - var h1 = s1.h; - var h2 = s2.h; + let h1 = s1.h; + let h2 = s2.h; if (h1 >= h2) { if (h2 === 1) { return add(s1, s2.v, cmp); } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var match = splitAuxNoPivot(cmp, s2, v1); + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let match = splitAuxNoPivot(cmp, s2, v1); return Belt_internalAVLset.joinShared(union(l1, match[0], cmp), v1, union(r1, match[1], cmp)); } if (h1 === 1) { return add(s2, s1.v, cmp); } - var v2 = s2.v; - var l2 = s2.l; - var r2 = s2.r; - var match$1 = splitAuxNoPivot(cmp, s1, v2); + let v2 = s2.v; + let l2 = s2.l; + let r2 = s2.r; + let match$1 = splitAuxNoPivot(cmp, s1, v2); return Belt_internalAVLset.joinShared(union(match$1[0], l2, cmp), v2, union(match$1[1], r2, cmp)); } @@ -217,15 +217,15 @@ function intersect(s1, s2, cmp) { if (s2 === undefined) { return; } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var pres = { + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let pres = { contents: false }; - var match = splitAuxPivot(cmp, s2, v1, pres); - var ll = intersect(l1, match[0], cmp); - var rr = intersect(r1, match[1], cmp); + let match = splitAuxPivot(cmp, s2, v1, pres); + let ll = intersect(l1, match[0], cmp); + let rr = intersect(r1, match[1], cmp); if (pres.contents) { return Belt_internalAVLset.joinShared(ll, v1, rr); } else { @@ -240,15 +240,15 @@ function diff(s1, s2, cmp) { if (s2 === undefined) { return s1; } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var pres = { + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let pres = { contents: false }; - var match = splitAuxPivot(cmp, s2, v1, pres); - var ll = diff(l1, match[0], cmp); - var rr = diff(r1, match[1], cmp); + let match = splitAuxPivot(cmp, s2, v1, pres); + let ll = diff(l1, match[0], cmp); + let rr = diff(r1, match[1], cmp); if (pres.contents) { return Belt_internalAVLset.concatShared(ll, rr); } else { @@ -256,67 +256,67 @@ function diff(s1, s2, cmp) { } } -var empty; +let empty; -var fromArray = Belt_internalAVLset.fromArray; +let fromArray = Belt_internalAVLset.fromArray; -var fromSortedArrayUnsafe = Belt_internalAVLset.fromSortedArrayUnsafe; +let fromSortedArrayUnsafe = Belt_internalAVLset.fromSortedArrayUnsafe; -var isEmpty = Belt_internalAVLset.isEmpty; +let isEmpty = Belt_internalAVLset.isEmpty; -var has = Belt_internalAVLset.has; +let has = Belt_internalAVLset.has; -var subset = Belt_internalAVLset.subset; +let subset = Belt_internalAVLset.subset; -var cmp = Belt_internalAVLset.cmp; +let cmp = Belt_internalAVLset.cmp; -var eq = Belt_internalAVLset.eq; +let eq = Belt_internalAVLset.eq; -var forEachU = Belt_internalAVLset.forEachU; +let forEachU = Belt_internalAVLset.forEachU; -var forEach = Belt_internalAVLset.forEach; +let forEach = Belt_internalAVLset.forEach; -var reduceU = Belt_internalAVLset.reduceU; +let reduceU = Belt_internalAVLset.reduceU; -var reduce = Belt_internalAVLset.reduce; +let reduce = Belt_internalAVLset.reduce; -var everyU = Belt_internalAVLset.everyU; +let everyU = Belt_internalAVLset.everyU; -var every = Belt_internalAVLset.every; +let every = Belt_internalAVLset.every; -var someU = Belt_internalAVLset.someU; +let someU = Belt_internalAVLset.someU; -var some = Belt_internalAVLset.some; +let some = Belt_internalAVLset.some; -var keepU = Belt_internalAVLset.keepSharedU; +let keepU = Belt_internalAVLset.keepSharedU; -var keep = Belt_internalAVLset.keepShared; +let keep = Belt_internalAVLset.keepShared; -var partitionU = Belt_internalAVLset.partitionSharedU; +let partitionU = Belt_internalAVLset.partitionSharedU; -var partition = Belt_internalAVLset.partitionShared; +let partition = Belt_internalAVLset.partitionShared; -var size = Belt_internalAVLset.size; +let size = Belt_internalAVLset.size; -var toList = Belt_internalAVLset.toList; +let toList = Belt_internalAVLset.toList; -var toArray = Belt_internalAVLset.toArray; +let toArray = Belt_internalAVLset.toArray; -var minimum = Belt_internalAVLset.minimum; +let minimum = Belt_internalAVLset.minimum; -var minUndefined = Belt_internalAVLset.minUndefined; +let minUndefined = Belt_internalAVLset.minUndefined; -var maximum = Belt_internalAVLset.maximum; +let maximum = Belt_internalAVLset.maximum; -var maxUndefined = Belt_internalAVLset.maxUndefined; +let maxUndefined = Belt_internalAVLset.maxUndefined; -var get = Belt_internalAVLset.get; +let get = Belt_internalAVLset.get; -var getUndefined = Belt_internalAVLset.getUndefined; +let getUndefined = Belt_internalAVLset.getUndefined; -var getExn = Belt_internalAVLset.getExn; +let getExn = Belt_internalAVLset.getExn; -var checkInvariantInternal = Belt_internalAVLset.checkInvariantInternal; +let checkInvariantInternal = Belt_internalAVLset.checkInvariantInternal; exports.empty = empty; exports.fromArray = fromArray; diff --git a/lib/js/belt_SetInt.js b/lib/js/belt_SetInt.js index 619d0e8487..6c2b170b10 100644 --- a/lib/js/belt_SetInt.js +++ b/lib/js/belt_SetInt.js @@ -1,27 +1,27 @@ 'use strict'; -var Belt_internalAVLset = require("./belt_internalAVLset.js"); -var Belt_internalSetInt = require("./belt_internalSetInt.js"); +let Belt_internalAVLset = require("./belt_internalAVLset.js"); +let Belt_internalSetInt = require("./belt_internalSetInt.js"); function add(t, x) { if (t === undefined) { return Belt_internalAVLset.singleton(x); } - var v = t.v; + let v = t.v; if (x === v) { return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (x < v) { - var ll = add(l, x); + let ll = add(l, x); if (ll === l) { return t; } else { return Belt_internalAVLset.bal(ll, v, r); } } - var rr = add(r, x); + let rr = add(r, x); if (rr === r) { return t; } else { @@ -30,10 +30,10 @@ function add(t, x) { } function mergeMany(h, arr) { - var len = arr.length; - var v = h; - for(var i = 0; i < len; ++i){ - var key = arr[i]; + let len = arr.length; + let v = h; + for(let i = 0; i < len; ++i){ + let key = arr[i]; v = add(v, key); } return v; @@ -43,9 +43,9 @@ function remove(t, x) { if (t === undefined) { return t; } - var v = t.v; - var l = t.l; - var r = t.r; + let v = t.v; + let l = t.l; + let r = t.r; if (x === v) { if (l === undefined) { return r; @@ -53,21 +53,21 @@ function remove(t, x) { if (r === undefined) { return l; } - var v$1 = { + let v$1 = { contents: r.v }; - var r$1 = Belt_internalAVLset.removeMinAuxWithRef(r, v$1); + let r$1 = Belt_internalAVLset.removeMinAuxWithRef(r, v$1); return Belt_internalAVLset.bal(l, v$1.contents, r$1); } if (x < v) { - var ll = remove(l, x); + let ll = remove(l, x); if (ll === l) { return t; } else { return Belt_internalAVLset.bal(ll, v, r); } } - var rr = remove(r, x); + let rr = remove(r, x); if (rr === r) { return t; } else { @@ -76,19 +76,19 @@ function remove(t, x) { } function removeMany(h, arr) { - var len = arr.length; - var v = h; - for(var i = 0; i < len; ++i){ - var key = arr[i]; + let len = arr.length; + let v = h; + for(let i = 0; i < len; ++i){ + let key = arr[i]; v = remove(v, key); } return v; } function splitAuxNoPivot(n, x) { - var v = n.v; - var l = n.l; - var r = n.r; + let v = n.v; + let l = n.l; + let r = n.r; if (x === v) { return [ l, @@ -102,7 +102,7 @@ function splitAuxNoPivot(n, x) { n ]; } - var match = splitAuxNoPivot(l, x); + let match = splitAuxNoPivot(l, x); return [ match[0], Belt_internalAVLset.joinShared(match[1], v, r) @@ -114,7 +114,7 @@ function splitAuxNoPivot(n, x) { undefined ]; } - var match$1 = splitAuxNoPivot(r, x); + let match$1 = splitAuxNoPivot(r, x); return [ Belt_internalAVLset.joinShared(l, v, match$1[0]), match$1[1] @@ -122,9 +122,9 @@ function splitAuxNoPivot(n, x) { } function splitAuxPivot(n, x, pres) { - var v = n.v; - var l = n.l; - var r = n.r; + let v = n.v; + let l = n.l; + let r = n.r; if (x === v) { pres.contents = true; return [ @@ -139,7 +139,7 @@ function splitAuxPivot(n, x, pres) { n ]; } - var match = splitAuxPivot(l, x, pres); + let match = splitAuxPivot(l, x, pres); return [ match[0], Belt_internalAVLset.joinShared(match[1], v, r) @@ -151,7 +151,7 @@ function splitAuxPivot(n, x, pres) { undefined ]; } - var match$1 = splitAuxPivot(r, x, pres); + let match$1 = splitAuxPivot(r, x, pres); return [ Belt_internalAVLset.joinShared(l, v, match$1[0]), match$1[1] @@ -168,10 +168,10 @@ function split(t, x) { false ]; } - var pres = { + let pres = { contents: false }; - var v = splitAuxPivot(t, x, pres); + let v = splitAuxPivot(t, x, pres); return [ v, pres.contents @@ -185,25 +185,25 @@ function union(s1, s2) { if (s2 === undefined) { return s1; } - var h1 = s1.h; - var h2 = s2.h; + let h1 = s1.h; + let h2 = s2.h; if (h1 >= h2) { if (h2 === 1) { return add(s1, s2.v); } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var match = splitAuxNoPivot(s2, v1); + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let match = splitAuxNoPivot(s2, v1); return Belt_internalAVLset.joinShared(union(l1, match[0]), v1, union(r1, match[1])); } if (h1 === 1) { return add(s2, s1.v); } - var v2 = s2.v; - var l2 = s2.l; - var r2 = s2.r; - var match$1 = splitAuxNoPivot(s1, v2); + let v2 = s2.v; + let l2 = s2.l; + let r2 = s2.r; + let match$1 = splitAuxNoPivot(s1, v2); return Belt_internalAVLset.joinShared(union(match$1[0], l2), v2, union(match$1[1], r2)); } @@ -214,15 +214,15 @@ function intersect(s1, s2) { if (s2 === undefined) { return; } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var pres = { + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let pres = { contents: false }; - var match = splitAuxPivot(s2, v1, pres); - var ll = intersect(l1, match[0]); - var rr = intersect(r1, match[1]); + let match = splitAuxPivot(s2, v1, pres); + let ll = intersect(l1, match[0]); + let rr = intersect(r1, match[1]); if (pres.contents) { return Belt_internalAVLset.joinShared(ll, v1, rr); } else { @@ -237,15 +237,15 @@ function diff(s1, s2) { if (s2 === undefined) { return s1; } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var pres = { + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let pres = { contents: false }; - var match = splitAuxPivot(s2, v1, pres); - var ll = diff(l1, match[0]); - var rr = diff(r1, match[1]); + let match = splitAuxPivot(s2, v1, pres); + let ll = diff(l1, match[0]); + let rr = diff(r1, match[1]); if (pres.contents) { return Belt_internalAVLset.concatShared(ll, rr); } else { @@ -253,67 +253,67 @@ function diff(s1, s2) { } } -var empty; +let empty; -var fromArray = Belt_internalSetInt.fromArray; +let fromArray = Belt_internalSetInt.fromArray; -var fromSortedArrayUnsafe = Belt_internalAVLset.fromSortedArrayUnsafe; +let fromSortedArrayUnsafe = Belt_internalAVLset.fromSortedArrayUnsafe; -var isEmpty = Belt_internalAVLset.isEmpty; +let isEmpty = Belt_internalAVLset.isEmpty; -var has = Belt_internalSetInt.has; +let has = Belt_internalSetInt.has; -var subset = Belt_internalSetInt.subset; +let subset = Belt_internalSetInt.subset; -var cmp = Belt_internalSetInt.cmp; +let cmp = Belt_internalSetInt.cmp; -var eq = Belt_internalSetInt.eq; +let eq = Belt_internalSetInt.eq; -var forEachU = Belt_internalAVLset.forEachU; +let forEachU = Belt_internalAVLset.forEachU; -var forEach = Belt_internalAVLset.forEach; +let forEach = Belt_internalAVLset.forEach; -var reduceU = Belt_internalAVLset.reduceU; +let reduceU = Belt_internalAVLset.reduceU; -var reduce = Belt_internalAVLset.reduce; +let reduce = Belt_internalAVLset.reduce; -var everyU = Belt_internalAVLset.everyU; +let everyU = Belt_internalAVLset.everyU; -var every = Belt_internalAVLset.every; +let every = Belt_internalAVLset.every; -var someU = Belt_internalAVLset.someU; +let someU = Belt_internalAVLset.someU; -var some = Belt_internalAVLset.some; +let some = Belt_internalAVLset.some; -var keepU = Belt_internalAVLset.keepSharedU; +let keepU = Belt_internalAVLset.keepSharedU; -var keep = Belt_internalAVLset.keepShared; +let keep = Belt_internalAVLset.keepShared; -var partitionU = Belt_internalAVLset.partitionSharedU; +let partitionU = Belt_internalAVLset.partitionSharedU; -var partition = Belt_internalAVLset.partitionShared; +let partition = Belt_internalAVLset.partitionShared; -var size = Belt_internalAVLset.size; +let size = Belt_internalAVLset.size; -var toList = Belt_internalAVLset.toList; +let toList = Belt_internalAVLset.toList; -var toArray = Belt_internalAVLset.toArray; +let toArray = Belt_internalAVLset.toArray; -var minimum = Belt_internalAVLset.minimum; +let minimum = Belt_internalAVLset.minimum; -var minUndefined = Belt_internalAVLset.minUndefined; +let minUndefined = Belt_internalAVLset.minUndefined; -var maximum = Belt_internalAVLset.maximum; +let maximum = Belt_internalAVLset.maximum; -var maxUndefined = Belt_internalAVLset.maxUndefined; +let maxUndefined = Belt_internalAVLset.maxUndefined; -var get = Belt_internalSetInt.get; +let get = Belt_internalSetInt.get; -var getUndefined = Belt_internalSetInt.getUndefined; +let getUndefined = Belt_internalSetInt.getUndefined; -var getExn = Belt_internalSetInt.getExn; +let getExn = Belt_internalSetInt.getExn; -var checkInvariantInternal = Belt_internalAVLset.checkInvariantInternal; +let checkInvariantInternal = Belt_internalAVLset.checkInvariantInternal; exports.empty = empty; exports.fromArray = fromArray; diff --git a/lib/js/belt_SetString.js b/lib/js/belt_SetString.js index a33133a201..3c62a4ea0b 100644 --- a/lib/js/belt_SetString.js +++ b/lib/js/belt_SetString.js @@ -1,27 +1,27 @@ 'use strict'; -var Belt_internalAVLset = require("./belt_internalAVLset.js"); -var Belt_internalSetString = require("./belt_internalSetString.js"); +let Belt_internalAVLset = require("./belt_internalAVLset.js"); +let Belt_internalSetString = require("./belt_internalSetString.js"); function add(t, x) { if (t === undefined) { return Belt_internalAVLset.singleton(x); } - var v = t.v; + let v = t.v; if (x === v) { return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (x < v) { - var ll = add(l, x); + let ll = add(l, x); if (ll === l) { return t; } else { return Belt_internalAVLset.bal(ll, v, r); } } - var rr = add(r, x); + let rr = add(r, x); if (rr === r) { return t; } else { @@ -30,10 +30,10 @@ function add(t, x) { } function mergeMany(h, arr) { - var len = arr.length; - var v = h; - for(var i = 0; i < len; ++i){ - var key = arr[i]; + let len = arr.length; + let v = h; + for(let i = 0; i < len; ++i){ + let key = arr[i]; v = add(v, key); } return v; @@ -43,9 +43,9 @@ function remove(t, x) { if (t === undefined) { return t; } - var v = t.v; - var l = t.l; - var r = t.r; + let v = t.v; + let l = t.l; + let r = t.r; if (x === v) { if (l === undefined) { return r; @@ -53,21 +53,21 @@ function remove(t, x) { if (r === undefined) { return l; } - var v$1 = { + let v$1 = { contents: r.v }; - var r$1 = Belt_internalAVLset.removeMinAuxWithRef(r, v$1); + let r$1 = Belt_internalAVLset.removeMinAuxWithRef(r, v$1); return Belt_internalAVLset.bal(l, v$1.contents, r$1); } if (x < v) { - var ll = remove(l, x); + let ll = remove(l, x); if (ll === l) { return t; } else { return Belt_internalAVLset.bal(ll, v, r); } } - var rr = remove(r, x); + let rr = remove(r, x); if (rr === r) { return t; } else { @@ -76,19 +76,19 @@ function remove(t, x) { } function removeMany(h, arr) { - var len = arr.length; - var v = h; - for(var i = 0; i < len; ++i){ - var key = arr[i]; + let len = arr.length; + let v = h; + for(let i = 0; i < len; ++i){ + let key = arr[i]; v = remove(v, key); } return v; } function splitAuxNoPivot(n, x) { - var v = n.v; - var l = n.l; - var r = n.r; + let v = n.v; + let l = n.l; + let r = n.r; if (x === v) { return [ l, @@ -102,7 +102,7 @@ function splitAuxNoPivot(n, x) { n ]; } - var match = splitAuxNoPivot(l, x); + let match = splitAuxNoPivot(l, x); return [ match[0], Belt_internalAVLset.joinShared(match[1], v, r) @@ -114,7 +114,7 @@ function splitAuxNoPivot(n, x) { undefined ]; } - var match$1 = splitAuxNoPivot(r, x); + let match$1 = splitAuxNoPivot(r, x); return [ Belt_internalAVLset.joinShared(l, v, match$1[0]), match$1[1] @@ -122,9 +122,9 @@ function splitAuxNoPivot(n, x) { } function splitAuxPivot(n, x, pres) { - var v = n.v; - var l = n.l; - var r = n.r; + let v = n.v; + let l = n.l; + let r = n.r; if (x === v) { pres.contents = true; return [ @@ -139,7 +139,7 @@ function splitAuxPivot(n, x, pres) { n ]; } - var match = splitAuxPivot(l, x, pres); + let match = splitAuxPivot(l, x, pres); return [ match[0], Belt_internalAVLset.joinShared(match[1], v, r) @@ -151,7 +151,7 @@ function splitAuxPivot(n, x, pres) { undefined ]; } - var match$1 = splitAuxPivot(r, x, pres); + let match$1 = splitAuxPivot(r, x, pres); return [ Belt_internalAVLset.joinShared(l, v, match$1[0]), match$1[1] @@ -168,10 +168,10 @@ function split(t, x) { false ]; } - var pres = { + let pres = { contents: false }; - var v = splitAuxPivot(t, x, pres); + let v = splitAuxPivot(t, x, pres); return [ v, pres.contents @@ -185,25 +185,25 @@ function union(s1, s2) { if (s2 === undefined) { return s1; } - var h1 = s1.h; - var h2 = s2.h; + let h1 = s1.h; + let h2 = s2.h; if (h1 >= h2) { if (h2 === 1) { return add(s1, s2.v); } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var match = splitAuxNoPivot(s2, v1); + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let match = splitAuxNoPivot(s2, v1); return Belt_internalAVLset.joinShared(union(l1, match[0]), v1, union(r1, match[1])); } if (h1 === 1) { return add(s2, s1.v); } - var v2 = s2.v; - var l2 = s2.l; - var r2 = s2.r; - var match$1 = splitAuxNoPivot(s1, v2); + let v2 = s2.v; + let l2 = s2.l; + let r2 = s2.r; + let match$1 = splitAuxNoPivot(s1, v2); return Belt_internalAVLset.joinShared(union(match$1[0], l2), v2, union(match$1[1], r2)); } @@ -214,15 +214,15 @@ function intersect(s1, s2) { if (s2 === undefined) { return; } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var pres = { + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let pres = { contents: false }; - var match = splitAuxPivot(s2, v1, pres); - var ll = intersect(l1, match[0]); - var rr = intersect(r1, match[1]); + let match = splitAuxPivot(s2, v1, pres); + let ll = intersect(l1, match[0]); + let rr = intersect(r1, match[1]); if (pres.contents) { return Belt_internalAVLset.joinShared(ll, v1, rr); } else { @@ -237,15 +237,15 @@ function diff(s1, s2) { if (s2 === undefined) { return s1; } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var pres = { + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let pres = { contents: false }; - var match = splitAuxPivot(s2, v1, pres); - var ll = diff(l1, match[0]); - var rr = diff(r1, match[1]); + let match = splitAuxPivot(s2, v1, pres); + let ll = diff(l1, match[0]); + let rr = diff(r1, match[1]); if (pres.contents) { return Belt_internalAVLset.concatShared(ll, rr); } else { @@ -253,67 +253,67 @@ function diff(s1, s2) { } } -var empty; +let empty; -var fromArray = Belt_internalSetString.fromArray; +let fromArray = Belt_internalSetString.fromArray; -var fromSortedArrayUnsafe = Belt_internalAVLset.fromSortedArrayUnsafe; +let fromSortedArrayUnsafe = Belt_internalAVLset.fromSortedArrayUnsafe; -var isEmpty = Belt_internalAVLset.isEmpty; +let isEmpty = Belt_internalAVLset.isEmpty; -var has = Belt_internalSetString.has; +let has = Belt_internalSetString.has; -var subset = Belt_internalSetString.subset; +let subset = Belt_internalSetString.subset; -var cmp = Belt_internalSetString.cmp; +let cmp = Belt_internalSetString.cmp; -var eq = Belt_internalSetString.eq; +let eq = Belt_internalSetString.eq; -var forEachU = Belt_internalAVLset.forEachU; +let forEachU = Belt_internalAVLset.forEachU; -var forEach = Belt_internalAVLset.forEach; +let forEach = Belt_internalAVLset.forEach; -var reduceU = Belt_internalAVLset.reduceU; +let reduceU = Belt_internalAVLset.reduceU; -var reduce = Belt_internalAVLset.reduce; +let reduce = Belt_internalAVLset.reduce; -var everyU = Belt_internalAVLset.everyU; +let everyU = Belt_internalAVLset.everyU; -var every = Belt_internalAVLset.every; +let every = Belt_internalAVLset.every; -var someU = Belt_internalAVLset.someU; +let someU = Belt_internalAVLset.someU; -var some = Belt_internalAVLset.some; +let some = Belt_internalAVLset.some; -var keepU = Belt_internalAVLset.keepSharedU; +let keepU = Belt_internalAVLset.keepSharedU; -var keep = Belt_internalAVLset.keepShared; +let keep = Belt_internalAVLset.keepShared; -var partitionU = Belt_internalAVLset.partitionSharedU; +let partitionU = Belt_internalAVLset.partitionSharedU; -var partition = Belt_internalAVLset.partitionShared; +let partition = Belt_internalAVLset.partitionShared; -var size = Belt_internalAVLset.size; +let size = Belt_internalAVLset.size; -var toList = Belt_internalAVLset.toList; +let toList = Belt_internalAVLset.toList; -var toArray = Belt_internalAVLset.toArray; +let toArray = Belt_internalAVLset.toArray; -var minimum = Belt_internalAVLset.minimum; +let minimum = Belt_internalAVLset.minimum; -var minUndefined = Belt_internalAVLset.minUndefined; +let minUndefined = Belt_internalAVLset.minUndefined; -var maximum = Belt_internalAVLset.maximum; +let maximum = Belt_internalAVLset.maximum; -var maxUndefined = Belt_internalAVLset.maxUndefined; +let maxUndefined = Belt_internalAVLset.maxUndefined; -var get = Belt_internalSetString.get; +let get = Belt_internalSetString.get; -var getUndefined = Belt_internalSetString.getUndefined; +let getUndefined = Belt_internalSetString.getUndefined; -var getExn = Belt_internalSetString.getExn; +let getExn = Belt_internalSetString.getExn; -var checkInvariantInternal = Belt_internalAVLset.checkInvariantInternal; +let checkInvariantInternal = Belt_internalAVLset.checkInvariantInternal; exports.empty = empty; exports.fromArray = fromArray; diff --git a/lib/js/belt_SortArray.js b/lib/js/belt_SortArray.js index a09c0f2f11..78e450606e 100644 --- a/lib/js/belt_SortArray.js +++ b/lib/js/belt_SortArray.js @@ -1,16 +1,16 @@ 'use strict'; -var Curry = require("./curry.js"); -var Belt_Array = require("./belt_Array.js"); +let Curry = require("./curry.js"); +let Belt_Array = require("./belt_Array.js"); function sortedLengthAuxMore(xs, _prec, _acc, len, lt) { while(true) { - var acc = _acc; - var prec = _prec; + let acc = _acc; + let prec = _prec; if (acc >= len) { return acc; } - var v = xs[acc]; + let v = xs[acc]; if (!lt(v, prec)) { return acc; } @@ -21,22 +21,22 @@ function sortedLengthAuxMore(xs, _prec, _acc, len, lt) { } function strictlySortedLengthU(xs, lt) { - var len = xs.length; + let len = xs.length; if (len === 0 || len === 1) { return len; } - var x0 = xs[0]; - var x1 = xs[1]; + let x0 = xs[0]; + let x1 = xs[1]; if (lt(x0, x1)) { - var _prec = x1; - var _acc = 2; + let _prec = x1; + let _acc = 2; while(true) { - var acc = _acc; - var prec = _prec; + let acc = _acc; + let prec = _prec; if (acc >= len) { return acc; } - var v = xs[acc]; + let v = xs[acc]; if (!lt(prec, v)) { return acc; } @@ -56,14 +56,14 @@ function strictlySortedLength(xs, lt) { } function isSortedU(a, cmp) { - var len = a.length; + let len = a.length; if (len === 0) { return true; } else { - var _i = 0; - var last_bound = len - 1 | 0; + let _i = 0; + let last_bound = len - 1 | 0; while(true) { - var i = _i; + let i = _i; if (i === last_bound) { return true; } @@ -81,22 +81,22 @@ function isSorted(a, cmp) { } function merge(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (cmp(s1, s2) <= 0) { dst[d] = s1; - var i1$1 = i1 + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return Belt_Array.blitUnsafe(src2, i2, dst, d + 1 | 0, src2r - i2 | 0); } @@ -106,7 +106,7 @@ function merge(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) continue ; } dst[d] = s2; - var i2$1 = i2 + 1 | 0; + let i2$1 = i2 + 1 | 0; if (i2$1 >= src2r) { return Belt_Array.blitUnsafe(src, i1, dst, d + 1 | 0, src1r - i1 | 0); } @@ -118,24 +118,24 @@ function merge(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) } function unionU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; - var c = cmp(s1, s2); + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; + let c = cmp(s1, s2); if (c < 0) { dst[d] = s1; - var i1$1 = i1 + 1 | 0; - var d$1 = d + 1 | 0; + let i1$1 = i1 + 1 | 0; + let d$1 = d + 1 | 0; if (i1$1 < src1r) { _d = d$1; _s1 = src[i1$1]; @@ -147,9 +147,9 @@ function unionU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) } if (c === 0) { dst[d] = s1; - var i1$2 = i1 + 1 | 0; - var i2$1 = i2 + 1 | 0; - var d$2 = d + 1 | 0; + let i1$2 = i1 + 1 | 0; + let i2$1 = i2 + 1 | 0; + let d$2 = d + 1 | 0; if (!(i1$2 < src1r && i2$1 < src2r)) { if (i1$2 === src1r) { Belt_Array.blitUnsafe(src2, i2$1, dst, d$2, src2r - i2$1 | 0); @@ -167,8 +167,8 @@ function unionU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) continue ; } dst[d] = s2; - var i2$2 = i2 + 1 | 0; - var d$3 = d + 1 | 0; + let i2$2 = i2 + 1 | 0; + let d$3 = d + 1 | 0; if (i2$2 < src2r) { _d = d$3; _s2 = src2[i2$2]; @@ -185,22 +185,22 @@ function union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) } function intersectU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; - var c = cmp(s1, s2); + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; + let c = cmp(s1, s2); if (c < 0) { - var i1$1 = i1 + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return d; } @@ -210,9 +210,9 @@ function intersectU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, } if (c === 0) { dst[d] = s1; - var i1$2 = i1 + 1 | 0; - var i2$1 = i2 + 1 | 0; - var d$1 = d + 1 | 0; + let i1$2 = i1 + 1 | 0; + let i2$1 = i2 + 1 | 0; + let d$1 = d + 1 | 0; if (!(i1$2 < src1r && i2$1 < src2r)) { return d$1; } @@ -223,7 +223,7 @@ function intersectU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, _i1 = i1$2; continue ; } - var i2$2 = i2 + 1 | 0; + let i2$2 = i2 + 1 | 0; if (i2$2 >= src2r) { return d; } @@ -238,24 +238,24 @@ function intersect(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, c } function diffU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; - var c = cmp(s1, s2); + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; + let c = cmp(s1, s2); if (c < 0) { dst[d] = s1; - var d$1 = d + 1 | 0; - var i1$1 = i1 + 1 | 0; + let d$1 = d + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return d$1; } @@ -265,8 +265,8 @@ function diffU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) continue ; } if (c === 0) { - var i1$2 = i1 + 1 | 0; - var i2$1 = i2 + 1 | 0; + let i1$2 = i1 + 1 | 0; + let i2$1 = i2 + 1 | 0; if (!(i1$2 < src1r && i2$1 < src2r)) { if (i1$2 === src1r) { return d; @@ -281,7 +281,7 @@ function diffU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) _i1 = i1$2; continue ; } - var i2$2 = i2 + 1 | 0; + let i2$2 = i2 + 1 | 0; if (i2$2 < src2r) { _s2 = src2[i2$2]; _i2 = i2$2; @@ -297,9 +297,9 @@ function diff(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { } function insertionSort(src, srcofs, dst, dstofs, len, cmp) { - for(var i = 0; i < len; ++i){ - var e = src[srcofs + i | 0]; - var j = (dstofs + i | 0) - 1 | 0; + for(let i = 0; i < len; ++i){ + let e = src[srcofs + i | 0]; + let j = (dstofs + i | 0) - 1 | 0; while(j >= dstofs && cmp(dst[j], e) > 0) { dst[j + 1 | 0] = dst[j]; j = j - 1 | 0; @@ -312,21 +312,21 @@ function sortTo(src, srcofs, dst, dstofs, len, cmp) { if (len <= 5) { return insertionSort(src, srcofs, dst, dstofs, len, cmp); } - var l1 = len / 2 | 0; - var l2 = len - l1 | 0; + let l1 = len / 2 | 0; + let l2 = len - l1 | 0; sortTo(src, srcofs + l1 | 0, dst, dstofs + l1 | 0, l2, cmp); sortTo(src, srcofs, src, srcofs + l2 | 0, l1, cmp); merge(src, srcofs + l2 | 0, l1, dst, dstofs + l1 | 0, l2, dst, dstofs, cmp); } function stableSortInPlaceByU(a, cmp) { - var l = a.length; + let l = a.length; if (l <= 5) { return insertionSort(a, 0, a, 0, l, cmp); } - var l1 = l / 2 | 0; - var l2 = l - l1 | 0; - var t = new Array(l2); + let l1 = l / 2 | 0; + let l2 = l - l1 | 0; + let t = new Array(l2); sortTo(a, l1, t, 0, l2, cmp); sortTo(a, 0, a, l2, l1, cmp); merge(a, l2, l1, t, 0, l2, a, 0, cmp); @@ -337,7 +337,7 @@ function stableSortInPlaceBy(a, cmp) { } function stableSortByU(a, cmp) { - var b = a.slice(0); + let b = a.slice(0); stableSortInPlaceByU(b, cmp); return b; } @@ -347,28 +347,28 @@ function stableSortBy(a, cmp) { } function binarySearchByU(sorted, key, cmp) { - var len = sorted.length; + let len = sorted.length; if (len === 0) { return -1; } - var lo = sorted[0]; - var c = cmp(key, lo); + let lo = sorted[0]; + let c = cmp(key, lo); if (c < 0) { return -1; } - var hi = sorted[len - 1 | 0]; - var c2 = cmp(key, hi); + let hi = sorted[len - 1 | 0]; + let c2 = cmp(key, hi); if (c2 > 0) { return -(len + 1 | 0) | 0; } else { - var _lo = 0; - var _hi = len - 1 | 0; + let _lo = 0; + let _hi = len - 1 | 0; while(true) { - var hi$1 = _hi; - var lo$1 = _lo; - var mid = (lo$1 + hi$1 | 0) / 2 | 0; - var midVal = sorted[mid]; - var c$1 = cmp(key, midVal); + let hi$1 = _hi; + let lo$1 = _lo; + let mid = (lo$1 + hi$1 | 0) / 2 | 0; + let midVal = sorted[mid]; + let c$1 = cmp(key, midVal); if (c$1 === 0) { return mid; } @@ -400,9 +400,9 @@ function binarySearchBy(sorted, key, cmp) { return binarySearchByU(sorted, key, Curry.__2(cmp)); } -var Int; +let Int; -var $$String; +let $$String; exports.Int = Int; exports.$$String = $$String; diff --git a/lib/js/belt_SortArrayInt.js b/lib/js/belt_SortArrayInt.js index d1e69bb195..986f19f413 100644 --- a/lib/js/belt_SortArrayInt.js +++ b/lib/js/belt_SortArrayInt.js @@ -1,15 +1,15 @@ 'use strict'; -var Belt_Array = require("./belt_Array.js"); +let Belt_Array = require("./belt_Array.js"); function sortedLengthAuxMore(xs, _prec, _acc, len) { while(true) { - var acc = _acc; - var prec = _prec; + let acc = _acc; + let prec = _prec; if (acc >= len) { return acc; } - var v = xs[acc]; + let v = xs[acc]; if (prec <= v) { return acc; } @@ -20,22 +20,22 @@ function sortedLengthAuxMore(xs, _prec, _acc, len) { } function strictlySortedLength(xs) { - var len = xs.length; + let len = xs.length; if (len === 0 || len === 1) { return len; } - var x0 = xs[0]; - var x1 = xs[1]; + let x0 = xs[0]; + let x1 = xs[1]; if (x0 < x1) { - var _prec = x1; - var _acc = 2; + let _prec = x1; + let _acc = 2; while(true) { - var acc = _acc; - var prec = _prec; + let acc = _acc; + let prec = _prec; if (acc >= len) { return acc; } - var v = xs[acc]; + let v = xs[acc]; if (prec >= v) { return acc; } @@ -51,14 +51,14 @@ function strictlySortedLength(xs) { } function isSorted(a) { - var len = a.length; + let len = a.length; if (len === 0) { return true; } else { - var _i = 0; - var last_bound = len - 1 | 0; + let _i = 0; + let last_bound = len - 1 | 0; while(true) { - var i = _i; + let i = _i; if (i === last_bound) { return true; } @@ -72,22 +72,22 @@ function isSorted(a) { } function merge(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (s1 <= s2) { dst[d] = s1; - var i1$1 = i1 + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return Belt_Array.blitUnsafe(src2, i2, dst, d + 1 | 0, src2r - i2 | 0); } @@ -97,7 +97,7 @@ function merge(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { continue ; } dst[d] = s2; - var i2$1 = i2 + 1 | 0; + let i2$1 = i2 + 1 | 0; if (i2$1 >= src2r) { return Belt_Array.blitUnsafe(src, i1, dst, d + 1 | 0, src1r - i1 | 0); } @@ -109,23 +109,23 @@ function merge(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { } function union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (s1 < s2) { dst[d] = s1; - var i1$1 = i1 + 1 | 0; - var d$1 = d + 1 | 0; + let i1$1 = i1 + 1 | 0; + let d$1 = d + 1 | 0; if (i1$1 < src1r) { _d = d$1; _s1 = src[i1$1]; @@ -137,9 +137,9 @@ function union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { } if (s1 === s2) { dst[d] = s1; - var i1$2 = i1 + 1 | 0; - var i2$1 = i2 + 1 | 0; - var d$2 = d + 1 | 0; + let i1$2 = i1 + 1 | 0; + let i2$1 = i2 + 1 | 0; + let d$2 = d + 1 | 0; if (!(i1$2 < src1r && i2$1 < src2r)) { if (i1$2 === src1r) { Belt_Array.blitUnsafe(src2, i2$1, dst, d$2, src2r - i2$1 | 0); @@ -157,8 +157,8 @@ function union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { continue ; } dst[d] = s2; - var i2$2 = i2 + 1 | 0; - var d$3 = d + 1 | 0; + let i2$2 = i2 + 1 | 0; + let d$3 = d + 1 | 0; if (i2$2 < src2r) { _d = d$3; _s2 = src2[i2$2]; @@ -171,21 +171,21 @@ function union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { } function intersect(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (s1 < s2) { - var i1$1 = i1 + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return d; } @@ -195,9 +195,9 @@ function intersect(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { } if (s1 === s2) { dst[d] = s1; - var i1$2 = i1 + 1 | 0; - var i2$1 = i2 + 1 | 0; - var d$1 = d + 1 | 0; + let i1$2 = i1 + 1 | 0; + let i2$1 = i2 + 1 | 0; + let d$1 = d + 1 | 0; if (!(i1$2 < src1r && i2$1 < src2r)) { return d$1; } @@ -208,7 +208,7 @@ function intersect(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { _i1 = i1$2; continue ; } - var i2$2 = i2 + 1 | 0; + let i2$2 = i2 + 1 | 0; if (i2$2 >= src2r) { return d; } @@ -219,23 +219,23 @@ function intersect(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { } function diff(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (s1 < s2) { dst[d] = s1; - var d$1 = d + 1 | 0; - var i1$1 = i1 + 1 | 0; + let d$1 = d + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return d$1; } @@ -245,8 +245,8 @@ function diff(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { continue ; } if (s1 === s2) { - var i1$2 = i1 + 1 | 0; - var i2$1 = i2 + 1 | 0; + let i1$2 = i1 + 1 | 0; + let i2$1 = i2 + 1 | 0; if (!(i1$2 < src1r && i2$1 < src2r)) { if (i1$2 === src1r) { return d; @@ -261,7 +261,7 @@ function diff(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { _i1 = i1$2; continue ; } - var i2$2 = i2 + 1 | 0; + let i2$2 = i2 + 1 | 0; if (i2$2 < src2r) { _s2 = src2[i2$2]; _i2 = i2$2; @@ -273,9 +273,9 @@ function diff(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { } function insertionSort(src, srcofs, dst, dstofs, len) { - for(var i = 0; i < len; ++i){ - var e = src[srcofs + i | 0]; - var j = (dstofs + i | 0) - 1 | 0; + for(let i = 0; i < len; ++i){ + let e = src[srcofs + i | 0]; + let j = (dstofs + i | 0) - 1 | 0; while(j >= dstofs && dst[j] > e) { dst[j + 1 | 0] = dst[j]; j = j - 1 | 0; @@ -288,52 +288,52 @@ function sortTo(src, srcofs, dst, dstofs, len) { if (len <= 5) { return insertionSort(src, srcofs, dst, dstofs, len); } - var l1 = len / 2 | 0; - var l2 = len - l1 | 0; + let l1 = len / 2 | 0; + let l2 = len - l1 | 0; sortTo(src, srcofs + l1 | 0, dst, dstofs + l1 | 0, l2); sortTo(src, srcofs, src, srcofs + l2 | 0, l1); merge(src, srcofs + l2 | 0, l1, dst, dstofs + l1 | 0, l2, dst, dstofs); } function stableSortInPlace(a) { - var l = a.length; + let l = a.length; if (l <= 5) { return insertionSort(a, 0, a, 0, l); } - var l1 = l / 2 | 0; - var l2 = l - l1 | 0; - var t = new Array(l2); + let l1 = l / 2 | 0; + let l2 = l - l1 | 0; + let t = new Array(l2); sortTo(a, l1, t, 0, l2); sortTo(a, 0, a, l2, l1); merge(a, l2, l1, t, 0, l2, a, 0); } function stableSort(a) { - var b = a.slice(0); + let b = a.slice(0); stableSortInPlace(b); return b; } function binarySearch(sorted, key) { - var len = sorted.length; + let len = sorted.length; if (len === 0) { return -1; } - var lo = sorted[0]; + let lo = sorted[0]; if (key < lo) { return -1; } - var hi = sorted[len - 1 | 0]; + let hi = sorted[len - 1 | 0]; if (key > hi) { return -(len + 1 | 0) | 0; } else { - var _lo = 0; - var _hi = len - 1 | 0; + let _lo = 0; + let _hi = len - 1 | 0; while(true) { - var hi$1 = _hi; - var lo$1 = _lo; - var mid = (lo$1 + hi$1 | 0) / 2 | 0; - var midVal = sorted[mid]; + let hi$1 = _hi; + let lo$1 = _lo; + let mid = (lo$1 + hi$1 | 0) / 2 | 0; + let midVal = sorted[mid]; if (key === midVal) { return mid; } diff --git a/lib/js/belt_SortArrayString.js b/lib/js/belt_SortArrayString.js index d1e69bb195..986f19f413 100644 --- a/lib/js/belt_SortArrayString.js +++ b/lib/js/belt_SortArrayString.js @@ -1,15 +1,15 @@ 'use strict'; -var Belt_Array = require("./belt_Array.js"); +let Belt_Array = require("./belt_Array.js"); function sortedLengthAuxMore(xs, _prec, _acc, len) { while(true) { - var acc = _acc; - var prec = _prec; + let acc = _acc; + let prec = _prec; if (acc >= len) { return acc; } - var v = xs[acc]; + let v = xs[acc]; if (prec <= v) { return acc; } @@ -20,22 +20,22 @@ function sortedLengthAuxMore(xs, _prec, _acc, len) { } function strictlySortedLength(xs) { - var len = xs.length; + let len = xs.length; if (len === 0 || len === 1) { return len; } - var x0 = xs[0]; - var x1 = xs[1]; + let x0 = xs[0]; + let x1 = xs[1]; if (x0 < x1) { - var _prec = x1; - var _acc = 2; + let _prec = x1; + let _acc = 2; while(true) { - var acc = _acc; - var prec = _prec; + let acc = _acc; + let prec = _prec; if (acc >= len) { return acc; } - var v = xs[acc]; + let v = xs[acc]; if (prec >= v) { return acc; } @@ -51,14 +51,14 @@ function strictlySortedLength(xs) { } function isSorted(a) { - var len = a.length; + let len = a.length; if (len === 0) { return true; } else { - var _i = 0; - var last_bound = len - 1 | 0; + let _i = 0; + let last_bound = len - 1 | 0; while(true) { - var i = _i; + let i = _i; if (i === last_bound) { return true; } @@ -72,22 +72,22 @@ function isSorted(a) { } function merge(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (s1 <= s2) { dst[d] = s1; - var i1$1 = i1 + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return Belt_Array.blitUnsafe(src2, i2, dst, d + 1 | 0, src2r - i2 | 0); } @@ -97,7 +97,7 @@ function merge(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { continue ; } dst[d] = s2; - var i2$1 = i2 + 1 | 0; + let i2$1 = i2 + 1 | 0; if (i2$1 >= src2r) { return Belt_Array.blitUnsafe(src, i1, dst, d + 1 | 0, src1r - i1 | 0); } @@ -109,23 +109,23 @@ function merge(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { } function union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (s1 < s2) { dst[d] = s1; - var i1$1 = i1 + 1 | 0; - var d$1 = d + 1 | 0; + let i1$1 = i1 + 1 | 0; + let d$1 = d + 1 | 0; if (i1$1 < src1r) { _d = d$1; _s1 = src[i1$1]; @@ -137,9 +137,9 @@ function union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { } if (s1 === s2) { dst[d] = s1; - var i1$2 = i1 + 1 | 0; - var i2$1 = i2 + 1 | 0; - var d$2 = d + 1 | 0; + let i1$2 = i1 + 1 | 0; + let i2$1 = i2 + 1 | 0; + let d$2 = d + 1 | 0; if (!(i1$2 < src1r && i2$1 < src2r)) { if (i1$2 === src1r) { Belt_Array.blitUnsafe(src2, i2$1, dst, d$2, src2r - i2$1 | 0); @@ -157,8 +157,8 @@ function union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { continue ; } dst[d] = s2; - var i2$2 = i2 + 1 | 0; - var d$3 = d + 1 | 0; + let i2$2 = i2 + 1 | 0; + let d$3 = d + 1 | 0; if (i2$2 < src2r) { _d = d$3; _s2 = src2[i2$2]; @@ -171,21 +171,21 @@ function union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { } function intersect(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (s1 < s2) { - var i1$1 = i1 + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return d; } @@ -195,9 +195,9 @@ function intersect(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { } if (s1 === s2) { dst[d] = s1; - var i1$2 = i1 + 1 | 0; - var i2$1 = i2 + 1 | 0; - var d$1 = d + 1 | 0; + let i1$2 = i1 + 1 | 0; + let i2$1 = i2 + 1 | 0; + let d$1 = d + 1 | 0; if (!(i1$2 < src1r && i2$1 < src2r)) { return d$1; } @@ -208,7 +208,7 @@ function intersect(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { _i1 = i1$2; continue ; } - var i2$2 = i2 + 1 | 0; + let i2$2 = i2 + 1 | 0; if (i2$2 >= src2r) { return d; } @@ -219,23 +219,23 @@ function intersect(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { } function diff(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (s1 < s2) { dst[d] = s1; - var d$1 = d + 1 | 0; - var i1$1 = i1 + 1 | 0; + let d$1 = d + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return d$1; } @@ -245,8 +245,8 @@ function diff(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { continue ; } if (s1 === s2) { - var i1$2 = i1 + 1 | 0; - var i2$1 = i2 + 1 | 0; + let i1$2 = i1 + 1 | 0; + let i2$1 = i2 + 1 | 0; if (!(i1$2 < src1r && i2$1 < src2r)) { if (i1$2 === src1r) { return d; @@ -261,7 +261,7 @@ function diff(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { _i1 = i1$2; continue ; } - var i2$2 = i2 + 1 | 0; + let i2$2 = i2 + 1 | 0; if (i2$2 < src2r) { _s2 = src2[i2$2]; _i2 = i2$2; @@ -273,9 +273,9 @@ function diff(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { } function insertionSort(src, srcofs, dst, dstofs, len) { - for(var i = 0; i < len; ++i){ - var e = src[srcofs + i | 0]; - var j = (dstofs + i | 0) - 1 | 0; + for(let i = 0; i < len; ++i){ + let e = src[srcofs + i | 0]; + let j = (dstofs + i | 0) - 1 | 0; while(j >= dstofs && dst[j] > e) { dst[j + 1 | 0] = dst[j]; j = j - 1 | 0; @@ -288,52 +288,52 @@ function sortTo(src, srcofs, dst, dstofs, len) { if (len <= 5) { return insertionSort(src, srcofs, dst, dstofs, len); } - var l1 = len / 2 | 0; - var l2 = len - l1 | 0; + let l1 = len / 2 | 0; + let l2 = len - l1 | 0; sortTo(src, srcofs + l1 | 0, dst, dstofs + l1 | 0, l2); sortTo(src, srcofs, src, srcofs + l2 | 0, l1); merge(src, srcofs + l2 | 0, l1, dst, dstofs + l1 | 0, l2, dst, dstofs); } function stableSortInPlace(a) { - var l = a.length; + let l = a.length; if (l <= 5) { return insertionSort(a, 0, a, 0, l); } - var l1 = l / 2 | 0; - var l2 = l - l1 | 0; - var t = new Array(l2); + let l1 = l / 2 | 0; + let l2 = l - l1 | 0; + let t = new Array(l2); sortTo(a, l1, t, 0, l2); sortTo(a, 0, a, l2, l1); merge(a, l2, l1, t, 0, l2, a, 0); } function stableSort(a) { - var b = a.slice(0); + let b = a.slice(0); stableSortInPlace(b); return b; } function binarySearch(sorted, key) { - var len = sorted.length; + let len = sorted.length; if (len === 0) { return -1; } - var lo = sorted[0]; + let lo = sorted[0]; if (key < lo) { return -1; } - var hi = sorted[len - 1 | 0]; + let hi = sorted[len - 1 | 0]; if (key > hi) { return -(len + 1 | 0) | 0; } else { - var _lo = 0; - var _hi = len - 1 | 0; + let _lo = 0; + let _hi = len - 1 | 0; while(true) { - var hi$1 = _hi; - var lo$1 = _lo; - var mid = (lo$1 + hi$1 | 0) / 2 | 0; - var midVal = sorted[mid]; + let hi$1 = _hi; + let lo$1 = _lo; + let mid = (lo$1 + hi$1 | 0) / 2 | 0; + let midVal = sorted[mid]; if (key === midVal) { return mid; } diff --git a/lib/js/belt_internalAVLset.js b/lib/js/belt_internalAVLset.js index 073b6e6349..5cf3af4493 100644 --- a/lib/js/belt_internalAVLset.js +++ b/lib/js/belt_internalAVLset.js @@ -1,8 +1,8 @@ 'use strict'; -var Curry = require("./curry.js"); -var Caml_option = require("./caml_option.js"); -var Belt_SortArray = require("./belt_SortArray.js"); +let Curry = require("./curry.js"); +let Caml_option = require("./caml_option.js"); +let Belt_SortArray = require("./belt_SortArray.js"); function copy(n) { if (n !== undefined) { @@ -18,8 +18,8 @@ function copy(n) { } function create(l, v, r) { - var hl = l !== undefined ? l.h : 0; - var hr = r !== undefined ? r.h : 0; + let hl = l !== undefined ? l.h : 0; + let hr = r !== undefined ? r.h : 0; return { v: v, h: ( @@ -52,11 +52,11 @@ function heightGe(l, r) { } function bal(l, v, r) { - var hl = l !== undefined ? l.h : 0; - var hr = r !== undefined ? r.h : 0; + let hl = l !== undefined ? l.h : 0; + let hr = r !== undefined ? r.h : 0; if (hl > (hr + 2 | 0)) { - var ll = l.l; - var lr = l.r; + let ll = l.l; + let lr = l.r; if (heightGe(ll, lr)) { return create(ll, l.v, create(lr, v, r)); } else { @@ -73,8 +73,8 @@ function bal(l, v, r) { r: r }; } - var rl = r.l; - var rr = r.r; + let rl = r.l; + let rr = r.r; if (heightGe(rr, rl)) { return create(create(l, v, rl), r.v, rr); } else { @@ -84,8 +84,8 @@ function bal(l, v, r) { function min0Aux(_n) { while(true) { - var n = _n; - var n$1 = n.l; + let n = _n; + let n$1 = n.l; if (n$1 === undefined) { return n.v; } @@ -110,8 +110,8 @@ function minUndefined(n) { function max0Aux(_n) { while(true) { - var n = _n; - var n$1 = n.r; + let n = _n; + let n$1 = n.r; if (n$1 === undefined) { return n.v; } @@ -135,7 +135,7 @@ function maxUndefined(n) { } function removeMinAuxWithRef(n, v) { - var ln = n.l; + let ln = n.l; if (ln !== undefined) { return bal(removeMinAuxWithRef(ln, v), n.v, n.r); } else { @@ -150,8 +150,8 @@ function isEmpty(n) { function stackAllLeft(_v, _s) { while(true) { - var s = _s; - var v = _v; + let s = _s; + let v = _v; if (v === undefined) { return s; } @@ -166,7 +166,7 @@ function stackAllLeft(_v, _s) { function forEachU(_n, f) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return; } @@ -183,8 +183,8 @@ function forEach(n, f) { function reduceU(_s, _accu, f) { while(true) { - var accu = _accu; - var s = _s; + let accu = _accu; + let s = _s; if (s === undefined) { return accu; } @@ -200,7 +200,7 @@ function reduce(s, accu, f) { function everyU(_n, p) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return true; } @@ -221,7 +221,7 @@ function every(n, p) { function someU(_n, p) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return false; } @@ -263,8 +263,8 @@ function joinShared(ln, v, rn) { if (rn === undefined) { return addMaxElement(ln, v); } - var lh = ln.h; - var rh = rn.h; + let lh = ln.h; + let rh = rn.h; if (lh > (rh + 2 | 0)) { return bal(ln.l, ln.v, joinShared(ln.r, v, rn)); } else if (rh > (lh + 2 | 0)) { @@ -281,10 +281,10 @@ function concatShared(t1, t2) { if (t2 === undefined) { return t1; } - var v = { + let v = { contents: t2.v }; - var t2r = removeMinAuxWithRef(t2, v); + let t2r = removeMinAuxWithRef(t2, v); return joinShared(t1, v.contents, t2r); } @@ -295,14 +295,14 @@ function partitionSharedU(n, p) { undefined ]; } - var value = n.v; - var match = partitionSharedU(n.l, p); - var lf = match[1]; - var lt = match[0]; - var pv = p(value); - var match$1 = partitionSharedU(n.r, p); - var rf = match$1[1]; - var rt = match$1[0]; + let value = n.v; + let match = partitionSharedU(n.l, p); + let lf = match[1]; + let lt = match[0]; + let pv = p(value); + let match$1 = partitionSharedU(n.r, p); + let rf = match$1[1]; + let rt = match$1[0]; if (pv) { return [ joinShared(lt, value, rt), @@ -321,10 +321,10 @@ function partitionShared(n, p) { } function lengthNode(n) { - var l = n.l; - var r = n.r; - var sizeL = l !== undefined ? lengthNode(l) : 0; - var sizeR = r !== undefined ? lengthNode(r) : 0; + let l = n.l; + let r = n.r; + let sizeL = l !== undefined ? lengthNode(l) : 0; + let sizeR = r !== undefined ? lengthNode(r) : 0; return (1 + sizeL | 0) + sizeR | 0; } @@ -338,8 +338,8 @@ function size(n) { function toListAux(_n, _accu) { while(true) { - var accu = _accu; - var n = _n; + let accu = _accu; + let n = _n; if (n === undefined) { return accu; } @@ -358,13 +358,13 @@ function toList(s) { function checkInvariantInternal(_v) { while(true) { - var v = _v; + let v = _v; if (v === undefined) { return; } - var l = v.l; - var r = v.r; - var diff = ( + let l = v.l; + let r = v.r; + let diff = ( l !== undefined ? l.h : 0 ) - ( r !== undefined ? r.h : 0 @@ -388,14 +388,14 @@ function checkInvariantInternal(_v) { function fillArray(_n, _i, arr) { while(true) { - var i = _i; - var n = _n; - var v = n.v; - var l = n.l; - var r = n.r; - var next = l !== undefined ? fillArray(l, i, arr) : i; + let i = _i; + let n = _n; + let v = n.v; + let l = n.l; + let r = n.r; + let next = l !== undefined ? fillArray(l, i, arr) : i; arr[next] = v; - var rnext = next + 1 | 0; + let rnext = next + 1 | 0; if (r === undefined) { return rnext; } @@ -407,19 +407,19 @@ function fillArray(_n, _i, arr) { function fillArrayWithPartition(_n, cursor, arr, p) { while(true) { - var n = _n; - var v = n.v; - var l = n.l; - var r = n.r; + let n = _n; + let v = n.v; + let l = n.l; + let r = n.r; if (l !== undefined) { fillArrayWithPartition(l, cursor, arr, p); } if (p(v)) { - var c = cursor.forward; + let c = cursor.forward; arr[c] = v; cursor.forward = c + 1 | 0; } else { - var c$1 = cursor.backward; + let c$1 = cursor.backward; arr[c$1] = v; cursor.backward = c$1 - 1 | 0; } @@ -433,13 +433,13 @@ function fillArrayWithPartition(_n, cursor, arr, p) { function fillArrayWithFilter(_n, _i, arr, p) { while(true) { - var i = _i; - var n = _n; - var v = n.v; - var l = n.l; - var r = n.r; - var next = l !== undefined ? fillArrayWithFilter(l, i, arr, p) : i; - var rnext = p(v) ? (arr[next] = v, next + 1 | 0) : next; + let i = _i; + let n = _n; + let v = n.v; + let l = n.l; + let r = n.r; + let next = l !== undefined ? fillArrayWithFilter(l, i, arr, p) : i; + let rnext = p(v) ? (arr[next] = v, next + 1 | 0) : next; if (r === undefined) { return rnext; } @@ -453,8 +453,8 @@ function toArray(n) { if (n === undefined) { return []; } - var size = lengthNode(n); - var v = new Array(size); + let size = lengthNode(n); + let v = new Array(size); fillArray(n, 0, v); return v; } @@ -466,8 +466,8 @@ function fromSortedArrayRevAux(arr, off, len) { case 1 : return singleton(arr[off]); case 2 : - var x0 = arr[off]; - var x1 = arr[off - 1 | 0]; + let x0 = arr[off]; + let x1 = arr[off - 1 | 0]; return { v: x1, h: 2, @@ -475,9 +475,9 @@ function fromSortedArrayRevAux(arr, off, len) { r: undefined }; case 3 : - var x0$1 = arr[off]; - var x1$1 = arr[off - 1 | 0]; - var x2 = arr[off - 2 | 0]; + let x0$1 = arr[off]; + let x1$1 = arr[off - 1 | 0]; + let x2 = arr[off - 2 | 0]; return { v: x1$1, h: 2, @@ -485,10 +485,10 @@ function fromSortedArrayRevAux(arr, off, len) { r: singleton(x2) }; default: - var nl = len / 2 | 0; - var left = fromSortedArrayRevAux(arr, off, nl); - var mid = arr[off - nl | 0]; - var right = fromSortedArrayRevAux(arr, (off - nl | 0) - 1 | 0, (len - nl | 0) - 1 | 0); + let nl = len / 2 | 0; + let left = fromSortedArrayRevAux(arr, off, nl); + let mid = arr[off - nl | 0]; + let right = fromSortedArrayRevAux(arr, (off - nl | 0) - 1 | 0, (len - nl | 0) - 1 | 0); return create(left, mid, right); } } @@ -500,8 +500,8 @@ function fromSortedArrayAux(arr, off, len) { case 1 : return singleton(arr[off]); case 2 : - var x0 = arr[off]; - var x1 = arr[off + 1 | 0]; + let x0 = arr[off]; + let x1 = arr[off + 1 | 0]; return { v: x1, h: 2, @@ -509,9 +509,9 @@ function fromSortedArrayAux(arr, off, len) { r: undefined }; case 3 : - var x0$1 = arr[off]; - var x1$1 = arr[off + 1 | 0]; - var x2 = arr[off + 2 | 0]; + let x0$1 = arr[off]; + let x1$1 = arr[off + 1 | 0]; + let x2 = arr[off + 2 | 0]; return { v: x1$1, h: 2, @@ -519,10 +519,10 @@ function fromSortedArrayAux(arr, off, len) { r: singleton(x2) }; default: - var nl = len / 2 | 0; - var left = fromSortedArrayAux(arr, off, nl); - var mid = arr[off + nl | 0]; - var right = fromSortedArrayAux(arr, (off + nl | 0) + 1 | 0, (len - nl | 0) - 1 | 0); + let nl = len / 2 | 0; + let left = fromSortedArrayAux(arr, off, nl); + let mid = arr[off + nl | 0]; + let right = fromSortedArrayAux(arr, (off + nl | 0) + 1 | 0, (len - nl | 0) - 1 | 0); return create(left, mid, right); } } @@ -535,12 +535,12 @@ function keepSharedU(n, p) { if (n === undefined) { return; } - var v = n.v; - var l = n.l; - var r = n.r; - var newL = keepSharedU(l, p); - var pv = p(v); - var newR = keepSharedU(r, p); + let v = n.v; + let l = n.l; + let r = n.r; + let newL = keepSharedU(l, p); + let pv = p(v); + let newR = keepSharedU(r, p); if (pv) { if (l === newL && r === newR) { return n; @@ -560,9 +560,9 @@ function keepCopyU(n, p) { if (n === undefined) { return; } - var size = lengthNode(n); - var v = new Array(size); - var last = fillArrayWithFilter(n, 0, v, p); + let size = lengthNode(n); + let v = new Array(size); + let last = fillArrayWithFilter(n, 0, v, p); return fromSortedArrayAux(v, 0, last); } @@ -577,15 +577,15 @@ function partitionCopyU(n, p) { undefined ]; } - var size = lengthNode(n); - var v = new Array(size); - var backward = size - 1 | 0; - var cursor = { + let size = lengthNode(n); + let v = new Array(size); + let backward = size - 1 | 0; + let cursor = { forward: 0, backward: backward }; fillArrayWithPartition(n, cursor, v, p); - var forwardLen = cursor.forward; + let forwardLen = cursor.forward; return [ fromSortedArrayAux(v, 0, forwardLen), fromSortedArrayRevAux(v, backward, size - forwardLen | 0) @@ -598,12 +598,12 @@ function partitionCopy(n, p) { function has(_t, x, cmp) { while(true) { - var t = _t; + let t = _t; if (t === undefined) { return false; } - var v = t.v; - var c = cmp(x, v); + let v = t.v; + let c = cmp(x, v); if (c === 0) { return true; } @@ -613,23 +613,23 @@ function has(_t, x, cmp) { } function cmp(s1, s2, cmp$1) { - var len1 = size(s1); - var len2 = size(s2); + let len1 = size(s1); + let len2 = size(s2); if (len1 === len2) { - var _e1 = stackAllLeft(s1, /* [] */0); - var _e2 = stackAllLeft(s2, /* [] */0); + let _e1 = stackAllLeft(s1, /* [] */0); + let _e2 = stackAllLeft(s2, /* [] */0); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (!e1) { return 0; } if (!e2) { return 0; } - var h2 = e2.hd; - var h1 = e1.hd; - var c = cmp$1(h1.v, h2.v); + let h2 = e2.hd; + let h1 = e1.hd; + let c = cmp$1(h1.v, h2.v); if (c !== 0) { return c; } @@ -650,21 +650,21 @@ function eq(s1, s2, c) { function subset(_s1, _s2, cmp) { while(true) { - var s2 = _s2; - var s1 = _s1; + let s2 = _s2; + let s1 = _s1; if (s1 === undefined) { return true; } if (s2 === undefined) { return false; } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var v2 = s2.v; - var l2 = s2.l; - var r2 = s2.r; - var c = cmp(v1, v2); + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let v2 = s2.v; + let l2 = s2.l; + let r2 = s2.r; + let c = cmp(v1, v2); if (c === 0) { if (!subset(l1, l2, cmp)) { return false; @@ -690,12 +690,12 @@ function subset(_s1, _s2, cmp) { function get(_n, x, cmp) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return; } - var v = n.v; - var c = cmp(x, v); + let v = n.v; + let c = cmp(x, v); if (c === 0) { return Caml_option.some(v); } @@ -706,12 +706,12 @@ function get(_n, x, cmp) { function getUndefined(_n, x, cmp) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return; } - var v = n.v; - var c = cmp(x, v); + let v = n.v; + let c = cmp(x, v); if (c === 0) { return v; } @@ -722,10 +722,10 @@ function getUndefined(_n, x, cmp) { function getExn(_n, x, cmp) { while(true) { - var n = _n; + let n = _n; if (n !== undefined) { - var v = n.v; - var c = cmp(x, v); + let v = n.v; + let c = cmp(x, v); if (c === 0) { return v; } @@ -740,19 +740,19 @@ function getExn(_n, x, cmp) { } function rotateWithLeftChild(k2) { - var k1 = k2.l; + let k1 = k2.l; k2.l = k1.r; k1.r = k2; - var n = k2.l; - var hlk2 = n !== undefined ? n.h : 0; - var n$1 = k2.r; - var hrk2 = n$1 !== undefined ? n$1.h : 0; + let n = k2.l; + let hlk2 = n !== undefined ? n.h : 0; + let n$1 = k2.r; + let hrk2 = n$1 !== undefined ? n$1.h : 0; k2.h = ( hlk2 > hrk2 ? hlk2 : hrk2 ) + 1 | 0; - var n$2 = k1.l; - var hlk1 = n$2 !== undefined ? n$2.h : 0; - var hk2 = k2.h; + let n$2 = k1.l; + let hlk1 = n$2 !== undefined ? n$2.h : 0; + let hk2 = k2.h; k1.h = ( hlk1 > hk2 ? hlk1 : hk2 ) + 1 | 0; @@ -760,19 +760,19 @@ function rotateWithLeftChild(k2) { } function rotateWithRightChild(k1) { - var k2 = k1.r; + let k2 = k1.r; k1.r = k2.l; k2.l = k1; - var n = k1.l; - var hlk1 = n !== undefined ? n.h : 0; - var n$1 = k1.r; - var hrk1 = n$1 !== undefined ? n$1.h : 0; + let n = k1.l; + let hlk1 = n !== undefined ? n.h : 0; + let n$1 = k1.r; + let hrk1 = n$1 !== undefined ? n$1.h : 0; k1.h = ( hlk1 > hrk1 ? hlk1 : hrk1 ) + 1 | 0; - var n$2 = k2.r; - var hrk2 = n$2 !== undefined ? n$2.h : 0; - var hk1 = k1.h; + let n$2 = k2.r; + let hrk2 = n$2 !== undefined ? n$2.h : 0; + let hk1 = k1.h; k2.h = ( hrk2 > hk1 ? hrk2 : hk1 ) + 1 | 0; @@ -780,24 +780,24 @@ function rotateWithRightChild(k1) { } function doubleWithLeftChild(k3) { - var k3l = k3.l; - var v = rotateWithRightChild(k3l); + let k3l = k3.l; + let v = rotateWithRightChild(k3l); k3.l = v; return rotateWithLeftChild(k3); } function doubleWithRightChild(k2) { - var k2r = k2.r; - var v = rotateWithLeftChild(k2r); + let k2r = k2.r; + let v = rotateWithLeftChild(k2r); k2.r = v; return rotateWithRightChild(k2); } function heightUpdateMutate(t) { - var n = t.l; - var hlt = n !== undefined ? n.h : 0; - var n$1 = t.r; - var hrt = n$1 !== undefined ? n$1.h : 0; + let n = t.l; + let hlt = n !== undefined ? n.h : 0; + let n$1 = t.r; + let hrt = n$1 !== undefined ? n$1.h : 0; t.h = ( hlt > hrt ? hlt : hrt ) + 1 | 0; @@ -805,13 +805,13 @@ function heightUpdateMutate(t) { } function balMutate(nt) { - var l = nt.l; - var r = nt.r; - var hl = l !== undefined ? l.h : 0; - var hr = r !== undefined ? r.h : 0; + let l = nt.l; + let r = nt.r; + let hl = l !== undefined ? l.h : 0; + let hr = r !== undefined ? r.h : 0; if (hl > (2 + hr | 0)) { - var ll = l.l; - var lr = l.r; + let ll = l.l; + let lr = l.r; if (heightGe(ll, lr)) { return heightUpdateMutate(rotateWithLeftChild(nt)); } else { @@ -819,8 +819,8 @@ function balMutate(nt) { } } if (hr > (2 + hl | 0)) { - var rl = r.l; - var rr = r.r; + let rl = r.l; + let rr = r.r; if (heightGe(rr, rl)) { return heightUpdateMutate(rotateWithRightChild(nt)); } else { @@ -837,15 +837,15 @@ function addMutate(cmp, t, x) { if (t === undefined) { return singleton(x); } - var k = t.v; - var c = cmp(x, k); + let k = t.v; + let c = cmp(x, k); if (c === 0) { return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (c < 0) { - var ll = addMutate(cmp, l, x); + let ll = addMutate(cmp, l, x); t.l = ll; } else { t.r = addMutate(cmp, r, x); @@ -854,29 +854,29 @@ function addMutate(cmp, t, x) { } function fromArray(xs, cmp) { - var len = xs.length; + let len = xs.length; if (len === 0) { return; } - var next = Belt_SortArray.strictlySortedLengthU(xs, (function (x, y) { + let next = Belt_SortArray.strictlySortedLengthU(xs, (function (x, y) { return cmp(x, y) < 0; })); - var result; + let result; if (next >= 0) { result = fromSortedArrayAux(xs, 0, next); } else { next = -next | 0; result = fromSortedArrayRevAux(xs, next - 1 | 0, next); } - for(var i = next; i < len; ++i){ + for(let i = next; i < len; ++i){ result = addMutate(cmp, result, xs[i]); } return result; } function removeMinAuxWithRootMutate(nt, n) { - var ln = n.l; - var rn = n.r; + let ln = n.l; + let rn = n.r; if (ln !== undefined) { n.l = removeMinAuxWithRootMutate(nt, ln); return balMutate(n); diff --git a/lib/js/belt_internalAVLtree.js b/lib/js/belt_internalAVLtree.js index fdee8b51d3..640b528ffa 100644 --- a/lib/js/belt_internalAVLtree.js +++ b/lib/js/belt_internalAVLtree.js @@ -1,8 +1,8 @@ 'use strict'; -var Curry = require("./curry.js"); -var Caml_option = require("./caml_option.js"); -var Belt_SortArray = require("./belt_SortArray.js"); +let Curry = require("./curry.js"); +let Caml_option = require("./caml_option.js"); +let Belt_SortArray = require("./belt_SortArray.js"); function treeHeight(n) { if (n !== undefined) { @@ -27,8 +27,8 @@ function copy(n) { } function create(l, x, d, r) { - var hl = treeHeight(l); - var hr = treeHeight(r); + let hl = treeHeight(l); + let hr = treeHeight(r); return { k: x, v: d, @@ -75,11 +75,11 @@ function updateValue(n, newValue) { } function bal(l, x, d, r) { - var hl = l !== undefined ? l.h : 0; - var hr = r !== undefined ? r.h : 0; + let hl = l !== undefined ? l.h : 0; + let hr = r !== undefined ? r.h : 0; if (hl > (hr + 2 | 0)) { - var ll = l.l; - var lr = l.r; + let ll = l.l; + let lr = l.r; if (treeHeight(ll) >= treeHeight(lr)) { return create(ll, l.k, l.v, create(lr, x, d, r)); } else { @@ -95,8 +95,8 @@ function bal(l, x, d, r) { r: r }; } - var rl = r.l; - var rr = r.r; + let rl = r.l; + let rr = r.r; if (treeHeight(rr) >= treeHeight(rl)) { return create(create(l, x, d, rl), r.k, r.v, rr); } else { @@ -106,8 +106,8 @@ function bal(l, x, d, r) { function minKey0Aux(_n) { while(true) { - var n = _n; - var n$1 = n.l; + let n = _n; + let n$1 = n.l; if (n$1 === undefined) { return n.k; } @@ -132,8 +132,8 @@ function minKeyUndefined(n) { function maxKey0Aux(_n) { while(true) { - var n = _n; - var n$1 = n.r; + let n = _n; + let n$1 = n.r; if (n$1 === undefined) { return n.k; } @@ -158,8 +158,8 @@ function maxKeyUndefined(n) { function minKV0Aux(_n) { while(true) { - var n = _n; - var n$1 = n.l; + let n = _n; + let n$1 = n.l; if (n$1 === undefined) { return [ n.k, @@ -187,8 +187,8 @@ function minUndefined(n) { function maxKV0Aux(_n) { while(true) { - var n = _n; - var n$1 = n.r; + let n = _n; + let n$1 = n.r; if (n$1 === undefined) { return [ n.k, @@ -215,7 +215,7 @@ function maxUndefined(n) { } function removeMinAuxWithRef(n, kr, vr) { - var ln = n.l; + let ln = n.l; if (ln !== undefined) { return bal(removeMinAuxWithRef(ln, kr, vr), n.k, n.v, n.r); } else { @@ -231,8 +231,8 @@ function isEmpty(x) { function stackAllLeft(_v, _s) { while(true) { - var s = _s; - var v = _v; + let s = _s; + let v = _v; if (v === undefined) { return s; } @@ -249,20 +249,20 @@ function findFirstByU(n, p) { if (n === undefined) { return; } - var left = findFirstByU(n.l, p); + let left = findFirstByU(n.l, p); if (left !== undefined) { return left; } - var v = n.k; - var d = n.v; - var pvd = p(v, d); + let v = n.k; + let d = n.v; + let pvd = p(v, d); if (pvd) { return [ v, d ]; } - var right = findFirstByU(n.r, p); + let right = findFirstByU(n.r, p); if (right !== undefined) { return right; } @@ -275,7 +275,7 @@ function findFirstBy(n, p) { function forEachU(_n, f) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return; } @@ -294,9 +294,9 @@ function mapU(n, f) { if (n === undefined) { return; } - var newLeft = mapU(n.l, f); - var newD = f(n.v); - var newRight = mapU(n.r, f); + let newLeft = mapU(n.l, f); + let newD = f(n.v); + let newRight = mapU(n.r, f); return { k: n.k, v: newD, @@ -314,10 +314,10 @@ function mapWithKeyU(n, f) { if (n === undefined) { return; } - var key = n.k; - var newLeft = mapWithKeyU(n.l, f); - var newD = f(key, n.v); - var newRight = mapWithKeyU(n.r, f); + let key = n.k; + let newLeft = mapWithKeyU(n.l, f); + let newD = f(key, n.v); + let newRight = mapWithKeyU(n.r, f); return { k: key, v: newD, @@ -333,15 +333,15 @@ function mapWithKey(n, f) { function reduceU(_m, _accu, f) { while(true) { - var accu = _accu; - var m = _m; + let accu = _accu; + let m = _m; if (m === undefined) { return accu; } - var v = m.k; - var d = m.v; - var l = m.l; - var r = m.r; + let v = m.k; + let d = m.v; + let l = m.l; + let r = m.r; _accu = f(reduceU(l, accu, f), v, d); _m = r; continue ; @@ -354,7 +354,7 @@ function reduce(m, accu, f) { function everyU(_n, p) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return true; } @@ -375,7 +375,7 @@ function every(n, p) { function someU(_n, p) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return false; } @@ -417,16 +417,16 @@ function join(ln, v, d, rn) { if (rn === undefined) { return addMaxElement(ln, v, d); } - var lv = ln.k; - var ld = ln.v; - var lh = ln.h; - var ll = ln.l; - var lr = ln.r; - var rv = rn.k; - var rd = rn.v; - var rh = rn.h; - var rl = rn.l; - var rr = rn.r; + let lv = ln.k; + let ld = ln.v; + let lh = ln.h; + let ll = ln.l; + let lr = ln.r; + let rv = rn.k; + let rd = rn.v; + let rh = rn.h; + let rl = rn.l; + let rr = rn.r; if (lh > (rh + 2 | 0)) { return bal(ll, lv, ld, join(lr, v, d, rn)); } else if (rh > (lh + 2 | 0)) { @@ -443,13 +443,13 @@ function concat(t1, t2) { if (t2 === undefined) { return t1; } - var kr = { + let kr = { contents: t2.k }; - var vr = { + let vr = { contents: t2.v }; - var t2r = removeMinAuxWithRef(t2, kr, vr); + let t2r = removeMinAuxWithRef(t2, kr, vr); return join(t1, kr.contents, vr.contents, t2r); } @@ -465,11 +465,11 @@ function keepSharedU(n, p) { if (n === undefined) { return; } - var v = n.k; - var d = n.v; - var newLeft = keepSharedU(n.l, p); - var pvd = p(v, d); - var newRight = keepSharedU(n.r, p); + let v = n.k; + let d = n.v; + let newLeft = keepSharedU(n.l, p); + let pvd = p(v, d); + let newRight = keepSharedU(n.r, p); if (pvd) { return join(newLeft, v, d, newRight); } else { @@ -485,11 +485,11 @@ function keepMapU(n, p) { if (n === undefined) { return; } - var v = n.k; - var d = n.v; - var newLeft = keepMapU(n.l, p); - var pvd = p(v, d); - var newRight = keepMapU(n.r, p); + let v = n.k; + let d = n.v; + let newLeft = keepMapU(n.l, p); + let pvd = p(v, d); + let newRight = keepMapU(n.r, p); if (pvd !== undefined) { return join(newLeft, v, Caml_option.valFromOption(pvd), newRight); } else { @@ -508,15 +508,15 @@ function partitionSharedU(n, p) { undefined ]; } - var key = n.k; - var value = n.v; - var match = partitionSharedU(n.l, p); - var lf = match[1]; - var lt = match[0]; - var pvd = p(key, value); - var match$1 = partitionSharedU(n.r, p); - var rf = match$1[1]; - var rt = match$1[0]; + let key = n.k; + let value = n.v; + let match = partitionSharedU(n.l, p); + let lf = match[1]; + let lt = match[0]; + let pvd = p(key, value); + let match$1 = partitionSharedU(n.r, p); + let rf = match$1[1]; + let rt = match$1[0]; if (pvd) { return [ join(lt, key, value, rt), @@ -535,10 +535,10 @@ function partitionShared(n, p) { } function lengthNode(n) { - var l = n.l; - var r = n.r; - var sizeL = l !== undefined ? lengthNode(l) : 0; - var sizeR = r !== undefined ? lengthNode(r) : 0; + let l = n.l; + let r = n.r; + let sizeL = l !== undefined ? lengthNode(l) : 0; + let sizeR = r !== undefined ? lengthNode(r) : 0; return (1 + sizeL | 0) + sizeR | 0; } @@ -552,15 +552,15 @@ function size(n) { function toListAux(_n, _accu) { while(true) { - var accu = _accu; - var n = _n; + let accu = _accu; + let n = _n; if (n === undefined) { return accu; } - var k = n.k; - var v = n.v; - var l = n.l; - var r = n.r; + let k = n.k; + let v = n.v; + let l = n.l; + let r = n.r; _accu = { hd: [ k, @@ -579,13 +579,13 @@ function toList(s) { function checkInvariantInternal(_v) { while(true) { - var v = _v; + let v = _v; if (v === undefined) { return; } - var l = v.l; - var r = v.r; - var diff = treeHeight(l) - treeHeight(r) | 0; + let l = v.l; + let r = v.r; + let diff = treeHeight(l) - treeHeight(r) | 0; if (!(diff <= 2 && diff >= -2)) { throw { RE_EXN_ID: "Assert_failure", @@ -605,14 +605,14 @@ function checkInvariantInternal(_v) { function fillArrayKey(_n, _i, arr) { while(true) { - var i = _i; - var n = _n; - var v = n.k; - var l = n.l; - var r = n.r; - var next = l !== undefined ? fillArrayKey(l, i, arr) : i; + let i = _i; + let n = _n; + let v = n.k; + let l = n.l; + let r = n.r; + let next = l !== undefined ? fillArrayKey(l, i, arr) : i; arr[next] = v; - var rnext = next + 1 | 0; + let rnext = next + 1 | 0; if (r === undefined) { return rnext; } @@ -624,13 +624,13 @@ function fillArrayKey(_n, _i, arr) { function fillArrayValue(_n, _i, arr) { while(true) { - var i = _i; - var n = _n; - var l = n.l; - var r = n.r; - var next = l !== undefined ? fillArrayValue(l, i, arr) : i; + let i = _i; + let n = _n; + let l = n.l; + let r = n.r; + let next = l !== undefined ? fillArrayValue(l, i, arr) : i; arr[next] = n.v; - var rnext = next + 1 | 0; + let rnext = next + 1 | 0; if (r === undefined) { return rnext; } @@ -642,17 +642,17 @@ function fillArrayValue(_n, _i, arr) { function fillArray(_n, _i, arr) { while(true) { - var i = _i; - var n = _n; - var l = n.l; - var v = n.k; - var r = n.r; - var next = l !== undefined ? fillArray(l, i, arr) : i; + let i = _i; + let n = _n; + let l = n.l; + let v = n.k; + let r = n.r; + let next = l !== undefined ? fillArray(l, i, arr) : i; arr[next] = [ v, n.v ]; - var rnext = next + 1 | 0; + let rnext = next + 1 | 0; if (r === undefined) { return rnext; } @@ -666,8 +666,8 @@ function toArray(n) { if (n === undefined) { return []; } - var size = lengthNode(n); - var v = new Array(size); + let size = lengthNode(n); + let v = new Array(size); fillArray(n, 0, v); return v; } @@ -676,8 +676,8 @@ function keysToArray(n) { if (n === undefined) { return []; } - var size = lengthNode(n); - var v = new Array(size); + let size = lengthNode(n); + let v = new Array(size); fillArrayKey(n, 0, v); return v; } @@ -686,8 +686,8 @@ function valuesToArray(n) { if (n === undefined) { return []; } - var size = lengthNode(n); - var v = new Array(size); + let size = lengthNode(n); + let v = new Array(size); fillArrayValue(n, 0, v); return v; } @@ -697,13 +697,13 @@ function fromSortedArrayRevAux(arr, off, len) { case 0 : return; case 1 : - var match = arr[off]; + let match = arr[off]; return singleton(match[0], match[1]); case 2 : - var match_0 = arr[off]; - var match_1 = arr[off - 1 | 0]; - var match$1 = match_1; - var match$2 = match_0; + let match_0 = arr[off]; + let match_1 = arr[off - 1 | 0]; + let match$1 = match_1; + let match$2 = match_0; return { k: match$1[0], v: match$1[1], @@ -712,12 +712,12 @@ function fromSortedArrayRevAux(arr, off, len) { r: undefined }; case 3 : - var match_0$1 = arr[off]; - var match_1$1 = arr[off - 1 | 0]; - var match_2 = arr[off - 2 | 0]; - var match$3 = match_2; - var match$4 = match_1$1; - var match$5 = match_0$1; + let match_0$1 = arr[off]; + let match_1$1 = arr[off - 1 | 0]; + let match_2 = arr[off - 2 | 0]; + let match$3 = match_2; + let match$4 = match_1$1; + let match$5 = match_0$1; return { k: match$4[0], v: match$4[1], @@ -726,10 +726,10 @@ function fromSortedArrayRevAux(arr, off, len) { r: singleton(match$3[0], match$3[1]) }; default: - var nl = len / 2 | 0; - var left = fromSortedArrayRevAux(arr, off, nl); - var match$6 = arr[off - nl | 0]; - var right = fromSortedArrayRevAux(arr, (off - nl | 0) - 1 | 0, (len - nl | 0) - 1 | 0); + let nl = len / 2 | 0; + let left = fromSortedArrayRevAux(arr, off, nl); + let match$6 = arr[off - nl | 0]; + let right = fromSortedArrayRevAux(arr, (off - nl | 0) - 1 | 0, (len - nl | 0) - 1 | 0); return create(left, match$6[0], match$6[1], right); } } @@ -739,13 +739,13 @@ function fromSortedArrayAux(arr, off, len) { case 0 : return; case 1 : - var match = arr[off]; + let match = arr[off]; return singleton(match[0], match[1]); case 2 : - var match_0 = arr[off]; - var match_1 = arr[off + 1 | 0]; - var match$1 = match_1; - var match$2 = match_0; + let match_0 = arr[off]; + let match_1 = arr[off + 1 | 0]; + let match$1 = match_1; + let match$2 = match_0; return { k: match$1[0], v: match$1[1], @@ -754,12 +754,12 @@ function fromSortedArrayAux(arr, off, len) { r: undefined }; case 3 : - var match_0$1 = arr[off]; - var match_1$1 = arr[off + 1 | 0]; - var match_2 = arr[off + 2 | 0]; - var match$3 = match_2; - var match$4 = match_1$1; - var match$5 = match_0$1; + let match_0$1 = arr[off]; + let match_1$1 = arr[off + 1 | 0]; + let match_2 = arr[off + 2 | 0]; + let match$3 = match_2; + let match$4 = match_1$1; + let match$5 = match_0$1; return { k: match$4[0], v: match$4[1], @@ -768,10 +768,10 @@ function fromSortedArrayAux(arr, off, len) { r: singleton(match$3[0], match$3[1]) }; default: - var nl = len / 2 | 0; - var left = fromSortedArrayAux(arr, off, nl); - var match$6 = arr[off + nl | 0]; - var right = fromSortedArrayAux(arr, (off + nl | 0) + 1 | 0, (len - nl | 0) - 1 | 0); + let nl = len / 2 | 0; + let left = fromSortedArrayAux(arr, off, nl); + let match$6 = arr[off + nl | 0]; + let right = fromSortedArrayAux(arr, (off + nl | 0) + 1 | 0, (len - nl | 0) - 1 | 0); return create(left, match$6[0], match$6[1], right); } } @@ -781,27 +781,27 @@ function fromSortedArrayUnsafe(arr) { } function cmpU(s1, s2, kcmp, vcmp) { - var len1 = size(s1); - var len2 = size(s2); + let len1 = size(s1); + let len2 = size(s2); if (len1 === len2) { - var _e1 = stackAllLeft(s1, /* [] */0); - var _e2 = stackAllLeft(s2, /* [] */0); + let _e1 = stackAllLeft(s1, /* [] */0); + let _e2 = stackAllLeft(s2, /* [] */0); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (!e1) { return 0; } if (!e2) { return 0; } - var h2 = e2.hd; - var h1 = e1.hd; - var c = kcmp(h1.k, h2.k); + let h2 = e2.hd; + let h1 = e1.hd; + let c = kcmp(h1.k, h2.k); if (c !== 0) { return c; } - var cx = vcmp(h1.v, h2.v); + let cx = vcmp(h1.v, h2.v); if (cx !== 0) { return cx; } @@ -821,22 +821,22 @@ function cmp(s1, s2, kcmp, vcmp) { } function eqU(s1, s2, kcmp, veq) { - var len1 = size(s1); - var len2 = size(s2); + let len1 = size(s1); + let len2 = size(s2); if (len1 === len2) { - var _e1 = stackAllLeft(s1, /* [] */0); - var _e2 = stackAllLeft(s2, /* [] */0); + let _e1 = stackAllLeft(s1, /* [] */0); + let _e2 = stackAllLeft(s2, /* [] */0); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (!e1) { return true; } if (!e2) { return true; } - var h2 = e2.hd; - var h1 = e1.hd; + let h2 = e2.hd; + let h1 = e1.hd; if (!(kcmp(h1.k, h2.k) === 0 && veq(h1.v, h2.v))) { return false; } @@ -855,12 +855,12 @@ function eq(s1, s2, kcmp, veq) { function get(_n, x, cmp) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return; } - var v = n.k; - var c = cmp(x, v); + let v = n.k; + let c = cmp(x, v); if (c === 0) { return Caml_option.some(n.v); } @@ -871,12 +871,12 @@ function get(_n, x, cmp) { function getUndefined(_n, x, cmp) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return; } - var v = n.k; - var c = cmp(x, v); + let v = n.k; + let c = cmp(x, v); if (c === 0) { return n.v; } @@ -887,10 +887,10 @@ function getUndefined(_n, x, cmp) { function getExn(_n, x, cmp) { while(true) { - var n = _n; + let n = _n; if (n !== undefined) { - var v = n.k; - var c = cmp(x, v); + let v = n.k; + let c = cmp(x, v); if (c === 0) { return n.v; } @@ -906,12 +906,12 @@ function getExn(_n, x, cmp) { function getWithDefault(_n, x, def, cmp) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return def; } - var v = n.k; - var c = cmp(x, v); + let v = n.k; + let c = cmp(x, v); if (c === 0) { return n.v; } @@ -922,12 +922,12 @@ function getWithDefault(_n, x, def, cmp) { function has(_n, x, cmp) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return false; } - var v = n.k; - var c = cmp(x, v); + let v = n.k; + let c = cmp(x, v); if (c === 0) { return true; } @@ -937,16 +937,16 @@ function has(_n, x, cmp) { } function rotateWithLeftChild(k2) { - var k1 = k2.l; + let k1 = k2.l; k2.l = k1.r; k1.r = k2; - var hlk2 = treeHeight(k2.l); - var hrk2 = treeHeight(k2.r); + let hlk2 = treeHeight(k2.l); + let hrk2 = treeHeight(k2.r); k2.h = ( hlk2 > hrk2 ? hlk2 : hrk2 ) + 1 | 0; - var hlk1 = treeHeight(k1.l); - var hk2 = k2.h; + let hlk1 = treeHeight(k1.l); + let hk2 = k2.h; k1.h = ( hlk1 > hk2 ? hlk1 : hk2 ) + 1 | 0; @@ -954,16 +954,16 @@ function rotateWithLeftChild(k2) { } function rotateWithRightChild(k1) { - var k2 = k1.r; + let k2 = k1.r; k1.r = k2.l; k2.l = k1; - var hlk1 = treeHeight(k1.l); - var hrk1 = treeHeight(k1.r); + let hlk1 = treeHeight(k1.l); + let hrk1 = treeHeight(k1.r); k1.h = ( hlk1 > hrk1 ? hlk1 : hrk1 ) + 1 | 0; - var hrk2 = treeHeight(k2.r); - var hk1 = k1.h; + let hrk2 = treeHeight(k2.r); + let hk1 = k1.h; k2.h = ( hrk2 > hk1 ? hrk2 : hk1 ) + 1 | 0; @@ -971,22 +971,22 @@ function rotateWithRightChild(k1) { } function doubleWithLeftChild(k3) { - var x = k3.l; - var v = rotateWithRightChild(x); + let x = k3.l; + let v = rotateWithRightChild(x); k3.l = v; return rotateWithLeftChild(k3); } function doubleWithRightChild(k2) { - var x = k2.r; - var v = rotateWithLeftChild(x); + let x = k2.r; + let v = rotateWithLeftChild(x); k2.r = v; return rotateWithRightChild(k2); } function heightUpdateMutate(t) { - var hlt = treeHeight(t.l); - var hrt = treeHeight(t.r); + let hlt = treeHeight(t.l); + let hrt = treeHeight(t.r); t.h = ( hlt > hrt ? hlt : hrt ) + 1 | 0; @@ -994,13 +994,13 @@ function heightUpdateMutate(t) { } function balMutate(nt) { - var l = nt.l; - var r = nt.r; - var hl = treeHeight(l); - var hr = treeHeight(r); + let l = nt.l; + let r = nt.r; + let hl = treeHeight(l); + let hr = treeHeight(r); if (hl > (2 + hr | 0)) { - var ll = l.l; - var lr = l.r; + let ll = l.l; + let lr = l.r; if (heightGe(ll, lr)) { return heightUpdateMutate(rotateWithLeftChild(nt)); } else { @@ -1008,8 +1008,8 @@ function balMutate(nt) { } } if (hr > (2 + hl | 0)) { - var rl = r.l; - var rr = r.r; + let rl = r.l; + let rr = r.r; if (heightGe(rr, rl)) { return heightUpdateMutate(rotateWithRightChild(nt)); } else { @@ -1026,16 +1026,16 @@ function updateMutate(t, x, data, cmp) { if (t === undefined) { return singleton(x, data); } - var k = t.k; - var c = cmp(x, k); + let k = t.k; + let c = cmp(x, k); if (c === 0) { t.v = data; return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (c < 0) { - var ll = updateMutate(l, x, data, cmp); + let ll = updateMutate(l, x, data, cmp); t.l = ll; } else { t.r = updateMutate(r, x, data, cmp); @@ -1044,30 +1044,30 @@ function updateMutate(t, x, data, cmp) { } function fromArray(xs, cmp) { - var len = xs.length; + let len = xs.length; if (len === 0) { return; } - var next = Belt_SortArray.strictlySortedLengthU(xs, (function (param, param$1) { + let next = Belt_SortArray.strictlySortedLengthU(xs, (function (param, param$1) { return cmp(param[0], param$1[0]) < 0; })); - var result; + let result; if (next >= 0) { result = fromSortedArrayAux(xs, 0, next); } else { next = -next | 0; result = fromSortedArrayRevAux(xs, next - 1 | 0, next); } - for(var i = next; i < len; ++i){ - var match = xs[i]; + for(let i = next; i < len; ++i){ + let match = xs[i]; result = updateMutate(result, match[0], match[1], cmp); } return result; } function removeMinAuxWithRootMutate(nt, n) { - var rn = n.r; - var ln = n.l; + let rn = n.r; + let ln = n.l; if (ln !== undefined) { n.l = removeMinAuxWithRootMutate(nt, ln); return balMutate(n); diff --git a/lib/js/belt_internalBuckets.js b/lib/js/belt_internalBuckets.js index 1bf7c26494..3da2fbc5e2 100644 --- a/lib/js/belt_internalBuckets.js +++ b/lib/js/belt_internalBuckets.js @@ -1,14 +1,14 @@ 'use strict'; -var Curry = require("./curry.js"); -var Belt_Array = require("./belt_Array.js"); -var Caml_option = require("./caml_option.js"); +let Curry = require("./curry.js"); +let Belt_Array = require("./belt_Array.js"); +let Caml_option = require("./caml_option.js"); function copyBucket(c) { if (c === undefined) { return c; } - var head = { + let head = { key: c.key, value: c.value, next: undefined @@ -19,12 +19,12 @@ function copyBucket(c) { function copyAuxCont(_c, _prec) { while(true) { - var prec = _prec; - var c = _c; + let prec = _prec; + let c = _c; if (c === undefined) { return; } - var ncopy = { + let ncopy = { key: c.key, value: c.value, next: undefined @@ -37,9 +37,9 @@ function copyAuxCont(_c, _prec) { } function copyBuckets(buckets) { - var len = buckets.length; - var newBuckets = new Array(len); - for(var i = 0; i < len; ++i){ + let len = buckets.length; + let newBuckets = new Array(len); + for(let i = 0; i < len; ++i){ newBuckets[i] = copyBucket(buckets[i]); } return newBuckets; @@ -56,8 +56,8 @@ function copy(x) { function bucketLength(_accu, _buckets) { while(true) { - var buckets = _buckets; - var accu = _accu; + let buckets = _buckets; + let accu = _accu; if (buckets === undefined) { return accu; } @@ -69,7 +69,7 @@ function bucketLength(_accu, _buckets) { function do_bucket_iter(f, _buckets) { while(true) { - var buckets = _buckets; + let buckets = _buckets; if (buckets === undefined) { return; } @@ -80,8 +80,8 @@ function do_bucket_iter(f, _buckets) { } function forEachU(h, f) { - var d = h.buckets; - for(var i = 0 ,i_finish = d.length; i < i_finish; ++i){ + let d = h.buckets; + for(let i = 0 ,i_finish = d.length; i < i_finish; ++i){ do_bucket_iter(f, d[i]); } } @@ -92,8 +92,8 @@ function forEach(h, f) { function do_bucket_fold(f, _b, _accu) { while(true) { - var accu = _accu; - var b = _b; + let accu = _accu; + let b = _b; if (b === undefined) { return accu; } @@ -104,9 +104,9 @@ function do_bucket_fold(f, _b, _accu) { } function reduceU(h, init, f) { - var d = h.buckets; - var accu = init; - for(var i = 0 ,i_finish = d.length; i < i_finish; ++i){ + let d = h.buckets; + let accu = init; + for(let i = 0 ,i_finish = d.length; i < i_finish; ++i){ accu = do_bucket_fold(f, d[i], accu); } return accu; @@ -118,7 +118,7 @@ function reduce(h, init, f) { function getMaxBucketLength(h) { return Belt_Array.reduceU(h.buckets, 0, (function (m, b) { - var len = bucketLength(0, b); + let len = bucketLength(0, b); if (m > len) { return m; } else { @@ -128,19 +128,19 @@ function getMaxBucketLength(h) { } function getBucketHistogram(h) { - var mbl = getMaxBucketLength(h); - var histo = Belt_Array.makeByU(mbl + 1 | 0, (function (param) { + let mbl = getMaxBucketLength(h); + let histo = Belt_Array.makeByU(mbl + 1 | 0, (function (param) { return 0; })); Belt_Array.forEachU(h.buckets, (function (b) { - var l = bucketLength(0, b); + let l = bucketLength(0, b); histo[l] = histo[l] + 1 | 0; })); return histo; } function logStats(h) { - var histogram = getBucketHistogram(h); + let histogram = getBucketHistogram(h); console.log({ bindings: h.size, buckets: h.buckets.length, @@ -150,10 +150,10 @@ function logStats(h) { function filterMapInplaceBucket(f, h, i, _prec, _cell) { while(true) { - var cell = _cell; - var prec = _prec; - var n = cell.next; - var data = f(cell.key, cell.value); + let cell = _cell; + let prec = _prec; + let n = cell.next; + let data = f(cell.key, cell.value); if (data !== undefined) { if (prec !== undefined) { cell.next = cell; @@ -184,9 +184,9 @@ function filterMapInplaceBucket(f, h, i, _prec, _cell) { } function keepMapInPlaceU(h, f) { - var h_buckets = h.buckets; - for(var i = 0 ,i_finish = h_buckets.length; i < i_finish; ++i){ - var v = h_buckets[i]; + let h_buckets = h.buckets; + for(let i = 0 ,i_finish = h_buckets.length; i < i_finish; ++i){ + let v = h_buckets[i]; if (v !== undefined) { filterMapInplaceBucket(f, h, i, undefined, v); } @@ -200,13 +200,13 @@ function keepMapInPlace(h, f) { function fillArray(_i, arr, _cell) { while(true) { - var cell = _cell; - var i = _i; + let cell = _cell; + let i = _i; arr[i] = [ cell.key, cell.value ]; - var v = cell.next; + let v = cell.next; if (v === undefined) { return i + 1 | 0; } @@ -218,10 +218,10 @@ function fillArray(_i, arr, _cell) { function fillArrayMap(_i, arr, _cell, f) { while(true) { - var cell = _cell; - var i = _i; + let cell = _cell; + let i = _i; arr[i] = f(cell); - var v = cell.next; + let v = cell.next; if (v === undefined) { return i + 1 | 0; } @@ -232,11 +232,11 @@ function fillArrayMap(_i, arr, _cell, f) { } function linear(h, f) { - var d = h.buckets; - var current = 0; - var arr = new Array(h.size); - for(var i = 0 ,i_finish = d.length; i < i_finish; ++i){ - var cell = d[i]; + let d = h.buckets; + let current = 0; + let arr = new Array(h.size); + for(let i = 0 ,i_finish = d.length; i < i_finish; ++i){ + let cell = d[i]; if (cell !== undefined) { current = fillArrayMap(current, arr, cell, f); } @@ -266,7 +266,7 @@ function toArray(h) { })); } -var C; +let C; exports.C = C; exports.copy = copy; diff --git a/lib/js/belt_internalBucketsType.js b/lib/js/belt_internalBucketsType.js index 826a249816..6b05dc2167 100644 --- a/lib/js/belt_internalBucketsType.js +++ b/lib/js/belt_internalBucketsType.js @@ -3,7 +3,7 @@ function power_2_above(_x, n) { while(true) { - var x = _x; + let x = _x; if (x >= n) { return x; } @@ -16,7 +16,7 @@ function power_2_above(_x, n) { } function make(hash, eq, hintSize) { - var s = power_2_above(16, hintSize); + let s = power_2_above(16, hintSize); return { size: 0, buckets: new Array(s), @@ -27,9 +27,9 @@ function make(hash, eq, hintSize) { function clear(h) { h.size = 0; - var h_buckets = h.buckets; - var len = h_buckets.length; - for(var i = 0; i < len; ++i){ + let h_buckets = h.buckets; + let len = h_buckets.length; + for(let i = 0; i < len; ++i){ h_buckets[i] = undefined; } } @@ -38,7 +38,7 @@ function isEmpty(h) { return h.size === 0; } -var emptyOpt; +let emptyOpt; exports.emptyOpt = emptyOpt; exports.make = make; diff --git a/lib/js/belt_internalMapInt.js b/lib/js/belt_internalMapInt.js index 0855581670..4011eb81d2 100644 --- a/lib/js/belt_internalMapInt.js +++ b/lib/js/belt_internalMapInt.js @@ -1,20 +1,20 @@ 'use strict'; -var Caml = require("./caml.js"); -var Curry = require("./curry.js"); -var Caml_option = require("./caml_option.js"); -var Belt_SortArray = require("./belt_SortArray.js"); -var Belt_internalAVLtree = require("./belt_internalAVLtree.js"); +let Caml = require("./caml.js"); +let Curry = require("./curry.js"); +let Caml_option = require("./caml_option.js"); +let Belt_SortArray = require("./belt_SortArray.js"); +let Belt_internalAVLtree = require("./belt_internalAVLtree.js"); function add(t, x, data) { if (t === undefined) { return Belt_internalAVLtree.singleton(x, data); } - var k = t.k; + let k = t.k; if (x === k) { return Belt_internalAVLtree.updateValue(t, data); } - var v = t.v; + let v = t.v; if (x < k) { return Belt_internalAVLtree.bal(add(t.l, x, data), k, v, t.r); } else { @@ -24,11 +24,11 @@ function add(t, x, data) { function get(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return; } - var v = n.k; + let v = n.k; if (x === v) { return Caml_option.some(n.v); } @@ -39,11 +39,11 @@ function get(_n, x) { function getUndefined(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return; } - var v = n.k; + let v = n.k; if (x === v) { return n.v; } @@ -54,9 +54,9 @@ function getUndefined(_n, x) { function getExn(_n, x) { while(true) { - var n = _n; + let n = _n; if (n !== undefined) { - var v = n.k; + let v = n.k; if (x === v) { return n.v; } @@ -72,11 +72,11 @@ function getExn(_n, x) { function getWithDefault(_n, x, def) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return def; } - var v = n.k; + let v = n.k; if (x === v) { return n.v; } @@ -87,11 +87,11 @@ function getWithDefault(_n, x, def) { function has(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return false; } - var v = n.k; + let v = n.k; if (x === v) { return true; } @@ -104,9 +104,9 @@ function remove(n, x) { if (n === undefined) { return n; } - var v = n.k; - var l = n.l; - var r = n.r; + let v = n.k; + let l = n.l; + let r = n.r; if (x !== v) { if (x < v) { return Belt_internalAVLtree.bal(remove(l, x), v, n.v, r); @@ -120,21 +120,21 @@ function remove(n, x) { if (r === undefined) { return l; } - var kr = { + let kr = { contents: r.k }; - var vr = { + let vr = { contents: r.v }; - var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); + let r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1); } function splitAux(x, n) { - var v = n.k; - var d = n.v; - var l = n.l; - var r = n.r; + let v = n.k; + let d = n.v; + let l = n.l; + let r = n.r; if (x === v) { return [ l, @@ -150,7 +150,7 @@ function splitAux(x, n) { n ]; } - var match = splitAux(x, l); + let match = splitAux(x, l); return [ match[0], match[1], @@ -164,7 +164,7 @@ function splitAux(x, n) { undefined ]; } - var match$1 = splitAux(x, r); + let match$1 = splitAux(x, r); return [ Belt_internalAVLtree.join(l, v, d, match$1[0]), match$1[1], @@ -189,22 +189,22 @@ function mergeU(s1, s2, f) { if (s1.h >= ( s2 !== undefined ? s2.h : 0 )) { - var v1 = s1.k; - var d1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var match = split(v1, s2); + let v1 = s1.k; + let d1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let match = split(v1, s2); return Belt_internalAVLtree.concatOrJoin(mergeU(l1, match[0], f), v1, f(v1, Caml_option.some(d1), match[1]), mergeU(r1, match[2], f)); } } else if (s2 === undefined) { return; } - var v2 = s2.k; - var d2 = s2.v; - var l2 = s2.l; - var r2 = s2.r; - var match$1 = split(v2, s1); + let v2 = s2.k; + let d2 = s2.v; + let l2 = s2.l; + let r2 = s2.r; + let match$1 = split(v2, s1); return Belt_internalAVLtree.concatOrJoin(mergeU(match$1[0], l2, f), v2, f(v2, match$1[1], Caml_option.some(d2)), mergeU(match$1[2], r2, f)); } @@ -214,21 +214,21 @@ function merge(s1, s2, f) { function compareAux(_e1, _e2, vcmp) { while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (!e1) { return 0; } if (!e2) { return 0; } - var h2 = e2.hd; - var h1 = e1.hd; - var c = Caml.int_compare(h1.k, h2.k); + let h2 = e2.hd; + let h1 = e1.hd; + let c = Caml.int_compare(h1.k, h2.k); if (c !== 0) { return c; } - var cx = vcmp(h1.v, h2.v); + let cx = vcmp(h1.v, h2.v); if (cx !== 0) { return cx; } @@ -239,8 +239,8 @@ function compareAux(_e1, _e2, vcmp) { } function cmpU(s1, s2, cmp) { - var len1 = Belt_internalAVLtree.size(s1); - var len2 = Belt_internalAVLtree.size(s2); + let len1 = Belt_internalAVLtree.size(s1); + let len2 = Belt_internalAVLtree.size(s2); if (len1 === len2) { return compareAux(Belt_internalAVLtree.stackAllLeft(s1, /* [] */0), Belt_internalAVLtree.stackAllLeft(s2, /* [] */0), cmp); } else if (len1 < len2) { @@ -256,16 +256,16 @@ function cmp(s1, s2, f) { function eqAux(_e1, _e2, eq) { while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (!e1) { return true; } if (!e2) { return true; } - var h2 = e2.hd; - var h1 = e1.hd; + let h2 = e2.hd; + let h1 = e1.hd; if (!(h1.k === h2.k && eq(h1.v, h2.v))) { return false; } @@ -276,8 +276,8 @@ function eqAux(_e1, _e2, eq) { } function eqU(s1, s2, eq) { - var len1 = Belt_internalAVLtree.size(s1); - var len2 = Belt_internalAVLtree.size(s2); + let len1 = Belt_internalAVLtree.size(s1); + let len2 = Belt_internalAVLtree.size(s2); if (len1 === len2) { return eqAux(Belt_internalAVLtree.stackAllLeft(s1, /* [] */0), Belt_internalAVLtree.stackAllLeft(s2, /* [] */0), eq); } else { @@ -293,16 +293,16 @@ function addMutate(t, x, data) { if (t === undefined) { return Belt_internalAVLtree.singleton(x, data); } - var k = t.k; + let k = t.k; if (x === k) { t.k = x; t.v = data; return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (x < k) { - var ll = addMutate(l, x, data); + let ll = addMutate(l, x, data); t.l = ll; } else { t.r = addMutate(r, x, data); @@ -311,32 +311,32 @@ function addMutate(t, x, data) { } function fromArray(xs) { - var len = xs.length; + let len = xs.length; if (len === 0) { return; } - var next = Belt_SortArray.strictlySortedLengthU(xs, (function (param, param$1) { + let next = Belt_SortArray.strictlySortedLengthU(xs, (function (param, param$1) { return param[0] < param$1[0]; })); - var result; + let result; if (next >= 0) { result = Belt_internalAVLtree.fromSortedArrayAux(xs, 0, next); } else { next = -next | 0; result = Belt_internalAVLtree.fromSortedArrayRevAux(xs, next - 1 | 0, next); } - for(var i = next; i < len; ++i){ - var match = xs[i]; + for(let i = next; i < len; ++i){ + let match = xs[i]; result = addMutate(result, match[0], match[1]); } return result; } -var N; +let N; -var A; +let A; -var S; +let S; exports.N = N; exports.A = A; diff --git a/lib/js/belt_internalMapString.js b/lib/js/belt_internalMapString.js index 955464e46a..7ca674b0c4 100644 --- a/lib/js/belt_internalMapString.js +++ b/lib/js/belt_internalMapString.js @@ -1,20 +1,20 @@ 'use strict'; -var Caml = require("./caml.js"); -var Curry = require("./curry.js"); -var Caml_option = require("./caml_option.js"); -var Belt_SortArray = require("./belt_SortArray.js"); -var Belt_internalAVLtree = require("./belt_internalAVLtree.js"); +let Caml = require("./caml.js"); +let Curry = require("./curry.js"); +let Caml_option = require("./caml_option.js"); +let Belt_SortArray = require("./belt_SortArray.js"); +let Belt_internalAVLtree = require("./belt_internalAVLtree.js"); function add(t, x, data) { if (t === undefined) { return Belt_internalAVLtree.singleton(x, data); } - var k = t.k; + let k = t.k; if (x === k) { return Belt_internalAVLtree.updateValue(t, data); } - var v = t.v; + let v = t.v; if (x < k) { return Belt_internalAVLtree.bal(add(t.l, x, data), k, v, t.r); } else { @@ -24,11 +24,11 @@ function add(t, x, data) { function get(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return; } - var v = n.k; + let v = n.k; if (x === v) { return Caml_option.some(n.v); } @@ -39,11 +39,11 @@ function get(_n, x) { function getUndefined(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return; } - var v = n.k; + let v = n.k; if (x === v) { return n.v; } @@ -54,9 +54,9 @@ function getUndefined(_n, x) { function getExn(_n, x) { while(true) { - var n = _n; + let n = _n; if (n !== undefined) { - var v = n.k; + let v = n.k; if (x === v) { return n.v; } @@ -72,11 +72,11 @@ function getExn(_n, x) { function getWithDefault(_n, x, def) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return def; } - var v = n.k; + let v = n.k; if (x === v) { return n.v; } @@ -87,11 +87,11 @@ function getWithDefault(_n, x, def) { function has(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return false; } - var v = n.k; + let v = n.k; if (x === v) { return true; } @@ -104,9 +104,9 @@ function remove(n, x) { if (n === undefined) { return n; } - var v = n.k; - var l = n.l; - var r = n.r; + let v = n.k; + let l = n.l; + let r = n.r; if (x !== v) { if (x < v) { return Belt_internalAVLtree.bal(remove(l, x), v, n.v, r); @@ -120,21 +120,21 @@ function remove(n, x) { if (r === undefined) { return l; } - var kr = { + let kr = { contents: r.k }; - var vr = { + let vr = { contents: r.v }; - var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); + let r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1); } function splitAux(x, n) { - var v = n.k; - var d = n.v; - var l = n.l; - var r = n.r; + let v = n.k; + let d = n.v; + let l = n.l; + let r = n.r; if (x === v) { return [ l, @@ -150,7 +150,7 @@ function splitAux(x, n) { n ]; } - var match = splitAux(x, l); + let match = splitAux(x, l); return [ match[0], match[1], @@ -164,7 +164,7 @@ function splitAux(x, n) { undefined ]; } - var match$1 = splitAux(x, r); + let match$1 = splitAux(x, r); return [ Belt_internalAVLtree.join(l, v, d, match$1[0]), match$1[1], @@ -189,22 +189,22 @@ function mergeU(s1, s2, f) { if (s1.h >= ( s2 !== undefined ? s2.h : 0 )) { - var v1 = s1.k; - var d1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var match = split(v1, s2); + let v1 = s1.k; + let d1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let match = split(v1, s2); return Belt_internalAVLtree.concatOrJoin(mergeU(l1, match[0], f), v1, f(v1, Caml_option.some(d1), match[1]), mergeU(r1, match[2], f)); } } else if (s2 === undefined) { return; } - var v2 = s2.k; - var d2 = s2.v; - var l2 = s2.l; - var r2 = s2.r; - var match$1 = split(v2, s1); + let v2 = s2.k; + let d2 = s2.v; + let l2 = s2.l; + let r2 = s2.r; + let match$1 = split(v2, s1); return Belt_internalAVLtree.concatOrJoin(mergeU(match$1[0], l2, f), v2, f(v2, match$1[1], Caml_option.some(d2)), mergeU(match$1[2], r2, f)); } @@ -214,21 +214,21 @@ function merge(s1, s2, f) { function compareAux(_e1, _e2, vcmp) { while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (!e1) { return 0; } if (!e2) { return 0; } - var h2 = e2.hd; - var h1 = e1.hd; - var c = Caml.string_compare(h1.k, h2.k); + let h2 = e2.hd; + let h1 = e1.hd; + let c = Caml.string_compare(h1.k, h2.k); if (c !== 0) { return c; } - var cx = vcmp(h1.v, h2.v); + let cx = vcmp(h1.v, h2.v); if (cx !== 0) { return cx; } @@ -239,8 +239,8 @@ function compareAux(_e1, _e2, vcmp) { } function cmpU(s1, s2, cmp) { - var len1 = Belt_internalAVLtree.size(s1); - var len2 = Belt_internalAVLtree.size(s2); + let len1 = Belt_internalAVLtree.size(s1); + let len2 = Belt_internalAVLtree.size(s2); if (len1 === len2) { return compareAux(Belt_internalAVLtree.stackAllLeft(s1, /* [] */0), Belt_internalAVLtree.stackAllLeft(s2, /* [] */0), cmp); } else if (len1 < len2) { @@ -256,16 +256,16 @@ function cmp(s1, s2, f) { function eqAux(_e1, _e2, eq) { while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (!e1) { return true; } if (!e2) { return true; } - var h2 = e2.hd; - var h1 = e1.hd; + let h2 = e2.hd; + let h1 = e1.hd; if (!(h1.k === h2.k && eq(h1.v, h2.v))) { return false; } @@ -276,8 +276,8 @@ function eqAux(_e1, _e2, eq) { } function eqU(s1, s2, eq) { - var len1 = Belt_internalAVLtree.size(s1); - var len2 = Belt_internalAVLtree.size(s2); + let len1 = Belt_internalAVLtree.size(s1); + let len2 = Belt_internalAVLtree.size(s2); if (len1 === len2) { return eqAux(Belt_internalAVLtree.stackAllLeft(s1, /* [] */0), Belt_internalAVLtree.stackAllLeft(s2, /* [] */0), eq); } else { @@ -293,16 +293,16 @@ function addMutate(t, x, data) { if (t === undefined) { return Belt_internalAVLtree.singleton(x, data); } - var k = t.k; + let k = t.k; if (x === k) { t.k = x; t.v = data; return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (x < k) { - var ll = addMutate(l, x, data); + let ll = addMutate(l, x, data); t.l = ll; } else { t.r = addMutate(r, x, data); @@ -311,32 +311,32 @@ function addMutate(t, x, data) { } function fromArray(xs) { - var len = xs.length; + let len = xs.length; if (len === 0) { return; } - var next = Belt_SortArray.strictlySortedLengthU(xs, (function (param, param$1) { + let next = Belt_SortArray.strictlySortedLengthU(xs, (function (param, param$1) { return param[0] < param$1[0]; })); - var result; + let result; if (next >= 0) { result = Belt_internalAVLtree.fromSortedArrayAux(xs, 0, next); } else { next = -next | 0; result = Belt_internalAVLtree.fromSortedArrayRevAux(xs, next - 1 | 0, next); } - for(var i = next; i < len; ++i){ - var match = xs[i]; + for(let i = next; i < len; ++i){ + let match = xs[i]; result = addMutate(result, match[0], match[1]); } return result; } -var N; +let N; -var A; +let A; -var S; +let S; exports.N = N; exports.A = A; diff --git a/lib/js/belt_internalSetBuckets.js b/lib/js/belt_internalSetBuckets.js index a4b4c74929..31b0c6ddb1 100644 --- a/lib/js/belt_internalSetBuckets.js +++ b/lib/js/belt_internalSetBuckets.js @@ -1,16 +1,16 @@ 'use strict'; -var Curry = require("./curry.js"); -var Belt_Array = require("./belt_Array.js"); +let Curry = require("./curry.js"); +let Belt_Array = require("./belt_Array.js"); function copyAuxCont(_c, _prec) { while(true) { - var prec = _prec; - var c = _c; + let prec = _prec; + let c = _c; if (c === undefined) { return; } - var ncopy = { + let ncopy = { key: c.key, next: undefined }; @@ -25,7 +25,7 @@ function copyBucket(c) { if (c === undefined) { return c; } - var head = { + let head = { key: c.key, next: undefined }; @@ -34,9 +34,9 @@ function copyBucket(c) { } function copyBuckets(buckets) { - var len = buckets.length; - var newBuckets = new Array(len); - for(var i = 0; i < len; ++i){ + let len = buckets.length; + let newBuckets = new Array(len); + for(let i = 0; i < len; ++i){ newBuckets[i] = copyBucket(buckets[i]); } return newBuckets; @@ -53,8 +53,8 @@ function copy(x) { function bucketLength(_accu, _buckets) { while(true) { - var buckets = _buckets; - var accu = _accu; + let buckets = _buckets; + let accu = _accu; if (buckets === undefined) { return accu; } @@ -66,7 +66,7 @@ function bucketLength(_accu, _buckets) { function doBucketIter(f, _buckets) { while(true) { - var buckets = _buckets; + let buckets = _buckets; if (buckets === undefined) { return; } @@ -77,8 +77,8 @@ function doBucketIter(f, _buckets) { } function forEachU(h, f) { - var d = h.buckets; - for(var i = 0 ,i_finish = d.length; i < i_finish; ++i){ + let d = h.buckets; + for(let i = 0 ,i_finish = d.length; i < i_finish; ++i){ doBucketIter(f, d[i]); } } @@ -89,10 +89,10 @@ function forEach(h, f) { function fillArray(_i, arr, _cell) { while(true) { - var cell = _cell; - var i = _i; + let cell = _cell; + let i = _i; arr[i] = cell.key; - var v = cell.next; + let v = cell.next; if (v === undefined) { return i + 1 | 0; } @@ -103,11 +103,11 @@ function fillArray(_i, arr, _cell) { } function toArray(h) { - var d = h.buckets; - var current = 0; - var arr = new Array(h.size); - for(var i = 0 ,i_finish = d.length; i < i_finish; ++i){ - var cell = d[i]; + let d = h.buckets; + let current = 0; + let arr = new Array(h.size); + for(let i = 0 ,i_finish = d.length; i < i_finish; ++i){ + let cell = d[i]; if (cell !== undefined) { current = fillArray(current, arr, cell); } @@ -118,8 +118,8 @@ function toArray(h) { function doBucketFold(f, _b, _accu) { while(true) { - var accu = _accu; - var b = _b; + let accu = _accu; + let b = _b; if (b === undefined) { return accu; } @@ -130,9 +130,9 @@ function doBucketFold(f, _b, _accu) { } function reduceU(h, init, f) { - var d = h.buckets; - var accu = init; - for(var i = 0 ,i_finish = d.length; i < i_finish; ++i){ + let d = h.buckets; + let accu = init; + for(let i = 0 ,i_finish = d.length; i < i_finish; ++i){ accu = doBucketFold(f, d[i], accu); } return accu; @@ -144,7 +144,7 @@ function reduce(h, init, f) { function getMaxBucketLength(h) { return Belt_Array.reduceU(h.buckets, 0, (function (m, b) { - var len = bucketLength(0, b); + let len = bucketLength(0, b); if (m > len) { return m; } else { @@ -154,19 +154,19 @@ function getMaxBucketLength(h) { } function getBucketHistogram(h) { - var mbl = getMaxBucketLength(h); - var histo = Belt_Array.makeByU(mbl + 1 | 0, (function (param) { + let mbl = getMaxBucketLength(h); + let histo = Belt_Array.makeByU(mbl + 1 | 0, (function (param) { return 0; })); Belt_Array.forEachU(h.buckets, (function (b) { - var l = bucketLength(0, b); + let l = bucketLength(0, b); histo[l] = histo[l] + 1 | 0; })); return histo; } function logStats(h) { - var histogram = getBucketHistogram(h); + let histogram = getBucketHistogram(h); console.log({ bindings: h.size, buckets: h.buckets.length, @@ -174,7 +174,7 @@ function logStats(h) { }); } -var C; +let C; exports.C = C; exports.copy = copy; diff --git a/lib/js/belt_internalSetInt.js b/lib/js/belt_internalSetInt.js index 31e7490b14..db7481cf8a 100644 --- a/lib/js/belt_internalSetInt.js +++ b/lib/js/belt_internalSetInt.js @@ -1,15 +1,15 @@ 'use strict'; -var Belt_SortArrayInt = require("./belt_SortArrayInt.js"); -var Belt_internalAVLset = require("./belt_internalAVLset.js"); +let Belt_SortArrayInt = require("./belt_SortArrayInt.js"); +let Belt_internalAVLset = require("./belt_internalAVLset.js"); function has(_t, x) { while(true) { - var t = _t; + let t = _t; if (t === undefined) { return false; } - var v = t.v; + let v = t.v; if (x === v) { return true; } @@ -20,18 +20,18 @@ function has(_t, x) { function compareAux(_e1, _e2) { while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (!e1) { return 0; } if (!e2) { return 0; } - var h2 = e2.hd; - var h1 = e1.hd; - var k1 = h1.v; - var k2 = h2.v; + let h2 = e2.hd; + let h1 = e1.hd; + let k1 = h1.v; + let k2 = h2.v; if (k1 !== k2) { if (k1 < k2) { return -1; @@ -46,8 +46,8 @@ function compareAux(_e1, _e2) { } function cmp(s1, s2) { - var len1 = Belt_internalAVLset.size(s1); - var len2 = Belt_internalAVLset.size(s2); + let len1 = Belt_internalAVLset.size(s1); + let len2 = Belt_internalAVLset.size(s2); if (len1 === len2) { return compareAux(Belt_internalAVLset.stackAllLeft(s1, /* [] */0), Belt_internalAVLset.stackAllLeft(s2, /* [] */0)); } else if (len1 < len2) { @@ -63,20 +63,20 @@ function eq(s1, s2) { function subset(_s1, _s2) { while(true) { - var s2 = _s2; - var s1 = _s1; + let s2 = _s2; + let s1 = _s1; if (s1 === undefined) { return true; } if (s2 === undefined) { return false; } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var v2 = s2.v; - var l2 = s2.l; - var r2 = s2.r; + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let v2 = s2.v; + let l2 = s2.l; + let r2 = s2.r; if (v1 === v2) { if (!subset(l1, l2)) { return false; @@ -102,11 +102,11 @@ function subset(_s1, _s2) { function get(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return; } - var v = n.v; + let v = n.v; if (x === v) { return v; } @@ -117,11 +117,11 @@ function get(_n, x) { function getUndefined(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return; } - var v = n.v; + let v = n.v; if (x === v) { return v; } @@ -132,9 +132,9 @@ function getUndefined(_n, x) { function getExn(_n, x) { while(true) { - var n = _n; + let n = _n; if (n !== undefined) { - var v = n.v; + let v = n.v; if (x === v) { return v; } @@ -152,12 +152,12 @@ function addMutate(t, x) { if (t === undefined) { return Belt_internalAVLset.singleton(x); } - var k = t.v; + let k = t.v; if (x === k) { return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (x < k) { t.l = addMutate(l, x); } else { @@ -167,29 +167,29 @@ function addMutate(t, x) { } function fromArray(xs) { - var len = xs.length; + let len = xs.length; if (len === 0) { return; } - var next = Belt_SortArrayInt.strictlySortedLength(xs); - var result; + let next = Belt_SortArrayInt.strictlySortedLength(xs); + let result; if (next >= 0) { result = Belt_internalAVLset.fromSortedArrayAux(xs, 0, next); } else { next = -next | 0; result = Belt_internalAVLset.fromSortedArrayRevAux(xs, next - 1 | 0, next); } - for(var i = next; i < len; ++i){ + for(let i = next; i < len; ++i){ result = addMutate(result, xs[i]); } return result; } -var S; +let S; -var N; +let N; -var A; +let A; exports.S = S; exports.N = N; diff --git a/lib/js/belt_internalSetString.js b/lib/js/belt_internalSetString.js index 5d25abb44d..18894e7491 100644 --- a/lib/js/belt_internalSetString.js +++ b/lib/js/belt_internalSetString.js @@ -1,15 +1,15 @@ 'use strict'; -var Belt_internalAVLset = require("./belt_internalAVLset.js"); -var Belt_SortArrayString = require("./belt_SortArrayString.js"); +let Belt_internalAVLset = require("./belt_internalAVLset.js"); +let Belt_SortArrayString = require("./belt_SortArrayString.js"); function has(_t, x) { while(true) { - var t = _t; + let t = _t; if (t === undefined) { return false; } - var v = t.v; + let v = t.v; if (x === v) { return true; } @@ -20,18 +20,18 @@ function has(_t, x) { function compareAux(_e1, _e2) { while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (!e1) { return 0; } if (!e2) { return 0; } - var h2 = e2.hd; - var h1 = e1.hd; - var k1 = h1.v; - var k2 = h2.v; + let h2 = e2.hd; + let h1 = e1.hd; + let k1 = h1.v; + let k2 = h2.v; if (k1 !== k2) { if (k1 < k2) { return -1; @@ -46,8 +46,8 @@ function compareAux(_e1, _e2) { } function cmp(s1, s2) { - var len1 = Belt_internalAVLset.size(s1); - var len2 = Belt_internalAVLset.size(s2); + let len1 = Belt_internalAVLset.size(s1); + let len2 = Belt_internalAVLset.size(s2); if (len1 === len2) { return compareAux(Belt_internalAVLset.stackAllLeft(s1, /* [] */0), Belt_internalAVLset.stackAllLeft(s2, /* [] */0)); } else if (len1 < len2) { @@ -63,20 +63,20 @@ function eq(s1, s2) { function subset(_s1, _s2) { while(true) { - var s2 = _s2; - var s1 = _s1; + let s2 = _s2; + let s1 = _s1; if (s1 === undefined) { return true; } if (s2 === undefined) { return false; } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var v2 = s2.v; - var l2 = s2.l; - var r2 = s2.r; + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let v2 = s2.v; + let l2 = s2.l; + let r2 = s2.r; if (v1 === v2) { if (!subset(l1, l2)) { return false; @@ -102,11 +102,11 @@ function subset(_s1, _s2) { function get(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return; } - var v = n.v; + let v = n.v; if (x === v) { return v; } @@ -117,11 +117,11 @@ function get(_n, x) { function getUndefined(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return; } - var v = n.v; + let v = n.v; if (x === v) { return v; } @@ -132,9 +132,9 @@ function getUndefined(_n, x) { function getExn(_n, x) { while(true) { - var n = _n; + let n = _n; if (n !== undefined) { - var v = n.v; + let v = n.v; if (x === v) { return v; } @@ -152,12 +152,12 @@ function addMutate(t, x) { if (t === undefined) { return Belt_internalAVLset.singleton(x); } - var k = t.v; + let k = t.v; if (x === k) { return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (x < k) { t.l = addMutate(l, x); } else { @@ -167,29 +167,29 @@ function addMutate(t, x) { } function fromArray(xs) { - var len = xs.length; + let len = xs.length; if (len === 0) { return; } - var next = Belt_SortArrayString.strictlySortedLength(xs); - var result; + let next = Belt_SortArrayString.strictlySortedLength(xs); + let result; if (next >= 0) { result = Belt_internalAVLset.fromSortedArrayAux(xs, 0, next); } else { next = -next | 0; result = Belt_internalAVLset.fromSortedArrayRevAux(xs, next - 1 | 0, next); } - for(var i = next; i < len; ++i){ + for(let i = next; i < len; ++i){ result = addMutate(result, xs[i]); } return result; } -var S; +let S; -var N; +let N; -var A; +let A; exports.S = S; exports.N = N; diff --git a/lib/js/buffer.js b/lib/js/buffer.js index 3c704d7a69..7b493282b7 100644 --- a/lib/js/buffer.js +++ b/lib/js/buffer.js @@ -1,14 +1,14 @@ 'use strict'; -var Bytes = require("./bytes.js"); -var Curry = require("./curry.js"); -var $$String = require("./string.js"); -var Caml_bytes = require("./caml_bytes.js"); -var Caml_string = require("./caml_string.js"); +let Bytes = require("./bytes.js"); +let Curry = require("./curry.js"); +let $$String = require("./string.js"); +let Caml_bytes = require("./caml_bytes.js"); +let Caml_string = require("./caml_string.js"); function create(n) { - var n$1 = n < 1 ? 1 : n; - var s = Caml_bytes.create(n$1); + let n$1 = n < 1 ? 1 : n; + let s = Caml_bytes.create(n$1); return { buffer: s, position: 0, @@ -73,19 +73,19 @@ function reset(b) { } function resize(b, more) { - var len = b.length; - var new_len = len; + let len = b.length; + let new_len = len; while((b.position + more | 0) > new_len) { new_len = (new_len << 1); }; - var new_buffer = Caml_bytes.create(new_len); + let new_buffer = Caml_bytes.create(new_len); Bytes.blit(b.buffer, 0, new_buffer, 0, b.position); b.buffer = new_buffer; b.length = new_len; } function add_char(b, c) { - var pos = b.position; + let pos = b.position; if (pos >= b.length) { resize(b, 1); } @@ -94,7 +94,7 @@ function add_char(b, c) { } function add_utf_8_uchar(b, u) { - var u$1 = u; + let u$1 = u; if (u$1 < 0) { throw { RE_EXN_ID: "Assert_failure", @@ -110,7 +110,7 @@ function add_utf_8_uchar(b, u) { return add_char(b, u$1); } if (u$1 <= 2047) { - var pos = b.position; + let pos = b.position; if ((pos + 2 | 0) > b.length) { resize(b, 2); } @@ -120,7 +120,7 @@ function add_utf_8_uchar(b, u) { return; } if (u$1 <= 65535) { - var pos$1 = b.position; + let pos$1 = b.position; if ((pos$1 + 3 | 0) > b.length) { resize(b, 3); } @@ -131,7 +131,7 @@ function add_utf_8_uchar(b, u) { return; } if (u$1 <= 1114111) { - var pos$2 = b.position; + let pos$2 = b.position; if ((pos$2 + 4 | 0) > b.length) { resize(b, 4); } @@ -154,7 +154,7 @@ function add_utf_8_uchar(b, u) { } function add_utf_16be_uchar(b, u) { - var u$1 = u; + let u$1 = u; if (u$1 < 0) { throw { RE_EXN_ID: "Assert_failure", @@ -167,7 +167,7 @@ function add_utf_16be_uchar(b, u) { }; } if (u$1 <= 65535) { - var pos = b.position; + let pos = b.position; if ((pos + 2 | 0) > b.length) { resize(b, 2); } @@ -177,10 +177,10 @@ function add_utf_16be_uchar(b, u) { return; } if (u$1 <= 1114111) { - var u$p = u$1 - 65536 | 0; - var hi = 55296 | (u$p >>> 10); - var lo = 56320 | u$p & 1023; - var pos$1 = b.position; + let u$p = u$1 - 65536 | 0; + let hi = 55296 | (u$p >>> 10); + let lo = 56320 | u$p & 1023; + let pos$1 = b.position; if ((pos$1 + 4 | 0) > b.length) { resize(b, 4); } @@ -203,7 +203,7 @@ function add_utf_16be_uchar(b, u) { } function add_utf_16le_uchar(b, u) { - var u$1 = u; + let u$1 = u; if (u$1 < 0) { throw { RE_EXN_ID: "Assert_failure", @@ -216,7 +216,7 @@ function add_utf_16le_uchar(b, u) { }; } if (u$1 <= 65535) { - var pos = b.position; + let pos = b.position; if ((pos + 2 | 0) > b.length) { resize(b, 2); } @@ -226,10 +226,10 @@ function add_utf_16le_uchar(b, u) { return; } if (u$1 <= 1114111) { - var u$p = u$1 - 65536 | 0; - var hi = 55296 | (u$p >>> 10); - var lo = 56320 | u$p & 1023; - var pos$1 = b.position; + let u$p = u$1 - 65536 | 0; + let hi = 55296 | (u$p >>> 10); + let lo = 56320 | u$p & 1023; + let pos$1 = b.position; if ((pos$1 + 4 | 0) > b.length) { resize(b, 4); } @@ -259,7 +259,7 @@ function add_substring(b, s, offset, len) { Error: new Error() }; } - var new_position = b.position + len | 0; + let new_position = b.position + len | 0; if (new_position > b.length) { resize(b, len); } @@ -272,8 +272,8 @@ function add_subbytes(b, s, offset, len) { } function add_string(b, s) { - var len = s.length; - var new_position = b.position + len | 0; + let len = s.length; + let new_position = b.position + len | 0; if (new_position > b.length) { resize(b, len); } @@ -308,12 +308,12 @@ function closing(param) { } function advance_to_closing(opening, closing, k, s, start) { - var _k = k; - var _i = start; - var lim = s.length; + let _k = k; + let _i = start; + let lim = s.length; while(true) { - var i = _i; - var k$1 = _k; + let i = _i; + let k$1 = _k; if (i >= lim) { throw { RE_EXN_ID: "Not_found", @@ -339,14 +339,14 @@ function advance_to_closing(opening, closing, k, s, start) { } function advance_to_non_alpha(s, start) { - var _i = start; - var lim = s.length; + let _i = start; + let lim = s.length; while(true) { - var i = _i; + let i = _i; if (i >= lim) { return lim; } - var match = Caml_string.get(s, i); + let match = Caml_string.get(s, i); if (match >= 91) { if (match >= 97) { if (match >= 123) { @@ -377,16 +377,16 @@ function find_ident(s, start, lim) { Error: new Error() }; } - var c = Caml_string.get(s, start); + let c = Caml_string.get(s, start); if (c !== 40 && c !== 123) { - var stop = advance_to_non_alpha(s, start + 1 | 0); + let stop = advance_to_non_alpha(s, start + 1 | 0); return [ $$String.sub(s, start, stop - start | 0), stop ]; } - var new_start = start + 1 | 0; - var stop$1 = advance_to_closing(c, closing(c), 0, s, new_start); + let new_start = start + 1 | 0; + let stop$1 = advance_to_closing(c, closing(c), 0, s, new_start); return [ $$String.sub(s, new_start, (stop$1 - start | 0) - 1 | 0), stop$1 + 1 | 0 @@ -394,12 +394,12 @@ function find_ident(s, start, lim) { } function add_substitute(b, f, s) { - var lim = s.length; - var _previous = /* ' ' */32; - var _i = 0; + let lim = s.length; + let _previous = /* ' ' */32; + let _i = 0; while(true) { - var i = _i; - var previous = _previous; + let i = _i; + let previous = _previous; if (i >= lim) { if (previous === /* '\\' */92) { return add_char(b, previous); @@ -407,7 +407,7 @@ function add_substitute(b, f, s) { return; } } - var current = Caml_string.get(s, i); + let current = Caml_string.get(s, i); if (current !== 36) { if (previous === /* '\\' */92) { add_char(b, /* '\\' */92); @@ -432,8 +432,8 @@ function add_substitute(b, f, s) { _previous = /* ' ' */32; continue ; } - var j = i + 1 | 0; - var match = find_ident(s, j, lim); + let j = i + 1 | 0; + let match = find_ident(s, j, lim); add_string(b, Curry._1(f, match[0])); _i = match[1]; _previous = /* ' ' */32; diff --git a/lib/js/bytes.js b/lib/js/bytes.js index 0974c146da..4f08cb2dd3 100644 --- a/lib/js/bytes.js +++ b/lib/js/bytes.js @@ -1,16 +1,16 @@ 'use strict'; -var Caml = require("./caml.js"); -var Char = require("./char.js"); -var Curry = require("./curry.js"); -var Caml_bytes = require("./caml_bytes.js"); -var Caml_js_exceptions = require("./caml_js_exceptions.js"); +let Caml = require("./caml.js"); +let Char = require("./char.js"); +let Curry = require("./curry.js"); +let Caml_bytes = require("./caml_bytes.js"); +let Caml_js_exceptions = require("./caml_js_exceptions.js"); function unsafe_fill(s, i, l, c) { if (l <= 0) { return; } - for(var k = i ,k_finish = l + i | 0; k < k_finish; ++k){ + for(let k = i ,k_finish = l + i | 0; k < k_finish; ++k){ s[k] = c; } } @@ -21,10 +21,10 @@ function unsafe_blit(s1, i1, s2, i2, len) { } if (s1 === s2) { if (i1 < i2) { - var range_a = (s1.length - i2 | 0) - 1 | 0; - var range_b = len - 1 | 0; - var range = range_a > range_b ? range_b : range_a; - for(var j = range; j >= 0; --j){ + let range_a = (s1.length - i2 | 0) - 1 | 0; + let range_b = len - 1 | 0; + let range = range_a > range_b ? range_b : range_a; + for(let j = range; j >= 0; --j){ s1[i2 + j | 0] = s1[i1 + j | 0]; } return; @@ -32,65 +32,65 @@ function unsafe_blit(s1, i1, s2, i2, len) { if (i1 <= i2) { return; } - var range_a$1 = (s1.length - i1 | 0) - 1 | 0; - var range_b$1 = len - 1 | 0; - var range$1 = range_a$1 > range_b$1 ? range_b$1 : range_a$1; - for(var k = 0; k <= range$1; ++k){ + let range_a$1 = (s1.length - i1 | 0) - 1 | 0; + let range_b$1 = len - 1 | 0; + let range$1 = range_a$1 > range_b$1 ? range_b$1 : range_a$1; + for(let k = 0; k <= range$1; ++k){ s1[i2 + k | 0] = s1[i1 + k | 0]; } return; } - var off1 = s1.length - i1 | 0; + let off1 = s1.length - i1 | 0; if (len <= off1) { - for(var i = 0; i < len; ++i){ + for(let i = 0; i < len; ++i){ s2[i2 + i | 0] = s1[i1 + i | 0]; } return; } - for(var i$1 = 0; i$1 < off1; ++i$1){ + for(let i$1 = 0; i$1 < off1; ++i$1){ s2[i2 + i$1 | 0] = s1[i1 + i$1 | 0]; } - for(var i$2 = off1; i$2 < len; ++i$2){ + for(let i$2 = off1; i$2 < len; ++i$2){ s2[i2 + i$2 | 0] = /* '\000' */0; } } function make(n, c) { - var s = Caml_bytes.create(n); + let s = Caml_bytes.create(n); unsafe_fill(s, 0, n, c); return s; } function init(n, f) { - var s = Caml_bytes.create(n); - for(var i = 0; i < n; ++i){ + let s = Caml_bytes.create(n); + for(let i = 0; i < n; ++i){ s[i] = Curry._1(f, i); } return s; } -var empty = []; +let empty = []; function copy(s) { - var len = s.length; - var r = Caml_bytes.create(len); + let len = s.length; + let r = Caml_bytes.create(len); unsafe_blit(s, 0, r, 0, len); return r; } function to_string(a) { - var i = 0; - var len = a.length; - var s = ""; - var s_len = len; + let i = 0; + let len = a.length; + let s = ""; + let s_len = len; if (i === 0 && len <= 4096 && len === a.length) { return String.fromCharCode.apply(null, a); } - var offset = 0; + let offset = 0; while(s_len > 0) { - var next = s_len < 1024 ? s_len : 1024; - var tmp_bytes = new Array(next); - for(var k = 0; k < next; ++k){ + let next = s_len < 1024 ? s_len : 1024; + let tmp_bytes = new Array(next); + for(let k = 0; k < next; ++k){ tmp_bytes[k] = a[k + offset | 0]; } s = s + String.fromCharCode.apply(null, tmp_bytes); @@ -101,9 +101,9 @@ function to_string(a) { } function of_string(s) { - var len = s.length; - var res = new Array(len); - for(var i = 0; i < len; ++i){ + let len = s.length; + let res = new Array(len); + for(let i = 0; i < len; ++i){ res[i] = s.codePointAt(i); } return res; @@ -117,7 +117,7 @@ function sub(s, ofs, len) { Error: new Error() }; } - var r = Caml_bytes.create(len); + let r = Caml_bytes.create(len); unsafe_blit(s, ofs, r, 0, len); return r; } @@ -127,10 +127,10 @@ function sub_string(b, ofs, len) { } function $plus$plus(a, b) { - var c = a + b | 0; - var match = a < 0; - var match$1 = b < 0; - var match$2 = c < 0; + let c = a + b | 0; + let match = a < 0; + let match$1 = b < 0; + let match$2 = c < 0; if (match) { if (!match$1) { return c; @@ -158,18 +158,18 @@ function $plus$plus(a, b) { } function extend(s, left, right) { - var len = $plus$plus($plus$plus(s.length, left), right); - var r = Caml_bytes.create(len); - var match = left < 0 ? [ + let len = $plus$plus($plus$plus(s.length, left), right); + let r = Caml_bytes.create(len); + let match = left < 0 ? [ -left | 0, 0 ] : [ 0, left ]; - var dstoff = match[1]; - var srcoff = match[0]; - var cpylen = Caml.int_min(s.length - srcoff | 0, len - dstoff | 0); + let dstoff = match[1]; + let srcoff = match[0]; + let cpylen = Caml.int_min(s.length - srcoff | 0, len - dstoff | 0); if (cpylen > 0) { unsafe_blit(s, srcoff, r, dstoff, cpylen); } @@ -209,29 +209,29 @@ function blit_string(s1, ofs1, s2, ofs2, len) { if (len <= 0) { return; } - var off1 = s1.length - ofs1 | 0; + let off1 = s1.length - ofs1 | 0; if (len <= off1) { - for(var i = 0; i < len; ++i){ + for(let i = 0; i < len; ++i){ s2[ofs2 + i | 0] = s1.codePointAt(ofs1 + i | 0); } return; } - for(var i$1 = 0; i$1 < off1; ++i$1){ + for(let i$1 = 0; i$1 < off1; ++i$1){ s2[ofs2 + i$1 | 0] = s1.codePointAt(ofs1 + i$1 | 0); } - for(var i$2 = off1; i$2 < len; ++i$2){ + for(let i$2 = off1; i$2 < len; ++i$2){ s2[ofs2 + i$2 | 0] = /* '\000' */0; } } function iter(f, a) { - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ Curry._1(f, a[i]); } } function iteri(f, a) { - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ Curry._2(f, i, a[i]); } } @@ -249,13 +249,13 @@ function ensure_ge(x, y) { function sum_lengths(_acc, seplen, _param) { while(true) { - var param = _param; - var acc = _acc; + let param = _param; + let acc = _acc; if (!param) { return acc; } - var tl = param.tl; - var hd = param.hd; + let tl = param.tl; + let hd = param.hd; if (!tl) { return hd.length + acc | 0; } @@ -269,18 +269,18 @@ function concat(sep, param) { if (!param) { return empty; } - var seplen = sep.length; - var dst = Caml_bytes.create(sum_lengths(0, seplen, param)); - var _pos = 0; - var _param = param; + let seplen = sep.length; + let dst = Caml_bytes.create(sum_lengths(0, seplen, param)); + let _pos = 0; + let _param = param; while(true) { - var param$1 = _param; - var pos = _pos; + let param$1 = _param; + let pos = _pos; if (!param$1) { return dst; } - var tl = param$1.tl; - var hd = param$1.hd; + let tl = param$1.tl; + let hd = param$1.hd; if (tl) { unsafe_blit(hd, 0, dst, pos, hd.length); unsafe_blit(sep, 0, dst, pos + hd.length | 0, seplen); @@ -294,9 +294,9 @@ function concat(sep, param) { } function cat(s1, s2) { - var l1 = s1.length; - var l2 = s2.length; - var r = Caml_bytes.create(l1 + l2 | 0); + let l1 = s1.length; + let l2 = s2.length; + let r = Caml_bytes.create(l1 + l2 | 0); unsafe_blit(s1, 0, r, 0, l1); unsafe_blit(s2, 0, r, l1, l2); return r; @@ -311,12 +311,12 @@ function is_space(param) { } function trim(s) { - var len = s.length; - var i = 0; + let len = s.length; + let i = 0; while(i < len && is_space(s[i])) { i = i + 1 | 0; }; - var j = len - 1 | 0; + let j = len - 1 | 0; while(j >= i && is_space(s[j])) { j = j - 1 | 0; }; @@ -328,9 +328,9 @@ function trim(s) { } function escaped(s) { - var n = 0; - for(var i = 0 ,i_finish = s.length; i < i_finish; ++i){ - var match = s[i]; + let n = 0; + for(let i = 0 ,i_finish = s.length; i < i_finish; ++i){ + let match = s[i]; n = n + ( match >= 32 ? ( match > 92 || match < 34 ? ( @@ -350,11 +350,11 @@ function escaped(s) { if (n === s.length) { return copy(s); } - var s$p = Caml_bytes.create(n); + let s$p = Caml_bytes.create(n); n = 0; - for(var i$1 = 0 ,i_finish$1 = s.length; i$1 < i_finish$1; ++i$1){ - var c = s[i$1]; - var exit = 0; + for(let i$1 = 0 ,i_finish$1 = s.length; i$1 < i_finish$1; ++i$1){ + let c = s[i$1]; + let exit = 0; if (c >= 35) { if (c !== 92) { if (c >= 127) { @@ -433,24 +433,24 @@ function escaped(s) { } function map(f, s) { - var l = s.length; + let l = s.length; if (l === 0) { return s; } - var r = Caml_bytes.create(l); - for(var i = 0; i < l; ++i){ + let r = Caml_bytes.create(l); + for(let i = 0; i < l; ++i){ r[i] = Curry._1(f, s[i]); } return r; } function mapi(f, s) { - var l = s.length; + let l = s.length; if (l === 0) { return s; } - var r = Caml_bytes.create(l); - for(var i = 0; i < l; ++i){ + let r = Caml_bytes.create(l); + for(let i = 0; i < l; ++i){ r[i] = Curry._2(f, i, s[i]); } return r; @@ -468,7 +468,7 @@ function apply1(f, s) { if (s.length === 0) { return s; } - var r = copy(s); + let r = copy(s); r[0] = Curry._1(f, s[0]); return r; } @@ -483,7 +483,7 @@ function uncapitalize_ascii(s) { function index_rec(s, lim, _i, c) { while(true) { - var i = _i; + let i = _i; if (i >= lim) { throw { RE_EXN_ID: "Not_found", @@ -504,7 +504,7 @@ function index(s, c) { function index_rec_opt(s, lim, _i, c) { while(true) { - var i = _i; + let i = _i; if (i >= lim) { return; } @@ -521,7 +521,7 @@ function index_opt(s, c) { } function index_from(s, i, c) { - var l = s.length; + let l = s.length; if (i < 0 || i > l) { throw { RE_EXN_ID: "Invalid_argument", @@ -533,7 +533,7 @@ function index_from(s, i, c) { } function index_from_opt(s, i, c) { - var l = s.length; + let l = s.length; if (i < 0 || i > l) { throw { RE_EXN_ID: "Invalid_argument", @@ -546,7 +546,7 @@ function index_from_opt(s, i, c) { function rindex_rec(s, _i, c) { while(true) { - var i = _i; + let i = _i; if (i < 0) { throw { RE_EXN_ID: "Not_found", @@ -578,7 +578,7 @@ function rindex_from(s, i, c) { function rindex_rec_opt(s, _i, c) { while(true) { - var i = _i; + let i = _i; if (i < 0) { return; } @@ -606,7 +606,7 @@ function rindex_from_opt(s, i, c) { } function contains_from(s, i, c) { - var l = s.length; + let l = s.length; if (i < 0 || i > l) { throw { RE_EXN_ID: "Invalid_argument", @@ -619,7 +619,7 @@ function contains_from(s, i, c) { return true; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { return false; } @@ -644,7 +644,7 @@ function rcontains_from(s, i, c) { return true; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { return false; } @@ -652,13 +652,13 @@ function rcontains_from(s, i, c) { } } -var compare = Caml_bytes.bytes_compare; +let compare = Caml_bytes.bytes_compare; -var equal = Caml_bytes.bytes_equal; +let equal = Caml_bytes.bytes_equal; -var unsafe_to_string = to_string; +let unsafe_to_string = to_string; -var unsafe_of_string = of_string; +let unsafe_of_string = of_string; exports.make = make; exports.init = init; diff --git a/lib/js/bytesLabels.js b/lib/js/bytesLabels.js index 0974c146da..4f08cb2dd3 100644 --- a/lib/js/bytesLabels.js +++ b/lib/js/bytesLabels.js @@ -1,16 +1,16 @@ 'use strict'; -var Caml = require("./caml.js"); -var Char = require("./char.js"); -var Curry = require("./curry.js"); -var Caml_bytes = require("./caml_bytes.js"); -var Caml_js_exceptions = require("./caml_js_exceptions.js"); +let Caml = require("./caml.js"); +let Char = require("./char.js"); +let Curry = require("./curry.js"); +let Caml_bytes = require("./caml_bytes.js"); +let Caml_js_exceptions = require("./caml_js_exceptions.js"); function unsafe_fill(s, i, l, c) { if (l <= 0) { return; } - for(var k = i ,k_finish = l + i | 0; k < k_finish; ++k){ + for(let k = i ,k_finish = l + i | 0; k < k_finish; ++k){ s[k] = c; } } @@ -21,10 +21,10 @@ function unsafe_blit(s1, i1, s2, i2, len) { } if (s1 === s2) { if (i1 < i2) { - var range_a = (s1.length - i2 | 0) - 1 | 0; - var range_b = len - 1 | 0; - var range = range_a > range_b ? range_b : range_a; - for(var j = range; j >= 0; --j){ + let range_a = (s1.length - i2 | 0) - 1 | 0; + let range_b = len - 1 | 0; + let range = range_a > range_b ? range_b : range_a; + for(let j = range; j >= 0; --j){ s1[i2 + j | 0] = s1[i1 + j | 0]; } return; @@ -32,65 +32,65 @@ function unsafe_blit(s1, i1, s2, i2, len) { if (i1 <= i2) { return; } - var range_a$1 = (s1.length - i1 | 0) - 1 | 0; - var range_b$1 = len - 1 | 0; - var range$1 = range_a$1 > range_b$1 ? range_b$1 : range_a$1; - for(var k = 0; k <= range$1; ++k){ + let range_a$1 = (s1.length - i1 | 0) - 1 | 0; + let range_b$1 = len - 1 | 0; + let range$1 = range_a$1 > range_b$1 ? range_b$1 : range_a$1; + for(let k = 0; k <= range$1; ++k){ s1[i2 + k | 0] = s1[i1 + k | 0]; } return; } - var off1 = s1.length - i1 | 0; + let off1 = s1.length - i1 | 0; if (len <= off1) { - for(var i = 0; i < len; ++i){ + for(let i = 0; i < len; ++i){ s2[i2 + i | 0] = s1[i1 + i | 0]; } return; } - for(var i$1 = 0; i$1 < off1; ++i$1){ + for(let i$1 = 0; i$1 < off1; ++i$1){ s2[i2 + i$1 | 0] = s1[i1 + i$1 | 0]; } - for(var i$2 = off1; i$2 < len; ++i$2){ + for(let i$2 = off1; i$2 < len; ++i$2){ s2[i2 + i$2 | 0] = /* '\000' */0; } } function make(n, c) { - var s = Caml_bytes.create(n); + let s = Caml_bytes.create(n); unsafe_fill(s, 0, n, c); return s; } function init(n, f) { - var s = Caml_bytes.create(n); - for(var i = 0; i < n; ++i){ + let s = Caml_bytes.create(n); + for(let i = 0; i < n; ++i){ s[i] = Curry._1(f, i); } return s; } -var empty = []; +let empty = []; function copy(s) { - var len = s.length; - var r = Caml_bytes.create(len); + let len = s.length; + let r = Caml_bytes.create(len); unsafe_blit(s, 0, r, 0, len); return r; } function to_string(a) { - var i = 0; - var len = a.length; - var s = ""; - var s_len = len; + let i = 0; + let len = a.length; + let s = ""; + let s_len = len; if (i === 0 && len <= 4096 && len === a.length) { return String.fromCharCode.apply(null, a); } - var offset = 0; + let offset = 0; while(s_len > 0) { - var next = s_len < 1024 ? s_len : 1024; - var tmp_bytes = new Array(next); - for(var k = 0; k < next; ++k){ + let next = s_len < 1024 ? s_len : 1024; + let tmp_bytes = new Array(next); + for(let k = 0; k < next; ++k){ tmp_bytes[k] = a[k + offset | 0]; } s = s + String.fromCharCode.apply(null, tmp_bytes); @@ -101,9 +101,9 @@ function to_string(a) { } function of_string(s) { - var len = s.length; - var res = new Array(len); - for(var i = 0; i < len; ++i){ + let len = s.length; + let res = new Array(len); + for(let i = 0; i < len; ++i){ res[i] = s.codePointAt(i); } return res; @@ -117,7 +117,7 @@ function sub(s, ofs, len) { Error: new Error() }; } - var r = Caml_bytes.create(len); + let r = Caml_bytes.create(len); unsafe_blit(s, ofs, r, 0, len); return r; } @@ -127,10 +127,10 @@ function sub_string(b, ofs, len) { } function $plus$plus(a, b) { - var c = a + b | 0; - var match = a < 0; - var match$1 = b < 0; - var match$2 = c < 0; + let c = a + b | 0; + let match = a < 0; + let match$1 = b < 0; + let match$2 = c < 0; if (match) { if (!match$1) { return c; @@ -158,18 +158,18 @@ function $plus$plus(a, b) { } function extend(s, left, right) { - var len = $plus$plus($plus$plus(s.length, left), right); - var r = Caml_bytes.create(len); - var match = left < 0 ? [ + let len = $plus$plus($plus$plus(s.length, left), right); + let r = Caml_bytes.create(len); + let match = left < 0 ? [ -left | 0, 0 ] : [ 0, left ]; - var dstoff = match[1]; - var srcoff = match[0]; - var cpylen = Caml.int_min(s.length - srcoff | 0, len - dstoff | 0); + let dstoff = match[1]; + let srcoff = match[0]; + let cpylen = Caml.int_min(s.length - srcoff | 0, len - dstoff | 0); if (cpylen > 0) { unsafe_blit(s, srcoff, r, dstoff, cpylen); } @@ -209,29 +209,29 @@ function blit_string(s1, ofs1, s2, ofs2, len) { if (len <= 0) { return; } - var off1 = s1.length - ofs1 | 0; + let off1 = s1.length - ofs1 | 0; if (len <= off1) { - for(var i = 0; i < len; ++i){ + for(let i = 0; i < len; ++i){ s2[ofs2 + i | 0] = s1.codePointAt(ofs1 + i | 0); } return; } - for(var i$1 = 0; i$1 < off1; ++i$1){ + for(let i$1 = 0; i$1 < off1; ++i$1){ s2[ofs2 + i$1 | 0] = s1.codePointAt(ofs1 + i$1 | 0); } - for(var i$2 = off1; i$2 < len; ++i$2){ + for(let i$2 = off1; i$2 < len; ++i$2){ s2[ofs2 + i$2 | 0] = /* '\000' */0; } } function iter(f, a) { - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ Curry._1(f, a[i]); } } function iteri(f, a) { - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ Curry._2(f, i, a[i]); } } @@ -249,13 +249,13 @@ function ensure_ge(x, y) { function sum_lengths(_acc, seplen, _param) { while(true) { - var param = _param; - var acc = _acc; + let param = _param; + let acc = _acc; if (!param) { return acc; } - var tl = param.tl; - var hd = param.hd; + let tl = param.tl; + let hd = param.hd; if (!tl) { return hd.length + acc | 0; } @@ -269,18 +269,18 @@ function concat(sep, param) { if (!param) { return empty; } - var seplen = sep.length; - var dst = Caml_bytes.create(sum_lengths(0, seplen, param)); - var _pos = 0; - var _param = param; + let seplen = sep.length; + let dst = Caml_bytes.create(sum_lengths(0, seplen, param)); + let _pos = 0; + let _param = param; while(true) { - var param$1 = _param; - var pos = _pos; + let param$1 = _param; + let pos = _pos; if (!param$1) { return dst; } - var tl = param$1.tl; - var hd = param$1.hd; + let tl = param$1.tl; + let hd = param$1.hd; if (tl) { unsafe_blit(hd, 0, dst, pos, hd.length); unsafe_blit(sep, 0, dst, pos + hd.length | 0, seplen); @@ -294,9 +294,9 @@ function concat(sep, param) { } function cat(s1, s2) { - var l1 = s1.length; - var l2 = s2.length; - var r = Caml_bytes.create(l1 + l2 | 0); + let l1 = s1.length; + let l2 = s2.length; + let r = Caml_bytes.create(l1 + l2 | 0); unsafe_blit(s1, 0, r, 0, l1); unsafe_blit(s2, 0, r, l1, l2); return r; @@ -311,12 +311,12 @@ function is_space(param) { } function trim(s) { - var len = s.length; - var i = 0; + let len = s.length; + let i = 0; while(i < len && is_space(s[i])) { i = i + 1 | 0; }; - var j = len - 1 | 0; + let j = len - 1 | 0; while(j >= i && is_space(s[j])) { j = j - 1 | 0; }; @@ -328,9 +328,9 @@ function trim(s) { } function escaped(s) { - var n = 0; - for(var i = 0 ,i_finish = s.length; i < i_finish; ++i){ - var match = s[i]; + let n = 0; + for(let i = 0 ,i_finish = s.length; i < i_finish; ++i){ + let match = s[i]; n = n + ( match >= 32 ? ( match > 92 || match < 34 ? ( @@ -350,11 +350,11 @@ function escaped(s) { if (n === s.length) { return copy(s); } - var s$p = Caml_bytes.create(n); + let s$p = Caml_bytes.create(n); n = 0; - for(var i$1 = 0 ,i_finish$1 = s.length; i$1 < i_finish$1; ++i$1){ - var c = s[i$1]; - var exit = 0; + for(let i$1 = 0 ,i_finish$1 = s.length; i$1 < i_finish$1; ++i$1){ + let c = s[i$1]; + let exit = 0; if (c >= 35) { if (c !== 92) { if (c >= 127) { @@ -433,24 +433,24 @@ function escaped(s) { } function map(f, s) { - var l = s.length; + let l = s.length; if (l === 0) { return s; } - var r = Caml_bytes.create(l); - for(var i = 0; i < l; ++i){ + let r = Caml_bytes.create(l); + for(let i = 0; i < l; ++i){ r[i] = Curry._1(f, s[i]); } return r; } function mapi(f, s) { - var l = s.length; + let l = s.length; if (l === 0) { return s; } - var r = Caml_bytes.create(l); - for(var i = 0; i < l; ++i){ + let r = Caml_bytes.create(l); + for(let i = 0; i < l; ++i){ r[i] = Curry._2(f, i, s[i]); } return r; @@ -468,7 +468,7 @@ function apply1(f, s) { if (s.length === 0) { return s; } - var r = copy(s); + let r = copy(s); r[0] = Curry._1(f, s[0]); return r; } @@ -483,7 +483,7 @@ function uncapitalize_ascii(s) { function index_rec(s, lim, _i, c) { while(true) { - var i = _i; + let i = _i; if (i >= lim) { throw { RE_EXN_ID: "Not_found", @@ -504,7 +504,7 @@ function index(s, c) { function index_rec_opt(s, lim, _i, c) { while(true) { - var i = _i; + let i = _i; if (i >= lim) { return; } @@ -521,7 +521,7 @@ function index_opt(s, c) { } function index_from(s, i, c) { - var l = s.length; + let l = s.length; if (i < 0 || i > l) { throw { RE_EXN_ID: "Invalid_argument", @@ -533,7 +533,7 @@ function index_from(s, i, c) { } function index_from_opt(s, i, c) { - var l = s.length; + let l = s.length; if (i < 0 || i > l) { throw { RE_EXN_ID: "Invalid_argument", @@ -546,7 +546,7 @@ function index_from_opt(s, i, c) { function rindex_rec(s, _i, c) { while(true) { - var i = _i; + let i = _i; if (i < 0) { throw { RE_EXN_ID: "Not_found", @@ -578,7 +578,7 @@ function rindex_from(s, i, c) { function rindex_rec_opt(s, _i, c) { while(true) { - var i = _i; + let i = _i; if (i < 0) { return; } @@ -606,7 +606,7 @@ function rindex_from_opt(s, i, c) { } function contains_from(s, i, c) { - var l = s.length; + let l = s.length; if (i < 0 || i > l) { throw { RE_EXN_ID: "Invalid_argument", @@ -619,7 +619,7 @@ function contains_from(s, i, c) { return true; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { return false; } @@ -644,7 +644,7 @@ function rcontains_from(s, i, c) { return true; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { return false; } @@ -652,13 +652,13 @@ function rcontains_from(s, i, c) { } } -var compare = Caml_bytes.bytes_compare; +let compare = Caml_bytes.bytes_compare; -var equal = Caml_bytes.bytes_equal; +let equal = Caml_bytes.bytes_equal; -var unsafe_to_string = to_string; +let unsafe_to_string = to_string; -var unsafe_of_string = of_string; +let unsafe_of_string = of_string; exports.make = make; exports.init = init; diff --git a/lib/js/caml.js b/lib/js/caml.js index 0675534391..c3729dc091 100644 --- a/lib/js/caml.js +++ b/lib/js/caml.js @@ -132,8 +132,8 @@ function i64_eq(x, y) { } function i64_ge(param, param$1) { - var other_hi = param$1[0]; - var hi = param[0]; + let other_hi = param$1[0]; + let hi = param[0]; if (hi > other_hi) { return true; } else if (hi < other_hi) { diff --git a/lib/js/caml_array.js b/lib/js/caml_array.js index 343049984a..8c5ae0f1de 100644 --- a/lib/js/caml_array.js +++ b/lib/js/caml_array.js @@ -2,9 +2,9 @@ function sub(x, offset, len) { - var result = new Array(len); - var j = 0; - var i = offset; + let result = new Array(len); + let j = 0; + let i = offset; while(j < len) { result[j] = x[i]; j = j + 1 | 0; @@ -15,8 +15,8 @@ function sub(x, offset, len) { function len(_acc, _l) { while(true) { - var l = _l; - var acc = _acc; + let l = _l; + let acc = _acc; if (!l) { return acc; } @@ -28,15 +28,15 @@ function len(_acc, _l) { function fill(arr, _i, _l) { while(true) { - var l = _l; - var i = _i; + let l = _l; + let i = _i; if (!l) { return; } - var x = l.hd; - var l$1 = x.length; - var k = i; - var j = 0; + let x = l.hd; + let l$1 = x.length; + let k = i; + let j = 0; while(j < l$1) { arr[k] = x[j]; k = k + 1 | 0; @@ -49,8 +49,8 @@ function fill(arr, _i, _l) { } function concat(l) { - var v = len(0, l); - var result = new Array(v); + let v = len(0, l); + let result = new Array(v); fill(result, 0, l); return result; } @@ -78,16 +78,16 @@ function get(xs, index) { } function make(len, init) { - var b = new Array(len); - for(var i = 0; i < len; ++i){ + let b = new Array(len); + for(let i = 0; i < len; ++i){ b[i] = init; } return b; } function make_float(len) { - var b = new Array(len); - for(var i = 0; i < len; ++i){ + let b = new Array(len); + for(let i = 0; i < len; ++i){ b[i] = 0; } return b; @@ -95,12 +95,12 @@ function make_float(len) { function blit(a1, i1, a2, i2, len) { if (i2 <= i1) { - for(var j = 0; j < len; ++j){ + for(let j = 0; j < len; ++j){ a2[j + i2 | 0] = a1[j + i1 | 0]; } return; } - for(var j$1 = len - 1 | 0; j$1 >= 0; --j$1){ + for(let j$1 = len - 1 | 0; j$1 >= 0; --j$1){ a2[j$1 + i2 | 0] = a1[j$1 + i1 | 0]; } } diff --git a/lib/js/caml_bytes.js b/lib/js/caml_bytes.js index 9796a18106..f558a63241 100644 --- a/lib/js/caml_bytes.js +++ b/lib/js/caml_bytes.js @@ -31,8 +31,8 @@ function create(len) { Error: new Error() }; } - var result = new Array(len); - for(var i = 0; i < len; ++i){ + let result = new Array(len); + for(let i = 0; i < len; ++i){ result[i] = /* '\000' */0; } return result; @@ -40,12 +40,12 @@ function create(len) { function bytes_compare_aux(s1, s2, _off, len, def) { while(true) { - var off = _off; + let off = _off; if (off >= len) { return def; } - var a = s1[off]; - var b = s2[off]; + let a = s1[off]; + let b = s2[off]; if (a > b) { return 1; } @@ -58,8 +58,8 @@ function bytes_compare_aux(s1, s2, _off, len, def) { } function bytes_compare(s1, s2) { - var len1 = s1.length; - var len2 = s2.length; + let len1 = s1.length; + let len2 = s2.length; if (len1 === len2) { return bytes_compare_aux(s1, s2, 0, len1, 0); } else if (len1 < len2) { @@ -70,17 +70,17 @@ function bytes_compare(s1, s2) { } function bytes_equal(s1, s2) { - var len1 = s1.length; - var len2 = s2.length; + let len1 = s1.length; + let len2 = s2.length; if (len1 === len2) { - var _off = 0; + let _off = 0; while(true) { - var off = _off; + let off = _off; if (off === len1) { return true; } - var a = s1[off]; - var b = s2[off]; + let a = s1[off]; + let b = s2[off]; if (a !== b) { return false; } diff --git a/lib/js/caml_exceptions.js b/lib/js/caml_exceptions.js index e440b2e406..3150c3c6c0 100644 --- a/lib/js/caml_exceptions.js +++ b/lib/js/caml_exceptions.js @@ -1,13 +1,13 @@ 'use strict'; -var idMap = new Map(); +let idMap = new Map(); function create(str) { - var v = idMap.get(str); - var id; + let v = idMap.get(str); + let id; if (v !== undefined) { - var id$1 = v + 1 | 0; + let id$1 = v + 1 | 0; idMap.set(str, id$1); id = id$1; } else { diff --git a/lib/js/caml_external_polyfill.js b/lib/js/caml_external_polyfill.js index 5004ae1ba5..cdf401bc84 100644 --- a/lib/js/caml_external_polyfill.js +++ b/lib/js/caml_external_polyfill.js @@ -1,7 +1,7 @@ 'use strict'; -var getGlobalThis = (function(){ +let getGlobalThis = (function(){ if (typeof globalThis !== 'undefined') return globalThis; if (typeof self !== 'undefined') return self; if (typeof window !== 'undefined') return window; @@ -10,7 +10,7 @@ var getGlobalThis = (function(){ throw new Error('Unable to locate global this'); }); -var resolve = (function(s){ +let resolve = (function(s){ var myGlobal = getGlobalThis(); if (myGlobal[s] === undefined){ throw new Error(s + " not polyfilled by ReScript yet\n") @@ -18,7 +18,7 @@ var resolve = (function(s){ return myGlobal[s] }); -var register = (function(s,fn){ +let register = (function(s,fn){ var myGlobal = getGlobalThis(); myGlobal[s] = fn return 0 diff --git a/lib/js/caml_float.js b/lib/js/caml_float.js index bde4822cb4..cc3664bdfd 100644 --- a/lib/js/caml_float.js +++ b/lib/js/caml_float.js @@ -1,11 +1,11 @@ 'use strict'; -var int_float_of_bits = (function(x){ +let int_float_of_bits = (function(x){ return new Float32Array(new Int32Array([x]).buffer)[0] }); -var int_bits_of_float = (function(x){ +let int_bits_of_float = (function(x){ return new Int32Array(new Float32Array([x]).buffer)[0] }); @@ -23,10 +23,10 @@ function modf_float(x) { ]; } } - var neg = 1 / x < 0; - var x$1 = Math.abs(x); - var i = Math.floor(x$1); - var f = x$1 - i; + let neg = 1 / x < 0; + let x$1 = Math.abs(x); + let i = Math.floor(x$1); + let f = x$1 - i; if (neg) { return [ - f, @@ -41,8 +41,8 @@ function modf_float(x) { } function ldexp_float(x, exp) { - var x$p = x; - var exp$p = exp; + let x$p = x; + let exp$p = exp; if (exp$p > 1023) { exp$p = exp$p - 1023; x$p = x$p * Math.pow(2, 1023); @@ -65,9 +65,9 @@ function frexp_float(x) { 0 ]; } - var neg = x < 0; - var x$p = Math.abs(x); - var exp = Math.floor(Math.LOG2E * Math.log(x$p)) + 1; + let neg = x < 0; + let x$p = Math.abs(x); + let exp = Math.floor(Math.LOG2E * Math.log(x$p)) + 1; x$p = x$p * Math.pow(2, - exp); if (x$p < 0.5) { x$p = x$p * 2; @@ -83,8 +83,8 @@ function frexp_float(x) { } function copysign_float(x, y) { - var x$1 = Math.abs(x); - var y$1 = y === 0 ? 1 / y : y; + let x$1 = Math.abs(x); + let y$1 = y === 0 ? 1 / y : y; if (y$1 < 0) { return - x$1; } else { @@ -93,8 +93,8 @@ function copysign_float(x, y) { } function expm1_float(x) { - var y = Math.exp(x); - var z = y - 1; + let y = Math.exp(x); + let z = y - 1; if (Math.abs(x) > 1) { return z; } else if (z === 0) { @@ -105,10 +105,10 @@ function expm1_float(x) { } function hypot_float(x, y) { - var x0 = Math.abs(x); - var y0 = Math.abs(y); - var a = x0 > y0 ? x0 : y0; - var b = ( + let x0 = Math.abs(x); + let y0 = Math.abs(y); + let a = x0 > y0 ? x0 : y0; + let b = ( x0 < y0 ? x0 : y0 ) / ( a !== 0 ? a : 1 diff --git a/lib/js/caml_format.js b/lib/js/caml_format.js index 7108fd6fdc..6cd47ba67f 100644 --- a/lib/js/caml_format.js +++ b/lib/js/caml_format.js @@ -1,7 +1,7 @@ 'use strict'; -var Caml = require("./caml.js"); -var Caml_int64 = require("./caml_int64.js"); +let Caml = require("./caml.js"); +let Caml_int64 = require("./caml_int64.js"); function parse_digit(c) { if (c >= 65) { @@ -38,10 +38,10 @@ function int_of_string_base(param) { } function parse_sign_and_base(s) { - var sign = 1; - var base = "Dec"; - var i = 0; - var match = s.codePointAt(i); + let sign = 1; + let base = "Dec"; + let i = 0; + let match = s.codePointAt(i); switch (match) { case 43 : i = i + 1 | 0; @@ -54,7 +54,7 @@ function parse_sign_and_base(s) { } if (s.codePointAt(i) === /* '0' */48) { - var match$1 = s.codePointAt(i + 1 | 0); + let match$1 = s.codePointAt(i + 1 | 0); if (match$1 >= 89) { if (match$1 >= 111) { if (match$1 < 121) { @@ -126,13 +126,13 @@ function parse_sign_and_base(s) { } function int_of_string(s) { - var match = parse_sign_and_base(s); - var i = match[0]; - var base = int_of_string_base(match[2]); - var threshold = 4294967295; - var len = s.length; - var c = i < len ? s.codePointAt(i) : /* '\000' */0; - var d = parse_digit(c); + let match = parse_sign_and_base(s); + let i = match[0]; + let base = int_of_string_base(match[2]); + let threshold = 4294967295; + let len = s.length; + let c = i < len ? s.codePointAt(i) : /* '\000' */0; + let d = parse_digit(c); if (d < 0 || d >= base) { throw { RE_EXN_ID: "Failure", @@ -140,19 +140,19 @@ function int_of_string(s) { Error: new Error() }; } - var aux = function (_acc, _k) { + let aux = function (_acc, _k) { while(true) { - var k = _k; - var acc = _acc; + let k = _k; + let acc = _acc; if (k === len) { return acc; } - var a = s.codePointAt(k); + let a = s.codePointAt(k); if (a === /* '_' */95) { _k = k + 1 | 0; continue ; } - var v = parse_digit(a); + let v = parse_digit(a); if (v < 0 || v >= base) { throw { RE_EXN_ID: "Failure", @@ -160,7 +160,7 @@ function int_of_string(s) { Error: new Error() }; } - var acc$1 = base * acc + v; + let acc$1 = base * acc + v; if (acc$1 > threshold) { throw { RE_EXN_ID: "Failure", @@ -173,8 +173,8 @@ function int_of_string(s) { continue ; }; }; - var res = match[1] * aux(d, i + 1 | 0); - var or_res = res | 0; + let res = match[1] * aux(d, i + 1 | 0); + let or_res = res | 0; if (base === 10 && res !== or_res) { throw { RE_EXN_ID: "Failure", @@ -186,12 +186,12 @@ function int_of_string(s) { } function int64_of_string(s) { - var match = parse_sign_and_base(s); - var hbase = match[2]; - var i = match[0]; - var base = Caml_int64.of_int32(int_of_string_base(hbase)); - var sign = Caml_int64.of_int32(match[1]); - var threshold; + let match = parse_sign_and_base(s); + let hbase = match[2]; + let i = match[0]; + let base = Caml_int64.of_int32(int_of_string_base(hbase)); + let sign = Caml_int64.of_int32(match[1]); + let threshold; switch (hbase) { case "Oct" : threshold = [ @@ -216,9 +216,9 @@ function int64_of_string(s) { break; } - var len = s.length; - var c = i < len ? s.codePointAt(i) : /* '\000' */0; - var d = Caml_int64.of_int32(parse_digit(c)); + let len = s.length; + let c = i < len ? s.codePointAt(i) : /* '\000' */0; + let d = Caml_int64.of_int32(parse_digit(c)); if (Caml.i64_lt(d, Caml_int64.zero) || Caml.i64_ge(d, base)) { throw { RE_EXN_ID: "Failure", @@ -226,19 +226,19 @@ function int64_of_string(s) { Error: new Error() }; } - var aux = function (_acc, _k) { + let aux = function (_acc, _k) { while(true) { - var k = _k; - var acc = _acc; + let k = _k; + let acc = _acc; if (k === len) { return acc; } - var a = s.codePointAt(k); + let a = s.codePointAt(k); if (a === /* '_' */95) { _k = k + 1 | 0; continue ; } - var v = Caml_int64.of_int32(parse_digit(a)); + let v = Caml_int64.of_int32(parse_digit(a)); if (Caml.i64_lt(v, Caml_int64.zero) || Caml.i64_ge(v, base) || Caml.i64_gt(acc, threshold)) { throw { RE_EXN_ID: "Failure", @@ -246,14 +246,14 @@ function int64_of_string(s) { Error: new Error() }; } - var acc$1 = Caml_int64.add(Caml_int64.mul(base, acc), v); + let acc$1 = Caml_int64.add(Caml_int64.mul(base, acc), v); _k = k + 1 | 0; _acc = acc$1; continue ; }; }; - var res = Caml_int64.mul(sign, aux(d, i + 1 | 0)); - var or_res = Caml_int64.or_(res, Caml_int64.zero); + let res = Caml_int64.mul(sign, aux(d, i + 1 | 0)); + let or_res = Caml_int64.or_(res, Caml_int64.zero); if (Caml.i64_eq(base, [ 0, 10 @@ -288,7 +288,7 @@ function lowercase(c) { } function parse_format(fmt) { - var len = fmt.length; + let len = fmt.length; if (len > 31) { throw { RE_EXN_ID: "Invalid_argument", @@ -296,7 +296,7 @@ function parse_format(fmt) { Error: new Error() }; } - var f = { + let f = { justify: "+", signstyle: "-", filter: " ", @@ -309,14 +309,14 @@ function parse_format(fmt) { prec: -1, conv: "f" }; - var _i = 0; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i >= len) { return f; } - var c = fmt.codePointAt(i); - var exit = 0; + let c = fmt.codePointAt(i); + let exit = 0; if (c >= 69) { if (c >= 88) { if (c >= 121) { @@ -403,10 +403,10 @@ function parse_format(fmt) { continue ; case 46 : f.prec = 0; - var j = i + 1 | 0; + let j = i + 1 | 0; while((function(j){ return function () { - var w = fmt.codePointAt(j) - /* '0' */48 | 0; + let w = fmt.codePointAt(j) - /* '0' */48 | 0; return w >= 0 && w <= 9; } }(j))()) { @@ -444,10 +444,10 @@ function parse_format(fmt) { continue ; case 3 : f.width = 0; - var j$1 = i; + let j$1 = i; while((function(j$1){ return function () { - var w = fmt.codePointAt(j$1) - /* '0' */48 | 0; + let w = fmt.codePointAt(j$1) - /* '0' */48 | 0; return w >= 0 && w <= 9; } }(j$1))()) { @@ -472,16 +472,16 @@ function parse_format(fmt) { } function finish_formatting(config, rawbuffer) { - var justify = config.justify; - var signstyle = config.signstyle; - var filter = config.filter; - var alternate = config.alternate; - var base = config.base; - var signedconv = config.signedconv; - var width = config.width; - var uppercase = config.uppercase; - var sign = config.sign; - var len = rawbuffer.length; + let justify = config.justify; + let signstyle = config.signstyle; + let filter = config.filter; + let alternate = config.alternate; + let base = config.base; + let signedconv = config.signedconv; + let width = config.width; + let uppercase = config.uppercase; + let sign = config.sign; + let len = rawbuffer.length; if (signedconv && (sign < 0 || signstyle !== "-")) { len = len + 1 | 0; } @@ -493,9 +493,9 @@ function finish_formatting(config, rawbuffer) { } } - var buffer = ""; + let buffer = ""; if (justify === "+" && filter === " ") { - for(var _for = len; _for < width; ++_for){ + for(let _for = len; _for < width; ++_for){ buffer = buffer + filter; } } @@ -514,13 +514,13 @@ function finish_formatting(config, rawbuffer) { buffer = buffer + "0x"; } if (justify === "+" && filter === "0") { - for(var _for$1 = len; _for$1 < width; ++_for$1){ + for(let _for$1 = len; _for$1 < width; ++_for$1){ buffer = buffer + filter; } } buffer = uppercase ? buffer + rawbuffer.toUpperCase() : buffer + rawbuffer; if (justify === "-") { - for(var _for$2 = len; _for$2 < width; ++_for$2){ + for(let _for$2 = len; _for$2 < width; ++_for$2){ buffer = buffer + " "; } } @@ -531,14 +531,14 @@ function format_int(fmt, i) { if (fmt === "%d") { return String(i); } - var f = parse_format(fmt); - var i$1 = i < 0 ? ( + let f = parse_format(fmt); + let i$1 = i < 0 ? ( f.signedconv ? (f.sign = -1, (-i >>> 0)) : (i >>> 0) ) : i; - var s = i$1.toString(int_of_base(f.base)); + let s = i$1.toString(int_of_base(f.base)); if (f.prec >= 0) { f.filter = " "; - var n = f.prec - s.length | 0; + let n = f.prec - s.length | 0; if (n > 0) { s = "0".repeat(n) + s; } @@ -551,17 +551,17 @@ function dec_of_pos_int64(x) { if (!Caml.i64_lt(x, Caml_int64.zero)) { return Caml_int64.to_string(x); } - var wbase = [ + let wbase = [ 0, 10 ]; - var y = Caml_int64.discard_sign(x); - var match = Caml_int64.div_mod(y, wbase); - var match$1 = Caml_int64.div_mod(Caml_int64.add([ + let y = Caml_int64.discard_sign(x); + let match = Caml_int64.div_mod(y, wbase); + let match$1 = Caml_int64.div_mod(Caml_int64.add([ 0, 8 ], match[1]), wbase); - var quotient = Caml_int64.add(Caml_int64.add([ + let quotient = Caml_int64.add(Caml_int64.add([ 214748364, 3435973836 ], match[0]), match$1[0]); @@ -569,34 +569,34 @@ function dec_of_pos_int64(x) { } function oct_of_int64(x) { - var s = ""; - var wbase = [ + let s = ""; + let wbase = [ 0, 8 ]; - var cvtbl = "01234567"; + let cvtbl = "01234567"; if (Caml.i64_lt(x, Caml_int64.zero)) { - var y = Caml_int64.discard_sign(x); - var match = Caml_int64.div_mod(y, wbase); - var quotient = Caml_int64.add([ + let y = Caml_int64.discard_sign(x); + let match = Caml_int64.div_mod(y, wbase); + let quotient = Caml_int64.add([ 268435456, 0 ], match[0]); - var modulus = match[1]; + let modulus = match[1]; s = cvtbl[Caml_int64.to_int32(modulus)] + s; while(Caml.i64_neq(quotient, Caml_int64.zero)) { - var match$1 = Caml_int64.div_mod(quotient, wbase); + let match$1 = Caml_int64.div_mod(quotient, wbase); quotient = match$1[0]; modulus = match$1[1]; s = cvtbl[Caml_int64.to_int32(modulus)] + s; }; } else { - var match$2 = Caml_int64.div_mod(x, wbase); - var quotient$1 = match$2[0]; - var modulus$1 = match$2[1]; + let match$2 = Caml_int64.div_mod(x, wbase); + let quotient$1 = match$2[0]; + let modulus$1 = match$2[1]; s = cvtbl[Caml_int64.to_int32(modulus$1)] + s; while(Caml.i64_neq(quotient$1, Caml_int64.zero)) { - var match$3 = Caml_int64.div_mod(quotient$1, wbase); + let match$3 = Caml_int64.div_mod(quotient$1, wbase); quotient$1 = match$3[0]; modulus$1 = match$3[1]; s = cvtbl[Caml_int64.to_int32(modulus$1)] + s; @@ -609,10 +609,10 @@ function int64_format(fmt, x) { if (fmt === "%d") { return Caml_int64.to_string(x); } - var f = parse_format(fmt); - var x$1 = f.signedconv && Caml.i64_lt(x, Caml_int64.zero) ? (f.sign = -1, Caml_int64.neg(x)) : x; - var match = f.base; - var s; + let f = parse_format(fmt); + let x$1 = f.signedconv && Caml.i64_lt(x, Caml_int64.zero) ? (f.sign = -1, Caml_int64.neg(x)) : x; + let match = f.base; + let s; switch (match) { case "Oct" : s = oct_of_int64(x$1); @@ -625,10 +625,10 @@ function int64_format(fmt, x) { break; } - var fill_s; + let fill_s; if (f.prec >= 0) { f.filter = " "; - var n = f.prec - s.length | 0; + let n = f.prec - s.length | 0; fill_s = n > 0 ? "0".repeat(n) + s : s; } else { fill_s = s; @@ -637,19 +637,19 @@ function int64_format(fmt, x) { } function format_float(fmt, x) { - var f = parse_format(fmt); - var prec = f.prec < 0 ? 6 : f.prec; - var x$1 = x < 0 ? (f.sign = -1, - x) : x; - var s = ""; + let f = parse_format(fmt); + let prec = f.prec < 0 ? 6 : f.prec; + let x$1 = x < 0 ? (f.sign = -1, - x) : x; + let s = ""; if (isNaN(x$1)) { s = "nan"; f.filter = " "; } else if (isFinite(x$1)) { - var match = f.conv; + let match = f.conv; switch (match) { case "e" : s = x$1.toExponential(prec); - var i = s.length; + let i = s.length; if (s.codePointAt(i - 3 | 0) === /* 'e' */101) { s = s.slice(0, i - 1 | 0) + ("0" + s.slice(i - 1 | 0)); } @@ -658,12 +658,12 @@ function format_float(fmt, x) { s = x$1.toFixed(prec); break; case "g" : - var prec$1 = prec !== 0 ? prec : 1; + let prec$1 = prec !== 0 ? prec : 1; s = x$1.toExponential(prec$1 - 1 | 0); - var j = s.indexOf("e"); - var exp = Number(s.slice(j + 1 | 0)) | 0; + let j = s.indexOf("e"); + let exp = Number(s.slice(j + 1 | 0)) | 0; if (exp < -4 || x$1 >= 1e21 || x$1.toFixed().length > prec$1) { - var i$1 = j - 1 | 0; + let i$1 = j - 1 | 0; while(s.codePointAt(i$1) === /* '0' */48) { i$1 = i$1 - 1 | 0; }; @@ -671,13 +671,13 @@ function format_float(fmt, x) { i$1 = i$1 - 1 | 0; } s = s.slice(0, i$1 + 1 | 0) + s.slice(j); - var i$2 = s.length; + let i$2 = s.length; if (s.codePointAt(i$2 - 3 | 0) === /* 'e' */101) { s = s.slice(0, i$2 - 1 | 0) + ("0" + s.slice(i$2 - 1 | 0)); } } else { - var p = prec$1; + let p = prec$1; if (exp < 0) { p = p - (exp + 1 | 0) | 0; s = x$1.toFixed(p); @@ -690,7 +690,7 @@ function format_float(fmt, x) { }; } if (p !== 0) { - var k = s.length - 1 | 0; + let k = s.length - 1 | 0; while(s.codePointAt(k) === /* '0' */48) { k = k - 1 | 0; }; @@ -712,7 +712,7 @@ function format_float(fmt, x) { return finish_formatting(f, s); } -var hexstring_of_float = (function(x,prec,style){ +let hexstring_of_float = (function(x,prec,style){ if (!isFinite(x)) { if (isNaN(x)) return "nan"; return x > 0 ? "infinity":"-infinity"; @@ -758,7 +758,7 @@ var hexstring_of_float = (function(x,prec,style){ return (sign_str + '0x' + x_str + 'p' + exp_sign + exp.toString(10)); }); -var float_of_string = (function(s,exn){ +let float_of_string = (function(s,exn){ var res = +s; if ((s.length > 0) && (res === res)) diff --git a/lib/js/caml_hash.js b/lib/js/caml_hash.js index c643a095ff..62db1bea24 100644 --- a/lib/js/caml_hash.js +++ b/lib/js/caml_hash.js @@ -1,13 +1,13 @@ 'use strict'; -var Caml_hash_primitive = require("./caml_hash_primitive.js"); +let Caml_hash_primitive = require("./caml_hash_primitive.js"); function push_back(q, v) { - var cell = { + let cell = { content: v, next: undefined }; - var last = q.last; + let last = q.last; if (last !== undefined) { q.length = q.length + 1 | 0; last.next = cell; @@ -20,8 +20,8 @@ function push_back(q, v) { } function unsafe_pop(q) { - var cell = q.first; - var next = cell.next; + let cell = q.first; + let next = cell.next; if (next === undefined) { q.length = 0; q.first = undefined; @@ -34,9 +34,9 @@ function unsafe_pop(q) { } function hash(count, _limit, seed, obj) { - var s = seed; + let s = seed; if (typeof obj === "number") { - var u = obj | 0; + let u = obj | 0; s = Caml_hash_primitive.hash_mix_int(s, (u + u | 0) + 1 | 0); return Caml_hash_primitive.hash_final_mix(s); } @@ -44,40 +44,40 @@ function hash(count, _limit, seed, obj) { s = Caml_hash_primitive.hash_mix_string(s, obj); return Caml_hash_primitive.hash_final_mix(s); } - var queue = { + let queue = { length: 0, first: undefined, last: undefined }; - var num = count; + let num = count; push_back(queue, obj); num = num - 1 | 0; while(queue.length !== 0 && num > 0) { - var obj$1 = unsafe_pop(queue); + let obj$1 = unsafe_pop(queue); if (typeof obj$1 === "number") { - var u$1 = obj$1 | 0; + let u$1 = obj$1 | 0; s = Caml_hash_primitive.hash_mix_int(s, (u$1 + u$1 | 0) + 1 | 0); num = num - 1 | 0; } else if (typeof obj$1 === "string") { s = Caml_hash_primitive.hash_mix_string(s, obj$1); num = num - 1 | 0; } else if (typeof obj$1 !== "boolean" && typeof obj$1 !== "undefined" && typeof obj$1 !== "symbol" && typeof obj$1 !== "function") { - var size = obj$1.length | 0; + let size = obj$1.length | 0; if (size !== 0) { - var obj_tag = obj$1.TAG; - var tag = (size << 10) | obj_tag; + let obj_tag = obj$1.TAG; + let tag = (size << 10) | obj_tag; if (obj_tag === 248) { s = Caml_hash_primitive.hash_mix_int(s, obj$1[1]); } else { s = Caml_hash_primitive.hash_mix_int(s, tag); - var v = size - 1 | 0; - var block = v < num ? v : num; - for(var i = 0; i <= block; ++i){ + let v = size - 1 | 0; + let block = v < num ? v : num; + for(let i = 0; i <= block; ++i){ push_back(queue, obj$1[i]); } } } else { - var size$1 = (function(obj,cb){ + let size$1 = (function(obj,cb){ var size = 0 for(var k in obj){ cb(obj[k]) diff --git a/lib/js/caml_hash_primitive.js b/lib/js/caml_hash_primitive.js index a00889fd52..a691cc43d3 100644 --- a/lib/js/caml_hash_primitive.js +++ b/lib/js/caml_hash_primitive.js @@ -6,17 +6,17 @@ function rotl32(x, n) { } function hash_mix_int(h, d) { - var d$1 = d; + let d$1 = d; d$1 = Math.imul(d$1, -862048943); d$1 = rotl32(d$1, 15); d$1 = Math.imul(d$1, 461845907); - var h$1 = h ^ d$1; + let h$1 = h ^ d$1; h$1 = rotl32(h$1, 13); return (h$1 + (h$1 << 2) | 0) - 430675100 | 0; } function hash_final_mix(h) { - var h$1 = h ^ (h >>> 16); + let h$1 = h ^ (h >>> 16); h$1 = Math.imul(h$1, -2048144789); h$1 = h$1 ^ (h$1 >>> 13); h$1 = Math.imul(h$1, -1028477387); @@ -24,17 +24,17 @@ function hash_final_mix(h) { } function hash_mix_string(h, s) { - var len = s.length; - var block = (len / 4 | 0) - 1 | 0; - var hash = h; - for(var i = 0; i <= block; ++i){ - var j = (i << 2); - var w = s.charCodeAt(j) | (s.charCodeAt(j + 1 | 0) << 8) | (s.charCodeAt(j + 2 | 0) << 16) | (s.charCodeAt(j + 3 | 0) << 24); + let len = s.length; + let block = (len / 4 | 0) - 1 | 0; + let hash = h; + for(let i = 0; i <= block; ++i){ + let j = (i << 2); + let w = s.charCodeAt(j) | (s.charCodeAt(j + 1 | 0) << 8) | (s.charCodeAt(j + 2 | 0) << 16) | (s.charCodeAt(j + 3 | 0) << 24); hash = hash_mix_int(hash, w); } - var modulo = len & 3; + let modulo = len & 3; if (modulo !== 0) { - var w$1 = modulo === 3 ? (s.charCodeAt(len - 1 | 0) << 16) | (s.charCodeAt(len - 2 | 0) << 8) | s.charCodeAt(len - 3 | 0) : ( + let w$1 = modulo === 3 ? (s.charCodeAt(len - 1 | 0) << 16) | (s.charCodeAt(len - 2 | 0) << 8) | s.charCodeAt(len - 3 | 0) : ( modulo === 2 ? (s.charCodeAt(len - 1 | 0) << 8) | s.charCodeAt(len - 2 | 0) : s.charCodeAt(len - 1 | 0) ); hash = hash_mix_int(hash, w$1); diff --git a/lib/js/caml_int64.js b/lib/js/caml_int64.js index 6deb838e07..c129f38a96 100644 --- a/lib/js/caml_int64.js +++ b/lib/js/caml_int64.js @@ -1,6 +1,6 @@ 'use strict'; -var Caml = require("./caml.js"); +let Caml = require("./caml.js"); function mk(lo, hi) { return [ @@ -9,27 +9,27 @@ function mk(lo, hi) { ]; } -var min_int = [ +let min_int = [ -2147483648, 0 ]; -var max_int = [ +let max_int = [ 2147483647, 4294967295 ]; -var one = [ +let one = [ 0, 1 ]; -var zero = [ +let zero = [ 0, 0 ]; -var neg_one = [ +let neg_one = [ -1, 4294967295 ]; @@ -43,9 +43,9 @@ function non_neg_signed(x) { } function succ(param) { - var x_lo = param[1]; - var x_hi = param[0]; - var lo = x_lo + 1 | 0; + let x_lo = param[1]; + let x_hi = param[0]; + let lo = x_lo + 1 | 0; return [ x_hi + ( lo === 0 ? 1 : 0 @@ -55,7 +55,7 @@ function succ(param) { } function neg(param) { - var other_lo = (param[1] ^ -1) + 1 | 0; + let other_lo = (param[1] ^ -1) + 1 | 0; return [ (param[0] ^ -1) + ( other_lo === 0 ? 1 : 0 @@ -65,9 +65,9 @@ function neg(param) { } function add_aux(param, y_lo, y_hi) { - var x_lo = param[1]; - var lo = x_lo + y_lo | 0; - var overflow = neg_signed(x_lo) && (neg_signed(y_lo) || non_neg_signed(lo)) || neg_signed(y_lo) && non_neg_signed(lo) ? 1 : 0; + let x_lo = param[1]; + let lo = x_lo + y_lo | 0; + let overflow = neg_signed(x_lo) && (neg_signed(y_lo) || non_neg_signed(lo)) || neg_signed(y_lo) && non_neg_signed(lo) ? 1 : 0; return [ param[0] + y_hi + overflow | 0, (lo >>> 0) @@ -111,8 +111,8 @@ function equal_nullable(x, y) { } function sub_aux(x, lo, hi) { - var y_lo = ((lo ^ -1) + 1 >>> 0); - var y_hi = (hi ^ -1) + ( + let y_lo = ((lo ^ -1) + 1 >>> 0); + let y_hi = (hi ^ -1) + ( y_lo === 0 ? 1 : 0 ) | 0; return add_aux(x, y_lo, y_hi); @@ -126,7 +126,7 @@ function lsl_(x, numBits) { if (numBits === 0) { return x; } - var lo = x[1]; + let lo = x[1]; if (numBits >= 32) { return [ (lo << (numBits - 32 | 0)), @@ -144,8 +144,8 @@ function lsr_(x, numBits) { if (numBits === 0) { return x; } - var hi = x[0]; - var offset = numBits - 32 | 0; + let hi = x[0]; + let offset = numBits - 32 | 0; if (offset === 0) { return [ 0, @@ -168,7 +168,7 @@ function asr_(x, numBits) { if (numBits === 0) { return x; } - var hi = x[0]; + let hi = x[0]; if (numBits < 32) { return [ (hi >> numBits), @@ -192,13 +192,13 @@ function is_zero(x) { function mul(_this, _other) { while(true) { - var other = _other; - var $$this = _this; - var lo; - var this_hi = $$this[0]; - var exit = 0; - var exit$1 = 0; - var exit$2 = 0; + let other = _other; + let $$this = _this; + let lo; + let this_hi = $$this[0]; + let exit = 0; + let exit$1 = 0; + let exit$2 = 0; if (this_hi !== 0) { exit$2 = 4; } else { @@ -225,16 +225,16 @@ function mul(_this, _other) { } } if (exit === 2) { - var other_hi = other[0]; - var lo$1 = $$this[1]; - var exit$3 = 0; + let other_hi = other[0]; + let lo$1 = $$this[1]; + let exit$3 = 0; if (other_hi !== -2147483648 || other[1] !== 0) { exit$3 = 3; } else { lo = lo$1; } if (exit$3 === 3) { - var other_lo = other[1]; + let other_lo = other[1]; if (this_hi < 0) { if (other_hi >= 0) { return neg(mul(neg($$this), other)); @@ -246,18 +246,18 @@ function mul(_this, _other) { if (other_hi < 0) { return neg(mul($$this, neg(other))); } - var a48 = (this_hi >>> 16); - var a32 = this_hi & 65535; - var a16 = (lo$1 >>> 16); - var a00 = lo$1 & 65535; - var b48 = (other_hi >>> 16); - var b32 = other_hi & 65535; - var b16 = (other_lo >>> 16); - var b00 = other_lo & 65535; - var c48 = 0; - var c32 = 0; - var c16 = 0; - var c00 = a00 * b00; + let a48 = (this_hi >>> 16); + let a32 = this_hi & 65535; + let a16 = (lo$1 >>> 16); + let a00 = lo$1 & 65535; + let b48 = (other_hi >>> 16); + let b32 = other_hi & 65535; + let b16 = (other_lo >>> 16); + let b00 = other_lo & 65535; + let c48 = 0; + let c32 = 0; + let c16 = 0; + let c00 = a00 * b00; c16 = (c00 >>> 16) + a16 * b00; c32 = (c16 >>> 16); c16 = (c16 & 65535) + a00 * b16; @@ -322,8 +322,8 @@ function of_float(x) { if (x < 0) { return neg(of_float(- x)); } - var hi = x / 4294967296 | 0; - var lo = x % 4294967296 | 0; + let hi = x / 4294967296 | 0; + let lo = x % 4294967296 | 0; return [ hi, (lo >>> 0) @@ -331,8 +331,8 @@ function of_float(x) { } function isSafeInteger(param) { - var hi = param[0]; - var top11Bits = (hi >> 21); + let hi = param[0]; + let top11Bits = (hi >> 21); if (top11Bits === 0) { return true; } else if (top11Bits === -1) { @@ -353,33 +353,33 @@ function to_string(self) { return "-" + to_string(neg(self)); } } - var approx_div1 = of_float(Math.floor(to_float(self) / 10)); - var lo = approx_div1[1]; - var hi = approx_div1[0]; - var match = sub_aux(sub_aux(self, (lo << 3), (lo >>> 29) | (hi << 3)), (lo << 1), (lo >>> 31) | (hi << 1)); - var rem_lo = match[1]; - var rem_hi = match[0]; + let approx_div1 = of_float(Math.floor(to_float(self) / 10)); + let lo = approx_div1[1]; + let hi = approx_div1[0]; + let match = sub_aux(sub_aux(self, (lo << 3), (lo >>> 29) | (hi << 3)), (lo << 1), (lo >>> 31) | (hi << 1)); + let rem_lo = match[1]; + let rem_hi = match[0]; if (rem_lo === 0 && rem_hi === 0) { return to_string(approx_div1) + "0"; } if (rem_hi < 0) { - var rem_lo$1 = ((rem_lo ^ -1) + 1 >>> 0); - var delta = Math.ceil(rem_lo$1 / 10); - var remainder = 10 * delta - rem_lo$1; + let rem_lo$1 = ((rem_lo ^ -1) + 1 >>> 0); + let delta = Math.ceil(rem_lo$1 / 10); + let remainder = 10 * delta - rem_lo$1; return to_string(sub_aux(approx_div1, delta | 0, 0)) + String(remainder | 0); } - var delta$1 = Math.floor(rem_lo / 10); - var remainder$1 = rem_lo - 10 * delta$1; + let delta$1 = Math.floor(rem_lo / 10); + let remainder$1 = rem_lo - 10 * delta$1; return to_string(add_aux(approx_div1, delta$1 | 0, 0)) + String(remainder$1 | 0); } function div(_self, _other) { while(true) { - var other = _other; - var self = _self; - var self_hi = self[0]; - var exit = 0; - var exit$1 = 0; + let other = _other; + let self = _self; + let self_hi = self[0]; + let exit = 0; + let exit$1 = 0; if (other[0] !== 0 || other[1] !== 0) { exit$1 = 2; } else { @@ -407,9 +407,9 @@ function div(_self, _other) { if (Caml.i64_eq(other, min_int)) { return one; } - var half_this = asr_(self, 1); - var approx = lsl_(div(half_this, other), 1); - var exit$2 = 0; + let half_this = asr_(self, 1); + let approx = lsl_(div(half_this, other), 1); + let exit$2 = 0; if (approx[0] !== 0) { exit$2 = 3; } else { @@ -423,15 +423,15 @@ function div(_self, _other) { exit$2 = 3; } if (exit$2 === 3) { - var rem = sub(self, mul(other, approx)); + let rem = sub(self, mul(other, approx)); return add(approx, div(rem, other)); } } } if (exit === 1) { - var other_hi = other[0]; - var exit$3 = 0; + let other_hi = other[0]; + let exit$3 = 0; if (other_hi !== -2147483648) { exit$3 = 2; } else { @@ -452,15 +452,15 @@ function div(_self, _other) { if (other_hi < 0) { return neg(div(self, neg(other))); } - var res = zero; - var rem$1 = self; + let res = zero; + let rem$1 = self; while(Caml.i64_ge(rem$1, other)) { - var b = Math.floor(to_float(rem$1) / to_float(other)); - var approx$1 = 1 > b ? 1 : b; - var log2 = Math.ceil(Math.log(approx$1) / Math.LN2); - var delta = log2 <= 48 ? 1 : Math.pow(2, log2 - 48); - var approxRes = of_float(approx$1); - var approxRem = mul(approxRes, other); + let b = Math.floor(to_float(rem$1) / to_float(other)); + let approx$1 = 1 > b ? 1 : b; + let log2 = Math.ceil(Math.log(approx$1) / Math.LN2); + let delta = log2 <= 48 ? 1 : Math.pow(2, log2 - 48); + let approxRes = of_float(approx$1); + let approxRem = mul(approxRes, other); while(approxRem[0] < 0 || Caml.i64_gt(approxRem, rem$1)) { approx$1 = approx$1 - delta; approxRes = of_float(approx$1); @@ -485,7 +485,7 @@ function mod_(self, other) { } function div_mod(self, other) { - var quotient = div(self, other); + let quotient = div(self, other); return [ quotient, sub(self, mul(quotient, other)) @@ -493,16 +493,16 @@ function div_mod(self, other) { } function compare(self, other) { - var y = other[0]; - var x = self[0]; - var v = x < y ? -1 : ( + let y = other[0]; + let x = self[0]; + let v = x < y ? -1 : ( x === y ? 0 : 1 ); if (v !== 0) { return v; } - var y$1 = other[1]; - var x$1 = self[1]; + let y$1 = other[1]; + let x$1 = self[1]; if (x$1 < y$1) { return -1; } else if (x$1 === y$1) { @@ -524,9 +524,9 @@ function to_int32(x) { } function to_hex(x) { - var x_lo = x[1]; - var x_hi = x[0]; - var aux = function (v) { + let x_lo = x[1]; + let x_hi = x[0]; + let aux = function (v) { return (v >>> 0).toString(16); }; if (x_hi === 0 && x_lo === 0) { @@ -538,8 +538,8 @@ function to_hex(x) { if (x_hi === 0) { return aux(x_lo); } - var lo = aux(x_lo); - var pad = 8 - lo.length | 0; + let lo = aux(x_lo); + let pad = 8 - lo.length | 0; if (pad <= 0) { return aux(x_hi) + lo; } else { @@ -559,7 +559,7 @@ function float_of_bits(x) { } function bits_of_float(x) { - var match = (function(x){return new Int32Array(new Float64Array([x]).buffer)})(x); + let match = (function(x){return new Int32Array(new Float64Array([x]).buffer)})(x); return [ match[1], (match[0] >>> 0) diff --git a/lib/js/caml_js_exceptions.js b/lib/js/caml_js_exceptions.js index 10ac31000d..5cac03dce9 100644 --- a/lib/js/caml_js_exceptions.js +++ b/lib/js/caml_js_exceptions.js @@ -1,9 +1,9 @@ 'use strict'; -var Caml_option = require("./caml_option.js"); -var Caml_exceptions = require("./caml_exceptions.js"); +let Caml_option = require("./caml_option.js"); +let Caml_exceptions = require("./caml_exceptions.js"); -var $$Error = "JsError"; +let $$Error = "JsError"; function internalToOCamlException(e) { if (Caml_exceptions.is_extension(e)) { diff --git a/lib/js/caml_lexer.js b/lib/js/caml_lexer.js index f1b9d95ed6..1a5be6d097 100644 --- a/lib/js/caml_lexer.js +++ b/lib/js/caml_lexer.js @@ -31,7 +31,7 @@ function caml_lex_array(s) { } ; -var caml_lex_engine_aux = (function (tbl, start_state, lexbuf, exn){ +let caml_lex_engine_aux = (function (tbl, start_state, lexbuf, exn){ if (!Array.isArray(tbl.lex_default)) { tbl.lex_base = caml_lex_array(tbl.lex_base); @@ -101,7 +101,7 @@ var caml_lex_engine_aux = (function (tbl, start_state, lexbuf, exn){ } }); -var empty_token_lit = "lexing: empty token"; +let empty_token_lit = "lexing: empty token"; function lex_engine(tbls, i, buf) { return caml_lex_engine_aux(tbls, i, buf, { @@ -156,7 +156,7 @@ function caml_lex_run_tag(s, i, mem) { } ; -var caml_new_lex_engine_aux = (function (tbl, start_state, lexbuf, exn) { +let caml_new_lex_engine_aux = (function (tbl, start_state, lexbuf, exn) { if (!Array.isArray(tbl.lex_default)) { tbl.lex_base = caml_lex_array(tbl.lex_base); diff --git a/lib/js/caml_md5.js b/lib/js/caml_md5.js index 69d9a6b015..5fb6b27d56 100644 --- a/lib/js/caml_md5.js +++ b/lib/js/caml_md5.js @@ -2,7 +2,7 @@ function cmn(q, a, b, x, s, t) { - var a$1 = ((a + q | 0) + x | 0) + t | 0; + let a$1 = ((a + q | 0) + x | 0) + t | 0; return ((a$1 << s) | (a$1 >>> (32 - s | 0)) | 0) + b | 0; } @@ -23,10 +23,10 @@ function i(a, b, c, d, x, s, t) { } function cycle(x, k) { - var a = x[0]; - var b = x[1]; - var c = x[2]; - var d = x[3]; + let a = x[0]; + let b = x[1]; + let c = x[2]; + let d = x[3]; a = f(a, b, c, d, k[0], 7, -680876936); d = f(d, a, b, c, k[1], 12, -389564586); c = f(c, d, a, b, k[2], 17, 606105819); @@ -97,14 +97,14 @@ function cycle(x, k) { x[3] = d + x[3] | 0; } -var state = [ +let state = [ 1732584193, -271733879, -1732584194, 271733878 ]; -var md5blk = [ +let md5blk = [ 0, 0, 0, @@ -124,36 +124,36 @@ var md5blk = [ ]; function md5_string(s, start, len) { - var s$1 = s.slice(start, len); - var n = s$1.length; + let s$1 = s.slice(start, len); + let n = s$1.length; state[0] = 1732584193; state[1] = -271733879; state[2] = -1732584194; state[3] = 271733878; - for(var i = 0; i <= 15; ++i){ + for(let i = 0; i <= 15; ++i){ md5blk[i] = 0; } - var i_end = n / 64 | 0; - for(var i$1 = 1; i$1 <= i_end; ++i$1){ - for(var j = 0; j <= 15; ++j){ - var k = ((i$1 << 6) - 64 | 0) + (j << 2) | 0; + let i_end = n / 64 | 0; + for(let i$1 = 1; i$1 <= i_end; ++i$1){ + for(let j = 0; j <= 15; ++j){ + let k = ((i$1 << 6) - 64 | 0) + (j << 2) | 0; md5blk[j] = ((s$1.charCodeAt(k) + (s$1.charCodeAt(k + 1 | 0) << 8) | 0) + (s$1.charCodeAt(k + 2 | 0) << 16) | 0) + (s$1.charCodeAt(k + 3 | 0) << 24) | 0; } cycle(state, md5blk); } - var s_tail = s$1.slice((i_end << 6)); - for(var kk = 0; kk <= 15; ++kk){ + let s_tail = s$1.slice((i_end << 6)); + for(let kk = 0; kk <= 15; ++kk){ md5blk[kk] = 0; } - var i_end$1 = s_tail.length - 1 | 0; - for(var i$2 = 0; i$2 <= i_end$1; ++i$2){ + let i_end$1 = s_tail.length - 1 | 0; + for(let i$2 = 0; i$2 <= i_end$1; ++i$2){ md5blk[i$2 / 4 | 0] = md5blk[i$2 / 4 | 0] | (s_tail.charCodeAt(i$2) << (i$2 % 4 << 3)); } - var i$3 = i_end$1 + 1 | 0; + let i$3 = i_end$1 + 1 | 0; md5blk[i$3 / 4 | 0] = md5blk[i$3 / 4 | 0] | (128 << (i$3 % 4 << 3)); if (i$3 > 55) { cycle(state, md5blk); - for(var i$4 = 0; i$4 <= 15; ++i$4){ + for(let i$4 = 0; i$4 <= 15; ++i$4){ md5blk[i$4] = 0; } } diff --git a/lib/js/caml_module.js b/lib/js/caml_module.js index bb191bbe7e..fbb4f2303a 100644 --- a/lib/js/caml_module.js +++ b/lib/js/caml_module.js @@ -1,16 +1,16 @@ 'use strict'; -var Caml_obj = require("./caml_obj.js"); +let Caml_obj = require("./caml_obj.js"); function init_mod(loc, shape) { - var undef_module = function (param) { + let undef_module = function (param) { throw { RE_EXN_ID: "Undefined_recursive_module", _1: loc, Error: new Error() }; }; - var loop = function (shape, struct_, idx) { + let loop = function (shape, struct_, idx) { if (typeof shape !== "object") { switch (shape) { case "Function" : @@ -29,12 +29,12 @@ function init_mod(loc, shape) { } } else { if (shape.TAG === "Module") { - var comps = shape._0; - var v = {}; + let comps = shape._0; + let v = {}; struct_[idx] = v; - var len = comps.length; - for(var i = 0; i < len; ++i){ - var match = comps[i]; + let len = comps.length; + for(let i = 0; i < len; ++i){ + let match = comps[i]; loop(match[0], v, match[1]); } return; @@ -43,14 +43,14 @@ function init_mod(loc, shape) { return; } }; - var res = {}; - var dummy_name = "dummy"; + let res = {}; + let dummy_name = "dummy"; loop(shape, res, dummy_name); return res[dummy_name]; } function update_mod(shape, o, n) { - var aux = function (shape, o, n, parent, i) { + let aux = function (shape, o, n, parent, i) { if (typeof shape !== "object") { switch (shape) { case "Function" : @@ -65,10 +65,10 @@ function update_mod(shape, o, n) { if (shape.TAG !== "Module") { return; } - var comps = shape._0; - for(var i$1 = 0 ,i_finish = comps.length; i$1 < i_finish; ++i$1){ - var match = comps[i$1]; - var name = match[1]; + let comps = shape._0; + for(let i$1 = 0 ,i_finish = comps.length; i$1 < i_finish; ++i$1){ + let match = comps[i$1]; + let name = match[1]; aux(match[0], o[name], n[name], o, name); } return; @@ -86,10 +86,10 @@ function update_mod(shape, o, n) { }; } if (shape.TAG === "Module") { - var comps = shape._0; - for(var i = 0 ,i_finish = comps.length; i < i_finish; ++i){ - var match = comps[i]; - var name = match[1]; + let comps = shape._0; + for(let i = 0 ,i_finish = comps.length; i < i_finish; ++i){ + let match = comps[i]; + let name = match[1]; aux(match[0], o[name], n[name], o, name); } return; diff --git a/lib/js/caml_obj.js b/lib/js/caml_obj.js index dcdee42dec..ca4152bdd3 100644 --- a/lib/js/caml_obj.js +++ b/lib/js/caml_obj.js @@ -1,11 +1,11 @@ 'use strict'; -var Caml = require("./caml.js"); +let Caml = require("./caml.js"); -var for_in = (function(o,foo){ +let for_in = (function(o,foo){ for (var x in o) { foo(x) }}); -var obj_dup = (function(x){ +let obj_dup = (function(x){ if(Array.isArray(x)){ var len = x.length var v = new Array(len) @@ -20,7 +20,7 @@ var obj_dup = (function(x){ return Object.assign({},x) }); -var update_dummy = (function(x,y){ +let update_dummy = (function(x,y){ var k if(Array.isArray(y)){ for(k = 0; k < y.length ; ++k){ @@ -40,8 +40,8 @@ function compare(a, b) { if (a === b) { return 0; } - var a_type = typeof a; - var b_type = typeof b; + let a_type = typeof a; + let b_type = typeof b; switch (a_type) { case "bigint" : if (b_type === "bigint") { @@ -131,8 +131,8 @@ function compare(a, b) { return -1; } } - var tag_a = a.TAG; - var tag_b = b.TAG; + let tag_a = a.TAG; + let tag_b = b.TAG; if (tag_a === 248) { return Caml.int_compare(a[1], b[1]); } @@ -150,17 +150,17 @@ function compare(a, b) { return 1; } } - var len_a = a.length | 0; - var len_b = b.length | 0; + let len_a = a.length | 0; + let len_b = b.length | 0; if (len_a === len_b) { if (Array.isArray(a)) { - var _i = 0; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === len_a) { return 0; } - var res = compare(a[i], b[i]); + let res = compare(a[i], b[i]); if (res !== 0) { return res; } @@ -173,13 +173,13 @@ function compare(a, b) { return aux_obj_compare(a, b); } } else if (len_a < len_b) { - var _i$1 = 0; + let _i$1 = 0; while(true) { - var i$1 = _i$1; + let i$1 = _i$1; if (i$1 === len_a) { return -1; } - var res$1 = compare(a[i$1], b[i$1]); + let res$1 = compare(a[i$1], b[i$1]); if (res$1 !== 0) { return res$1; } @@ -187,13 +187,13 @@ function compare(a, b) { continue ; }; } else { - var _i$2 = 0; + let _i$2 = 0; while(true) { - var i$2 = _i$2; + let i$2 = _i$2; if (i$2 === len_b) { return 1; } - var res$2 = compare(a[i$2], b[i$2]); + let res$2 = compare(a[i$2], b[i$2]); if (res$2 !== 0) { return res$2; } @@ -205,19 +205,19 @@ function compare(a, b) { } function aux_obj_compare(a, b) { - var min_key_lhs = { + let min_key_lhs = { contents: undefined }; - var min_key_rhs = { + let min_key_rhs = { contents: undefined }; - var do_key = function (param, key) { - var min_key = param[2]; - var b = param[1]; + let do_key = function (param, key) { + let min_key = param[2]; + let b = param[1]; if (!(!Object.prototype.hasOwnProperty.call(b, key) || compare(param[0][key], b[key]) > 0)) { return; } - var mk = min_key.contents; + let mk = min_key.contents; if (mk !== undefined && key >= mk) { return; } else { @@ -225,26 +225,26 @@ function aux_obj_compare(a, b) { return; } }; - var partial_arg = [ + let partial_arg = [ a, b, min_key_rhs ]; - var do_key_a = function (param) { + let do_key_a = function (param) { return do_key(partial_arg, param); }; - var partial_arg$1 = [ + let partial_arg$1 = [ b, a, min_key_lhs ]; - var do_key_b = function (param) { + let do_key_b = function (param) { return do_key(partial_arg$1, param); }; for_in(a, do_key_a); for_in(b, do_key_b); - var match = min_key_lhs.contents; - var match$1 = min_key_rhs.contents; + let match = min_key_lhs.contents; + let match$1 = min_key_rhs.contents; if (match !== undefined) { if (match$1 !== undefined) { return Caml.string_compare(match, match$1); @@ -262,11 +262,11 @@ function equal(a, b) { if (a === b) { return true; } - var a_type = typeof a; + let a_type = typeof a; if (a_type === "string" || a_type === "number" || a_type === "bigint" || a_type === "boolean" || a_type === "undefined" || a === null) { return false; } - var b_type = typeof b; + let b_type = typeof b; if (a_type === "function" || b_type === "function") { throw { RE_EXN_ID: "Invalid_argument", @@ -277,8 +277,8 @@ function equal(a, b) { if (b_type === "number" || b_type === "bigint" || b_type === "undefined" || b === null) { return false; } - var tag_a = a.TAG; - var tag_b = b.TAG; + let tag_a = a.TAG; + let tag_b = b.TAG; if (tag_a === 248) { return a[1] === b[1]; } @@ -292,13 +292,13 @@ function equal(a, b) { if (tag_a !== tag_b) { return false; } - var len_a = a.length | 0; - var len_b = b.length | 0; + let len_a = a.length | 0; + let len_b = b.length | 0; if (len_a === len_b) { if (Array.isArray(a)) { - var _i = 0; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === len_a) { return true; } @@ -311,17 +311,17 @@ function equal(a, b) { } else if ((a instanceof Date && b instanceof Date)) { return !(a > b || a < b); } else { - var result = { + let result = { contents: true }; - var do_key_a = function (key) { + let do_key_a = function (key) { if (!Object.prototype.hasOwnProperty.call(b, key)) { result.contents = false; return; } }; - var do_key_b = function (key) { + let do_key_b = function (key) { if (!Object.prototype.hasOwnProperty.call(a, key) || !equal(b[key], a[key])) { result.contents = false; return; diff --git a/lib/js/caml_option.js b/lib/js/caml_option.js index 18c4b4c0cd..38cc8ad44e 100644 --- a/lib/js/caml_option.js +++ b/lib/js/caml_option.js @@ -47,7 +47,7 @@ function valFromOption(x) { if (!(x !== null && x.BS_PRIVATE_NESTED_SOME_NONE !== undefined)) { return x; } - var depth = x.BS_PRIVATE_NESTED_SOME_NONE; + let depth = x.BS_PRIVATE_NESTED_SOME_NONE; if (depth === 0) { return; } else { diff --git a/lib/js/caml_parser.js b/lib/js/caml_parser.js index 958be61b52..92cf721e98 100644 --- a/lib/js/caml_parser.js +++ b/lib/js/caml_parser.js @@ -65,7 +65,7 @@ var Result = { var PARSER_TRACE = false; ; -var parse_engine = (function (tables /* parser_table */, env /* parser_env */, cmd /* parser_input*/, arg /* Obj.t*/) { +let parse_engine = (function (tables /* parser_table */, env /* parser_env */, cmd /* parser_input*/, arg /* Obj.t*/) { var ERRCODE = 256; //var START = 0; //var TOKEN_READ = 1; @@ -290,7 +290,7 @@ var parse_engine = (function (tables /* parser_table */, env /* parser_env */, c return res; }); -var set_parser_trace = (function (v) { +let set_parser_trace = (function (v) { var old = PARSER_TRACE; PARSER_TRACE = v; return old; diff --git a/lib/js/caml_splice_call.js b/lib/js/caml_splice_call.js index 30777062ad..f5a5b17c99 100644 --- a/lib/js/caml_splice_call.js +++ b/lib/js/caml_splice_call.js @@ -1,7 +1,7 @@ 'use strict'; -var spliceApply = (function(fn,args){ +let spliceApply = (function(fn,args){ var i, argLen; argLen = args.length var applied = [] @@ -15,7 +15,7 @@ var spliceApply = (function(fn,args){ return fn.apply(null,applied) }); -var spliceNewApply = (function (ctor,args){ +let spliceNewApply = (function (ctor,args){ var i, argLen; argLen = args.length var applied = [null] // Function.prototype.bind.apply(fn, args) requires the first element in \`args\` to be \`null\` @@ -30,7 +30,7 @@ var spliceNewApply = (function (ctor,args){ return new C() }); -var spliceObjApply = (function(obj,name,args){ +let spliceObjApply = (function(obj,name,args){ var i, argLen; argLen = args.length var applied = [] diff --git a/lib/js/caml_sys.js b/lib/js/caml_sys.js index e5935ab0aa..aede4c5f7a 100644 --- a/lib/js/caml_sys.js +++ b/lib/js/caml_sys.js @@ -8,7 +8,7 @@ function sys_getenv(s) { Error: new Error() }; } - var x = process.env[s]; + let x = process.env[s]; if (x !== undefined) { return x; } @@ -18,7 +18,7 @@ function sys_getenv(s) { }; } -var os_type = (function(_){ +let os_type = (function(_){ if(typeof process !== 'undefined' && process.platform === 'win32'){ return "Win32" } @@ -35,7 +35,7 @@ function sys_time(param) { } } -var sys_getcwd = (function(param){ +let sys_getcwd = (function(param){ if (typeof process === "undefined" || process.cwd === undefined){ return "/" } @@ -49,7 +49,7 @@ function sys_get_argv(param) { [""] ]; } - var argv = process.argv; + let argv = process.argv; if (argv == null) { return [ "", diff --git a/lib/js/camlinternalLazy.js b/lib/js/camlinternalLazy.js index ce6273feba..5978143101 100644 --- a/lib/js/camlinternalLazy.js +++ b/lib/js/camlinternalLazy.js @@ -1,15 +1,15 @@ 'use strict'; -var Caml_exceptions = require("./caml_exceptions.js"); +let Caml_exceptions = require("./caml_exceptions.js"); function is_val(l) { return l.LAZY_DONE; } -var Undefined = /* @__PURE__ */Caml_exceptions.create("CamlinternalLazy.Undefined"); +let Undefined = /* @__PURE__ */Caml_exceptions.create("CamlinternalLazy.Undefined"); function forward_with_closure(blk, closure) { - var result = closure(); + let result = closure(); blk.VAL = result; blk.LAZY_DONE = true; return result; @@ -26,7 +26,7 @@ function force(lzv) { if (lzv.LAZY_DONE) { return lzv.VAL; } else { - var closure = lzv.VAL; + let closure = lzv.VAL; lzv.VAL = raise_undefined; try { return forward_with_closure(lzv, closure); @@ -44,7 +44,7 @@ function force_val(lzv) { if (lzv.LAZY_DONE) { return lzv.VAL; } else { - var closure = lzv.VAL; + let closure = lzv.VAL; lzv.VAL = raise_undefined; return forward_with_closure(lzv, closure); } diff --git a/lib/js/char.js b/lib/js/char.js index 3ec471ae84..ee681e2de2 100644 --- a/lib/js/char.js +++ b/lib/js/char.js @@ -1,6 +1,6 @@ 'use strict'; -var Bytes = require("./bytes.js"); +let Bytes = require("./bytes.js"); function chr(n) { if (n < 0 || n > 255) { @@ -14,7 +14,7 @@ function chr(n) { } function escaped(param) { - var exit = 0; + let exit = 0; if (param >= 40) { if (param === 92) { return "\\\\"; @@ -54,7 +54,7 @@ function escaped(param) { } switch (exit) { case 1 : - var s = [ + let s = [ 0, 0, 0, @@ -66,7 +66,7 @@ function escaped(param) { s[3] = 48 + param % 10 | 0; return Bytes.to_string(s); case 2 : - var s$1 = [0]; + let s$1 = [0]; s$1[0] = param; return Bytes.to_string(s$1); diff --git a/lib/js/complex.js b/lib/js/complex.js index 68df6e9cf4..6cedfbb02f 100644 --- a/lib/js/complex.js +++ b/lib/js/complex.js @@ -1,7 +1,7 @@ 'use strict'; -var one = { +let one = { re: 1.0, im: 0.0 }; @@ -43,15 +43,15 @@ function mul(x, y) { function div(x, y) { if (Math.abs(y.re) >= Math.abs(y.im)) { - var r = y.im / y.re; - var d = y.re + r * y.im; + let r = y.im / y.re; + let d = y.re + r * y.im; return { re: (x.re + r * x.im) / d, im: (x.im - r * x.re) / d }; } - var r$1 = y.re / y.im; - var d$1 = y.im + r$1 * y.re; + let r$1 = y.re / y.im; + let d$1 = y.im + r$1 * y.re; return { re: (r$1 * x.re + x.im) / d$1, im: (r$1 * x.im - x.re) / d$1 @@ -67,8 +67,8 @@ function norm2(x) { } function norm(x) { - var r = Math.abs(x.re); - var i = Math.abs(x.im); + let r = Math.abs(x.re); + let i = Math.abs(x.im); if (r === 0.0) { return i; } @@ -76,10 +76,10 @@ function norm(x) { return r; } if (r >= i) { - var q = i / r; + let q = i / r; return r * Math.sqrt(1.0 + q * q); } - var q$1 = r / i; + let q$1 = r / i; return i * Math.sqrt(1.0 + q$1 * q$1); } @@ -101,14 +101,14 @@ function sqrt(x) { im: 0.0 }; } - var r = Math.abs(x.re); - var i = Math.abs(x.im); - var w; + let r = Math.abs(x.re); + let i = Math.abs(x.im); + let w; if (r >= i) { - var q = i / r; + let q = i / r; w = Math.sqrt(r) * Math.sqrt(0.5 * (1.0 + Math.sqrt(1.0 + q * q))); } else { - var q$1 = r / i; + let q$1 = r / i; w = Math.sqrt(i) * Math.sqrt(0.5 * (q$1 + Math.sqrt(1.0 + q$1 * q$1))); } if (x.re >= 0.0) { @@ -125,7 +125,7 @@ function sqrt(x) { } function exp(x) { - var e = Math.exp(x.re); + let e = Math.exp(x.re); return { re: e * Math.cos(x.im), im: e * Math.sin(x.im) @@ -143,12 +143,12 @@ function pow(x, y) { return exp(mul(y, log(x))); } -var zero = { +let zero = { re: 0.0, im: 0.0 }; -var i = { +let i = { re: 0.0, im: 1.0 }; diff --git a/lib/js/curry.js b/lib/js/curry.js index ed57c348b3..9fd82ae358 100644 --- a/lib/js/curry.js +++ b/lib/js/curry.js @@ -1,15 +1,15 @@ 'use strict'; -var Caml_array = require("./caml_array.js"); +let Caml_array = require("./caml_array.js"); function app(_f, _args) { while(true) { - var args = _args; - var f = _f; - var init_arity = f.length; - var arity = init_arity === 0 ? 1 : init_arity; - var len = args.length; - var d = arity - len | 0; + let args = _args; + let f = _f; + let init_arity = f.length; + let arity = init_arity === 0 ? 1 : init_arity; + let len = args.length; + let d = arity - len | 0; if (d === 0) { return f.apply(null, args); } @@ -27,7 +27,7 @@ function app(_f, _args) { } function _1(o, a0) { - var arity = o.length; + let arity = o.length; if (arity === 1) { return o(a0); } else { @@ -65,7 +65,7 @@ function _1(o, a0) { } function __1(o) { - var arity = o.length; + let arity = o.length; if (arity === 1) { return o; } else { @@ -76,7 +76,7 @@ function __1(o) { } function _2(o, a0, a1) { - var arity = o.length; + let arity = o.length; if (arity === 2) { return o(a0, a1); } else { @@ -115,7 +115,7 @@ function _2(o, a0, a1) { } function __2(o) { - var arity = o.length; + let arity = o.length; if (arity === 2) { return o; } else { @@ -126,7 +126,7 @@ function __2(o) { } function _3(o, a0, a1, a2) { - var arity = o.length; + let arity = o.length; if (arity === 3) { return o(a0, a1, a2); } else { @@ -167,7 +167,7 @@ function _3(o, a0, a1, a2) { } function __3(o) { - var arity = o.length; + let arity = o.length; if (arity === 3) { return o; } else { @@ -178,7 +178,7 @@ function __3(o) { } function _4(o, a0, a1, a2, a3) { - var arity = o.length; + let arity = o.length; if (arity === 4) { return o(a0, a1, a2, a3); } else { @@ -222,7 +222,7 @@ function _4(o, a0, a1, a2, a3) { } function __4(o) { - var arity = o.length; + let arity = o.length; if (arity === 4) { return o; } else { @@ -233,7 +233,7 @@ function __4(o) { } function _5(o, a0, a1, a2, a3, a4) { - var arity = o.length; + let arity = o.length; if (arity === 5) { return o(a0, a1, a2, a3, a4); } else { @@ -281,7 +281,7 @@ function _5(o, a0, a1, a2, a3, a4) { } function __5(o) { - var arity = o.length; + let arity = o.length; if (arity === 5) { return o; } else { @@ -292,7 +292,7 @@ function __5(o) { } function _6(o, a0, a1, a2, a3, a4, a5) { - var arity = o.length; + let arity = o.length; if (arity === 6) { return o(a0, a1, a2, a3, a4, a5); } else { @@ -345,7 +345,7 @@ function _6(o, a0, a1, a2, a3, a4, a5) { } function __6(o) { - var arity = o.length; + let arity = o.length; if (arity === 6) { return o; } else { @@ -356,7 +356,7 @@ function __6(o) { } function _7(o, a0, a1, a2, a3, a4, a5, a6) { - var arity = o.length; + let arity = o.length; if (arity === 7) { return o(a0, a1, a2, a3, a4, a5, a6); } else { @@ -415,7 +415,7 @@ function _7(o, a0, a1, a2, a3, a4, a5, a6) { } function __7(o) { - var arity = o.length; + let arity = o.length; if (arity === 7) { return o; } else { @@ -426,7 +426,7 @@ function __7(o) { } function _8(o, a0, a1, a2, a3, a4, a5, a6, a7) { - var arity = o.length; + let arity = o.length; if (arity === 8) { return o(a0, a1, a2, a3, a4, a5, a6, a7); } else { @@ -494,7 +494,7 @@ function _8(o, a0, a1, a2, a3, a4, a5, a6, a7) { } function __8(o) { - var arity = o.length; + let arity = o.length; if (arity === 8) { return o; } else { diff --git a/lib/js/digest.js b/lib/js/digest.js index 601ac14a7b..3480dcfa39 100644 --- a/lib/js/digest.js +++ b/lib/js/digest.js @@ -1,11 +1,11 @@ 'use strict'; -var Char = require("./char.js"); -var Bytes = require("./bytes.js"); -var $$String = require("./string.js"); -var Caml_md5 = require("./caml_md5.js"); -var Caml_bytes = require("./caml_bytes.js"); -var Caml_string = require("./caml_string.js"); +let Char = require("./char.js"); +let Bytes = require("./bytes.js"); +let $$String = require("./string.js"); +let Caml_md5 = require("./caml_md5.js"); +let Caml_bytes = require("./caml_bytes.js"); +let Caml_string = require("./caml_string.js"); function string(str) { return Caml_md5.md5_string(str, 0, str.length); @@ -44,9 +44,9 @@ function to_hex(d) { Error: new Error() }; } - var result = Caml_bytes.create(32); - for(var i = 0; i <= 15; ++i){ - var x = Caml_string.get(d, i); + let result = Caml_bytes.create(32); + for(let i = 0; i <= 15; ++i){ + let x = Caml_string.get(d, i); result[(i << 1)] = char_hex((x >>> 4)); result[(i << 1) + 1 | 0] = char_hex(x & 15); } @@ -61,7 +61,7 @@ function from_hex(s) { Error: new Error() }; } - var digit = function (c) { + let digit = function (c) { if (c >= 65) { if (c >= 97) { if (c >= 103) { @@ -91,19 +91,19 @@ function from_hex(s) { } return c - /* '0' */48 | 0; }; - var $$byte = function (i) { + let $$byte = function (i) { return (digit(Caml_string.get(s, i)) << 4) + digit(Caml_string.get(s, i + 1 | 0)) | 0; }; - var result = Caml_bytes.create(16); - for(var i = 0; i <= 15; ++i){ + let result = Caml_bytes.create(16); + for(let i = 0; i <= 15; ++i){ Caml_bytes.set(result, i, Char.chr($$byte((i << 1)))); } return Bytes.unsafe_to_string(result); } -var compare = $$String.compare; +let compare = $$String.compare; -var equal = $$String.equal; +let equal = $$String.equal; exports.compare = compare; exports.equal = equal; diff --git a/lib/js/dom.js b/lib/js/dom.js index 9bfcdb3d96..595bc1805a 100644 --- a/lib/js/dom.js +++ b/lib/js/dom.js @@ -1,9 +1,9 @@ 'use strict'; -var $$Storage; +let $$Storage; -var Storage2; +let Storage2; exports.$$Storage = $$Storage; exports.Storage2 = Storage2; diff --git a/lib/js/dom_storage.js b/lib/js/dom_storage.js index be39838354..8d625d6a2c 100644 --- a/lib/js/dom_storage.js +++ b/lib/js/dom_storage.js @@ -1,6 +1,6 @@ 'use strict'; -var Caml_option = require("./caml_option.js"); +let Caml_option = require("./caml_option.js"); function getItem(s, obj) { return Caml_option.null_to_opt(obj.getItem(s)); diff --git a/lib/js/filename.js b/lib/js/filename.js index cf0af8d069..22e6930898 100644 --- a/lib/js/filename.js +++ b/lib/js/filename.js @@ -1,29 +1,29 @@ 'use strict'; -var Sys = require("./sys.js"); -var Bytes = require("./bytes.js"); -var Curry = require("./curry.js"); -var $$Buffer = require("./buffer.js"); -var $$String = require("./string.js"); -var Caml_sys = require("./caml_sys.js"); -var Caml_string = require("./caml_string.js"); -var Caml_js_exceptions = require("./caml_js_exceptions.js"); +let Sys = require("./sys.js"); +let Bytes = require("./bytes.js"); +let Curry = require("./curry.js"); +let $$Buffer = require("./buffer.js"); +let $$String = require("./string.js"); +let Caml_sys = require("./caml_sys.js"); +let Caml_string = require("./caml_string.js"); +let Caml_js_exceptions = require("./caml_js_exceptions.js"); function generic_basename(is_dir_sep, current_dir_name, name) { if (name === "") { return current_dir_name; } else { - var _n = name.length - 1 | 0; + let _n = name.length - 1 | 0; while(true) { - var n = _n; + let n = _n; if (n < 0) { return $$String.sub(name, 0, 1); } if (!Curry._2(is_dir_sep, name, n)) { - var _n$1 = n; - var p = n + 1 | 0; + let _n$1 = n; + let p = n + 1 | 0; while(true) { - var n$1 = _n$1; + let n$1 = _n$1; if (n$1 < 0) { return $$String.sub(name, 0, p); } @@ -44,23 +44,23 @@ function generic_dirname(is_dir_sep, current_dir_name, name) { if (name === "") { return current_dir_name; } else { - var _n = name.length - 1 | 0; + let _n = name.length - 1 | 0; while(true) { - var n = _n; + let n = _n; if (n < 0) { return $$String.sub(name, 0, 1); } if (!Curry._2(is_dir_sep, name, n)) { - var _n$1 = n; + let _n$1 = n; while(true) { - var n$1 = _n$1; + let n$1 = _n$1; if (n$1 < 0) { return current_dir_name; } if (Curry._2(is_dir_sep, name, n$1)) { - var _n$2 = n$1; + let _n$2 = n$1; while(true) { - var n$2 = _n$2; + let n$2 = _n$2; if (n$2 < 0) { return $$String.sub(name, 0, 1); } @@ -81,7 +81,7 @@ function generic_dirname(is_dir_sep, current_dir_name, name) { } } -var current_dir_name = "."; +let current_dir_name = "."; function is_dir_sep(s, i) { return Caml_string.get(s, i) === /* '/' */47; @@ -115,13 +115,13 @@ function check_suffix(name, suff) { } } -var temp_dir_name; +let temp_dir_name; try { temp_dir_name = Caml_sys.sys_getenv("TMPDIR"); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { temp_dir_name = "/tmp"; } else { @@ -130,11 +130,11 @@ catch (raw_exn){ } function quote(param) { - var quotequote = "'\\''"; - var l = param.length; - var b = $$Buffer.create(l + 20 | 0); + let quotequote = "'\\''"; + let l = param.length; + let b = $$Buffer.create(l + 20 | 0); $$Buffer.add_char(b, /* '\'' */39); - for(var i = 0; i < l; ++i){ + for(let i = 0; i < l; ++i){ if (Caml_string.get(param, i) === /* '\'' */39) { $$Buffer.add_string(b, quotequote); } else { @@ -153,10 +153,10 @@ function dirname(param) { return generic_dirname(is_dir_sep, current_dir_name, param); } -var current_dir_name$1 = "."; +let current_dir_name$1 = "."; function is_dir_sep$1(s, i) { - var c = Caml_string.get(s, i); + let c = Caml_string.get(s, i); if (c === /* '/' */47 || c === /* '\\' */92) { return true; } else { @@ -192,17 +192,17 @@ function check_suffix$1(name, suff) { if (name.length < suff.length) { return false; } - var s = $$String.sub(name, name.length - suff.length | 0, suff.length); + let s = $$String.sub(name, name.length - suff.length | 0, suff.length); return Bytes.unsafe_to_string(Bytes.lowercase_ascii(Bytes.unsafe_of_string(s))) === Bytes.unsafe_to_string(Bytes.lowercase_ascii(Bytes.unsafe_of_string(suff))); } -var temp_dir_name$1; +let temp_dir_name$1; try { temp_dir_name$1 = Caml_sys.sys_getenv("TEMP"); } catch (raw_exn$1){ - var exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1); + let exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1); if (exn$1.RE_EXN_ID === "Not_found") { temp_dir_name$1 = "."; } else { @@ -211,16 +211,16 @@ catch (raw_exn$1){ } function quote$1(s) { - var l = s.length; - var b = $$Buffer.create(l + 20 | 0); + let l = s.length; + let b = $$Buffer.create(l + 20 | 0); $$Buffer.add_char(b, /* '"' */34); - var loop = function (_i) { + let loop = function (_i) { while(true) { - var i = _i; + let i = _i; if (i === l) { return $$Buffer.add_char(b, /* '"' */34); } - var c = Caml_string.get(s, i); + let c = Caml_string.get(s, i); if (c === 34) { return loop_bs(0, i); } @@ -232,15 +232,15 @@ function quote$1(s) { continue ; }; }; - var loop_bs = function (_n, _i) { + let loop_bs = function (_n, _i) { while(true) { - var i = _i; - var n = _n; + let i = _i; + let n = _n; if (i === l) { $$Buffer.add_char(b, /* '"' */34); return add_bs(n); } - var match = Caml_string.get(s, i); + let match = Caml_string.get(s, i); if (match !== 34) { if (match !== 92) { add_bs(n); @@ -255,8 +255,8 @@ function quote$1(s) { return loop(i + 1 | 0); }; }; - var add_bs = function (n) { - for(var _j = 1; _j <= n; ++_j){ + let add_bs = function (n) { + for(let _j = 1; _j <= n; ++_j){ $$Buffer.add_char(b, /* '\\' */92); } }; @@ -265,7 +265,7 @@ function quote$1(s) { } function has_drive(s) { - var is_letter = function (param) { + let is_letter = function (param) { if (param >= 91) { return !(param > 122 || param < 97); } else { @@ -294,17 +294,17 @@ function drive_and_path(s) { } function dirname$1(s) { - var match = drive_and_path(s); - var dir = generic_dirname(is_dir_sep$1, current_dir_name$1, match[1]); + let match = drive_and_path(s); + let dir = generic_dirname(is_dir_sep$1, current_dir_name$1, match[1]); return match[0] + dir; } function basename$1(s) { - var match = drive_and_path(s); + let match = drive_and_path(s); return generic_basename(is_dir_sep$1, current_dir_name$1, match[1]); } -var current_dir_name$2 = "."; +let current_dir_name$2 = "."; function basename$2(param) { return generic_basename(is_dir_sep$1, current_dir_name$2, param); @@ -314,7 +314,7 @@ function dirname$2(param) { return generic_dirname(is_dir_sep$1, current_dir_name$2, param); } -var match; +let match; switch (Sys.os_type) { case "Cygwin" : @@ -363,14 +363,14 @@ switch (Sys.os_type) { ]; } -var temp_dir_name$2 = match[7]; +let temp_dir_name$2 = match[7]; -var is_dir_sep$2 = match[3]; +let is_dir_sep$2 = match[3]; -var dir_sep = match[2]; +let dir_sep = match[2]; function concat(dirname, filename) { - var l = dirname.length; + let l = dirname.length; if (l === 0 || Curry._2(is_dir_sep$2, dirname, l - 1 | 0)) { return dirname + filename; } else { @@ -379,7 +379,7 @@ function concat(dirname, filename) { } function chop_suffix(name, suff) { - var n = name.length - suff.length | 0; + let n = name.length - suff.length | 0; if (n < 0) { throw { RE_EXN_ID: "Invalid_argument", @@ -391,16 +391,16 @@ function chop_suffix(name, suff) { } function extension_len(name) { - var _i = name.length - 1 | 0; + let _i = name.length - 1 | 0; while(true) { - var i = _i; + let i = _i; if (i < 0 || Curry._2(is_dir_sep$2, name, i)) { return 0; } if (Caml_string.get(name, i) === /* '.' */46) { - var _i$1 = i - 1 | 0; + let _i$1 = i - 1 | 0; while(true) { - var i$1 = _i$1; + let i$1 = _i$1; if (i$1 < 0 || Curry._2(is_dir_sep$2, name, i$1)) { return 0; } @@ -417,7 +417,7 @@ function extension_len(name) { } function extension(name) { - var l = extension_len(name); + let l = extension_len(name); if (l === 0) { return ""; } else { @@ -426,7 +426,7 @@ function extension(name) { } function chop_extension(name) { - var l = extension_len(name); + let l = extension_len(name); if (l === 0) { throw { RE_EXN_ID: "Invalid_argument", @@ -438,7 +438,7 @@ function chop_extension(name) { } function remove_extension(name) { - var l = extension_len(name); + let l = extension_len(name); if (l === 0) { return name; } else { @@ -446,7 +446,7 @@ function remove_extension(name) { } } -var current_temp_dir_name = { +let current_temp_dir_name = { contents: temp_dir_name$2 }; @@ -458,21 +458,21 @@ function get_temp_dir_name(param) { return current_temp_dir_name.contents; } -var current_dir_name$3 = match[0]; +let current_dir_name$3 = match[0]; -var parent_dir_name = match[1]; +let parent_dir_name = match[1]; -var is_relative$2 = match[4]; +let is_relative$2 = match[4]; -var is_implicit$2 = match[5]; +let is_implicit$2 = match[5]; -var check_suffix$2 = match[6]; +let check_suffix$2 = match[6]; -var basename$3 = match[9]; +let basename$3 = match[9]; -var dirname$3 = match[10]; +let dirname$3 = match[10]; -var quote$2 = match[8]; +let quote$2 = match[8]; exports.current_dir_name = current_dir_name$3; exports.parent_dir_name = parent_dir_name; diff --git a/lib/js/genlex.js b/lib/js/genlex.js index de38b40b7f..88561a47d7 100644 --- a/lib/js/genlex.js +++ b/lib/js/genlex.js @@ -1,22 +1,22 @@ 'use strict'; -var Char = require("./char.js"); -var List = require("./list.js"); -var Bytes = require("./bytes.js"); -var Stream = require("./stream.js"); -var Hashtbl = require("./hashtbl.js"); -var Caml_bytes = require("./caml_bytes.js"); -var Caml_format = require("./caml_format.js"); -var Caml_string = require("./caml_string.js"); -var Caml_js_exceptions = require("./caml_js_exceptions.js"); +let Char = require("./char.js"); +let List = require("./list.js"); +let Bytes = require("./bytes.js"); +let Stream = require("./stream.js"); +let Hashtbl = require("./hashtbl.js"); +let Caml_bytes = require("./caml_bytes.js"); +let Caml_format = require("./caml_format.js"); +let Caml_string = require("./caml_string.js"); +let Caml_js_exceptions = require("./caml_js_exceptions.js"); -var initial_buffer = Caml_bytes.create(32); +let initial_buffer = Caml_bytes.create(32); -var buffer = { +let buffer = { contents: initial_buffer }; -var bufpos = { +let bufpos = { contents: 0 }; @@ -27,7 +27,7 @@ function reset_buffer(param) { function store(c) { if (bufpos.contents >= buffer.contents.length) { - var newbuffer = Caml_bytes.create((bufpos.contents << 1)); + let newbuffer = Caml_bytes.create((bufpos.contents << 1)); Bytes.blit(buffer.contents, 0, newbuffer, 0, bufpos.contents); buffer.contents = newbuffer; } @@ -36,25 +36,25 @@ function store(c) { } function get_string(param) { - var s = Bytes.sub_string(buffer.contents, 0, bufpos.contents); + let s = Bytes.sub_string(buffer.contents, 0, bufpos.contents); buffer.contents = initial_buffer; return s; } function make_lexer(keywords) { - var kwd_table = Hashtbl.create(undefined, 17); + let kwd_table = Hashtbl.create(undefined, 17); List.iter((function (s) { Hashtbl.add(kwd_table, s, { TAG: "Kwd", _0: s }); }), keywords); - var ident_or_keyword = function (id) { + let ident_or_keyword = function (id) { try { return Hashtbl.find(kwd_table, id); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { return { TAG: "Ident", @@ -64,13 +64,13 @@ function make_lexer(keywords) { throw exn; } }; - var keyword_or_error = function (c) { - var s = Caml_string.make(1, c); + let keyword_or_error = function (c) { + let s = Caml_string.make(1, c); try { return Hashtbl.find(kwd_table, s); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { throw { RE_EXN_ID: Stream.$$Error, @@ -81,13 +81,13 @@ function make_lexer(keywords) { throw exn; } }; - var next_token = function (strm__) { + let next_token = function (strm__) { while(true) { - var c = Stream.peek(strm__); + let c = Stream.peek(strm__); if (c === undefined) { return; } - var exit = 0; + let exit = 0; if (c < 124) { if (c > 122 || c < 65) { if (c >= 123) { @@ -111,12 +111,12 @@ function make_lexer(keywords) { }; case 39 : Stream.junk(strm__); - var c$1; + let c$1; try { c$1 = $$char(strm__); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === Stream.Failure) { throw { RE_EXN_ID: Stream.$$Error, @@ -126,7 +126,7 @@ function make_lexer(keywords) { } throw exn; } - var match = Stream.peek(strm__); + let match = Stream.peek(strm__); if (match !== undefined) { if (match !== 39) { throw { @@ -148,7 +148,7 @@ function make_lexer(keywords) { }; case 40 : Stream.junk(strm__); - var match$1 = Stream.peek(strm__); + let match$1 = Stream.peek(strm__); if (match$1 === 42) { Stream.junk(strm__); comment(strm__); @@ -158,7 +158,7 @@ function make_lexer(keywords) { } case 45 : Stream.junk(strm__); - var c$2 = Stream.peek(strm__); + let c$2 = Stream.peek(strm__); if (c$2 !== undefined && !(c$2 > 57 || c$2 < 48)) { Stream.junk(strm__); reset_buffer(); @@ -265,7 +265,7 @@ function make_lexer(keywords) { reset_buffer(); store(c); while(true) { - var c$3 = Stream.peek(strm__); + let c$3 = Stream.peek(strm__); if (c$3 === undefined) { return ident_or_keyword(get_string()); } @@ -305,9 +305,9 @@ function make_lexer(keywords) { } }; }; - var ident2 = function (strm__) { + let ident2 = function (strm__) { while(true) { - var c = Stream.peek(strm__); + let c = Stream.peek(strm__); if (c === undefined) { return ident_or_keyword(get_string()); } @@ -373,9 +373,9 @@ function make_lexer(keywords) { continue ; }; }; - var number = function (strm__) { + let number = function (strm__) { while(true) { - var c = Stream.peek(strm__); + let c = Stream.peek(strm__); if (c !== undefined) { if (c >= 58) { if (!(c !== 69 && c !== 101)) { @@ -395,7 +395,7 @@ function make_lexer(keywords) { Stream.junk(strm__); store(/* '.' */46); while(true) { - var c$1 = Stream.peek(strm__); + let c$1 = Stream.peek(strm__); if (c$1 !== undefined) { if (c$1 > 101 || c$1 < 69) { if (!(c$1 > 57 || c$1 < 48)) { @@ -424,8 +424,8 @@ function make_lexer(keywords) { }; }; }; - var exponent_part = function (strm__) { - var c = Stream.peek(strm__); + let exponent_part = function (strm__) { + let c = Stream.peek(strm__); if (c !== undefined && !(c !== 43 && c !== 45)) { Stream.junk(strm__); store(c); @@ -434,9 +434,9 @@ function make_lexer(keywords) { return end_exponent_part(strm__); } }; - var end_exponent_part = function (strm__) { + let end_exponent_part = function (strm__) { while(true) { - var c = Stream.peek(strm__); + let c = Stream.peek(strm__); if (c === undefined) { return { TAG: "Float", @@ -454,9 +454,9 @@ function make_lexer(keywords) { continue ; }; }; - var string = function (strm__) { + let string = function (strm__) { while(true) { - var c = Stream.peek(strm__); + let c = Stream.peek(strm__); if (c !== undefined) { if (c !== 34) { if (c !== 92) { @@ -465,12 +465,12 @@ function make_lexer(keywords) { continue ; } Stream.junk(strm__); - var c$1; + let c$1; try { c$1 = $$escape(strm__); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === Stream.Failure) { throw { RE_EXN_ID: Stream.$$Error, @@ -492,8 +492,8 @@ function make_lexer(keywords) { }; }; }; - var $$char = function (strm__) { - var c = Stream.peek(strm__); + let $$char = function (strm__) { + let c = Stream.peek(strm__); if (c !== undefined) { if (c !== 92) { Stream.junk(strm__); @@ -504,7 +504,7 @@ function make_lexer(keywords) { return $$escape(strm__); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === Stream.Failure) { throw { RE_EXN_ID: Stream.$$Error, @@ -521,8 +521,8 @@ function make_lexer(keywords) { }; } }; - var $$escape = function (strm__) { - var c1 = Stream.peek(strm__); + let $$escape = function (strm__) { + let c1 = Stream.peek(strm__); if (c1 !== undefined) { if (c1 >= 58) { switch (c1) { @@ -542,7 +542,7 @@ function make_lexer(keywords) { } else { if (c1 >= 48) { Stream.junk(strm__); - var c2 = Stream.peek(strm__); + let c2 = Stream.peek(strm__); if (c2 !== undefined) { if (c2 > 57 || c2 < 48) { throw { @@ -552,7 +552,7 @@ function make_lexer(keywords) { }; } Stream.junk(strm__); - var c3 = Stream.peek(strm__); + let c3 = Stream.peek(strm__); if (c3 !== undefined) { if (c3 > 57 || c3 < 48) { throw { @@ -586,14 +586,14 @@ function make_lexer(keywords) { }; } }; - var comment = function (strm__) { + let comment = function (strm__) { while(true) { - var match = Stream.peek(strm__); + let match = Stream.peek(strm__); if (match !== undefined) { switch (match) { case 40 : Stream.junk(strm__); - var match$1 = Stream.peek(strm__); + let match$1 = Stream.peek(strm__); if (match$1 !== undefined) { if (match$1 !== 42) { Stream.junk(strm__); @@ -611,7 +611,7 @@ function make_lexer(keywords) { case 42 : Stream.junk(strm__); while(true) { - var match$2 = Stream.peek(strm__); + let match$2 = Stream.peek(strm__); if (match$2 !== undefined) { if (match$2 !== 41) { if (match$2 !== 42) { diff --git a/lib/js/hashtbl.js b/lib/js/hashtbl.js index b35b3a3e86..c113bc9004 100644 --- a/lib/js/hashtbl.js +++ b/lib/js/hashtbl.js @@ -1,15 +1,15 @@ 'use strict'; -var Caml = require("./caml.js"); -var $$Array = require("./array.js"); -var Curry = require("./curry.js"); -var Random = require("./random.js"); -var Caml_obj = require("./caml_obj.js"); -var Caml_hash = require("./caml_hash.js"); -var Caml_array = require("./caml_array.js"); -var Pervasives = require("./pervasives.js"); -var Caml_option = require("./caml_option.js"); -var CamlinternalLazy = require("./camlinternalLazy.js"); +let Caml = require("./caml.js"); +let $$Array = require("./array.js"); +let Curry = require("./curry.js"); +let Random = require("./random.js"); +let Caml_obj = require("./caml_obj.js"); +let Caml_hash = require("./caml_hash.js"); +let Caml_array = require("./caml_array.js"); +let Pervasives = require("./pervasives.js"); +let Caml_option = require("./caml_option.js"); +let CamlinternalLazy = require("./camlinternalLazy.js"); function hash(x) { return Caml_hash.hash(10, 100, 0, x); @@ -27,7 +27,7 @@ function flip_ongoing_traversal(h) { h.initial_size = -h.initial_size | 0; } -var randomized = { +let randomized = { contents: false }; @@ -39,13 +39,13 @@ function is_randomized(param) { return randomized.contents; } -var prng = CamlinternalLazy.from_fun(function () { +let prng = CamlinternalLazy.from_fun(function () { return Random.State.make_self_init(); }); function power_2_above(_x, n) { while(true) { - var x = _x; + let x = _x; if (x >= n) { return x; } @@ -58,9 +58,9 @@ function power_2_above(_x, n) { } function create(randomOpt, initial_size) { - var random = randomOpt !== undefined ? randomOpt : randomized.contents; - var s = power_2_above(16, initial_size); - var seed = random ? Random.State.bits(CamlinternalLazy.force(prng)) : 0; + let random = randomOpt !== undefined ? randomOpt : randomized.contents; + let s = power_2_above(16, initial_size); + let seed = random ? Random.State.bits(CamlinternalLazy.force(prng)) : 0; return { size: 0, data: Caml_array.make(s, "Empty"), @@ -71,14 +71,14 @@ function create(randomOpt, initial_size) { function clear(h) { h.size = 0; - var len = h.data.length; - for(var i = 0; i < len; ++i){ + let len = h.data.length; + for(let i = 0; i < len; ++i){ Caml_array.set(h.data, i, "Empty"); } } function reset(h) { - var len = h.data.length; + let len = h.data.length; if (len === Pervasives.abs(h.initial_size)) { return clear(h); } else { @@ -92,20 +92,20 @@ function copy_bucketlist(param) { if (typeof param !== "object") { return "Empty"; } - var key = param.key; - var data = param.data; - var next = param.next; - var loop = function (_prec, _param) { + let key = param.key; + let data = param.data; + let next = param.next; + let loop = function (_prec, _param) { while(true) { - var param = _param; - var prec = _prec; + let param = _param; + let prec = _prec; if (typeof param !== "object") { return; } - var key = param.key; - var data = param.data; - var next = param.next; - var r = { + let key = param.key; + let data = param.data; + let next = param.next; + let r = { TAG: "Cons", key: key, data: data, @@ -128,7 +128,7 @@ function copy_bucketlist(param) { continue ; }; }; - var r = { + let r = { TAG: "Cons", key: key, data: data, @@ -152,33 +152,33 @@ function length(h) { } function resize(indexfun, h) { - var odata = h.data; - var osize = odata.length; - var nsize = (osize << 1); + let odata = h.data; + let osize = odata.length; + let nsize = (osize << 1); if (nsize < osize) { return; } - var ndata = Caml_array.make(nsize, "Empty"); - var ndata_tail = Caml_array.make(nsize, "Empty"); - var inplace = h.initial_size >= 0; + let ndata = Caml_array.make(nsize, "Empty"); + let ndata_tail = Caml_array.make(nsize, "Empty"); + let inplace = h.initial_size >= 0; h.data = ndata; - var insert_bucket = function (_param) { + let insert_bucket = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var key = param.key; - var data = param.data; - var next = param.next; - var cell = inplace ? param : ({ + let key = param.key; + let data = param.data; + let next = param.next; + let cell = inplace ? param : ({ TAG: "Cons", key: key, data: data, next: "Empty" }); - var nidx = Curry._2(indexfun, h, key); - var tail = Caml_array.get(ndata_tail, nidx); + let nidx = Curry._2(indexfun, h, key); + let tail = Caml_array.get(ndata_tail, nidx); if (typeof tail !== "object") { Caml_array.set(ndata, nidx, cell); } else { @@ -189,14 +189,14 @@ function resize(indexfun, h) { continue ; }; }; - for(var i = 0; i < osize; ++i){ + for(let i = 0; i < osize; ++i){ insert_bucket(Caml_array.get(odata, i)); } if (!inplace) { return; } - for(var i$1 = 0; i$1 < nsize; ++i$1){ - var tail = Caml_array.get(ndata_tail, i$1); + for(let i$1 = 0; i$1 < nsize; ++i$1){ + let tail = Caml_array.get(ndata_tail, i$1); if (typeof tail === "object") { tail.next = "Empty"; } @@ -209,8 +209,8 @@ function key_index(h, key) { } function add(h, key, data) { - var i = key_index(h, key); - var bucket = { + let i = key_index(h, key); + let bucket = { TAG: "Cons", key: key, data: data, @@ -225,17 +225,17 @@ function add(h, key, data) { } function remove(h, key) { - var i = key_index(h, key); - var _prec = "Empty"; - var _param = Caml_array.get(h.data, i); + let i = key_index(h, key); + let _prec = "Empty"; + let _param = Caml_array.get(h.data, i); while(true) { - var param = _param; - var prec = _prec; + let param = _param; + let prec = _prec; if (typeof param !== "object") { return; } - var k = param.key; - var next = param.next; + let k = param.key; + let next = param.next; if (Caml_obj.equal(k, key)) { h.size = h.size - 1 | 0; if (typeof prec !== "object") { @@ -252,16 +252,16 @@ function remove(h, key) { } function find(h, key) { - var match = Caml_array.get(h.data, key_index(h, key)); + let match = Caml_array.get(h.data, key_index(h, key)); if (typeof match !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var k1 = match.key; - var d1 = match.data; - var next1 = match.next; + let k1 = match.key; + let d1 = match.data; + let next1 = match.next; if (Caml_obj.equal(key, k1)) { return d1; } @@ -271,9 +271,9 @@ function find(h, key) { Error: new Error() }; } - var k2 = next1.key; - var d2 = next1.data; - var next2 = next1.next; + let k2 = next1.key; + let d2 = next1.data; + let next2 = next1.next; if (Caml_obj.equal(key, k2)) { return d2; } @@ -283,24 +283,24 @@ function find(h, key) { Error: new Error() }; } - var k3 = next2.key; - var d3 = next2.data; - var next3 = next2.next; + let k3 = next2.key; + let d3 = next2.data; + let next3 = next2.next; if (Caml_obj.equal(key, k3)) { return d3; } else { - var _param = next3; + let _param = next3; while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var k = param.key; - var data = param.data; - var next = param.next; + let k = param.key; + let data = param.data; + let next = param.next; if (Caml_obj.equal(key, k)) { return data; } @@ -311,43 +311,43 @@ function find(h, key) { } function find_opt(h, key) { - var match = Caml_array.get(h.data, key_index(h, key)); + let match = Caml_array.get(h.data, key_index(h, key)); if (typeof match !== "object") { return; } - var k1 = match.key; - var d1 = match.data; - var next1 = match.next; + let k1 = match.key; + let d1 = match.data; + let next1 = match.next; if (Caml_obj.equal(key, k1)) { return Caml_option.some(d1); } if (typeof next1 !== "object") { return; } - var k2 = next1.key; - var d2 = next1.data; - var next2 = next1.next; + let k2 = next1.key; + let d2 = next1.data; + let next2 = next1.next; if (Caml_obj.equal(key, k2)) { return Caml_option.some(d2); } if (typeof next2 !== "object") { return; } - var k3 = next2.key; - var d3 = next2.data; - var next3 = next2.next; + let k3 = next2.key; + let d3 = next2.data; + let next3 = next2.next; if (Caml_obj.equal(key, k3)) { return Caml_option.some(d3); } else { - var _param = next3; + let _param = next3; while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var k = param.key; - var data = param.data; - var next = param.next; + let k = param.key; + let data = param.data; + let next = param.next; if (Caml_obj.equal(key, k)) { return Caml_option.some(data); } @@ -358,15 +358,15 @@ function find_opt(h, key) { } function find_all(h, key) { - var find_in_bucket = function (_param) { + let find_in_bucket = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return /* [] */0; } - var k = param.key; - var data = param.data; - var next = param.next; + let k = param.key; + let data = param.data; + let next = param.next; if (Caml_obj.equal(k, key)) { return { hd: data, @@ -382,12 +382,12 @@ function find_all(h, key) { function replace_bucket(key, data, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return true; } - var k = param.key; - var next = param.next; + let k = param.key; + let next = param.next; if (Caml_obj.equal(k, key)) { param.key = key; param.data = data; @@ -399,8 +399,8 @@ function replace_bucket(key, data, _param) { } function replace(h, key, data) { - var i = key_index(h, key); - var l = Caml_array.get(h.data, i); + let i = key_index(h, key); + let l = Caml_array.get(h.data, i); if (replace_bucket(key, data, l)) { Caml_array.set(h.data, i, { TAG: "Cons", @@ -419,14 +419,14 @@ function replace(h, key, data) { } function mem(h, key) { - var _param = Caml_array.get(h.data, key_index(h, key)); + let _param = Caml_array.get(h.data, key_index(h, key)); while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } - var k = param.key; - var next = param.next; + let k = param.key; + let next = param.next; if (Caml_obj.equal(k, key)) { return true; } @@ -436,27 +436,27 @@ function mem(h, key) { } function iter(f, h) { - var do_bucket = function (_param) { + let do_bucket = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var key = param.key; - var data = param.data; - var next = param.next; + let key = param.key; + let data = param.data; + let next = param.next; Curry._2(f, key, data); _param = next; continue ; }; }; - var old_trav = h.initial_size < 0; + let old_trav = h.initial_size < 0; if (!old_trav) { flip_ongoing_traversal(h); } try { - var d = h.data; - for(var i = 0 ,i_finish = d.length; i < i_finish; ++i){ + let d = h.data; + for(let i = 0 ,i_finish = d.length; i < i_finish; ++i){ do_bucket(Caml_array.get(d, i)); } if (!old_trav) { @@ -476,8 +476,8 @@ function iter(f, h) { function filter_map_inplace_bucket(f, h, i, _prec, _param) { while(true) { - var param = _param; - var prec = _prec; + let param = _param; + let prec = _prec; if (typeof param !== "object") { if (typeof prec !== "object") { return Caml_array.set(h.data, i, "Empty"); @@ -486,10 +486,10 @@ function filter_map_inplace_bucket(f, h, i, _prec, _param) { return; } } - var key = param.key; - var data = param.data; - var next = param.next; - var data$1 = Curry._2(f, key, data); + let key = param.key; + let data = param.data; + let next = param.next; + let data$1 = Curry._2(f, key, data); if (data$1 !== undefined) { if (typeof prec !== "object") { Caml_array.set(h.data, i, param); @@ -508,13 +508,13 @@ function filter_map_inplace_bucket(f, h, i, _prec, _param) { } function filter_map_inplace(f, h) { - var d = h.data; - var old_trav = h.initial_size < 0; + let d = h.data; + let old_trav = h.initial_size < 0; if (!old_trav) { flip_ongoing_traversal(h); } try { - for(var i = 0 ,i_finish = d.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = d.length; i < i_finish; ++i){ filter_map_inplace_bucket(f, h, i, "Empty", Caml_array.get(h.data, i)); } return; @@ -529,29 +529,29 @@ function filter_map_inplace(f, h) { } function fold(f, h, init) { - var do_bucket = function (_b, _accu) { + let do_bucket = function (_b, _accu) { while(true) { - var accu = _accu; - var b = _b; + let accu = _accu; + let b = _b; if (typeof b !== "object") { return accu; } - var key = b.key; - var data = b.data; - var next = b.next; + let key = b.key; + let data = b.data; + let next = b.next; _accu = Curry._3(f, key, data, accu); _b = next; continue ; }; }; - var old_trav = h.initial_size < 0; + let old_trav = h.initial_size < 0; if (!old_trav) { flip_ongoing_traversal(h); } try { - var d = h.data; - var accu = init; - for(var i = 0 ,i_finish = d.length; i < i_finish; ++i){ + let d = h.data; + let accu = init; + for(let i = 0 ,i_finish = d.length; i < i_finish; ++i){ accu = do_bucket(Caml_array.get(d, i), accu); } if (!old_trav) { @@ -570,12 +570,12 @@ function fold(f, h, init) { function bucket_length(_accu, _param) { while(true) { - var param = _param; - var accu = _accu; + let param = _param; + let accu = _accu; if (typeof param !== "object") { return accu; } - var next = param.next; + let next = param.next; _param = next; _accu = accu + 1 | 0; continue ; @@ -583,12 +583,12 @@ function bucket_length(_accu, _param) { } function stats(h) { - var mbl = $$Array.fold_left((function (m, b) { + let mbl = $$Array.fold_left((function (m, b) { return Caml.int_max(m, bucket_length(0, b)); }), 0, h.data); - var histo = Caml_array.make(mbl + 1 | 0, 0); + let histo = Caml_array.make(mbl + 1 | 0, 0); $$Array.iter((function (b) { - var l = bucket_length(0, b); + let l = bucket_length(0, b); Caml_array.set(histo, l, Caml_array.get(histo, l) + 1 | 0); }), h.data); return { @@ -600,12 +600,12 @@ function stats(h) { } function MakeSeeded(H) { - var key_index = function (h, key) { + let key_index = function (h, key) { return Curry._2(H.hash, h.seed, key) & (h.data.length - 1 | 0); }; - var add = function (h, key, data) { - var i = key_index(h, key); - var bucket = { + let add = function (h, key, data) { + let i = key_index(h, key); + let bucket = { TAG: "Cons", key: key, data: data, @@ -618,18 +618,18 @@ function MakeSeeded(H) { } }; - var remove = function (h, key) { - var i = key_index(h, key); - var _prec = "Empty"; - var _param = Caml_array.get(h.data, i); + let remove = function (h, key) { + let i = key_index(h, key); + let _prec = "Empty"; + let _param = Caml_array.get(h.data, i); while(true) { - var param = _param; - var prec = _prec; + let param = _param; + let prec = _prec; if (typeof param !== "object") { return; } - var k = param.key; - var next = param.next; + let k = param.key; + let next = param.next; if (Curry._2(H.equal, k, key)) { h.size = h.size - 1 | 0; if (typeof prec !== "object") { @@ -644,17 +644,17 @@ function MakeSeeded(H) { continue ; }; }; - var find = function (h, key) { - var match = Caml_array.get(h.data, key_index(h, key)); + let find = function (h, key) { + let match = Caml_array.get(h.data, key_index(h, key)); if (typeof match !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var k1 = match.key; - var d1 = match.data; - var next1 = match.next; + let k1 = match.key; + let d1 = match.data; + let next1 = match.next; if (Curry._2(H.equal, key, k1)) { return d1; } @@ -664,9 +664,9 @@ function MakeSeeded(H) { Error: new Error() }; } - var k2 = next1.key; - var d2 = next1.data; - var next2 = next1.next; + let k2 = next1.key; + let d2 = next1.data; + let next2 = next1.next; if (Curry._2(H.equal, key, k2)) { return d2; } @@ -676,24 +676,24 @@ function MakeSeeded(H) { Error: new Error() }; } - var k3 = next2.key; - var d3 = next2.data; - var next3 = next2.next; + let k3 = next2.key; + let d3 = next2.data; + let next3 = next2.next; if (Curry._2(H.equal, key, k3)) { return d3; } else { - var _param = next3; + let _param = next3; while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var k = param.key; - var data = param.data; - var next = param.next; + let k = param.key; + let data = param.data; + let next = param.next; if (Curry._2(H.equal, key, k)) { return data; } @@ -702,44 +702,44 @@ function MakeSeeded(H) { }; } }; - var find_opt = function (h, key) { - var match = Caml_array.get(h.data, key_index(h, key)); + let find_opt = function (h, key) { + let match = Caml_array.get(h.data, key_index(h, key)); if (typeof match !== "object") { return; } - var k1 = match.key; - var d1 = match.data; - var next1 = match.next; + let k1 = match.key; + let d1 = match.data; + let next1 = match.next; if (Curry._2(H.equal, key, k1)) { return Caml_option.some(d1); } if (typeof next1 !== "object") { return; } - var k2 = next1.key; - var d2 = next1.data; - var next2 = next1.next; + let k2 = next1.key; + let d2 = next1.data; + let next2 = next1.next; if (Curry._2(H.equal, key, k2)) { return Caml_option.some(d2); } if (typeof next2 !== "object") { return; } - var k3 = next2.key; - var d3 = next2.data; - var next3 = next2.next; + let k3 = next2.key; + let d3 = next2.data; + let next3 = next2.next; if (Curry._2(H.equal, key, k3)) { return Caml_option.some(d3); } else { - var _param = next3; + let _param = next3; while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var k = param.key; - var data = param.data; - var next = param.next; + let k = param.key; + let data = param.data; + let next = param.next; if (Curry._2(H.equal, key, k)) { return Caml_option.some(data); } @@ -748,16 +748,16 @@ function MakeSeeded(H) { }; } }; - var find_all = function (h, key) { - var find_in_bucket = function (_param) { + let find_all = function (h, key) { + let find_in_bucket = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return /* [] */0; } - var k = param.key; - var d = param.data; - var next = param.next; + let k = param.key; + let d = param.data; + let next = param.next; if (Curry._2(H.equal, k, key)) { return { hd: d, @@ -770,14 +770,14 @@ function MakeSeeded(H) { }; return find_in_bucket(Caml_array.get(h.data, key_index(h, key))); }; - var replace_bucket = function (key, data, _param) { + let replace_bucket = function (key, data, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return true; } - var k = param.key; - var next = param.next; + let k = param.key; + let next = param.next; if (Curry._2(H.equal, k, key)) { param.key = key; param.data = data; @@ -787,9 +787,9 @@ function MakeSeeded(H) { continue ; }; }; - var replace = function (h, key, data) { - var i = key_index(h, key); - var l = Caml_array.get(h.data, i); + let replace = function (h, key, data) { + let i = key_index(h, key); + let l = Caml_array.get(h.data, i); if (replace_bucket(key, data, l)) { Caml_array.set(h.data, i, { TAG: "Cons", @@ -806,15 +806,15 @@ function MakeSeeded(H) { } }; - var mem = function (h, key) { - var _param = Caml_array.get(h.data, key_index(h, key)); + let mem = function (h, key) { + let _param = Caml_array.get(h.data, key_index(h, key)); while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } - var k = param.key; - var next = param.next; + let k = param.key; + let next = param.next; if (Curry._2(H.equal, k, key)) { return true; } @@ -843,13 +843,13 @@ function MakeSeeded(H) { } function Make(H) { - var equal = H.equal; - var key_index = function (h, key) { + let equal = H.equal; + let key_index = function (h, key) { return Curry._1(H.hash, key) & (h.data.length - 1 | 0); }; - var add = function (h, key, data) { - var i = key_index(h, key); - var bucket = { + let add = function (h, key, data) { + let i = key_index(h, key); + let bucket = { TAG: "Cons", key: key, data: data, @@ -862,18 +862,18 @@ function Make(H) { } }; - var remove = function (h, key) { - var i = key_index(h, key); - var _prec = "Empty"; - var _param = Caml_array.get(h.data, i); + let remove = function (h, key) { + let i = key_index(h, key); + let _prec = "Empty"; + let _param = Caml_array.get(h.data, i); while(true) { - var param = _param; - var prec = _prec; + let param = _param; + let prec = _prec; if (typeof param !== "object") { return; } - var k = param.key; - var next = param.next; + let k = param.key; + let next = param.next; if (Curry._2(equal, k, key)) { h.size = h.size - 1 | 0; if (typeof prec !== "object") { @@ -888,17 +888,17 @@ function Make(H) { continue ; }; }; - var find = function (h, key) { - var match = Caml_array.get(h.data, key_index(h, key)); + let find = function (h, key) { + let match = Caml_array.get(h.data, key_index(h, key)); if (typeof match !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var k1 = match.key; - var d1 = match.data; - var next1 = match.next; + let k1 = match.key; + let d1 = match.data; + let next1 = match.next; if (Curry._2(equal, key, k1)) { return d1; } @@ -908,9 +908,9 @@ function Make(H) { Error: new Error() }; } - var k2 = next1.key; - var d2 = next1.data; - var next2 = next1.next; + let k2 = next1.key; + let d2 = next1.data; + let next2 = next1.next; if (Curry._2(equal, key, k2)) { return d2; } @@ -920,24 +920,24 @@ function Make(H) { Error: new Error() }; } - var k3 = next2.key; - var d3 = next2.data; - var next3 = next2.next; + let k3 = next2.key; + let d3 = next2.data; + let next3 = next2.next; if (Curry._2(equal, key, k3)) { return d3; } else { - var _param = next3; + let _param = next3; while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var k = param.key; - var data = param.data; - var next = param.next; + let k = param.key; + let data = param.data; + let next = param.next; if (Curry._2(equal, key, k)) { return data; } @@ -946,44 +946,44 @@ function Make(H) { }; } }; - var find_opt = function (h, key) { - var match = Caml_array.get(h.data, key_index(h, key)); + let find_opt = function (h, key) { + let match = Caml_array.get(h.data, key_index(h, key)); if (typeof match !== "object") { return; } - var k1 = match.key; - var d1 = match.data; - var next1 = match.next; + let k1 = match.key; + let d1 = match.data; + let next1 = match.next; if (Curry._2(equal, key, k1)) { return Caml_option.some(d1); } if (typeof next1 !== "object") { return; } - var k2 = next1.key; - var d2 = next1.data; - var next2 = next1.next; + let k2 = next1.key; + let d2 = next1.data; + let next2 = next1.next; if (Curry._2(equal, key, k2)) { return Caml_option.some(d2); } if (typeof next2 !== "object") { return; } - var k3 = next2.key; - var d3 = next2.data; - var next3 = next2.next; + let k3 = next2.key; + let d3 = next2.data; + let next3 = next2.next; if (Curry._2(equal, key, k3)) { return Caml_option.some(d3); } else { - var _param = next3; + let _param = next3; while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var k = param.key; - var data = param.data; - var next = param.next; + let k = param.key; + let data = param.data; + let next = param.next; if (Curry._2(equal, key, k)) { return Caml_option.some(data); } @@ -992,16 +992,16 @@ function Make(H) { }; } }; - var find_all = function (h, key) { - var find_in_bucket = function (_param) { + let find_all = function (h, key) { + let find_in_bucket = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return /* [] */0; } - var k = param.key; - var d = param.data; - var next = param.next; + let k = param.key; + let d = param.data; + let next = param.next; if (Curry._2(equal, k, key)) { return { hd: d, @@ -1014,14 +1014,14 @@ function Make(H) { }; return find_in_bucket(Caml_array.get(h.data, key_index(h, key))); }; - var replace_bucket = function (key, data, _param) { + let replace_bucket = function (key, data, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return true; } - var k = param.key; - var next = param.next; + let k = param.key; + let next = param.next; if (Curry._2(equal, k, key)) { param.key = key; param.data = data; @@ -1031,9 +1031,9 @@ function Make(H) { continue ; }; }; - var replace = function (h, key, data) { - var i = key_index(h, key); - var l = Caml_array.get(h.data, i); + let replace = function (h, key, data) { + let i = key_index(h, key); + let l = Caml_array.get(h.data, i); if (replace_bucket(key, data, l)) { Caml_array.set(h.data, i, { TAG: "Cons", @@ -1050,15 +1050,15 @@ function Make(H) { } }; - var mem = function (h, key) { - var _param = Caml_array.get(h.data, key_index(h, key)); + let mem = function (h, key) { + let _param = Caml_array.get(h.data, key_index(h, key)); while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } - var k = param.key; - var next = param.next; + let k = param.key; + let next = param.next; if (Curry._2(equal, k, key)) { return true; } @@ -1066,7 +1066,7 @@ function Make(H) { continue ; }; }; - var create$1 = function (sz) { + let create$1 = function (sz) { return create(false, sz); }; return { @@ -1089,7 +1089,7 @@ function Make(H) { }; } -var seeded_hash_param = Caml_hash.hash; +let seeded_hash_param = Caml_hash.hash; exports.create = create; exports.clear = clear; diff --git a/lib/js/hashtblLabels.js b/lib/js/hashtblLabels.js index bde4c5f647..ea6f6504c1 100644 --- a/lib/js/hashtblLabels.js +++ b/lib/js/hashtblLabels.js @@ -1,11 +1,11 @@ 'use strict'; -var Curry = require("./curry.js"); -var Hashtbl = require("./hashtbl.js"); +let Curry = require("./curry.js"); +let Hashtbl = require("./hashtbl.js"); -var add = Hashtbl.add; +let add = Hashtbl.add; -var replace = Hashtbl.replace; +let replace = Hashtbl.replace; function iter(f, tbl) { Hashtbl.iter(Curry.__2(f), tbl); @@ -20,21 +20,21 @@ function fold(f, tbl, init) { } function MakeSeeded(H) { - var include = Hashtbl.MakeSeeded(H); - var add = include.add; - var replace = include.replace; - var iter = include.iter; - var filter_map_inplace = include.filter_map_inplace; - var fold = include.fold; - var add$1 = Curry.__3(add); - var replace$1 = Curry.__3(replace); - var iter$1 = function (f, tbl) { + let include = Hashtbl.MakeSeeded(H); + let add = include.add; + let replace = include.replace; + let iter = include.iter; + let filter_map_inplace = include.filter_map_inplace; + let fold = include.fold; + let add$1 = Curry.__3(add); + let replace$1 = Curry.__3(replace); + let iter$1 = function (f, tbl) { Curry._2(iter, Curry.__2(f), tbl); }; - var filter_map_inplace$1 = function (f, tbl) { + let filter_map_inplace$1 = function (f, tbl) { Curry._2(filter_map_inplace, Curry.__2(f), tbl); }; - var fold$1 = function (f, tbl, init) { + let fold$1 = function (f, tbl, init) { return Curry._3(fold, Curry.__3(f), tbl, init); }; return { @@ -58,33 +58,33 @@ function MakeSeeded(H) { } function Make(H) { - var hash = function (_seed, x) { + let hash = function (_seed, x) { return Curry._1(H.hash, x); }; - var H_equal = H.equal; - var H$1 = { + let H_equal = H.equal; + let H$1 = { equal: H_equal, hash: hash }; - var include = Hashtbl.MakeSeeded(H$1); - var create = include.create; - var add = include.add; - var replace = include.replace; - var iter = include.iter; - var filter_map_inplace = include.filter_map_inplace; - var fold = include.fold; - var add$1 = Curry.__3(add); - var replace$1 = Curry.__3(replace); - var iter$1 = function (f, tbl) { + let include = Hashtbl.MakeSeeded(H$1); + let create = include.create; + let add = include.add; + let replace = include.replace; + let iter = include.iter; + let filter_map_inplace = include.filter_map_inplace; + let fold = include.fold; + let add$1 = Curry.__3(add); + let replace$1 = Curry.__3(replace); + let iter$1 = function (f, tbl) { Curry._2(iter, Curry.__2(f), tbl); }; - var filter_map_inplace$1 = function (f, tbl) { + let filter_map_inplace$1 = function (f, tbl) { Curry._2(filter_map_inplace, Curry.__2(f), tbl); }; - var fold$1 = function (f, tbl, init) { + let fold$1 = function (f, tbl, init) { return Curry._3(fold, Curry.__3(f), tbl, init); }; - var create$1 = function (sz) { + let create$1 = function (sz) { return Curry._2(create, false, sz); }; return { @@ -107,39 +107,39 @@ function Make(H) { }; } -var create = Hashtbl.create; +let create = Hashtbl.create; -var clear = Hashtbl.clear; +let clear = Hashtbl.clear; -var reset = Hashtbl.reset; +let reset = Hashtbl.reset; -var copy = Hashtbl.copy; +let copy = Hashtbl.copy; -var find = Hashtbl.find; +let find = Hashtbl.find; -var find_opt = Hashtbl.find_opt; +let find_opt = Hashtbl.find_opt; -var find_all = Hashtbl.find_all; +let find_all = Hashtbl.find_all; -var mem = Hashtbl.mem; +let mem = Hashtbl.mem; -var remove = Hashtbl.remove; +let remove = Hashtbl.remove; -var length = Hashtbl.length; +let length = Hashtbl.length; -var randomize = Hashtbl.randomize; +let randomize = Hashtbl.randomize; -var is_randomized = Hashtbl.is_randomized; +let is_randomized = Hashtbl.is_randomized; -var stats = Hashtbl.stats; +let stats = Hashtbl.stats; -var hash = Hashtbl.hash; +let hash = Hashtbl.hash; -var seeded_hash = Hashtbl.seeded_hash; +let seeded_hash = Hashtbl.seeded_hash; -var hash_param = Hashtbl.hash_param; +let hash_param = Hashtbl.hash_param; -var seeded_hash_param = Hashtbl.seeded_hash_param; +let seeded_hash_param = Hashtbl.seeded_hash_param; exports.create = create; exports.clear = clear; diff --git a/lib/js/int32.js b/lib/js/int32.js index d07dc971d4..e9e88ebe44 100644 --- a/lib/js/int32.js +++ b/lib/js/int32.js @@ -1,8 +1,8 @@ 'use strict'; -var Caml = require("./caml.js"); -var Caml_format = require("./caml_format.js"); -var Caml_js_exceptions = require("./caml_js_exceptions.js"); +let Caml = require("./caml.js"); +let Caml_format = require("./caml_format.js"); +let Caml_js_exceptions = require("./caml_js_exceptions.js"); function succ(n) { return n + 1 | 0; @@ -33,7 +33,7 @@ function of_string_opt(s) { return Caml_format.int_of_string(s); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Failure") { return; } @@ -41,21 +41,21 @@ function of_string_opt(s) { } } -var compare = Caml.int_compare; +let compare = Caml.int_compare; function equal(x, y) { return x === y; } -var zero = 0; +let zero = 0; -var one = 1; +let one = 1; -var minus_one = -1; +let minus_one = -1; -var max_int = 2147483647; +let max_int = 2147483647; -var min_int = -2147483648; +let min_int = -2147483648; exports.zero = zero; exports.one = one; diff --git a/lib/js/int64.js b/lib/js/int64.js index 962606c64c..bf669e50d0 100644 --- a/lib/js/int64.js +++ b/lib/js/int64.js @@ -1,9 +1,9 @@ 'use strict'; -var Caml = require("./caml.js"); -var Caml_int64 = require("./caml_int64.js"); -var Caml_format = require("./caml_format.js"); -var Caml_js_exceptions = require("./caml_js_exceptions.js"); +let Caml = require("./caml.js"); +let Caml_int64 = require("./caml_int64.js"); +let Caml_format = require("./caml_format.js"); +let Caml_js_exceptions = require("./caml_js_exceptions.js"); function pred(n) { return Caml_int64.sub(n, Caml_int64.one); @@ -26,7 +26,7 @@ function of_string_opt(s) { return Caml_format.int64_of_string(s); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Failure") { return; } @@ -34,23 +34,23 @@ function of_string_opt(s) { } } -var compare = Caml_int64.compare; +let compare = Caml_int64.compare; -var equal = Caml_int64.equal; +let equal = Caml_int64.equal; -var zero = Caml_int64.zero; +let zero = Caml_int64.zero; -var one = Caml_int64.one; +let one = Caml_int64.one; -var minus_one = Caml_int64.neg_one; +let minus_one = Caml_int64.neg_one; -var succ = Caml_int64.succ; +let succ = Caml_int64.succ; -var max_int = Caml_int64.max_int; +let max_int = Caml_int64.max_int; -var min_int = Caml_int64.min_int; +let min_int = Caml_int64.min_int; -var to_string = Caml_int64.to_string; +let to_string = Caml_int64.to_string; exports.zero = zero; exports.one = one; diff --git a/lib/js/js.js b/lib/js/js.js index 527d6d9dcb..b1b67b66fd 100644 --- a/lib/js/js.js +++ b/lib/js/js.js @@ -1,79 +1,79 @@ 'use strict'; -var Internal = {}; +let Internal = {}; -var MapperRt; +let MapperRt; -var Null; +let Null; -var Undefined; +let Undefined; -var Nullable; +let Nullable; -var Null_undefined; +let Null_undefined; -var Exn; +let Exn; -var $$Array; +let $$Array; -var Array2; +let Array2; -var $$String; +let $$String; -var String2; +let String2; -var Re; +let Re; -var $$Promise; +let $$Promise; -var Promise2; +let Promise2; -var $$Date; +let $$Date; -var Dict; +let Dict; -var Global; +let Global; -var Json; +let Json; -var $$Math; +let $$Math; -var Obj; +let Obj; -var Typed_array; +let Typed_array; -var TypedArray2; +let TypedArray2; -var Types; +let Types; -var Float; +let Float; -var Int; +let Int; -var $$BigInt; +let $$BigInt; -var $$File; +let $$File; -var $$Blob; +let $$Blob; -var $$Option; +let $$Option; -var Result; +let Result; -var List; +let List; -var Vector; +let Vector; -var Console; +let Console; -var $$Set; +let $$Set; -var $$WeakSet; +let $$WeakSet; -var $$Map; +let $$Map; -var $$WeakMap; +let $$WeakMap; exports.MapperRt = MapperRt; exports.Internal = Internal; diff --git a/lib/js/js_OO.js b/lib/js/js_OO.js index 4dd0a5e63d..d7a97adee6 100644 --- a/lib/js/js_OO.js +++ b/lib/js/js_OO.js @@ -1,7 +1,7 @@ 'use strict'; -var Callback = {}; +let Callback = {}; exports.Callback = Callback; /* No side effect */ diff --git a/lib/js/js_array.js b/lib/js/js_array.js index 345f904567..8da31ce1cf 100644 --- a/lib/js/js_array.js +++ b/lib/js/js_array.js @@ -1,8 +1,8 @@ 'use strict'; -var Curry = require("./curry.js"); -var Caml_option = require("./caml_option.js"); -var Caml_splice_call = require("./caml_splice_call.js"); +let Curry = require("./curry.js"); +let Caml_option = require("./caml_option.js"); +let Caml_splice_call = require("./caml_splice_call.js"); function copyWithin(to_, obj) { return obj.copyWithin(to_); diff --git a/lib/js/js_dict.js b/lib/js/js_dict.js index 4dfafed9ff..de36932d44 100644 --- a/lib/js/js_dict.js +++ b/lib/js/js_dict.js @@ -1,6 +1,6 @@ 'use strict'; -var Caml_option = require("./caml_option.js"); +let Caml_option = require("./caml_option.js"); function get(dict, k) { if ((k in dict)) { @@ -9,16 +9,16 @@ function get(dict, k) { } -var unsafeDeleteKey = (function (dict,key){ +let unsafeDeleteKey = (function (dict,key){ delete dict[key]; }); function entries(dict) { - var keys = Object.keys(dict); - var l = keys.length; - var values = new Array(l); - for(var i = 0; i < l; ++i){ - var key = keys[i]; + let keys = Object.keys(dict); + let l = keys.length; + let values = new Array(l); + for(let i = 0; i < l; ++i){ + let key = keys[i]; values[i] = [ key, dict[key] @@ -28,24 +28,24 @@ function entries(dict) { } function values(dict) { - var keys = Object.keys(dict); - var l = keys.length; - var values$1 = new Array(l); - for(var i = 0; i < l; ++i){ + let keys = Object.keys(dict); + let l = keys.length; + let values$1 = new Array(l); + for(let i = 0; i < l; ++i){ values$1[i] = dict[keys[i]]; } return values$1; } function fromList(entries) { - var dict = {}; - var _x = entries; + let dict = {}; + let _x = entries; while(true) { - var x = _x; + let x = _x; if (!x) { return dict; } - var match = x.hd; + let match = x.hd; dict[match[0]] = match[1]; _x = x.tl; continue ; @@ -53,21 +53,21 @@ function fromList(entries) { } function fromArray(entries) { - var dict = {}; - var l = entries.length; - for(var i = 0; i < l; ++i){ - var match = entries[i]; + let dict = {}; + let l = entries.length; + for(let i = 0; i < l; ++i){ + let match = entries[i]; dict[match[0]] = match[1]; } return dict; } function map(f, source) { - var target = {}; - var keys = Object.keys(source); - var l = keys.length; - for(var i = 0; i < l; ++i){ - var key = keys[i]; + let target = {}; + let keys = Object.keys(source); + let l = keys.length; + for(let i = 0; i < l; ++i){ + let key = keys[i]; target[key] = f(source[key]); } return target; diff --git a/lib/js/js_exn.js b/lib/js/js_exn.js index cc85c73d12..34b90db044 100644 --- a/lib/js/js_exn.js +++ b/lib/js/js_exn.js @@ -29,7 +29,7 @@ function raiseUriError(str) { throw new URIError(str); } -var $$Error$1 = "JsError"; +let $$Error$1 = "JsError"; exports.$$Error = $$Error$1; exports.raiseError = raiseError; diff --git a/lib/js/js_int.js b/lib/js/js_int.js index 36656ac46f..95dcd37e77 100644 --- a/lib/js/js_int.js +++ b/lib/js/js_int.js @@ -5,9 +5,9 @@ function equal(x, y) { return x === y; } -var max = 2147483647; +let max = 2147483647; -var min = -2147483648; +let min = -2147483648; exports.equal = equal; exports.max = max; diff --git a/lib/js/js_json.js b/lib/js/js_json.js index 77e1f0b083..b214ef1e15 100644 --- a/lib/js/js_json.js +++ b/lib/js/js_json.js @@ -1,10 +1,10 @@ 'use strict'; -var Kind = {}; +let Kind = {}; function classify(x) { - var ty = typeof x; + let ty = typeof x; if (ty === "string") { return { TAG: "JSONString", @@ -100,7 +100,7 @@ function decodeNull(json) { } -var patch = (function (json) { +let patch = (function (json) { var x = [json]; var q = [{ kind: 0, i: 0, parent: x }]; while (q.length !== 0) { diff --git a/lib/js/js_list.js b/lib/js/js_list.js index 31658a3d96..61f262ea4d 100644 --- a/lib/js/js_list.js +++ b/lib/js/js_list.js @@ -1,14 +1,14 @@ 'use strict'; -var Js_vector = require("./js_vector.js"); -var Caml_option = require("./caml_option.js"); +let Js_vector = require("./js_vector.js"); +let Caml_option = require("./caml_option.js"); function length(l) { - var _len = 0; - var _x = l; + let _len = 0; + let _x = l; while(true) { - var x = _x; - var len = _len; + let x = _x; + let len = _len; if (!x) { return len; } @@ -47,11 +47,11 @@ function nth(l, n) { if (n < 0) { return; } - var _l = l; - var _n = n; + let _l = l; + let _n = n; while(true) { - var n$1 = _n; - var l$1 = _l; + let n$1 = _n; + let l$1 = _l; if (!l$1) { return; } @@ -66,8 +66,8 @@ function nth(l, n) { function revAppend(_l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { return l2; } @@ -86,8 +86,8 @@ function rev(l) { function mapRevAux(f, _acc, _ls) { while(true) { - var ls = _ls; - var acc = _acc; + let ls = _ls; + let acc = _acc; if (!ls) { return acc; } @@ -110,7 +110,7 @@ function map(f, ls) { function iter(f, _x) { while(true) { - var x = _x; + let x = _x; if (!x) { return; } @@ -121,11 +121,11 @@ function iter(f, _x) { } function iteri(f, l) { - var _i = 0; - var _x = l; + let _i = 0; + let _x = l; while(true) { - var x = _x; - var i = _i; + let x = _x; + let i = _i; if (!x) { return; } @@ -138,8 +138,8 @@ function iteri(f, l) { function foldLeft(f, _accu, _l) { while(true) { - var l = _l; - var accu = _accu; + let l = _l; + let accu = _accu; if (!l) { return accu; } @@ -151,8 +151,8 @@ function foldLeft(f, _accu, _l) { function tailLoop(f, _acc, _x) { while(true) { - var x = _x; - var acc = _acc; + let x = _x; + let acc = _acc; if (!x) { return acc; } @@ -163,12 +163,12 @@ function tailLoop(f, _acc, _x) { } function foldRight(f, l, init) { - var loop = function (n, x) { + let loop = function (n, x) { if (!x) { return init; } - var t = x.tl; - var h = x.hd; + let t = x.tl; + let h = x.hd; if (n < 1000) { return f(h, loop(n + 1 | 0, t)); } else { @@ -179,11 +179,11 @@ function foldRight(f, l, init) { } function flatten(lx) { - var _acc = /* [] */0; - var _lx = lx; + let _acc = /* [] */0; + let _lx = lx; while(true) { - var lx$1 = _lx; - var acc = _acc; + let lx$1 = _lx; + let acc = _acc; if (!lx$1) { return revAppend(acc, /* [] */0); } @@ -195,13 +195,13 @@ function flatten(lx) { function filterRevAux(f, _acc, _xs) { while(true) { - var xs = _xs; - var acc = _acc; + let xs = _xs; + let acc = _acc; if (!xs) { return acc; } - var ys = xs.tl; - var y = xs.hd; + let ys = xs.tl; + let y = xs.hd; if (f(y)) { _xs = ys; _acc = { @@ -221,13 +221,13 @@ function filter(f, xs) { function filterMapRevAux(f, _acc, _xs) { while(true) { - var xs = _xs; - var acc = _acc; + let xs = _xs; + let acc = _acc; if (!xs) { return acc; } - var ys = xs.tl; - var z = f(xs.hd); + let ys = xs.tl; + let z = f(xs.hd); if (z !== undefined) { _xs = ys; _acc = { @@ -246,11 +246,11 @@ function filterMap(f, xs) { } function countBy(f, xs) { - var _acc = 0; - var _xs = xs; + let _acc = 0; + let _xs = xs; while(true) { - var xs$1 = _xs; - var acc = _acc; + let xs$1 = _xs; + let acc = _acc; if (!xs$1) { return acc; } @@ -268,12 +268,12 @@ function toVector(xs) { if (!xs) { return []; } - var a = new Array(length(xs)); - var _i = 0; - var _x = xs; + let a = new Array(length(xs)); + let _i = 0; + let _x = xs; while(true) { - var x = _x; - var i = _i; + let x = _x; + let i = _i; if (!x) { return a; } @@ -286,8 +286,8 @@ function toVector(xs) { function equal(cmp, _xs, _ys) { while(true) { - var ys = _ys; - var xs = _xs; + let ys = _ys; + let xs = _xs; if (!xs) { if (ys) { return false; diff --git a/lib/js/js_mapperRt.js b/lib/js/js_mapperRt.js index 137cb6509d..1e2b8e158f 100644 --- a/lib/js/js_mapperRt.js +++ b/lib/js/js_mapperRt.js @@ -12,13 +12,13 @@ function raiseWhenNotFound(x) { } function fromInt(len, xs, $$enum) { - var _i = 0; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === len) { return; } - var k = xs[i]; + let k = xs[i]; if (k === $$enum) { return i; } @@ -28,16 +28,16 @@ function fromInt(len, xs, $$enum) { } function fromIntAssert(len, xs, $$enum) { - var _i = 0; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === len) { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var k = xs[i]; + let k = xs[i]; if (k === $$enum) { return i; } diff --git a/lib/js/js_math.js b/lib/js/js_math.js index 6f90ef46d9..84fa103ab9 100644 --- a/lib/js/js_math.js +++ b/lib/js/js_math.js @@ -1,6 +1,6 @@ 'use strict'; -var Js_int = require("./js_int.js"); +let Js_int = require("./js_int.js"); function unsafe_ceil(prim) { return Math.ceil(prim); @@ -34,9 +34,9 @@ function random_int(min, max) { return floor_int(Math.random() * (max - min | 0)) + min | 0; } -var ceil = ceil_int; +let ceil = ceil_int; -var floor = floor_int; +let floor = floor_int; exports.unsafe_ceil = unsafe_ceil; exports.ceil_int = ceil_int; diff --git a/lib/js/js_null.js b/lib/js/js_null.js index de96799a6a..682a2a31a5 100644 --- a/lib/js/js_null.js +++ b/lib/js/js_null.js @@ -1,6 +1,6 @@ 'use strict'; -var Caml_option = require("./caml_option.js"); +let Caml_option = require("./caml_option.js"); function test(x) { return x === null; @@ -36,7 +36,7 @@ function fromOption(x) { } } -var from_opt = fromOption; +let from_opt = fromOption; exports.test = test; exports.getExn = getExn; diff --git a/lib/js/js_null_undefined.js b/lib/js/js_null_undefined.js index 7e28e7eaeb..334fe5e479 100644 --- a/lib/js/js_null_undefined.js +++ b/lib/js/js_null_undefined.js @@ -1,6 +1,6 @@ 'use strict'; -var Caml_option = require("./caml_option.js"); +let Caml_option = require("./caml_option.js"); function bind(x, f) { if (x == null) { @@ -24,7 +24,7 @@ function fromOption(x) { } -var from_opt = fromOption; +let from_opt = fromOption; exports.bind = bind; exports.iter = iter; diff --git a/lib/js/js_option.js b/lib/js/js_option.js index 2058dd53ce..5a513afd29 100644 --- a/lib/js/js_option.js +++ b/lib/js/js_option.js @@ -1,6 +1,6 @@ 'use strict'; -var Caml_option = require("./caml_option.js"); +let Caml_option = require("./caml_option.js"); function some(x) { return Caml_option.some(x); @@ -67,7 +67,7 @@ function filter(f, x) { if (x === undefined) { return; } - var x$1 = Caml_option.valFromOption(x); + let x$1 = Caml_option.valFromOption(x); if (f(x$1)) { return Caml_option.some(x$1); } @@ -84,7 +84,7 @@ function firstSome(a, b) { } } -var $$default = getWithDefault; +let $$default = getWithDefault; exports.some = some; exports.isSome = isSome; diff --git a/lib/js/js_promise.js b/lib/js/js_promise.js index 12ae5aeaeb..41895787db 100644 --- a/lib/js/js_promise.js +++ b/lib/js/js_promise.js @@ -1,6 +1,6 @@ 'use strict'; -var Curry = require("./curry.js"); +let Curry = require("./curry.js"); function then_(arg1, obj) { return obj.then(Curry.__1(arg1)); diff --git a/lib/js/js_promise2.js b/lib/js/js_promise2.js index 7aa2c0fe05..e5b902e114 100644 --- a/lib/js/js_promise2.js +++ b/lib/js/js_promise2.js @@ -1,11 +1,11 @@ 'use strict'; -var then = (function(p, cont) { +let then = (function(p, cont) { return Promise.resolve(p).then(cont) }); -var $$catch = (function(p, cont) { +let $$catch = (function(p, cont) { return Promise.resolve(p).catch(cont) }); diff --git a/lib/js/js_string.js b/lib/js/js_string.js index 0af2c20c3c..74854d2836 100644 --- a/lib/js/js_string.js +++ b/lib/js/js_string.js @@ -1,8 +1,8 @@ 'use strict'; -var Curry = require("./curry.js"); -var Caml_option = require("./caml_option.js"); -var Caml_splice_call = require("./caml_splice_call.js"); +let Curry = require("./curry.js"); +let Caml_option = require("./caml_option.js"); +let Caml_splice_call = require("./caml_splice_call.js"); function charAt(arg1, obj) { return obj.charAt(arg1); diff --git a/lib/js/js_typed_array.js b/lib/js/js_typed_array.js index e8df6ea6e6..cadb668ff9 100644 --- a/lib/js/js_typed_array.js +++ b/lib/js/js_typed_array.js @@ -9,7 +9,7 @@ function sliceFrom(arg1, obj) { return obj.slice(arg1); } -var $$ArrayBuffer = { +let $$ArrayBuffer = { slice: slice, sliceFrom: sliceFrom }; @@ -162,7 +162,7 @@ function somei(arg1, obj) { return obj.some(arg1); } -var $$Int8Array = { +let $$Int8Array = { setArray: setArray, setArrayOffset: setArrayOffset, copyWithin: copyWithin, @@ -350,7 +350,7 @@ function somei$1(arg1, obj) { return obj.some(arg1); } -var $$Uint8Array = { +let $$Uint8Array = { setArray: setArray$1, setArrayOffset: setArrayOffset$1, copyWithin: copyWithin$1, @@ -538,7 +538,7 @@ function somei$2(arg1, obj) { return obj.some(arg1); } -var $$Uint8ClampedArray = { +let $$Uint8ClampedArray = { setArray: setArray$2, setArrayOffset: setArrayOffset$2, copyWithin: copyWithin$2, @@ -726,7 +726,7 @@ function somei$3(arg1, obj) { return obj.some(arg1); } -var $$Int16Array = { +let $$Int16Array = { setArray: setArray$3, setArrayOffset: setArrayOffset$3, copyWithin: copyWithin$3, @@ -914,7 +914,7 @@ function somei$4(arg1, obj) { return obj.some(arg1); } -var $$Uint16Array = { +let $$Uint16Array = { setArray: setArray$4, setArrayOffset: setArrayOffset$4, copyWithin: copyWithin$4, @@ -1102,7 +1102,7 @@ function somei$5(arg1, obj) { return obj.some(arg1); } -var $$Int32Array = { +let $$Int32Array = { setArray: setArray$5, setArrayOffset: setArrayOffset$5, copyWithin: copyWithin$5, @@ -1290,7 +1290,7 @@ function somei$6(arg1, obj) { return obj.some(arg1); } -var $$Uint32Array = { +let $$Uint32Array = { setArray: setArray$6, setArrayOffset: setArrayOffset$6, copyWithin: copyWithin$6, @@ -1478,7 +1478,7 @@ function somei$7(arg1, obj) { return obj.some(arg1); } -var $$Float32Array = { +let $$Float32Array = { setArray: setArray$7, setArrayOffset: setArrayOffset$7, copyWithin: copyWithin$7, @@ -1666,7 +1666,7 @@ function somei$8(arg1, obj) { return obj.some(arg1); } -var $$Float64Array = { +let $$Float64Array = { setArray: setArray$8, setArrayOffset: setArrayOffset$8, copyWithin: copyWithin$8, @@ -1706,13 +1706,13 @@ var $$Float64Array = { somei: somei$8 }; -var $$DataView = {}; +let $$DataView = {}; -var Int32_array; +let Int32_array; -var Float32_array; +let Float32_array; -var Float64_array; +let Float64_array; exports.$$ArrayBuffer = $$ArrayBuffer; exports.$$Int8Array = $$Int8Array; diff --git a/lib/js/js_typed_array2.js b/lib/js/js_typed_array2.js index 73050c540d..a54929d49c 100644 --- a/lib/js/js_typed_array2.js +++ b/lib/js/js_typed_array2.js @@ -1,27 +1,27 @@ 'use strict'; -var $$ArrayBuffer = {}; +let $$ArrayBuffer = {}; -var $$Int8Array = {}; +let $$Int8Array = {}; -var $$Uint8Array = {}; +let $$Uint8Array = {}; -var $$Uint8ClampedArray = {}; +let $$Uint8ClampedArray = {}; -var $$Int16Array = {}; +let $$Int16Array = {}; -var $$Uint16Array = {}; +let $$Uint16Array = {}; -var $$Int32Array = {}; +let $$Int32Array = {}; -var $$Uint32Array = {}; +let $$Uint32Array = {}; -var $$Float32Array = {}; +let $$Float32Array = {}; -var $$Float64Array = {}; +let $$Float64Array = {}; -var $$DataView = {}; +let $$DataView = {}; exports.$$ArrayBuffer = $$ArrayBuffer; exports.$$Int8Array = $$Int8Array; diff --git a/lib/js/js_types.js b/lib/js/js_types.js index 3ddbc101ee..b279239d92 100644 --- a/lib/js/js_types.js +++ b/lib/js/js_types.js @@ -2,7 +2,7 @@ function classify(x) { - var ty = typeof x; + let ty = typeof x; if (ty === "undefined") { return "JSUndefined"; } else if (x === null) { diff --git a/lib/js/js_undefined.js b/lib/js/js_undefined.js index ae23e681cc..f67e1ec960 100644 --- a/lib/js/js_undefined.js +++ b/lib/js/js_undefined.js @@ -1,6 +1,6 @@ 'use strict'; -var Caml_option = require("./caml_option.js"); +let Caml_option = require("./caml_option.js"); function test(x) { return x === undefined; @@ -38,7 +38,7 @@ function fromOption(x) { } -var from_opt = fromOption; +let from_opt = fromOption; exports.test = test; exports.testAny = testAny; diff --git a/lib/js/js_vector.js b/lib/js/js_vector.js index 4273ab5d2d..059d447a54 100644 --- a/lib/js/js_vector.js +++ b/lib/js/js_vector.js @@ -2,10 +2,10 @@ function filterInPlace(p, a) { - var i = 0; - var j = 0; + let i = 0; + let j = 0; while(i < a.length) { - var v = a[i]; + let v = a[i]; if (p(v)) { a[j] = v; j = j + 1 | 0; @@ -28,23 +28,23 @@ function memByRef(x, xs) { } function iter(f, xs) { - for(var i = 0 ,i_finish = xs.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = xs.length; i < i_finish; ++i){ f(xs[i]); } } function iteri(f, a) { - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ f(i, a[i]); } } function toList(a) { - var _i = a.length - 1 | 0; - var _res = /* [] */0; + let _i = a.length - 1 | 0; + let _res = /* [] */0; while(true) { - var res = _res; - var i = _i; + let res = _res; + let i = _i; if (i < 0) { return res; } @@ -58,54 +58,54 @@ function toList(a) { } function init(n, f) { - var v = new Array(n); - for(var i = 0; i < n; ++i){ + let v = new Array(n); + for(let i = 0; i < n; ++i){ v[i] = f(i); } return v; } function copy(x) { - var len = x.length; - var b = new Array(len); - for(var i = 0; i < len; ++i){ + let len = x.length; + let b = new Array(len); + for(let i = 0; i < len; ++i){ b[i] = x[i]; } return b; } function map(f, a) { - var l = a.length; - var r = new Array(l); - for(var i = 0; i < l; ++i){ + let l = a.length; + let r = new Array(l); + for(let i = 0; i < l; ++i){ r[i] = f(a[i]); } return r; } function foldLeft(f, x, a) { - var r = x; - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + let r = x; + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ r = f(r, a[i]); } return r; } function foldRight(f, a, x) { - var r = x; - for(var i = a.length - 1 | 0; i >= 0; --i){ + let r = x; + for(let i = a.length - 1 | 0; i >= 0; --i){ r = f(a[i], r); } return r; } function mapi(f, a) { - var l = a.length; + let l = a.length; if (l === 0) { return []; } - var r = new Array(l); - for(var i = 0; i < l; ++i){ + let r = new Array(l); + for(let i = 0; i < l; ++i){ r[i] = f(i, a[i]); } return r; diff --git a/lib/js/jsxEventC.js b/lib/js/jsxEventC.js index d09731cc54..8570b3b8d5 100644 --- a/lib/js/jsxEventC.js +++ b/lib/js/jsxEventC.js @@ -5,37 +5,37 @@ function MakeEventWithType(Type) { return {}; } -var Synthetic = {}; +let Synthetic = {}; -var Clipboard = {}; +let Clipboard = {}; -var Composition = {}; +let Composition = {}; -var Keyboard = {}; +let Keyboard = {}; -var Focus = {}; +let Focus = {}; -var Form = {}; +let Form = {}; -var Mouse = {}; +let Mouse = {}; -var Pointer = {}; +let Pointer = {}; -var $$Selection = {}; +let $$Selection = {}; -var $$Touch = {}; +let $$Touch = {}; -var UI = {}; +let UI = {}; -var Wheel = {}; +let Wheel = {}; -var Media = {}; +let Media = {}; -var $$Image = {}; +let $$Image = {}; -var $$Animation = {}; +let $$Animation = {}; -var Transition = {}; +let Transition = {}; exports.MakeEventWithType = MakeEventWithType; exports.Synthetic = Synthetic; diff --git a/lib/js/jsxEventU.js b/lib/js/jsxEventU.js index d09731cc54..8570b3b8d5 100644 --- a/lib/js/jsxEventU.js +++ b/lib/js/jsxEventU.js @@ -5,37 +5,37 @@ function MakeEventWithType(Type) { return {}; } -var Synthetic = {}; +let Synthetic = {}; -var Clipboard = {}; +let Clipboard = {}; -var Composition = {}; +let Composition = {}; -var Keyboard = {}; +let Keyboard = {}; -var Focus = {}; +let Focus = {}; -var Form = {}; +let Form = {}; -var Mouse = {}; +let Mouse = {}; -var Pointer = {}; +let Pointer = {}; -var $$Selection = {}; +let $$Selection = {}; -var $$Touch = {}; +let $$Touch = {}; -var UI = {}; +let UI = {}; -var Wheel = {}; +let Wheel = {}; -var Media = {}; +let Media = {}; -var $$Image = {}; +let $$Image = {}; -var $$Animation = {}; +let $$Animation = {}; -var Transition = {}; +let Transition = {}; exports.MakeEventWithType = MakeEventWithType; exports.Synthetic = Synthetic; diff --git a/lib/js/jsxPPXReactSupportC.js b/lib/js/jsxPPXReactSupportC.js index e5416381cf..ec0aec1033 100644 --- a/lib/js/jsxPPXReactSupportC.js +++ b/lib/js/jsxPPXReactSupportC.js @@ -1,7 +1,7 @@ 'use strict'; -var React = require("react"); -var Caml_splice_call = require("./caml_splice_call.js"); +let React = require("react"); +let Caml_splice_call = require("./caml_splice_call.js"); function createElementWithKey(key, component, props) { return React.createElement(component, key !== undefined ? Object.assign({ @@ -19,7 +19,7 @@ function createElementVariadicWithKey(key, component, props, elements) { ]); } -var Jsx; +let Jsx; exports.Jsx = Jsx; exports.createElementWithKey = createElementWithKey; diff --git a/lib/js/jsxPPXReactSupportU.js b/lib/js/jsxPPXReactSupportU.js index e5416381cf..ec0aec1033 100644 --- a/lib/js/jsxPPXReactSupportU.js +++ b/lib/js/jsxPPXReactSupportU.js @@ -1,7 +1,7 @@ 'use strict'; -var React = require("react"); -var Caml_splice_call = require("./caml_splice_call.js"); +let React = require("react"); +let Caml_splice_call = require("./caml_splice_call.js"); function createElementWithKey(key, component, props) { return React.createElement(component, key !== undefined ? Object.assign({ @@ -19,7 +19,7 @@ function createElementVariadicWithKey(key, component, props, elements) { ]); } -var Jsx; +let Jsx; exports.Jsx = Jsx; exports.createElementWithKey = createElementWithKey; diff --git a/lib/js/lazy.js b/lib/js/lazy.js index eb345670db..4172877d98 100644 --- a/lib/js/lazy.js +++ b/lib/js/lazy.js @@ -1,7 +1,7 @@ 'use strict'; -var Curry = require("./curry.js"); -var CamlinternalLazy = require("./camlinternalLazy.js"); +let Curry = require("./curry.js"); +let CamlinternalLazy = require("./camlinternalLazy.js"); function from_fun(f) { return CamlinternalLazy.from_fun(function () { @@ -9,19 +9,19 @@ function from_fun(f) { }); } -var from_val = CamlinternalLazy.from_val; +let from_val = CamlinternalLazy.from_val; -var Undefined = CamlinternalLazy.Undefined; +let Undefined = CamlinternalLazy.Undefined; -var force_val = CamlinternalLazy.force_val; +let force_val = CamlinternalLazy.force_val; -var is_val = CamlinternalLazy.is_val; +let is_val = CamlinternalLazy.is_val; -var lazy_from_fun = from_fun; +let lazy_from_fun = from_fun; -var lazy_from_val = from_val; +let lazy_from_val = from_val; -var lazy_is_val = CamlinternalLazy.is_val; +let lazy_is_val = CamlinternalLazy.is_val; exports.Undefined = Undefined; exports.force_val = force_val; diff --git a/lib/js/lexing.js b/lib/js/lexing.js index 57d074252b..7e6fa564a9 100644 --- a/lib/js/lexing.js +++ b/lib/js/lexing.js @@ -1,16 +1,16 @@ 'use strict'; -var Bytes = require("./bytes.js"); -var Curry = require("./curry.js"); -var Caml_array = require("./caml_array.js"); -var Caml_bytes = require("./caml_bytes.js"); -var Caml_lexer = require("./caml_lexer.js"); +let Bytes = require("./bytes.js"); +let Curry = require("./curry.js"); +let Caml_array = require("./caml_array.js"); +let Caml_bytes = require("./caml_bytes.js"); +let Caml_lexer = require("./caml_lexer.js"); function engine(tbl, state, buf) { - var result = Caml_lexer.lex_engine(tbl, state, buf); + let result = Caml_lexer.lex_engine(tbl, state, buf); if (result >= 0) { buf.lex_start_p = buf.lex_curr_p; - var init = buf.lex_curr_p; + let init = buf.lex_curr_p; buf.lex_curr_p = { pos_fname: init.pos_fname, pos_lnum: init.pos_lnum, @@ -22,10 +22,10 @@ function engine(tbl, state, buf) { } function new_engine(tbl, state, buf) { - var result = Caml_lexer.new_lex_engine(tbl, state, buf); + let result = Caml_lexer.new_lex_engine(tbl, state, buf); if (result >= 0) { buf.lex_start_p = buf.lex_curr_p; - var init = buf.lex_curr_p; + let init = buf.lex_curr_p; buf.lex_curr_p = { pos_fname: init.pos_fname, pos_lnum: init.pos_lnum, @@ -36,7 +36,7 @@ function new_engine(tbl, state, buf) { return result; } -var zero_pos = { +let zero_pos = { pos_fname: "", pos_lnum: 1, pos_bol: 0, @@ -44,16 +44,16 @@ var zero_pos = { }; function from_function(f) { - var partial_arg = Caml_bytes.create(512); + let partial_arg = Caml_bytes.create(512); return { refill_buff: (function (param) { - var read = Curry._2(f, partial_arg, partial_arg.length); - var n = read > 0 ? read : (param.lex_eof_reached = true, 0); + let read = Curry._2(f, partial_arg, partial_arg.length); + let n = read > 0 ? read : (param.lex_eof_reached = true, 0); if ((param.lex_buffer_len + n | 0) > param.lex_buffer.length) { if (((param.lex_buffer_len - param.lex_start_pos | 0) + n | 0) <= param.lex_buffer.length) { Bytes.blit(param.lex_buffer, param.lex_start_pos, param.lex_buffer, 0, param.lex_buffer_len - param.lex_start_pos | 0); } else { - var newlen = (param.lex_buffer.length << 1); + let newlen = (param.lex_buffer.length << 1); if (((param.lex_buffer_len - param.lex_start_pos | 0) + n | 0) > newlen) { throw { RE_EXN_ID: "Failure", @@ -61,19 +61,19 @@ function from_function(f) { Error: new Error() }; } - var newbuf = Caml_bytes.create(newlen); + let newbuf = Caml_bytes.create(newlen); Bytes.blit(param.lex_buffer, param.lex_start_pos, newbuf, 0, param.lex_buffer_len - param.lex_start_pos | 0); param.lex_buffer = newbuf; } - var s = param.lex_start_pos; + let s = param.lex_start_pos; param.lex_abs_pos = param.lex_abs_pos + s | 0; param.lex_curr_pos = param.lex_curr_pos - s | 0; param.lex_start_pos = 0; param.lex_last_pos = param.lex_last_pos - s | 0; param.lex_buffer_len = param.lex_buffer_len - s | 0; - var t = param.lex_mem; - for(var i = 0 ,i_finish = t.length; i < i_finish; ++i){ - var v = Caml_array.get(t, i); + let t = param.lex_mem; + for(let i = 0 ,i_finish = t.length; i < i_finish; ++i){ + let v = Caml_array.get(t, i); if (v >= 0) { Caml_array.set(t, i, v - s | 0); } @@ -117,12 +117,12 @@ function from_string(s) { } function lexeme(lexbuf) { - var len = lexbuf.lex_curr_pos - lexbuf.lex_start_pos | 0; + let len = lexbuf.lex_curr_pos - lexbuf.lex_start_pos | 0; return Bytes.sub_string(lexbuf.lex_buffer, lexbuf.lex_start_pos, len); } function sub_lexeme(lexbuf, i1, i2) { - var len = i2 - i1 | 0; + let len = i2 - i1 | 0; return Bytes.sub_string(lexbuf.lex_buffer, i1, len); } @@ -130,7 +130,7 @@ function sub_lexeme_opt(lexbuf, i1, i2) { if (i1 < 0) { return; } - var len = i2 - i1 | 0; + let len = i2 - i1 | 0; return Bytes.sub_string(lexbuf.lex_buffer, i1, len); } @@ -166,7 +166,7 @@ function lexeme_end_p(lexbuf) { } function new_line(lexbuf) { - var lcp = lexbuf.lex_curr_p; + let lcp = lexbuf.lex_curr_p; lexbuf.lex_curr_p = { pos_fname: lcp.pos_fname, pos_lnum: lcp.pos_lnum + 1 | 0, @@ -178,7 +178,7 @@ function new_line(lexbuf) { function flush_input(lb) { lb.lex_curr_pos = 0; lb.lex_abs_pos = 0; - var init = lb.lex_curr_p; + let init = lb.lex_curr_p; lb.lex_curr_p = { pos_fname: init.pos_fname, pos_lnum: init.pos_lnum, @@ -188,7 +188,7 @@ function flush_input(lb) { lb.lex_buffer_len = 0; } -var dummy_pos = { +let dummy_pos = { pos_fname: "", pos_lnum: 0, pos_bol: 0, diff --git a/lib/js/list.js b/lib/js/list.js index 6e8070897c..ba69509710 100644 --- a/lib/js/list.js +++ b/lib/js/list.js @@ -1,16 +1,16 @@ 'use strict'; -var Curry = require("./curry.js"); -var Caml_obj = require("./caml_obj.js"); -var Pervasives = require("./pervasives.js"); -var Caml_option = require("./caml_option.js"); +let Curry = require("./curry.js"); +let Caml_obj = require("./caml_obj.js"); +let Pervasives = require("./pervasives.js"); +let Caml_option = require("./caml_option.js"); function length(l) { - var _len = 0; - var _param = l; + let _len = 0; + let _param = l; while(true) { - var param = _param; - var len = _len; + let param = _param; + let len = _len; if (!param) { return len; } @@ -57,11 +57,11 @@ function nth(l, n) { Error: new Error() }; } - var _l = l; - var _n = n; + let _l = l; + let _n = n; while(true) { - var n$1 = _n; - var l$1 = _l; + let n$1 = _n; + let l$1 = _l; if (l$1) { if (n$1 === 0) { return l$1.hd; @@ -86,11 +86,11 @@ function nth_opt(l, n) { Error: new Error() }; } - var _l = l; - var _n = n; + let _l = l; + let _n = n; while(true) { - var n$1 = _n; - var l$1 = _l; + let n$1 = _n; + let l$1 = _l; if (!l$1) { return; } @@ -105,8 +105,8 @@ function nth_opt(l, n) { function rev_append(_l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { return l2; } @@ -125,8 +125,8 @@ function rev(l) { function init_tailrec_aux(_acc, _i, n, f) { while(true) { - var i = _i; - var acc = _acc; + let i = _i; + let acc = _acc; if (i >= n) { return acc; } @@ -143,7 +143,7 @@ function init_aux(i, n, f) { if (i >= n) { return /* [] */0; } - var r = Curry._1(f, i); + let r = Curry._1(f, i); return { hd: r, tl: init_aux(i + 1 | 0, n, f) @@ -177,7 +177,7 @@ function map(f, param) { if (!param) { return /* [] */0; } - var r = Curry._1(f, param.hd); + let r = Curry._1(f, param.hd); return { hd: r, tl: map(f, param.tl) @@ -188,7 +188,7 @@ function mapi(i, f, param) { if (!param) { return /* [] */0; } - var r = Curry._2(f, i, param.hd); + let r = Curry._2(f, i, param.hd); return { hd: r, tl: mapi(i + 1 | 0, f, param.tl) @@ -200,11 +200,11 @@ function mapi$1(f, l) { } function rev_map(f, l) { - var _accu = /* [] */0; - var _param = l; + let _accu = /* [] */0; + let _param = l; while(true) { - var param = _param; - var accu = _accu; + let param = _param; + let accu = _accu; if (!param) { return accu; } @@ -219,7 +219,7 @@ function rev_map(f, l) { function iter(f, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return; } @@ -230,11 +230,11 @@ function iter(f, _param) { } function iteri(f, l) { - var _i = 0; - var _param = l; + let _i = 0; + let _param = l; while(true) { - var param = _param; - var i = _i; + let param = _param; + let i = _i; if (!param) { return; } @@ -247,8 +247,8 @@ function iteri(f, l) { function fold_left(f, _accu, _l) { while(true) { - var l = _l; - var accu = _accu; + let l = _l; + let accu = _accu; if (!l) { return accu; } @@ -269,7 +269,7 @@ function fold_right(f, l, accu) { function map2(f, l1, l2) { if (l1) { if (l2) { - var r = Curry._2(f, l1.hd, l2.hd); + let r = Curry._2(f, l1.hd, l2.hd); return { hd: r, tl: map2(f, l1.tl, l2.tl) @@ -292,13 +292,13 @@ function map2(f, l1, l2) { } function rev_map2(f, l1, l2) { - var _accu = /* [] */0; - var _l1 = l1; - var _l2 = l2; + let _accu = /* [] */0; + let _l1 = l1; + let _l2 = l2; while(true) { - var l2$1 = _l2; - var l1$1 = _l1; - var accu = _accu; + let l2$1 = _l2; + let l1$1 = _l1; + let accu = _accu; if (l1$1) { if (l2$1) { _l2 = l2$1.tl; @@ -328,8 +328,8 @@ function rev_map2(f, l1, l2) { function iter2(f, _l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (l1) { if (l2) { Curry._2(f, l1.hd, l2.hd); @@ -356,9 +356,9 @@ function iter2(f, _l1, _l2) { function fold_left2(f, _accu, _l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; - var accu = _accu; + let l2 = _l2; + let l1 = _l1; + let accu = _accu; if (l1) { if (l2) { _l2 = l2.tl; @@ -406,7 +406,7 @@ function fold_right2(f, l1, l2, accu) { function for_all(p, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return true; } @@ -420,7 +420,7 @@ function for_all(p, _param) { function exists(p, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return false; } @@ -434,8 +434,8 @@ function exists(p, _param) { function for_all2(p, _l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (l1) { if (l2) { if (!Curry._2(p, l1.hd, l2.hd)) { @@ -464,8 +464,8 @@ function for_all2(p, _l1, _l2) { function exists2(p, _l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (l1) { if (l2) { if (Curry._2(p, l1.hd, l2.hd)) { @@ -494,7 +494,7 @@ function exists2(p, _l1, _l2) { function mem(x, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return false; } @@ -508,7 +508,7 @@ function mem(x, _param) { function memq(x, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return false; } @@ -522,9 +522,9 @@ function memq(x, _param) { function assoc(x, _param) { while(true) { - var param = _param; + let param = _param; if (param) { - var match = param.hd; + let match = param.hd; if (Caml_obj.equal(match[0], x)) { return match[1]; } @@ -540,11 +540,11 @@ function assoc(x, _param) { function assoc_opt(x, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return; } - var match = param.hd; + let match = param.hd; if (Caml_obj.equal(match[0], x)) { return Caml_option.some(match[1]); } @@ -555,9 +555,9 @@ function assoc_opt(x, _param) { function assq(x, _param) { while(true) { - var param = _param; + let param = _param; if (param) { - var match = param.hd; + let match = param.hd; if (match[0] === x) { return match[1]; } @@ -573,11 +573,11 @@ function assq(x, _param) { function assq_opt(x, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return; } - var match = param.hd; + let match = param.hd; if (match[0] === x) { return Caml_option.some(match[1]); } @@ -588,7 +588,7 @@ function assq_opt(x, _param) { function mem_assoc(x, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return false; } @@ -602,7 +602,7 @@ function mem_assoc(x, _param) { function mem_assq(x, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return false; } @@ -618,8 +618,8 @@ function remove_assoc(x, param) { if (!param) { return /* [] */0; } - var l = param.tl; - var pair = param.hd; + let l = param.tl; + let pair = param.hd; if (Caml_obj.equal(pair[0], x)) { return l; } else { @@ -634,8 +634,8 @@ function remove_assq(x, param) { if (!param) { return /* [] */0; } - var l = param.tl; - var pair = param.hd; + let l = param.tl; + let pair = param.hd; if (pair[0] === x) { return l; } else { @@ -648,9 +648,9 @@ function remove_assq(x, param) { function find(p, _param) { while(true) { - var param = _param; + let param = _param; if (param) { - var x = param.hd; + let x = param.hd; if (Curry._1(p, x)) { return x; } @@ -666,11 +666,11 @@ function find(p, _param) { function find_opt(p, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return; } - var x = param.hd; + let x = param.hd; if (Curry._1(p, x)) { return Caml_option.some(x); } @@ -681,16 +681,16 @@ function find_opt(p, _param) { function find_all(p) { return function (param) { - var _accu = /* [] */0; - var _param = param; + let _accu = /* [] */0; + let _param = param; while(true) { - var param$1 = _param; - var accu = _accu; + let param$1 = _param; + let accu = _accu; if (!param$1) { return rev_append(accu, /* [] */0); } - var l = param$1.tl; - var x = param$1.hd; + let l = param$1.tl; + let x = param$1.hd; if (Curry._1(p, x)) { _param = l; _accu = { @@ -706,21 +706,21 @@ function find_all(p) { } function partition(p, l) { - var _yes = /* [] */0; - var _no = /* [] */0; - var _param = l; + let _yes = /* [] */0; + let _no = /* [] */0; + let _param = l; while(true) { - var param = _param; - var no = _no; - var yes = _yes; + let param = _param; + let no = _no; + let yes = _yes; if (!param) { return [ rev_append(yes, /* [] */0), rev_append(no, /* [] */0) ]; } - var l$1 = param.tl; - var x = param.hd; + let l$1 = param.tl; + let x = param.hd; if (Curry._1(p, x)) { _param = l$1; _yes = { @@ -745,8 +745,8 @@ function split(param) { /* [] */0 ]; } - var match = param.hd; - var match$1 = split(param.tl); + let match = param.hd; + let match$1 = split(param.tl); return [ { hd: match[0], @@ -793,8 +793,8 @@ function merge(cmp, l1, l2) { if (!l2) { return l1; } - var h2 = l2.hd; - var h1 = l1.hd; + let h2 = l2.hd; + let h1 = l1.hd; if (Curry._2(cmp, h1, h2) <= 0) { return { hd: h1, @@ -810,8 +810,8 @@ function merge(cmp, l1, l2) { function chop(_k, _l) { while(true) { - var l = _l; - var k = _k; + let l = _l; + let k = _k; if (k === 0) { return l; } @@ -833,16 +833,16 @@ function chop(_k, _l) { } function stable_sort(cmp, l) { - var sort = function (n, l) { + let sort = function (n, l) { if (n !== 2) { if (n === 3 && l) { - var match = l.tl; + let match = l.tl; if (match) { - var match$1 = match.tl; + let match$1 = match.tl; if (match$1) { - var x3 = match$1.hd; - var x2 = match.hd; - var x1 = l.hd; + let x3 = match$1.hd; + let x2 = match.hd; + let x1 = l.hd; if (Curry._2(cmp, x1, x2) <= 0) { if (Curry._2(cmp, x2, x3) <= 0) { return { @@ -919,10 +919,10 @@ function stable_sort(cmp, l) { } } else if (l) { - var match$2 = l.tl; + let match$2 = l.tl; if (match$2) { - var x2$1 = match$2.hd; - var x1$1 = l.hd; + let x2$1 = match$2.hd; + let x1$1 = l.hd; if (Curry._2(cmp, x1$1, x2$1) <= 0) { return { hd: x1$1, @@ -943,26 +943,26 @@ function stable_sort(cmp, l) { } } - var n1 = (n >> 1); - var n2 = n - n1 | 0; - var l2 = chop(n1, l); - var s1 = rev_sort(n1, l); - var s2 = rev_sort(n2, l2); - var _l1 = s1; - var _l2 = s2; - var _accu = /* [] */0; + let n1 = (n >> 1); + let n2 = n - n1 | 0; + let l2 = chop(n1, l); + let s1 = rev_sort(n1, l); + let s2 = rev_sort(n2, l2); + let _l1 = s1; + let _l2 = s2; + let _accu = /* [] */0; while(true) { - var accu = _accu; - var l2$1 = _l2; - var l1 = _l1; + let accu = _accu; + let l2$1 = _l2; + let l1 = _l1; if (!l1) { return rev_append(l2$1, accu); } if (!l2$1) { return rev_append(l1, accu); } - var h2 = l2$1.hd; - var h1 = l1.hd; + let h2 = l2$1.hd; + let h1 = l1.hd; if (Curry._2(cmp, h1, h2) > 0) { _accu = { hd: h1, @@ -979,16 +979,16 @@ function stable_sort(cmp, l) { continue ; }; }; - var rev_sort = function (n, l) { + let rev_sort = function (n, l) { if (n !== 2) { if (n === 3 && l) { - var match = l.tl; + let match = l.tl; if (match) { - var match$1 = match.tl; + let match$1 = match.tl; if (match$1) { - var x3 = match$1.hd; - var x2 = match.hd; - var x1 = l.hd; + let x3 = match$1.hd; + let x2 = match.hd; + let x1 = l.hd; if (Curry._2(cmp, x1, x2) > 0) { if (Curry._2(cmp, x2, x3) > 0) { return { @@ -1065,10 +1065,10 @@ function stable_sort(cmp, l) { } } else if (l) { - var match$2 = l.tl; + let match$2 = l.tl; if (match$2) { - var x2$1 = match$2.hd; - var x1$1 = l.hd; + let x2$1 = match$2.hd; + let x1$1 = l.hd; if (Curry._2(cmp, x1$1, x2$1) > 0) { return { hd: x1$1, @@ -1089,26 +1089,26 @@ function stable_sort(cmp, l) { } } - var n1 = (n >> 1); - var n2 = n - n1 | 0; - var l2 = chop(n1, l); - var s1 = sort(n1, l); - var s2 = sort(n2, l2); - var _l1 = s1; - var _l2 = s2; - var _accu = /* [] */0; + let n1 = (n >> 1); + let n2 = n - n1 | 0; + let l2 = chop(n1, l); + let s1 = sort(n1, l); + let s2 = sort(n2, l2); + let _l1 = s1; + let _l2 = s2; + let _accu = /* [] */0; while(true) { - var accu = _accu; - var l2$1 = _l2; - var l1 = _l1; + let accu = _accu; + let l2$1 = _l2; + let l1 = _l1; if (!l1) { return rev_append(l2$1, accu); } if (!l2$1) { return rev_append(l1, accu); } - var h2 = l2$1.hd; - var h1 = l1.hd; + let h2 = l2$1.hd; + let h1 = l1.hd; if (Curry._2(cmp, h1, h2) <= 0) { _accu = { hd: h1, @@ -1125,7 +1125,7 @@ function stable_sort(cmp, l) { continue ; }; }; - var len = length(l); + let len = length(l); if (len < 2) { return l; } else { @@ -1134,19 +1134,19 @@ function stable_sort(cmp, l) { } function sort_uniq(cmp, l) { - var sort = function (n, l) { + let sort = function (n, l) { if (n !== 2) { if (n === 3 && l) { - var match = l.tl; + let match = l.tl; if (match) { - var match$1 = match.tl; + let match$1 = match.tl; if (match$1) { - var x3 = match$1.hd; - var x2 = match.hd; - var x1 = l.hd; - var c = Curry._2(cmp, x1, x2); + let x3 = match$1.hd; + let x2 = match.hd; + let x1 = l.hd; + let c = Curry._2(cmp, x1, x2); if (c === 0) { - var c$1 = Curry._2(cmp, x2, x3); + let c$1 = Curry._2(cmp, x2, x3); if (c$1 === 0) { return { hd: x2, @@ -1171,7 +1171,7 @@ function sort_uniq(cmp, l) { } } if (c < 0) { - var c$2 = Curry._2(cmp, x2, x3); + let c$2 = Curry._2(cmp, x2, x3); if (c$2 === 0) { return { hd: x1, @@ -1193,7 +1193,7 @@ function sort_uniq(cmp, l) { } }; } - var c$3 = Curry._2(cmp, x1, x3); + let c$3 = Curry._2(cmp, x1, x3); if (c$3 === 0) { return { hd: x1, @@ -1226,7 +1226,7 @@ function sort_uniq(cmp, l) { }; } } - var c$4 = Curry._2(cmp, x1, x3); + let c$4 = Curry._2(cmp, x1, x3); if (c$4 === 0) { return { hd: x2, @@ -1248,7 +1248,7 @@ function sort_uniq(cmp, l) { } }; } - var c$5 = Curry._2(cmp, x2, x3); + let c$5 = Curry._2(cmp, x2, x3); if (c$5 === 0) { return { hd: x2, @@ -1287,11 +1287,11 @@ function sort_uniq(cmp, l) { } } else if (l) { - var match$2 = l.tl; + let match$2 = l.tl; if (match$2) { - var x2$1 = match$2.hd; - var x1$1 = l.hd; - var c$6 = Curry._2(cmp, x1$1, x2$1); + let x2$1 = match$2.hd; + let x1$1 = l.hd; + let c$6 = Curry._2(cmp, x1$1, x2$1); if (c$6 === 0) { return { hd: x1$1, @@ -1317,29 +1317,29 @@ function sort_uniq(cmp, l) { } } - var n1 = (n >> 1); - var n2 = n - n1 | 0; - var l2 = chop(n1, l); - var s1 = rev_sort(n1, l); - var s2 = rev_sort(n2, l2); - var _l1 = s1; - var _l2 = s2; - var _accu = /* [] */0; + let n1 = (n >> 1); + let n2 = n - n1 | 0; + let l2 = chop(n1, l); + let s1 = rev_sort(n1, l); + let s2 = rev_sort(n2, l2); + let _l1 = s1; + let _l2 = s2; + let _accu = /* [] */0; while(true) { - var accu = _accu; - var l2$1 = _l2; - var l1 = _l1; + let accu = _accu; + let l2$1 = _l2; + let l1 = _l1; if (!l1) { return rev_append(l2$1, accu); } if (!l2$1) { return rev_append(l1, accu); } - var t2 = l2$1.tl; - var h2 = l2$1.hd; - var t1 = l1.tl; - var h1 = l1.hd; - var c$7 = Curry._2(cmp, h1, h2); + let t2 = l2$1.tl; + let h2 = l2$1.hd; + let t1 = l1.tl; + let h1 = l1.hd; + let c$7 = Curry._2(cmp, h1, h2); if (c$7 === 0) { _accu = { hd: h1, @@ -1365,19 +1365,19 @@ function sort_uniq(cmp, l) { continue ; }; }; - var rev_sort = function (n, l) { + let rev_sort = function (n, l) { if (n !== 2) { if (n === 3 && l) { - var match = l.tl; + let match = l.tl; if (match) { - var match$1 = match.tl; + let match$1 = match.tl; if (match$1) { - var x3 = match$1.hd; - var x2 = match.hd; - var x1 = l.hd; - var c = Curry._2(cmp, x1, x2); + let x3 = match$1.hd; + let x2 = match.hd; + let x1 = l.hd; + let c = Curry._2(cmp, x1, x2); if (c === 0) { - var c$1 = Curry._2(cmp, x2, x3); + let c$1 = Curry._2(cmp, x2, x3); if (c$1 === 0) { return { hd: x2, @@ -1402,7 +1402,7 @@ function sort_uniq(cmp, l) { } } if (c > 0) { - var c$2 = Curry._2(cmp, x2, x3); + let c$2 = Curry._2(cmp, x2, x3); if (c$2 === 0) { return { hd: x1, @@ -1424,7 +1424,7 @@ function sort_uniq(cmp, l) { } }; } - var c$3 = Curry._2(cmp, x1, x3); + let c$3 = Curry._2(cmp, x1, x3); if (c$3 === 0) { return { hd: x1, @@ -1457,7 +1457,7 @@ function sort_uniq(cmp, l) { }; } } - var c$4 = Curry._2(cmp, x1, x3); + let c$4 = Curry._2(cmp, x1, x3); if (c$4 === 0) { return { hd: x2, @@ -1479,7 +1479,7 @@ function sort_uniq(cmp, l) { } }; } - var c$5 = Curry._2(cmp, x2, x3); + let c$5 = Curry._2(cmp, x2, x3); if (c$5 === 0) { return { hd: x2, @@ -1518,11 +1518,11 @@ function sort_uniq(cmp, l) { } } else if (l) { - var match$2 = l.tl; + let match$2 = l.tl; if (match$2) { - var x2$1 = match$2.hd; - var x1$1 = l.hd; - var c$6 = Curry._2(cmp, x1$1, x2$1); + let x2$1 = match$2.hd; + let x1$1 = l.hd; + let c$6 = Curry._2(cmp, x1$1, x2$1); if (c$6 === 0) { return { hd: x1$1, @@ -1548,29 +1548,29 @@ function sort_uniq(cmp, l) { } } - var n1 = (n >> 1); - var n2 = n - n1 | 0; - var l2 = chop(n1, l); - var s1 = sort(n1, l); - var s2 = sort(n2, l2); - var _l1 = s1; - var _l2 = s2; - var _accu = /* [] */0; + let n1 = (n >> 1); + let n2 = n - n1 | 0; + let l2 = chop(n1, l); + let s1 = sort(n1, l); + let s2 = sort(n2, l2); + let _l1 = s1; + let _l2 = s2; + let _accu = /* [] */0; while(true) { - var accu = _accu; - var l2$1 = _l2; - var l1 = _l1; + let accu = _accu; + let l2$1 = _l2; + let l1 = _l1; if (!l1) { return rev_append(l2$1, accu); } if (!l2$1) { return rev_append(l1, accu); } - var t2 = l2$1.tl; - var h2 = l2$1.hd; - var t1 = l1.tl; - var h1 = l1.hd; - var c$7 = Curry._2(cmp, h1, h2); + let t2 = l2$1.tl; + let h2 = l2$1.hd; + let t1 = l1.tl; + let h1 = l1.hd; + let c$7 = Curry._2(cmp, h1, h2); if (c$7 === 0) { _accu = { hd: h1, @@ -1596,7 +1596,7 @@ function sort_uniq(cmp, l) { continue ; }; }; - var len = length(l); + let len = length(l); if (len < 2) { return l; } else { @@ -1606,8 +1606,8 @@ function sort_uniq(cmp, l) { function compare_lengths(_l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { if (l2) { return -1; @@ -1626,8 +1626,8 @@ function compare_lengths(_l1, _l2) { function compare_length_with(_l, _n) { while(true) { - var n = _n; - var l = _l; + let n = _n; + let l = _l; if (!l) { if (n === 0) { return 0; @@ -1646,15 +1646,15 @@ function compare_length_with(_l, _n) { }; } -var append = Pervasives.$at; +let append = Pervasives.$at; -var concat = flatten; +let concat = flatten; -var filter = find_all; +let filter = find_all; -var sort = stable_sort; +let sort = stable_sort; -var fast_sort = stable_sort; +let fast_sort = stable_sort; exports.length = length; exports.compare_lengths = compare_lengths; diff --git a/lib/js/listLabels.js b/lib/js/listLabels.js index 318f19b207..53cb36b11e 100644 --- a/lib/js/listLabels.js +++ b/lib/js/listLabels.js @@ -1,16 +1,16 @@ 'use strict'; -var Curry = require("./curry.js"); -var Caml_obj = require("./caml_obj.js"); -var Pervasives = require("./pervasives.js"); -var Caml_option = require("./caml_option.js"); +let Curry = require("./curry.js"); +let Caml_obj = require("./caml_obj.js"); +let Pervasives = require("./pervasives.js"); +let Caml_option = require("./caml_option.js"); function length(l) { - var _len = 0; - var _param = l; + let _len = 0; + let _param = l; while(true) { - var param = _param; - var len = _len; + let param = _param; + let len = _len; if (!param) { return len; } @@ -57,11 +57,11 @@ function nth(l, n) { Error: new Error() }; } - var _l = l; - var _n = n; + let _l = l; + let _n = n; while(true) { - var n$1 = _n; - var l$1 = _l; + let n$1 = _n; + let l$1 = _l; if (l$1) { if (n$1 === 0) { return l$1.hd; @@ -86,11 +86,11 @@ function nth_opt(l, n) { Error: new Error() }; } - var _l = l; - var _n = n; + let _l = l; + let _n = n; while(true) { - var n$1 = _n; - var l$1 = _l; + let n$1 = _n; + let l$1 = _l; if (!l$1) { return; } @@ -105,8 +105,8 @@ function nth_opt(l, n) { function rev_append(_l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { return l2; } @@ -125,8 +125,8 @@ function rev(l) { function init_tailrec_aux(_acc, _i, n, f) { while(true) { - var i = _i; - var acc = _acc; + let i = _i; + let acc = _acc; if (i >= n) { return acc; } @@ -143,7 +143,7 @@ function init_aux(i, n, f) { if (i >= n) { return /* [] */0; } - var r = Curry._1(f, i); + let r = Curry._1(f, i); return { hd: r, tl: init_aux(i + 1 | 0, n, f) @@ -177,7 +177,7 @@ function map(f, param) { if (!param) { return /* [] */0; } - var r = Curry._1(f, param.hd); + let r = Curry._1(f, param.hd); return { hd: r, tl: map(f, param.tl) @@ -188,7 +188,7 @@ function mapi(i, f, param) { if (!param) { return /* [] */0; } - var r = Curry._2(f, i, param.hd); + let r = Curry._2(f, i, param.hd); return { hd: r, tl: mapi(i + 1 | 0, f, param.tl) @@ -200,11 +200,11 @@ function mapi$1(f, l) { } function rev_map(f, l) { - var _accu = /* [] */0; - var _param = l; + let _accu = /* [] */0; + let _param = l; while(true) { - var param = _param; - var accu = _accu; + let param = _param; + let accu = _accu; if (!param) { return accu; } @@ -219,7 +219,7 @@ function rev_map(f, l) { function iter(f, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return; } @@ -230,11 +230,11 @@ function iter(f, _param) { } function iteri(f, l) { - var _i = 0; - var _param = l; + let _i = 0; + let _param = l; while(true) { - var param = _param; - var i = _i; + let param = _param; + let i = _i; if (!param) { return; } @@ -247,8 +247,8 @@ function iteri(f, l) { function fold_left(f, _accu, _l) { while(true) { - var l = _l; - var accu = _accu; + let l = _l; + let accu = _accu; if (!l) { return accu; } @@ -269,7 +269,7 @@ function fold_right(f, l, accu) { function map2(f, l1, l2) { if (l1) { if (l2) { - var r = Curry._2(f, l1.hd, l2.hd); + let r = Curry._2(f, l1.hd, l2.hd); return { hd: r, tl: map2(f, l1.tl, l2.tl) @@ -292,13 +292,13 @@ function map2(f, l1, l2) { } function rev_map2(f, l1, l2) { - var _accu = /* [] */0; - var _l1 = l1; - var _l2 = l2; + let _accu = /* [] */0; + let _l1 = l1; + let _l2 = l2; while(true) { - var l2$1 = _l2; - var l1$1 = _l1; - var accu = _accu; + let l2$1 = _l2; + let l1$1 = _l1; + let accu = _accu; if (l1$1) { if (l2$1) { _l2 = l2$1.tl; @@ -328,8 +328,8 @@ function rev_map2(f, l1, l2) { function iter2(f, _l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (l1) { if (l2) { Curry._2(f, l1.hd, l2.hd); @@ -356,9 +356,9 @@ function iter2(f, _l1, _l2) { function fold_left2(f, _accu, _l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; - var accu = _accu; + let l2 = _l2; + let l1 = _l1; + let accu = _accu; if (l1) { if (l2) { _l2 = l2.tl; @@ -406,7 +406,7 @@ function fold_right2(f, l1, l2, accu) { function for_all(p, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return true; } @@ -420,7 +420,7 @@ function for_all(p, _param) { function exists(p, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return false; } @@ -434,8 +434,8 @@ function exists(p, _param) { function for_all2(p, _l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (l1) { if (l2) { if (!Curry._2(p, l1.hd, l2.hd)) { @@ -464,8 +464,8 @@ function for_all2(p, _l1, _l2) { function exists2(p, _l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (l1) { if (l2) { if (Curry._2(p, l1.hd, l2.hd)) { @@ -494,7 +494,7 @@ function exists2(p, _l1, _l2) { function mem(x, _set) { while(true) { - var set = _set; + let set = _set; if (!set) { return false; } @@ -508,7 +508,7 @@ function mem(x, _set) { function memq(x, _set) { while(true) { - var set = _set; + let set = _set; if (!set) { return false; } @@ -522,9 +522,9 @@ function memq(x, _set) { function assoc(x, _param) { while(true) { - var param = _param; + let param = _param; if (param) { - var match = param.hd; + let match = param.hd; if (Caml_obj.equal(match[0], x)) { return match[1]; } @@ -540,11 +540,11 @@ function assoc(x, _param) { function assoc_opt(x, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return; } - var match = param.hd; + let match = param.hd; if (Caml_obj.equal(match[0], x)) { return Caml_option.some(match[1]); } @@ -555,9 +555,9 @@ function assoc_opt(x, _param) { function assq(x, _param) { while(true) { - var param = _param; + let param = _param; if (param) { - var match = param.hd; + let match = param.hd; if (match[0] === x) { return match[1]; } @@ -573,11 +573,11 @@ function assq(x, _param) { function assq_opt(x, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return; } - var match = param.hd; + let match = param.hd; if (match[0] === x) { return Caml_option.some(match[1]); } @@ -588,7 +588,7 @@ function assq_opt(x, _param) { function mem_assoc(x, _map) { while(true) { - var map = _map; + let map = _map; if (!map) { return false; } @@ -602,7 +602,7 @@ function mem_assoc(x, _map) { function mem_assq(x, _map) { while(true) { - var map = _map; + let map = _map; if (!map) { return false; } @@ -618,8 +618,8 @@ function remove_assoc(x, param) { if (!param) { return /* [] */0; } - var l = param.tl; - var pair = param.hd; + let l = param.tl; + let pair = param.hd; if (Caml_obj.equal(pair[0], x)) { return l; } else { @@ -634,8 +634,8 @@ function remove_assq(x, param) { if (!param) { return /* [] */0; } - var l = param.tl; - var pair = param.hd; + let l = param.tl; + let pair = param.hd; if (pair[0] === x) { return l; } else { @@ -648,9 +648,9 @@ function remove_assq(x, param) { function find(p, _param) { while(true) { - var param = _param; + let param = _param; if (param) { - var x = param.hd; + let x = param.hd; if (Curry._1(p, x)) { return x; } @@ -666,11 +666,11 @@ function find(p, _param) { function find_opt(p, _param) { while(true) { - var param = _param; + let param = _param; if (!param) { return; } - var x = param.hd; + let x = param.hd; if (Curry._1(p, x)) { return Caml_option.some(x); } @@ -681,16 +681,16 @@ function find_opt(p, _param) { function find_all(p) { return function (param) { - var _accu = /* [] */0; - var _param = param; + let _accu = /* [] */0; + let _param = param; while(true) { - var param$1 = _param; - var accu = _accu; + let param$1 = _param; + let accu = _accu; if (!param$1) { return rev_append(accu, /* [] */0); } - var l = param$1.tl; - var x = param$1.hd; + let l = param$1.tl; + let x = param$1.hd; if (Curry._1(p, x)) { _param = l; _accu = { @@ -706,21 +706,21 @@ function find_all(p) { } function partition(p, l) { - var _yes = /* [] */0; - var _no = /* [] */0; - var _param = l; + let _yes = /* [] */0; + let _no = /* [] */0; + let _param = l; while(true) { - var param = _param; - var no = _no; - var yes = _yes; + let param = _param; + let no = _no; + let yes = _yes; if (!param) { return [ rev_append(yes, /* [] */0), rev_append(no, /* [] */0) ]; } - var l$1 = param.tl; - var x = param.hd; + let l$1 = param.tl; + let x = param.hd; if (Curry._1(p, x)) { _param = l$1; _yes = { @@ -745,8 +745,8 @@ function split(param) { /* [] */0 ]; } - var match = param.hd; - var match$1 = split(param.tl); + let match = param.hd; + let match$1 = split(param.tl); return [ { hd: match[0], @@ -793,8 +793,8 @@ function merge(cmp, l1, l2) { if (!l2) { return l1; } - var h2 = l2.hd; - var h1 = l1.hd; + let h2 = l2.hd; + let h1 = l1.hd; if (Curry._2(cmp, h1, h2) <= 0) { return { hd: h1, @@ -810,8 +810,8 @@ function merge(cmp, l1, l2) { function chop(_k, _l) { while(true) { - var l = _l; - var k = _k; + let l = _l; + let k = _k; if (k === 0) { return l; } @@ -833,16 +833,16 @@ function chop(_k, _l) { } function stable_sort(cmp, l) { - var sort = function (n, l) { + let sort = function (n, l) { if (n !== 2) { if (n === 3 && l) { - var match = l.tl; + let match = l.tl; if (match) { - var match$1 = match.tl; + let match$1 = match.tl; if (match$1) { - var x3 = match$1.hd; - var x2 = match.hd; - var x1 = l.hd; + let x3 = match$1.hd; + let x2 = match.hd; + let x1 = l.hd; if (Curry._2(cmp, x1, x2) <= 0) { if (Curry._2(cmp, x2, x3) <= 0) { return { @@ -919,10 +919,10 @@ function stable_sort(cmp, l) { } } else if (l) { - var match$2 = l.tl; + let match$2 = l.tl; if (match$2) { - var x2$1 = match$2.hd; - var x1$1 = l.hd; + let x2$1 = match$2.hd; + let x1$1 = l.hd; if (Curry._2(cmp, x1$1, x2$1) <= 0) { return { hd: x1$1, @@ -943,26 +943,26 @@ function stable_sort(cmp, l) { } } - var n1 = (n >> 1); - var n2 = n - n1 | 0; - var l2 = chop(n1, l); - var s1 = rev_sort(n1, l); - var s2 = rev_sort(n2, l2); - var _l1 = s1; - var _l2 = s2; - var _accu = /* [] */0; + let n1 = (n >> 1); + let n2 = n - n1 | 0; + let l2 = chop(n1, l); + let s1 = rev_sort(n1, l); + let s2 = rev_sort(n2, l2); + let _l1 = s1; + let _l2 = s2; + let _accu = /* [] */0; while(true) { - var accu = _accu; - var l2$1 = _l2; - var l1 = _l1; + let accu = _accu; + let l2$1 = _l2; + let l1 = _l1; if (!l1) { return rev_append(l2$1, accu); } if (!l2$1) { return rev_append(l1, accu); } - var h2 = l2$1.hd; - var h1 = l1.hd; + let h2 = l2$1.hd; + let h1 = l1.hd; if (Curry._2(cmp, h1, h2) > 0) { _accu = { hd: h1, @@ -979,16 +979,16 @@ function stable_sort(cmp, l) { continue ; }; }; - var rev_sort = function (n, l) { + let rev_sort = function (n, l) { if (n !== 2) { if (n === 3 && l) { - var match = l.tl; + let match = l.tl; if (match) { - var match$1 = match.tl; + let match$1 = match.tl; if (match$1) { - var x3 = match$1.hd; - var x2 = match.hd; - var x1 = l.hd; + let x3 = match$1.hd; + let x2 = match.hd; + let x1 = l.hd; if (Curry._2(cmp, x1, x2) > 0) { if (Curry._2(cmp, x2, x3) > 0) { return { @@ -1065,10 +1065,10 @@ function stable_sort(cmp, l) { } } else if (l) { - var match$2 = l.tl; + let match$2 = l.tl; if (match$2) { - var x2$1 = match$2.hd; - var x1$1 = l.hd; + let x2$1 = match$2.hd; + let x1$1 = l.hd; if (Curry._2(cmp, x1$1, x2$1) > 0) { return { hd: x1$1, @@ -1089,26 +1089,26 @@ function stable_sort(cmp, l) { } } - var n1 = (n >> 1); - var n2 = n - n1 | 0; - var l2 = chop(n1, l); - var s1 = sort(n1, l); - var s2 = sort(n2, l2); - var _l1 = s1; - var _l2 = s2; - var _accu = /* [] */0; + let n1 = (n >> 1); + let n2 = n - n1 | 0; + let l2 = chop(n1, l); + let s1 = sort(n1, l); + let s2 = sort(n2, l2); + let _l1 = s1; + let _l2 = s2; + let _accu = /* [] */0; while(true) { - var accu = _accu; - var l2$1 = _l2; - var l1 = _l1; + let accu = _accu; + let l2$1 = _l2; + let l1 = _l1; if (!l1) { return rev_append(l2$1, accu); } if (!l2$1) { return rev_append(l1, accu); } - var h2 = l2$1.hd; - var h1 = l1.hd; + let h2 = l2$1.hd; + let h1 = l1.hd; if (Curry._2(cmp, h1, h2) <= 0) { _accu = { hd: h1, @@ -1125,7 +1125,7 @@ function stable_sort(cmp, l) { continue ; }; }; - var len = length(l); + let len = length(l); if (len < 2) { return l; } else { @@ -1134,19 +1134,19 @@ function stable_sort(cmp, l) { } function sort_uniq(cmp, l) { - var sort = function (n, l) { + let sort = function (n, l) { if (n !== 2) { if (n === 3 && l) { - var match = l.tl; + let match = l.tl; if (match) { - var match$1 = match.tl; + let match$1 = match.tl; if (match$1) { - var x3 = match$1.hd; - var x2 = match.hd; - var x1 = l.hd; - var c = Curry._2(cmp, x1, x2); + let x3 = match$1.hd; + let x2 = match.hd; + let x1 = l.hd; + let c = Curry._2(cmp, x1, x2); if (c === 0) { - var c$1 = Curry._2(cmp, x2, x3); + let c$1 = Curry._2(cmp, x2, x3); if (c$1 === 0) { return { hd: x2, @@ -1171,7 +1171,7 @@ function sort_uniq(cmp, l) { } } if (c < 0) { - var c$2 = Curry._2(cmp, x2, x3); + let c$2 = Curry._2(cmp, x2, x3); if (c$2 === 0) { return { hd: x1, @@ -1193,7 +1193,7 @@ function sort_uniq(cmp, l) { } }; } - var c$3 = Curry._2(cmp, x1, x3); + let c$3 = Curry._2(cmp, x1, x3); if (c$3 === 0) { return { hd: x1, @@ -1226,7 +1226,7 @@ function sort_uniq(cmp, l) { }; } } - var c$4 = Curry._2(cmp, x1, x3); + let c$4 = Curry._2(cmp, x1, x3); if (c$4 === 0) { return { hd: x2, @@ -1248,7 +1248,7 @@ function sort_uniq(cmp, l) { } }; } - var c$5 = Curry._2(cmp, x2, x3); + let c$5 = Curry._2(cmp, x2, x3); if (c$5 === 0) { return { hd: x2, @@ -1287,11 +1287,11 @@ function sort_uniq(cmp, l) { } } else if (l) { - var match$2 = l.tl; + let match$2 = l.tl; if (match$2) { - var x2$1 = match$2.hd; - var x1$1 = l.hd; - var c$6 = Curry._2(cmp, x1$1, x2$1); + let x2$1 = match$2.hd; + let x1$1 = l.hd; + let c$6 = Curry._2(cmp, x1$1, x2$1); if (c$6 === 0) { return { hd: x1$1, @@ -1317,29 +1317,29 @@ function sort_uniq(cmp, l) { } } - var n1 = (n >> 1); - var n2 = n - n1 | 0; - var l2 = chop(n1, l); - var s1 = rev_sort(n1, l); - var s2 = rev_sort(n2, l2); - var _l1 = s1; - var _l2 = s2; - var _accu = /* [] */0; + let n1 = (n >> 1); + let n2 = n - n1 | 0; + let l2 = chop(n1, l); + let s1 = rev_sort(n1, l); + let s2 = rev_sort(n2, l2); + let _l1 = s1; + let _l2 = s2; + let _accu = /* [] */0; while(true) { - var accu = _accu; - var l2$1 = _l2; - var l1 = _l1; + let accu = _accu; + let l2$1 = _l2; + let l1 = _l1; if (!l1) { return rev_append(l2$1, accu); } if (!l2$1) { return rev_append(l1, accu); } - var t2 = l2$1.tl; - var h2 = l2$1.hd; - var t1 = l1.tl; - var h1 = l1.hd; - var c$7 = Curry._2(cmp, h1, h2); + let t2 = l2$1.tl; + let h2 = l2$1.hd; + let t1 = l1.tl; + let h1 = l1.hd; + let c$7 = Curry._2(cmp, h1, h2); if (c$7 === 0) { _accu = { hd: h1, @@ -1365,19 +1365,19 @@ function sort_uniq(cmp, l) { continue ; }; }; - var rev_sort = function (n, l) { + let rev_sort = function (n, l) { if (n !== 2) { if (n === 3 && l) { - var match = l.tl; + let match = l.tl; if (match) { - var match$1 = match.tl; + let match$1 = match.tl; if (match$1) { - var x3 = match$1.hd; - var x2 = match.hd; - var x1 = l.hd; - var c = Curry._2(cmp, x1, x2); + let x3 = match$1.hd; + let x2 = match.hd; + let x1 = l.hd; + let c = Curry._2(cmp, x1, x2); if (c === 0) { - var c$1 = Curry._2(cmp, x2, x3); + let c$1 = Curry._2(cmp, x2, x3); if (c$1 === 0) { return { hd: x2, @@ -1402,7 +1402,7 @@ function sort_uniq(cmp, l) { } } if (c > 0) { - var c$2 = Curry._2(cmp, x2, x3); + let c$2 = Curry._2(cmp, x2, x3); if (c$2 === 0) { return { hd: x1, @@ -1424,7 +1424,7 @@ function sort_uniq(cmp, l) { } }; } - var c$3 = Curry._2(cmp, x1, x3); + let c$3 = Curry._2(cmp, x1, x3); if (c$3 === 0) { return { hd: x1, @@ -1457,7 +1457,7 @@ function sort_uniq(cmp, l) { }; } } - var c$4 = Curry._2(cmp, x1, x3); + let c$4 = Curry._2(cmp, x1, x3); if (c$4 === 0) { return { hd: x2, @@ -1479,7 +1479,7 @@ function sort_uniq(cmp, l) { } }; } - var c$5 = Curry._2(cmp, x2, x3); + let c$5 = Curry._2(cmp, x2, x3); if (c$5 === 0) { return { hd: x2, @@ -1518,11 +1518,11 @@ function sort_uniq(cmp, l) { } } else if (l) { - var match$2 = l.tl; + let match$2 = l.tl; if (match$2) { - var x2$1 = match$2.hd; - var x1$1 = l.hd; - var c$6 = Curry._2(cmp, x1$1, x2$1); + let x2$1 = match$2.hd; + let x1$1 = l.hd; + let c$6 = Curry._2(cmp, x1$1, x2$1); if (c$6 === 0) { return { hd: x1$1, @@ -1548,29 +1548,29 @@ function sort_uniq(cmp, l) { } } - var n1 = (n >> 1); - var n2 = n - n1 | 0; - var l2 = chop(n1, l); - var s1 = sort(n1, l); - var s2 = sort(n2, l2); - var _l1 = s1; - var _l2 = s2; - var _accu = /* [] */0; + let n1 = (n >> 1); + let n2 = n - n1 | 0; + let l2 = chop(n1, l); + let s1 = sort(n1, l); + let s2 = sort(n2, l2); + let _l1 = s1; + let _l2 = s2; + let _accu = /* [] */0; while(true) { - var accu = _accu; - var l2$1 = _l2; - var l1 = _l1; + let accu = _accu; + let l2$1 = _l2; + let l1 = _l1; if (!l1) { return rev_append(l2$1, accu); } if (!l2$1) { return rev_append(l1, accu); } - var t2 = l2$1.tl; - var h2 = l2$1.hd; - var t1 = l1.tl; - var h1 = l1.hd; - var c$7 = Curry._2(cmp, h1, h2); + let t2 = l2$1.tl; + let h2 = l2$1.hd; + let t1 = l1.tl; + let h1 = l1.hd; + let c$7 = Curry._2(cmp, h1, h2); if (c$7 === 0) { _accu = { hd: h1, @@ -1596,7 +1596,7 @@ function sort_uniq(cmp, l) { continue ; }; }; - var len = length(l); + let len = length(l); if (len < 2) { return l; } else { @@ -1606,8 +1606,8 @@ function sort_uniq(cmp, l) { function compare_lengths(_l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { if (l2) { return -1; @@ -1626,8 +1626,8 @@ function compare_lengths(_l1, _l2) { function compare_length_with(_l, _n) { while(true) { - var n = _n; - var l = _l; + let n = _n; + let l = _l; if (!l) { if (n === 0) { return 0; @@ -1646,15 +1646,15 @@ function compare_length_with(_l, _n) { }; } -var append = Pervasives.$at; +let append = Pervasives.$at; -var concat = flatten; +let concat = flatten; -var filter = find_all; +let filter = find_all; -var sort = stable_sort; +let sort = stable_sort; -var fast_sort = stable_sort; +let fast_sort = stable_sort; exports.length = length; exports.hd = hd; diff --git a/lib/js/map.js b/lib/js/map.js index 15e2287b94..2c2024cc01 100644 --- a/lib/js/map.js +++ b/lib/js/map.js @@ -1,19 +1,19 @@ 'use strict'; -var Curry = require("./curry.js"); -var Caml_option = require("./caml_option.js"); +let Curry = require("./curry.js"); +let Caml_option = require("./caml_option.js"); function Make(funarg) { - var height = function (param) { + let height = function (param) { if (typeof param !== "object") { return 0; } else { return param.h; } }; - var create = function (l, x, d, r) { - var hl = height(l); - var hr = height(r); + let create = function (l, x, d, r) { + let hl = height(l); + let hr = height(r); return { TAG: "Node", l: l, @@ -23,7 +23,7 @@ function Make(funarg) { h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0 }; }; - var singleton = function (x, d) { + let singleton = function (x, d) { return { TAG: "Node", l: "Empty", @@ -33,10 +33,10 @@ function Make(funarg) { h: 1 }; }; - var bal = function (l, x, d, r) { - var hl; + let bal = function (l, x, d, r) { + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -46,10 +46,10 @@ function Make(funarg) { Error: new Error() }; } - var lr = l.r; - var ld = l.d; - var lv = l.v; - var ll = l.l; + let lr = l.r; + let ld = l.d; + let lv = l.v; + let ll = l.l; if (height(ll) >= height(lr)) { return create(ll, lv, ld, create(lr, x, d, r)); } @@ -79,10 +79,10 @@ function Make(funarg) { Error: new Error() }; } - var rr = r.r; - var rd = r.d; - var rv = r.v; - var rl = r.l; + let rr = r.r; + let rd = r.d; + let rv = r.v; + let rl = r.l; if (height(rr) >= height(rl)) { return create(create(l, x, d, rl), rv, rd, rr); } @@ -95,14 +95,14 @@ function Make(funarg) { Error: new Error() }; }; - var is_empty = function (param) { + let is_empty = function (param) { if (typeof param !== "object") { return true; } else { return false; } }; - var add = function (x, data, param) { + let add = function (x, data, param) { if (typeof param !== "object") { return { TAG: "Node", @@ -113,11 +113,11 @@ function Make(funarg) { h: 1 }; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Curry._2(funarg.compare, x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { if (d === data) { return param; @@ -133,30 +133,30 @@ function Make(funarg) { } } if (c < 0) { - var ll = add(x, data, l); + let ll = add(x, data, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = add(x, data, r); + let rr = add(x, data, r); if (r === rr) { return param; } else { return bal(l, v, d, rr); } }; - var find = function (x, _param) { + let find = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var c = Curry._2(funarg.compare, x, param.v); + let c = Curry._2(funarg.compare, x, param.v); if (c === 0) { return param.d; } @@ -164,31 +164,31 @@ function Make(funarg) { continue ; }; }; - var find_first = function (f, _param) { + let find_first = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _d0 = param.d; - var _param$1 = param.l; + let _v0 = v; + let _d0 = param.d; + let _param$1 = param.l; while(true) { - var param$1 = _param$1; - var d0 = _d0; - var v0 = _v0; + let param$1 = _param$1; + let d0 = _d0; + let v0 = _v0; if (typeof param$1 !== "object") { return [ v0, d0 ]; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.l; _d0 = param$1.d; @@ -203,28 +203,28 @@ function Make(funarg) { continue ; }; }; - var find_first_opt = function (f, _param) { + let find_first_opt = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _d0 = param.d; - var _param$1 = param.l; + let _v0 = v; + let _d0 = param.d; + let _param$1 = param.l; while(true) { - var param$1 = _param$1; - var d0 = _d0; - var v0 = _v0; + let param$1 = _param$1; + let d0 = _d0; + let v0 = _v0; if (typeof param$1 !== "object") { return [ v0, d0 ]; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.l; _d0 = param$1.d; @@ -239,31 +239,31 @@ function Make(funarg) { continue ; }; }; - var find_last = function (f, _param) { + let find_last = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _d0 = param.d; - var _param$1 = param.r; + let _v0 = v; + let _d0 = param.d; + let _param$1 = param.r; while(true) { - var param$1 = _param$1; - var d0 = _d0; - var v0 = _v0; + let param$1 = _param$1; + let d0 = _d0; + let v0 = _v0; if (typeof param$1 !== "object") { return [ v0, d0 ]; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.r; _d0 = param$1.d; @@ -278,28 +278,28 @@ function Make(funarg) { continue ; }; }; - var find_last_opt = function (f, _param) { + let find_last_opt = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _d0 = param.d; - var _param$1 = param.r; + let _v0 = v; + let _d0 = param.d; + let _param$1 = param.r; while(true) { - var param$1 = _param$1; - var d0 = _d0; - var v0 = _v0; + let param$1 = _param$1; + let d0 = _d0; + let v0 = _v0; if (typeof param$1 !== "object") { return [ v0, d0 ]; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.r; _d0 = param$1.d; @@ -314,13 +314,13 @@ function Make(funarg) { continue ; }; }; - var find_opt = function (x, _param) { + let find_opt = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var c = Curry._2(funarg.compare, x, param.v); + let c = Curry._2(funarg.compare, x, param.v); if (c === 0) { return Caml_option.some(param.d); } @@ -328,13 +328,13 @@ function Make(funarg) { continue ; }; }; - var mem = function (x, _param) { + let mem = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } - var c = Curry._2(funarg.compare, x, param.v); + let c = Curry._2(funarg.compare, x, param.v); if (c === 0) { return true; } @@ -342,16 +342,16 @@ function Make(funarg) { continue ; }; }; - var min_binding = function (_param) { + let min_binding = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return [ param.v, @@ -362,13 +362,13 @@ function Make(funarg) { continue ; }; }; - var min_binding_opt = function (_param) { + let min_binding_opt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return [ param.v, @@ -379,16 +379,16 @@ function Make(funarg) { continue ; }; }; - var max_binding = function (_param) { + let max_binding = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return [ param.v, @@ -399,13 +399,13 @@ function Make(funarg) { continue ; }; }; - var max_binding_opt = function (_param) { + let max_binding_opt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return [ param.v, @@ -416,7 +416,7 @@ function Make(funarg) { continue ; }; }; - var remove_min_binding = function (param) { + let remove_min_binding = function (param) { if (typeof param !== "object") { throw { RE_EXN_ID: "Invalid_argument", @@ -424,53 +424,53 @@ function Make(funarg) { Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return param.r; } else { return bal(remove_min_binding(l), param.v, param.d, param.r); } }; - var merge = function (t1, t2) { + let merge = function (t1, t2) { if (typeof t1 !== "object") { return t2; } if (typeof t2 !== "object") { return t1; } - var match = min_binding(t2); + let match = min_binding(t2); return bal(t1, match[0], match[1], remove_min_binding(t2)); }; - var remove = function (x, param) { + let remove = function (x, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Curry._2(funarg.compare, x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { return merge(l, r); } if (c < 0) { - var ll = remove(x, l); + let ll = remove(x, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = remove(x, r); + let rr = remove(x, r); if (r === rr) { return param; } else { return bal(l, v, d, rr); } }; - var update = function (x, f, param) { + let update = function (x, f, param) { if (typeof param !== "object") { - var data = Curry._1(f, undefined); + let data = Curry._1(f, undefined); if (data !== undefined) { return { TAG: "Node", @@ -484,17 +484,17 @@ function Make(funarg) { return "Empty"; } } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Curry._2(funarg.compare, x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { - var data$1 = Curry._1(f, Caml_option.some(d)); + let data$1 = Curry._1(f, Caml_option.some(d)); if (data$1 === undefined) { return merge(l, r); } - var data$2 = Caml_option.valFromOption(data$1); + let data$2 = Caml_option.valFromOption(data$1); if (d === data$2) { return param; } else { @@ -509,23 +509,23 @@ function Make(funarg) { } } if (c < 0) { - var ll = update(x, f, l); + let ll = update(x, f, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = update(x, f, r); + let rr = update(x, f, r); if (r === rr) { return param; } else { return bal(l, v, d, rr); } }; - var iter = function (f, _param) { + let iter = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } @@ -535,13 +535,13 @@ function Make(funarg) { continue ; }; }; - var map = function (f, param) { + let map = function (f, param) { if (typeof param !== "object") { return "Empty"; } - var l$p = map(f, param.l); - var d$p = Curry._1(f, param.d); - var r$p = map(f, param.r); + let l$p = map(f, param.l); + let d$p = Curry._1(f, param.d); + let r$p = map(f, param.r); return { TAG: "Node", l: l$p, @@ -551,14 +551,14 @@ function Make(funarg) { h: param.h }; }; - var mapi = function (f, param) { + let mapi = function (f, param) { if (typeof param !== "object") { return "Empty"; } - var v = param.v; - var l$p = mapi(f, param.l); - var d$p = Curry._2(f, v, param.d); - var r$p = mapi(f, param.r); + let v = param.v; + let l$p = mapi(f, param.l); + let d$p = Curry._2(f, v, param.d); + let r$p = mapi(f, param.r); return { TAG: "Node", l: l$p, @@ -568,10 +568,10 @@ function Make(funarg) { h: param.h }; }; - var fold = function (f, _m, _accu) { + let fold = function (f, _m, _accu) { while(true) { - var accu = _accu; - var m = _m; + let accu = _accu; + let m = _m; if (typeof m !== "object") { return accu; } @@ -580,9 +580,9 @@ function Make(funarg) { continue ; }; }; - var for_all = function (p, _param) { + let for_all = function (p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return true; } @@ -596,9 +596,9 @@ function Make(funarg) { continue ; }; }; - var exists = function (p, _param) { + let exists = function (p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } @@ -612,29 +612,29 @@ function Make(funarg) { continue ; }; }; - var add_min_binding = function (k, x, param) { + let add_min_binding = function (k, x, param) { if (typeof param !== "object") { return singleton(k, x); } else { return bal(add_min_binding(k, x, param.l), param.v, param.d, param.r); } }; - var add_max_binding = function (k, x, param) { + let add_max_binding = function (k, x, param) { if (typeof param !== "object") { return singleton(k, x); } else { return bal(param.l, param.v, param.d, add_max_binding(k, x, param.r)); } }; - var join = function (l, v, d, r) { + let join = function (l, v, d, r) { if (typeof l !== "object") { return add_min_binding(v, d, r); } - var lh = l.h; + let lh = l.h; if (typeof r !== "object") { return add_max_binding(v, d, l); } - var rh = r.h; + let rh = r.h; if (lh > (rh + 2 | 0)) { return bal(l.l, l.v, l.d, join(l.r, v, d, r)); } else if (rh > (lh + 2 | 0)) { @@ -643,24 +643,24 @@ function Make(funarg) { return create(l, v, d, r); } }; - var concat = function (t1, t2) { + let concat = function (t1, t2) { if (typeof t1 !== "object") { return t2; } if (typeof t2 !== "object") { return t1; } - var match = min_binding(t2); + let match = min_binding(t2); return join(t1, match[0], match[1], remove_min_binding(t2)); }; - var concat_or_join = function (t1, v, d, t2) { + let concat_or_join = function (t1, v, d, t2) { if (d !== undefined) { return join(t1, v, Caml_option.valFromOption(d), t2); } else { return concat(t1, t2); } }; - var split = function (x, param) { + let split = function (x, param) { if (typeof param !== "object") { return [ "Empty", @@ -668,11 +668,11 @@ function Make(funarg) { "Empty" ]; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Curry._2(funarg.compare, x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { return [ l, @@ -681,30 +681,30 @@ function Make(funarg) { ]; } if (c < 0) { - var match = split(x, l); + let match = split(x, l); return [ match[0], match[1], join(match[2], v, d, r) ]; } - var match$1 = split(x, r); + let match$1 = split(x, r); return [ join(l, v, d, match$1[0]), match$1[1], match$1[2] ]; }; - var merge$1 = function (f, s1, s2) { + let merge$1 = function (f, s1, s2) { if (typeof s1 !== "object") { if (typeof s2 !== "object") { return "Empty"; } } else { - var v1 = s1.v; + let v1 = s1.v; if (s1.h >= height(s2)) { - var match = split(v1, s2); + let match = split(v1, s2); return concat_or_join(merge$1(f, s1.l, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2])); } @@ -720,53 +720,53 @@ function Make(funarg) { Error: new Error() }; } - var v2 = s2.v; - var match$1 = split(v2, s1); + let v2 = s2.v; + let match$1 = split(v2, s1); return concat_or_join(merge$1(f, match$1[0], s2.l), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r)); }; - var union = function (f, s1, s2) { + let union = function (f, s1, s2) { if (typeof s1 !== "object") { return s2; } - var d1 = s1.d; - var v1 = s1.v; + let d1 = s1.d; + let v1 = s1.v; if (typeof s2 !== "object") { return s1; } - var d2 = s2.d; - var v2 = s2.v; + let d2 = s2.d; + let v2 = s2.v; if (s1.h >= s2.h) { - var match = split(v1, s2); - var d2$1 = match[1]; - var l = union(f, s1.l, match[0]); - var r = union(f, s1.r, match[2]); + let match = split(v1, s2); + let d2$1 = match[1]; + let l = union(f, s1.l, match[0]); + let r = union(f, s1.r, match[2]); if (d2$1 !== undefined) { return concat_or_join(l, v1, Curry._3(f, v1, d1, Caml_option.valFromOption(d2$1)), r); } else { return join(l, v1, d1, r); } } - var match$1 = split(v2, s1); - var d1$1 = match$1[1]; - var l$1 = union(f, match$1[0], s2.l); - var r$1 = union(f, match$1[2], s2.r); + let match$1 = split(v2, s1); + let d1$1 = match$1[1]; + let l$1 = union(f, match$1[0], s2.l); + let r$1 = union(f, match$1[2], s2.r); if (d1$1 !== undefined) { return concat_or_join(l$1, v2, Curry._3(f, v2, Caml_option.valFromOption(d1$1), d2), r$1); } else { return join(l$1, v2, d2, r$1); } }; - var filter = function (p, param) { + let filter = function (p, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var l$p = filter(p, l); - var pvd = Curry._2(p, v, d); - var r$p = filter(p, r); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let l$p = filter(p, l); + let pvd = Curry._2(p, v, d); + let r$p = filter(p, r); if (pvd) { if (l === l$p && r === r$p) { return param; @@ -777,22 +777,22 @@ function Make(funarg) { return concat(l$p, r$p); } }; - var partition = function (p, param) { + let partition = function (p, param) { if (typeof param !== "object") { return [ "Empty", "Empty" ]; } - var d = param.d; - var v = param.v; - var match = partition(p, param.l); - var lf = match[1]; - var lt = match[0]; - var pvd = Curry._2(p, v, d); - var match$1 = partition(p, param.r); - var rf = match$1[1]; - var rt = match$1[0]; + let d = param.d; + let v = param.v; + let match = partition(p, param.l); + let lf = match[1]; + let lt = match[0]; + let pvd = Curry._2(p, v, d); + let match$1 = partition(p, param.r); + let rf = match$1[1]; + let rt = match$1[0]; if (pvd) { return [ join(lt, v, d, rt), @@ -805,10 +805,10 @@ function Make(funarg) { ]; } }; - var cons_enum = function (_m, _e) { + let cons_enum = function (_m, _e) { while(true) { - var e = _e; - var m = _m; + let e = _e; + let m = _m; if (typeof m !== "object") { return e; } @@ -823,12 +823,12 @@ function Make(funarg) { continue ; }; }; - var compare = function (cmp, m1, m2) { - var _e1 = cons_enum(m1, "End"); - var _e2 = cons_enum(m2, "End"); + let compare = function (cmp, m1, m2) { + let _e1 = cons_enum(m1, "End"); + let _e2 = cons_enum(m2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return 0; @@ -839,11 +839,11 @@ function Make(funarg) { if (typeof e2 !== "object") { return 1; } - var c = Curry._2(funarg.compare, e1._0, e2._0); + let c = Curry._2(funarg.compare, e1._0, e2._0); if (c !== 0) { return c; } - var c$1 = Curry._2(cmp, e1._1, e2._1); + let c$1 = Curry._2(cmp, e1._1, e2._1); if (c$1 !== 0) { return c$1; } @@ -852,12 +852,12 @@ function Make(funarg) { continue ; }; }; - var equal = function (cmp, m1, m2) { - var _e1 = cons_enum(m1, "End"); - var _e2 = cons_enum(m2, "End"); + let equal = function (cmp, m1, m2) { + let _e1 = cons_enum(m1, "End"); + let _e2 = cons_enum(m2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return true; @@ -879,17 +879,17 @@ function Make(funarg) { continue ; }; }; - var cardinal = function (param) { + let cardinal = function (param) { if (typeof param !== "object") { return 0; } else { return (cardinal(param.l) + 1 | 0) + cardinal(param.r) | 0; } }; - var bindings_aux = function (_accu, _param) { + let bindings_aux = function (_accu, _param) { while(true) { - var param = _param; - var accu = _accu; + let param = _param; + let accu = _accu; if (typeof param !== "object") { return accu; } @@ -904,7 +904,7 @@ function Make(funarg) { continue ; }; }; - var bindings = function (s) { + let bindings = function (s) { return bindings_aux(/* [] */0, s); }; return { diff --git a/lib/js/mapLabels.js b/lib/js/mapLabels.js index 4f1bd203fd..c86e441772 100644 --- a/lib/js/mapLabels.js +++ b/lib/js/mapLabels.js @@ -1,19 +1,19 @@ 'use strict'; -var Curry = require("./curry.js"); -var Caml_option = require("./caml_option.js"); +let Curry = require("./curry.js"); +let Caml_option = require("./caml_option.js"); function Make(Ord) { - var height = function (param) { + let height = function (param) { if (typeof param !== "object") { return 0; } else { return param.h; } }; - var create = function (l, x, d, r) { - var hl = height(l); - var hr = height(r); + let create = function (l, x, d, r) { + let hl = height(l); + let hr = height(r); return { TAG: "Node", l: l, @@ -23,7 +23,7 @@ function Make(Ord) { h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0 }; }; - var singleton = function (x, d) { + let singleton = function (x, d) { return { TAG: "Node", l: "Empty", @@ -33,10 +33,10 @@ function Make(Ord) { h: 1 }; }; - var bal = function (l, x, d, r) { - var hl; + let bal = function (l, x, d, r) { + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -46,10 +46,10 @@ function Make(Ord) { Error: new Error() }; } - var lr = l.r; - var ld = l.d; - var lv = l.v; - var ll = l.l; + let lr = l.r; + let ld = l.d; + let lv = l.v; + let ll = l.l; if (height(ll) >= height(lr)) { return create(ll, lv, ld, create(lr, x, d, r)); } @@ -79,10 +79,10 @@ function Make(Ord) { Error: new Error() }; } - var rr = r.r; - var rd = r.d; - var rv = r.v; - var rl = r.l; + let rr = r.r; + let rd = r.d; + let rv = r.v; + let rl = r.l; if (height(rr) >= height(rl)) { return create(create(l, x, d, rl), rv, rd, rr); } @@ -95,14 +95,14 @@ function Make(Ord) { Error: new Error() }; }; - var is_empty = function (param) { + let is_empty = function (param) { if (typeof param !== "object") { return true; } else { return false; } }; - var add = function (x, data, param) { + let add = function (x, data, param) { if (typeof param !== "object") { return { TAG: "Node", @@ -113,11 +113,11 @@ function Make(Ord) { h: 1 }; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Curry._2(Ord.compare, x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Curry._2(Ord.compare, x, v); if (c === 0) { if (d === data) { return param; @@ -133,30 +133,30 @@ function Make(Ord) { } } if (c < 0) { - var ll = add(x, data, l); + let ll = add(x, data, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = add(x, data, r); + let rr = add(x, data, r); if (r === rr) { return param; } else { return bal(l, v, d, rr); } }; - var find = function (x, _param) { + let find = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var c = Curry._2(Ord.compare, x, param.v); + let c = Curry._2(Ord.compare, x, param.v); if (c === 0) { return param.d; } @@ -164,18 +164,18 @@ function Make(Ord) { continue ; }; }; - var find_first_aux = function (_v0, _d0, f, _param) { + let find_first_aux = function (_v0, _d0, f, _param) { while(true) { - var param = _param; - var d0 = _d0; - var v0 = _v0; + let param = _param; + let d0 = _d0; + let v0 = _v0; if (typeof param !== "object") { return [ v0, d0 ]; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.l; _d0 = param.d; @@ -186,16 +186,16 @@ function Make(Ord) { continue ; }; }; - var find_first = function (f, _param) { + let find_first = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_first_aux(v, param.d, f, param.l); } @@ -203,18 +203,18 @@ function Make(Ord) { continue ; }; }; - var find_first_opt_aux = function (_v0, _d0, f, _param) { + let find_first_opt_aux = function (_v0, _d0, f, _param) { while(true) { - var param = _param; - var d0 = _d0; - var v0 = _v0; + let param = _param; + let d0 = _d0; + let v0 = _v0; if (typeof param !== "object") { return [ v0, d0 ]; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.l; _d0 = param.d; @@ -225,13 +225,13 @@ function Make(Ord) { continue ; }; }; - var find_first_opt = function (f, _param) { + let find_first_opt = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_first_opt_aux(v, param.d, f, param.l); } @@ -239,18 +239,18 @@ function Make(Ord) { continue ; }; }; - var find_last_aux = function (_v0, _d0, f, _param) { + let find_last_aux = function (_v0, _d0, f, _param) { while(true) { - var param = _param; - var d0 = _d0; - var v0 = _v0; + let param = _param; + let d0 = _d0; + let v0 = _v0; if (typeof param !== "object") { return [ v0, d0 ]; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.r; _d0 = param.d; @@ -261,16 +261,16 @@ function Make(Ord) { continue ; }; }; - var find_last = function (f, _param) { + let find_last = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_last_aux(v, param.d, f, param.r); } @@ -278,18 +278,18 @@ function Make(Ord) { continue ; }; }; - var find_last_opt_aux = function (_v0, _d0, f, _param) { + let find_last_opt_aux = function (_v0, _d0, f, _param) { while(true) { - var param = _param; - var d0 = _d0; - var v0 = _v0; + let param = _param; + let d0 = _d0; + let v0 = _v0; if (typeof param !== "object") { return [ v0, d0 ]; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.r; _d0 = param.d; @@ -300,13 +300,13 @@ function Make(Ord) { continue ; }; }; - var find_last_opt = function (f, _param) { + let find_last_opt = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_last_opt_aux(v, param.d, f, param.r); } @@ -314,13 +314,13 @@ function Make(Ord) { continue ; }; }; - var find_opt = function (x, _param) { + let find_opt = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var c = Curry._2(Ord.compare, x, param.v); + let c = Curry._2(Ord.compare, x, param.v); if (c === 0) { return Caml_option.some(param.d); } @@ -328,13 +328,13 @@ function Make(Ord) { continue ; }; }; - var mem = function (x, _param) { + let mem = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } - var c = Curry._2(Ord.compare, x, param.v); + let c = Curry._2(Ord.compare, x, param.v); if (c === 0) { return true; } @@ -342,16 +342,16 @@ function Make(Ord) { continue ; }; }; - var min_binding = function (_param) { + let min_binding = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return [ param.v, @@ -362,13 +362,13 @@ function Make(Ord) { continue ; }; }; - var min_binding_opt = function (_param) { + let min_binding_opt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return [ param.v, @@ -379,16 +379,16 @@ function Make(Ord) { continue ; }; }; - var max_binding = function (_param) { + let max_binding = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return [ param.v, @@ -399,13 +399,13 @@ function Make(Ord) { continue ; }; }; - var max_binding_opt = function (_param) { + let max_binding_opt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return [ param.v, @@ -416,7 +416,7 @@ function Make(Ord) { continue ; }; }; - var remove_min_binding = function (param) { + let remove_min_binding = function (param) { if (typeof param !== "object") { throw { RE_EXN_ID: "Invalid_argument", @@ -424,53 +424,53 @@ function Make(Ord) { Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return param.r; } else { return bal(remove_min_binding(l), param.v, param.d, param.r); } }; - var merge = function (t1, t2) { + let merge = function (t1, t2) { if (typeof t1 !== "object") { return t2; } if (typeof t2 !== "object") { return t1; } - var match = min_binding(t2); + let match = min_binding(t2); return bal(t1, match[0], match[1], remove_min_binding(t2)); }; - var remove = function (x, param) { + let remove = function (x, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Curry._2(Ord.compare, x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Curry._2(Ord.compare, x, v); if (c === 0) { return merge(l, r); } if (c < 0) { - var ll = remove(x, l); + let ll = remove(x, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = remove(x, r); + let rr = remove(x, r); if (r === rr) { return param; } else { return bal(l, v, d, rr); } }; - var update = function (x, f, param) { + let update = function (x, f, param) { if (typeof param !== "object") { - var data = Curry._1(f, undefined); + let data = Curry._1(f, undefined); if (data !== undefined) { return { TAG: "Node", @@ -484,17 +484,17 @@ function Make(Ord) { return "Empty"; } } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Curry._2(Ord.compare, x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Curry._2(Ord.compare, x, v); if (c === 0) { - var data$1 = Curry._1(f, Caml_option.some(d)); + let data$1 = Curry._1(f, Caml_option.some(d)); if (data$1 === undefined) { return merge(l, r); } - var data$2 = Caml_option.valFromOption(data$1); + let data$2 = Caml_option.valFromOption(data$1); if (d === data$2) { return param; } else { @@ -509,23 +509,23 @@ function Make(Ord) { } } if (c < 0) { - var ll = update(x, f, l); + let ll = update(x, f, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = update(x, f, r); + let rr = update(x, f, r); if (r === rr) { return param; } else { return bal(l, v, d, rr); } }; - var iter = function (f, _param) { + let iter = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } @@ -535,13 +535,13 @@ function Make(Ord) { continue ; }; }; - var map = function (f, param) { + let map = function (f, param) { if (typeof param !== "object") { return "Empty"; } - var l$p = map(f, param.l); - var d$p = Curry._1(f, param.d); - var r$p = map(f, param.r); + let l$p = map(f, param.l); + let d$p = Curry._1(f, param.d); + let r$p = map(f, param.r); return { TAG: "Node", l: l$p, @@ -551,14 +551,14 @@ function Make(Ord) { h: param.h }; }; - var mapi = function (f, param) { + let mapi = function (f, param) { if (typeof param !== "object") { return "Empty"; } - var v = param.v; - var l$p = mapi(f, param.l); - var d$p = Curry._2(f, v, param.d); - var r$p = mapi(f, param.r); + let v = param.v; + let l$p = mapi(f, param.l); + let d$p = Curry._2(f, v, param.d); + let r$p = mapi(f, param.r); return { TAG: "Node", l: l$p, @@ -568,10 +568,10 @@ function Make(Ord) { h: param.h }; }; - var fold = function (f, _m, _accu) { + let fold = function (f, _m, _accu) { while(true) { - var accu = _accu; - var m = _m; + let accu = _accu; + let m = _m; if (typeof m !== "object") { return accu; } @@ -580,9 +580,9 @@ function Make(Ord) { continue ; }; }; - var for_all = function (p, _param) { + let for_all = function (p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return true; } @@ -596,9 +596,9 @@ function Make(Ord) { continue ; }; }; - var exists = function (p, _param) { + let exists = function (p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } @@ -612,29 +612,29 @@ function Make(Ord) { continue ; }; }; - var add_min_binding = function (k, x, param) { + let add_min_binding = function (k, x, param) { if (typeof param !== "object") { return singleton(k, x); } else { return bal(add_min_binding(k, x, param.l), param.v, param.d, param.r); } }; - var add_max_binding = function (k, x, param) { + let add_max_binding = function (k, x, param) { if (typeof param !== "object") { return singleton(k, x); } else { return bal(param.l, param.v, param.d, add_max_binding(k, x, param.r)); } }; - var join = function (l, v, d, r) { + let join = function (l, v, d, r) { if (typeof l !== "object") { return add_min_binding(v, d, r); } - var lh = l.h; + let lh = l.h; if (typeof r !== "object") { return add_max_binding(v, d, l); } - var rh = r.h; + let rh = r.h; if (lh > (rh + 2 | 0)) { return bal(l.l, l.v, l.d, join(l.r, v, d, r)); } else if (rh > (lh + 2 | 0)) { @@ -643,24 +643,24 @@ function Make(Ord) { return create(l, v, d, r); } }; - var concat = function (t1, t2) { + let concat = function (t1, t2) { if (typeof t1 !== "object") { return t2; } if (typeof t2 !== "object") { return t1; } - var match = min_binding(t2); + let match = min_binding(t2); return join(t1, match[0], match[1], remove_min_binding(t2)); }; - var concat_or_join = function (t1, v, d, t2) { + let concat_or_join = function (t1, v, d, t2) { if (d !== undefined) { return join(t1, v, Caml_option.valFromOption(d), t2); } else { return concat(t1, t2); } }; - var split = function (x, param) { + let split = function (x, param) { if (typeof param !== "object") { return [ "Empty", @@ -668,11 +668,11 @@ function Make(Ord) { "Empty" ]; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Curry._2(Ord.compare, x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Curry._2(Ord.compare, x, v); if (c === 0) { return [ l, @@ -681,30 +681,30 @@ function Make(Ord) { ]; } if (c < 0) { - var match = split(x, l); + let match = split(x, l); return [ match[0], match[1], join(match[2], v, d, r) ]; } - var match$1 = split(x, r); + let match$1 = split(x, r); return [ join(l, v, d, match$1[0]), match$1[1], match$1[2] ]; }; - var merge$1 = function (f, s1, s2) { + let merge$1 = function (f, s1, s2) { if (typeof s1 !== "object") { if (typeof s2 !== "object") { return "Empty"; } } else { - var v1 = s1.v; + let v1 = s1.v; if (s1.h >= height(s2)) { - var match = split(v1, s2); + let match = split(v1, s2); return concat_or_join(merge$1(f, s1.l, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2])); } @@ -720,53 +720,53 @@ function Make(Ord) { Error: new Error() }; } - var v2 = s2.v; - var match$1 = split(v2, s1); + let v2 = s2.v; + let match$1 = split(v2, s1); return concat_or_join(merge$1(f, match$1[0], s2.l), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r)); }; - var union = function (f, s1, s2) { + let union = function (f, s1, s2) { if (typeof s1 !== "object") { return s2; } - var d1 = s1.d; - var v1 = s1.v; + let d1 = s1.d; + let v1 = s1.v; if (typeof s2 !== "object") { return s1; } - var d2 = s2.d; - var v2 = s2.v; + let d2 = s2.d; + let v2 = s2.v; if (s1.h >= s2.h) { - var match = split(v1, s2); - var d2$1 = match[1]; - var l = union(f, s1.l, match[0]); - var r = union(f, s1.r, match[2]); + let match = split(v1, s2); + let d2$1 = match[1]; + let l = union(f, s1.l, match[0]); + let r = union(f, s1.r, match[2]); if (d2$1 !== undefined) { return concat_or_join(l, v1, Curry._3(f, v1, d1, Caml_option.valFromOption(d2$1)), r); } else { return join(l, v1, d1, r); } } - var match$1 = split(v2, s1); - var d1$1 = match$1[1]; - var l$1 = union(f, match$1[0], s2.l); - var r$1 = union(f, match$1[2], s2.r); + let match$1 = split(v2, s1); + let d1$1 = match$1[1]; + let l$1 = union(f, match$1[0], s2.l); + let r$1 = union(f, match$1[2], s2.r); if (d1$1 !== undefined) { return concat_or_join(l$1, v2, Curry._3(f, v2, Caml_option.valFromOption(d1$1), d2), r$1); } else { return join(l$1, v2, d2, r$1); } }; - var filter = function (p, param) { + let filter = function (p, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var l$p = filter(p, l); - var pvd = Curry._2(p, v, d); - var r$p = filter(p, r); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let l$p = filter(p, l); + let pvd = Curry._2(p, v, d); + let r$p = filter(p, r); if (pvd) { if (l === l$p && r === r$p) { return param; @@ -777,22 +777,22 @@ function Make(Ord) { return concat(l$p, r$p); } }; - var partition = function (p, param) { + let partition = function (p, param) { if (typeof param !== "object") { return [ "Empty", "Empty" ]; } - var d = param.d; - var v = param.v; - var match = partition(p, param.l); - var lf = match[1]; - var lt = match[0]; - var pvd = Curry._2(p, v, d); - var match$1 = partition(p, param.r); - var rf = match$1[1]; - var rt = match$1[0]; + let d = param.d; + let v = param.v; + let match = partition(p, param.l); + let lf = match[1]; + let lt = match[0]; + let pvd = Curry._2(p, v, d); + let match$1 = partition(p, param.r); + let rf = match$1[1]; + let rt = match$1[0]; if (pvd) { return [ join(lt, v, d, rt), @@ -805,10 +805,10 @@ function Make(Ord) { ]; } }; - var cons_enum = function (_m, _e) { + let cons_enum = function (_m, _e) { while(true) { - var e = _e; - var m = _m; + let e = _e; + let m = _m; if (typeof m !== "object") { return e; } @@ -823,12 +823,12 @@ function Make(Ord) { continue ; }; }; - var compare = function (cmp, m1, m2) { - var _e1 = cons_enum(m1, "End"); - var _e2 = cons_enum(m2, "End"); + let compare = function (cmp, m1, m2) { + let _e1 = cons_enum(m1, "End"); + let _e2 = cons_enum(m2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return 0; @@ -839,11 +839,11 @@ function Make(Ord) { if (typeof e2 !== "object") { return 1; } - var c = Curry._2(Ord.compare, e1._0, e2._0); + let c = Curry._2(Ord.compare, e1._0, e2._0); if (c !== 0) { return c; } - var c$1 = Curry._2(cmp, e1._1, e2._1); + let c$1 = Curry._2(cmp, e1._1, e2._1); if (c$1 !== 0) { return c$1; } @@ -852,12 +852,12 @@ function Make(Ord) { continue ; }; }; - var equal = function (cmp, m1, m2) { - var _e1 = cons_enum(m1, "End"); - var _e2 = cons_enum(m2, "End"); + let equal = function (cmp, m1, m2) { + let _e1 = cons_enum(m1, "End"); + let _e2 = cons_enum(m2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return true; @@ -879,17 +879,17 @@ function Make(Ord) { continue ; }; }; - var cardinal = function (param) { + let cardinal = function (param) { if (typeof param !== "object") { return 0; } else { return (cardinal(param.l) + 1 | 0) + cardinal(param.r) | 0; } }; - var bindings_aux = function (_accu, _param) { + let bindings_aux = function (_accu, _param) { while(true) { - var param = _param; - var accu = _accu; + let param = _param; + let accu = _accu; if (typeof param !== "object") { return accu; } @@ -904,7 +904,7 @@ function Make(Ord) { continue ; }; }; - var bindings = function (s) { + let bindings = function (s) { return bindings_aux(/* [] */0, s); }; return { diff --git a/lib/js/moreLabels.js b/lib/js/moreLabels.js index 0926d6db97..9f2fde45f1 100644 --- a/lib/js/moreLabels.js +++ b/lib/js/moreLabels.js @@ -1,11 +1,11 @@ 'use strict'; -var List = require("./list.js"); -var Curry = require("./curry.js"); -var Caml_option = require("./caml_option.js"); -var HashtblLabels = require("./hashtblLabels.js"); +let List = require("./list.js"); +let Curry = require("./curry.js"); +let Caml_option = require("./caml_option.js"); +let HashtblLabels = require("./hashtblLabels.js"); -var Hashtbl = { +let Hashtbl = { create: HashtblLabels.create, clear: HashtblLabels.clear, reset: HashtblLabels.reset, @@ -32,18 +32,18 @@ var Hashtbl = { seeded_hash_param: HashtblLabels.seeded_hash_param }; -var $$Map = { +let $$Map = { Make: (function (funarg) { - var height = function (param) { + let height = function (param) { if (typeof param !== "object") { return 0; } else { return param.h; } }; - var create = function (l, x, d, r) { - var hl = height(l); - var hr = height(r); + let create = function (l, x, d, r) { + let hl = height(l); + let hr = height(r); return { TAG: "Node", l: l, @@ -53,7 +53,7 @@ var $$Map = { h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0 }; }; - var singleton = function (x, d) { + let singleton = function (x, d) { return { TAG: "Node", l: "Empty", @@ -63,10 +63,10 @@ var $$Map = { h: 1 }; }; - var bal = function (l, x, d, r) { - var hl; + let bal = function (l, x, d, r) { + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -76,10 +76,10 @@ var $$Map = { Error: new Error() }; } - var lr = l.r; - var ld = l.d; - var lv = l.v; - var ll = l.l; + let lr = l.r; + let ld = l.d; + let lv = l.v; + let ll = l.l; if (height(ll) >= height(lr)) { return create(ll, lv, ld, create(lr, x, d, r)); } @@ -109,10 +109,10 @@ var $$Map = { Error: new Error() }; } - var rr = r.r; - var rd = r.d; - var rv = r.v; - var rl = r.l; + let rr = r.r; + let rd = r.d; + let rv = r.v; + let rl = r.l; if (height(rr) >= height(rl)) { return create(create(l, x, d, rl), rv, rd, rr); } @@ -125,14 +125,14 @@ var $$Map = { Error: new Error() }; }; - var is_empty = function (param) { + let is_empty = function (param) { if (typeof param !== "object") { return true; } else { return false; } }; - var add = function (x, data, param) { + let add = function (x, data, param) { if (typeof param !== "object") { return { TAG: "Node", @@ -143,11 +143,11 @@ var $$Map = { h: 1 }; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Curry._2(funarg.compare, x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { if (d === data) { return param; @@ -163,30 +163,30 @@ var $$Map = { } } if (c < 0) { - var ll = add(x, data, l); + let ll = add(x, data, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = add(x, data, r); + let rr = add(x, data, r); if (r === rr) { return param; } else { return bal(l, v, d, rr); } }; - var find = function (x, _param) { + let find = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var c = Curry._2(funarg.compare, x, param.v); + let c = Curry._2(funarg.compare, x, param.v); if (c === 0) { return param.d; } @@ -194,18 +194,18 @@ var $$Map = { continue ; }; }; - var find_first_aux = function (_v0, _d0, f, _param) { + let find_first_aux = function (_v0, _d0, f, _param) { while(true) { - var param = _param; - var d0 = _d0; - var v0 = _v0; + let param = _param; + let d0 = _d0; + let v0 = _v0; if (typeof param !== "object") { return [ v0, d0 ]; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.l; _d0 = param.d; @@ -216,16 +216,16 @@ var $$Map = { continue ; }; }; - var find_first = function (f, _param) { + let find_first = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_first_aux(v, param.d, f, param.l); } @@ -233,18 +233,18 @@ var $$Map = { continue ; }; }; - var find_first_opt_aux = function (_v0, _d0, f, _param) { + let find_first_opt_aux = function (_v0, _d0, f, _param) { while(true) { - var param = _param; - var d0 = _d0; - var v0 = _v0; + let param = _param; + let d0 = _d0; + let v0 = _v0; if (typeof param !== "object") { return [ v0, d0 ]; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.l; _d0 = param.d; @@ -255,13 +255,13 @@ var $$Map = { continue ; }; }; - var find_first_opt = function (f, _param) { + let find_first_opt = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_first_opt_aux(v, param.d, f, param.l); } @@ -269,18 +269,18 @@ var $$Map = { continue ; }; }; - var find_last_aux = function (_v0, _d0, f, _param) { + let find_last_aux = function (_v0, _d0, f, _param) { while(true) { - var param = _param; - var d0 = _d0; - var v0 = _v0; + let param = _param; + let d0 = _d0; + let v0 = _v0; if (typeof param !== "object") { return [ v0, d0 ]; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.r; _d0 = param.d; @@ -291,16 +291,16 @@ var $$Map = { continue ; }; }; - var find_last = function (f, _param) { + let find_last = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_last_aux(v, param.d, f, param.r); } @@ -308,18 +308,18 @@ var $$Map = { continue ; }; }; - var find_last_opt_aux = function (_v0, _d0, f, _param) { + let find_last_opt_aux = function (_v0, _d0, f, _param) { while(true) { - var param = _param; - var d0 = _d0; - var v0 = _v0; + let param = _param; + let d0 = _d0; + let v0 = _v0; if (typeof param !== "object") { return [ v0, d0 ]; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.r; _d0 = param.d; @@ -330,13 +330,13 @@ var $$Map = { continue ; }; }; - var find_last_opt = function (f, _param) { + let find_last_opt = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_last_opt_aux(v, param.d, f, param.r); } @@ -344,13 +344,13 @@ var $$Map = { continue ; }; }; - var find_opt = function (x, _param) { + let find_opt = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var c = Curry._2(funarg.compare, x, param.v); + let c = Curry._2(funarg.compare, x, param.v); if (c === 0) { return Caml_option.some(param.d); } @@ -358,13 +358,13 @@ var $$Map = { continue ; }; }; - var mem = function (x, _param) { + let mem = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } - var c = Curry._2(funarg.compare, x, param.v); + let c = Curry._2(funarg.compare, x, param.v); if (c === 0) { return true; } @@ -372,16 +372,16 @@ var $$Map = { continue ; }; }; - var min_binding = function (_param) { + let min_binding = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return [ param.v, @@ -392,13 +392,13 @@ var $$Map = { continue ; }; }; - var min_binding_opt = function (_param) { + let min_binding_opt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return [ param.v, @@ -409,16 +409,16 @@ var $$Map = { continue ; }; }; - var max_binding = function (_param) { + let max_binding = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return [ param.v, @@ -429,13 +429,13 @@ var $$Map = { continue ; }; }; - var max_binding_opt = function (_param) { + let max_binding_opt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return [ param.v, @@ -446,7 +446,7 @@ var $$Map = { continue ; }; }; - var remove_min_binding = function (param) { + let remove_min_binding = function (param) { if (typeof param !== "object") { throw { RE_EXN_ID: "Invalid_argument", @@ -454,53 +454,53 @@ var $$Map = { Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return param.r; } else { return bal(remove_min_binding(l), param.v, param.d, param.r); } }; - var merge = function (t1, t2) { + let merge = function (t1, t2) { if (typeof t1 !== "object") { return t2; } if (typeof t2 !== "object") { return t1; } - var match = min_binding(t2); + let match = min_binding(t2); return bal(t1, match[0], match[1], remove_min_binding(t2)); }; - var remove = function (x, param) { + let remove = function (x, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Curry._2(funarg.compare, x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { return merge(l, r); } if (c < 0) { - var ll = remove(x, l); + let ll = remove(x, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = remove(x, r); + let rr = remove(x, r); if (r === rr) { return param; } else { return bal(l, v, d, rr); } }; - var update = function (x, f, param) { + let update = function (x, f, param) { if (typeof param !== "object") { - var data = Curry._1(f, undefined); + let data = Curry._1(f, undefined); if (data !== undefined) { return { TAG: "Node", @@ -514,17 +514,17 @@ var $$Map = { return "Empty"; } } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Curry._2(funarg.compare, x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { - var data$1 = Curry._1(f, Caml_option.some(d)); + let data$1 = Curry._1(f, Caml_option.some(d)); if (data$1 === undefined) { return merge(l, r); } - var data$2 = Caml_option.valFromOption(data$1); + let data$2 = Caml_option.valFromOption(data$1); if (d === data$2) { return param; } else { @@ -539,23 +539,23 @@ var $$Map = { } } if (c < 0) { - var ll = update(x, f, l); + let ll = update(x, f, l); if (l === ll) { return param; } else { return bal(ll, v, d, r); } } - var rr = update(x, f, r); + let rr = update(x, f, r); if (r === rr) { return param; } else { return bal(l, v, d, rr); } }; - var iter = function (f, _param) { + let iter = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } @@ -565,13 +565,13 @@ var $$Map = { continue ; }; }; - var map = function (f, param) { + let map = function (f, param) { if (typeof param !== "object") { return "Empty"; } - var l$p = map(f, param.l); - var d$p = Curry._1(f, param.d); - var r$p = map(f, param.r); + let l$p = map(f, param.l); + let d$p = Curry._1(f, param.d); + let r$p = map(f, param.r); return { TAG: "Node", l: l$p, @@ -581,14 +581,14 @@ var $$Map = { h: param.h }; }; - var mapi = function (f, param) { + let mapi = function (f, param) { if (typeof param !== "object") { return "Empty"; } - var v = param.v; - var l$p = mapi(f, param.l); - var d$p = Curry._2(f, v, param.d); - var r$p = mapi(f, param.r); + let v = param.v; + let l$p = mapi(f, param.l); + let d$p = Curry._2(f, v, param.d); + let r$p = mapi(f, param.r); return { TAG: "Node", l: l$p, @@ -598,10 +598,10 @@ var $$Map = { h: param.h }; }; - var fold = function (f, _m, _accu) { + let fold = function (f, _m, _accu) { while(true) { - var accu = _accu; - var m = _m; + let accu = _accu; + let m = _m; if (typeof m !== "object") { return accu; } @@ -610,9 +610,9 @@ var $$Map = { continue ; }; }; - var for_all = function (p, _param) { + let for_all = function (p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return true; } @@ -626,9 +626,9 @@ var $$Map = { continue ; }; }; - var exists = function (p, _param) { + let exists = function (p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } @@ -642,29 +642,29 @@ var $$Map = { continue ; }; }; - var add_min_binding = function (k, x, param) { + let add_min_binding = function (k, x, param) { if (typeof param !== "object") { return singleton(k, x); } else { return bal(add_min_binding(k, x, param.l), param.v, param.d, param.r); } }; - var add_max_binding = function (k, x, param) { + let add_max_binding = function (k, x, param) { if (typeof param !== "object") { return singleton(k, x); } else { return bal(param.l, param.v, param.d, add_max_binding(k, x, param.r)); } }; - var join = function (l, v, d, r) { + let join = function (l, v, d, r) { if (typeof l !== "object") { return add_min_binding(v, d, r); } - var lh = l.h; + let lh = l.h; if (typeof r !== "object") { return add_max_binding(v, d, l); } - var rh = r.h; + let rh = r.h; if (lh > (rh + 2 | 0)) { return bal(l.l, l.v, l.d, join(l.r, v, d, r)); } else if (rh > (lh + 2 | 0)) { @@ -673,24 +673,24 @@ var $$Map = { return create(l, v, d, r); } }; - var concat = function (t1, t2) { + let concat = function (t1, t2) { if (typeof t1 !== "object") { return t2; } if (typeof t2 !== "object") { return t1; } - var match = min_binding(t2); + let match = min_binding(t2); return join(t1, match[0], match[1], remove_min_binding(t2)); }; - var concat_or_join = function (t1, v, d, t2) { + let concat_or_join = function (t1, v, d, t2) { if (d !== undefined) { return join(t1, v, Caml_option.valFromOption(d), t2); } else { return concat(t1, t2); } }; - var split = function (x, param) { + let split = function (x, param) { if (typeof param !== "object") { return [ "Empty", @@ -698,11 +698,11 @@ var $$Map = { "Empty" ]; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var c = Curry._2(funarg.compare, x, v); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { return [ l, @@ -711,30 +711,30 @@ var $$Map = { ]; } if (c < 0) { - var match = split(x, l); + let match = split(x, l); return [ match[0], match[1], join(match[2], v, d, r) ]; } - var match$1 = split(x, r); + let match$1 = split(x, r); return [ join(l, v, d, match$1[0]), match$1[1], match$1[2] ]; }; - var merge$1 = function (f, s1, s2) { + let merge$1 = function (f, s1, s2) { if (typeof s1 !== "object") { if (typeof s2 !== "object") { return "Empty"; } } else { - var v1 = s1.v; + let v1 = s1.v; if (s1.h >= height(s2)) { - var match = split(v1, s2); + let match = split(v1, s2); return concat_or_join(merge$1(f, s1.l, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2])); } @@ -750,53 +750,53 @@ var $$Map = { Error: new Error() }; } - var v2 = s2.v; - var match$1 = split(v2, s1); + let v2 = s2.v; + let match$1 = split(v2, s1); return concat_or_join(merge$1(f, match$1[0], s2.l), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r)); }; - var union = function (f, s1, s2) { + let union = function (f, s1, s2) { if (typeof s1 !== "object") { return s2; } - var d1 = s1.d; - var v1 = s1.v; + let d1 = s1.d; + let v1 = s1.v; if (typeof s2 !== "object") { return s1; } - var d2 = s2.d; - var v2 = s2.v; + let d2 = s2.d; + let v2 = s2.v; if (s1.h >= s2.h) { - var match = split(v1, s2); - var d2$1 = match[1]; - var l = union(f, s1.l, match[0]); - var r = union(f, s1.r, match[2]); + let match = split(v1, s2); + let d2$1 = match[1]; + let l = union(f, s1.l, match[0]); + let r = union(f, s1.r, match[2]); if (d2$1 !== undefined) { return concat_or_join(l, v1, Curry._3(f, v1, d1, Caml_option.valFromOption(d2$1)), r); } else { return join(l, v1, d1, r); } } - var match$1 = split(v2, s1); - var d1$1 = match$1[1]; - var l$1 = union(f, match$1[0], s2.l); - var r$1 = union(f, match$1[2], s2.r); + let match$1 = split(v2, s1); + let d1$1 = match$1[1]; + let l$1 = union(f, match$1[0], s2.l); + let r$1 = union(f, match$1[2], s2.r); if (d1$1 !== undefined) { return concat_or_join(l$1, v2, Curry._3(f, v2, Caml_option.valFromOption(d1$1), d2), r$1); } else { return join(l$1, v2, d2, r$1); } }; - var filter = function (p, param) { + let filter = function (p, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var d = param.d; - var v = param.v; - var l = param.l; - var l$p = filter(p, l); - var pvd = Curry._2(p, v, d); - var r$p = filter(p, r); + let r = param.r; + let d = param.d; + let v = param.v; + let l = param.l; + let l$p = filter(p, l); + let pvd = Curry._2(p, v, d); + let r$p = filter(p, r); if (pvd) { if (l === l$p && r === r$p) { return param; @@ -807,22 +807,22 @@ var $$Map = { return concat(l$p, r$p); } }; - var partition = function (p, param) { + let partition = function (p, param) { if (typeof param !== "object") { return [ "Empty", "Empty" ]; } - var d = param.d; - var v = param.v; - var match = partition(p, param.l); - var lf = match[1]; - var lt = match[0]; - var pvd = Curry._2(p, v, d); - var match$1 = partition(p, param.r); - var rf = match$1[1]; - var rt = match$1[0]; + let d = param.d; + let v = param.v; + let match = partition(p, param.l); + let lf = match[1]; + let lt = match[0]; + let pvd = Curry._2(p, v, d); + let match$1 = partition(p, param.r); + let rf = match$1[1]; + let rt = match$1[0]; if (pvd) { return [ join(lt, v, d, rt), @@ -835,10 +835,10 @@ var $$Map = { ]; } }; - var cons_enum = function (_m, _e) { + let cons_enum = function (_m, _e) { while(true) { - var e = _e; - var m = _m; + let e = _e; + let m = _m; if (typeof m !== "object") { return e; } @@ -853,12 +853,12 @@ var $$Map = { continue ; }; }; - var compare = function (cmp, m1, m2) { - var _e1 = cons_enum(m1, "End"); - var _e2 = cons_enum(m2, "End"); + let compare = function (cmp, m1, m2) { + let _e1 = cons_enum(m1, "End"); + let _e2 = cons_enum(m2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return 0; @@ -869,11 +869,11 @@ var $$Map = { if (typeof e2 !== "object") { return 1; } - var c = Curry._2(funarg.compare, e1._0, e2._0); + let c = Curry._2(funarg.compare, e1._0, e2._0); if (c !== 0) { return c; } - var c$1 = Curry._2(cmp, e1._1, e2._1); + let c$1 = Curry._2(cmp, e1._1, e2._1); if (c$1 !== 0) { return c$1; } @@ -882,12 +882,12 @@ var $$Map = { continue ; }; }; - var equal = function (cmp, m1, m2) { - var _e1 = cons_enum(m1, "End"); - var _e2 = cons_enum(m2, "End"); + let equal = function (cmp, m1, m2) { + let _e1 = cons_enum(m1, "End"); + let _e2 = cons_enum(m2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return true; @@ -909,17 +909,17 @@ var $$Map = { continue ; }; }; - var cardinal = function (param) { + let cardinal = function (param) { if (typeof param !== "object") { return 0; } else { return (cardinal(param.l) + 1 | 0) + cardinal(param.r) | 0; } }; - var bindings_aux = function (_accu, _param) { + let bindings_aux = function (_accu, _param) { while(true) { - var param = _param; - var accu = _accu; + let param = _param; + let accu = _accu; if (typeof param !== "object") { return accu; } @@ -934,7 +934,7 @@ var $$Map = { continue ; }; }; - var bindings = function (s) { + let bindings = function (s) { return bindings_aux(/* [] */0, s); }; return { @@ -976,19 +976,19 @@ var $$Map = { }) }; -var $$Set = { +let $$Set = { Make: (function (funarg) { - var height = function (param) { + let height = function (param) { if (typeof param !== "object") { return 0; } else { return param.h; } }; - var create = function (l, v, r) { - var hl; + let create = function (l, v, r) { + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; return { TAG: "Node", @@ -998,10 +998,10 @@ var $$Set = { h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0 }; }; - var bal = function (l, v, r) { - var hl; + let bal = function (l, v, r) { + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -1011,9 +1011,9 @@ var $$Set = { Error: new Error() }; } - var lr = l.r; - var lv = l.v; - var ll = l.l; + let lr = l.r; + let lv = l.v; + let ll = l.l; if (height(ll) >= height(lr)) { return create(ll, lv, create(lr, v, r)); } @@ -1042,9 +1042,9 @@ var $$Set = { Error: new Error() }; } - var rr = r.r; - var rv = r.v; - var rl = r.l; + let rr = r.r; + let rv = r.v; + let rl = r.l; if (height(rr) >= height(rl)) { return create(create(l, v, rl), rv, rr); } @@ -1057,7 +1057,7 @@ var $$Set = { Error: new Error() }; }; - var add = function (x, param) { + let add = function (x, param) { if (typeof param !== "object") { return { TAG: "Node", @@ -1067,29 +1067,29 @@ var $$Set = { h: 1 }; } - var r = param.r; - var v = param.v; - var l = param.l; - var c = Curry._2(funarg.compare, x, v); + let r = param.r; + let v = param.v; + let l = param.l; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { return param; } if (c < 0) { - var ll = add(x, l); + let ll = add(x, l); if (l === ll) { return param; } else { return bal(ll, v, r); } } - var rr = add(x, r); + let rr = add(x, r); if (r === rr) { return param; } else { return bal(l, v, rr); } }; - var singleton = function (x) { + let singleton = function (x) { return { TAG: "Node", l: "Empty", @@ -1098,29 +1098,29 @@ var $$Set = { h: 1 }; }; - var add_min_element = function (x, param) { + let add_min_element = function (x, param) { if (typeof param !== "object") { return singleton(x); } else { return bal(add_min_element(x, param.l), param.v, param.r); } }; - var add_max_element = function (x, param) { + let add_max_element = function (x, param) { if (typeof param !== "object") { return singleton(x); } else { return bal(param.l, param.v, add_max_element(x, param.r)); } }; - var join = function (l, v, r) { + let join = function (l, v, r) { if (typeof l !== "object") { return add_min_element(v, r); } - var lh = l.h; + let lh = l.h; if (typeof r !== "object") { return add_max_element(v, l); } - var rh = r.h; + let rh = r.h; if (lh > (rh + 2 | 0)) { return bal(l.l, l.v, join(l.r, v, r)); } else if (rh > (lh + 2 | 0)) { @@ -1129,16 +1129,16 @@ var $$Set = { return create(l, v, r); } }; - var min_elt = function (_param) { + let min_elt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return param.v; } @@ -1146,13 +1146,13 @@ var $$Set = { continue ; }; }; - var min_elt_opt = function (_param) { + let min_elt_opt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return Caml_option.some(param.v); } @@ -1160,16 +1160,16 @@ var $$Set = { continue ; }; }; - var max_elt = function (_param) { + let max_elt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return param.v; } @@ -1177,13 +1177,13 @@ var $$Set = { continue ; }; }; - var max_elt_opt = function (_param) { + let max_elt_opt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return Caml_option.some(param.v); } @@ -1191,7 +1191,7 @@ var $$Set = { continue ; }; }; - var remove_min_elt = function (param) { + let remove_min_elt = function (param) { if (typeof param !== "object") { throw { RE_EXN_ID: "Invalid_argument", @@ -1199,14 +1199,14 @@ var $$Set = { Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return param.r; } else { return bal(remove_min_elt(l), param.v, param.r); } }; - var merge = function (t1, t2) { + let merge = function (t1, t2) { if (typeof t1 !== "object") { return t2; } else if (typeof t2 !== "object") { @@ -1215,7 +1215,7 @@ var $$Set = { return bal(t1, min_elt(t2), remove_min_elt(t2)); } }; - var concat = function (t1, t2) { + let concat = function (t1, t2) { if (typeof t1 !== "object") { return t2; } else if (typeof t2 !== "object") { @@ -1224,7 +1224,7 @@ var $$Set = { return join(t1, min_elt(t2), remove_min_elt(t2)); } }; - var split = function (x, param) { + let split = function (x, param) { if (typeof param !== "object") { return [ "Empty", @@ -1232,10 +1232,10 @@ var $$Set = { "Empty" ]; } - var r = param.r; - var v = param.v; - var l = param.l; - var c = Curry._2(funarg.compare, x, v); + let r = param.r; + let v = param.v; + let l = param.l; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { return [ l, @@ -1244,34 +1244,34 @@ var $$Set = { ]; } if (c < 0) { - var match = split(x, l); + let match = split(x, l); return [ match[0], match[1], join(match[2], v, r) ]; } - var match$1 = split(x, r); + let match$1 = split(x, r); return [ join(l, v, match$1[0]), match$1[1], match$1[2] ]; }; - var is_empty = function (param) { + let is_empty = function (param) { if (typeof param !== "object") { return true; } else { return false; } }; - var mem = function (x, _param) { + let mem = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } - var c = Curry._2(funarg.compare, x, param.v); + let c = Curry._2(funarg.compare, x, param.v); if (c === 0) { return true; } @@ -1279,96 +1279,96 @@ var $$Set = { continue ; }; }; - var remove = function (x, param) { + let remove = function (x, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var v = param.v; - var l = param.l; - var c = Curry._2(funarg.compare, x, v); + let r = param.r; + let v = param.v; + let l = param.l; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { return merge(l, r); } if (c < 0) { - var ll = remove(x, l); + let ll = remove(x, l); if (l === ll) { return param; } else { return bal(ll, v, r); } } - var rr = remove(x, r); + let rr = remove(x, r); if (r === rr) { return param; } else { return bal(l, v, rr); } }; - var union = function (s1, s2) { + let union = function (s1, s2) { if (typeof s1 !== "object") { return s2; } - var h1 = s1.h; - var v1 = s1.v; + let h1 = s1.h; + let v1 = s1.v; if (typeof s2 !== "object") { return s1; } - var h2 = s2.h; - var v2 = s2.v; + let h2 = s2.h; + let v2 = s2.v; if (h1 >= h2) { if (h2 === 1) { return add(v2, s1); } - var match = split(v1, s2); + let match = split(v1, s2); return join(union(s1.l, match[0]), v1, union(s1.r, match[2])); } if (h1 === 1) { return add(v1, s2); } - var match$1 = split(v2, s1); + let match$1 = split(v2, s1); return join(union(match$1[0], s2.l), v2, union(match$1[2], s2.r)); }; - var inter = function (s1, s2) { + let inter = function (s1, s2) { if (typeof s1 !== "object") { return "Empty"; } if (typeof s2 !== "object") { return "Empty"; } - var r1 = s1.r; - var v1 = s1.v; - var l1 = s1.l; - var match = split(v1, s2); - var l2 = match[0]; + let r1 = s1.r; + let v1 = s1.v; + let l1 = s1.l; + let match = split(v1, s2); + let l2 = match[0]; if (match[1]) { return join(inter(l1, l2), v1, inter(r1, match[2])); } else { return concat(inter(l1, l2), inter(r1, match[2])); } }; - var diff = function (s1, s2) { + let diff = function (s1, s2) { if (typeof s1 !== "object") { return "Empty"; } if (typeof s2 !== "object") { return s1; } - var r1 = s1.r; - var v1 = s1.v; - var l1 = s1.l; - var match = split(v1, s2); - var l2 = match[0]; + let r1 = s1.r; + let v1 = s1.v; + let l1 = s1.l; + let match = split(v1, s2); + let l2 = match[0]; if (match[1]) { return concat(diff(l1, l2), diff(r1, match[2])); } else { return join(diff(l1, l2), v1, diff(r1, match[2])); } }; - var cons_enum = function (_s, _e) { + let cons_enum = function (_s, _e) { while(true) { - var e = _e; - var s = _s; + let e = _e; + let s = _s; if (typeof s !== "object") { return e; } @@ -1382,10 +1382,10 @@ var $$Set = { continue ; }; }; - var compare_aux = function (_e1, _e2) { + let compare_aux = function (_e1, _e2) { while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return 0; @@ -1396,7 +1396,7 @@ var $$Set = { if (typeof e2 !== "object") { return 1; } - var c = Curry._2(funarg.compare, e1._0, e2._0); + let c = Curry._2(funarg.compare, e1._0, e2._0); if (c !== 0) { return c; } @@ -1405,28 +1405,28 @@ var $$Set = { continue ; }; }; - var compare = function (s1, s2) { + let compare = function (s1, s2) { return compare_aux(cons_enum(s1, "End"), cons_enum(s2, "End")); }; - var equal = function (s1, s2) { + let equal = function (s1, s2) { return compare(s1, s2) === 0; }; - var subset = function (_s1, _s2) { + let subset = function (_s1, _s2) { while(true) { - var s2 = _s2; - var s1 = _s1; + let s2 = _s2; + let s1 = _s1; if (typeof s1 !== "object") { return true; } - var r1 = s1.r; - var v1 = s1.v; - var l1 = s1.l; + let r1 = s1.r; + let v1 = s1.v; + let l1 = s1.l; if (typeof s2 !== "object") { return false; } - var r2 = s2.r; - var l2 = s2.l; - var c = Curry._2(funarg.compare, v1, s2.v); + let r2 = s2.r; + let l2 = s2.l; + let c = Curry._2(funarg.compare, v1, s2.v); if (c === 0) { if (!subset(l1, l2)) { return false; @@ -1461,9 +1461,9 @@ var $$Set = { continue ; }; }; - var iter = function (f, _param) { + let iter = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } @@ -1473,10 +1473,10 @@ var $$Set = { continue ; }; }; - var fold = function (f, _s, _accu) { + let fold = function (f, _s, _accu) { while(true) { - var accu = _accu; - var s = _s; + let accu = _accu; + let s = _s; if (typeof s !== "object") { return accu; } @@ -1485,9 +1485,9 @@ var $$Set = { continue ; }; }; - var for_all = function (p, _param) { + let for_all = function (p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return true; } @@ -1501,9 +1501,9 @@ var $$Set = { continue ; }; }; - var exists = function (p, _param) { + let exists = function (p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } @@ -1517,16 +1517,16 @@ var $$Set = { continue ; }; }; - var filter = function (p, param) { + let filter = function (p, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var v = param.v; - var l = param.l; - var l$p = filter(p, l); - var pv = Curry._1(p, v); - var r$p = filter(p, r); + let r = param.r; + let v = param.v; + let l = param.l; + let l$p = filter(p, l); + let pv = Curry._1(p, v); + let r$p = filter(p, r); if (pv) { if (l === l$p && r === r$p) { return param; @@ -1537,21 +1537,21 @@ var $$Set = { return concat(l$p, r$p); } }; - var partition = function (p, param) { + let partition = function (p, param) { if (typeof param !== "object") { return [ "Empty", "Empty" ]; } - var v = param.v; - var match = partition(p, param.l); - var lf = match[1]; - var lt = match[0]; - var pv = Curry._1(p, v); - var match$1 = partition(p, param.r); - var rf = match$1[1]; - var rt = match$1[0]; + let v = param.v; + let match = partition(p, param.l); + let lf = match[1]; + let lt = match[0]; + let pv = Curry._1(p, v); + let match$1 = partition(p, param.r); + let rf = match$1[1]; + let rt = match$1[0]; if (pv) { return [ join(lt, v, rt), @@ -1564,17 +1564,17 @@ var $$Set = { ]; } }; - var cardinal = function (param) { + let cardinal = function (param) { if (typeof param !== "object") { return 0; } else { return (cardinal(param.l) + 1 | 0) + cardinal(param.r) | 0; } }; - var elements_aux = function (_accu, _param) { + let elements_aux = function (_accu, _param) { while(true) { - var param = _param; - var accu = _accu; + let param = _param; + let accu = _accu; if (typeof param !== "object") { return accu; } @@ -1586,20 +1586,20 @@ var $$Set = { continue ; }; }; - var elements = function (s) { + let elements = function (s) { return elements_aux(/* [] */0, s); }; - var find = function (x, _param) { + let find = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; - var c = Curry._2(funarg.compare, x, v); + let v = param.v; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { return v; } @@ -1607,14 +1607,14 @@ var $$Set = { continue ; }; }; - var find_first_aux = function (_v0, f, _param) { + let find_first_aux = function (_v0, f, _param) { while(true) { - var param = _param; - var v0 = _v0; + let param = _param; + let v0 = _v0; if (typeof param !== "object") { return v0; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.l; _v0 = v; @@ -1624,16 +1624,16 @@ var $$Set = { continue ; }; }; - var find_first = function (f, _param) { + let find_first = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_first_aux(v, f, param.l); } @@ -1641,14 +1641,14 @@ var $$Set = { continue ; }; }; - var find_first_opt_aux = function (_v0, f, _param) { + let find_first_opt_aux = function (_v0, f, _param) { while(true) { - var param = _param; - var v0 = _v0; + let param = _param; + let v0 = _v0; if (typeof param !== "object") { return Caml_option.some(v0); } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.l; _v0 = v; @@ -1658,13 +1658,13 @@ var $$Set = { continue ; }; }; - var find_first_opt = function (f, _param) { + let find_first_opt = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_first_opt_aux(v, f, param.l); } @@ -1672,14 +1672,14 @@ var $$Set = { continue ; }; }; - var find_last_aux = function (_v0, f, _param) { + let find_last_aux = function (_v0, f, _param) { while(true) { - var param = _param; - var v0 = _v0; + let param = _param; + let v0 = _v0; if (typeof param !== "object") { return v0; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.r; _v0 = v; @@ -1689,16 +1689,16 @@ var $$Set = { continue ; }; }; - var find_last = function (f, _param) { + let find_last = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_last_aux(v, f, param.r); } @@ -1706,14 +1706,14 @@ var $$Set = { continue ; }; }; - var find_last_opt_aux = function (_v0, f, _param) { + let find_last_opt_aux = function (_v0, f, _param) { while(true) { - var param = _param; - var v0 = _v0; + let param = _param; + let v0 = _v0; if (typeof param !== "object") { return Caml_option.some(v0); } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.r; _v0 = v; @@ -1723,13 +1723,13 @@ var $$Set = { continue ; }; }; - var find_last_opt = function (f, _param) { + let find_last_opt = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_last_opt_aux(v, f, param.r); } @@ -1737,14 +1737,14 @@ var $$Set = { continue ; }; }; - var find_opt = function (x, _param) { + let find_opt = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; - var c = Curry._2(funarg.compare, x, v); + let v = param.v; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { return Caml_option.some(v); } @@ -1752,31 +1752,31 @@ var $$Set = { continue ; }; }; - var try_join = function (l, v, r) { + let try_join = function (l, v, r) { if ((l === "Empty" || Curry._2(funarg.compare, max_elt(l), v) < 0) && (r === "Empty" || Curry._2(funarg.compare, v, min_elt(r)) < 0)) { return join(l, v, r); } else { return union(l, add(v, r)); } }; - var map = function (f, param) { + let map = function (f, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var v = param.v; - var l = param.l; - var l$p = map(f, l); - var v$p = Curry._1(f, v); - var r$p = map(f, r); + let r = param.r; + let v = param.v; + let l = param.l; + let l$p = map(f, l); + let v$p = Curry._1(f, v); + let r$p = map(f, r); if (l === l$p && v === v$p && r === r$p) { return param; } else { return try_join(l$p, v$p, r$p); } }; - var of_sorted_list = function (l) { - var sub = function (n, l) { + let of_sorted_list = function (l) { + let sub = function (n, l) { switch (n) { case 0 : return [ @@ -1799,7 +1799,7 @@ var $$Set = { break; case 2 : if (l) { - var match = l.tl; + let match = l.tl; if (match) { return [ { @@ -1823,9 +1823,9 @@ var $$Set = { break; case 3 : if (l) { - var match$1 = l.tl; + let match$1 = l.tl; if (match$1) { - var match$2 = match$1.tl; + let match$2 = match$1.tl; if (match$2) { return [ { @@ -1858,11 +1858,11 @@ var $$Set = { default: } - var nl = n / 2 | 0; - var match$3 = sub(nl, l); - var l$1 = match$3[1]; + let nl = n / 2 | 0; + let match$3 = sub(nl, l); + let l$1 = match$3[1]; if (l$1) { - var match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl); + let match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl); return [ create(match$3[0], l$1.hd, match$4[0]), match$4[1] @@ -1880,27 +1880,27 @@ var $$Set = { }; return sub(List.length(l), l)[0]; }; - var of_list = function (l) { + let of_list = function (l) { if (!l) { return "Empty"; } - var match = l.tl; - var x0 = l.hd; + let match = l.tl; + let x0 = l.hd; if (!match) { return singleton(x0); } - var match$1 = match.tl; - var x1 = match.hd; + let match$1 = match.tl; + let x1 = match.hd; if (!match$1) { return add(x1, singleton(x0)); } - var match$2 = match$1.tl; - var x2 = match$1.hd; + let match$2 = match$1.tl; + let x2 = match$1.hd; if (!match$2) { return add(x2, add(x1, singleton(x0))); } - var match$3 = match$2.tl; - var x3 = match$2.hd; + let match$3 = match$2.tl; + let x3 = match$2.hd; if (match$3) { if (match$3.tl) { return of_sorted_list(List.sort_uniq(funarg.compare, l)); diff --git a/lib/js/parsing.js b/lib/js/parsing.js index d4f86fc0d1..466de81043 100644 --- a/lib/js/parsing.js +++ b/lib/js/parsing.js @@ -1,19 +1,19 @@ 'use strict'; -var $$Array = require("./array.js"); -var Curry = require("./curry.js"); -var Lexing = require("./lexing.js"); -var Caml_obj = require("./caml_obj.js"); -var Caml_array = require("./caml_array.js"); -var Caml_parser = require("./caml_parser.js"); -var Caml_exceptions = require("./caml_exceptions.js"); -var Caml_js_exceptions = require("./caml_js_exceptions.js"); +let $$Array = require("./array.js"); +let Curry = require("./curry.js"); +let Lexing = require("./lexing.js"); +let Caml_obj = require("./caml_obj.js"); +let Caml_array = require("./caml_array.js"); +let Caml_parser = require("./caml_parser.js"); +let Caml_exceptions = require("./caml_exceptions.js"); +let Caml_js_exceptions = require("./caml_js_exceptions.js"); -var YYexit = /* @__PURE__ */Caml_exceptions.create("Parsing.YYexit"); +let YYexit = /* @__PURE__ */Caml_exceptions.create("Parsing.YYexit"); -var Parse_error = /* @__PURE__ */Caml_exceptions.create("Parsing.Parse_error"); +let Parse_error = /* @__PURE__ */Caml_exceptions.create("Parsing.Parse_error"); -var env = { +let env = { s_stack: Caml_array.make(100, 0), v_stack: Caml_array.make(100, undefined), symb_start_stack: Caml_array.make(100, Lexing.dummy_pos), @@ -33,12 +33,12 @@ var env = { }; function grow_stacks(param) { - var oldsize = env.stacksize; - var newsize = (oldsize << 1); - var new_s = Caml_array.make(newsize, 0); - var new_v = Caml_array.make(newsize, undefined); - var new_start = Caml_array.make(newsize, Lexing.dummy_pos); - var new_end = Caml_array.make(newsize, Lexing.dummy_pos); + let oldsize = env.stacksize; + let newsize = (oldsize << 1); + let new_s = Caml_array.make(newsize, 0); + let new_v = Caml_array.make(newsize, undefined); + let new_start = Caml_array.make(newsize, Lexing.dummy_pos); + let new_end = Caml_array.make(newsize, Lexing.dummy_pos); $$Array.blit(env.s_stack, 0, new_s, 0, oldsize); env.s_stack = new_s; $$Array.blit(env.v_stack, 0, new_v, 0, oldsize); @@ -55,33 +55,33 @@ function clear_parser(param) { env.lval = undefined; } -var current_lookahead_fun = { +let current_lookahead_fun = { contents: (function (param) { return false; }) }; function yyparse(tables, start, lexer, lexbuf) { - var init_asp = env.asp; - var init_sp = env.sp; - var init_stackbase = env.stackbase; - var init_state = env.state; - var init_curr_char = env.curr_char; - var init_lval = env.lval; - var init_errflag = env.errflag; + let init_asp = env.asp; + let init_sp = env.sp; + let init_stackbase = env.stackbase; + let init_state = env.state; + let init_curr_char = env.curr_char; + let init_lval = env.lval; + let init_errflag = env.errflag; env.stackbase = env.sp + 1 | 0; env.curr_char = start; env.symb_end = lexbuf.lex_curr_p; try { - var _cmd = "Start"; - var _arg; + let _cmd = "Start"; + let _arg; while(true) { - var arg = _arg; - var cmd = _cmd; - var match = Caml_parser.parse_engine(tables, env, cmd, arg); + let arg = _arg; + let cmd = _cmd; + let match = Caml_parser.parse_engine(tables, env, cmd, arg); switch (match) { case "Read_token" : - var t = Curry._1(lexer, lexbuf); + let t = Curry._1(lexer, lexbuf); env.symb_start = lexbuf.lex_start_p; env.symb_end = lexbuf.lex_curr_p; _arg = t; @@ -103,7 +103,7 @@ function yyparse(tables, start, lexer, lexbuf) { _cmd = "Stacks_grown_2"; continue ; case "Compute_semantic_action" : - var match$1; + let match$1; try { match$1 = [ "Semantic_action_computed", @@ -111,7 +111,7 @@ function yyparse(tables, start, lexer, lexbuf) { ]; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === Parse_error) { match$1 = [ "Error_detected", @@ -134,8 +134,8 @@ function yyparse(tables, start, lexer, lexbuf) { }; } catch (raw_exn$1){ - var exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1); - var curr_char = env.curr_char; + let exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1); + let curr_char = env.curr_char; env.asp = init_asp; env.sp = init_sp; env.stackbase = init_stackbase; @@ -162,14 +162,14 @@ function peek_val(env, n) { } function symbol_start_pos(param) { - var _i = env.rule_len; + let _i = env.rule_len; while(true) { - var i = _i; + let i = _i; if (i <= 0) { return Caml_array.get(env.symb_end_stack, env.asp); } - var st = Caml_array.get(env.symb_start_stack, (env.asp - i | 0) + 1 | 0); - var en = Caml_array.get(env.symb_end_stack, (env.asp - i | 0) + 1 | 0); + let st = Caml_array.get(env.symb_start_stack, (env.asp - i | 0) + 1 | 0); + let en = Caml_array.get(env.symb_end_stack, (env.asp - i | 0) + 1 | 0); if (Caml_obj.notequal(st, en)) { return st; } @@ -214,7 +214,7 @@ function parse_error(param) { } -var set_trace = Caml_parser.set_parser_trace; +let set_trace = Caml_parser.set_parser_trace; exports.symbol_start = symbol_start; exports.symbol_end = symbol_end; diff --git a/lib/js/pervasives.js b/lib/js/pervasives.js index 5b92a088da..75ca9bd08e 100644 --- a/lib/js/pervasives.js +++ b/lib/js/pervasives.js @@ -1,13 +1,13 @@ 'use strict'; -var Curry = require("./curry.js"); -var Caml_sys = require("./caml_sys.js"); -var Caml_format = require("./caml_format.js"); -var Caml_string = require("./caml_string.js"); -var Caml_exceptions = require("./caml_exceptions.js"); -var Caml_js_exceptions = require("./caml_js_exceptions.js"); - -var JsxModules = { +let Curry = require("./curry.js"); +let Caml_sys = require("./caml_sys.js"); +let Caml_format = require("./caml_format.js"); +let Caml_string = require("./caml_string.js"); +let Caml_exceptions = require("./caml_exceptions.js"); +let Caml_js_exceptions = require("./caml_js_exceptions.js"); + +let JsxModules = { Jsx: undefined, JsxEvent: undefined, JsxDOM: undefined @@ -29,7 +29,7 @@ function invalid_arg(s) { }; } -var Exit = /* @__PURE__ */Caml_exceptions.create("Pervasives.Exit"); +let Exit = /* @__PURE__ */Caml_exceptions.create("Pervasives.Exit"); function abs(x) { if (x >= 0) { @@ -43,7 +43,7 @@ function lnot(x) { return x ^ -1; } -var min_int = -2147483648; +let min_int = -2147483648; function classify_float(x) { if (isFinite(x)) { @@ -111,7 +111,7 @@ function int_of_string_opt(s) { return Caml_format.int_of_string(s); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Failure") { return; } @@ -120,14 +120,14 @@ function int_of_string_opt(s) { } function valid_float_lexem(s) { - var l = s.length; - var _i = 0; + let l = s.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i >= l) { return s + "."; } - var match = Caml_string.get(s, i); + let match = Caml_string.get(s, i); if (match >= 48) { if (match >= 58) { return s; @@ -152,7 +152,7 @@ function float_of_string_opt(s) { return Caml_format.float_of_string(s); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Failure") { return; } @@ -191,14 +191,14 @@ function print_string(prim) { console.log(prim); } -var exit_function = { +let exit_function = { contents: (function (prim) { }) }; function at_exit(f) { - var g = exit_function.contents; + let g = exit_function.contents; exit_function.contents = (function (param) { Curry._1(f, undefined); Curry._1(g, undefined); @@ -210,25 +210,25 @@ function exit(retcode) { return Caml_sys.sys_exit(retcode); } -var Jsx; +let Jsx; -var JsxEvent; +let JsxEvent; -var JsxDOM; +let JsxDOM; -var JsxPPXReactSupport; +let JsxPPXReactSupport; -var max_int = 2147483647; +let max_int = 2147483647; -var infinity = Infinity; +let infinity = Infinity; -var neg_infinity = -Infinity; +let neg_infinity = -Infinity; -var max_float = 1.79769313486231571e+308; +let max_float = 1.79769313486231571e+308; -var min_float = 2.22507385850720138e-308; +let min_float = 2.22507385850720138e-308; -var epsilon_float = 2.22044604925031308e-16; +let epsilon_float = 2.22044604925031308e-16; exports.Jsx = Jsx; exports.JsxEvent = JsxEvent; diff --git a/lib/js/pervasivesU.js b/lib/js/pervasivesU.js index 9f14ce6e3e..823250ab49 100644 --- a/lib/js/pervasivesU.js +++ b/lib/js/pervasivesU.js @@ -1,12 +1,12 @@ 'use strict'; -var Caml_sys = require("./caml_sys.js"); -var Caml_format = require("./caml_format.js"); -var Caml_string = require("./caml_string.js"); -var Caml_exceptions = require("./caml_exceptions.js"); -var Caml_js_exceptions = require("./caml_js_exceptions.js"); +let Caml_sys = require("./caml_sys.js"); +let Caml_format = require("./caml_format.js"); +let Caml_string = require("./caml_string.js"); +let Caml_exceptions = require("./caml_exceptions.js"); +let Caml_js_exceptions = require("./caml_js_exceptions.js"); -var JsxModules = { +let JsxModules = { Jsx: undefined, JsxEvent: undefined, JsxDOM: undefined @@ -28,7 +28,7 @@ function invalid_arg(s) { }; } -var Exit = /* @__PURE__ */Caml_exceptions.create("PervasivesU.Exit"); +let Exit = /* @__PURE__ */Caml_exceptions.create("PervasivesU.Exit"); function abs(x) { if (x >= 0) { @@ -42,7 +42,7 @@ function lnot(x) { return x ^ -1; } -var min_int = -2147483648; +let min_int = -2147483648; function classify_float(x) { if (isFinite(x)) { @@ -110,7 +110,7 @@ function int_of_string_opt(s) { return Caml_format.int_of_string(s); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Failure") { return; } @@ -119,14 +119,14 @@ function int_of_string_opt(s) { } function valid_float_lexem(s) { - var l = s.length; - var _i = 0; + let l = s.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i >= l) { return s + "."; } - var match = Caml_string.get(s, i); + let match = Caml_string.get(s, i); if (match >= 48) { if (match >= 58) { return s; @@ -151,7 +151,7 @@ function float_of_string_opt(s) { return Caml_format.float_of_string(s); } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Failure") { return; } @@ -190,14 +190,14 @@ function print_string(prim) { console.log(prim); } -var exit_function = { +let exit_function = { contents: (function (prim) { }) }; function at_exit(f) { - var g = exit_function.contents; + let g = exit_function.contents; exit_function.contents = (function () { f(); g(); @@ -209,25 +209,25 @@ function exit(retcode) { return Caml_sys.sys_exit(retcode); } -var Jsx; +let Jsx; -var JsxEvent; +let JsxEvent; -var JsxDOM; +let JsxDOM; -var JsxPPXReactSupport; +let JsxPPXReactSupport; -var max_int = 2147483647; +let max_int = 2147483647; -var infinity = Infinity; +let infinity = Infinity; -var neg_infinity = -Infinity; +let neg_infinity = -Infinity; -var max_float = 1.79769313486231571e+308; +let max_float = 1.79769313486231571e+308; -var min_float = 2.22507385850720138e-308; +let min_float = 2.22507385850720138e-308; -var epsilon_float = 2.22044604925031308e-16; +let epsilon_float = 2.22044604925031308e-16; exports.Jsx = Jsx; exports.JsxEvent = JsxEvent; diff --git a/lib/js/queue.js b/lib/js/queue.js index 12e8ed2e4c..5b1774e810 100644 --- a/lib/js/queue.js +++ b/lib/js/queue.js @@ -1,9 +1,9 @@ 'use strict'; -var Curry = require("./curry.js"); -var Caml_exceptions = require("./caml_exceptions.js"); +let Curry = require("./curry.js"); +let Caml_exceptions = require("./caml_exceptions.js"); -var Empty = /* @__PURE__ */Caml_exceptions.create("Queue.Empty"); +let Empty = /* @__PURE__ */Caml_exceptions.create("Queue.Empty"); function create(param) { return { @@ -20,12 +20,12 @@ function clear(q) { } function add(x, q) { - var cell = { + let cell = { TAG: "Cons", content: x, next: "Nil" }; - var last = q.last; + let last = q.last; if (typeof last !== "object") { q.length = 1; q.first = cell; @@ -38,7 +38,7 @@ function add(x, q) { } function peek(q) { - var match = q.first; + let match = q.first; if (typeof match === "object") { return match.content; } @@ -49,15 +49,15 @@ function peek(q) { } function take(q) { - var match = q.first; + let match = q.first; if (typeof match !== "object") { throw { RE_EXN_ID: Empty, Error: new Error() }; } - var content = match.content; - var next = match.next; + let content = match.content; + let next = match.next; if (typeof next !== "object") { clear(q); return content; @@ -68,22 +68,22 @@ function take(q) { } function copy(q) { - var q_res = { + let q_res = { length: q.length, first: "Nil", last: "Nil" }; - var _prev = "Nil"; - var _cell = q.first; + let _prev = "Nil"; + let _cell = q.first; while(true) { - var cell = _cell; - var prev = _prev; + let cell = _cell; + let prev = _prev; if (typeof cell !== "object") { q_res.last = prev; return q_res; } - var next = cell.next; - var res = { + let next = cell.next; + let res = { TAG: "Cons", content: cell.content, next: "Nil" @@ -108,13 +108,13 @@ function length(q) { } function iter(f, q) { - var _cell = q.first; + let _cell = q.first; while(true) { - var cell = _cell; + let cell = _cell; if (typeof cell !== "object") { return; } - var next = cell.next; + let next = cell.next; Curry._1(f, cell.content); _cell = next; continue ; @@ -122,16 +122,16 @@ function iter(f, q) { } function fold(f, accu, q) { - var _accu = accu; - var _cell = q.first; + let _accu = accu; + let _cell = q.first; while(true) { - var cell = _cell; - var accu$1 = _accu; + let cell = _cell; + let accu$1 = _accu; if (typeof cell !== "object") { return accu$1; } - var next = cell.next; - var accu$2 = Curry._2(f, accu$1, cell.content); + let next = cell.next; + let accu$2 = Curry._2(f, accu$1, cell.content); _cell = next; _accu = accu$2; continue ; @@ -142,7 +142,7 @@ function transfer(q1, q2) { if (q1.length <= 0) { return; } - var last = q2.last; + let last = q2.last; if (typeof last !== "object") { q2.length = q1.length; q2.first = q1.first; @@ -155,11 +155,11 @@ function transfer(q1, q2) { clear(q1); } -var push = add; +let push = add; -var pop = take; +let pop = take; -var top = peek; +let top = peek; exports.Empty = Empty; exports.create = create; diff --git a/lib/js/random.js b/lib/js/random.js index 21c60f99b1..9ead241098 100644 --- a/lib/js/random.js +++ b/lib/js/random.js @@ -1,13 +1,13 @@ 'use strict'; -var Caml = require("./caml.js"); -var $$Array = require("./array.js"); -var Int32 = require("./int32.js"); -var Int64 = require("./int64.js"); -var Digest = require("./digest.js"); -var Caml_array = require("./caml_array.js"); -var Caml_int64 = require("./caml_int64.js"); -var Caml_string = require("./caml_string.js"); +let Caml = require("./caml.js"); +let $$Array = require("./array.js"); +let Int32 = require("./int32.js"); +let Int64 = require("./int64.js"); +let Digest = require("./digest.js"); +let Caml_array = require("./caml_array.js"); +let Caml_int64 = require("./caml_int64.js"); +let Caml_string = require("./caml_string.js"); function random_seed(param) { return [(Math.floor(Math.random()*0x7fffffff))]; @@ -19,23 +19,23 @@ function assign(st1, st2) { } function full_init(s, seed) { - var combine = function (accu, x) { + let combine = function (accu, x) { return Digest.string(accu + String(x)); }; - var extract = function (d) { + let extract = function (d) { return ((Caml_string.get(d, 0) + (Caml_string.get(d, 1) << 8) | 0) + (Caml_string.get(d, 2) << 16) | 0) + (Caml_string.get(d, 3) << 24) | 0; }; - var seed$1 = seed.length === 0 ? [0] : seed; - var l = seed$1.length; - for(var i = 0; i <= 54; ++i){ + let seed$1 = seed.length === 0 ? [0] : seed; + let l = seed$1.length; + for(let i = 0; i <= 54; ++i){ Caml_array.set(s.st, i, i); } - var accu = "x"; - for(var i$1 = 0 ,i_finish = 54 + ( + let accu = "x"; + for(let i$1 = 0 ,i_finish = 54 + ( 55 > l ? 55 : l ) | 0; i$1 <= i_finish; ++i$1){ - var j = i$1 % 55; - var k = i$1 % l; + let j = i$1 % 55; + let k = i$1 % l; accu = combine(accu, Caml_array.get(seed$1, k)); Caml_array.set(s.st, j, (Caml_array.get(s.st, j) ^ extract(accu)) & 1073741823); } @@ -43,7 +43,7 @@ function full_init(s, seed) { } function make(seed) { - var result = { + let result = { st: Caml_array.make(55, 0), idx: 0 }; @@ -56,7 +56,7 @@ function make_self_init(param) { } function copy(s) { - var result = { + let result = { st: Caml_array.make(55, 0), idx: 0 }; @@ -66,9 +66,9 @@ function copy(s) { function bits(s) { s.idx = (s.idx + 1 | 0) % 55; - var curval = Caml_array.get(s.st, s.idx); - var newval = Caml_array.get(s.st, (s.idx + 24 | 0) % 55) + (curval ^ (curval >>> 25) & 31) | 0; - var newval30 = newval & 1073741823; + let curval = Caml_array.get(s.st, s.idx); + let newval = Caml_array.get(s.st, (s.idx + 24 | 0) % 55) + (curval ^ (curval >>> 25) & 31) | 0; + let newval30 = newval & 1073741823; Caml_array.set(s.st, s.idx, newval30); return newval30; } @@ -82,8 +82,8 @@ function $$int(s, bound) { }; } while(true) { - var r = bits(s); - var v = r % bound; + let r = bits(s); + let v = r % bound; if ((r - v | 0) <= ((1073741823 - bound | 0) + 1 | 0)) { return v; } @@ -100,10 +100,10 @@ function int32(s, bound) { }; } while(true) { - var b1 = bits(s); - var b2 = ((bits(s) & 1) << 30); - var r = b1 | b2; - var v = r % bound; + let b1 = bits(s); + let b2 = ((bits(s) & 1) << 30); + let r = b1 | b2; + let v = r % bound; if ((r - v | 0) <= ((Int32.max_int - bound | 0) + 1 | 0)) { return v; } @@ -120,11 +120,11 @@ function int64(s, bound) { }; } while(true) { - var b1 = Caml_int64.of_int32(bits(s)); - var b2 = Caml_int64.lsl_(Caml_int64.of_int32(bits(s)), 30); - var b3 = Caml_int64.lsl_(Caml_int64.of_int32(bits(s) & 7), 60); - var r = Caml_int64.or_(b1, Caml_int64.or_(b2, b3)); - var v = Caml_int64.mod_(r, bound); + let b1 = Caml_int64.of_int32(bits(s)); + let b2 = Caml_int64.lsl_(Caml_int64.of_int32(bits(s)), 30); + let b3 = Caml_int64.lsl_(Caml_int64.of_int32(bits(s) & 7), 60); + let r = Caml_int64.or_(b1, Caml_int64.or_(b2, b3)); + let v = Caml_int64.mod_(r, bound); if (!Caml.i64_gt(Caml_int64.sub(r, v), Caml_int64.add(Caml_int64.sub(Int64.max_int, bound), Caml_int64.one))) { return v; } @@ -133,8 +133,8 @@ function int64(s, bound) { } function rawfloat(s) { - var r1 = bits(s); - var r2 = bits(s); + let r1 = bits(s); + let r2 = bits(s); return (r1 / 1073741824.0 + r2) / 1073741824.0; } @@ -146,7 +146,7 @@ function bool(s) { return (bits(s) & 1) === 0; } -var $$default = { +let $$default = { st: [ 987910699, 495797812, @@ -251,7 +251,7 @@ function set_state(s) { assign($$default, s); } -var State = { +let State = { make: make, make_self_init: make_self_init, copy: copy, diff --git a/lib/js/set.js b/lib/js/set.js index d91465c84c..b0b8660849 100644 --- a/lib/js/set.js +++ b/lib/js/set.js @@ -1,21 +1,21 @@ 'use strict'; -var List = require("./list.js"); -var Curry = require("./curry.js"); -var Caml_option = require("./caml_option.js"); +let List = require("./list.js"); +let Curry = require("./curry.js"); +let Caml_option = require("./caml_option.js"); function Make(funarg) { - var height = function (param) { + let height = function (param) { if (typeof param !== "object") { return 0; } else { return param.h; } }; - var create = function (l, v, r) { - var hl; + let create = function (l, v, r) { + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; return { TAG: "Node", @@ -25,10 +25,10 @@ function Make(funarg) { h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0 }; }; - var bal = function (l, v, r) { - var hl; + let bal = function (l, v, r) { + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -38,9 +38,9 @@ function Make(funarg) { Error: new Error() }; } - var lr = l.r; - var lv = l.v; - var ll = l.l; + let lr = l.r; + let lv = l.v; + let ll = l.l; if (height(ll) >= height(lr)) { return create(ll, lv, create(lr, v, r)); } @@ -69,9 +69,9 @@ function Make(funarg) { Error: new Error() }; } - var rr = r.r; - var rv = r.v; - var rl = r.l; + let rr = r.r; + let rv = r.v; + let rl = r.l; if (height(rr) >= height(rl)) { return create(create(l, v, rl), rv, rr); } @@ -84,7 +84,7 @@ function Make(funarg) { Error: new Error() }; }; - var add = function (x, param) { + let add = function (x, param) { if (typeof param !== "object") { return { TAG: "Node", @@ -94,29 +94,29 @@ function Make(funarg) { h: 1 }; } - var r = param.r; - var v = param.v; - var l = param.l; - var c = Curry._2(funarg.compare, x, v); + let r = param.r; + let v = param.v; + let l = param.l; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { return param; } if (c < 0) { - var ll = add(x, l); + let ll = add(x, l); if (l === ll) { return param; } else { return bal(ll, v, r); } } - var rr = add(x, r); + let rr = add(x, r); if (r === rr) { return param; } else { return bal(l, v, rr); } }; - var singleton = function (x) { + let singleton = function (x) { return { TAG: "Node", l: "Empty", @@ -125,29 +125,29 @@ function Make(funarg) { h: 1 }; }; - var add_min_element = function (x, param) { + let add_min_element = function (x, param) { if (typeof param !== "object") { return singleton(x); } else { return bal(add_min_element(x, param.l), param.v, param.r); } }; - var add_max_element = function (x, param) { + let add_max_element = function (x, param) { if (typeof param !== "object") { return singleton(x); } else { return bal(param.l, param.v, add_max_element(x, param.r)); } }; - var join = function (l, v, r) { + let join = function (l, v, r) { if (typeof l !== "object") { return add_min_element(v, r); } - var lh = l.h; + let lh = l.h; if (typeof r !== "object") { return add_max_element(v, l); } - var rh = r.h; + let rh = r.h; if (lh > (rh + 2 | 0)) { return bal(l.l, l.v, join(l.r, v, r)); } else if (rh > (lh + 2 | 0)) { @@ -156,16 +156,16 @@ function Make(funarg) { return create(l, v, r); } }; - var min_elt = function (_param) { + let min_elt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return param.v; } @@ -173,13 +173,13 @@ function Make(funarg) { continue ; }; }; - var min_elt_opt = function (_param) { + let min_elt_opt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return Caml_option.some(param.v); } @@ -187,16 +187,16 @@ function Make(funarg) { continue ; }; }; - var max_elt = function (_param) { + let max_elt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return param.v; } @@ -204,13 +204,13 @@ function Make(funarg) { continue ; }; }; - var max_elt_opt = function (_param) { + let max_elt_opt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return Caml_option.some(param.v); } @@ -218,7 +218,7 @@ function Make(funarg) { continue ; }; }; - var remove_min_elt = function (param) { + let remove_min_elt = function (param) { if (typeof param !== "object") { throw { RE_EXN_ID: "Invalid_argument", @@ -226,14 +226,14 @@ function Make(funarg) { Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return param.r; } else { return bal(remove_min_elt(l), param.v, param.r); } }; - var concat = function (t1, t2) { + let concat = function (t1, t2) { if (typeof t1 !== "object") { return t2; } else if (typeof t2 !== "object") { @@ -242,7 +242,7 @@ function Make(funarg) { return join(t1, min_elt(t2), remove_min_elt(t2)); } }; - var split = function (x, param) { + let split = function (x, param) { if (typeof param !== "object") { return [ "Empty", @@ -250,10 +250,10 @@ function Make(funarg) { "Empty" ]; } - var r = param.r; - var v = param.v; - var l = param.l; - var c = Curry._2(funarg.compare, x, v); + let r = param.r; + let v = param.v; + let l = param.l; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { return [ l, @@ -262,34 +262,34 @@ function Make(funarg) { ]; } if (c < 0) { - var match = split(x, l); + let match = split(x, l); return [ match[0], match[1], join(match[2], v, r) ]; } - var match$1 = split(x, r); + let match$1 = split(x, r); return [ join(l, v, match$1[0]), match$1[1], match$1[2] ]; }; - var is_empty = function (param) { + let is_empty = function (param) { if (typeof param !== "object") { return true; } else { return false; } }; - var mem = function (x, _param) { + let mem = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } - var c = Curry._2(funarg.compare, x, param.v); + let c = Curry._2(funarg.compare, x, param.v); if (c === 0) { return true; } @@ -297,14 +297,14 @@ function Make(funarg) { continue ; }; }; - var remove = function (x, param) { + let remove = function (x, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var v = param.v; - var l = param.l; - var c = Curry._2(funarg.compare, x, v); + let r = param.r; + let v = param.v; + let l = param.l; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { if (typeof l !== "object") { return r; @@ -315,84 +315,84 @@ function Make(funarg) { } } if (c < 0) { - var ll = remove(x, l); + let ll = remove(x, l); if (l === ll) { return param; } else { return bal(ll, v, r); } } - var rr = remove(x, r); + let rr = remove(x, r); if (r === rr) { return param; } else { return bal(l, v, rr); } }; - var union = function (s1, s2) { + let union = function (s1, s2) { if (typeof s1 !== "object") { return s2; } - var h1 = s1.h; - var v1 = s1.v; + let h1 = s1.h; + let v1 = s1.v; if (typeof s2 !== "object") { return s1; } - var h2 = s2.h; - var v2 = s2.v; + let h2 = s2.h; + let v2 = s2.v; if (h1 >= h2) { if (h2 === 1) { return add(v2, s1); } - var match = split(v1, s2); + let match = split(v1, s2); return join(union(s1.l, match[0]), v1, union(s1.r, match[2])); } if (h1 === 1) { return add(v1, s2); } - var match$1 = split(v2, s1); + let match$1 = split(v2, s1); return join(union(match$1[0], s2.l), v2, union(match$1[2], s2.r)); }; - var inter = function (s1, s2) { + let inter = function (s1, s2) { if (typeof s1 !== "object") { return "Empty"; } if (typeof s2 !== "object") { return "Empty"; } - var r1 = s1.r; - var v1 = s1.v; - var l1 = s1.l; - var match = split(v1, s2); - var l2 = match[0]; + let r1 = s1.r; + let v1 = s1.v; + let l1 = s1.l; + let match = split(v1, s2); + let l2 = match[0]; if (match[1]) { return join(inter(l1, l2), v1, inter(r1, match[2])); } else { return concat(inter(l1, l2), inter(r1, match[2])); } }; - var diff = function (s1, s2) { + let diff = function (s1, s2) { if (typeof s1 !== "object") { return "Empty"; } if (typeof s2 !== "object") { return s1; } - var r1 = s1.r; - var v1 = s1.v; - var l1 = s1.l; - var match = split(v1, s2); - var l2 = match[0]; + let r1 = s1.r; + let v1 = s1.v; + let l1 = s1.l; + let match = split(v1, s2); + let l2 = match[0]; if (match[1]) { return concat(diff(l1, l2), diff(r1, match[2])); } else { return join(diff(l1, l2), v1, diff(r1, match[2])); } }; - var cons_enum = function (_s, _e) { + let cons_enum = function (_s, _e) { while(true) { - var e = _e; - var s = _s; + let e = _e; + let s = _s; if (typeof s !== "object") { return e; } @@ -406,12 +406,12 @@ function Make(funarg) { continue ; }; }; - var compare = function (s1, s2) { - var _e1 = cons_enum(s1, "End"); - var _e2 = cons_enum(s2, "End"); + let compare = function (s1, s2) { + let _e1 = cons_enum(s1, "End"); + let _e2 = cons_enum(s2, "End"); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return 0; @@ -422,7 +422,7 @@ function Make(funarg) { if (typeof e2 !== "object") { return 1; } - var c = Curry._2(funarg.compare, e1._0, e2._0); + let c = Curry._2(funarg.compare, e1._0, e2._0); if (c !== 0) { return c; } @@ -431,25 +431,25 @@ function Make(funarg) { continue ; }; }; - var equal = function (s1, s2) { + let equal = function (s1, s2) { return compare(s1, s2) === 0; }; - var subset = function (_s1, _s2) { + let subset = function (_s1, _s2) { while(true) { - var s2 = _s2; - var s1 = _s1; + let s2 = _s2; + let s1 = _s1; if (typeof s1 !== "object") { return true; } - var r1 = s1.r; - var v1 = s1.v; - var l1 = s1.l; + let r1 = s1.r; + let v1 = s1.v; + let l1 = s1.l; if (typeof s2 !== "object") { return false; } - var r2 = s2.r; - var l2 = s2.l; - var c = Curry._2(funarg.compare, v1, s2.v); + let r2 = s2.r; + let l2 = s2.l; + let c = Curry._2(funarg.compare, v1, s2.v); if (c === 0) { if (!subset(l1, l2)) { return false; @@ -484,9 +484,9 @@ function Make(funarg) { continue ; }; }; - var iter = function (f, _param) { + let iter = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } @@ -496,10 +496,10 @@ function Make(funarg) { continue ; }; }; - var fold = function (f, _s, _accu) { + let fold = function (f, _s, _accu) { while(true) { - var accu = _accu; - var s = _s; + let accu = _accu; + let s = _s; if (typeof s !== "object") { return accu; } @@ -508,9 +508,9 @@ function Make(funarg) { continue ; }; }; - var for_all = function (p, _param) { + let for_all = function (p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return true; } @@ -524,9 +524,9 @@ function Make(funarg) { continue ; }; }; - var exists = function (p, _param) { + let exists = function (p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } @@ -540,16 +540,16 @@ function Make(funarg) { continue ; }; }; - var filter = function (p, param) { + let filter = function (p, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var v = param.v; - var l = param.l; - var l$p = filter(p, l); - var pv = Curry._1(p, v); - var r$p = filter(p, r); + let r = param.r; + let v = param.v; + let l = param.l; + let l$p = filter(p, l); + let pv = Curry._1(p, v); + let r$p = filter(p, r); if (pv) { if (l === l$p && r === r$p) { return param; @@ -560,21 +560,21 @@ function Make(funarg) { return concat(l$p, r$p); } }; - var partition = function (p, param) { + let partition = function (p, param) { if (typeof param !== "object") { return [ "Empty", "Empty" ]; } - var v = param.v; - var match = partition(p, param.l); - var lf = match[1]; - var lt = match[0]; - var pv = Curry._1(p, v); - var match$1 = partition(p, param.r); - var rf = match$1[1]; - var rt = match$1[0]; + let v = param.v; + let match = partition(p, param.l); + let lf = match[1]; + let lt = match[0]; + let pv = Curry._1(p, v); + let match$1 = partition(p, param.r); + let rf = match$1[1]; + let rt = match$1[0]; if (pv) { return [ join(lt, v, rt), @@ -587,17 +587,17 @@ function Make(funarg) { ]; } }; - var cardinal = function (param) { + let cardinal = function (param) { if (typeof param !== "object") { return 0; } else { return (cardinal(param.l) + 1 | 0) + cardinal(param.r) | 0; } }; - var elements_aux = function (_accu, _param) { + let elements_aux = function (_accu, _param) { while(true) { - var param = _param; - var accu = _accu; + let param = _param; + let accu = _accu; if (typeof param !== "object") { return accu; } @@ -609,20 +609,20 @@ function Make(funarg) { continue ; }; }; - var elements = function (s) { + let elements = function (s) { return elements_aux(/* [] */0, s); }; - var find = function (x, _param) { + let find = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; - var c = Curry._2(funarg.compare, x, v); + let v = param.v; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { return v; } @@ -630,26 +630,26 @@ function Make(funarg) { continue ; }; }; - var find_first = function (f, _param) { + let find_first = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _param$1 = param.l; + let _v0 = v; + let _param$1 = param.l; while(true) { - var param$1 = _param$1; - var v0 = _v0; + let param$1 = _param$1; + let v0 = _v0; if (typeof param$1 !== "object") { return v0; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.l; _v0 = v$1; @@ -663,23 +663,23 @@ function Make(funarg) { continue ; }; }; - var find_first_opt = function (f, _param) { + let find_first_opt = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _param$1 = param.l; + let _v0 = v; + let _param$1 = param.l; while(true) { - var param$1 = _param$1; - var v0 = _v0; + let param$1 = _param$1; + let v0 = _v0; if (typeof param$1 !== "object") { return Caml_option.some(v0); } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.l; _v0 = v$1; @@ -693,26 +693,26 @@ function Make(funarg) { continue ; }; }; - var find_last = function (f, _param) { + let find_last = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _param$1 = param.r; + let _v0 = v; + let _param$1 = param.r; while(true) { - var param$1 = _param$1; - var v0 = _v0; + let param$1 = _param$1; + let v0 = _v0; if (typeof param$1 !== "object") { return v0; } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.r; _v0 = v$1; @@ -726,23 +726,23 @@ function Make(funarg) { continue ; }; }; - var find_last_opt = function (f, _param) { + let find_last_opt = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { - var _v0 = v; - var _param$1 = param.r; + let _v0 = v; + let _param$1 = param.r; while(true) { - var param$1 = _param$1; - var v0 = _v0; + let param$1 = _param$1; + let v0 = _v0; if (typeof param$1 !== "object") { return Caml_option.some(v0); } - var v$1 = param$1.v; + let v$1 = param$1.v; if (Curry._1(f, v$1)) { _param$1 = param$1.r; _v0 = v$1; @@ -756,14 +756,14 @@ function Make(funarg) { continue ; }; }; - var find_opt = function (x, _param) { + let find_opt = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; - var c = Curry._2(funarg.compare, x, v); + let v = param.v; + let c = Curry._2(funarg.compare, x, v); if (c === 0) { return Caml_option.some(v); } @@ -771,16 +771,16 @@ function Make(funarg) { continue ; }; }; - var map = function (f, param) { + let map = function (f, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var v = param.v; - var l = param.l; - var l$p = map(f, l); - var v$p = Curry._1(f, v); - var r$p = map(f, r); + let r = param.r; + let v = param.v; + let l = param.l; + let l$p = map(f, l); + let v$p = Curry._1(f, v); + let r$p = map(f, r); if (l === l$p && v === v$p && r === r$p) { return param; } else if ((l$p === "Empty" || Curry._2(funarg.compare, max_elt(l$p), v$p) < 0) && (r$p === "Empty" || Curry._2(funarg.compare, v$p, min_elt(r$p)) < 0)) { @@ -789,31 +789,31 @@ function Make(funarg) { return union(l$p, add(v$p, r$p)); } }; - var of_list = function (l) { + let of_list = function (l) { if (!l) { return "Empty"; } - var match = l.tl; - var x0 = l.hd; + let match = l.tl; + let x0 = l.hd; if (!match) { return singleton(x0); } - var match$1 = match.tl; - var x1 = match.hd; + let match$1 = match.tl; + let x1 = match.hd; if (!match$1) { return add(x1, singleton(x0)); } - var match$2 = match$1.tl; - var x2 = match$1.hd; + let match$2 = match$1.tl; + let x2 = match$1.hd; if (!match$2) { return add(x2, add(x1, singleton(x0))); } - var match$3 = match$2.tl; - var x3 = match$2.hd; + let match$3 = match$2.tl; + let x3 = match$2.hd; if (match$3) { if (match$3.tl) { - var l$1 = List.sort_uniq(funarg.compare, l); - var sub = function (n, l) { + let l$1 = List.sort_uniq(funarg.compare, l); + let sub = function (n, l) { switch (n) { case 0 : return [ @@ -836,7 +836,7 @@ function Make(funarg) { break; case 2 : if (l) { - var match = l.tl; + let match = l.tl; if (match) { return [ { @@ -860,9 +860,9 @@ function Make(funarg) { break; case 3 : if (l) { - var match$1 = l.tl; + let match$1 = l.tl; if (match$1) { - var match$2 = match$1.tl; + let match$2 = match$1.tl; if (match$2) { return [ { @@ -895,11 +895,11 @@ function Make(funarg) { default: } - var nl = n / 2 | 0; - var match$3 = sub(nl, l); - var l$1 = match$3[1]; + let nl = n / 2 | 0; + let match$3 = sub(nl, l); + let l$1 = match$3[1]; if (l$1) { - var match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl); + let match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl); return [ create(match$3[0], l$1.hd, match$4[0]), match$4[1] diff --git a/lib/js/setLabels.js b/lib/js/setLabels.js index 1b49b5cb1a..4d52f2d2b8 100644 --- a/lib/js/setLabels.js +++ b/lib/js/setLabels.js @@ -1,21 +1,21 @@ 'use strict'; -var List = require("./list.js"); -var Curry = require("./curry.js"); -var Caml_option = require("./caml_option.js"); +let List = require("./list.js"); +let Curry = require("./curry.js"); +let Caml_option = require("./caml_option.js"); function Make(Ord) { - var height = function (param) { + let height = function (param) { if (typeof param !== "object") { return 0; } else { return param.h; } }; - var create = function (l, v, r) { - var hl; + let create = function (l, v, r) { + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; return { TAG: "Node", @@ -25,10 +25,10 @@ function Make(Ord) { h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0 }; }; - var bal = function (l, v, r) { - var hl; + let bal = function (l, v, r) { + let hl; hl = typeof l !== "object" ? 0 : l.h; - var hr; + let hr; hr = typeof r !== "object" ? 0 : r.h; if (hl > (hr + 2 | 0)) { if (typeof l !== "object") { @@ -38,9 +38,9 @@ function Make(Ord) { Error: new Error() }; } - var lr = l.r; - var lv = l.v; - var ll = l.l; + let lr = l.r; + let lv = l.v; + let ll = l.l; if (height(ll) >= height(lr)) { return create(ll, lv, create(lr, v, r)); } @@ -69,9 +69,9 @@ function Make(Ord) { Error: new Error() }; } - var rr = r.r; - var rv = r.v; - var rl = r.l; + let rr = r.r; + let rv = r.v; + let rl = r.l; if (height(rr) >= height(rl)) { return create(create(l, v, rl), rv, rr); } @@ -84,7 +84,7 @@ function Make(Ord) { Error: new Error() }; }; - var add = function (x, param) { + let add = function (x, param) { if (typeof param !== "object") { return { TAG: "Node", @@ -94,29 +94,29 @@ function Make(Ord) { h: 1 }; } - var r = param.r; - var v = param.v; - var l = param.l; - var c = Curry._2(Ord.compare, x, v); + let r = param.r; + let v = param.v; + let l = param.l; + let c = Curry._2(Ord.compare, x, v); if (c === 0) { return param; } if (c < 0) { - var ll = add(x, l); + let ll = add(x, l); if (l === ll) { return param; } else { return bal(ll, v, r); } } - var rr = add(x, r); + let rr = add(x, r); if (r === rr) { return param; } else { return bal(l, v, rr); } }; - var singleton = function (x) { + let singleton = function (x) { return { TAG: "Node", l: "Empty", @@ -125,29 +125,29 @@ function Make(Ord) { h: 1 }; }; - var add_min_element = function (x, param) { + let add_min_element = function (x, param) { if (typeof param !== "object") { return singleton(x); } else { return bal(add_min_element(x, param.l), param.v, param.r); } }; - var add_max_element = function (x, param) { + let add_max_element = function (x, param) { if (typeof param !== "object") { return singleton(x); } else { return bal(param.l, param.v, add_max_element(x, param.r)); } }; - var join = function (l, v, r) { + let join = function (l, v, r) { if (typeof l !== "object") { return add_min_element(v, r); } - var lh = l.h; + let lh = l.h; if (typeof r !== "object") { return add_max_element(v, l); } - var rh = r.h; + let rh = r.h; if (lh > (rh + 2 | 0)) { return bal(l.l, l.v, join(l.r, v, r)); } else if (rh > (lh + 2 | 0)) { @@ -156,16 +156,16 @@ function Make(Ord) { return create(l, v, r); } }; - var min_elt = function (_param) { + let min_elt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return param.v; } @@ -173,13 +173,13 @@ function Make(Ord) { continue ; }; }; - var min_elt_opt = function (_param) { + let min_elt_opt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return Caml_option.some(param.v); } @@ -187,16 +187,16 @@ function Make(Ord) { continue ; }; }; - var max_elt = function (_param) { + let max_elt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return param.v; } @@ -204,13 +204,13 @@ function Make(Ord) { continue ; }; }; - var max_elt_opt = function (_param) { + let max_elt_opt = function (_param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var r = param.r; + let r = param.r; if (typeof r !== "object") { return Caml_option.some(param.v); } @@ -218,7 +218,7 @@ function Make(Ord) { continue ; }; }; - var remove_min_elt = function (param) { + let remove_min_elt = function (param) { if (typeof param !== "object") { throw { RE_EXN_ID: "Invalid_argument", @@ -226,14 +226,14 @@ function Make(Ord) { Error: new Error() }; } - var l = param.l; + let l = param.l; if (typeof l !== "object") { return param.r; } else { return bal(remove_min_elt(l), param.v, param.r); } }; - var merge = function (t1, t2) { + let merge = function (t1, t2) { if (typeof t1 !== "object") { return t2; } else if (typeof t2 !== "object") { @@ -242,7 +242,7 @@ function Make(Ord) { return bal(t1, min_elt(t2), remove_min_elt(t2)); } }; - var concat = function (t1, t2) { + let concat = function (t1, t2) { if (typeof t1 !== "object") { return t2; } else if (typeof t2 !== "object") { @@ -251,7 +251,7 @@ function Make(Ord) { return join(t1, min_elt(t2), remove_min_elt(t2)); } }; - var split = function (x, param) { + let split = function (x, param) { if (typeof param !== "object") { return [ "Empty", @@ -259,10 +259,10 @@ function Make(Ord) { "Empty" ]; } - var r = param.r; - var v = param.v; - var l = param.l; - var c = Curry._2(Ord.compare, x, v); + let r = param.r; + let v = param.v; + let l = param.l; + let c = Curry._2(Ord.compare, x, v); if (c === 0) { return [ l, @@ -271,34 +271,34 @@ function Make(Ord) { ]; } if (c < 0) { - var match = split(x, l); + let match = split(x, l); return [ match[0], match[1], join(match[2], v, r) ]; } - var match$1 = split(x, r); + let match$1 = split(x, r); return [ join(l, v, match$1[0]), match$1[1], match$1[2] ]; }; - var is_empty = function (param) { + let is_empty = function (param) { if (typeof param !== "object") { return true; } else { return false; } }; - var mem = function (x, _param) { + let mem = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } - var c = Curry._2(Ord.compare, x, param.v); + let c = Curry._2(Ord.compare, x, param.v); if (c === 0) { return true; } @@ -306,96 +306,96 @@ function Make(Ord) { continue ; }; }; - var remove = function (x, param) { + let remove = function (x, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var v = param.v; - var l = param.l; - var c = Curry._2(Ord.compare, x, v); + let r = param.r; + let v = param.v; + let l = param.l; + let c = Curry._2(Ord.compare, x, v); if (c === 0) { return merge(l, r); } if (c < 0) { - var ll = remove(x, l); + let ll = remove(x, l); if (l === ll) { return param; } else { return bal(ll, v, r); } } - var rr = remove(x, r); + let rr = remove(x, r); if (r === rr) { return param; } else { return bal(l, v, rr); } }; - var union = function (s1, s2) { + let union = function (s1, s2) { if (typeof s1 !== "object") { return s2; } - var h1 = s1.h; - var v1 = s1.v; + let h1 = s1.h; + let v1 = s1.v; if (typeof s2 !== "object") { return s1; } - var h2 = s2.h; - var v2 = s2.v; + let h2 = s2.h; + let v2 = s2.v; if (h1 >= h2) { if (h2 === 1) { return add(v2, s1); } - var match = split(v1, s2); + let match = split(v1, s2); return join(union(s1.l, match[0]), v1, union(s1.r, match[2])); } if (h1 === 1) { return add(v1, s2); } - var match$1 = split(v2, s1); + let match$1 = split(v2, s1); return join(union(match$1[0], s2.l), v2, union(match$1[2], s2.r)); }; - var inter = function (s1, s2) { + let inter = function (s1, s2) { if (typeof s1 !== "object") { return "Empty"; } if (typeof s2 !== "object") { return "Empty"; } - var r1 = s1.r; - var v1 = s1.v; - var l1 = s1.l; - var match = split(v1, s2); - var l2 = match[0]; + let r1 = s1.r; + let v1 = s1.v; + let l1 = s1.l; + let match = split(v1, s2); + let l2 = match[0]; if (match[1]) { return join(inter(l1, l2), v1, inter(r1, match[2])); } else { return concat(inter(l1, l2), inter(r1, match[2])); } }; - var diff = function (s1, s2) { + let diff = function (s1, s2) { if (typeof s1 !== "object") { return "Empty"; } if (typeof s2 !== "object") { return s1; } - var r1 = s1.r; - var v1 = s1.v; - var l1 = s1.l; - var match = split(v1, s2); - var l2 = match[0]; + let r1 = s1.r; + let v1 = s1.v; + let l1 = s1.l; + let match = split(v1, s2); + let l2 = match[0]; if (match[1]) { return concat(diff(l1, l2), diff(r1, match[2])); } else { return join(diff(l1, l2), v1, diff(r1, match[2])); } }; - var cons_enum = function (_s, _e) { + let cons_enum = function (_s, _e) { while(true) { - var e = _e; - var s = _s; + let e = _e; + let s = _s; if (typeof s !== "object") { return e; } @@ -409,10 +409,10 @@ function Make(Ord) { continue ; }; }; - var compare_aux = function (_e1, _e2) { + let compare_aux = function (_e1, _e2) { while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (typeof e1 !== "object") { if (typeof e2 !== "object") { return 0; @@ -423,7 +423,7 @@ function Make(Ord) { if (typeof e2 !== "object") { return 1; } - var c = Curry._2(Ord.compare, e1._0, e2._0); + let c = Curry._2(Ord.compare, e1._0, e2._0); if (c !== 0) { return c; } @@ -432,28 +432,28 @@ function Make(Ord) { continue ; }; }; - var compare = function (s1, s2) { + let compare = function (s1, s2) { return compare_aux(cons_enum(s1, "End"), cons_enum(s2, "End")); }; - var equal = function (s1, s2) { + let equal = function (s1, s2) { return compare(s1, s2) === 0; }; - var subset = function (_s1, _s2) { + let subset = function (_s1, _s2) { while(true) { - var s2 = _s2; - var s1 = _s1; + let s2 = _s2; + let s1 = _s1; if (typeof s1 !== "object") { return true; } - var r1 = s1.r; - var v1 = s1.v; - var l1 = s1.l; + let r1 = s1.r; + let v1 = s1.v; + let l1 = s1.l; if (typeof s2 !== "object") { return false; } - var r2 = s2.r; - var l2 = s2.l; - var c = Curry._2(Ord.compare, v1, s2.v); + let r2 = s2.r; + let l2 = s2.l; + let c = Curry._2(Ord.compare, v1, s2.v); if (c === 0) { if (!subset(l1, l2)) { return false; @@ -488,9 +488,9 @@ function Make(Ord) { continue ; }; }; - var iter = function (f, _param) { + let iter = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } @@ -500,10 +500,10 @@ function Make(Ord) { continue ; }; }; - var fold = function (f, _s, _accu) { + let fold = function (f, _s, _accu) { while(true) { - var accu = _accu; - var s = _s; + let accu = _accu; + let s = _s; if (typeof s !== "object") { return accu; } @@ -512,9 +512,9 @@ function Make(Ord) { continue ; }; }; - var for_all = function (p, _param) { + let for_all = function (p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return true; } @@ -528,9 +528,9 @@ function Make(Ord) { continue ; }; }; - var exists = function (p, _param) { + let exists = function (p, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return false; } @@ -544,16 +544,16 @@ function Make(Ord) { continue ; }; }; - var filter = function (p, param) { + let filter = function (p, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var v = param.v; - var l = param.l; - var l$p = filter(p, l); - var pv = Curry._1(p, v); - var r$p = filter(p, r); + let r = param.r; + let v = param.v; + let l = param.l; + let l$p = filter(p, l); + let pv = Curry._1(p, v); + let r$p = filter(p, r); if (pv) { if (l === l$p && r === r$p) { return param; @@ -564,21 +564,21 @@ function Make(Ord) { return concat(l$p, r$p); } }; - var partition = function (p, param) { + let partition = function (p, param) { if (typeof param !== "object") { return [ "Empty", "Empty" ]; } - var v = param.v; - var match = partition(p, param.l); - var lf = match[1]; - var lt = match[0]; - var pv = Curry._1(p, v); - var match$1 = partition(p, param.r); - var rf = match$1[1]; - var rt = match$1[0]; + let v = param.v; + let match = partition(p, param.l); + let lf = match[1]; + let lt = match[0]; + let pv = Curry._1(p, v); + let match$1 = partition(p, param.r); + let rf = match$1[1]; + let rt = match$1[0]; if (pv) { return [ join(lt, v, rt), @@ -591,17 +591,17 @@ function Make(Ord) { ]; } }; - var cardinal = function (param) { + let cardinal = function (param) { if (typeof param !== "object") { return 0; } else { return (cardinal(param.l) + 1 | 0) + cardinal(param.r) | 0; } }; - var elements_aux = function (_accu, _param) { + let elements_aux = function (_accu, _param) { while(true) { - var param = _param; - var accu = _accu; + let param = _param; + let accu = _accu; if (typeof param !== "object") { return accu; } @@ -613,20 +613,20 @@ function Make(Ord) { continue ; }; }; - var elements = function (s) { + let elements = function (s) { return elements_aux(/* [] */0, s); }; - var find = function (x, _param) { + let find = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; - var c = Curry._2(Ord.compare, x, v); + let v = param.v; + let c = Curry._2(Ord.compare, x, v); if (c === 0) { return v; } @@ -634,14 +634,14 @@ function Make(Ord) { continue ; }; }; - var find_first_aux = function (_v0, f, _param) { + let find_first_aux = function (_v0, f, _param) { while(true) { - var param = _param; - var v0 = _v0; + let param = _param; + let v0 = _v0; if (typeof param !== "object") { return v0; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.l; _v0 = v; @@ -651,16 +651,16 @@ function Make(Ord) { continue ; }; }; - var find_first = function (f, _param) { + let find_first = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_first_aux(v, f, param.l); } @@ -668,14 +668,14 @@ function Make(Ord) { continue ; }; }; - var find_first_opt_aux = function (_v0, f, _param) { + let find_first_opt_aux = function (_v0, f, _param) { while(true) { - var param = _param; - var v0 = _v0; + let param = _param; + let v0 = _v0; if (typeof param !== "object") { return Caml_option.some(v0); } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.l; _v0 = v; @@ -685,13 +685,13 @@ function Make(Ord) { continue ; }; }; - var find_first_opt = function (f, _param) { + let find_first_opt = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_first_opt_aux(v, f, param.l); } @@ -699,14 +699,14 @@ function Make(Ord) { continue ; }; }; - var find_last_aux = function (_v0, f, _param) { + let find_last_aux = function (_v0, f, _param) { while(true) { - var param = _param; - var v0 = _v0; + let param = _param; + let v0 = _v0; if (typeof param !== "object") { return v0; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.r; _v0 = v; @@ -716,16 +716,16 @@ function Make(Ord) { continue ; }; }; - var find_last = function (f, _param) { + let find_last = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { throw { RE_EXN_ID: "Not_found", Error: new Error() }; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_last_aux(v, f, param.r); } @@ -733,14 +733,14 @@ function Make(Ord) { continue ; }; }; - var find_last_opt_aux = function (_v0, f, _param) { + let find_last_opt_aux = function (_v0, f, _param) { while(true) { - var param = _param; - var v0 = _v0; + let param = _param; + let v0 = _v0; if (typeof param !== "object") { return Caml_option.some(v0); } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { _param = param.r; _v0 = v; @@ -750,13 +750,13 @@ function Make(Ord) { continue ; }; }; - var find_last_opt = function (f, _param) { + let find_last_opt = function (f, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; + let v = param.v; if (Curry._1(f, v)) { return find_last_opt_aux(v, f, param.r); } @@ -764,14 +764,14 @@ function Make(Ord) { continue ; }; }; - var find_opt = function (x, _param) { + let find_opt = function (x, _param) { while(true) { - var param = _param; + let param = _param; if (typeof param !== "object") { return; } - var v = param.v; - var c = Curry._2(Ord.compare, x, v); + let v = param.v; + let c = Curry._2(Ord.compare, x, v); if (c === 0) { return Caml_option.some(v); } @@ -779,31 +779,31 @@ function Make(Ord) { continue ; }; }; - var try_join = function (l, v, r) { + let try_join = function (l, v, r) { if ((l === "Empty" || Curry._2(Ord.compare, max_elt(l), v) < 0) && (r === "Empty" || Curry._2(Ord.compare, v, min_elt(r)) < 0)) { return join(l, v, r); } else { return union(l, add(v, r)); } }; - var map = function (f, param) { + let map = function (f, param) { if (typeof param !== "object") { return "Empty"; } - var r = param.r; - var v = param.v; - var l = param.l; - var l$p = map(f, l); - var v$p = Curry._1(f, v); - var r$p = map(f, r); + let r = param.r; + let v = param.v; + let l = param.l; + let l$p = map(f, l); + let v$p = Curry._1(f, v); + let r$p = map(f, r); if (l === l$p && v === v$p && r === r$p) { return param; } else { return try_join(l$p, v$p, r$p); } }; - var of_sorted_list = function (l) { - var sub = function (n, l) { + let of_sorted_list = function (l) { + let sub = function (n, l) { switch (n) { case 0 : return [ @@ -826,7 +826,7 @@ function Make(Ord) { break; case 2 : if (l) { - var match = l.tl; + let match = l.tl; if (match) { return [ { @@ -850,9 +850,9 @@ function Make(Ord) { break; case 3 : if (l) { - var match$1 = l.tl; + let match$1 = l.tl; if (match$1) { - var match$2 = match$1.tl; + let match$2 = match$1.tl; if (match$2) { return [ { @@ -885,11 +885,11 @@ function Make(Ord) { default: } - var nl = n / 2 | 0; - var match$3 = sub(nl, l); - var l$1 = match$3[1]; + let nl = n / 2 | 0; + let match$3 = sub(nl, l); + let l$1 = match$3[1]; if (l$1) { - var match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl); + let match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl); return [ create(match$3[0], l$1.hd, match$4[0]), match$4[1] @@ -907,27 +907,27 @@ function Make(Ord) { }; return sub(List.length(l), l)[0]; }; - var of_list = function (l) { + let of_list = function (l) { if (!l) { return "Empty"; } - var match = l.tl; - var x0 = l.hd; + let match = l.tl; + let x0 = l.hd; if (!match) { return singleton(x0); } - var match$1 = match.tl; - var x1 = match.hd; + let match$1 = match.tl; + let x1 = match.hd; if (!match$1) { return add(x1, singleton(x0)); } - var match$2 = match$1.tl; - var x2 = match$1.hd; + let match$2 = match$1.tl; + let x2 = match$1.hd; if (!match$2) { return add(x2, add(x1, singleton(x0))); } - var match$3 = match$2.tl; - var x3 = match$2.hd; + let match$3 = match$2.tl; + let x3 = match$2.hd; if (match$3) { if (match$3.tl) { return of_sorted_list(List.sort_uniq(Ord.compare, l)); diff --git a/lib/js/sort.js b/lib/js/sort.js index c484fee455..b2b980796b 100644 --- a/lib/js/sort.js +++ b/lib/js/sort.js @@ -1,6 +1,6 @@ 'use strict'; -var Curry = require("./curry.js"); +let Curry = require("./curry.js"); function merge(order, l1, l2) { if (!l1) { @@ -9,8 +9,8 @@ function merge(order, l1, l2) { if (!l2) { return l1; } - var h2 = l2.hd; - var h1 = l1.hd; + let h2 = l2.hd; + let h1 = l1.hd; if (Curry._2(order, h1, h2)) { return { hd: h1, @@ -25,12 +25,12 @@ function merge(order, l1, l2) { } function list(order, l) { - var initlist = function (param) { + let initlist = function (param) { if (!param) { return /* [] */0; } - var match = param.tl; - var e = param.hd; + let match = param.tl; + let e = param.hd; if (!match) { return { hd: { @@ -40,7 +40,7 @@ function list(order, l) { tl: /* [] */0 }; } - var e2 = match.hd; + let e2 = match.hd; return { hd: Curry._2(order, e, e2) ? ({ hd: e, @@ -58,11 +58,11 @@ function list(order, l) { tl: initlist(match.tl) }; }; - var merge2 = function (param) { + let merge2 = function (param) { if (!param) { return param; } - var match = param.tl; + let match = param.tl; if (match) { return { hd: merge(order, param.hd, match.hd), @@ -72,9 +72,9 @@ function list(order, l) { return param; } }; - var _param = initlist(l); + let _param = initlist(l); while(true) { - var param = _param; + let param = _param; if (!param) { return /* [] */0; } @@ -87,20 +87,20 @@ function list(order, l) { } function swap(arr, i, j) { - var tmp = arr[i]; + let tmp = arr[i]; arr[i] = arr[j]; arr[j] = tmp; } function array(cmp, arr) { - var qsort = function (_lo, _hi) { + let qsort = function (_lo, _hi) { while(true) { - var hi = _hi; - var lo = _lo; + let hi = _hi; + let lo = _lo; if ((hi - lo | 0) < 6) { return; } - var mid = ((lo + hi | 0) >>> 1); + let mid = ((lo + hi | 0) >>> 1); if (Curry._2(cmp, arr[mid], arr[lo])) { swap(arr, mid, lo); } @@ -111,9 +111,9 @@ function array(cmp, arr) { } } - var pivot = arr[mid]; - var i = lo + 1 | 0; - var j = hi - 1 | 0; + let pivot = arr[mid]; + let i = lo + 1 | 0; + let j = hi - 1 | 0; if (!Curry._2(cmp, pivot, arr[hi]) || !Curry._2(cmp, arr[lo], pivot)) { throw { RE_EXN_ID: "Invalid_argument", @@ -145,11 +145,11 @@ function array(cmp, arr) { }; }; qsort(0, arr.length - 1 | 0); - for(var i = 1 ,i_finish = arr.length; i < i_finish; ++i){ - var val_i = arr[i]; + for(let i = 1 ,i_finish = arr.length; i < i_finish; ++i){ + let val_i = arr[i]; if (!Curry._2(cmp, arr[i - 1 | 0], val_i)) { arr[i] = arr[i - 1 | 0]; - var j = i - 1 | 0; + let j = i - 1 | 0; while(j >= 1 && !Curry._2(cmp, arr[j - 1 | 0], val_i)) { arr[j] = arr[j - 1 | 0]; j = j - 1 | 0; diff --git a/lib/js/stack.js b/lib/js/stack.js index 78ed546449..741be44433 100644 --- a/lib/js/stack.js +++ b/lib/js/stack.js @@ -1,9 +1,9 @@ 'use strict'; -var List = require("./list.js"); -var Caml_exceptions = require("./caml_exceptions.js"); +let List = require("./list.js"); +let Caml_exceptions = require("./caml_exceptions.js"); -var Empty = /* @__PURE__ */Caml_exceptions.create("Stack.Empty"); +let Empty = /* @__PURE__ */Caml_exceptions.create("Stack.Empty"); function create(param) { return { @@ -33,7 +33,7 @@ function push(x, s) { } function pop(s) { - var match = s.c; + let match = s.c; if (match) { s.c = match.tl; s.len = s.len - 1 | 0; @@ -46,7 +46,7 @@ function pop(s) { } function top(s) { - var match = s.c; + let match = s.c; if (match) { return match.hd; } diff --git a/lib/js/stdLabels.js b/lib/js/stdLabels.js index ba5a4cd41f..b8942f1839 100644 --- a/lib/js/stdLabels.js +++ b/lib/js/stdLabels.js @@ -1,13 +1,13 @@ 'use strict'; -var $$Array; +let $$Array; -var Bytes; +let Bytes; -var List; +let List; -var $$String; +let $$String; exports.$$Array = $$Array; exports.Bytes = Bytes; diff --git a/lib/js/stream.js b/lib/js/stream.js index 076f6487d4..4ae7bf4905 100644 --- a/lib/js/stream.js +++ b/lib/js/stream.js @@ -1,16 +1,16 @@ 'use strict'; -var List = require("./list.js"); -var Curry = require("./curry.js"); -var Caml_bytes = require("./caml_bytes.js"); -var Caml_option = require("./caml_option.js"); -var Caml_string = require("./caml_string.js"); -var Caml_exceptions = require("./caml_exceptions.js"); -var CamlinternalLazy = require("./camlinternalLazy.js"); +let List = require("./list.js"); +let Curry = require("./curry.js"); +let Caml_bytes = require("./caml_bytes.js"); +let Caml_option = require("./caml_option.js"); +let Caml_string = require("./caml_string.js"); +let Caml_exceptions = require("./caml_exceptions.js"); +let CamlinternalLazy = require("./camlinternalLazy.js"); -var Failure = /* @__PURE__ */Caml_exceptions.create("Stream.Failure"); +let Failure = /* @__PURE__ */Caml_exceptions.create("Stream.Failure"); -var $$Error = /* @__PURE__ */Caml_exceptions.create("Stream.Error"); +let $$Error = /* @__PURE__ */Caml_exceptions.create("Stream.Error"); function count(param) { if (param !== undefined) { @@ -30,7 +30,7 @@ function data(param) { function get_data(count, _d) { while(true) { - var d = _d; + let d = _d; if (typeof d !== "object") { return d; } @@ -38,8 +38,8 @@ function get_data(count, _d) { case "Scons" : return d; case "Sapp" : - var d2 = d._1; - var match = get_data(count, d._0); + let d2 = d._1; + let match = get_data(count, d._0); if (typeof match !== "object") { _d = d2; continue ; @@ -68,10 +68,10 @@ function get_data(count, _d) { _d = CamlinternalLazy.force(d._0); continue ; case "Sgen" : - var g = d._0; - var match$1 = g.curr; + let g = d._0; + let match$1 = g.curr; if (match$1 !== undefined) { - var a = Caml_option.valFromOption(match$1); + let a = Caml_option.valFromOption(match$1); if (a !== undefined) { g.curr = undefined; return { @@ -83,7 +83,7 @@ function get_data(count, _d) { return "Sempty"; } } - var a$1 = Curry._1(g.func, count); + let a$1 = Curry._1(g.func, count); if (a$1 !== undefined) { return { TAG: "Scons", @@ -101,7 +101,7 @@ function get_data(count, _d) { function peek_data(s) { while(true) { - var f = s.data; + let f = s.data; if (typeof f !== "object") { return; } @@ -109,7 +109,7 @@ function peek_data(s) { case "Scons" : return Caml_option.some(f._0); case "Sapp" : - var d = get_data(s.count, s.data); + let d = get_data(s.count, s.data); if (typeof d !== "object") { return; } @@ -130,12 +130,12 @@ function peek_data(s) { s.data = CamlinternalLazy.force(f._0); continue ; case "Sgen" : - var g = f._0; - var a = g.curr; + let g = f._0; + let a = g.curr; if (a !== undefined) { return Caml_option.valFromOption(a); } - var x = Curry._1(g.func, s.count); + let x = Curry._1(g.func, s.count); g.curr = Caml_option.some(x); return x; @@ -152,7 +152,7 @@ function peek(param) { function junk_data(s) { while(true) { - var g = s.data; + let g = s.data; if (typeof g === "object") { switch (g.TAG) { case "Scons" : @@ -160,8 +160,8 @@ function junk_data(s) { s.data = g._1; return; case "Sgen" : - var g$1 = g._0; - var match = g$1.curr; + let g$1 = g._0; + let match = g$1.curr; if (match !== undefined) { s.count = s.count + 1 | 0; g$1.curr = undefined; @@ -172,7 +172,7 @@ function junk_data(s) { } } - var match$1 = peek_data(s); + let match$1 = peek_data(s); if (match$1 === undefined) { return; } @@ -195,7 +195,7 @@ function nget_data(n, s) { 0 ]; } - var a = peek_data(s); + let a = peek_data(s); if (a === undefined) { return [ /* [] */0, @@ -203,9 +203,9 @@ function nget_data(n, s) { 0 ]; } - var a$1 = Caml_option.valFromOption(a); + let a$1 = Caml_option.valFromOption(a); junk_data(s); - var match = nget_data(n - 1 | 0, s); + let match = nget_data(n - 1 | 0, s); return [ { hd: a$1, @@ -222,7 +222,7 @@ function nget_data(n, s) { function npeek(n, param) { if (param !== undefined) { - var match = nget_data(n, param); + let match = nget_data(n, param); param.count = param.count - match[2] | 0; param.data = match[1]; return match[0]; @@ -232,7 +232,7 @@ function npeek(n, param) { } function next(s) { - var a = peek(s); + let a = peek(s); if (a !== undefined) { junk(s); return Caml_option.valFromOption(a); @@ -244,7 +244,7 @@ function next(s) { } function empty(s) { - var match = peek(s); + let match = peek(s); if (match === undefined) { return; } @@ -255,9 +255,9 @@ function empty(s) { } function iter(f, strm) { - var _param; + let _param; while(true) { - var a = peek(strm); + let a = peek(strm); if (a === undefined) { return; } @@ -295,11 +295,11 @@ function of_list(l) { } function of_string(s) { - var count = { + let count = { contents: 0 }; return from(function (param) { - var c = count.contents; + let c = count.contents; if (c < s.length) { count.contents = count.contents + 1 | 0; return Caml_string.get(s, c); @@ -309,11 +309,11 @@ function of_string(s) { } function of_bytes(s) { - var count = { + let count = { contents: 0 }; return from(function (param) { - var c = count.contents; + let c = count.contents; if (c < s.length) { count.contents = count.contents + 1 | 0; return Caml_bytes.get(s, c); @@ -447,7 +447,7 @@ function dump_data(f, param) { function dump(f, s) { console.log("{count = "); - var i = count(s); + let i = count(s); console.log(String(i)); console.log("; data = "); dump_data(f, data(s)); @@ -455,7 +455,7 @@ function dump(f, s) { console.log(""); } -var sempty; +let sempty; exports.Failure = Failure; exports.$$Error = $$Error; diff --git a/lib/js/string.js b/lib/js/string.js index 62c45a7cd1..6e230f1125 100644 --- a/lib/js/string.js +++ b/lib/js/string.js @@ -1,11 +1,11 @@ 'use strict'; -var Caml = require("./caml.js"); -var $$Array = require("./array.js"); -var Bytes = require("./bytes.js"); -var Curry = require("./curry.js"); -var Caml_string = require("./caml_string.js"); -var Caml_js_exceptions = require("./caml_js_exceptions.js"); +let Caml = require("./caml.js"); +let $$Array = require("./array.js"); +let Bytes = require("./bytes.js"); +let Curry = require("./curry.js"); +let Caml_string = require("./caml_string.js"); +let Caml_js_exceptions = require("./caml_js_exceptions.js"); function init(n, f) { return Bytes.unsafe_to_string(Bytes.init(n, f)); @@ -20,13 +20,13 @@ function concat(sep, xs) { } function iter(f, s) { - for(var i = 0 ,i_finish = s.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = s.length; i < i_finish; ++i){ Curry._1(f, s.codePointAt(i)); } } function iteri(f, s) { - for(var i = 0 ,i_finish = s.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = s.length; i < i_finish; ++i){ Curry._2(f, i, s.codePointAt(i)); } } @@ -56,13 +56,13 @@ function trim(s) { } function escaped(s) { - var needs_escape = function (_i) { + let needs_escape = function (_i) { while(true) { - var i = _i; + let i = _i; if (i >= s.length) { return false; } - var match = s.codePointAt(i); + let match = s.codePointAt(i); if (match < 32) { return true; } @@ -89,7 +89,7 @@ function escaped(s) { function index_rec(s, lim, _i, c) { while(true) { - var i = _i; + let i = _i; if (i >= lim) { throw { RE_EXN_ID: "Not_found", @@ -110,7 +110,7 @@ function index(s, c) { function index_rec_opt(s, lim, _i, c) { while(true) { - var i = _i; + let i = _i; if (i >= lim) { return; } @@ -127,7 +127,7 @@ function index_opt(s, c) { } function index_from(s, i, c) { - var l = s.length; + let l = s.length; if (i < 0 || i > l) { throw { RE_EXN_ID: "Invalid_argument", @@ -139,7 +139,7 @@ function index_from(s, i, c) { } function index_from_opt(s, i, c) { - var l = s.length; + let l = s.length; if (i < 0 || i > l) { throw { RE_EXN_ID: "Invalid_argument", @@ -152,7 +152,7 @@ function index_from_opt(s, i, c) { function rindex_rec(s, _i, c) { while(true) { - var i = _i; + let i = _i; if (i < 0) { throw { RE_EXN_ID: "Not_found", @@ -184,7 +184,7 @@ function rindex_from(s, i, c) { function rindex_rec_opt(s, _i, c) { while(true) { - var i = _i; + let i = _i; if (i < 0) { return; } @@ -212,7 +212,7 @@ function rindex_from_opt(s, i, c) { } function contains_from(s, i, c) { - var l = s.length; + let l = s.length; if (i < 0 || i > l) { throw { RE_EXN_ID: "Invalid_argument", @@ -225,7 +225,7 @@ function contains_from(s, i, c) { return true; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { return false; } @@ -250,7 +250,7 @@ function rcontains_from(s, i, c) { return true; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { return false; } @@ -274,16 +274,16 @@ function uncapitalize_ascii(s) { return Bytes.unsafe_to_string(Bytes.uncapitalize_ascii(Bytes.unsafe_of_string(s))); } -var compare = Caml.string_compare; +let compare = Caml.string_compare; function equal(a, b) { return a === b; } function split_on_char(sep, s) { - var r = /* [] */0; - var j = s.length; - for(var i = s.length - 1 | 0; i >= 0; --i){ + let r = /* [] */0; + let j = s.length; + for(let i = s.length - 1 | 0; i >= 0; --i){ if (s.codePointAt(i) === sep) { r = { hd: sub(s, i + 1 | 0, (j - i | 0) - 1 | 0), @@ -299,9 +299,9 @@ function split_on_char(sep, s) { }; } -var make = Caml_string.make; +let make = Caml_string.make; -var blit = Bytes.blit_string; +let blit = Bytes.blit_string; exports.make = make; exports.init = init; diff --git a/lib/js/stringLabels.js b/lib/js/stringLabels.js index d8c07b0e50..cb39521e4b 100644 --- a/lib/js/stringLabels.js +++ b/lib/js/stringLabels.js @@ -1,11 +1,11 @@ 'use strict'; -var Caml = require("./caml.js"); -var $$Array = require("./array.js"); -var Bytes = require("./bytes.js"); -var Curry = require("./curry.js"); -var Caml_string = require("./caml_string.js"); -var Caml_js_exceptions = require("./caml_js_exceptions.js"); +let Caml = require("./caml.js"); +let $$Array = require("./array.js"); +let Bytes = require("./bytes.js"); +let Curry = require("./curry.js"); +let Caml_string = require("./caml_string.js"); +let Caml_js_exceptions = require("./caml_js_exceptions.js"); function init(n, f) { return Bytes.unsafe_to_string(Bytes.init(n, f)); @@ -15,20 +15,20 @@ function sub(s, ofs, len) { return Bytes.unsafe_to_string(Bytes.sub(Bytes.unsafe_of_string(s), ofs, len)); } -var blit = Bytes.blit_string; +let blit = Bytes.blit_string; function concat(sep, xs) { return $$Array.of_list(xs).join(sep); } function iter(f, s) { - for(var i = 0 ,i_finish = s.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = s.length; i < i_finish; ++i){ Curry._1(f, s.codePointAt(i)); } } function iteri(f, s) { - for(var i = 0 ,i_finish = s.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = s.length; i < i_finish; ++i){ Curry._2(f, i, s.codePointAt(i)); } } @@ -58,13 +58,13 @@ function trim(s) { } function escaped(s) { - var needs_escape = function (_i) { + let needs_escape = function (_i) { while(true) { - var i = _i; + let i = _i; if (i >= s.length) { return false; } - var match = s.codePointAt(i); + let match = s.codePointAt(i); if (match < 32) { return true; } @@ -91,7 +91,7 @@ function escaped(s) { function index_rec(s, lim, _i, c) { while(true) { - var i = _i; + let i = _i; if (i >= lim) { throw { RE_EXN_ID: "Not_found", @@ -112,7 +112,7 @@ function index(s, c) { function index_rec_opt(s, lim, _i, c) { while(true) { - var i = _i; + let i = _i; if (i >= lim) { return; } @@ -129,7 +129,7 @@ function index_opt(s, c) { } function index_from(s, i, c) { - var l = s.length; + let l = s.length; if (i < 0 || i > l) { throw { RE_EXN_ID: "Invalid_argument", @@ -141,7 +141,7 @@ function index_from(s, i, c) { } function index_from_opt(s, i, c) { - var l = s.length; + let l = s.length; if (i < 0 || i > l) { throw { RE_EXN_ID: "Invalid_argument", @@ -154,7 +154,7 @@ function index_from_opt(s, i, c) { function rindex_rec(s, _i, c) { while(true) { - var i = _i; + let i = _i; if (i < 0) { throw { RE_EXN_ID: "Not_found", @@ -186,7 +186,7 @@ function rindex_from(s, i, c) { function rindex_rec_opt(s, _i, c) { while(true) { - var i = _i; + let i = _i; if (i < 0) { return; } @@ -214,7 +214,7 @@ function rindex_from_opt(s, i, c) { } function contains_from(s, i, c) { - var l = s.length; + let l = s.length; if (i < 0 || i > l) { throw { RE_EXN_ID: "Invalid_argument", @@ -227,7 +227,7 @@ function contains_from(s, i, c) { return true; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { return false; } @@ -252,7 +252,7 @@ function rcontains_from(s, i, c) { return true; } catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + let exn = Caml_js_exceptions.internalToOCamlException(raw_exn); if (exn.RE_EXN_ID === "Not_found") { return false; } @@ -276,16 +276,16 @@ function uncapitalize_ascii(s) { return Bytes.unsafe_to_string(Bytes.uncapitalize_ascii(Bytes.unsafe_of_string(s))); } -var compare = Caml.string_compare; +let compare = Caml.string_compare; function equal(a, b) { return a === b; } function split_on_char(sep, s) { - var r = /* [] */0; - var j = s.length; - for(var i = s.length - 1 | 0; i >= 0; --i){ + let r = /* [] */0; + let j = s.length; + for(let i = s.length - 1 | 0; i >= 0; --i){ if (s.codePointAt(i) === sep) { r = { hd: sub(s, i + 1 | 0, (j - i | 0) - 1 | 0), @@ -301,7 +301,7 @@ function split_on_char(sep, s) { }; } -var make = Caml_string.make; +let make = Caml_string.make; exports.make = make; exports.init = init; diff --git a/lib/js/sys.js b/lib/js/sys.js index a0088d3afc..38e33bb84a 100644 --- a/lib/js/sys.js +++ b/lib/js/sys.js @@ -1,25 +1,25 @@ 'use strict'; -var Caml_sys = require("./caml_sys.js"); -var Caml_exceptions = require("./caml_exceptions.js"); +let Caml_sys = require("./caml_sys.js"); +let Caml_exceptions = require("./caml_exceptions.js"); -var match = Caml_sys.sys_get_argv(); +let match = Caml_sys.sys_get_argv(); -var os_type = Caml_sys.os_type(); +let os_type = Caml_sys.os_type(); -var backend_type = { +let backend_type = { TAG: "Other", _0: "BS" }; -var big_endian = false; +let big_endian = false; -var unix = Caml_sys.os_type() === "Unix"; +let unix = Caml_sys.os_type() === "Unix"; -var win32 = Caml_sys.os_type() === "Win32"; +let win32 = Caml_sys.os_type() === "Win32"; function getenv_opt(s) { - var x = typeof process === "undefined" ? undefined : process; + let x = typeof process === "undefined" ? undefined : process; if (x !== undefined) { return x.env[s]; } @@ -30,7 +30,7 @@ function command(param) { return 127; } -var interactive = { +let interactive = { contents: false }; @@ -42,7 +42,7 @@ function set_signal(sig_num, sig_beh) { } -var Break = /* @__PURE__ */Caml_exceptions.create("Sys.Break"); +let Break = /* @__PURE__ */Caml_exceptions.create("Sys.Break"); function catch_break(on) { @@ -56,77 +56,77 @@ function runtime_warnings_enabled(param) { return false; } -var argv = match[1]; +let argv = match[1]; -var executable_name = match[0]; +let executable_name = match[0]; -var cygwin = false; +let cygwin = false; -var word_size = 32; +let word_size = 32; -var int_size = 32; +let int_size = 32; -var max_string_length = 2147483647; +let max_string_length = 2147483647; -var max_array_length = 2147483647; +let max_array_length = 2147483647; -var sigabrt = -1; +let sigabrt = -1; -var sigalrm = -2; +let sigalrm = -2; -var sigfpe = -3; +let sigfpe = -3; -var sighup = -4; +let sighup = -4; -var sigill = -5; +let sigill = -5; -var sigint = -6; +let sigint = -6; -var sigkill = -7; +let sigkill = -7; -var sigpipe = -8; +let sigpipe = -8; -var sigquit = -9; +let sigquit = -9; -var sigsegv = -10; +let sigsegv = -10; -var sigterm = -11; +let sigterm = -11; -var sigusr1 = -12; +let sigusr1 = -12; -var sigusr2 = -13; +let sigusr2 = -13; -var sigchld = -14; +let sigchld = -14; -var sigcont = -15; +let sigcont = -15; -var sigstop = -16; +let sigstop = -16; -var sigtstp = -17; +let sigtstp = -17; -var sigttin = -18; +let sigttin = -18; -var sigttou = -19; +let sigttou = -19; -var sigvtalrm = -20; +let sigvtalrm = -20; -var sigprof = -21; +let sigprof = -21; -var sigbus = -22; +let sigbus = -22; -var sigpoll = -23; +let sigpoll = -23; -var sigsys = -24; +let sigsys = -24; -var sigtrap = -25; +let sigtrap = -25; -var sigurg = -26; +let sigurg = -26; -var sigxcpu = -27; +let sigxcpu = -27; -var sigxfsz = -28; +let sigxfsz = -28; -var ocaml_version = "4.06.2+BS"; +let ocaml_version = "4.06.2+BS"; exports.argv = argv; exports.executable_name = executable_name; diff --git a/lib/js/uchar.js b/lib/js/uchar.js index 6f3ea68631..afb17c438f 100644 --- a/lib/js/uchar.js +++ b/lib/js/uchar.js @@ -1,7 +1,7 @@ 'use strict'; -var Caml = require("./caml.js"); -var Caml_format = require("./caml_format.js"); +let Caml = require("./caml.js"); +let Caml_format = require("./caml_format.js"); function err_not_sv(i) { return Caml_format.format_int("%X", i) + " is not an Unicode scalar value"; @@ -53,7 +53,7 @@ function of_int(i) { if (is_valid(i)) { return i; } - var s = err_not_sv(i); + let s = err_not_sv(i); throw { RE_EXN_ID: "Invalid_argument", _1: s, @@ -73,7 +73,7 @@ function to_char(u) { if (u <= 255) { return u; } - var s = err_not_latin1(u); + let s = err_not_latin1(u); throw { RE_EXN_ID: "Invalid_argument", _1: s, @@ -89,19 +89,19 @@ function equal(prim0, prim1) { return prim0 === prim1; } -var compare = Caml.int_compare; +let compare = Caml.int_compare; function hash(prim) { return prim; } -var min = 0; +let min = 0; -var max = 1114111; +let max = 1114111; -var bom = 65279; +let bom = 65279; -var rep = 65533; +let rep = 65533; function unsafe_of_int(prim) { return prim;