From 46dcf279de977e13170b94c8cbc4e9ac42236f98 Mon Sep 17 00:00:00 2001 From: Hongbo Zhang Date: Mon, 9 May 2016 12:19:44 -0400 Subject: [PATCH] [feature] make js files relocatble --- .gitignore | 1 - jscomp/build.sh | 2 +- jscomp/ext_filename.ml | 122 +++++-- jscomp/ext_filename.mli | 19 +- jscomp/ext_pervasives.ml | 2 + jscomp/ext_pervasives.mli | 2 + jscomp/js_cmj_format.ml | 6 +- jscomp/js_config.ml | 36 +- jscomp/js_config.mli | 4 + jscomp/js_main.ml | 34 +- jscomp/js_program_loader.ml | 68 ++-- jscomp/lam_analysis.ml | 3 +- jscomp/lam_compile_env.ml | 64 ++-- jscomp/lam_compile_env.mli | 2 + jscomp/lam_compile_group.ml | 5 +- jscomp/lam_current_unit.ml | 1 + jscomp/lam_current_unit.mli | 1 + jscomp/lam_dispatch_primitive.ml | 1 + jscomp/lib/js.ml | 2 +- jscomp/runtime/.runtimedepend | 12 +- jscomp/runtime/Makefile | 18 +- jscomp/runtime/caml_block.js | 11 - jscomp/runtime/caml_int64.ml | 5 +- jscomp/runtime/caml_oo.ml | 4 +- jscomp/runtime/caml_sys.ml | 3 + jscomp/runtime/caml_sys.mli | 1 + jscomp/stdlib/Makefile.shared | 2 +- jscomp/test/.depend | 12 +- jscomp/test/Makefile | 4 +- jscomp/test/a_filename_test.js | 61 ---- jscomp/test/a_filename_test.ml | 87 +++-- jscomp/test/a_recursve_type.js | 6 - jscomp/test/ext_filename.js | 216 ----------- jscomp/tools/line_process.ml | 2 +- {jscomp/stdlib => lib/js}/arg.js | 14 +- {jscomp/stdlib => lib/js}/array.js | 8 +- {jscomp/stdlib => lib/js}/arrayLabels.js | 0 {jscomp/stdlib => lib/js}/bigarray.js | 4 +- {jscomp/runtime => lib/js}/block.js | 0 {jscomp/stdlib => lib/js}/buffer.js | 6 +- {jscomp/stdlib => lib/js}/bytes.js | 10 +- {jscomp/stdlib => lib/js}/bytesLabels.js | 0 {jscomp/stdlib => lib/js}/callback.js | 0 {jscomp/runtime => lib/js}/caml_array.js | 0 {jscomp/runtime => lib/js}/caml_backtrace.js | 0 {jscomp/runtime => lib/js}/caml_basic.js | 0 .../js}/caml_builtin_exceptions.js | 0 {jscomp/runtime => lib/js}/caml_exceptions.js | 0 {jscomp/runtime => lib/js}/caml_float.js | 0 {jscomp/runtime => lib/js}/caml_format.js | 0 {jscomp/runtime => lib/js}/caml_gc.js | 0 {jscomp/runtime => lib/js}/caml_hash.js | 0 {jscomp/runtime => lib/js}/caml_int32.js | 0 {jscomp/runtime => lib/js}/caml_int64.js | 0 {jscomp/runtime => lib/js}/caml_io.js | 0 {jscomp/runtime => lib/js}/caml_lexer.js | 0 {jscomp/runtime => lib/js}/caml_md5.js | 0 {jscomp/runtime => lib/js}/caml_obj.js | 0 {jscomp/runtime => lib/js}/caml_oo.js | 2 +- {jscomp/runtime => lib/js}/caml_parser.js | 0 {jscomp/runtime => lib/js}/caml_primitive.js | 0 {jscomp/runtime => lib/js}/caml_queue.js | 0 {jscomp/runtime => lib/js}/caml_string.js | 0 {jscomp/runtime => lib/js}/caml_sys.js | 8 + {jscomp/runtime => lib/js}/caml_utils.js | 0 {jscomp/runtime => lib/js}/caml_weak.js | 0 .../stdlib => lib/js}/camlinternalFormat.js | 20 +- .../js}/camlinternalFormatBasics.js | 2 +- {jscomp/stdlib => lib/js}/camlinternalLazy.js | 4 +- {jscomp/stdlib => lib/js}/camlinternalMod.js | 4 +- {jscomp/stdlib => lib/js}/camlinternalOO.js | 16 +- {jscomp/stdlib => lib/js}/char.js | 4 +- {jscomp/stdlib => lib/js}/complex.js | 0 {jscomp/runtime => lib/js}/curry.js | 0 {jscomp/stdlib => lib/js}/digest.js | 6 +- {jscomp/stdlib => lib/js}/filename.js | 8 +- {jscomp/runtime => lib/js}/fn.js | 0 {jscomp/stdlib => lib/js}/format.js | 14 +- {jscomp/stdlib => lib/js}/gc.js | 6 +- {jscomp/stdlib => lib/js}/genlex.js | 10 +- {jscomp/stdlib => lib/js}/hashtbl.js | 16 +- {jscomp/stdlib => lib/js}/int32.js | 4 +- {jscomp/stdlib => lib/js}/int64.js | 4 +- {jscomp/runtime => lib/js}/js.js | 0 {jscomp/runtime => lib/js}/js_primitive.js | 0 {jscomp/stdlib => lib/js}/lazy.js | 4 +- {jscomp/stdlib => lib/js}/lexing.js | 8 +- {jscomp/stdlib => lib/js}/list.js | 6 +- {jscomp/stdlib => lib/js}/listLabels.js | 0 {jscomp/stdlib => lib/js}/map.js | 4 +- {jscomp/stdlib => lib/js}/marshal.js | 4 +- {jscomp/stdlib => lib/js}/moreLabels.js | 0 {jscomp/stdlib => lib/js}/nativeint.js | 4 +- {jscomp/stdlib => lib/js}/obj.js | 2 +- {jscomp/stdlib => lib/js}/oo.js | 0 {jscomp/stdlib => lib/js}/parsing.js | 10 +- {jscomp/stdlib => lib/js}/pervasives.js | 14 +- {jscomp/stdlib => lib/js}/printexc.js | 10 +- {jscomp/stdlib => lib/js}/printf.js | 2 +- {jscomp/stdlib => lib/js}/queue.js | 6 +- {jscomp/stdlib => lib/js}/random.js | 10 +- {jscomp/stdlib => lib/js}/scanf.js | 14 +- {jscomp/stdlib => lib/js}/set.js | 4 +- {jscomp/stdlib => lib/js}/sort.js | 4 +- {jscomp/stdlib => lib/js}/stack.js | 2 +- {jscomp/stdlib => lib/js}/stdLabels.js | 0 {jscomp/stdlib => lib/js}/std_exit.js | 0 {jscomp/stdlib => lib/js}/stream.js | 8 +- {jscomp/stdlib => lib/js}/string.js | 4 +- {jscomp/stdlib => lib/js}/stringLabels.js | 0 {jscomp/stdlib => lib/js}/sys.js | 2 +- {jscomp => lib/js}/test/a.js | 0 lib/js/test/a_filename_test.js | 100 +++++ {jscomp => lib/js}/test/a_list_test.js | 2 +- {jscomp => lib/js}/test/a_recursive_type.js | 2 +- {jscomp => lib/js}/test/a_scope_bug.js | 2 +- {jscomp => lib/js}/test/a_string_test.js | 4 +- {jscomp => lib/js}/test/abstract_type.js | 0 .../js}/test/and_or_tailcall_test.js | 2 +- {jscomp => lib/js}/test/ari_regress_test.js | 4 +- {jscomp => lib/js}/test/arith_lexer.js | 10 +- {jscomp => lib/js}/test/arith_parser.js | 6 +- {jscomp => lib/js}/test/arith_syntax.js | 2 +- {jscomp => lib/js}/test/array_test.js | 10 +- {jscomp => lib/js}/test/b.js | 0 {jscomp => lib/js}/test/basic_module_test.js | 2 +- {jscomp => lib/js}/test/bdd.js | 6 +- {jscomp => lib/js}/test/bigarray_test.js | 4 +- {jscomp => lib/js}/test/boolean_test.js | 0 {jscomp => lib/js}/test/buffer_test.js | 6 +- {jscomp => lib/js}/test/caml_compare_test.js | 4 +- {jscomp => lib/js}/test/caml_format_test.js | 24 +- {jscomp => lib/js}/test/class3_test.js | 14 +- {jscomp => lib/js}/test/class4_test.js | 8 +- {jscomp => lib/js}/test/class5_test.js | 10 +- {jscomp => lib/js}/test/class6_test.js | 12 +- {jscomp => lib/js}/test/class7_test.js | 12 +- {jscomp => lib/js}/test/class8_test.js | 10 +- {jscomp => lib/js}/test/class_repr.js | 6 +- {jscomp => lib/js}/test/class_test.js | 6 +- .../js}/test/class_type_ffi_test.js | 2 +- {jscomp => lib/js}/test/complex_if_test.js | 6 +- {jscomp => lib/js}/test/complex_test.js | 4 +- {jscomp => lib/js}/test/complex_while_loop.js | 0 {jscomp => lib/js}/test/const_block_test.js | 2 +- {jscomp => lib/js}/test/const_defs.js | 0 {jscomp => lib/js}/test/const_defs_test.js | 2 +- {jscomp => lib/js}/test/const_test.js | 2 +- {jscomp => lib/js}/test/cont_int_fold_test.js | 0 {jscomp => lib/js}/test/cps_test.js | 8 +- .../js}/test/cross_module_inline_test.js | 2 +- {jscomp => lib/js}/test/debug_keep_test.js | 0 {jscomp => lib/js}/test/debugger_test.js | 0 {jscomp => lib/js}/test/demo.js | 2 +- {jscomp => lib/js}/test/demo_int_map.js | 2 +- {jscomp => lib/js}/test/demo_page.js | 2 +- {jscomp => lib/js}/test/digest_test.js | 16 +- {jscomp => lib/js}/test/empty_obj.js | 2 +- {jscomp => lib/js}/test/epsilon_test.js | 4 +- .../js}/test/equal_exception_test.js | 6 +- {jscomp => lib/js}/test/equal_test.js | 0 {jscomp => lib/js}/test/es6_module_test.js | 4 +- {jscomp => lib/js}/test/event_ffi.js | 4 +- .../js}/test/exception_raise_test.js | 8 +- .../js}/test/exception_value_test.js | 2 +- {jscomp => lib/js}/test/ext_array.js | 10 +- {jscomp => lib/js}/test/ext_bytes.js | 4 +- lib/js/test/ext_filename.js | 341 ++++++++++++++++++ {jscomp => lib/js}/test/ext_list.js | 8 +- {jscomp => lib/js}/test/ext_log.js | 8 +- {jscomp => lib/js}/test/ext_pervasives.js | 13 +- {jscomp => lib/js}/test/ext_string.js | 14 +- .../js}/test/extensible_variant_test.js | 6 +- {jscomp => lib/js}/test/fail_comp.js | 0 {jscomp => lib/js}/test/ffi_arity_test.js | 6 +- {jscomp => lib/js}/test/ffi_js.js | 0 {jscomp => lib/js}/test/ffi_test.js | 0 {jscomp => lib/js}/test/fib.js | 0 {jscomp => lib/js}/test/float_array.js | 0 {jscomp => lib/js}/test/float_of_bits_test.js | 16 +- {jscomp => lib/js}/test/float_record.js | 0 {jscomp => lib/js}/test/float_test.js | 12 +- {jscomp => lib/js}/test/for_loop_test.js | 12 +- .../js}/test/for_side_effect_test.js | 2 +- {jscomp => lib/js}/test/format_regression.js | 4 +- {jscomp => lib/js}/test/genlex_test.js | 8 +- .../test/global_exception_regression_test.js | 4 +- .../js}/test/google_closure_test.js | 2 +- {jscomp => lib/js}/test/guide_for_ext.js | 0 {jscomp => lib/js}/test/hamming_test.js | 16 +- {jscomp => lib/js}/test/hash_test.js | 10 +- {jscomp => lib/js}/test/hashtbl_test.js | 10 +- {jscomp => lib/js}/test/inline_edge_cases.js | 0 {jscomp => lib/js}/test/inline_map2_test.js | 12 +- {jscomp => lib/js}/test/inline_map_test.js | 8 +- .../js}/test/inline_regression_test.js | 8 +- {jscomp => lib/js}/test/int32_test.js | 14 +- {jscomp => lib/js}/test/int64_mul_div_test.js | 18 +- {jscomp => lib/js}/test/int64_test.js | 18 +- {jscomp => lib/js}/test/int_hashtbl_test.js | 12 +- {jscomp => lib/js}/test/int_map.js | 6 +- {jscomp => lib/js}/test/int_overflow_test.js | 6 +- {jscomp => lib/js}/test/io_test.js | 0 {jscomp => lib/js}/test/js_bool_test.js | 4 +- {jscomp => lib/js}/test/js_date.js | 0 {jscomp => lib/js}/test/js_date_test.js | 2 +- {jscomp => lib/js}/test/js_obj_test.js | 6 +- {jscomp => lib/js}/test/js_val.js | 0 {jscomp => lib/js}/test/lam_current_unit.js | 6 +- {jscomp => lib/js}/test/lam_methname.js | 14 +- {jscomp => lib/js}/test/lam_methname_test.js | 2 +- {jscomp => lib/js}/test/lazy_test.js | 8 +- {jscomp => lib/js}/test/lexer_test.js | 10 +- {jscomp => lib/js}/test/lib_js_test.js | 2 +- {jscomp => lib/js}/test/libarg_test.js | 12 +- {jscomp => lib/js}/test/libqueue_test.js | 10 +- {jscomp => lib/js}/test/limits_test.js | 6 +- {jscomp => lib/js}/test/list_test.js | 8 +- .../js}/test/local_exception_test.js | 2 +- .../js}/test/loop_regression_test.js | 2 +- {jscomp => lib/js}/test/loop_suites_test.js | 0 {jscomp => lib/js}/test/map_find_test.js | 10 +- {jscomp => lib/js}/test/map_test.js | 12 +- {jscomp => lib/js}/test/mock_mt.js | 4 +- {jscomp => lib/js}/test/module_alias.js | 0 .../js}/test/module_parameter_test.js | 4 +- {jscomp => lib/js}/test/mt.js | 6 +- {jscomp => lib/js}/test/mt_global.js | 2 +- {jscomp => lib/js}/test/number_lexer.js | 8 +- {jscomp => lib/js}/test/obj_magic_test.js | 4 +- {jscomp => lib/js}/test/obj_test.js | 6 +- {jscomp => lib/js}/test/of_string_test.js | 4 +- {jscomp => lib/js}/test/offset.js | 10 +- {jscomp => lib/js}/test/pq_test.js | 2 +- {jscomp => lib/js}/test/pr6726.js | 0 {jscomp => lib/js}/test/pr_regression_test.js | 4 +- {jscomp => lib/js}/test/primitive_reg_test.js | 0 {jscomp => lib/js}/test/print_alpha_test.js | 4 +- {jscomp => lib/js}/test/printf_sim.js | 6 +- {jscomp => lib/js}/test/printf_test.js | 8 +- {jscomp => lib/js}/test/qcc.js | 30 +- {jscomp => lib/js}/test/queue_test.js | 8 +- {jscomp => lib/js}/test/random_test.js | 12 +- {jscomp => lib/js}/test/rec_module_test.js | 12 +- {jscomp => lib/js}/test/rec_value_test.js | 10 +- {jscomp => lib/js}/test/record_with_test.js | 4 +- {jscomp => lib/js}/test/regression_print.js | 0 .../js}/test/runtime_encoding_test.js | 0 {jscomp => lib/js}/test/scanf_io.js | 26 +- .../scanf_reference_error_regression_test.js | 12 +- {jscomp => lib/js}/test/scanf_test.js | 6 +- {jscomp => lib/js}/test/shift_test.js | 0 {jscomp => lib/js}/test/simple_lexer_test.js | 10 +- {jscomp => lib/js}/test/small_inline_test.js | 2 +- {jscomp => lib/js}/test/sprintf_reg_test.js | 6 +- {jscomp => lib/js}/test/stack_comp_test.js | 8 +- {jscomp => lib/js}/test/stack_test.js | 6 +- .../js}/test/string_get_set_test.js | 6 +- .../js}/test/string_literal_print_test.js | 2 +- .../js}/test/string_runtime_test.js | 10 +- {jscomp => lib/js}/test/string_test.js | 12 +- {jscomp => lib/js}/test/stringmatch_test.js | 2 +- {jscomp => lib/js}/test/swap_test.js | 20 +- .../js}/test/tailcall_inline_test.js | 6 +- {jscomp => lib/js}/test/test_alias.js | 2 +- {jscomp => lib/js}/test/test_ari.js | 4 +- {jscomp => lib/js}/test/test_array.js | 4 +- {jscomp => lib/js}/test/test_array_append.js | 2 +- .../js}/test/test_array_primitive.js | 2 +- {jscomp => lib/js}/test/test_bool_equal.js | 2 +- {jscomp => lib/js}/test/test_bug.js | 4 +- {jscomp => lib/js}/test/test_bytes.js | 2 +- {jscomp => lib/js}/test/test_char.js | 2 +- {jscomp => lib/js}/test/test_closure.js | 8 +- {jscomp => lib/js}/test/test_common.js | 2 +- {jscomp => lib/js}/test/test_const_elim.js | 0 .../js}/test/test_const_propogate.js | 0 {jscomp => lib/js}/test/test_cps.js | 4 +- {jscomp => lib/js}/test/test_demo.js | 4 +- {jscomp => lib/js}/test/test_dup_param.js | 0 {jscomp => lib/js}/test/test_eq.js | 0 {jscomp => lib/js}/test/test_exception.js | 4 +- .../js}/test/test_exception_escape.js | 2 +- {jscomp => lib/js}/test/test_export2.js | 2 +- {jscomp => lib/js}/test/test_external.js | 2 +- {jscomp => lib/js}/test/test_external_unit.js | 0 {jscomp => lib/js}/test/test_ffi.js | 0 {jscomp => lib/js}/test/test_fib.js | 2 +- {jscomp => lib/js}/test/test_filename.js | 4 +- {jscomp => lib/js}/test/test_for_loop.js | 6 +- {jscomp => lib/js}/test/test_for_map.js | 6 +- {jscomp => lib/js}/test/test_for_map2.js | 0 {jscomp => lib/js}/test/test_format.js | 6 +- {jscomp => lib/js}/test/test_formatter.js | 2 +- .../js}/test/test_functor_dead_code.js | 0 .../js}/test/test_generative_module.js | 0 {jscomp => lib/js}/test/test_global_print.js | 2 +- .../js}/test/test_google_closure.js | 2 +- {jscomp => lib/js}/test/test_include.js | 4 +- {jscomp => lib/js}/test/test_incomplete.js | 2 +- {jscomp => lib/js}/test/test_incr_ref.js | 0 {jscomp => lib/js}/test/test_int_map_find.js | 6 +- {jscomp => lib/js}/test/test_internalOO.js | 24 +- {jscomp => lib/js}/test/test_is_js.js | 0 {jscomp => lib/js}/test/test_js_ffi.js | 2 +- {jscomp => lib/js}/test/test_let.js | 2 +- {jscomp => lib/js}/test/test_list.js | 10 +- {jscomp => lib/js}/test/test_literal.js | 2 +- .../js}/test/test_match_exception.js | 4 +- {jscomp => lib/js}/test/test_nat64.js | 0 {jscomp => lib/js}/test/test_nested_let.js | 0 {jscomp => lib/js}/test/test_nested_print.js | 2 +- {jscomp => lib/js}/test/test_non_export.js | 0 {jscomp => lib/js}/test/test_nullary.js | 0 {jscomp => lib/js}/test/test_obj.js | 2 +- .../js}/test/test_obj_simple_ffi.js | 0 {jscomp => lib/js}/test/test_order.js | 2 +- .../js}/test/test_order_tailcall.js | 0 {jscomp => lib/js}/test/test_pack.js | 0 {jscomp => lib/js}/test/test_per.js | 16 +- {jscomp => lib/js}/test/test_pervasive.js | 4 +- {jscomp => lib/js}/test/test_pervasives2.js | 6 +- {jscomp => lib/js}/test/test_pervasives3.js | 4 +- {jscomp => lib/js}/test/test_primitive.js | 6 +- {jscomp => lib/js}/test/test_ramification.js | 0 {jscomp => lib/js}/test/test_react.js | 2 +- {jscomp => lib/js}/test/test_react_case.js | 0 .../js}/test/test_runtime_encoding.js | 0 {jscomp => lib/js}/test/test_scope.js | 0 {jscomp => lib/js}/test/test_seq.js | 12 +- {jscomp => lib/js}/test/test_set.js | 6 +- .../js}/test/test_side_effect_functor.js | 0 .../js}/test/test_simple_include.js | 2 +- {jscomp => lib/js}/test/test_simple_obj.js | 6 +- .../js}/test/test_simple_pattern_match.js | 0 {jscomp => lib/js}/test/test_simple_ref.js | 2 +- .../js}/test/test_simple_tailcall.js | 0 {jscomp => lib/js}/test/test_small.js | 0 {jscomp => lib/js}/test/test_sprintf.js | 6 +- {jscomp => lib/js}/test/test_stack.js | 0 .../js}/test/test_static_catch_ident.js | 4 +- {jscomp => lib/js}/test/test_string.js | 2 +- {jscomp => lib/js}/test/test_string_case.js | 2 +- {jscomp => lib/js}/test/test_string_const.js | 0 {jscomp => lib/js}/test/test_string_map.js | 6 +- {jscomp => lib/js}/test/test_string_switch.js | 0 {jscomp => lib/js}/test/test_switch.js | 4 +- {jscomp => lib/js}/test/test_trywith.js | 2 +- {jscomp => lib/js}/test/test_tuple.js | 2 +- .../js}/test/test_tuple_destructring.js | 0 .../js}/test/test_type_based_arity.js | 2 +- {jscomp => lib/js}/test/test_u.js | 0 .../js}/test/test_unsupported_primitive.js | 2 +- {jscomp => lib/js}/test/test_while_closure.js | 8 +- .../js}/test/test_while_side_effect.js | 0 {jscomp => lib/js}/test/test_zero_nullable.js | 6 +- {jscomp => lib/js}/test/testing.js | 16 +- {jscomp => lib/js}/test/tfloat_record_test.js | 12 +- {jscomp => lib/js}/test/ticker.js | 18 +- {jscomp => lib/js}/test/to_string_test.js | 4 +- {jscomp => lib/js}/test/tscanf_test.js | 28 +- {jscomp => lib/js}/test/tuple_alloc.js | 0 {jscomp => lib/js}/test/typeof_test.js | 2 +- .../js}/test/undef_regression_test.js | 0 {jscomp => lib/js}/test/unitest_string.js | 0 {jscomp => lib/js}/test/unsafe_ppx_test.js | 6 +- {jscomp/runtime => lib/js}/typed_array.js | 0 {jscomp/stdlib => lib/js}/unix.js | 16 +- {jscomp/stdlib => lib/js}/unixLabels.js | 0 {jscomp/stdlib => lib/js}/weak.js | 12 +- package.json | 12 +- 371 files changed, 1585 insertions(+), 1262 deletions(-) delete mode 100644 jscomp/runtime/caml_block.js delete mode 100644 jscomp/test/a_filename_test.js delete mode 100644 jscomp/test/a_recursve_type.js delete mode 100644 jscomp/test/ext_filename.js rename {jscomp/stdlib => lib/js}/arg.js (98%) rename {jscomp/stdlib => lib/js}/array.js (97%) rename {jscomp/stdlib => lib/js}/arrayLabels.js (100%) rename {jscomp/stdlib => lib/js}/bigarray.js (98%) rename {jscomp/runtime => lib/js}/block.js (100%) rename {jscomp/stdlib => lib/js}/buffer.js (97%) rename {jscomp/stdlib => lib/js}/bytes.js (97%) rename {jscomp/stdlib => lib/js}/bytesLabels.js (100%) rename {jscomp/stdlib => lib/js}/callback.js (100%) rename {jscomp/runtime => lib/js}/caml_array.js (100%) rename {jscomp/runtime => lib/js}/caml_backtrace.js (100%) rename {jscomp/runtime => lib/js}/caml_basic.js (100%) rename {jscomp/runtime => lib/js}/caml_builtin_exceptions.js (100%) rename {jscomp/runtime => lib/js}/caml_exceptions.js (100%) rename {jscomp/runtime => lib/js}/caml_float.js (100%) rename {jscomp/runtime => lib/js}/caml_format.js (100%) rename {jscomp/runtime => lib/js}/caml_gc.js (100%) rename {jscomp/runtime => lib/js}/caml_hash.js (100%) rename {jscomp/runtime => lib/js}/caml_int32.js (100%) rename {jscomp/runtime => lib/js}/caml_int64.js (100%) rename {jscomp/runtime => lib/js}/caml_io.js (100%) rename {jscomp/runtime => lib/js}/caml_lexer.js (100%) rename {jscomp/runtime => lib/js}/caml_md5.js (100%) rename {jscomp/runtime => lib/js}/caml_obj.js (100%) rename {jscomp/runtime => lib/js}/caml_oo.js (98%) rename {jscomp/runtime => lib/js}/caml_parser.js (100%) rename {jscomp/runtime => lib/js}/caml_primitive.js (100%) rename {jscomp/runtime => lib/js}/caml_queue.js (100%) rename {jscomp/runtime => lib/js}/caml_string.js (100%) rename {jscomp/runtime => lib/js}/caml_sys.js (88%) rename {jscomp/runtime => lib/js}/caml_utils.js (100%) rename {jscomp/runtime => lib/js}/caml_weak.js (100%) rename {jscomp/stdlib => lib/js}/camlinternalFormat.js (99%) rename {jscomp/stdlib => lib/js}/camlinternalFormatBasics.js (99%) rename {jscomp/stdlib => lib/js}/camlinternalLazy.js (92%) rename {jscomp/stdlib => lib/js}/camlinternalMod.js (94%) rename {jscomp/stdlib => lib/js}/camlinternalOO.js (98%) rename {jscomp/stdlib => lib/js}/char.js (93%) rename {jscomp/stdlib => lib/js}/complex.js (100%) rename {jscomp/runtime => lib/js}/curry.js (100%) rename {jscomp/stdlib => lib/js}/digest.js (94%) rename {jscomp/stdlib => lib/js}/filename.js (97%) rename {jscomp/runtime => lib/js}/fn.js (100%) rename {jscomp/stdlib => lib/js}/format.js (99%) rename {jscomp/stdlib => lib/js}/gc.js (98%) rename {jscomp/stdlib => lib/js}/genlex.js (98%) rename {jscomp/stdlib => lib/js}/hashtbl.js (97%) rename {jscomp/stdlib => lib/js}/int32.js (89%) rename {jscomp/stdlib => lib/js}/int64.js (93%) rename {jscomp/runtime => lib/js}/js.js (100%) rename {jscomp/runtime => lib/js}/js_primitive.js (100%) rename {jscomp/stdlib => lib/js}/lazy.js (90%) rename {jscomp/stdlib => lib/js}/lexing.js (96%) rename {jscomp/stdlib => lib/js}/list.js (99%) rename {jscomp/stdlib => lib/js}/listLabels.js (100%) rename {jscomp/stdlib => lib/js}/map.js (99%) rename {jscomp/stdlib => lib/js}/marshal.js (94%) rename {jscomp/stdlib => lib/js}/moreLabels.js (100%) rename {jscomp/stdlib => lib/js}/nativeint.js (90%) rename {jscomp/stdlib => lib/js}/obj.js (98%) rename {jscomp/stdlib => lib/js}/oo.js (100%) rename {jscomp/stdlib => lib/js}/parsing.js (96%) rename {jscomp/stdlib => lib/js}/pervasives.js (97%) rename {jscomp/stdlib => lib/js}/printexc.js (98%) rename {jscomp/stdlib => lib/js}/printf.js (97%) rename {jscomp/stdlib => lib/js}/queue.js (96%) rename {jscomp/stdlib => lib/js}/random.js (95%) rename {jscomp/stdlib => lib/js}/scanf.js (99%) rename {jscomp/stdlib => lib/js}/set.js (99%) rename {jscomp/stdlib => lib/js}/sort.js (96%) rename {jscomp/stdlib => lib/js}/stack.js (95%) rename {jscomp/stdlib => lib/js}/stdLabels.js (100%) rename {jscomp/stdlib => lib/js}/std_exit.js (100%) rename {jscomp/stdlib => lib/js}/stream.js (98%) rename {jscomp/stdlib => lib/js}/string.js (98%) rename {jscomp/stdlib => lib/js}/stringLabels.js (100%) rename {jscomp/stdlib => lib/js}/sys.js (97%) rename {jscomp => lib/js}/test/a.js (100%) create mode 100644 lib/js/test/a_filename_test.js rename {jscomp => lib/js}/test/a_list_test.js (98%) rename {jscomp => lib/js}/test/a_recursive_type.js (88%) rename {jscomp => lib/js}/test/a_scope_bug.js (87%) rename {jscomp => lib/js}/test/a_string_test.js (97%) rename {jscomp => lib/js}/test/abstract_type.js (100%) rename {jscomp => lib/js}/test/and_or_tailcall_test.js (96%) rename {jscomp => lib/js}/test/ari_regress_test.js (94%) rename {jscomp => lib/js}/test/arith_lexer.js (96%) rename {jscomp => lib/js}/test/arith_parser.js (97%) rename {jscomp => lib/js}/test/arith_syntax.js (91%) rename {jscomp => lib/js}/test/array_test.js (96%) rename {jscomp => lib/js}/test/b.js (100%) rename {jscomp => lib/js}/test/basic_module_test.js (94%) rename {jscomp => lib/js}/test/bdd.js (97%) rename {jscomp => lib/js}/test/bigarray_test.js (93%) rename {jscomp => lib/js}/test/boolean_test.js (100%) rename {jscomp => lib/js}/test/buffer_test.js (91%) rename {jscomp => lib/js}/test/caml_compare_test.js (98%) rename {jscomp => lib/js}/test/caml_format_test.js (99%) rename {jscomp => lib/js}/test/class3_test.js (97%) rename {jscomp => lib/js}/test/class4_test.js (96%) rename {jscomp => lib/js}/test/class5_test.js (97%) rename {jscomp => lib/js}/test/class6_test.js (94%) rename {jscomp => lib/js}/test/class7_test.js (96%) rename {jscomp => lib/js}/test/class8_test.js (92%) rename {jscomp => lib/js}/test/class_repr.js (75%) rename {jscomp => lib/js}/test/class_test.js (95%) rename {jscomp => lib/js}/test/class_type_ffi_test.js (94%) rename {jscomp => lib/js}/test/complex_if_test.js (97%) rename {jscomp => lib/js}/test/complex_test.js (86%) rename {jscomp => lib/js}/test/complex_while_loop.js (100%) rename {jscomp => lib/js}/test/const_block_test.js (96%) rename {jscomp => lib/js}/test/const_defs.js (100%) rename {jscomp => lib/js}/test/const_defs_test.js (76%) rename {jscomp => lib/js}/test/const_test.js (94%) rename {jscomp => lib/js}/test/cont_int_fold_test.js (100%) rename {jscomp => lib/js}/test/cps_test.js (92%) rename {jscomp => lib/js}/test/cross_module_inline_test.js (77%) rename {jscomp => lib/js}/test/debug_keep_test.js (100%) rename {jscomp => lib/js}/test/debugger_test.js (100%) rename {jscomp => lib/js}/test/demo.js (98%) rename {jscomp => lib/js}/test/demo_int_map.js (97%) rename {jscomp => lib/js}/test/demo_page.js (96%) rename {jscomp => lib/js}/test/digest_test.js (96%) rename {jscomp => lib/js}/test/empty_obj.js (82%) rename {jscomp => lib/js}/test/epsilon_test.js (88%) rename {jscomp => lib/js}/test/equal_exception_test.js (92%) rename {jscomp => lib/js}/test/equal_test.js (100%) rename {jscomp => lib/js}/test/es6_module_test.js (91%) rename {jscomp => lib/js}/test/event_ffi.js (95%) rename {jscomp => lib/js}/test/exception_raise_test.js (90%) rename {jscomp => lib/js}/test/exception_value_test.js (87%) rename {jscomp => lib/js}/test/ext_array.js (89%) rename {jscomp => lib/js}/test/ext_bytes.js (96%) create mode 100644 lib/js/test/ext_filename.js rename {jscomp => lib/js}/test/ext_list.js (98%) rename {jscomp => lib/js}/test/ext_log.js (97%) rename {jscomp => lib/js}/test/ext_pervasives.js (83%) rename {jscomp => lib/js}/test/ext_string.js (94%) rename {jscomp => lib/js}/test/extensible_variant_test.js (90%) rename {jscomp => lib/js}/test/fail_comp.js (100%) rename {jscomp => lib/js}/test/ffi_arity_test.js (96%) rename {jscomp => lib/js}/test/ffi_js.js (100%) rename {jscomp => lib/js}/test/ffi_test.js (100%) rename {jscomp => lib/js}/test/fib.js (100%) rename {jscomp => lib/js}/test/float_array.js (100%) rename {jscomp => lib/js}/test/float_of_bits_test.js (91%) rename {jscomp => lib/js}/test/float_record.js (100%) rename {jscomp => lib/js}/test/float_test.js (96%) rename {jscomp => lib/js}/test/for_loop_test.js (96%) rename {jscomp => lib/js}/test/for_side_effect_test.js (94%) rename {jscomp => lib/js}/test/format_regression.js (92%) rename {jscomp => lib/js}/test/genlex_test.js (92%) rename {jscomp => lib/js}/test/global_exception_regression_test.js (86%) rename {jscomp => lib/js}/test/google_closure_test.js (94%) rename {jscomp => lib/js}/test/guide_for_ext.js (100%) rename {jscomp => lib/js}/test/hamming_test.js (96%) rename {jscomp => lib/js}/test/hash_test.js (94%) rename {jscomp => lib/js}/test/hashtbl_test.js (90%) rename {jscomp => lib/js}/test/inline_edge_cases.js (100%) rename {jscomp => lib/js}/test/inline_map2_test.js (99%) rename {jscomp => lib/js}/test/inline_map_test.js (93%) rename {jscomp => lib/js}/test/inline_regression_test.js (89%) rename {jscomp => lib/js}/test/int32_test.js (95%) rename {jscomp => lib/js}/test/int64_mul_div_test.js (98%) rename {jscomp => lib/js}/test/int64_test.js (99%) rename {jscomp => lib/js}/test/int_hashtbl_test.js (91%) rename {jscomp => lib/js}/test/int_map.js (98%) rename {jscomp => lib/js}/test/int_overflow_test.js (97%) rename {jscomp => lib/js}/test/io_test.js (100%) rename {jscomp => lib/js}/test/js_bool_test.js (93%) rename {jscomp => lib/js}/test/js_date.js (100%) rename {jscomp => lib/js}/test/js_date_test.js (96%) rename {jscomp => lib/js}/test/js_obj_test.js (90%) rename {jscomp => lib/js}/test/js_val.js (100%) rename {jscomp => lib/js}/test/lam_current_unit.js (88%) rename {jscomp => lib/js}/test/lam_methname.js (90%) rename {jscomp => lib/js}/test/lam_methname_test.js (98%) rename {jscomp => lib/js}/test/lazy_test.js (96%) rename {jscomp => lib/js}/test/lexer_test.js (94%) rename {jscomp => lib/js}/test/lib_js_test.js (93%) rename {jscomp => lib/js}/test/libarg_test.js (98%) rename {jscomp => lib/js}/test/libqueue_test.js (98%) rename {jscomp => lib/js}/test/limits_test.js (87%) rename {jscomp => lib/js}/test/list_test.js (93%) rename {jscomp => lib/js}/test/local_exception_test.js (90%) rename {jscomp => lib/js}/test/loop_regression_test.js (94%) rename {jscomp => lib/js}/test/loop_suites_test.js (100%) rename {jscomp => lib/js}/test/map_find_test.js (95%) rename {jscomp => lib/js}/test/map_test.js (96%) rename {jscomp => lib/js}/test/mock_mt.js (94%) rename {jscomp => lib/js}/test/module_alias.js (100%) rename {jscomp => lib/js}/test/module_parameter_test.js (93%) rename {jscomp => lib/js}/test/mt.js (92%) rename {jscomp => lib/js}/test/mt_global.js (96%) rename {jscomp => lib/js}/test/number_lexer.js (97%) rename {jscomp => lib/js}/test/obj_magic_test.js (94%) rename {jscomp => lib/js}/test/obj_test.js (98%) rename {jscomp => lib/js}/test/of_string_test.js (90%) rename {jscomp => lib/js}/test/offset.js (98%) rename {jscomp => lib/js}/test/pq_test.js (96%) rename {jscomp => lib/js}/test/pr6726.js (100%) rename {jscomp => lib/js}/test/pr_regression_test.js (95%) rename {jscomp => lib/js}/test/primitive_reg_test.js (100%) rename {jscomp => lib/js}/test/print_alpha_test.js (89%) rename {jscomp => lib/js}/test/printf_sim.js (93%) rename {jscomp => lib/js}/test/printf_test.js (94%) rename {jscomp => lib/js}/test/qcc.js (98%) rename {jscomp => lib/js}/test/queue_test.js (83%) rename {jscomp => lib/js}/test/random_test.js (93%) rename {jscomp => lib/js}/test/rec_module_test.js (98%) rename {jscomp => lib/js}/test/rec_value_test.js (95%) rename {jscomp => lib/js}/test/record_with_test.js (92%) rename {jscomp => lib/js}/test/regression_print.js (100%) rename {jscomp => lib/js}/test/runtime_encoding_test.js (100%) rename {jscomp => lib/js}/test/scanf_io.js (88%) rename {jscomp => lib/js}/test/scanf_reference_error_regression_test.js (92%) rename {jscomp => lib/js}/test/scanf_test.js (90%) rename {jscomp => lib/js}/test/shift_test.js (100%) rename {jscomp => lib/js}/test/simple_lexer_test.js (95%) rename {jscomp => lib/js}/test/small_inline_test.js (96%) rename {jscomp => lib/js}/test/sprintf_reg_test.js (93%) rename {jscomp => lib/js}/test/stack_comp_test.js (98%) rename {jscomp => lib/js}/test/stack_test.js (89%) rename {jscomp => lib/js}/test/string_get_set_test.js (95%) rename {jscomp => lib/js}/test/string_literal_print_test.js (98%) rename {jscomp => lib/js}/test/string_runtime_test.js (90%) rename {jscomp => lib/js}/test/string_test.js (96%) rename {jscomp => lib/js}/test/stringmatch_test.js (99%) rename {jscomp => lib/js}/test/swap_test.js (97%) rename {jscomp => lib/js}/test/tailcall_inline_test.js (91%) rename {jscomp => lib/js}/test/test_alias.js (81%) rename {jscomp => lib/js}/test/test_ari.js (97%) rename {jscomp => lib/js}/test/test_array.js (88%) rename {jscomp => lib/js}/test/test_array_append.js (84%) rename {jscomp => lib/js}/test/test_array_primitive.js (93%) rename {jscomp => lib/js}/test/test_bool_equal.js (94%) rename {jscomp => lib/js}/test/test_bug.js (96%) rename {jscomp => lib/js}/test/test_bytes.js (80%) rename {jscomp => lib/js}/test/test_char.js (92%) rename {jscomp => lib/js}/test/test_closure.js (73%) rename {jscomp => lib/js}/test/test_common.js (79%) rename {jscomp => lib/js}/test/test_const_elim.js (100%) rename {jscomp => lib/js}/test/test_const_propogate.js (100%) rename {jscomp => lib/js}/test/test_cps.js (89%) rename {jscomp => lib/js}/test/test_demo.js (93%) rename {jscomp => lib/js}/test/test_dup_param.js (100%) rename {jscomp => lib/js}/test/test_eq.js (100%) rename {jscomp => lib/js}/test/test_exception.js (82%) rename {jscomp => lib/js}/test/test_exception_escape.js (83%) rename {jscomp => lib/js}/test/test_export2.js (74%) rename {jscomp => lib/js}/test/test_external.js (84%) rename {jscomp => lib/js}/test/test_external_unit.js (100%) rename {jscomp => lib/js}/test/test_ffi.js (100%) rename {jscomp => lib/js}/test/test_fib.js (97%) rename {jscomp => lib/js}/test/test_filename.js (69%) rename {jscomp => lib/js}/test/test_for_loop.js (94%) rename {jscomp => lib/js}/test/test_for_map.js (98%) rename {jscomp => lib/js}/test/test_for_map2.js (100%) rename {jscomp => lib/js}/test/test_format.js (75%) rename {jscomp => lib/js}/test/test_formatter.js (91%) rename {jscomp => lib/js}/test/test_functor_dead_code.js (100%) rename {jscomp => lib/js}/test/test_generative_module.js (100%) rename {jscomp => lib/js}/test/test_global_print.js (87%) rename {jscomp => lib/js}/test/test_google_closure.js (93%) rename {jscomp => lib/js}/test/test_include.js (97%) rename {jscomp => lib/js}/test/test_incomplete.js (89%) rename {jscomp => lib/js}/test/test_incr_ref.js (100%) rename {jscomp => lib/js}/test/test_int_map_find.js (93%) rename {jscomp => lib/js}/test/test_internalOO.js (98%) rename {jscomp => lib/js}/test/test_is_js.js (100%) rename {jscomp => lib/js}/test/test_js_ffi.js (94%) rename {jscomp => lib/js}/test/test_let.js (76%) rename {jscomp => lib/js}/test/test_list.js (99%) rename {jscomp => lib/js}/test/test_literal.js (91%) rename {jscomp => lib/js}/test/test_match_exception.js (69%) rename {jscomp => lib/js}/test/test_nat64.js (100%) rename {jscomp => lib/js}/test/test_nested_let.js (100%) rename {jscomp => lib/js}/test/test_nested_print.js (85%) rename {jscomp => lib/js}/test/test_non_export.js (100%) rename {jscomp => lib/js}/test/test_nullary.js (100%) rename {jscomp => lib/js}/test/test_obj.js (85%) rename {jscomp => lib/js}/test/test_obj_simple_ffi.js (100%) rename {jscomp => lib/js}/test/test_order.js (78%) rename {jscomp => lib/js}/test/test_order_tailcall.js (100%) rename {jscomp => lib/js}/test/test_pack.js (100%) rename {jscomp => lib/js}/test/test_per.js (96%) rename {jscomp => lib/js}/test/test_pervasive.js (98%) rename {jscomp => lib/js}/test/test_pervasives2.js (98%) rename {jscomp => lib/js}/test/test_pervasives3.js (98%) rename {jscomp => lib/js}/test/test_primitive.js (92%) rename {jscomp => lib/js}/test/test_ramification.js (100%) rename {jscomp => lib/js}/test/test_react.js (93%) rename {jscomp => lib/js}/test/test_react_case.js (100%) rename {jscomp => lib/js}/test/test_runtime_encoding.js (100%) rename {jscomp => lib/js}/test/test_scope.js (100%) rename {jscomp => lib/js}/test/test_seq.js (83%) rename {jscomp => lib/js}/test/test_set.js (99%) rename {jscomp => lib/js}/test/test_side_effect_functor.js (100%) rename {jscomp => lib/js}/test/test_simple_include.js (97%) rename {jscomp => lib/js}/test/test_simple_obj.js (94%) rename {jscomp => lib/js}/test/test_simple_pattern_match.js (100%) rename {jscomp => lib/js}/test/test_simple_ref.js (91%) rename {jscomp => lib/js}/test/test_simple_tailcall.js (100%) rename {jscomp => lib/js}/test/test_small.js (100%) rename {jscomp => lib/js}/test/test_sprintf.js (80%) rename {jscomp => lib/js}/test/test_stack.js (100%) rename {jscomp => lib/js}/test/test_static_catch_ident.js (82%) rename {jscomp => lib/js}/test/test_string.js (91%) rename {jscomp => lib/js}/test/test_string_case.js (84%) rename {jscomp => lib/js}/test/test_string_const.js (100%) rename {jscomp => lib/js}/test/test_string_map.js (94%) rename {jscomp => lib/js}/test/test_string_switch.js (100%) rename {jscomp => lib/js}/test/test_switch.js (88%) rename {jscomp => lib/js}/test/test_trywith.js (90%) rename {jscomp => lib/js}/test/test_tuple.js (88%) rename {jscomp => lib/js}/test/test_tuple_destructring.js (100%) rename {jscomp => lib/js}/test/test_type_based_arity.js (96%) rename {jscomp => lib/js}/test/test_u.js (100%) rename {jscomp => lib/js}/test/test_unsupported_primitive.js (87%) rename {jscomp => lib/js}/test/test_while_closure.js (76%) rename {jscomp => lib/js}/test/test_while_side_effect.js (100%) rename {jscomp => lib/js}/test/test_zero_nullable.js (96%) rename {jscomp => lib/js}/test/testing.js (90%) rename {jscomp => lib/js}/test/tfloat_record_test.js (87%) rename {jscomp => lib/js}/test/ticker.js (98%) rename {jscomp => lib/js}/test/to_string_test.js (90%) rename {jscomp => lib/js}/test/tscanf_test.js (99%) rename {jscomp => lib/js}/test/tuple_alloc.js (100%) rename {jscomp => lib/js}/test/typeof_test.js (93%) rename {jscomp => lib/js}/test/undef_regression_test.js (100%) rename {jscomp => lib/js}/test/unitest_string.js (100%) rename {jscomp => lib/js}/test/unsafe_ppx_test.js (94%) rename {jscomp/runtime => lib/js}/typed_array.js (100%) rename {jscomp/stdlib => lib/js}/unix.js (99%) rename {jscomp/stdlib => lib/js}/unixLabels.js (100%) rename {jscomp/stdlib => lib/js}/weak.js (97%) diff --git a/.gitignore b/.gitignore index ba4d2ee43a..af3911940a 100644 --- a/.gitignore +++ b/.gitignore @@ -69,5 +69,4 @@ coverage dist/ bin/ -lib/ man/ \ No newline at end of file diff --git a/jscomp/build.sh b/jscomp/build.sh index 148f82a344..6189667993 100755 --- a/jscomp/build.sh +++ b/jscomp/build.sh @@ -40,7 +40,7 @@ cd ./test/ # ./build.sh 2>> ../build.compile make $TARGET.cmj 2>> ../build.compile -cat $TARGET.js >> ../build.compile +cat ../../lib/js/test/$TARGET.js >> ../build.compile make -j30 all 2>>../build.compile make depend 2>>../build.compile echo "<> ../build.compile diff --git a/jscomp/ext_filename.ml b/jscomp/ext_filename.ml index c7de56a42e..8803abbcfc 100644 --- a/jscomp/ext_filename.ml +++ b/jscomp/ext_filename.ml @@ -34,23 +34,57 @@ let node_sep = "/" let node_parent = ".." let node_current = "." +type t = + [ `File of string + | `Dir of string ] + +let cwd = lazy (Sys.getcwd ()) + +let (//) = Filename.concat + +let combine path1 path2 = + if path1 = "" then + path2 + else if path2 = "" then path1 + else + if Filename.is_relative path2 then + path1// path2 + else + path2 + +(* Note that [.//] is the same as [./] *) +let path_as_directory x = + if x = "" then x + else + if Ext_string.ends_with x Filename.dir_sep then + x + else + x ^ Filename.dir_sep + let absolute_path s = - let s = if Filename.is_relative s then Filename.concat (Sys.getcwd ()) s else s in - (* Now simplify . and .. components *) - let rec aux s = - let base = Filename.basename s in - let dir = Filename.dirname s in - if dir = s then dir - else if base = Filename.current_dir_name then aux dir - else if base = Filename.parent_dir_name then Filename.dirname (aux dir) - else Filename.concat (aux dir) base - in - aux s + let process s = + let s = + if Filename.is_relative s then + Lazy.force cwd // s + else s in + (* Now simplify . and .. components *) + let rec aux s = + let base,dir = Filename.basename s, Filename.dirname s in + if dir = s then dir + else if base = Filename.current_dir_name then aux dir + else if base = Filename.parent_dir_name then Filename.dirname (aux dir) + else aux dir // base + in aux s in + match s with + | `File x -> `File (process x ) + | `Dir x -> `Dir (process x) + let chop_extension ?(loc="") name = try Filename.chop_extension name with Invalid_argument _ -> - invalid_arg ("Filename.chop_extension (" ^ loc ^ ":" ^ name ^ ")") + Ext_pervasives.invalid_argf + "Filename.chop_extension ( %s : %s )" loc name let try_chop_extension s = try Filename.chop_extension s with _ -> s @@ -74,9 +108,18 @@ let try_chop_extension s = try Filename.chop_extension s with _ -> s /c/d ]} *) -let relative_path file1 file2 = - let dir1 = Ext_string.split (Filename.dirname file1) (Filename.dir_sep.[0]) in - let dir2 = Ext_string.split (Filename.dirname file2) (Filename.dir_sep.[0]) in +let relative_path file_or_dir_1 file_or_dir_2 = + let sep_char = Filename.dir_sep.[0] in + let relevant_dir1 = + (match file_or_dir_1 with + | `Dir x -> x + | `File file1 -> Filename.dirname file1) in + let relevant_dir2 = + (match file_or_dir_2 with + |`Dir x -> x + |`File file2 -> Filename.dirname file2 ) in + let dir1 = Ext_string.split relevant_dir1 sep_char in + let dir2 = Ext_string.split relevant_dir2 sep_char in let rec go (dir1 : string list) (dir2 : string list) = match dir1, dir2 with | x::xs , y :: ys when x = y @@ -95,20 +138,29 @@ let relative_path file1 file2 = let node_modules = "node_modules" let node_modules_length = String.length "node_modules" +let package_json = "package.json" + + + + (** path2: a/b path1: a result: ./b TODO: [Filename.concat] with care + + [file1] is currently compilation file + [file2] is the dependency *) -let node_relative_path path1 path2 = - let v = Ext_string.find path2 ~sub:node_modules in - let len = String.length path2 in +let node_relative_path (file1 : t) + (`File file2 as dep_file : [`File of string]) = + let v = Ext_string.find file2 ~sub:node_modules in + let len = String.length file2 in if v >= 0 then let rec skip i = if i >= len then - failwith ("invalid path: " ^ path2) + Ext_pervasives.failwithf "invalid path: %s" file2 else - match path2.[i] with + match file2.[i] with | '/' | '.' -> skip (i + 1) | _ -> i @@ -121,21 +173,22 @@ let node_relative_path path1 path2 = This seems weird though *) in - Ext_string.tail_from path2 + Ext_string.tail_from file2 (skip (v + node_modules_length)) else - (relative_path - (try_chop_extension (absolute_path path2)) - (try_chop_extension (absolute_path path1)) - ) ^ node_sep ^ - (try_chop_extension (Filename.basename path2)) + relative_path + (absolute_path dep_file) + (absolute_path file1) + ^ node_sep ^ + try_chop_extension (Filename.basename file2) + (** [resolve cwd module_name], [cwd] is current working directory, absolute path *) let resolve ~cwd module_name = let rec aux origin cwd module_name = - let v = Filename.concat (Filename.concat cwd node_modules) module_name + let v = ( cwd // node_modules) // module_name in if Sys.is_directory v then v else @@ -145,3 +198,18 @@ let resolve ~cwd module_name = else Ext_pervasives.failwithf "%s not found in %s" module_name origin in aux cwd cwd module_name + + +let resolve_package cwd = + let rec aux cwd = + if Sys.file_exists (cwd // package_json) then cwd + else + let cwd' = Filename.dirname cwd in + if String.length cwd' < String.length cwd then + aux cwd' + else + Ext_pervasives.failwithf "package.json not found from %s" cwd + in + aux cwd + +let package_dir = lazy (resolve_package (Lazy.force cwd)) diff --git a/jscomp/ext_filename.mli b/jscomp/ext_filename.mli index e52003e5a5..bef13db1f6 100644 --- a/jscomp/ext_filename.mli +++ b/jscomp/ext_filename.mli @@ -26,8 +26,17 @@ +(* TODO: + Change the module name, this code is not really an extension of the standard + library but rather specific to JS Module name convention. +*) +type t = + [ `File of string + | `Dir of string ] +val combine : string -> string -> string +val path_as_directory : string -> string (** An extension module to calculate relative path follow node/npm style. TODO : this short name will have to change upon renaming the file. @@ -41,12 +50,14 @@ just treat it as a library instead *) -val node_relative_path : string -> string -> string -(** TODO Change the module name, this code is not really an extension of the standard - library but rather specific to JS Module name convention. - *) +val node_relative_path : t -> [`File of string] -> string val chop_extension : ?loc:string -> string -> string val resolve : cwd:string -> string -> string + +val resolve_package : string -> string + +val cwd : string Lazy.t +val package_dir : string Lazy.t diff --git a/jscomp/ext_pervasives.ml b/jscomp/ext_pervasives.ml index 18ef51d441..e365399af3 100644 --- a/jscomp/ext_pervasives.ml +++ b/jscomp/ext_pervasives.ml @@ -62,3 +62,5 @@ let is_pos_pow n = try aux 0 n with M.E -> -1 let failwithf fmt = Format.ksprintf failwith fmt + +let invalid_argf fmt = Format.ksprintf invalid_arg fmt diff --git a/jscomp/ext_pervasives.mli b/jscomp/ext_pervasives.mli index 2ae4542825..a5a0873eb2 100644 --- a/jscomp/ext_pervasives.mli +++ b/jscomp/ext_pervasives.mli @@ -42,3 +42,5 @@ val with_file_as_pp : string -> (Format.formatter -> 'a) -> 'a val is_pos_pow : Int32.t -> int val failwithf : ('a, unit, string, 'b) format4 -> 'a + +val invalid_argf : ('a, unit, string, 'b) format4 -> 'a diff --git a/jscomp/js_cmj_format.ml b/jscomp/js_cmj_format.ml index 1d0d0ce4b9..66e42e48c3 100644 --- a/jscomp/js_cmj_format.ml +++ b/jscomp/js_cmj_format.ml @@ -71,9 +71,9 @@ let from_file name : t = let ic = open_in_bin name in let buffer = really_input_string ic cmj_magic_number_length in if buffer <> cmj_magic_number then - failwith - ("cmj files have incompatible versions, please rebuilt using the new compiler : " - ^ __LOC__) + Ext_pervasives.failwithf + "cmj files have incompatible versions, please rebuilt using the new compiler : %s" + __LOC__ else let v : t = input_value ic in close_in ic ; diff --git a/jscomp/js_config.ml b/jscomp/js_config.ml index 7b7bed4bc4..17a6c1d742 100644 --- a/jscomp/js_config.ml +++ b/jscomp/js_config.ml @@ -74,8 +74,36 @@ let get_goog_package_name () = | AmdJS | NodeJS -> None -let get_npm_package_path () = None - +let npm_package_path = ref None +let set_npm_package_path s = npm_package_path := Some s +let get_npm_package_path () = !npm_package_path + +let (//) = Filename.concat +(* for a single pass compilation, [output_dir] + can be cached +*) +let get_output_dir filename = + match get_npm_package_path () with + | None -> + if Filename.is_relative filename then + Lazy.force Ext_filename.cwd // + Filename.dirname filename + else + Filename.dirname filename + | Some x -> + Lazy.force Ext_filename.package_dir // x + + + +(* Note that we can have different [basename] when passed + to many files +*) +let get_output_file filename = + let basename = Filename.basename filename in + Filename.concat (get_output_dir filename) + (Ext_filename.chop_extension ~loc:__LOC__ basename ^ get_ext()) + + let default_gen_tds = ref false let stdlib_set = String_set.of_list [ @@ -88,10 +116,10 @@ let stdlib_set = String_set.of_list [ "arrayLabels"; "hashtbl"; "queue"; - "buffer"; + "buffer"; "int32"; "random"; - "bytes"; + "bytes"; "int64"; "scanf"; "bytesLabels"; diff --git a/jscomp/js_config.mli b/jscomp/js_config.mli index b06c3561fe..ffb63cfd2f 100644 --- a/jscomp/js_config.mli +++ b/jscomp/js_config.mli @@ -36,7 +36,11 @@ type env = val get_env : unit -> env val get_ext : unit -> string +val get_output_dir : string -> string +val get_output_file : string -> string val get_goog_package_name : unit -> string option + +val set_npm_package_path : string -> unit val get_npm_package_path : unit -> string option val set_env : env -> unit diff --git a/jscomp/js_main.ml b/jscomp/js_main.ml index b61815d5de..48c9518839 100644 --- a/jscomp/js_main.ml +++ b/jscomp/js_main.ml @@ -34,25 +34,10 @@ let process_file ppf name = Js_implementation.interface ppf name opref; if !make_package then objfiles := (opref ^ ".cmi") :: !objfiles end - (* else if Filename.check_suffix name ".cmo" *) - (* || Filename.check_suffix name ".cma" then *) - (* objfiles := name :: !objfiles *) - (* else if Filename.check_suffix name ".cmi" && !make_package then *) - (* objfiles := name :: !objfiles *) - (* else if Filename.check_suffix name ext_obj *) - (* || Filename.check_suffix name ext_lib then *) - (* ccobjs := name :: !ccobjs *) - (* else if Filename.check_suffix name ext_dll then *) - (* dllibs := name :: !dllibs *) - (* else if Filename.check_suffix name ".c" then begin *) - (* Compile.c_file name; *) - (* ccobjs := (Filename.chop_suffix (Filename.basename name) ".c" ^ ext_obj) *) - (* :: !ccobjs *) - (* end *) else raise(Arg.Bad("don't know what to do with " ^ name)) -let usage = "Usage: ocamlc \nOptions are:" +let usage = "Usage: bsc \nOptions are:" let ppf = Format.err_formatter @@ -145,10 +130,15 @@ module Options = Main_args.Make_bytecomp_options (struct end) let add_include_path s = - let path = Ext_filename.resolve (Sys.getcwd ()) s in + let path = + Ext_filename.resolve + (Lazy.force Ext_filename.cwd) s in Clflags.include_dirs := path :: ! Clflags.include_dirs let buckle_script_flags = + ("-js-npm-output-path", Arg.String Js_config.set_npm_package_path, + " set npm-output-path, for example `lib/js`") + :: ("-npm-package", Arg.String add_include_path, " set package names, for example bs-platform " ) :: ("-js-module", Arg.String Js_config.cmd_set_module, @@ -165,16 +155,6 @@ let main () = try readenv ppf Before_args; Arg.parse buckle_script_flags anonymous usage; - readenv ppf Before_link; - if - List.length (List.filter (fun x -> !x) - [make_archive;make_package;compile_only;output_c_object]) - > 1 - then - if !print_types then - fatal "Option -i is incompatible with -pack, -a, -output-obj" - else - fatal "Please specify at most one of -pack, -a, -c, -output-obj"; exit 0 with x -> Location.report_exception ppf x; diff --git a/jscomp/js_program_loader.ml b/jscomp/js_program_loader.ml index 0935bc7b51..6c05a36913 100644 --- a/jscomp/js_program_loader.ml +++ b/jscomp/js_program_loader.ml @@ -36,6 +36,8 @@ module S = Js_stmt_make open Js_output.Ops +let (//) = Filename.concat + let string_of_module_id (x : Lam_module_ident.t) : string = match x.kind with | Runtime @@ -54,6 +56,35 @@ let string_of_module_id (x : Lam_module_ident.t) : string = base | Some v -> v ^ "." ^ base end + | AmdJS + | NodeJS -> + let rebase dep = + Ext_filename.node_relative_path + (`Dir (Js_config.get_output_dir !Location.input_name)) dep + in + begin match Lam_compile_env.get_npm_package_path x with + | Some x -> + let filename = String.uncapitalize id.name in + rebase (`File (Lazy.force Ext_filename.package_dir // x // filename)) + | None -> + begin match Config_util.find file with + (* maybe from third party library*) + (* Check: be consistent when generating js files + A.ml -> a.js + a.ml -> a.js + check generated [js] file if it's capital or not + Actually, we can not tell its original name just from [id], + so we just always general litte_case.js + *) + | file -> + rebase (`File file) + (* for some primitive files, no cmj support *) + | exception Not_found -> + Ext_pervasives.failwithf + "@[%s not found in search path - while compiling %s @] " + file !Location.input_name + end + end | Browser (* In browser *) -> @@ -62,43 +93,6 @@ let string_of_module_id (x : Lam_module_ident.t) : string = "./runtime/" ^ target else "./stdlib/" ^ target - | AmdJS - | NodeJS -> - let filename = String.uncapitalize id.name in - begin match Config_util.find file with - (* for some primitive files, no cmj support *) - | exception Not_found -> - if String_set.mem filename Js_config.runtime_set then - let path = - (* For the runtime, only [JS] files are needed, and - unlike the stdlib, [bsc] have some pre-built knowledge - about where it is, since in general, [runtime] - is *transparent* to the user - *) - Filename.concat - (Filename.dirname (Filename.dirname Sys.executable_name)) - "runtime" - in - Ext_filename.node_relative_path !Location.input_name - (Filename.concat path filename) - else - begin - Ext_log.warn __LOC__ "@[%s not found in search path - while compiling %s @] " - file !Location.input_name ; - Printf.sprintf "%s" - (String.uncapitalize id.name) - end - (* maybe from third party library*) - (* Check: be consistent when generating js files - A.ml -> a.js - a.ml -> a.js - check generated [js] file if it's capital or not - Actually, we can not tell its original name just from [id], - so we just always general litte_case.js - *) - | path -> - Ext_filename.node_relative_path !Location.input_name path - end end | External name -> name diff --git a/jscomp/lam_analysis.ml b/jscomp/lam_analysis.ml index 529a0ae7e4..9a4dd8167e 100644 --- a/jscomp/lam_analysis.ml +++ b/jscomp/lam_analysis.ml @@ -43,7 +43,8 @@ let rec no_side_effects (lam : Lambda.lambda) : bool = (* register to c runtime does not make sense in ocaml *) | "caml_set_oo_id" | "caml_is_js" - | "caml_int64_float_of_bits" (* more safe to check if arguments are constant *) + | "caml_int64_float_of_bits" + (* more safe to check if arguments are constant *) (* non-observable side effect *) | "caml_sys_get_config" | "caml_sys_get_argv" (* should be fine *) diff --git a/jscomp/lam_compile_env.ml b/jscomp/lam_compile_env.ml index edd568bbd5..6644d3426b 100644 --- a/jscomp/lam_compile_env.ml +++ b/jscomp/lam_compile_env.ml @@ -41,11 +41,13 @@ type ml_module_info = { type env_value = | Visit of ml_module_info - | Runtime of bool (** A built in module probably from our runtime primitives, - so it does not have any [signature] - *) - | External (** Also a js file, but this belong to third party - *) + | Runtime of bool * Js_cmj_format.t + (** A built in module probably from our runtime primitives, + so it does not have any [signature] + *) + | External + (** Also a js file, but this belong to third party + *) type module_info = { signature : Types.signature ; @@ -152,26 +154,15 @@ let query_and_add_if_not_exist (type u) | exception Not_found -> begin match oid.kind with | Runtime -> - add_cached_tbl oid (Runtime true) ; + let cmj_table = + Config_util.find_cmj (Lam_module_ident.name oid ^ ".cmj") in + add_cached_tbl oid (Runtime (true,cmj_table)) ; begin match env with | Has_env _ -> found {signature = []; pure = true} | No_env -> - found (Js_cmj_format.pure_dummy) + found cmj_table end - | External _ -> - add_cached_tbl oid External; - (** This might be wrong, if we happen to expand an js module - we should assert false (but this in general should not happen) - *) - begin match env with - | Has_env _ - -> - found {signature = []; pure = false} - | No_env -> - found (Js_cmj_format.no_pure_dummy) - end - | Ml -> let cmj_table = @@ -188,6 +179,20 @@ let query_and_add_if_not_exist (type u) | No_env -> found cmj_table end + + | External _ -> + add_cached_tbl oid External; + (** This might be wrong, if we happen to expand an js module + we should assert false (but this in general should not happen) + *) + begin match env with + | Has_env _ + -> + found {signature = []; pure = false} + | No_env -> + found (Js_cmj_format.no_pure_dummy) + end + end | Visit {signatures ; cmj_table = cmj_table; _} -> begin match env with @@ -196,14 +201,12 @@ let query_and_add_if_not_exist (type u) | No_env -> found cmj_table end - | Runtime pure -> + | Runtime (pure, cmj_table) -> begin match env with | Has_env _ -> found {signature = [] ; pure } | No_env -> - found (if pure then Js_cmj_format.pure_dummy - else Js_cmj_format.no_pure_dummy - ) + found cmj_table end | External -> begin match env with @@ -219,14 +222,15 @@ let is_pure id = ~found:(fun x -> x.effect = None) let get_goog_package_name ({ kind; _} as id : Lam_module_ident.t) = - match kind with - | Runtime -> - Some "buckle.runtime" (* Invariant check with the build system *) - | Ml - | External _ -> - query_and_add_if_not_exist id No_env + query_and_add_if_not_exist id No_env ~not_found:(fun _ -> None) ~found:(fun x -> x.goog_package) + + +let get_npm_package_path ( id : Lam_module_ident.t) = + query_and_add_if_not_exist id No_env + ~not_found:(fun _ -> None) + ~found:(fun x -> x.npm_package_path) (* TODO: [env] is not hard dependency *) diff --git a/jscomp/lam_compile_env.mli b/jscomp/lam_compile_env.mli index 5252771694..d3a1f075c7 100644 --- a/jscomp/lam_compile_env.mli +++ b/jscomp/lam_compile_env.mli @@ -92,6 +92,8 @@ val reset : unit -> unit val is_pure : Lam_module_ident.t -> bool val get_goog_package_name : Lam_module_ident.t -> string option +val get_npm_package_path : Lam_module_ident.t -> string option + (* The second argument is mostly from [runtime] modules will change the input [hard_dependencies] *) diff --git a/jscomp/lam_compile_group.ml b/jscomp/lam_compile_group.ml index 730402f3bd..3bf0be426d 100644 --- a/jscomp/lam_compile_group.ml +++ b/jscomp/lam_compile_group.ml @@ -420,8 +420,9 @@ let lambda_as_module Lam_current_unit.set_file filename ; Lam_current_unit.iset_debug_file "tuple_alloc.ml"; Ext_pervasives.with_file_as_chan - (Ext_filename.chop_extension ~loc:__LOC__ filename ^ Js_config.get_ext()) - (fun chan -> Js_dump.dump_deps_program (compile ~filename false env sigs lam) chan) + (Js_config.get_output_file filename) + (fun chan -> Js_dump.dump_deps_program + (compile ~filename false env sigs lam) chan) end (* We can use {!Env.current_unit = "Pervasives"} to tell if it is some specific module, We need handle some definitions in standard libraries in a special way, most are io specific, diff --git a/jscomp/lam_current_unit.ml b/jscomp/lam_current_unit.ml index aa002e03d8..ce8c7fe1ef 100644 --- a/jscomp/lam_current_unit.ml +++ b/jscomp/lam_current_unit.ml @@ -40,5 +40,6 @@ let iset_debug_file _ = () let set_debug_file f = debug_file := f let get_debug_file () = !debug_file + let is_same_file () = !debug_file <> "" && !debug_file = !file diff --git a/jscomp/lam_current_unit.mli b/jscomp/lam_current_unit.mli index 39d5e7157e..7a96a6579f 100644 --- a/jscomp/lam_current_unit.mli +++ b/jscomp/lam_current_unit.mli @@ -36,3 +36,4 @@ val set_debug_file : string -> unit val get_debug_file : unit -> string val is_same_file : unit -> bool + diff --git a/jscomp/lam_dispatch_primitive.ml b/jscomp/lam_dispatch_primitive.ml index f649f1ee29..629e2b946e 100644 --- a/jscomp/lam_dispatch_primitive.ml +++ b/jscomp/lam_dispatch_primitive.ml @@ -464,6 +464,7 @@ let query (prim : Lam_compile_env.primitive_description) | "caml_sys_system_command" | "caml_sys_getcwd" (* check browser or nodejs *) | "caml_sys_is_directory" + | "caml_sys_file_exists" -> call Js_config.sys | "caml_lex_engine" diff --git a/jscomp/lib/js.ml b/jscomp/lib/js.ml index 562ac64d39..605057dd5b 100644 --- a/jscomp/lib/js.ml +++ b/jscomp/lib/js.ml @@ -128,7 +128,7 @@ end module Array = struct external new_uninitialized : int -> 'a array = "js_create_array" external append : 'a array -> 'a array -> 'a array = "js_array_append" - external make: int -> 'a -> 'a array = "caml_make_vect" + external make : int -> 'a -> 'a array = "caml_make_vect" end module Bytes = struct external to_int_array : bytes -> int array = "%identity" diff --git a/jscomp/runtime/.runtimedepend b/jscomp/runtime/.runtimedepend index 04d89772ae..cc8152b11a 100644 --- a/jscomp/runtime/.runtimedepend +++ b/jscomp/runtime/.runtimedepend @@ -44,8 +44,10 @@ caml_hash.cmj : js.cmj caml_queue.cmi caml_hash.cmi caml_hash.cmx : js.cmx caml_queue.cmx caml_hash.cmi caml_int32.cmj : caml_int32.cmi caml_int32.cmx : caml_int32.cmi -caml_int64.cmj : typed_array.cmj js.cmj caml_utils.cmi caml_int64.cmi -caml_int64.cmx : typed_array.cmx js.cmx caml_utils.cmx caml_int64.cmi +caml_int64.cmj : typed_array.cmj js.cmj caml_utils.cmi caml_int32.cmi \ + caml_int64.cmi +caml_int64.cmx : typed_array.cmx js.cmx caml_utils.cmx caml_int32.cmx \ + caml_int64.cmi caml_io.cmj : js.cmj caml_io.cmx : js.cmx caml_lexer.cmj : caml_lexer.cmi @@ -102,8 +104,10 @@ caml_hash.cmo : js.cmo caml_queue.cmi caml_hash.cmi caml_hash.cmj : js.cmj caml_queue.cmj caml_hash.cmi caml_int32.cmo : caml_int32.cmi caml_int32.cmj : caml_int32.cmi -caml_int64.cmo : typed_array.cmo js.cmo caml_utils.cmi caml_int64.cmi -caml_int64.cmj : typed_array.cmj js.cmj caml_utils.cmj caml_int64.cmi +caml_int64.cmo : typed_array.cmo js.cmo caml_utils.cmi caml_int32.cmi \ + caml_int64.cmi +caml_int64.cmj : typed_array.cmj js.cmj caml_utils.cmj caml_int32.cmj \ + caml_int64.cmi caml_io.cmo : js.cmo caml_io.cmj : js.cmj caml_lexer.cmo : caml_lexer.cmi diff --git a/jscomp/runtime/Makefile b/jscomp/runtime/Makefile index d8e4fe9a70..29ab6c26a7 100644 --- a/jscomp/runtime/Makefile +++ b/jscomp/runtime/Makefile @@ -2,12 +2,26 @@ include ../Makefile.shared COMPILER=../bin/bsc -SOURCE_LIST := $(shell cat runtime.mllib) +OTHERS= caml_array caml_string \ + caml_obj caml_int64 \ + caml_exceptions caml_utils caml_sys caml_io\ + caml_float caml_lexer caml_parser caml_primitive\ + caml_format caml_md5 caml_queue caml_hash caml_weak\ + caml_backtrace caml_int32 caml_gc typed_array \ + js_primitive caml_basic caml_oo curry + +SOURCE_LIST= $(OTHERS) caml_builtin_exceptions block js fn + +caml_oo.cmj : caml_array.cmj +caml_format.cmj caml_io.cmj: curry.cmj + + +$(addsuffix .cmj, $(OTHERS)): caml_builtin_exceptions.cmj block.cmj js.cmj fn.cmj RUNTIME := $(addsuffix .cmj, $(SOURCE_LIST)) -COMPFLAGS += $(MODULE_FLAGS) -w -40 +COMPFLAGS += $(MODULE_FLAGS) -w -40 -js-npm-output-path lib/js diff --git a/jscomp/runtime/caml_block.js b/jscomp/runtime/caml_block.js deleted file mode 100644 index a706eab77a..0000000000 --- a/jscomp/runtime/caml_block.js +++ /dev/null @@ -1,11 +0,0 @@ -// Generated CODE, PLEASE EDIT WITH CARE -'use strict'; - - -function create(tag, block) { - block.tag = tag; - return block; -} - -exports.create = create; -/* No side effect */ diff --git a/jscomp/runtime/caml_int64.ml b/jscomp/runtime/caml_int64.ml index 814a46c85e..5165071914 100644 --- a/jscomp/runtime/caml_int64.ml +++ b/jscomp/runtime/caml_int64.ml @@ -205,10 +205,11 @@ let rec mul this end -external bswap32: nativeint -> nativeint = "%bswap_int32" + let swap {lo ; hi } = - mk ~lo:( bswap32 hi) ~hi:( bswap32 lo) + mk ~lo:( Caml_int32.caml_int32_bswap hi) + ~hi:( Caml_int32.caml_int32_bswap lo) (* Dispatched by the compiler, idea: should we do maximum sharing *) diff --git a/jscomp/runtime/caml_oo.ml b/jscomp/runtime/caml_oo.ml index e1ff6d68ee..8607674e9d 100644 --- a/jscomp/runtime/caml_oo.ml +++ b/jscomp/runtime/caml_oo.ml @@ -37,7 +37,9 @@ option2: create a new array *) let caml_methods_cache = Js.Array.make 1000 0 -external get_methods : CamlinternalOO.obj -> CamlinternalOO.closure array = "%field0" + +external get_methods : CamlinternalOO.obj -> CamlinternalOO.closure array = + "%field0" let caml_get_public_method diff --git a/jscomp/runtime/caml_sys.ml b/jscomp/runtime/caml_sys.ml index eeeb43aac4..0907becb82 100644 --- a/jscomp/runtime/caml_sys.ml +++ b/jscomp/runtime/caml_sys.ml @@ -72,3 +72,6 @@ let caml_sys_getcwd () = "/" let caml_sys_is_directory _s = raise @@ Failure "caml_sys_is_directory not implemented" + +let caml_sys_file_exists _s = + raise @@ Failure "caml_sys_file_exists not implemented" diff --git a/jscomp/runtime/caml_sys.mli b/jscomp/runtime/caml_sys.mli index c145f270a6..16a9e85b72 100644 --- a/jscomp/runtime/caml_sys.mli +++ b/jscomp/runtime/caml_sys.mli @@ -40,3 +40,4 @@ val caml_sys_system_command : unit -> int val caml_sys_getcwd : unit -> string val caml_sys_is_directory : string -> bool +val caml_sys_file_exists : string -> bool diff --git a/jscomp/stdlib/Makefile.shared b/jscomp/stdlib/Makefile.shared index 21112e9ef5..a2f9f0ca33 100755 --- a/jscomp/stdlib/Makefile.shared +++ b/jscomp/stdlib/Makefile.shared @@ -22,7 +22,7 @@ CAMLC=$(CAMLRUN) $(COMPILER) #COMPFLAGS=-strict-sequence -w +33..39 -g -warn-error A -bin-annot -nostdlib \ # -safe-string COMPFLAGS= $(MODULE_FLAGS) -strict-sequence -w +33..39 -g -warn-error A -nostdlib \ - -safe-string + -safe-string -I ../runtime -js-npm-output-path lib/js # OPTCOMPILER=ocamlopt.opt diff --git a/jscomp/test/.depend b/jscomp/test/.depend index e8644af61c..ea66d03d0e 100644 --- a/jscomp/test/.depend +++ b/jscomp/test/.depend @@ -148,9 +148,11 @@ ext_array.cmx : ../stdlib/list.cmx ../stdlib/array.cmx ext_bytes.cmj : ../stdlib/bytes.cmi ext_bytes.cmx : ../stdlib/bytes.cmx ext_filename.cmj : ../stdlib/sys.cmi ../stdlib/string.cmi ../stdlib/list.cmi \ - ../stdlib/filename.cmi ext_string.cmj ext_pervasives.cmi + ../stdlib/lazy.cmi ../stdlib/filename.cmi ext_string.cmj \ + ext_pervasives.cmi ext_filename.cmx : ../stdlib/sys.cmx ../stdlib/string.cmx ../stdlib/list.cmx \ - ../stdlib/filename.cmx ext_string.cmx ext_pervasives.cmx + ../stdlib/lazy.cmx ../stdlib/filename.cmx ext_string.cmx \ + ext_pervasives.cmx ext_list.cmj : ../stdlib/list.cmi ../stdlib/array.cmi ext_list.cmx : ../stdlib/list.cmx ../stdlib/array.cmx ext_log.cmj : lam_current_unit.cmj ../stdlib/format.cmi @@ -760,9 +762,11 @@ ext_array.cmj : ../stdlib/list.cmj ../stdlib/array.cmj ext_bytes.cmo : ../stdlib/bytes.cmi ext_bytes.cmj : ../stdlib/bytes.cmj ext_filename.cmo : ../stdlib/sys.cmi ../stdlib/string.cmi ../stdlib/list.cmi \ - ../stdlib/filename.cmi ext_string.cmo ext_pervasives.cmi + ../stdlib/lazy.cmi ../stdlib/filename.cmi ext_string.cmo \ + ext_pervasives.cmi ext_filename.cmj : ../stdlib/sys.cmj ../stdlib/string.cmj ../stdlib/list.cmj \ - ../stdlib/filename.cmj ext_string.cmj ext_pervasives.cmj + ../stdlib/lazy.cmj ../stdlib/filename.cmj ext_string.cmj \ + ext_pervasives.cmj ext_list.cmo : ../stdlib/list.cmi ../stdlib/array.cmi ext_list.cmj : ../stdlib/list.cmj ../stdlib/array.cmj ext_log.cmo : lam_current_unit.cmo ../stdlib/format.cmi diff --git a/jscomp/test/Makefile b/jscomp/test/Makefile index ed6ccd24b7..e7abf4c546 100644 --- a/jscomp/test/Makefile +++ b/jscomp/test/Makefile @@ -8,6 +8,7 @@ SOURCE_LIST := $(shell cat test.mllib) TESTS := $(addsuffix .cmj, $(SOURCE_LIST) ) COMPFLAGS+= $(MODULE_FLAGS) -w -40 +COMPFLAGS+= -js-npm-output-path lib/js/test/ $(TESTS): $(CAMLC) @@ -43,5 +44,6 @@ simple_lexer_test.ml: simple_lexer_test.mll depend: $(CAMLDEP) $(INCLUDES) *.mli *.ml | sed -e 's/\.cmo/.cmj/g' > .depend - $(CAMLDEP) $(INCLUDES) *.ml | sed -e 's/\.cmx/.cmj/g' >>.depend + $(CAMLDEP) $(INCLUDES) *.ml | sed -e 's/\.cmx/.cmj/g' >> .depend + diff --git a/jscomp/test/a_filename_test.js b/jscomp/test/a_filename_test.js deleted file mode 100644 index 25aca2a207..0000000000 --- a/jscomp/test/a_filename_test.js +++ /dev/null @@ -1,61 +0,0 @@ -// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE -'use strict'; - -var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Ext_filename = require("./ext_filename"); - -var suites_000 = /* tuple */[ - "basic", - function () { - return /* Eq */Block.__(0, [ - Ext_filename.node_relative_path("./a/b.c", "./a/u/g.c"), - "./u/g" - ]); - } -]; - -var suites_001 = /* :: */[ - /* tuple */[ - "node", - function () { - return /* Eq */Block.__(0, [ - Ext_filename.node_relative_path("./a/b.c", "xxxghsoghos/ghsoghso/node_modules/buckle-stdlib/list.js"), - "buckle-stdlib/list.js" - ]); - } - ], - /* :: */[ - /* tuple */[ - "node2", - function () { - return /* Eq */Block.__(0, [ - Ext_filename.node_relative_path("./a/b.c", "xxxghsoghos/ghsoghso/node_modules//buckle-stdlib/list.js"), - "buckle-stdlib/list.js" - ]); - } - ], - /* :: */[ - /* tuple */[ - "node3", - function () { - return /* Eq */Block.__(0, [ - Ext_filename.node_relative_path("./a/b.c", "xxxghsoghos/ghsoghso/node_modules/./buckle-stdlib/list.js"), - "buckle-stdlib/list.js" - ]); - } - ], - /* [] */0 - ] - ] -]; - -var suites = /* :: */[ - suites_000, - suites_001 -]; - -Mt.from_pair_suites("a_filename_test.ml", suites); - -exports.suites = suites; -/* Not a pure module */ diff --git a/jscomp/test/a_filename_test.ml b/jscomp/test/a_filename_test.ml index c812500111..b9d2ce6f10 100644 --- a/jscomp/test/a_filename_test.ml +++ b/jscomp/test/a_filename_test.ml @@ -1,34 +1,63 @@ +let suites : Mt.pair_suites ref = ref [] +let test_id = ref 0 +let eq loc x y = + incr test_id ; + suites := + (loc ^" id " ^ (string_of_int !test_id), (fun _ -> Mt.Eq(x,y))) :: !suites -let suites = Mt.[ - "basic", (fun _ -> - Eq((Ext_filename.node_relative_path - "./a/b.c" - "./a/u/g.c"), "./u/g") - ); - "node", (fun _ -> - Eq(Ext_filename.node_relative_path - "./a/b.c" - "xxxghsoghos/ghsoghso/node_modules/buckle-stdlib/list.js", - "buckle-stdlib/list.js" - ) - ); - - "node2", (fun _ -> - Eq(Ext_filename.node_relative_path - "./a/b.c" - "xxxghsoghos/ghsoghso/node_modules//buckle-stdlib/list.js", - "buckle-stdlib/list.js" - ) - ); - "node3", (fun _ -> - Eq(Ext_filename.node_relative_path - "./a/b.c" - "xxxghsoghos/ghsoghso/node_modules/./buckle-stdlib/list.js", - "buckle-stdlib/list.js" - ) +let () = + eq __LOC__ + (let (//) = Ext_filename.combine in + ("/tmp"// "subdir/file.txt", + "/tmp"// "/a/tmp.txt", + "/a/tmp.txt" // "subdir/file.txt" + )) + ("/tmp/subdir/file.txt", + "/a/tmp.txt", + "/a/tmp.txt/subdir/file.txt" ) + ; + eq __LOC__ + (Ext_filename.node_relative_path + (`File "./a/b.c") + (`File "./a/u/g.c")) "./u/g"; -] -;; Mt.from_pair_suites __FILE__ suites + eq __LOC__ + (Ext_filename.node_relative_path + (`File "./a/b.c") + (`File "xxxghsoghos/ghsoghso/node_modules/buckle-stdlib/list.js")) + "buckle-stdlib/list.js" ; + + eq __LOC__ + (Ext_filename.node_relative_path + (`File "./a/b.c") + (`File "xxxghsoghos/ghsoghso/node_modules//buckle-stdlib/list.js")) + "buckle-stdlib/list.js" ; + + eq __LOC__ + (Ext_filename.node_relative_path + (`File "./a/b.c") + (`File "xxxghsoghos/ghsoghso/node_modules/./buckle-stdlib/list.js")) + "buckle-stdlib/list.js" ; + + eq __LOC__ + (Ext_filename.node_relative_path + (`File "./a/c.js") + (`File "./a/b")) + "./b" ; + eq __LOC__ + (Ext_filename.node_relative_path + (`File "./a/c") + (`File "./a/b.js")) + "./b" ; + eq __LOC__ + (Ext_filename.node_relative_path + (`Dir "./a/") + (`File "./a/b.js")) + "./b" + + + +;; Mt.from_pair_suites __FILE__ !suites diff --git a/jscomp/test/a_recursve_type.js b/jscomp/test/a_recursve_type.js deleted file mode 100644 index 4c33d80567..0000000000 --- a/jscomp/test/a_recursve_type.js +++ /dev/null @@ -1,6 +0,0 @@ -// Generated CODE, PLEASE EDIT WITH CARE - -"use strict"; -var loop=function(y,x){return x[1](y);}; -exports.loop=loop; -/* No side effect */ \ No newline at end of file diff --git a/jscomp/test/ext_filename.js b/jscomp/test/ext_filename.js deleted file mode 100644 index e3cd5da259..0000000000 --- a/jscomp/test/ext_filename.js +++ /dev/null @@ -1,216 +0,0 @@ -// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE -'use strict'; - -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Filename = require("../stdlib/filename"); -var Caml_sys = require("../runtime/caml_sys"); -var Pervasives = require("../stdlib/pervasives"); -var Block = require("../runtime/block"); -var Ext_string = require("./ext_string"); -var Curry = require("../runtime/curry"); -var Ext_pervasives = require("./ext_pervasives"); -var $$String = require("../stdlib/string"); -var List = require("../stdlib/list"); -var Format = require("../stdlib/format"); - -var node_sep = "/"; - -var node_parent = ".."; - -var node_current = "."; - -function absolute_path(s) { - var s$1 = Curry._1(Filename.is_relative, s) ? Filename.concat(Caml_sys.caml_sys_getcwd(/* () */0), s) : s; - var aux = function (_s) { - while(true) { - var s = _s; - var base = Curry._1(Filename.basename, s); - var dir = Curry._1(Filename.dirname, s); - if (dir === s) { - return dir; - } - else if (base === Filename.current_dir_name) { - _s = dir; - continue ; - - } - else if (base === Filename.parent_dir_name) { - return Curry._1(Filename.dirname, aux(dir)); - } - else { - return Filename.concat(aux(dir), base); - } - }; - }; - return aux(s$1); -} - -function chop_extension($staropt$star, name) { - var loc = $staropt$star ? $staropt$star[0] : ""; - try { - return Filename.chop_extension(name); - } - catch (exn){ - if (exn[0] === Caml_builtin_exceptions.invalid_argument) { - var s = "Filename.chop_extension (" + (loc + (":" + (name + ")"))); - throw [ - Caml_builtin_exceptions.invalid_argument, - s - ]; - } - else { - throw exn; - } - } -} - -function try_chop_extension(s) { - try { - return Filename.chop_extension(s); - } - catch (exn){ - return s; - } -} - -function relative_path(file1, file2) { - var dir1 = Ext_string.split(/* None */0, Curry._1(Filename.dirname, file1), Filename.dir_sep.charCodeAt(0)); - var dir2 = Ext_string.split(/* None */0, Curry._1(Filename.dirname, file2), Filename.dir_sep.charCodeAt(0)); - var go = function (_dir1, _dir2) { - while(true) { - var dir2 = _dir2; - var dir1 = _dir1; - var exit = 0; - if (dir1) { - if (dir2) { - if (dir1[0] === dir2[0]) { - _dir2 = dir2[1]; - _dir1 = dir1[1]; - continue ; - - } - else { - exit = 1; - } - } - else { - exit = 1; - } - } - else { - exit = 1; - } - if (exit === 1) { - return Pervasives.$at(List.map(function () { - return node_parent; - }, dir2), dir1); - } - - }; - }; - var ys = go(dir1, dir2); - if (ys) { - if (ys[0] === node_parent) { - return $$String.concat(node_sep, ys); - } - else { - return $$String.concat(node_sep, /* :: */[ - node_current, - ys - ]); - } - } - else { - return $$String.concat(node_sep, /* :: */[ - node_current, - ys - ]); - } -} - -var node_modules = "node_modules"; - -function node_relative_path(path1, path2) { - var v = Ext_string.find(/* None */0, node_modules, path2); - var len = path2.length; - if (v >= 0) { - var skip = function (_i) { - while(true) { - var i = _i; - if (i >= len) { - var s = "invalid path: " + path2; - throw [ - Caml_builtin_exceptions.failure, - s - ]; - } - else { - var match = path2.charCodeAt(i); - if (match === 47 || match === 46) { - _i = i + 1 | 0; - continue ; - - } - else { - return i; - } - } - }; - }; - return Ext_string.tail_from(path2, skip(v + 12 | 0)); - } - else { - return relative_path(try_chop_extension(absolute_path(path2)), try_chop_extension(absolute_path(path1))) + (node_sep + try_chop_extension(Curry._1(Filename.basename, path2))); - } -} - -function resolve(cwd, module_name) { - var origin = cwd; - var _cwd = cwd; - var module_name$1 = module_name; - while(true) { - var cwd$1 = _cwd; - var v = Filename.concat(Filename.concat(cwd$1, node_modules), module_name$1); - if (Caml_sys.caml_sys_is_directory(v)) { - return v; - } - else { - var cwd$prime = Curry._1(Filename.dirname, cwd$1); - if (cwd$prime.length < cwd$1.length) { - _cwd = cwd$prime; - continue ; - - } - else { - return Curry._2(Format.ksprintf(Pervasives.failwith, /* Format */[ - /* String */Block.__(2, [ - /* No_padding */0, - /* String_literal */Block.__(11, [ - " not found in ", - /* String */Block.__(2, [ - /* No_padding */0, - /* End_of_format */0 - ]) - ]) - ]), - "%s not found in %s" - ]), module_name$1, origin); - } - } - }; -} - -var node_modules_length = 12; - -exports.node_sep = node_sep; -exports.node_parent = node_parent; -exports.node_current = node_current; -exports.absolute_path = absolute_path; -exports.chop_extension = chop_extension; -exports.try_chop_extension = try_chop_extension; -exports.relative_path = relative_path; -exports.node_modules = node_modules; -exports.node_modules_length = node_modules_length; -exports.node_relative_path = node_relative_path; -exports.resolve = resolve; -/* Filename Not a pure module */ diff --git a/jscomp/tools/line_process.ml b/jscomp/tools/line_process.ml index a0dd7847d2..19bde1419c 100644 --- a/jscomp/tools/line_process.ml +++ b/jscomp/tools/line_process.ml @@ -83,7 +83,7 @@ let rec process_line cwd filedir line = Line_process.read_lines "." "./tools/tools.mllib" ]} - TODO: we can only concat (dir/file) not (dir/dir) + FIXME: we can only concat (dir/file) not (dir/dir) {[ Filename.concat "/bb/x/" "/bb/x/";; ]} diff --git a/jscomp/stdlib/arg.js b/lib/js/arg.js similarity index 98% rename from jscomp/stdlib/arg.js rename to lib/js/arg.js index b2ecf2fbf8..645ca23714 100644 --- a/jscomp/stdlib/arg.js +++ b/lib/js/arg.js @@ -1,20 +1,20 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../runtime/caml_obj"); -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); +var Caml_obj = require("./caml_obj"); +var Caml_builtin_exceptions = require("./caml_builtin_exceptions"); var Bytes = require("./bytes"); -var Caml_exceptions = require("../runtime/caml_exceptions"); +var Caml_exceptions = require("./caml_exceptions"); var Pervasives = require("./pervasives"); -var Caml_format = require("../runtime/caml_format"); -var Block = require("../runtime/block"); +var Caml_format = require("./caml_format"); +var Block = require("./block"); var Sys = require("./sys"); -var Curry = require("../runtime/curry"); +var Curry = require("./curry"); var Printf = require("./printf"); var Buffer = require("./buffer"); var $$String = require("./string"); var List = require("./list"); -var Caml_string = require("../runtime/caml_string"); +var Caml_string = require("./caml_string"); var Bad = Caml_exceptions.create("Arg.Bad"); diff --git a/jscomp/stdlib/array.js b/lib/js/array.js similarity index 97% rename from jscomp/stdlib/array.js rename to lib/js/array.js index b1f35b4036..76d1f0d89b 100644 --- a/jscomp/stdlib/array.js +++ b/lib/js/array.js @@ -1,10 +1,10 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_exceptions = require("../runtime/caml_exceptions"); -var Curry = require("../runtime/curry"); -var Caml_array = require("../runtime/caml_array"); +var Caml_builtin_exceptions = require("./caml_builtin_exceptions"); +var Caml_exceptions = require("./caml_exceptions"); +var Curry = require("./curry"); +var Caml_array = require("./caml_array"); function init(l, f) { if (l) { diff --git a/jscomp/stdlib/arrayLabels.js b/lib/js/arrayLabels.js similarity index 100% rename from jscomp/stdlib/arrayLabels.js rename to lib/js/arrayLabels.js diff --git a/jscomp/stdlib/bigarray.js b/lib/js/bigarray.js similarity index 98% rename from jscomp/stdlib/bigarray.js rename to lib/js/bigarray.js index 6840b8e840..49e853fc0b 100644 --- a/jscomp/stdlib/bigarray.js +++ b/lib/js/bigarray.js @@ -1,8 +1,8 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_array = require("../runtime/caml_array"); +var Caml_builtin_exceptions = require("./caml_builtin_exceptions"); +var Caml_array = require("./caml_array"); function dims() { var n = function () { diff --git a/jscomp/runtime/block.js b/lib/js/block.js similarity index 100% rename from jscomp/runtime/block.js rename to lib/js/block.js diff --git a/jscomp/stdlib/buffer.js b/lib/js/buffer.js similarity index 97% rename from jscomp/stdlib/buffer.js rename to lib/js/buffer.js index 0a42472700..d3d2e1556f 100644 --- a/jscomp/stdlib/buffer.js +++ b/lib/js/buffer.js @@ -2,12 +2,12 @@ 'use strict'; var Bytes = require("./bytes"); -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); +var Caml_builtin_exceptions = require("./caml_builtin_exceptions"); var Pervasives = require("./pervasives"); var Sys = require("./sys"); -var Curry = require("../runtime/curry"); +var Curry = require("./curry"); var $$String = require("./string"); -var Caml_string = require("../runtime/caml_string"); +var Caml_string = require("./caml_string"); function create(n) { var n$1 = n < 1 ? 1 : n; diff --git a/jscomp/stdlib/bytes.js b/lib/js/bytes.js similarity index 97% rename from jscomp/stdlib/bytes.js rename to lib/js/bytes.js index f400cadaa3..12d878308b 100644 --- a/jscomp/stdlib/bytes.js +++ b/lib/js/bytes.js @@ -1,13 +1,13 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_obj = require("../runtime/caml_obj"); +var Caml_builtin_exceptions = require("./caml_builtin_exceptions"); +var Caml_obj = require("./caml_obj"); var Pervasives = require("./pervasives"); -var Caml_int32 = require("../runtime/caml_int32"); +var Caml_int32 = require("./caml_int32"); var Char = require("./char"); -var Curry = require("../runtime/curry"); -var Caml_string = require("../runtime/caml_string"); +var Curry = require("./curry"); +var Caml_string = require("./caml_string"); var List = require("./list"); function make(n, c) { diff --git a/jscomp/stdlib/bytesLabels.js b/lib/js/bytesLabels.js similarity index 100% rename from jscomp/stdlib/bytesLabels.js rename to lib/js/bytesLabels.js diff --git a/jscomp/stdlib/callback.js b/lib/js/callback.js similarity index 100% rename from jscomp/stdlib/callback.js rename to lib/js/callback.js diff --git a/jscomp/runtime/caml_array.js b/lib/js/caml_array.js similarity index 100% rename from jscomp/runtime/caml_array.js rename to lib/js/caml_array.js diff --git a/jscomp/runtime/caml_backtrace.js b/lib/js/caml_backtrace.js similarity index 100% rename from jscomp/runtime/caml_backtrace.js rename to lib/js/caml_backtrace.js diff --git a/jscomp/runtime/caml_basic.js b/lib/js/caml_basic.js similarity index 100% rename from jscomp/runtime/caml_basic.js rename to lib/js/caml_basic.js diff --git a/jscomp/runtime/caml_builtin_exceptions.js b/lib/js/caml_builtin_exceptions.js similarity index 100% rename from jscomp/runtime/caml_builtin_exceptions.js rename to lib/js/caml_builtin_exceptions.js diff --git a/jscomp/runtime/caml_exceptions.js b/lib/js/caml_exceptions.js similarity index 100% rename from jscomp/runtime/caml_exceptions.js rename to lib/js/caml_exceptions.js diff --git a/jscomp/runtime/caml_float.js b/lib/js/caml_float.js similarity index 100% rename from jscomp/runtime/caml_float.js rename to lib/js/caml_float.js diff --git a/jscomp/runtime/caml_format.js b/lib/js/caml_format.js similarity index 100% rename from jscomp/runtime/caml_format.js rename to lib/js/caml_format.js diff --git a/jscomp/runtime/caml_gc.js b/lib/js/caml_gc.js similarity index 100% rename from jscomp/runtime/caml_gc.js rename to lib/js/caml_gc.js diff --git a/jscomp/runtime/caml_hash.js b/lib/js/caml_hash.js similarity index 100% rename from jscomp/runtime/caml_hash.js rename to lib/js/caml_hash.js diff --git a/jscomp/runtime/caml_int32.js b/lib/js/caml_int32.js similarity index 100% rename from jscomp/runtime/caml_int32.js rename to lib/js/caml_int32.js diff --git a/jscomp/runtime/caml_int64.js b/lib/js/caml_int64.js similarity index 100% rename from jscomp/runtime/caml_int64.js rename to lib/js/caml_int64.js diff --git a/jscomp/runtime/caml_io.js b/lib/js/caml_io.js similarity index 100% rename from jscomp/runtime/caml_io.js rename to lib/js/caml_io.js diff --git a/jscomp/runtime/caml_lexer.js b/lib/js/caml_lexer.js similarity index 100% rename from jscomp/runtime/caml_lexer.js rename to lib/js/caml_lexer.js diff --git a/jscomp/runtime/caml_md5.js b/lib/js/caml_md5.js similarity index 100% rename from jscomp/runtime/caml_md5.js rename to lib/js/caml_md5.js diff --git a/jscomp/runtime/caml_obj.js b/lib/js/caml_obj.js similarity index 100% rename from jscomp/runtime/caml_obj.js rename to lib/js/caml_obj.js diff --git a/jscomp/runtime/caml_oo.js b/lib/js/caml_oo.js similarity index 98% rename from jscomp/runtime/caml_oo.js rename to lib/js/caml_oo.js index fdcb084942..2a35114831 100644 --- a/jscomp/runtime/caml_oo.js +++ b/lib/js/caml_oo.js @@ -21,7 +21,7 @@ function caml_get_public_method(obj, tag, cacheid) { Caml_builtin_exceptions.assert_failure, [ "caml_oo.ml", - 52, + 54, 20 ] ]; diff --git a/jscomp/runtime/caml_parser.js b/lib/js/caml_parser.js similarity index 100% rename from jscomp/runtime/caml_parser.js rename to lib/js/caml_parser.js diff --git a/jscomp/runtime/caml_primitive.js b/lib/js/caml_primitive.js similarity index 100% rename from jscomp/runtime/caml_primitive.js rename to lib/js/caml_primitive.js diff --git a/jscomp/runtime/caml_queue.js b/lib/js/caml_queue.js similarity index 100% rename from jscomp/runtime/caml_queue.js rename to lib/js/caml_queue.js diff --git a/jscomp/runtime/caml_string.js b/lib/js/caml_string.js similarity index 100% rename from jscomp/runtime/caml_string.js rename to lib/js/caml_string.js diff --git a/jscomp/runtime/caml_sys.js b/lib/js/caml_sys.js similarity index 88% rename from jscomp/runtime/caml_sys.js rename to lib/js/caml_sys.js index 8ff60334b0..6910269c6b 100644 --- a/jscomp/runtime/caml_sys.js +++ b/lib/js/caml_sys.js @@ -55,6 +55,13 @@ function caml_sys_is_directory() { ]; } +function caml_sys_file_exists() { + throw [ + Caml_builtin_exceptions.failure, + "caml_sys_file_exists not implemented" + ]; +} + function caml_sys_getenv(prim) { return $$caml_sys_getenv(prim); } @@ -66,4 +73,5 @@ exports.caml_sys_random_seed = caml_sys_random_seed; exports.caml_sys_system_command = caml_sys_system_command; exports.caml_sys_getcwd = caml_sys_getcwd; exports.caml_sys_is_directory = caml_sys_is_directory; +exports.caml_sys_file_exists = caml_sys_file_exists; /* Not a pure module */ diff --git a/jscomp/runtime/caml_utils.js b/lib/js/caml_utils.js similarity index 100% rename from jscomp/runtime/caml_utils.js rename to lib/js/caml_utils.js diff --git a/jscomp/runtime/caml_weak.js b/lib/js/caml_weak.js similarity index 100% rename from jscomp/runtime/caml_weak.js rename to lib/js/caml_weak.js diff --git a/jscomp/stdlib/camlinternalFormat.js b/lib/js/camlinternalFormat.js similarity index 99% rename from jscomp/stdlib/camlinternalFormat.js rename to lib/js/camlinternalFormat.js index 625c7fafbf..6bd6196238 100644 --- a/jscomp/stdlib/camlinternalFormat.js +++ b/lib/js/camlinternalFormat.js @@ -2,22 +2,22 @@ 'use strict'; var Bytes = require("./bytes"); -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_obj = require("../runtime/caml_obj"); -var Caml_io = require("../runtime/caml_io"); -var Caml_float = require("../runtime/caml_float"); +var Caml_builtin_exceptions = require("./caml_builtin_exceptions"); +var Caml_obj = require("./caml_obj"); +var Caml_io = require("./caml_io"); +var Caml_float = require("./caml_float"); var Pervasives = require("./pervasives"); -var Caml_exceptions = require("../runtime/caml_exceptions"); -var Caml_format = require("../runtime/caml_format"); -var Caml_int32 = require("../runtime/caml_int32"); -var Block = require("../runtime/block"); +var Caml_exceptions = require("./caml_exceptions"); +var Caml_format = require("./caml_format"); +var Caml_int32 = require("./caml_int32"); +var Block = require("./block"); var Char = require("./char"); var Sys = require("./sys"); -var Curry = require("../runtime/curry"); +var Curry = require("./curry"); var CamlinternalFormatBasics = require("./camlinternalFormatBasics"); var Buffer = require("./buffer"); var $$String = require("./string"); -var Caml_string = require("../runtime/caml_string"); +var Caml_string = require("./caml_string"); function create_char_set() { return Bytes.make(32, /* "\000" */0); diff --git a/jscomp/stdlib/camlinternalFormatBasics.js b/lib/js/camlinternalFormatBasics.js similarity index 99% rename from jscomp/stdlib/camlinternalFormatBasics.js rename to lib/js/camlinternalFormatBasics.js index f922a33a70..a126b9b878 100644 --- a/jscomp/stdlib/camlinternalFormatBasics.js +++ b/lib/js/camlinternalFormatBasics.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Block = require("../runtime/block"); +var Block = require("./block"); function erase_rel(param) { if (typeof param === "number") { diff --git a/jscomp/stdlib/camlinternalLazy.js b/lib/js/camlinternalLazy.js similarity index 92% rename from jscomp/stdlib/camlinternalLazy.js rename to lib/js/camlinternalLazy.js index 5ef0ff3a1a..8e770069de 100644 --- a/jscomp/stdlib/camlinternalLazy.js +++ b/lib/js/camlinternalLazy.js @@ -2,8 +2,8 @@ 'use strict'; var Obj = require("./obj"); -var Caml_exceptions = require("../runtime/caml_exceptions"); -var Curry = require("../runtime/curry"); +var Caml_exceptions = require("./caml_exceptions"); +var Curry = require("./curry"); var Undefined = Caml_exceptions.create("CamlinternalLazy.Undefined"); diff --git a/jscomp/stdlib/camlinternalMod.js b/lib/js/camlinternalMod.js similarity index 94% rename from jscomp/stdlib/camlinternalMod.js rename to lib/js/camlinternalMod.js index 3a320ff9d7..708a8fdc3b 100644 --- a/jscomp/stdlib/camlinternalMod.js +++ b/lib/js/camlinternalMod.js @@ -1,8 +1,8 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_obj = require("../runtime/caml_obj"); +var Caml_builtin_exceptions = require("./caml_builtin_exceptions"); +var Caml_obj = require("./caml_obj"); var CamlinternalOO = require("./camlinternalOO"); function init_mod(loc, shape) { diff --git a/jscomp/stdlib/camlinternalOO.js b/lib/js/camlinternalOO.js similarity index 98% rename from jscomp/stdlib/camlinternalOO.js rename to lib/js/camlinternalOO.js index e7547c733d..474ee71c0b 100644 --- a/jscomp/stdlib/camlinternalOO.js +++ b/lib/js/camlinternalOO.js @@ -1,17 +1,17 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../runtime/caml_obj"); -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); +var Caml_obj = require("./caml_obj"); +var Caml_builtin_exceptions = require("./caml_builtin_exceptions"); var Obj = require("./obj"); -var Caml_exceptions = require("../runtime/caml_exceptions"); -var Caml_oo = require("../runtime/caml_oo"); -var Caml_int32 = require("../runtime/caml_int32"); +var Caml_exceptions = require("./caml_exceptions"); +var Caml_oo = require("./caml_oo"); +var Caml_int32 = require("./caml_int32"); var Sys = require("./sys"); -var Curry = require("../runtime/curry"); -var Caml_array = require("../runtime/caml_array"); +var Curry = require("./curry"); +var Caml_array = require("./caml_array"); var $$Array = require("./array"); -var Caml_string = require("../runtime/caml_string"); +var Caml_string = require("./caml_string"); var List = require("./list"); function copy(o) { diff --git a/jscomp/stdlib/char.js b/lib/js/char.js similarity index 93% rename from jscomp/stdlib/char.js rename to lib/js/char.js index 18638ac251..daac654009 100644 --- a/jscomp/stdlib/char.js +++ b/lib/js/char.js @@ -1,8 +1,8 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_string = require("../runtime/caml_string"); +var Caml_builtin_exceptions = require("./caml_builtin_exceptions"); +var Caml_string = require("./caml_string"); function chr(n) { if (n < 0 || n > 255) { diff --git a/jscomp/stdlib/complex.js b/lib/js/complex.js similarity index 100% rename from jscomp/stdlib/complex.js rename to lib/js/complex.js diff --git a/jscomp/runtime/curry.js b/lib/js/curry.js similarity index 100% rename from jscomp/runtime/curry.js rename to lib/js/curry.js diff --git a/jscomp/stdlib/digest.js b/lib/js/digest.js similarity index 94% rename from jscomp/stdlib/digest.js rename to lib/js/digest.js index 94c582791e..3e4cdf15d2 100644 --- a/jscomp/stdlib/digest.js +++ b/lib/js/digest.js @@ -1,12 +1,12 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); +var Caml_builtin_exceptions = require("./caml_builtin_exceptions"); var Pervasives = require("./pervasives"); var Char = require("./char"); -var Caml_md5 = require("../runtime/caml_md5"); +var Caml_md5 = require("./caml_md5"); var $$String = require("./string"); -var Caml_string = require("../runtime/caml_string"); +var Caml_string = require("./caml_string"); function string(str) { return Caml_md5.caml_md5_string(str, 0, str.length); diff --git a/jscomp/stdlib/filename.js b/lib/js/filename.js similarity index 97% rename from jscomp/stdlib/filename.js rename to lib/js/filename.js index 36d05f63a8..0b3336d921 100644 --- a/jscomp/stdlib/filename.js +++ b/lib/js/filename.js @@ -1,12 +1,12 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); +var Caml_builtin_exceptions = require("./caml_builtin_exceptions"); var CamlinternalLazy = require("./camlinternalLazy"); -var Caml_sys = require("../runtime/caml_sys"); +var Caml_sys = require("./caml_sys"); var Pervasives = require("./pervasives"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); +var Block = require("./block"); +var Curry = require("./curry"); var Printf = require("./printf"); var Buffer = require("./buffer"); var $$String = require("./string"); diff --git a/jscomp/runtime/fn.js b/lib/js/fn.js similarity index 100% rename from jscomp/runtime/fn.js rename to lib/js/fn.js diff --git a/jscomp/stdlib/format.js b/lib/js/format.js similarity index 99% rename from jscomp/stdlib/format.js rename to lib/js/format.js index 7ea0f64161..c7a545b84f 100644 --- a/jscomp/stdlib/format.js +++ b/lib/js/format.js @@ -1,17 +1,17 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../runtime/caml_obj"); -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); +var Caml_obj = require("./caml_obj"); +var Caml_builtin_exceptions = require("./caml_builtin_exceptions"); var Bytes = require("./bytes"); -var Caml_io = require("../runtime/caml_io"); -var Caml_exceptions = require("../runtime/caml_exceptions"); +var Caml_io = require("./caml_io"); +var Caml_exceptions = require("./caml_exceptions"); var Pervasives = require("./pervasives"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); +var Block = require("./block"); +var Curry = require("./curry"); var Buffer = require("./buffer"); var $$String = require("./string"); -var Caml_string = require("../runtime/caml_string"); +var Caml_string = require("./caml_string"); var CamlinternalFormat = require("./camlinternalFormat"); function add_queue(x, q) { diff --git a/jscomp/stdlib/gc.js b/lib/js/gc.js similarity index 98% rename from jscomp/stdlib/gc.js rename to lib/js/gc.js index 97b47dda90..12f1d317d9 100644 --- a/jscomp/stdlib/gc.js +++ b/lib/js/gc.js @@ -1,10 +1,10 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Block = require("../runtime/block"); -var Caml_gc = require("../runtime/caml_gc"); +var Block = require("./block"); +var Caml_gc = require("./caml_gc"); var Sys = require("./sys"); -var Curry = require("../runtime/curry"); +var Curry = require("./curry"); var Printf = require("./printf"); function print_stat(c) { diff --git a/jscomp/stdlib/genlex.js b/lib/js/genlex.js similarity index 98% rename from jscomp/stdlib/genlex.js rename to lib/js/genlex.js index 7d18a44cdb..85c7531c04 100644 --- a/jscomp/stdlib/genlex.js +++ b/lib/js/genlex.js @@ -2,14 +2,14 @@ 'use strict'; var Bytes = require("./bytes"); -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); +var Caml_builtin_exceptions = require("./caml_builtin_exceptions"); var Hashtbl = require("./hashtbl"); var Stream = require("./stream"); -var Caml_format = require("../runtime/caml_format"); -var Caml_int32 = require("../runtime/caml_int32"); -var Block = require("../runtime/block"); +var Caml_format = require("./caml_format"); +var Caml_int32 = require("./caml_int32"); +var Block = require("./block"); var Char = require("./char"); -var Caml_string = require("../runtime/caml_string"); +var Caml_string = require("./caml_string"); var List = require("./list"); var initial_buffer = new Array(32); diff --git a/jscomp/stdlib/hashtbl.js b/lib/js/hashtbl.js similarity index 97% rename from jscomp/stdlib/hashtbl.js rename to lib/js/hashtbl.js index 9dafdea9b6..c29a636655 100644 --- a/jscomp/stdlib/hashtbl.js +++ b/lib/js/hashtbl.js @@ -2,18 +2,18 @@ 'use strict'; var Bytes = require("./bytes"); -var Caml_obj = require("../runtime/caml_obj"); -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); +var Caml_obj = require("./caml_obj"); +var Caml_builtin_exceptions = require("./caml_builtin_exceptions"); var CamlinternalLazy = require("./camlinternalLazy"); -var Caml_sys = require("../runtime/caml_sys"); +var Caml_sys = require("./caml_sys"); var Pervasives = require("./pervasives"); -var Block = require("../runtime/block"); +var Block = require("./block"); var Sys = require("./sys"); -var Curry = require("../runtime/curry"); -var Caml_array = require("../runtime/caml_array"); +var Curry = require("./curry"); +var Caml_array = require("./caml_array"); var $$Array = require("./array"); -var Caml_string = require("../runtime/caml_string"); -var Caml_hash = require("../runtime/caml_hash"); +var Caml_string = require("./caml_string"); +var Caml_hash = require("./caml_hash"); var Random = require("./random"); function hash(x) { diff --git a/jscomp/stdlib/int32.js b/lib/js/int32.js similarity index 89% rename from jscomp/stdlib/int32.js rename to lib/js/int32.js index 2ffd87b975..9634c7b51b 100644 --- a/jscomp/stdlib/int32.js +++ b/lib/js/int32.js @@ -1,8 +1,8 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../runtime/caml_obj"); -var Caml_format = require("../runtime/caml_format"); +var Caml_obj = require("./caml_obj"); +var Caml_format = require("./caml_format"); function succ(n) { return n + 1 | 0; diff --git a/jscomp/stdlib/int64.js b/lib/js/int64.js similarity index 93% rename from jscomp/stdlib/int64.js rename to lib/js/int64.js index 52a78cb370..3dd2abca7d 100644 --- a/jscomp/stdlib/int64.js +++ b/lib/js/int64.js @@ -1,8 +1,8 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_int64 = require("../runtime/caml_int64"); -var Caml_format = require("../runtime/caml_format"); +var Caml_int64 = require("./caml_int64"); +var Caml_format = require("./caml_format"); function succ(n) { return Caml_int64.add(n, /* int64 */[ diff --git a/jscomp/runtime/js.js b/lib/js/js.js similarity index 100% rename from jscomp/runtime/js.js rename to lib/js/js.js diff --git a/jscomp/runtime/js_primitive.js b/lib/js/js_primitive.js similarity index 100% rename from jscomp/runtime/js_primitive.js rename to lib/js/js_primitive.js diff --git a/jscomp/stdlib/lazy.js b/lib/js/lazy.js similarity index 90% rename from jscomp/stdlib/lazy.js rename to lib/js/lazy.js index e8cc6e2d32..d574774a79 100644 --- a/jscomp/stdlib/lazy.js +++ b/lib/js/lazy.js @@ -1,10 +1,10 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../runtime/caml_obj"); +var Caml_obj = require("./caml_obj"); var Obj = require("./obj"); var CamlinternalLazy = require("./camlinternalLazy"); -var Block = require("../runtime/block"); +var Block = require("./block"); function from_fun(f) { var x = Block.__(Obj.lazy_tag, [0]); diff --git a/jscomp/stdlib/lexing.js b/lib/js/lexing.js similarity index 96% rename from jscomp/stdlib/lexing.js rename to lib/js/lexing.js index acf5e5f294..a7322e8043 100644 --- a/jscomp/stdlib/lexing.js +++ b/lib/js/lexing.js @@ -2,12 +2,12 @@ 'use strict'; var Bytes = require("./bytes"); -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); +var Caml_builtin_exceptions = require("./caml_builtin_exceptions"); var Pervasives = require("./pervasives"); -var Caml_lexer = require("../runtime/caml_lexer"); +var Caml_lexer = require("./caml_lexer"); var Sys = require("./sys"); -var Curry = require("../runtime/curry"); -var Caml_string = require("../runtime/caml_string"); +var Curry = require("./curry"); +var Caml_string = require("./caml_string"); function engine(tbl, state, buf) { var result = Caml_lexer.caml_lex_engine(tbl, state, buf); diff --git a/jscomp/stdlib/list.js b/lib/js/list.js similarity index 99% rename from jscomp/stdlib/list.js rename to lib/js/list.js index 61b6423e4f..0f0949ffdc 100644 --- a/jscomp/stdlib/list.js +++ b/lib/js/list.js @@ -1,10 +1,10 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_obj = require("../runtime/caml_obj"); +var Caml_builtin_exceptions = require("./caml_builtin_exceptions"); +var Caml_obj = require("./caml_obj"); var Pervasives = require("./pervasives"); -var Curry = require("../runtime/curry"); +var Curry = require("./curry"); function length(l) { var _len = 0; diff --git a/jscomp/stdlib/listLabels.js b/lib/js/listLabels.js similarity index 100% rename from jscomp/stdlib/listLabels.js rename to lib/js/listLabels.js diff --git a/jscomp/stdlib/map.js b/lib/js/map.js similarity index 99% rename from jscomp/stdlib/map.js rename to lib/js/map.js index 71c54c506b..f34d2206b8 100644 --- a/jscomp/stdlib/map.js +++ b/lib/js/map.js @@ -1,8 +1,8 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Curry = require("../runtime/curry"); +var Caml_builtin_exceptions = require("./caml_builtin_exceptions"); +var Curry = require("./curry"); function Make(funarg) { var height = function (param) { diff --git a/jscomp/stdlib/marshal.js b/lib/js/marshal.js similarity index 94% rename from jscomp/stdlib/marshal.js rename to lib/js/marshal.js index ce003321ab..ee0ae0d22a 100644 --- a/jscomp/stdlib/marshal.js +++ b/lib/js/marshal.js @@ -1,8 +1,8 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_string = require("../runtime/caml_string"); +var Caml_builtin_exceptions = require("./caml_builtin_exceptions"); +var Caml_string = require("./caml_string"); function to_buffer(buff, ofs, len, _, _$1) { if (ofs < 0 || len < 0 || ofs > (buff.length - len | 0)) { diff --git a/jscomp/stdlib/moreLabels.js b/lib/js/moreLabels.js similarity index 100% rename from jscomp/stdlib/moreLabels.js rename to lib/js/moreLabels.js diff --git a/jscomp/stdlib/nativeint.js b/lib/js/nativeint.js similarity index 90% rename from jscomp/stdlib/nativeint.js rename to lib/js/nativeint.js index 083a5101c9..284e75626b 100644 --- a/jscomp/stdlib/nativeint.js +++ b/lib/js/nativeint.js @@ -1,8 +1,8 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../runtime/caml_obj"); -var Caml_format = require("../runtime/caml_format"); +var Caml_obj = require("./caml_obj"); +var Caml_format = require("./caml_format"); var Sys = require("./sys"); function succ(n) { diff --git a/jscomp/stdlib/obj.js b/lib/js/obj.js similarity index 98% rename from jscomp/stdlib/obj.js rename to lib/js/obj.js index 34578d01fa..5586aa5139 100644 --- a/jscomp/stdlib/obj.js +++ b/lib/js/obj.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); +var Caml_builtin_exceptions = require("./caml_builtin_exceptions"); var Marshal = require("./marshal"); function double_field(x, i) { diff --git a/jscomp/stdlib/oo.js b/lib/js/oo.js similarity index 100% rename from jscomp/stdlib/oo.js rename to lib/js/oo.js diff --git a/jscomp/stdlib/parsing.js b/lib/js/parsing.js similarity index 96% rename from jscomp/stdlib/parsing.js rename to lib/js/parsing.js index 77a8451cbc..c110c6219b 100644 --- a/jscomp/stdlib/parsing.js +++ b/lib/js/parsing.js @@ -1,12 +1,12 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../runtime/caml_obj"); -var Caml_parser = require("../runtime/caml_parser"); -var Caml_exceptions = require("../runtime/caml_exceptions"); +var Caml_obj = require("./caml_obj"); +var Caml_parser = require("./caml_parser"); +var Caml_exceptions = require("./caml_exceptions"); var Lexing = require("./lexing"); -var Curry = require("../runtime/curry"); -var Caml_array = require("../runtime/caml_array"); +var Curry = require("./curry"); +var Caml_array = require("./caml_array"); var $$Array = require("./array"); var YYexit = Caml_exceptions.create("Parsing.YYexit"); diff --git a/jscomp/stdlib/pervasives.js b/lib/js/pervasives.js similarity index 97% rename from jscomp/stdlib/pervasives.js rename to lib/js/pervasives.js index 751eae1c10..cdb5902e22 100644 --- a/jscomp/stdlib/pervasives.js +++ b/lib/js/pervasives.js @@ -1,14 +1,14 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_obj = require("../runtime/caml_obj"); -var Caml_io = require("../runtime/caml_io"); -var Caml_exceptions = require("../runtime/caml_exceptions"); -var Caml_format = require("../runtime/caml_format"); -var Curry = require("../runtime/curry"); +var Caml_builtin_exceptions = require("./caml_builtin_exceptions"); +var Caml_obj = require("./caml_obj"); +var Caml_io = require("./caml_io"); +var Caml_exceptions = require("./caml_exceptions"); +var Caml_format = require("./caml_format"); +var Curry = require("./curry"); var CamlinternalFormatBasics = require("./camlinternalFormatBasics"); -var Caml_string = require("../runtime/caml_string"); +var Caml_string = require("./caml_string"); function failwith(s) { throw [ diff --git a/jscomp/stdlib/printexc.js b/lib/js/printexc.js similarity index 98% rename from jscomp/stdlib/printexc.js rename to lib/js/printexc.js index d865553c2a..e73c8bc5b6 100644 --- a/jscomp/stdlib/printexc.js +++ b/lib/js/printexc.js @@ -1,13 +1,13 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_io = require("../runtime/caml_io"); +var Caml_builtin_exceptions = require("./caml_builtin_exceptions"); +var Caml_io = require("./caml_io"); var Obj = require("./obj"); var Pervasives = require("./pervasives"); -var Caml_backtrace = require("../runtime/caml_backtrace"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); +var Caml_backtrace = require("./caml_backtrace"); +var Block = require("./block"); +var Curry = require("./curry"); var Printf = require("./printf"); var $$Array = require("./array"); var Buffer = require("./buffer"); diff --git a/jscomp/stdlib/printf.js b/lib/js/printf.js similarity index 97% rename from jscomp/stdlib/printf.js rename to lib/js/printf.js index 1b4616f205..887db3b4df 100644 --- a/jscomp/stdlib/printf.js +++ b/lib/js/printf.js @@ -2,7 +2,7 @@ 'use strict'; var Pervasives = require("./pervasives"); -var Curry = require("../runtime/curry"); +var Curry = require("./curry"); var Buffer = require("./buffer"); var CamlinternalFormat = require("./camlinternalFormat"); diff --git a/jscomp/stdlib/queue.js b/lib/js/queue.js similarity index 96% rename from jscomp/stdlib/queue.js rename to lib/js/queue.js index 72ab7b9bb1..15e2cc93a9 100644 --- a/jscomp/stdlib/queue.js +++ b/lib/js/queue.js @@ -1,9 +1,9 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../runtime/caml_obj"); -var Caml_exceptions = require("../runtime/caml_exceptions"); -var Curry = require("../runtime/curry"); +var Caml_obj = require("./caml_obj"); +var Caml_exceptions = require("./caml_exceptions"); +var Curry = require("./curry"); var Empty = Caml_exceptions.create("Queue.Empty"); diff --git a/jscomp/stdlib/random.js b/lib/js/random.js similarity index 95% rename from jscomp/stdlib/random.js rename to lib/js/random.js index 5f87338469..b2204eec4b 100644 --- a/jscomp/stdlib/random.js +++ b/lib/js/random.js @@ -1,16 +1,16 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_int64 = require("../runtime/caml_int64"); -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_sys = require("../runtime/caml_sys"); +var Caml_int64 = require("./caml_int64"); +var Caml_builtin_exceptions = require("./caml_builtin_exceptions"); +var Caml_sys = require("./caml_sys"); var Pervasives = require("./pervasives"); var Nativeint = require("./nativeint"); var Int32 = require("./int32"); var Digest = require("./digest"); -var Curry = require("../runtime/curry"); +var Curry = require("./curry"); var Int64 = require("./int64"); -var Caml_array = require("../runtime/caml_array"); +var Caml_array = require("./caml_array"); var $$Array = require("./array"); function new_state() { diff --git a/jscomp/stdlib/scanf.js b/lib/js/scanf.js similarity index 99% rename from jscomp/stdlib/scanf.js rename to lib/js/scanf.js index f0610d63be..1e8f8467d2 100644 --- a/jscomp/stdlib/scanf.js +++ b/lib/js/scanf.js @@ -1,19 +1,19 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); +var Caml_builtin_exceptions = require("./caml_builtin_exceptions"); var Bytes = require("./bytes"); var Pervasives = require("./pervasives"); -var Caml_exceptions = require("../runtime/caml_exceptions"); -var Caml_format = require("../runtime/caml_format"); -var Caml_int32 = require("../runtime/caml_int32"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); +var Caml_exceptions = require("./caml_exceptions"); +var Caml_format = require("./caml_format"); +var Caml_int32 = require("./caml_int32"); +var Block = require("./block"); +var Curry = require("./curry"); var Printf = require("./printf"); var CamlinternalFormatBasics = require("./camlinternalFormatBasics"); var Buffer = require("./buffer"); var $$String = require("./string"); -var Caml_string = require("../runtime/caml_string"); +var Caml_string = require("./caml_string"); var List = require("./list"); var CamlinternalFormat = require("./camlinternalFormat"); diff --git a/jscomp/stdlib/set.js b/lib/js/set.js similarity index 99% rename from jscomp/stdlib/set.js rename to lib/js/set.js index 3b1b9318c6..1bc0806dda 100644 --- a/jscomp/stdlib/set.js +++ b/lib/js/set.js @@ -1,8 +1,8 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Curry = require("../runtime/curry"); +var Caml_builtin_exceptions = require("./caml_builtin_exceptions"); +var Curry = require("./curry"); var List = require("./list"); function Make(funarg) { diff --git a/jscomp/stdlib/sort.js b/lib/js/sort.js similarity index 96% rename from jscomp/stdlib/sort.js rename to lib/js/sort.js index 740be2f2d5..2f4652d334 100644 --- a/jscomp/stdlib/sort.js +++ b/lib/js/sort.js @@ -1,8 +1,8 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Curry = require("../runtime/curry"); +var Caml_builtin_exceptions = require("./caml_builtin_exceptions"); +var Curry = require("./curry"); function merge(order, l1, l2) { if (l1) { diff --git a/jscomp/stdlib/stack.js b/lib/js/stack.js similarity index 95% rename from jscomp/stdlib/stack.js rename to lib/js/stack.js index 2fa612ad2c..ae9b85629c 100644 --- a/jscomp/stdlib/stack.js +++ b/lib/js/stack.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_exceptions = require("../runtime/caml_exceptions"); +var Caml_exceptions = require("./caml_exceptions"); var List = require("./list"); var Empty = Caml_exceptions.create("Stack.Empty"); diff --git a/jscomp/stdlib/stdLabels.js b/lib/js/stdLabels.js similarity index 100% rename from jscomp/stdlib/stdLabels.js rename to lib/js/stdLabels.js diff --git a/jscomp/stdlib/std_exit.js b/lib/js/std_exit.js similarity index 100% rename from jscomp/stdlib/std_exit.js rename to lib/js/std_exit.js diff --git a/jscomp/stdlib/stream.js b/lib/js/stream.js similarity index 98% rename from jscomp/stdlib/stream.js rename to lib/js/stream.js index d761807b59..a2e8f5d3db 100644 --- a/jscomp/stdlib/stream.js +++ b/lib/js/stream.js @@ -1,12 +1,12 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); +var Caml_builtin_exceptions = require("./caml_builtin_exceptions"); var CamlinternalLazy = require("./camlinternalLazy"); -var Caml_exceptions = require("../runtime/caml_exceptions"); +var Caml_exceptions = require("./caml_exceptions"); var Pervasives = require("./pervasives"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); +var Block = require("./block"); +var Curry = require("./curry"); var List = require("./list"); var Failure = Caml_exceptions.create("Stream.Failure"); diff --git a/jscomp/stdlib/string.js b/lib/js/string.js similarity index 98% rename from jscomp/stdlib/string.js rename to lib/js/string.js index fd889b8a89..3f292db8b9 100644 --- a/jscomp/stdlib/string.js +++ b/lib/js/string.js @@ -2,8 +2,8 @@ 'use strict'; var Bytes = require("./bytes"); -var Caml_int32 = require("../runtime/caml_int32"); -var Caml_string = require("../runtime/caml_string"); +var Caml_int32 = require("./caml_int32"); +var Caml_string = require("./caml_string"); var List = require("./list"); function make(n, c) { diff --git a/jscomp/stdlib/stringLabels.js b/lib/js/stringLabels.js similarity index 100% rename from jscomp/stdlib/stringLabels.js rename to lib/js/stringLabels.js diff --git a/jscomp/stdlib/sys.js b/lib/js/sys.js similarity index 97% rename from jscomp/stdlib/sys.js rename to lib/js/sys.js index ac058f37b2..d6e5321451 100644 --- a/jscomp/stdlib/sys.js +++ b/lib/js/sys.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_exceptions = require("../runtime/caml_exceptions"); +var Caml_exceptions = require("./caml_exceptions"); var is_js = /* true */1; diff --git a/jscomp/test/a.js b/lib/js/test/a.js similarity index 100% rename from jscomp/test/a.js rename to lib/js/test/a.js diff --git a/lib/js/test/a_filename_test.js b/lib/js/test/a_filename_test.js new file mode 100644 index 0000000000..9cc8388683 --- /dev/null +++ b/lib/js/test/a_filename_test.js @@ -0,0 +1,100 @@ +// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE +'use strict'; + +var Mt = require("./mt"); +var Block = require("../block"); +var Ext_filename = require("./ext_filename"); + +var suites = [/* [] */0]; + +var test_id = [0]; + +function eq(loc, x, y) { + test_id[0] = test_id[0] + 1 | 0; + suites[0] = /* :: */[ + /* tuple */[ + loc + (" id " + test_id[0]), + function () { + return /* Eq */Block.__(0, [ + x, + y + ]); + } + ], + suites[0] + ]; + return /* () */0; +} + +eq('File "a_filename_test.ml", line 10, characters 5-12', /* tuple */[ + Ext_filename.combine("/tmp", "subdir/file.txt"), + Ext_filename.combine("/tmp", "/a/tmp.txt"), + Ext_filename.combine("/a/tmp.txt", "subdir/file.txt") + ], /* tuple */[ + "/tmp/subdir/file.txt", + "/a/tmp.txt", + "/a/tmp.txt/subdir/file.txt" + ]); + +eq('File "a_filename_test.ml", line 22, characters 5-12', Ext_filename.node_relative_path(/* `File */[ + 781515420, + "./a/b.c" + ], /* `File */[ + 781515420, + "./a/u/g.c" + ]), "./u/g"); + +eq('File "a_filename_test.ml", line 27, characters 5-12', Ext_filename.node_relative_path(/* `File */[ + 781515420, + "./a/b.c" + ], /* `File */[ + 781515420, + "xxxghsoghos/ghsoghso/node_modules/buckle-stdlib/list.js" + ]), "buckle-stdlib/list.js"); + +eq('File "a_filename_test.ml", line 33, characters 5-12', Ext_filename.node_relative_path(/* `File */[ + 781515420, + "./a/b.c" + ], /* `File */[ + 781515420, + "xxxghsoghos/ghsoghso/node_modules//buckle-stdlib/list.js" + ]), "buckle-stdlib/list.js"); + +eq('File "a_filename_test.ml", line 39, characters 5-12', Ext_filename.node_relative_path(/* `File */[ + 781515420, + "./a/b.c" + ], /* `File */[ + 781515420, + "xxxghsoghos/ghsoghso/node_modules/./buckle-stdlib/list.js" + ]), "buckle-stdlib/list.js"); + +eq('File "a_filename_test.ml", line 45, characters 5-12', Ext_filename.node_relative_path(/* `File */[ + 781515420, + "./a/c.js" + ], /* `File */[ + 781515420, + "./a/b" + ]), "./b"); + +eq('File "a_filename_test.ml", line 50, characters 5-12', Ext_filename.node_relative_path(/* `File */[ + 781515420, + "./a/c" + ], /* `File */[ + 781515420, + "./a/b.js" + ]), "./b"); + +eq('File "a_filename_test.ml", line 55, characters 5-12', Ext_filename.node_relative_path(/* `Dir */[ + 3405101, + "./a/" + ], /* `File */[ + 781515420, + "./a/b.js" + ]), "./b"); + +Mt.from_pair_suites("a_filename_test.ml", suites[0]); + +exports.suites = suites; +exports.test_id = test_id; +exports.eq = eq; +/* Not a pure module */ diff --git a/jscomp/test/a_list_test.js b/lib/js/test/a_list_test.js similarity index 98% rename from jscomp/test/a_list_test.js rename to lib/js/test/a_list_test.js index d06b84b9df..ec38df5bae 100644 --- a/jscomp/test/a_list_test.js +++ b/lib/js/test/a_list_test.js @@ -2,7 +2,7 @@ 'use strict'; var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); var Ext_list = require("./ext_list"); var suites_000 = /* tuple */[ diff --git a/jscomp/test/a_recursive_type.js b/lib/js/test/a_recursive_type.js similarity index 88% rename from jscomp/test/a_recursive_type.js rename to lib/js/test/a_recursive_type.js index 37b0e1a7ee..7e75eb0936 100644 --- a/jscomp/test/a_recursive_type.js +++ b/lib/js/test/a_recursive_type.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../runtime/curry"); +var Curry = require("../curry"); function g(x) { return Curry._1(x[0], x); diff --git a/jscomp/test/a_scope_bug.js b/lib/js/test/a_scope_bug.js similarity index 87% rename from jscomp/test/a_scope_bug.js rename to lib/js/test/a_scope_bug.js index 5436a084e1..824e4fdaee 100644 --- a/jscomp/test/a_scope_bug.js +++ b/lib/js/test/a_scope_bug.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_int32 = require("../runtime/caml_int32"); +var Caml_int32 = require("../caml_int32"); function odd(_z) { while(true) { diff --git a/jscomp/test/a_string_test.js b/lib/js/test/a_string_test.js similarity index 97% rename from jscomp/test/a_string_test.js rename to lib/js/test/a_string_test.js index de132e9f84..e261f18429 100644 --- a/jscomp/test/a_string_test.js +++ b/lib/js/test/a_string_test.js @@ -2,9 +2,9 @@ 'use strict'; var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); var Ext_string = require("./ext_string"); -var List = require("../stdlib/list"); +var List = require("../list"); var suites_000 = /* tuple */[ "split", diff --git a/jscomp/test/abstract_type.js b/lib/js/test/abstract_type.js similarity index 100% rename from jscomp/test/abstract_type.js rename to lib/js/test/abstract_type.js diff --git a/jscomp/test/and_or_tailcall_test.js b/lib/js/test/and_or_tailcall_test.js similarity index 96% rename from jscomp/test/and_or_tailcall_test.js rename to lib/js/test/and_or_tailcall_test.js index e1cf659051..17eb9e0749 100644 --- a/jscomp/test/and_or_tailcall_test.js +++ b/lib/js/test/and_or_tailcall_test.js @@ -2,7 +2,7 @@ 'use strict'; var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); function f(b, _, _n) { while(true) { diff --git a/jscomp/test/ari_regress_test.js b/lib/js/test/ari_regress_test.js similarity index 94% rename from jscomp/test/ari_regress_test.js rename to lib/js/test/ari_regress_test.js index da150a4136..04a17d718a 100644 --- a/jscomp/test/ari_regress_test.js +++ b/lib/js/test/ari_regress_test.js @@ -2,8 +2,8 @@ 'use strict'; var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); +var Block = require("../block"); +var Curry = require("../curry"); var g = 7; diff --git a/jscomp/test/arith_lexer.js b/lib/js/test/arith_lexer.js similarity index 96% rename from jscomp/test/arith_lexer.js rename to lib/js/test/arith_lexer.js index 5179e00fc6..34cc8eb1bf 100644 --- a/jscomp/test/arith_lexer.js +++ b/lib/js/test/arith_lexer.js @@ -1,11 +1,11 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Pervasives = require("../stdlib/pervasives"); -var Caml_format = require("../runtime/caml_format"); -var Lexing = require("../stdlib/lexing"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); +var Pervasives = require("../pervasives"); +var Caml_format = require("../caml_format"); +var Lexing = require("../lexing"); +var Block = require("../block"); +var Curry = require("../curry"); var __ocaml_lex_tables = /* record */[ /* lex_base */"\0\0\xf6\xff\xf7\xff\xf8\xff\xf9\xff\xfa\xff\xfb\xff\xfc\xff:\0\x85\0\xff\xff", diff --git a/jscomp/test/arith_parser.js b/lib/js/test/arith_parser.js similarity index 97% rename from jscomp/test/arith_parser.js rename to lib/js/test/arith_parser.js index a65b0605fd..cae025a3da 100644 --- a/jscomp/test/arith_parser.js +++ b/lib/js/test/arith_parser.js @@ -1,9 +1,9 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Block = require("../runtime/block"); -var Parsing = require("../stdlib/parsing"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Block = require("../block"); +var Parsing = require("../parsing"); var yytransl_const = /* array */[ 259, diff --git a/jscomp/test/arith_syntax.js b/lib/js/test/arith_syntax.js similarity index 91% rename from jscomp/test/arith_syntax.js rename to lib/js/test/arith_syntax.js index 0efa47226f..1f86261db6 100644 --- a/jscomp/test/arith_syntax.js +++ b/lib/js/test/arith_syntax.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Pervasives = require("../stdlib/pervasives"); +var Pervasives = require("../pervasives"); function str(e) { switch (e.tag | 0) { diff --git a/jscomp/test/array_test.js b/lib/js/test/array_test.js similarity index 96% rename from jscomp/test/array_test.js rename to lib/js/test/array_test.js index cc535d68e8..c7f2224a24 100644 --- a/jscomp/test/array_test.js +++ b/lib/js/test/array_test.js @@ -1,12 +1,12 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../runtime/caml_obj"); +var Caml_obj = require("../caml_obj"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Caml_array = require("../runtime/caml_array"); -var $$Array = require("../stdlib/array"); -var List = require("../stdlib/list"); +var Block = require("../block"); +var Caml_array = require("../caml_array"); +var $$Array = require("../array"); +var List = require("../list"); function is_sorted(x) { var len = x.length; diff --git a/jscomp/test/b.js b/lib/js/test/b.js similarity index 100% rename from jscomp/test/b.js rename to lib/js/test/b.js diff --git a/jscomp/test/basic_module_test.js b/lib/js/test/basic_module_test.js similarity index 94% rename from jscomp/test/basic_module_test.js rename to lib/js/test/basic_module_test.js index 52a69488bd..d982bd0ccd 100644 --- a/jscomp/test/basic_module_test.js +++ b/lib/js/test/basic_module_test.js @@ -4,7 +4,7 @@ var Mt = require("./mt"); var Offset = require("./offset"); var Mt_global = require("./mt_global"); -var Curry = require("../runtime/curry"); +var Curry = require("../curry"); var count = [0]; diff --git a/jscomp/test/bdd.js b/lib/js/test/bdd.js similarity index 97% rename from jscomp/test/bdd.js rename to lib/js/test/bdd.js index 9dc0832df3..dbf5c0116f 100644 --- a/jscomp/test/bdd.js +++ b/lib/js/test/bdd.js @@ -1,9 +1,9 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_int32 = require("../runtime/caml_int32"); -var Caml_array = require("../runtime/caml_array"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Caml_int32 = require("../caml_int32"); +var Caml_array = require("../caml_array"); function $$eval(_bdd, vars) { while(true) { diff --git a/jscomp/test/bigarray_test.js b/lib/js/test/bigarray_test.js similarity index 93% rename from jscomp/test/bigarray_test.js rename to lib/js/test/bigarray_test.js index 870f1276e4..52c85b57f0 100644 --- a/jscomp/test/bigarray_test.js +++ b/lib/js/test/bigarray_test.js @@ -1,8 +1,8 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_int32 = require("../runtime/caml_int32"); -var Bigarray = require("../stdlib/bigarray"); +var Caml_int32 = require("../caml_int32"); +var Bigarray = require("../bigarray"); function sum() { var result = 0; diff --git a/jscomp/test/boolean_test.js b/lib/js/test/boolean_test.js similarity index 100% rename from jscomp/test/boolean_test.js rename to lib/js/test/boolean_test.js diff --git a/jscomp/test/buffer_test.js b/lib/js/test/buffer_test.js similarity index 91% rename from jscomp/test/buffer_test.js rename to lib/js/test/buffer_test.js index 4c568fed0a..0f33ea0c8a 100644 --- a/jscomp/test/buffer_test.js +++ b/lib/js/test/buffer_test.js @@ -1,10 +1,10 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Bytes = require("../stdlib/bytes"); +var Bytes = require("../bytes"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Buffer = require("../stdlib/buffer"); +var Block = require("../block"); +var Buffer = require("../buffer"); var v = "gso"; diff --git a/jscomp/test/caml_compare_test.js b/lib/js/test/caml_compare_test.js similarity index 98% rename from jscomp/test/caml_compare_test.js rename to lib/js/test/caml_compare_test.js index 7a773d7dc9..5993e55da4 100644 --- a/jscomp/test/caml_compare_test.js +++ b/lib/js/test/caml_compare_test.js @@ -1,9 +1,9 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../runtime/caml_obj"); +var Caml_obj = require("../caml_obj"); var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); var suites_000 = /* tuple */[ "option", diff --git a/jscomp/test/caml_format_test.js b/lib/js/test/caml_format_test.js similarity index 99% rename from jscomp/test/caml_format_test.js rename to lib/js/test/caml_format_test.js index b0b10f93ce..aabc74072f 100644 --- a/jscomp/test/caml_format_test.js +++ b/lib/js/test/caml_format_test.js @@ -1,19 +1,19 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_int64 = require("../runtime/caml_int64"); -var Caml_obj = require("../runtime/caml_obj"); -var Caml_float = require("../runtime/caml_float"); -var Pervasives = require("../stdlib/pervasives"); -var Caml_format = require("../runtime/caml_format"); +var Caml_int64 = require("../caml_int64"); +var Caml_obj = require("../caml_obj"); +var Caml_float = require("../caml_float"); +var Pervasives = require("../pervasives"); +var Caml_format = require("../caml_format"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); -var Printf = require("../stdlib/printf"); -var Int64 = require("../stdlib/int64"); -var $$Array = require("../stdlib/array"); -var Buffer = require("../stdlib/buffer"); -var Format = require("../stdlib/format"); +var Block = require("../block"); +var Curry = require("../curry"); +var Printf = require("../printf"); +var Int64 = require("../int64"); +var $$Array = require("../array"); +var Buffer = require("../buffer"); +var Format = require("../format"); var of_string = Caml_obj.caml_obj_dup(/* array */[ /* tuple */[ diff --git a/jscomp/test/class3_test.js b/lib/js/test/class3_test.js similarity index 97% rename from jscomp/test/class3_test.js rename to lib/js/test/class3_test.js index c41a28fd37..da96226574 100644 --- a/jscomp/test/class3_test.js +++ b/lib/js/test/class3_test.js @@ -1,14 +1,14 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../runtime/caml_obj"); -var Pervasives = require("../stdlib/pervasives"); +var Caml_obj = require("../caml_obj"); +var Pervasives = require("../pervasives"); var Mt = require("./mt"); -var Caml_int32 = require("../runtime/caml_int32"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); -var CamlinternalOO = require("../stdlib/camlinternalOO"); -var List = require("../stdlib/list"); +var Caml_int32 = require("../caml_int32"); +var Block = require("../block"); +var Curry = require("../curry"); +var CamlinternalOO = require("../camlinternalOO"); +var List = require("../list"); var shared = [ "bump", diff --git a/jscomp/test/class4_test.js b/lib/js/test/class4_test.js similarity index 96% rename from jscomp/test/class4_test.js rename to lib/js/test/class4_test.js index 9f8a044af8..f55a5e5b8e 100644 --- a/jscomp/test/class4_test.js +++ b/lib/js/test/class4_test.js @@ -1,11 +1,11 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../runtime/caml_obj"); +var Caml_obj = require("../caml_obj"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); -var CamlinternalOO = require("../stdlib/camlinternalOO"); +var Block = require("../block"); +var Curry = require("../curry"); +var CamlinternalOO = require("../camlinternalOO"); var shared = [ "move", diff --git a/jscomp/test/class5_test.js b/lib/js/test/class5_test.js similarity index 97% rename from jscomp/test/class5_test.js rename to lib/js/test/class5_test.js index 19bb9b45bf..021b160138 100644 --- a/jscomp/test/class5_test.js +++ b/lib/js/test/class5_test.js @@ -1,12 +1,12 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Pervasives = require("../stdlib/pervasives"); +var Pervasives = require("../pervasives"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); -var CamlinternalOO = require("../stdlib/camlinternalOO"); -var List = require("../stdlib/list"); +var Block = require("../block"); +var Curry = require("../curry"); +var CamlinternalOO = require("../camlinternalOO"); +var List = require("../list"); var shared = [ "move", diff --git a/jscomp/test/class6_test.js b/lib/js/test/class6_test.js similarity index 94% rename from jscomp/test/class6_test.js rename to lib/js/test/class6_test.js index 2a9082bfd3..e9afaff596 100644 --- a/jscomp/test/class6_test.js +++ b/lib/js/test/class6_test.js @@ -1,13 +1,13 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../runtime/caml_obj"); -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_exceptions = require("../runtime/caml_exceptions"); +var Caml_obj = require("../caml_obj"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Caml_exceptions = require("../caml_exceptions"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); -var CamlinternalOO = require("../stdlib/camlinternalOO"); +var Block = require("../block"); +var Curry = require("../curry"); +var CamlinternalOO = require("../camlinternalOO"); var shared = [ "move", diff --git a/jscomp/test/class7_test.js b/lib/js/test/class7_test.js similarity index 96% rename from jscomp/test/class7_test.js rename to lib/js/test/class7_test.js index 84c2b0f7ee..cda260d967 100644 --- a/jscomp/test/class7_test.js +++ b/lib/js/test/class7_test.js @@ -1,13 +1,13 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../runtime/caml_obj"); -var Caml_exceptions = require("../runtime/caml_exceptions"); +var Caml_obj = require("../caml_obj"); +var Caml_exceptions = require("../caml_exceptions"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); -var CamlinternalOO = require("../stdlib/camlinternalOO"); -var Oo = require("../stdlib/oo"); +var Block = require("../block"); +var Curry = require("../curry"); +var CamlinternalOO = require("../camlinternalOO"); +var Oo = require("../oo"); var shared = ["copy"]; diff --git a/jscomp/test/class8_test.js b/lib/js/test/class8_test.js similarity index 92% rename from jscomp/test/class8_test.js rename to lib/js/test/class8_test.js index 1902a8e483..f8273caf04 100644 --- a/jscomp/test/class8_test.js +++ b/lib/js/test/class8_test.js @@ -1,12 +1,12 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../runtime/caml_obj"); -var Caml_exceptions = require("../runtime/caml_exceptions"); +var Caml_obj = require("../caml_obj"); +var Caml_exceptions = require("../caml_exceptions"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); -var CamlinternalOO = require("../stdlib/camlinternalOO"); +var Block = require("../block"); +var Curry = require("../curry"); +var CamlinternalOO = require("../camlinternalOO"); var shared = [ "leq", diff --git a/jscomp/test/class_repr.js b/lib/js/test/class_repr.js similarity index 75% rename from jscomp/test/class_repr.js rename to lib/js/test/class_repr.js index d7876cc2ee..af6e425aca 100644 --- a/jscomp/test/class_repr.js +++ b/lib/js/test/class_repr.js @@ -1,9 +1,9 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../runtime/curry"); -var CamlinternalOO = require("../stdlib/camlinternalOO"); -var Oo = require("../stdlib/oo"); +var Curry = require("../curry"); +var CamlinternalOO = require("../camlinternalOO"); +var Oo = require("../oo"); function x_init($$class) { var x = CamlinternalOO.new_variable($$class, "x"); diff --git a/jscomp/test/class_test.js b/lib/js/test/class_test.js similarity index 95% rename from jscomp/test/class_test.js rename to lib/js/test/class_test.js index a8aa86c4b2..fac1c54d40 100644 --- a/jscomp/test/class_test.js +++ b/lib/js/test/class_test.js @@ -2,9 +2,9 @@ 'use strict'; var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); -var CamlinternalOO = require("../stdlib/camlinternalOO"); +var Block = require("../block"); +var Curry = require("../curry"); +var CamlinternalOO = require("../camlinternalOO"); var shared = [ "move", diff --git a/jscomp/test/class_type_ffi_test.js b/lib/js/test/class_type_ffi_test.js similarity index 94% rename from jscomp/test/class_type_ffi_test.js rename to lib/js/test/class_type_ffi_test.js index 5ff992e93e..a0ccaae767 100644 --- a/jscomp/test/class_type_ffi_test.js +++ b/lib/js/test/class_type_ffi_test.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../runtime/curry"); +var Curry = require("../curry"); function sum_float_array(arr) { var v = 0; diff --git a/jscomp/test/complex_if_test.js b/lib/js/test/complex_if_test.js similarity index 97% rename from jscomp/test/complex_if_test.js rename to lib/js/test/complex_if_test.js index 104da44fd9..3492fb4f47 100644 --- a/jscomp/test/complex_if_test.js +++ b/lib/js/test/complex_if_test.js @@ -1,10 +1,10 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Bytes = require("../stdlib/bytes"); +var Bytes = require("../bytes"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Caml_string = require("../runtime/caml_string"); +var Block = require("../block"); +var Caml_string = require("../caml_string"); function fib(n) { if (n !== 1 && n !== 23) { diff --git a/jscomp/test/complex_test.js b/lib/js/test/complex_test.js similarity index 86% rename from jscomp/test/complex_test.js rename to lib/js/test/complex_test.js index 137c4970c9..02efb5414b 100644 --- a/jscomp/test/complex_test.js +++ b/lib/js/test/complex_test.js @@ -1,9 +1,9 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Complex = require("../stdlib/complex"); +var Complex = require("../complex"); var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); var suites_000 = /* tuple */[ "basic_add", diff --git a/jscomp/test/complex_while_loop.js b/lib/js/test/complex_while_loop.js similarity index 100% rename from jscomp/test/complex_while_loop.js rename to lib/js/test/complex_while_loop.js diff --git a/jscomp/test/const_block_test.js b/lib/js/test/const_block_test.js similarity index 96% rename from jscomp/test/const_block_test.js rename to lib/js/test/const_block_test.js index 27e98fc5a0..67ce8c7acd 100644 --- a/jscomp/test/const_block_test.js +++ b/lib/js/test/const_block_test.js @@ -2,7 +2,7 @@ 'use strict'; var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); var a = /* float array */[ 0, diff --git a/jscomp/test/const_defs.js b/lib/js/test/const_defs.js similarity index 100% rename from jscomp/test/const_defs.js rename to lib/js/test/const_defs.js diff --git a/jscomp/test/const_defs_test.js b/lib/js/test/const_defs_test.js similarity index 76% rename from jscomp/test/const_defs_test.js rename to lib/js/test/const_defs_test.js index 65970c4151..f0234fc490 100644 --- a/jscomp/test/const_defs_test.js +++ b/lib/js/test/const_defs_test.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); var u = 3; diff --git a/jscomp/test/const_test.js b/lib/js/test/const_test.js similarity index 94% rename from jscomp/test/const_test.js rename to lib/js/test/const_test.js index 3eac1c0d3c..42846dc2c2 100644 --- a/jscomp/test/const_test.js +++ b/lib/js/test/const_test.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Block = require("../runtime/block"); +var Block = require("../block"); function f(x) { return x; diff --git a/jscomp/test/cont_int_fold_test.js b/lib/js/test/cont_int_fold_test.js similarity index 100% rename from jscomp/test/cont_int_fold_test.js rename to lib/js/test/cont_int_fold_test.js diff --git a/jscomp/test/cps_test.js b/lib/js/test/cps_test.js similarity index 92% rename from jscomp/test/cps_test.js rename to lib/js/test/cps_test.js index 066c05f91a..a951017824 100644 --- a/jscomp/test/cps_test.js +++ b/lib/js/test/cps_test.js @@ -2,10 +2,10 @@ 'use strict'; var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); -var Caml_array = require("../runtime/caml_array"); -var $$Array = require("../stdlib/array"); +var Block = require("../block"); +var Curry = require("../curry"); +var Caml_array = require("../caml_array"); +var $$Array = require("../array"); function test() { var v = [0]; diff --git a/jscomp/test/cross_module_inline_test.js b/lib/js/test/cross_module_inline_test.js similarity index 77% rename from jscomp/test/cross_module_inline_test.js rename to lib/js/test/cross_module_inline_test.js index d0388987df..86032fa894 100644 --- a/jscomp/test/cross_module_inline_test.js +++ b/lib/js/test/cross_module_inline_test.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_string = require("../runtime/caml_string"); +var Caml_string = require("../caml_string"); var v = Caml_string.caml_is_printable(/* "a" */97); diff --git a/jscomp/test/debug_keep_test.js b/lib/js/test/debug_keep_test.js similarity index 100% rename from jscomp/test/debug_keep_test.js rename to lib/js/test/debug_keep_test.js diff --git a/jscomp/test/debugger_test.js b/lib/js/test/debugger_test.js similarity index 100% rename from jscomp/test/debugger_test.js rename to lib/js/test/debugger_test.js diff --git a/jscomp/test/demo.js b/lib/js/test/demo.js similarity index 98% rename from jscomp/test/demo.js rename to lib/js/test/demo.js index a8c1e0dc72..da2c6c9eb2 100644 --- a/jscomp/test/demo.js +++ b/lib/js/test/demo.js @@ -2,7 +2,7 @@ 'use strict'; var Runtime = require("@runtime"); -var Curry = require("../runtime/curry"); +var Curry = require("../curry"); var UI = require("@ui"); var BUI = require("@blp/ui"); diff --git a/jscomp/test/demo_int_map.js b/lib/js/test/demo_int_map.js similarity index 97% rename from jscomp/test/demo_int_map.js rename to lib/js/test/demo_int_map.js index 1ee41b74cf..44f9ae55cf 100644 --- a/jscomp/test/demo_int_map.js +++ b/lib/js/test/demo_int_map.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); function height(param) { if (param) { diff --git a/jscomp/test/demo_page.js b/lib/js/test/demo_page.js similarity index 96% rename from jscomp/test/demo_page.js rename to lib/js/test/demo_page.js index 566928e1f1..f3892e4aa2 100644 --- a/jscomp/test/demo_page.js +++ b/lib/js/test/demo_page.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../runtime/curry"); +var Curry = require("../curry"); var React = require("react"); var ReactDom = require("react-dom"); diff --git a/jscomp/test/digest_test.js b/lib/js/test/digest_test.js similarity index 96% rename from jscomp/test/digest_test.js rename to lib/js/test/digest_test.js index c64ef595ec..0ba7f96914 100644 --- a/jscomp/test/digest_test.js +++ b/lib/js/test/digest_test.js @@ -1,15 +1,15 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Bytes = require("../stdlib/bytes"); -var Pervasives = require("../stdlib/pervasives"); +var Bytes = require("../bytes"); +var Pervasives = require("../pervasives"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Digest = require("../stdlib/digest"); -var Curry = require("../runtime/curry"); -var Printf = require("../stdlib/printf"); -var $$Array = require("../stdlib/array"); -var Caml_string = require("../runtime/caml_string"); +var Block = require("../block"); +var Digest = require("../digest"); +var Curry = require("../curry"); +var Printf = require("../printf"); +var $$Array = require("../array"); +var Caml_string = require("../caml_string"); var Ext_array = require("./ext_array"); function f(x) { diff --git a/jscomp/test/empty_obj.js b/lib/js/test/empty_obj.js similarity index 82% rename from jscomp/test/empty_obj.js rename to lib/js/test/empty_obj.js index fca406e8f5..c085936872 100644 --- a/jscomp/test/empty_obj.js +++ b/lib/js/test/empty_obj.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var CamlinternalOO = require("../stdlib/camlinternalOO"); +var CamlinternalOO = require("../camlinternalOO"); var $$class = CamlinternalOO.create_table(0); diff --git a/jscomp/test/epsilon_test.js b/lib/js/test/epsilon_test.js similarity index 88% rename from jscomp/test/epsilon_test.js rename to lib/js/test/epsilon_test.js index d4cfe7b3a1..2dccc2cc50 100644 --- a/jscomp/test/epsilon_test.js +++ b/lib/js/test/epsilon_test.js @@ -1,9 +1,9 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Pervasives = require("../stdlib/pervasives"); +var Pervasives = require("../pervasives"); var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); var v = (Number.EPSILON?Number.EPSILON:2.220446049250313e-16); diff --git a/jscomp/test/equal_exception_test.js b/lib/js/test/equal_exception_test.js similarity index 92% rename from jscomp/test/equal_exception_test.js rename to lib/js/test/equal_exception_test.js index 690c3a9436..ef9ed87311 100644 --- a/jscomp/test/equal_exception_test.js +++ b/lib/js/test/equal_exception_test.js @@ -1,9 +1,9 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Bytes = require("../stdlib/bytes"); -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_exceptions = require("../runtime/caml_exceptions"); +var Bytes = require("../bytes"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Caml_exceptions = require("../caml_exceptions"); var Mt = require("./mt"); var v = "gso"; diff --git a/jscomp/test/equal_test.js b/lib/js/test/equal_test.js similarity index 100% rename from jscomp/test/equal_test.js rename to lib/js/test/equal_test.js diff --git a/jscomp/test/es6_module_test.js b/lib/js/test/es6_module_test.js similarity index 91% rename from jscomp/test/es6_module_test.js rename to lib/js/test/es6_module_test.js index e132104b38..0983aadab2 100644 --- a/jscomp/test/es6_module_test.js +++ b/lib/js/test/es6_module_test.js @@ -2,8 +2,8 @@ 'use strict'; var Mt = require("./mt"); -var Block = require("../runtime/block"); -var List = require("../stdlib/list"); +var Block = require("../block"); +var List = require("../list"); function length() { return 3; diff --git a/jscomp/test/event_ffi.js b/lib/js/test/event_ffi.js similarity index 95% rename from jscomp/test/event_ffi.js rename to lib/js/test/event_ffi.js index cd8a87b05a..44b26ed79c 100644 --- a/jscomp/test/event_ffi.js +++ b/lib/js/test/event_ffi.js @@ -1,8 +1,8 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_int32 = require("../runtime/caml_int32"); -var Curry = require("../runtime/curry"); +var Caml_int32 = require("../caml_int32"); +var Curry = require("../curry"); function h0(x) { return x(); diff --git a/jscomp/test/exception_raise_test.js b/lib/js/test/exception_raise_test.js similarity index 90% rename from jscomp/test/exception_raise_test.js rename to lib/js/test/exception_raise_test.js index 8b11d41690..435c441652 100644 --- a/jscomp/test/exception_raise_test.js +++ b/lib/js/test/exception_raise_test.js @@ -1,11 +1,11 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_exceptions = require("../runtime/caml_exceptions"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Caml_exceptions = require("../caml_exceptions"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); +var Block = require("../block"); +var Curry = require("../curry"); var Local = Caml_exceptions.create("Exception_raise_test.Local"); diff --git a/jscomp/test/exception_value_test.js b/lib/js/test/exception_value_test.js similarity index 87% rename from jscomp/test/exception_value_test.js rename to lib/js/test/exception_value_test.js index 51d686fb10..102d1900f0 100644 --- a/jscomp/test/exception_value_test.js +++ b/lib/js/test/exception_value_test.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); function f() { throw Caml_builtin_exceptions.not_found; diff --git a/jscomp/test/ext_array.js b/lib/js/test/ext_array.js similarity index 89% rename from jscomp/test/ext_array.js rename to lib/js/test/ext_array.js index 706b572f36..063d028e04 100644 --- a/jscomp/test/ext_array.js +++ b/lib/js/test/ext_array.js @@ -1,11 +1,11 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Curry = require("../runtime/curry"); -var Caml_array = require("../runtime/caml_array"); -var $$Array = require("../stdlib/array"); -var List = require("../stdlib/list"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Curry = require("../curry"); +var Caml_array = require("../caml_array"); +var $$Array = require("../array"); +var List = require("../list"); function reverse_in_place(a) { var a$1 = a; diff --git a/jscomp/test/ext_bytes.js b/lib/js/test/ext_bytes.js similarity index 96% rename from jscomp/test/ext_bytes.js rename to lib/js/test/ext_bytes.js index 1d36925c7d..c6542e7ef7 100644 --- a/jscomp/test/ext_bytes.js +++ b/lib/js/test/ext_bytes.js @@ -1,8 +1,8 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Bytes = require("../stdlib/bytes"); -var Caml_string = require("../runtime/caml_string"); +var Bytes = require("../bytes"); +var Caml_string = require("../caml_string"); function escaped(s) { var n = 0; diff --git a/lib/js/test/ext_filename.js b/lib/js/test/ext_filename.js new file mode 100644 index 0000000000..8f0f17bc5e --- /dev/null +++ b/lib/js/test/ext_filename.js @@ -0,0 +1,341 @@ +// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE +'use strict'; + +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Filename = require("../filename"); +var CamlinternalLazy = require("../camlinternalLazy"); +var Caml_sys = require("../caml_sys"); +var Pervasives = require("../pervasives"); +var Block = require("../block"); +var Ext_string = require("./ext_string"); +var Curry = require("../curry"); +var Ext_pervasives = require("./ext_pervasives"); +var $$String = require("../string"); +var Format = require("../format"); +var List = require("../list"); + +var node_sep = "/"; + +var node_parent = ".."; + +var node_current = "."; + +var cwd = Block.__(246, [function () { + return Caml_sys.caml_sys_getcwd(/* () */0); + }]); + +function combine(path1, path2) { + if (path1 === "") { + return path2; + } + else if (path2 === "") { + return path1; + } + else if (Curry._1(Filename.is_relative, path2)) { + return Filename.concat(path1, path2); + } + else { + return path2; + } +} + +function path_as_directory(x) { + if (x === "" || Ext_string.ends_with(x, Filename.dir_sep)) { + return x; + } + else { + return x + Filename.dir_sep; + } +} + +function absolute_path(s) { + var process = function (s) { + var s$1; + if (Curry._1(Filename.is_relative, s)) { + var tag = cwd.tag | 0; + s$1 = Filename.concat(tag === 250 ? cwd[0] : ( + tag === 246 ? CamlinternalLazy.force_lazy_block(cwd) : cwd + ), s); + } + else { + s$1 = s; + } + var aux = function (_s) { + while(true) { + var s = _s; + var match_000 = Curry._1(Filename.basename, s); + var match_001 = Curry._1(Filename.dirname, s); + var dir = match_001; + var base = match_000; + if (dir === s) { + return dir; + } + else if (base === Filename.current_dir_name) { + _s = dir; + continue ; + + } + else if (base === Filename.parent_dir_name) { + return Curry._1(Filename.dirname, aux(dir)); + } + else { + return Filename.concat(aux(dir), base); + } + }; + }; + return aux(s$1); + }; + if (s[0] >= 781515420) { + return /* `File */[ + 781515420, + process(s[1]) + ]; + } + else { + return /* `Dir */[ + 3405101, + process(s[1]) + ]; + } +} + +function chop_extension($staropt$star, name) { + var loc = $staropt$star ? $staropt$star[0] : ""; + try { + return Filename.chop_extension(name); + } + catch (exn){ + if (exn[0] === Caml_builtin_exceptions.invalid_argument) { + return Curry._2(Format.ksprintf(Pervasives.invalid_arg, /* Format */[ + /* String_literal */Block.__(11, [ + "Filename.chop_extension ( ", + /* String */Block.__(2, [ + /* No_padding */0, + /* String_literal */Block.__(11, [ + " : ", + /* String */Block.__(2, [ + /* No_padding */0, + /* String_literal */Block.__(11, [ + " )", + /* End_of_format */0 + ]) + ]) + ]) + ]) + ]), + "Filename.chop_extension ( %s : %s )" + ]), loc, name); + } + else { + throw exn; + } + } +} + +function try_chop_extension(s) { + try { + return Filename.chop_extension(s); + } + catch (exn){ + return s; + } +} + +function relative_path(file_or_dir_1, file_or_dir_2) { + var sep_char = Filename.dir_sep.charCodeAt(0); + var relevant_dir1 = file_or_dir_1[0] >= 781515420 ? Curry._1(Filename.dirname, file_or_dir_1[1]) : file_or_dir_1[1]; + var relevant_dir2 = file_or_dir_2[0] >= 781515420 ? Curry._1(Filename.dirname, file_or_dir_2[1]) : file_or_dir_2[1]; + var dir1 = Ext_string.split(/* None */0, relevant_dir1, sep_char); + var dir2 = Ext_string.split(/* None */0, relevant_dir2, sep_char); + var go = function (_dir1, _dir2) { + while(true) { + var dir2 = _dir2; + var dir1 = _dir1; + var exit = 0; + if (dir1) { + if (dir2) { + if (dir1[0] === dir2[0]) { + _dir2 = dir2[1]; + _dir1 = dir1[1]; + continue ; + + } + else { + exit = 1; + } + } + else { + exit = 1; + } + } + else { + exit = 1; + } + if (exit === 1) { + return Pervasives.$at(List.map(function () { + return node_parent; + }, dir2), dir1); + } + + }; + }; + var ys = go(dir1, dir2); + if (ys) { + if (ys[0] === node_parent) { + return $$String.concat(node_sep, ys); + } + else { + return $$String.concat(node_sep, /* :: */[ + node_current, + ys + ]); + } + } + else { + return $$String.concat(node_sep, /* :: */[ + node_current, + ys + ]); + } +} + +var node_modules = "node_modules"; + +var package_json = "package.json"; + +function node_relative_path(file1, dep_file) { + var file2 = dep_file[1]; + var v = Ext_string.find(/* None */0, node_modules, file2); + var len = file2.length; + if (v >= 0) { + var skip = function (_i) { + while(true) { + var i = _i; + if (i >= len) { + return Curry._1(Format.ksprintf(Pervasives.failwith, /* Format */[ + /* String_literal */Block.__(11, [ + "invalid path: ", + /* String */Block.__(2, [ + /* No_padding */0, + /* End_of_format */0 + ]) + ]), + "invalid path: %s" + ]), file2); + } + else { + var match = file2.charCodeAt(i); + if (match === 47 || match === 46) { + _i = i + 1 | 0; + continue ; + + } + else { + return i; + } + } + }; + }; + return Ext_string.tail_from(file2, skip(v + 12 | 0)); + } + else { + return relative_path(absolute_path(dep_file), absolute_path(file1)) + (node_sep + try_chop_extension(Curry._1(Filename.basename, file2))); + } +} + +function resolve(cwd, module_name) { + var origin = cwd; + var _cwd = cwd; + var module_name$1 = module_name; + while(true) { + var cwd$1 = _cwd; + var v = Filename.concat(Filename.concat(cwd$1, node_modules), module_name$1); + if (Caml_sys.caml_sys_is_directory(v)) { + return v; + } + else { + var cwd$prime = Curry._1(Filename.dirname, cwd$1); + if (cwd$prime.length < cwd$1.length) { + _cwd = cwd$prime; + continue ; + + } + else { + return Curry._2(Format.ksprintf(Pervasives.failwith, /* Format */[ + /* String */Block.__(2, [ + /* No_padding */0, + /* String_literal */Block.__(11, [ + " not found in ", + /* String */Block.__(2, [ + /* No_padding */0, + /* End_of_format */0 + ]) + ]) + ]), + "%s not found in %s" + ]), module_name$1, origin); + } + } + }; +} + +function resolve_package(cwd) { + var _cwd = cwd; + while(true) { + var cwd$1 = _cwd; + if (Caml_sys.caml_sys_file_exists(Filename.concat(cwd$1, package_json))) { + return cwd$1; + } + else { + var cwd$prime = Curry._1(Filename.dirname, cwd$1); + if (cwd$prime.length < cwd$1.length) { + _cwd = cwd$prime; + continue ; + + } + else { + return Curry._1(Format.ksprintf(Pervasives.failwith, /* Format */[ + /* String_literal */Block.__(11, [ + "package.json not found from ", + /* String */Block.__(2, [ + /* No_padding */0, + /* End_of_format */0 + ]) + ]), + "package.json not found from %s" + ]), cwd$1); + } + } + }; +} + +var package_dir = Block.__(246, [function () { + var tag = cwd.tag | 0; + return resolve_package(tag === 250 ? cwd[0] : ( + tag === 246 ? CamlinternalLazy.force_lazy_block(cwd) : cwd + )); + }]); + +var $slash$slash = Filename.concat; + +var node_modules_length = 12; + +exports.node_sep = node_sep; +exports.node_parent = node_parent; +exports.node_current = node_current; +exports.cwd = cwd; +exports.$slash$slash = $slash$slash; +exports.combine = combine; +exports.path_as_directory = path_as_directory; +exports.absolute_path = absolute_path; +exports.chop_extension = chop_extension; +exports.try_chop_extension = try_chop_extension; +exports.relative_path = relative_path; +exports.node_modules = node_modules; +exports.node_modules_length = node_modules_length; +exports.package_json = package_json; +exports.node_relative_path = node_relative_path; +exports.resolve = resolve; +exports.resolve_package = resolve_package; +exports.package_dir = package_dir; +/* Filename Not a pure module */ diff --git a/jscomp/test/ext_list.js b/lib/js/test/ext_list.js similarity index 98% rename from jscomp/test/ext_list.js rename to lib/js/test/ext_list.js index 890bf17de8..a94026902e 100644 --- a/jscomp/test/ext_list.js +++ b/lib/js/test/ext_list.js @@ -1,10 +1,10 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Curry = require("../runtime/curry"); -var $$Array = require("../stdlib/array"); -var List = require("../stdlib/list"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Curry = require("../curry"); +var $$Array = require("../array"); +var List = require("../list"); function filter_map(f, _xs) { while(true) { diff --git a/jscomp/test/ext_log.js b/lib/js/test/ext_log.js similarity index 97% rename from jscomp/test/ext_log.js rename to lib/js/test/ext_log.js index fb73238653..7417c752d8 100644 --- a/jscomp/test/ext_log.js +++ b/lib/js/test/ext_log.js @@ -1,11 +1,11 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Pervasives = require("../stdlib/pervasives"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); +var Pervasives = require("../pervasives"); +var Block = require("../block"); +var Curry = require("../curry"); var Lam_current_unit = require("./lam_current_unit"); -var Format = require("../stdlib/format"); +var Format = require("../format"); function err(str, f) { return Curry._1(Format.fprintf(Format.err_formatter, Pervasives.$caret$caret(/* Format */[ diff --git a/jscomp/test/ext_pervasives.js b/lib/js/test/ext_pervasives.js similarity index 83% rename from jscomp/test/ext_pervasives.js rename to lib/js/test/ext_pervasives.js index f8ba58910e..4c359e6bb4 100644 --- a/jscomp/test/ext_pervasives.js +++ b/lib/js/test/ext_pervasives.js @@ -1,10 +1,10 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Pervasives = require("../stdlib/pervasives"); -var Caml_exceptions = require("../runtime/caml_exceptions"); -var Curry = require("../runtime/curry"); -var Format = require("../stdlib/format"); +var Pervasives = require("../pervasives"); +var Caml_exceptions = require("../caml_exceptions"); +var Curry = require("../curry"); +var Format = require("../format"); function $$finally(v, f, action) { var exit = 0; @@ -78,9 +78,14 @@ function failwithf(fmt) { return Format.ksprintf(Pervasives.failwith, fmt); } +function invalid_argf(fmt) { + return Format.ksprintf(Pervasives.invalid_arg, fmt); +} + exports.$$finally = $$finally; exports.with_file_as_chan = with_file_as_chan; exports.with_file_as_pp = with_file_as_pp; exports.is_pos_pow = is_pos_pow; exports.failwithf = failwithf; +exports.invalid_argf = invalid_argf; /* Format Not a pure module */ diff --git a/jscomp/test/ext_string.js b/lib/js/test/ext_string.js similarity index 94% rename from jscomp/test/ext_string.js rename to lib/js/test/ext_string.js index 251f8d7643..1b59adf787 100644 --- a/jscomp/test/ext_string.js +++ b/lib/js/test/ext_string.js @@ -1,14 +1,14 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Bytes = require("../stdlib/bytes"); -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_exceptions = require("../runtime/caml_exceptions"); -var Caml_int32 = require("../runtime/caml_int32"); -var Curry = require("../runtime/curry"); +var Bytes = require("../bytes"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Caml_exceptions = require("../caml_exceptions"); +var Caml_int32 = require("../caml_int32"); +var Curry = require("../curry"); var Ext_bytes = require("./ext_bytes"); -var $$String = require("../stdlib/string"); -var Caml_string = require("../runtime/caml_string"); +var $$String = require("../string"); +var Caml_string = require("../caml_string"); function split_by($staropt$star, is_delim, str) { var keep_empty = $staropt$star ? $staropt$star[0] : /* false */0; diff --git a/jscomp/test/extensible_variant_test.js b/lib/js/test/extensible_variant_test.js similarity index 90% rename from jscomp/test/extensible_variant_test.js rename to lib/js/test/extensible_variant_test.js index fa37570c07..fa9b1f91e0 100644 --- a/jscomp/test/extensible_variant_test.js +++ b/lib/js/test/extensible_variant_test.js @@ -1,10 +1,10 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_exceptions = require("../runtime/caml_exceptions"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Caml_exceptions = require("../caml_exceptions"); var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); var Str = Caml_exceptions.create("Extensible_variant_test.Str"); diff --git a/jscomp/test/fail_comp.js b/lib/js/test/fail_comp.js similarity index 100% rename from jscomp/test/fail_comp.js rename to lib/js/test/fail_comp.js diff --git a/jscomp/test/ffi_arity_test.js b/lib/js/test/ffi_arity_test.js similarity index 96% rename from jscomp/test/ffi_arity_test.js rename to lib/js/test/ffi_arity_test.js index ce7a654146..c485f67468 100644 --- a/jscomp/test/ffi_arity_test.js +++ b/lib/js/test/ffi_arity_test.js @@ -2,9 +2,9 @@ 'use strict'; var Mt = require("./mt"); -var Caml_int32 = require("../runtime/caml_int32"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); +var Caml_int32 = require("../caml_int32"); +var Block = require("../block"); +var Curry = require("../curry"); function f(v) { if (v % 2) { diff --git a/jscomp/test/ffi_js.js b/lib/js/test/ffi_js.js similarity index 100% rename from jscomp/test/ffi_js.js rename to lib/js/test/ffi_js.js diff --git a/jscomp/test/ffi_test.js b/lib/js/test/ffi_test.js similarity index 100% rename from jscomp/test/ffi_test.js rename to lib/js/test/ffi_test.js diff --git a/jscomp/test/fib.js b/lib/js/test/fib.js similarity index 100% rename from jscomp/test/fib.js rename to lib/js/test/fib.js diff --git a/jscomp/test/float_array.js b/lib/js/test/float_array.js similarity index 100% rename from jscomp/test/float_array.js rename to lib/js/test/float_array.js diff --git a/jscomp/test/float_of_bits_test.js b/lib/js/test/float_of_bits_test.js similarity index 91% rename from jscomp/test/float_of_bits_test.js rename to lib/js/test/float_of_bits_test.js index dd3d542fe0..375976b34a 100644 --- a/jscomp/test/float_of_bits_test.js +++ b/lib/js/test/float_of_bits_test.js @@ -1,15 +1,15 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_int64 = require("../runtime/caml_int64"); -var Caml_float = require("../runtime/caml_float"); -var Pervasives = require("../stdlib/pervasives"); +var Caml_int64 = require("../caml_int64"); +var Caml_float = require("../caml_float"); +var Pervasives = require("../pervasives"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); -var Printf = require("../stdlib/printf"); -var $$Array = require("../stdlib/array"); -var List = require("../stdlib/list"); +var Block = require("../block"); +var Curry = require("../curry"); +var Printf = require("../printf"); +var $$Array = require("../array"); +var List = require("../list"); var one_float = /* int64 */[ /* hi */1072693248, diff --git a/jscomp/test/float_record.js b/lib/js/test/float_record.js similarity index 100% rename from jscomp/test/float_record.js rename to lib/js/test/float_record.js diff --git a/jscomp/test/float_test.js b/lib/js/test/float_test.js similarity index 96% rename from jscomp/test/float_test.js rename to lib/js/test/float_test.js index 9c6c14d8bf..c55c405a7d 100644 --- a/jscomp/test/float_test.js +++ b/lib/js/test/float_test.js @@ -1,14 +1,14 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_float = require("../runtime/caml_float"); -var Pervasives = require("../stdlib/pervasives"); +var Caml_float = require("../caml_float"); +var Pervasives = require("../pervasives"); var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); var Mt_global = require("./mt_global"); -var Curry = require("../runtime/curry"); -var Printf = require("../stdlib/printf"); -var $$Array = require("../stdlib/array"); +var Curry = require("../curry"); +var Printf = require("../printf"); +var $$Array = require("../array"); var match_000 = [0]; diff --git a/jscomp/test/for_loop_test.js b/lib/js/test/for_loop_test.js similarity index 96% rename from jscomp/test/for_loop_test.js rename to lib/js/test/for_loop_test.js index e92d8eb4da..28ccd7359c 100644 --- a/jscomp/test/for_loop_test.js +++ b/lib/js/test/for_loop_test.js @@ -1,12 +1,12 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_int32 = require("../runtime/caml_int32"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); -var Caml_array = require("../runtime/caml_array"); -var $$Array = require("../stdlib/array"); -var List = require("../stdlib/list"); +var Caml_int32 = require("../caml_int32"); +var Block = require("../block"); +var Curry = require("../curry"); +var Caml_array = require("../caml_array"); +var $$Array = require("../array"); +var List = require("../list"); function for_3(x) { var v = [0]; diff --git a/jscomp/test/for_side_effect_test.js b/lib/js/test/for_side_effect_test.js similarity index 94% rename from jscomp/test/for_side_effect_test.js rename to lib/js/test/for_side_effect_test.js index 942905066e..aa7f3adfeb 100644 --- a/jscomp/test/for_side_effect_test.js +++ b/lib/js/test/for_side_effect_test.js @@ -2,7 +2,7 @@ 'use strict'; var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); function tst() { for(var i = (console.log("hi"), 0) ,i_finish = (console.log("hello"), 3); i <= i_finish; ++i){ diff --git a/jscomp/test/format_regression.js b/lib/js/test/format_regression.js similarity index 92% rename from jscomp/test/format_regression.js rename to lib/js/test/format_regression.js index 634b38f854..cdd22a7b87 100644 --- a/jscomp/test/format_regression.js +++ b/lib/js/test/format_regression.js @@ -1,8 +1,8 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Curry = require("../runtime/curry"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Curry = require("../curry"); function peek_queue() { throw [ diff --git a/jscomp/test/genlex_test.js b/lib/js/test/genlex_test.js similarity index 92% rename from jscomp/test/genlex_test.js rename to lib/js/test/genlex_test.js index 6c65b9b4cd..1c8b604545 100644 --- a/jscomp/test/genlex_test.js +++ b/lib/js/test/genlex_test.js @@ -1,11 +1,11 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Stream = require("../stdlib/stream"); +var Stream = require("../stream"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Genlex = require("../stdlib/genlex"); -var List = require("../stdlib/list"); +var Block = require("../block"); +var Genlex = require("../genlex"); +var List = require("../list"); var lexer = Genlex.make_lexer(/* :: */[ "+", diff --git a/jscomp/test/global_exception_regression_test.js b/lib/js/test/global_exception_regression_test.js similarity index 86% rename from jscomp/test/global_exception_regression_test.js rename to lib/js/test/global_exception_regression_test.js index d5f18fb62c..521075e6af 100644 --- a/jscomp/test/global_exception_regression_test.js +++ b/lib/js/test/global_exception_regression_test.js @@ -1,9 +1,9 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); var v = Caml_builtin_exceptions.not_found; diff --git a/jscomp/test/google_closure_test.js b/lib/js/test/google_closure_test.js similarity index 94% rename from jscomp/test/google_closure_test.js rename to lib/js/test/google_closure_test.js index 7463429895..0443059397 100644 --- a/jscomp/test/google_closure_test.js +++ b/lib/js/test/google_closure_test.js @@ -2,7 +2,7 @@ 'use strict'; var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); var Test_google_closure = require("./test_google_closure"); Mt.from_pair_suites("Closure", /* :: */[ diff --git a/jscomp/test/guide_for_ext.js b/lib/js/test/guide_for_ext.js similarity index 100% rename from jscomp/test/guide_for_ext.js rename to lib/js/test/guide_for_ext.js diff --git a/jscomp/test/hamming_test.js b/lib/js/test/hamming_test.js similarity index 96% rename from jscomp/test/hamming_test.js rename to lib/js/test/hamming_test.js index 688c8d1967..4d3c2a7070 100644 --- a/jscomp/test/hamming_test.js +++ b/lib/js/test/hamming_test.js @@ -1,15 +1,15 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_int64 = require("../runtime/caml_int64"); -var Caml_obj = require("../runtime/caml_obj"); -var CamlinternalLazy = require("../stdlib/camlinternalLazy"); -var Caml_format = require("../runtime/caml_format"); +var Caml_int64 = require("../caml_int64"); +var Caml_obj = require("../caml_obj"); +var CamlinternalLazy = require("../camlinternalLazy"); +var Caml_format = require("../caml_format"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); -var Printf = require("../stdlib/printf"); -var Buffer = require("../stdlib/buffer"); +var Block = require("../block"); +var Curry = require("../curry"); +var Printf = require("../printf"); +var Buffer = require("../buffer"); var n0 = /* int64 */[ /* hi */0, diff --git a/jscomp/test/hash_test.js b/lib/js/test/hash_test.js similarity index 94% rename from jscomp/test/hash_test.js rename to lib/js/test/hash_test.js index 9078d6d006..7c88a6e293 100644 --- a/jscomp/test/hash_test.js +++ b/lib/js/test/hash_test.js @@ -1,13 +1,13 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Bytes = require("../stdlib/bytes"); -var Hashtbl = require("../stdlib/hashtbl"); +var Bytes = require("../bytes"); +var Hashtbl = require("../hashtbl"); var Mt = require("./mt"); -var Char = require("../stdlib/char"); +var Char = require("../char"); var Mt_global = require("./mt_global"); -var $$Array = require("../stdlib/array"); -var Caml_string = require("../runtime/caml_string"); +var $$Array = require("../array"); +var Caml_string = require("../caml_string"); var suites = [/* [] */0]; diff --git a/jscomp/test/hashtbl_test.js b/lib/js/test/hashtbl_test.js similarity index 90% rename from jscomp/test/hashtbl_test.js rename to lib/js/test/hashtbl_test.js index b0b84a2272..878627aca4 100644 --- a/jscomp/test/hashtbl_test.js +++ b/lib/js/test/hashtbl_test.js @@ -1,12 +1,12 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../runtime/caml_obj"); -var Hashtbl = require("../stdlib/hashtbl"); +var Caml_obj = require("../caml_obj"); +var Hashtbl = require("../hashtbl"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var $$Array = require("../stdlib/array"); -var List = require("../stdlib/list"); +var Block = require("../block"); +var $$Array = require("../array"); +var List = require("../list"); function to_list(tbl) { return Hashtbl.fold(function (k, v, acc) { diff --git a/jscomp/test/inline_edge_cases.js b/lib/js/test/inline_edge_cases.js similarity index 100% rename from jscomp/test/inline_edge_cases.js rename to lib/js/test/inline_edge_cases.js diff --git a/jscomp/test/inline_map2_test.js b/lib/js/test/inline_map2_test.js similarity index 99% rename from jscomp/test/inline_map2_test.js rename to lib/js/test/inline_map2_test.js index 369eedd606..c977323d52 100644 --- a/jscomp/test/inline_map2_test.js +++ b/lib/js/test/inline_map2_test.js @@ -1,13 +1,13 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_obj = require("../runtime/caml_obj"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Caml_obj = require("../caml_obj"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); -var List = require("../stdlib/list"); -var Caml_string = require("../runtime/caml_string"); +var Block = require("../block"); +var Curry = require("../curry"); +var List = require("../list"); +var Caml_string = require("../caml_string"); function Make(Ord) { var height = function (param) { diff --git a/jscomp/test/inline_map_test.js b/lib/js/test/inline_map_test.js similarity index 93% rename from jscomp/test/inline_map_test.js rename to lib/js/test/inline_map_test.js index 950eddbe12..9f7bd1ba15 100644 --- a/jscomp/test/inline_map_test.js +++ b/lib/js/test/inline_map_test.js @@ -1,11 +1,11 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_obj = require("../runtime/caml_obj"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Caml_obj = require("../caml_obj"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var List = require("../stdlib/list"); +var Block = require("../block"); +var List = require("../list"); function height(param) { if (param) { diff --git a/jscomp/test/inline_regression_test.js b/lib/js/test/inline_regression_test.js similarity index 89% rename from jscomp/test/inline_regression_test.js rename to lib/js/test/inline_regression_test.js index 8561af3431..f221c3834a 100644 --- a/jscomp/test/inline_regression_test.js +++ b/lib/js/test/inline_regression_test.js @@ -1,11 +1,11 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Filename = require("../stdlib/filename"); +var Filename = require("../filename"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); -var $$String = require("../stdlib/string"); +var Block = require("../block"); +var Curry = require("../curry"); +var $$String = require("../string"); function generic_basename(is_dir_sep, current_dir_name, name) { if (name === "") { diff --git a/jscomp/test/int32_test.js b/lib/js/test/int32_test.js similarity index 95% rename from jscomp/test/int32_test.js rename to lib/js/test/int32_test.js index 4da0a91141..3c01245ecf 100644 --- a/jscomp/test/int32_test.js +++ b/lib/js/test/int32_test.js @@ -1,15 +1,15 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Pervasives = require("../stdlib/pervasives"); +var Pervasives = require("../pervasives"); var Mt = require("./mt"); -var Caml_int32 = require("../runtime/caml_int32"); -var Block = require("../runtime/block"); -var Int32 = require("../stdlib/int32"); -var Curry = require("../runtime/curry"); -var $$Array = require("../stdlib/array"); +var Caml_int32 = require("../caml_int32"); +var Block = require("../block"); +var Int32 = require("../int32"); +var Curry = require("../curry"); +var $$Array = require("../array"); var Ext_array = require("./ext_array"); -var Format = require("../stdlib/format"); +var Format = require("../format"); function f(x) { return /* tuple */[ diff --git a/jscomp/test/int64_mul_div_test.js b/lib/js/test/int64_mul_div_test.js similarity index 98% rename from jscomp/test/int64_mul_div_test.js rename to lib/js/test/int64_mul_div_test.js index 1148855bd8..c9c3078d7a 100644 --- a/jscomp/test/int64_mul_div_test.js +++ b/lib/js/test/int64_mul_div_test.js @@ -1,16 +1,16 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_int64 = require("../runtime/caml_int64"); -var Caml_obj = require("../runtime/caml_obj"); -var Pervasives = require("../stdlib/pervasives"); -var Caml_format = require("../runtime/caml_format"); +var Caml_int64 = require("../caml_int64"); +var Caml_obj = require("../caml_obj"); +var Pervasives = require("../pervasives"); +var Caml_format = require("../caml_format"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); -var Printf = require("../stdlib/printf"); -var $$Array = require("../stdlib/array"); -var List = require("../stdlib/list"); +var Block = require("../block"); +var Curry = require("../curry"); +var Printf = require("../printf"); +var $$Array = require("../array"); +var List = require("../list"); function commutative_mul(result, a, b) { return /* Eq */Block.__(0, [ diff --git a/jscomp/test/int64_test.js b/lib/js/test/int64_test.js similarity index 99% rename from jscomp/test/int64_test.js rename to lib/js/test/int64_test.js index 4fae197153..474f550817 100644 --- a/jscomp/test/int64_test.js +++ b/lib/js/test/int64_test.js @@ -1,17 +1,17 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_int64 = require("../runtime/caml_int64"); -var Caml_obj = require("../runtime/caml_obj"); -var Pervasives = require("../stdlib/pervasives"); +var Caml_int64 = require("../caml_int64"); +var Caml_obj = require("../caml_obj"); +var Pervasives = require("../pervasives"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Int32 = require("../stdlib/int32"); -var Curry = require("../runtime/curry"); -var Int64 = require("../stdlib/int64"); -var $$Array = require("../stdlib/array"); +var Block = require("../block"); +var Int32 = require("../int32"); +var Curry = require("../curry"); +var Int64 = require("../int64"); +var $$Array = require("../array"); var Ext_array = require("./ext_array"); -var Format = require("../stdlib/format"); +var Format = require("../format"); function f(u, v) { return +(u > v); diff --git a/jscomp/test/int_hashtbl_test.js b/lib/js/test/int_hashtbl_test.js similarity index 91% rename from jscomp/test/int_hashtbl_test.js rename to lib/js/test/int_hashtbl_test.js index 2a36065b3f..d8f384f80d 100644 --- a/jscomp/test/int_hashtbl_test.js +++ b/lib/js/test/int_hashtbl_test.js @@ -1,13 +1,13 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../runtime/caml_obj"); -var Hashtbl = require("../stdlib/hashtbl"); +var Caml_obj = require("../caml_obj"); +var Hashtbl = require("../hashtbl"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); -var $$Array = require("../stdlib/array"); -var List = require("../stdlib/list"); +var Block = require("../block"); +var Curry = require("../curry"); +var $$Array = require("../array"); +var List = require("../list"); function f(H) { var tbl = Curry._1(H[/* create */0], 17); diff --git a/jscomp/test/int_map.js b/lib/js/test/int_map.js similarity index 98% rename from jscomp/test/int_map.js rename to lib/js/test/int_map.js index 452ec0e310..ecebb78d94 100644 --- a/jscomp/test/int_map.js +++ b/lib/js/test/int_map.js @@ -1,9 +1,9 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_obj = require("../runtime/caml_obj"); -var Curry = require("../runtime/curry"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Caml_obj = require("../caml_obj"); +var Curry = require("../curry"); function height(param) { if (param) { diff --git a/jscomp/test/int_overflow_test.js b/lib/js/test/int_overflow_test.js similarity index 97% rename from jscomp/test/int_overflow_test.js rename to lib/js/test/int_overflow_test.js index a759f01795..a579c1c351 100644 --- a/jscomp/test/int_overflow_test.js +++ b/lib/js/test/int_overflow_test.js @@ -2,9 +2,9 @@ 'use strict'; var Mt = require("./mt"); -var Caml_int32 = require("../runtime/caml_int32"); -var Block = require("../runtime/block"); -var Int32 = require("../stdlib/int32"); +var Caml_int32 = require("../caml_int32"); +var Block = require("../block"); +var Int32 = require("../int32"); function hash_variant(s) { var accu = 0; diff --git a/jscomp/test/io_test.js b/lib/js/test/io_test.js similarity index 100% rename from jscomp/test/io_test.js rename to lib/js/test/io_test.js diff --git a/jscomp/test/js_bool_test.js b/lib/js/test/js_bool_test.js similarity index 93% rename from jscomp/test/js_bool_test.js rename to lib/js/test/js_bool_test.js index 66901d33be..ee3e4e160f 100644 --- a/jscomp/test/js_bool_test.js +++ b/lib/js/test/js_bool_test.js @@ -1,9 +1,9 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../runtime/caml_obj"); +var Caml_obj = require("../caml_obj"); var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); function f(x) { if (x) { diff --git a/jscomp/test/js_date.js b/lib/js/test/js_date.js similarity index 100% rename from jscomp/test/js_date.js rename to lib/js/test/js_date.js diff --git a/jscomp/test/js_date_test.js b/lib/js/test/js_date_test.js similarity index 96% rename from jscomp/test/js_date_test.js rename to lib/js/test/js_date_test.js index 72f38dd85a..bcadf5537e 100644 --- a/jscomp/test/js_date_test.js +++ b/lib/js/test/js_date_test.js @@ -2,7 +2,7 @@ 'use strict'; var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); var d = new Date(2016, 2); diff --git a/jscomp/test/js_obj_test.js b/lib/js/test/js_obj_test.js similarity index 90% rename from jscomp/test/js_obj_test.js rename to lib/js/test/js_obj_test.js index a903bd08f4..004dfdd7f0 100644 --- a/jscomp/test/js_obj_test.js +++ b/lib/js/test/js_obj_test.js @@ -2,9 +2,9 @@ 'use strict'; var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); -var CamlinternalOO = require("../stdlib/camlinternalOO"); +var Block = require("../block"); +var Curry = require("../curry"); +var CamlinternalOO = require("../camlinternalOO"); function f(u) { if (u.tag === 248) { diff --git a/jscomp/test/js_val.js b/lib/js/test/js_val.js similarity index 100% rename from jscomp/test/js_val.js rename to lib/js/test/js_val.js diff --git a/jscomp/test/lam_current_unit.js b/lib/js/test/lam_current_unit.js similarity index 88% rename from jscomp/test/lam_current_unit.js rename to lib/js/test/lam_current_unit.js index cab0363c85..424039bdfe 100644 --- a/jscomp/test/lam_current_unit.js +++ b/lib/js/test/lam_current_unit.js @@ -1,9 +1,9 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Bytes = require("../stdlib/bytes"); -var Filename = require("../stdlib/filename"); -var Caml_string = require("../runtime/caml_string"); +var Bytes = require("../bytes"); +var Filename = require("../filename"); +var Caml_string = require("../caml_string"); var file = [""]; diff --git a/jscomp/test/lam_methname.js b/lib/js/test/lam_methname.js similarity index 90% rename from jscomp/test/lam_methname.js rename to lib/js/test/lam_methname.js index 88cc412791..0de0fe85cf 100644 --- a/jscomp/test/lam_methname.js +++ b/lib/js/test/lam_methname.js @@ -1,16 +1,16 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_obj = require("../runtime/caml_obj"); -var Caml_format = require("../runtime/caml_format"); -var Block = require("../runtime/block"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Caml_obj = require("../caml_obj"); +var Caml_format = require("../caml_format"); +var Block = require("../block"); var Ext_string = require("./ext_string"); -var Curry = require("../runtime/curry"); +var Curry = require("../curry"); var Ext_log = require("./ext_log"); var Lam_current_unit = require("./lam_current_unit"); -var $$String = require("../stdlib/string"); -var List = require("../stdlib/list"); +var $$String = require("../string"); +var List = require("../list"); function process(x) { switch (x) { diff --git a/jscomp/test/lam_methname_test.js b/lib/js/test/lam_methname_test.js similarity index 98% rename from jscomp/test/lam_methname_test.js rename to lib/js/test/lam_methname_test.js index 0a94082bef..61c75007c2 100644 --- a/jscomp/test/lam_methname_test.js +++ b/lib/js/test/lam_methname_test.js @@ -3,7 +3,7 @@ var Lam_methname = require("./lam_methname"); var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); var suites_000 = /* tuple */[ "normal", diff --git a/jscomp/test/lazy_test.js b/lib/js/test/lazy_test.js similarity index 96% rename from jscomp/test/lazy_test.js rename to lib/js/test/lazy_test.js index 783b5654f5..8ddb8080c1 100644 --- a/jscomp/test/lazy_test.js +++ b/lib/js/test/lazy_test.js @@ -1,11 +1,11 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Lazy = require("../stdlib/lazy"); -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var CamlinternalLazy = require("../stdlib/camlinternalLazy"); +var Lazy = require("../lazy"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var CamlinternalLazy = require("../camlinternalLazy"); var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); var u = [3]; diff --git a/jscomp/test/lexer_test.js b/lib/js/test/lexer_test.js similarity index 94% rename from jscomp/test/lexer_test.js rename to lib/js/test/lexer_test.js index 456092d9e4..eb0fc7e927 100644 --- a/jscomp/test/lexer_test.js +++ b/lib/js/test/lexer_test.js @@ -1,15 +1,15 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); var Arith_syntax = require("./arith_syntax"); var Mt = require("./mt"); -var Lexing = require("../stdlib/lexing"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); +var Lexing = require("../lexing"); +var Block = require("../block"); +var Curry = require("../curry"); var Number_lexer = require("./number_lexer"); var Arith_lexer = require("./arith_lexer"); -var List = require("../stdlib/list"); +var List = require("../list"); var Arith_parser = require("./arith_parser"); function get_tokens(lex, str) { diff --git a/jscomp/test/lib_js_test.js b/lib/js/test/lib_js_test.js similarity index 93% rename from jscomp/test/lib_js_test.js rename to lib/js/test/lib_js_test.js index 92a99ce671..4227254d98 100644 --- a/jscomp/test/lib_js_test.js +++ b/lib/js/test/lib_js_test.js @@ -2,7 +2,7 @@ 'use strict'; var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); console.log(JSON.stringify(/* :: */[ 1, diff --git a/jscomp/test/libarg_test.js b/lib/js/test/libarg_test.js similarity index 98% rename from jscomp/test/libarg_test.js rename to lib/js/test/libarg_test.js index 50f6a5a307..52dcb22aef 100644 --- a/jscomp/test/libarg_test.js +++ b/lib/js/test/libarg_test.js @@ -1,13 +1,13 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../runtime/caml_obj"); +var Caml_obj = require("../caml_obj"); var Mt = require("./mt"); -var Arg = require("../stdlib/arg"); -var Block = require("../runtime/block"); -var Printf = require("../stdlib/printf"); -var Curry = require("../runtime/curry"); -var List = require("../stdlib/list"); +var Arg = require("../arg"); +var Block = require("../block"); +var Printf = require("../printf"); +var Curry = require("../curry"); +var List = require("../list"); var current = [0]; diff --git a/jscomp/test/libqueue_test.js b/lib/js/test/libqueue_test.js similarity index 98% rename from jscomp/test/libqueue_test.js rename to lib/js/test/libqueue_test.js index 11341038b2..e8c9262333 100644 --- a/jscomp/test/libqueue_test.js +++ b/lib/js/test/libqueue_test.js @@ -1,11 +1,11 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_obj = require("../runtime/caml_obj"); -var Queue = require("../stdlib/queue"); -var Curry = require("../runtime/curry"); -var List = require("../stdlib/list"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Caml_obj = require("../caml_obj"); +var Queue = require("../queue"); +var Curry = require("../curry"); +var List = require("../list"); function to_list(q) { return List.rev(Queue.fold(function (l, x) { diff --git a/jscomp/test/limits_test.js b/lib/js/test/limits_test.js similarity index 87% rename from jscomp/test/limits_test.js rename to lib/js/test/limits_test.js index c039f6000b..59de683c40 100644 --- a/jscomp/test/limits_test.js +++ b/lib/js/test/limits_test.js @@ -1,10 +1,10 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Pervasives = require("../stdlib/pervasives"); +var Pervasives = require("../pervasives"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Int32 = require("../stdlib/int32"); +var Block = require("../block"); +var Int32 = require("../int32"); var suites = [/* [] */0]; diff --git a/jscomp/test/list_test.js b/lib/js/test/list_test.js similarity index 93% rename from jscomp/test/list_test.js rename to lib/js/test/list_test.js index e66d16f910..cdb0ce9280 100644 --- a/jscomp/test/list_test.js +++ b/lib/js/test/list_test.js @@ -1,11 +1,11 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../runtime/caml_obj"); +var Caml_obj = require("../caml_obj"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var $$Array = require("../stdlib/array"); -var List = require("../stdlib/list"); +var Block = require("../block"); +var $$Array = require("../array"); +var List = require("../list"); var list_suites_000 = /* tuple */[ "length", diff --git a/jscomp/test/local_exception_test.js b/lib/js/test/local_exception_test.js similarity index 90% rename from jscomp/test/local_exception_test.js rename to lib/js/test/local_exception_test.js index b4cde81798..a0520414e0 100644 --- a/jscomp/test/local_exception_test.js +++ b/lib/js/test/local_exception_test.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_exceptions = require("../runtime/caml_exceptions"); +var Caml_exceptions = require("../caml_exceptions"); var A = Caml_exceptions.create("Local_exception_test.A"); diff --git a/jscomp/test/loop_regression_test.js b/lib/js/test/loop_regression_test.js similarity index 94% rename from jscomp/test/loop_regression_test.js rename to lib/js/test/loop_regression_test.js index 7e0952d81c..d9f923071d 100644 --- a/jscomp/test/loop_regression_test.js +++ b/lib/js/test/loop_regression_test.js @@ -2,7 +2,7 @@ 'use strict'; var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); function f() { var v = [0]; diff --git a/jscomp/test/loop_suites_test.js b/lib/js/test/loop_suites_test.js similarity index 100% rename from jscomp/test/loop_suites_test.js rename to lib/js/test/loop_suites_test.js diff --git a/jscomp/test/map_find_test.js b/lib/js/test/map_find_test.js similarity index 95% rename from jscomp/test/map_find_test.js rename to lib/js/test/map_find_test.js index 15f5ec7ae2..8d4d1a0bc7 100644 --- a/jscomp/test/map_find_test.js +++ b/lib/js/test/map_find_test.js @@ -1,12 +1,12 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_obj = require("../runtime/caml_obj"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Caml_obj = require("../caml_obj"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var List = require("../stdlib/list"); -var Caml_string = require("../runtime/caml_string"); +var Block = require("../block"); +var List = require("../list"); +var Caml_string = require("../caml_string"); function height(param) { if (param) { diff --git a/jscomp/test/map_test.js b/lib/js/test/map_test.js similarity index 96% rename from jscomp/test/map_test.js rename to lib/js/test/map_test.js index 23f995a8f6..7d26bd88fb 100644 --- a/jscomp/test/map_test.js +++ b/lib/js/test/map_test.js @@ -1,13 +1,13 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_obj = require("../runtime/caml_obj"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Caml_obj = require("../caml_obj"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); -var Caml_string = require("../runtime/caml_string"); -var List = require("../stdlib/list"); +var Block = require("../block"); +var Curry = require("../curry"); +var Caml_string = require("../caml_string"); +var List = require("../list"); function height(param) { if (param) { diff --git a/jscomp/test/mock_mt.js b/lib/js/test/mock_mt.js similarity index 94% rename from jscomp/test/mock_mt.js rename to lib/js/test/mock_mt.js index 9a022489e4..42f50ee34b 100644 --- a/jscomp/test/mock_mt.js +++ b/lib/js/test/mock_mt.js @@ -1,8 +1,8 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../runtime/curry"); -var List = require("../stdlib/list"); +var Curry = require("../curry"); +var List = require("../list"); function from_pair_suites(name, suites) { console.log(/* tuple */[ diff --git a/jscomp/test/module_alias.js b/lib/js/test/module_alias.js similarity index 100% rename from jscomp/test/module_alias.js rename to lib/js/test/module_alias.js diff --git a/jscomp/test/module_parameter_test.js b/lib/js/test/module_parameter_test.js similarity index 93% rename from jscomp/test/module_parameter_test.js rename to lib/js/test/module_parameter_test.js index 05675d12f8..5f10e3de95 100644 --- a/jscomp/test/module_parameter_test.js +++ b/lib/js/test/module_parameter_test.js @@ -2,8 +2,8 @@ 'use strict'; var Mt = require("./mt"); -var Block = require("../runtime/block"); -var $$String = require("../stdlib/string"); +var Block = require("../block"); +var $$String = require("../string"); function u(v) { return v; diff --git a/jscomp/test/mt.js b/lib/js/test/mt.js similarity index 92% rename from jscomp/test/mt.js rename to lib/js/test/mt.js index 857e154c49..c10405b796 100644 --- a/jscomp/test/mt.js +++ b/lib/js/test/mt.js @@ -1,10 +1,10 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Curry = require("../runtime/curry"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Curry = require("../curry"); var Assert = require("assert"); -var List = require("../stdlib/list"); +var List = require("../list"); function from_suites(name, suite) { describe(name, function () { diff --git a/jscomp/test/mt_global.js b/lib/js/test/mt_global.js similarity index 96% rename from jscomp/test/mt_global.js rename to lib/js/test/mt_global.js index 517c64a852..fe55f21d7e 100644 --- a/jscomp/test/mt_global.js +++ b/lib/js/test/mt_global.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Block = require("../runtime/block"); +var Block = require("../block"); function collect_eq(test_id, suites, loc, x, y) { test_id[0] = test_id[0] + 1 | 0; diff --git a/jscomp/test/number_lexer.js b/lib/js/test/number_lexer.js similarity index 97% rename from jscomp/test/number_lexer.js rename to lib/js/test/number_lexer.js index 6dc8b6d0ba..6852b12899 100644 --- a/jscomp/test/number_lexer.js +++ b/lib/js/test/number_lexer.js @@ -1,10 +1,10 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Pervasives = require("../stdlib/pervasives"); -var Lexing = require("../stdlib/lexing"); -var Sys = require("../stdlib/sys"); -var Curry = require("../runtime/curry"); +var Pervasives = require("../pervasives"); +var Lexing = require("../lexing"); +var Sys = require("../sys"); +var Curry = require("../curry"); var l = Sys.is_js ? function (prim) { console.log(prim); diff --git a/jscomp/test/obj_magic_test.js b/lib/js/test/obj_magic_test.js similarity index 94% rename from jscomp/test/obj_magic_test.js rename to lib/js/test/obj_magic_test.js index 61aa65f432..a79de7606f 100644 --- a/jscomp/test/obj_magic_test.js +++ b/lib/js/test/obj_magic_test.js @@ -1,9 +1,9 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Obj = require("../stdlib/obj"); +var Obj = require("../obj"); var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); var empty_backtrace = Block.__(Obj.abstract_tag, []); diff --git a/jscomp/test/obj_test.js b/lib/js/test/obj_test.js similarity index 98% rename from jscomp/test/obj_test.js rename to lib/js/test/obj_test.js index d5e09ecb7a..a7b5341ae7 100644 --- a/jscomp/test/obj_test.js +++ b/lib/js/test/obj_test.js @@ -2,9 +2,9 @@ 'use strict'; var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); -var CamlinternalOO = require("../stdlib/camlinternalOO"); +var Block = require("../block"); +var Curry = require("../curry"); +var CamlinternalOO = require("../camlinternalOO"); var shared = [ "hi", diff --git a/jscomp/test/of_string_test.js b/lib/js/test/of_string_test.js similarity index 90% rename from jscomp/test/of_string_test.js rename to lib/js/test/of_string_test.js index 7ef2e891ac..afbd7aad23 100644 --- a/jscomp/test/of_string_test.js +++ b/lib/js/test/of_string_test.js @@ -1,9 +1,9 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Pervasives = require("../stdlib/pervasives"); +var Pervasives = require("../pervasives"); var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); var suites_000 = /* tuple */[ "string_of_float_1", diff --git a/jscomp/test/offset.js b/lib/js/test/offset.js similarity index 98% rename from jscomp/test/offset.js rename to lib/js/test/offset.js index 1b5a8afe56..ff6bcf9b67 100644 --- a/jscomp/test/offset.js +++ b/lib/js/test/offset.js @@ -1,11 +1,11 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Curry = require("../runtime/curry"); -var $$String = require("../stdlib/string"); -var Caml_string = require("../runtime/caml_string"); -var List = require("../stdlib/list"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Curry = require("../curry"); +var $$String = require("../string"); +var Caml_string = require("../caml_string"); +var List = require("../list"); function height(param) { if (param) { diff --git a/jscomp/test/pq_test.js b/lib/js/test/pq_test.js similarity index 96% rename from jscomp/test/pq_test.js rename to lib/js/test/pq_test.js index d08fbdc47a..702c0a3748 100644 --- a/jscomp/test/pq_test.js +++ b/lib/js/test/pq_test.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_exceptions = require("../runtime/caml_exceptions"); +var Caml_exceptions = require("../caml_exceptions"); function insert(queue, prio, elt) { if (queue) { diff --git a/jscomp/test/pr6726.js b/lib/js/test/pr6726.js similarity index 100% rename from jscomp/test/pr6726.js rename to lib/js/test/pr6726.js diff --git a/jscomp/test/pr_regression_test.js b/lib/js/test/pr_regression_test.js similarity index 95% rename from jscomp/test/pr_regression_test.js rename to lib/js/test/pr_regression_test.js index 8fc0f2ed55..bda0c6f114 100644 --- a/jscomp/test/pr_regression_test.js +++ b/lib/js/test/pr_regression_test.js @@ -2,8 +2,8 @@ 'use strict'; var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); +var Block = require("../block"); +var Curry = require("../curry"); var v = [3]; diff --git a/jscomp/test/primitive_reg_test.js b/lib/js/test/primitive_reg_test.js similarity index 100% rename from jscomp/test/primitive_reg_test.js rename to lib/js/test/primitive_reg_test.js diff --git a/jscomp/test/print_alpha_test.js b/lib/js/test/print_alpha_test.js similarity index 89% rename from jscomp/test/print_alpha_test.js rename to lib/js/test/print_alpha_test.js index 919c4d4439..1248e76ca2 100644 --- a/jscomp/test/print_alpha_test.js +++ b/lib/js/test/print_alpha_test.js @@ -2,8 +2,8 @@ 'use strict'; var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); +var Block = require("../block"); +var Curry = require("../curry"); function f(h, _) { console.log(3); diff --git a/jscomp/test/printf_sim.js b/lib/js/test/printf_sim.js similarity index 93% rename from jscomp/test/printf_sim.js rename to lib/js/test/printf_sim.js index c40934980a..3880961fa8 100644 --- a/jscomp/test/printf_sim.js +++ b/lib/js/test/printf_sim.js @@ -1,9 +1,9 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); -var Printf = require("../stdlib/printf"); +var Block = require("../block"); +var Curry = require("../curry"); +var Printf = require("../printf"); Curry._1(Printf.printf(/* Format */[ /* Int64 */Block.__(7, [ diff --git a/jscomp/test/printf_test.js b/lib/js/test/printf_test.js similarity index 94% rename from jscomp/test/printf_test.js rename to lib/js/test/printf_test.js index 93b64e3550..7ab9189624 100644 --- a/jscomp/test/printf_test.js +++ b/lib/js/test/printf_test.js @@ -2,10 +2,10 @@ 'use strict'; var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); -var Printf = require("../stdlib/printf"); -var Format = require("../stdlib/format"); +var Block = require("../block"); +var Curry = require("../curry"); +var Printf = require("../printf"); +var Format = require("../format"); function print_pair(fmt, param) { return Curry._2(Format.fprintf(fmt, /* Format */[ diff --git a/jscomp/test/qcc.js b/lib/js/test/qcc.js similarity index 98% rename from jscomp/test/qcc.js rename to lib/js/test/qcc.js index c378c2d667..fd9b1fbfb0 100644 --- a/jscomp/test/qcc.js +++ b/lib/js/test/qcc.js @@ -1,21 +1,21 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_io = require("../runtime/caml_io"); -var Bytes = require("../stdlib/bytes"); -var Caml_obj = require("../runtime/caml_obj"); -var Pervasives = require("../stdlib/pervasives"); -var Caml_int32 = require("../runtime/caml_int32"); -var Block = require("../runtime/block"); -var Char = require("../stdlib/char"); -var Sys = require("../stdlib/sys"); -var Curry = require("../runtime/curry"); -var Printf = require("../stdlib/printf"); -var Caml_array = require("../runtime/caml_array"); -var $$String = require("../stdlib/string"); -var Caml_string = require("../runtime/caml_string"); -var List = require("../stdlib/list"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Caml_io = require("../caml_io"); +var Bytes = require("../bytes"); +var Caml_obj = require("../caml_obj"); +var Pervasives = require("../pervasives"); +var Caml_int32 = require("../caml_int32"); +var Block = require("../block"); +var Char = require("../char"); +var Sys = require("../sys"); +var Curry = require("../curry"); +var Printf = require("../printf"); +var Caml_array = require("../caml_array"); +var $$String = require("../string"); +var Caml_string = require("../caml_string"); +var List = require("../list"); var dbg = [/* true */1]; diff --git a/jscomp/test/queue_test.js b/lib/js/test/queue_test.js similarity index 83% rename from jscomp/test/queue_test.js rename to lib/js/test/queue_test.js index 1dbecccb31..6145127ba2 100644 --- a/jscomp/test/queue_test.js +++ b/lib/js/test/queue_test.js @@ -2,10 +2,10 @@ 'use strict'; var Mt = require("./mt"); -var Queue = require("../stdlib/queue"); -var Block = require("../runtime/block"); -var Caml_array = require("../runtime/caml_array"); -var $$Array = require("../stdlib/array"); +var Queue = require("../queue"); +var Block = require("../block"); +var Caml_array = require("../caml_array"); +var $$Array = require("../array"); function to_array(q) { var v = Caml_array.caml_make_vect(q[/* length */0], 0); diff --git a/jscomp/test/random_test.js b/lib/js/test/random_test.js similarity index 93% rename from jscomp/test/random_test.js rename to lib/js/test/random_test.js index 896fa053ab..c5ed086a1f 100644 --- a/jscomp/test/random_test.js +++ b/lib/js/test/random_test.js @@ -2,13 +2,13 @@ 'use strict'; var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); var Mt_global = require("./mt_global"); -var Curry = require("../runtime/curry"); -var Printf = require("../stdlib/printf"); -var Int64 = require("../stdlib/int64"); -var Caml_array = require("../runtime/caml_array"); -var Random = require("../stdlib/random"); +var Curry = require("../curry"); +var Printf = require("../printf"); +var Int64 = require("../int64"); +var Caml_array = require("../caml_array"); +var Random = require("../random"); var id = [0]; diff --git a/jscomp/test/rec_module_test.js b/lib/js/test/rec_module_test.js similarity index 98% rename from jscomp/test/rec_module_test.js rename to lib/js/test/rec_module_test.js index 1c5539e40f..ca98d59683 100644 --- a/jscomp/test/rec_module_test.js +++ b/lib/js/test/rec_module_test.js @@ -1,13 +1,13 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); -var CamlinternalMod = require("../stdlib/camlinternalMod"); -var List = require("../stdlib/list"); -var Caml_string = require("../runtime/caml_string"); +var Block = require("../block"); +var Curry = require("../curry"); +var CamlinternalMod = require("../camlinternalMod"); +var List = require("../list"); +var Caml_string = require("../caml_string"); var A = CamlinternalMod.init_mod([ "rec_module_test.ml", diff --git a/jscomp/test/rec_value_test.js b/lib/js/test/rec_value_test.js similarity index 95% rename from jscomp/test/rec_value_test.js rename to lib/js/test/rec_value_test.js index 54ec36257e..4bac870952 100644 --- a/jscomp/test/rec_value_test.js +++ b/lib/js/test/rec_value_test.js @@ -1,11 +1,11 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../runtime/caml_obj"); -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var CamlinternalLazy = require("../stdlib/camlinternalLazy"); -var Block = require("../runtime/block"); -var List = require("../stdlib/list"); +var Caml_obj = require("../caml_obj"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var CamlinternalLazy = require("../camlinternalLazy"); +var Block = require("../block"); +var List = require("../list"); var x = { diff --git a/jscomp/test/record_with_test.js b/lib/js/test/record_with_test.js similarity index 92% rename from jscomp/test/record_with_test.js rename to lib/js/test/record_with_test.js index de614e81c3..a83b17ef84 100644 --- a/jscomp/test/record_with_test.js +++ b/lib/js/test/record_with_test.js @@ -2,8 +2,8 @@ 'use strict'; var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); +var Block = require("../block"); +var Curry = require("../curry"); var v = /* record */[ /* syntax : None */0, diff --git a/jscomp/test/regression_print.js b/lib/js/test/regression_print.js similarity index 100% rename from jscomp/test/regression_print.js rename to lib/js/test/regression_print.js diff --git a/jscomp/test/runtime_encoding_test.js b/lib/js/test/runtime_encoding_test.js similarity index 100% rename from jscomp/test/runtime_encoding_test.js rename to lib/js/test/runtime_encoding_test.js diff --git a/jscomp/test/scanf_io.js b/lib/js/test/scanf_io.js similarity index 88% rename from jscomp/test/scanf_io.js rename to lib/js/test/scanf_io.js index e205682871..c5675899e5 100644 --- a/jscomp/test/scanf_io.js +++ b/lib/js/test/scanf_io.js @@ -1,19 +1,19 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_io = require("../runtime/caml_io"); -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Bytes = require("../stdlib/bytes"); -var Caml_obj = require("../runtime/caml_obj"); -var Pervasives = require("../stdlib/pervasives"); -var Block = require("../runtime/block"); -var Digest = require("../stdlib/digest"); -var Curry = require("../runtime/curry"); -var Printf = require("../stdlib/printf"); -var Scanf = require("../stdlib/scanf"); -var Buffer = require("../stdlib/buffer"); -var List = require("../stdlib/list"); -var Caml_string = require("../runtime/caml_string"); +var Caml_io = require("../caml_io"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Bytes = require("../bytes"); +var Caml_obj = require("../caml_obj"); +var Pervasives = require("../pervasives"); +var Block = require("../block"); +var Digest = require("../digest"); +var Curry = require("../curry"); +var Printf = require("../printf"); +var Scanf = require("../scanf"); +var Buffer = require("../buffer"); +var List = require("../list"); +var Caml_string = require("../caml_string"); var tscanf_data_file = "tscanf_data"; diff --git a/jscomp/test/scanf_reference_error_regression_test.js b/lib/js/test/scanf_reference_error_regression_test.js similarity index 92% rename from jscomp/test/scanf_reference_error_regression_test.js rename to lib/js/test/scanf_reference_error_regression_test.js index ceda1a7efa..6dc7444276 100644 --- a/jscomp/test/scanf_reference_error_regression_test.js +++ b/lib/js/test/scanf_reference_error_regression_test.js @@ -1,14 +1,14 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); var Mt_global = require("./mt_global"); -var Curry = require("../runtime/curry"); -var Scanf = require("../stdlib/scanf"); -var Printf = require("../stdlib/printf"); -var List = require("../stdlib/list"); +var Curry = require("../curry"); +var Scanf = require("../scanf"); +var Printf = require("../printf"); +var List = require("../list"); var suites = [/* [] */0]; diff --git a/jscomp/test/scanf_test.js b/lib/js/test/scanf_test.js similarity index 90% rename from jscomp/test/scanf_test.js rename to lib/js/test/scanf_test.js index c2b81b80a8..612532ffb6 100644 --- a/jscomp/test/scanf_test.js +++ b/lib/js/test/scanf_test.js @@ -2,10 +2,10 @@ 'use strict'; var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); var Mt_global = require("./mt_global"); -var Curry = require("../runtime/curry"); -var Scanf = require("../stdlib/scanf"); +var Curry = require("../curry"); +var Scanf = require("../scanf"); var suites = [/* [] */0]; diff --git a/jscomp/test/shift_test.js b/lib/js/test/shift_test.js similarity index 100% rename from jscomp/test/shift_test.js rename to lib/js/test/shift_test.js diff --git a/jscomp/test/simple_lexer_test.js b/lib/js/test/simple_lexer_test.js similarity index 95% rename from jscomp/test/simple_lexer_test.js rename to lib/js/test/simple_lexer_test.js index ad2b0e6987..5889700b94 100644 --- a/jscomp/test/simple_lexer_test.js +++ b/lib/js/test/simple_lexer_test.js @@ -1,12 +1,12 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Bytes = require("../stdlib/bytes"); +var Bytes = require("../bytes"); var Mt = require("./mt"); -var Lexing = require("../stdlib/lexing"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); -var Caml_string = require("../runtime/caml_string"); +var Lexing = require("../lexing"); +var Block = require("../block"); +var Curry = require("../curry"); +var Caml_string = require("../caml_string"); var __ocaml_lex_tables = /* record */[ /* lex_base */"\0\0\xfd\xff\xfe\xff\0\0\0\0\x01\0\0\0\0\0\0\0\0\0\0\0\0\0\x04\0\x01\0\x04\0\x03\0\0\0\x06\0\0\0\xff\xff", diff --git a/jscomp/test/small_inline_test.js b/lib/js/test/small_inline_test.js similarity index 96% rename from jscomp/test/small_inline_test.js rename to lib/js/test/small_inline_test.js index f501fbe22e..6b7c488cbd 100644 --- a/jscomp/test/small_inline_test.js +++ b/lib/js/test/small_inline_test.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../runtime/curry"); +var Curry = require("../curry"); function $pipe$great(x, f) { return Curry._1(f, x); diff --git a/jscomp/test/sprintf_reg_test.js b/lib/js/test/sprintf_reg_test.js similarity index 93% rename from jscomp/test/sprintf_reg_test.js rename to lib/js/test/sprintf_reg_test.js index 628deabc38..9de40be5db 100644 --- a/jscomp/test/sprintf_reg_test.js +++ b/lib/js/test/sprintf_reg_test.js @@ -2,10 +2,10 @@ 'use strict'; var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); var Mt_global = require("./mt_global"); -var Curry = require("../runtime/curry"); -var Printf = require("../stdlib/printf"); +var Curry = require("../curry"); +var Printf = require("../printf"); var suites = [/* [] */0]; diff --git a/jscomp/test/stack_comp_test.js b/lib/js/test/stack_comp_test.js similarity index 98% rename from jscomp/test/stack_comp_test.js rename to lib/js/test/stack_comp_test.js index d1c1720174..cf6c37f156 100644 --- a/jscomp/test/stack_comp_test.js +++ b/lib/js/test/stack_comp_test.js @@ -1,12 +1,12 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../runtime/caml_obj"); +var Caml_obj = require("../caml_obj"); var Mt = require("./mt"); var Mt_global = require("./mt_global"); -var Curry = require("../runtime/curry"); -var Stack = require("../stdlib/stack"); -var List = require("../stdlib/list"); +var Curry = require("../curry"); +var Stack = require("../stack"); +var List = require("../list"); var suites = [/* [] */0]; diff --git a/jscomp/test/stack_test.js b/lib/js/test/stack_test.js similarity index 89% rename from jscomp/test/stack_test.js rename to lib/js/test/stack_test.js index a54f746d2a..f15c072ebb 100644 --- a/jscomp/test/stack_test.js +++ b/lib/js/test/stack_test.js @@ -2,9 +2,9 @@ 'use strict'; var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Stack = require("../stdlib/stack"); -var List = require("../stdlib/list"); +var Block = require("../block"); +var Stack = require("../stack"); +var List = require("../list"); function to_list(v) { var acc = /* [] */0; diff --git a/jscomp/test/string_get_set_test.js b/lib/js/test/string_get_set_test.js similarity index 95% rename from jscomp/test/string_get_set_test.js rename to lib/js/test/string_get_set_test.js index db13f42177..ee8c6d9354 100644 --- a/jscomp/test/string_get_set_test.js +++ b/lib/js/test/string_get_set_test.js @@ -1,10 +1,10 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_int64 = require("../runtime/caml_int64"); +var Caml_int64 = require("../caml_int64"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Caml_string = require("../runtime/caml_string"); +var Block = require("../block"); +var Caml_string = require("../caml_string"); Mt.from_pair_suites("string_get_set_test.ml", /* :: */[ /* tuple */[ diff --git a/jscomp/test/string_literal_print_test.js b/lib/js/test/string_literal_print_test.js similarity index 98% rename from jscomp/test/string_literal_print_test.js rename to lib/js/test/string_literal_print_test.js index 601021cff2..e9cc5f234f 100644 --- a/jscomp/test/string_literal_print_test.js +++ b/lib/js/test/string_literal_print_test.js @@ -2,7 +2,7 @@ 'use strict'; var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); var zero_to_255 = "\0\x01\x02\x03\x04\x05\x06\x07\b\t\n\x0b\f\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"; diff --git a/jscomp/test/string_runtime_test.js b/lib/js/test/string_runtime_test.js similarity index 90% rename from jscomp/test/string_runtime_test.js rename to lib/js/test/string_runtime_test.js index 46c496709c..490f4b1f6e 100644 --- a/jscomp/test/string_runtime_test.js +++ b/lib/js/test/string_runtime_test.js @@ -1,12 +1,12 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_string = require("../runtime/caml_string"); -var Bytes = require("../stdlib/bytes"); +var Caml_string = require("../caml_string"); +var Bytes = require("../bytes"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var List = require("../stdlib/list"); -var Caml_string = require("../runtime/caml_string"); +var Block = require("../block"); +var List = require("../list"); +var Caml_string = require("../caml_string"); var suites_000 = /* tuple */[ "string_of_char_array", diff --git a/jscomp/test/string_test.js b/lib/js/test/string_test.js similarity index 96% rename from jscomp/test/string_test.js rename to lib/js/test/string_test.js index c391f4202c..e9d499b547 100644 --- a/jscomp/test/string_test.js +++ b/lib/js/test/string_test.js @@ -1,14 +1,14 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Bytes = require("../stdlib/bytes"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Bytes = require("../bytes"); var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); var Ext_string = require("./ext_string"); -var $$String = require("../stdlib/string"); -var List = require("../stdlib/list"); -var Caml_string = require("../runtime/caml_string"); +var $$String = require("../string"); +var List = require("../list"); +var Caml_string = require("../caml_string"); function ff(x) { var a; diff --git a/jscomp/test/stringmatch_test.js b/lib/js/test/stringmatch_test.js similarity index 99% rename from jscomp/test/stringmatch_test.js rename to lib/js/test/stringmatch_test.js index ec7074a314..ef482ef08c 100644 --- a/jscomp/test/stringmatch_test.js +++ b/lib/js/test/stringmatch_test.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); function tst01(s) { if (s === "") { diff --git a/jscomp/test/swap_test.js b/lib/js/test/swap_test.js similarity index 97% rename from jscomp/test/swap_test.js rename to lib/js/test/swap_test.js index 995a041f8c..8cc440e26e 100644 --- a/jscomp/test/swap_test.js +++ b/lib/js/test/swap_test.js @@ -1,17 +1,17 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_int64 = require("../runtime/caml_int64"); -var Caml_obj = require("../runtime/caml_obj"); -var Pervasives = require("../stdlib/pervasives"); +var Caml_int64 = require("../caml_int64"); +var Caml_obj = require("../caml_obj"); +var Pervasives = require("../pervasives"); var Mt = require("./mt"); -var Caml_int32 = require("../runtime/caml_int32"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); -var Printf = require("../stdlib/printf"); -var $$Array = require("../stdlib/array"); -var List = require("../stdlib/list"); -var Format = require("../stdlib/format"); +var Caml_int32 = require("../caml_int32"); +var Block = require("../block"); +var Curry = require("../curry"); +var Printf = require("../printf"); +var $$Array = require("../array"); +var List = require("../list"); +var Format = require("../format"); var tests_16 = Caml_obj.caml_obj_dup(/* array */[ /* tuple */[ diff --git a/jscomp/test/tailcall_inline_test.js b/lib/js/test/tailcall_inline_test.js similarity index 91% rename from jscomp/test/tailcall_inline_test.js rename to lib/js/test/tailcall_inline_test.js index c9a78c4d28..a3a44c668e 100644 --- a/jscomp/test/tailcall_inline_test.js +++ b/lib/js/test/tailcall_inline_test.js @@ -2,9 +2,9 @@ 'use strict'; var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Caml_array = require("../runtime/caml_array"); -var $$Array = require("../stdlib/array"); +var Block = require("../block"); +var Caml_array = require("../caml_array"); +var $$Array = require("../array"); function f() { var f$1 = function (_acc, _n) { diff --git a/jscomp/test/test_alias.js b/lib/js/test/test_alias.js similarity index 81% rename from jscomp/test/test_alias.js rename to lib/js/test/test_alias.js index acaba289a2..7228b45b6a 100644 --- a/jscomp/test/test_alias.js +++ b/lib/js/test/test_alias.js @@ -2,7 +2,7 @@ 'use strict'; var Test_global_print = require("./test_global_print"); -var List = require("../stdlib/list"); +var List = require("../list"); var v = List.length; diff --git a/jscomp/test/test_ari.js b/lib/js/test/test_ari.js similarity index 97% rename from jscomp/test/test_ari.js rename to lib/js/test/test_ari.js index 7d9ba6b53e..e7e147a4ef 100644 --- a/jscomp/test/test_ari.js +++ b/lib/js/test/test_ari.js @@ -1,9 +1,9 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../runtime/curry"); +var Curry = require("../curry"); var VV = require("VV"); -var List = require("../stdlib/list"); +var List = require("../list"); var U = require("U"); function f(x) { diff --git a/jscomp/test/test_array.js b/lib/js/test/test_array.js similarity index 88% rename from jscomp/test/test_array.js rename to lib/js/test/test_array.js index dbce3d0e1f..dc16a9ca55 100644 --- a/jscomp/test/test_array.js +++ b/lib/js/test/test_array.js @@ -1,8 +1,8 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_array = require("../runtime/caml_array"); -var $$Array = require("../stdlib/array"); +var Caml_array = require("../caml_array"); +var $$Array = require("../array"); var v = Caml_array.caml_make_vect(6, 5); diff --git a/jscomp/test/test_array_append.js b/lib/js/test/test_array_append.js similarity index 84% rename from jscomp/test/test_array_append.js rename to lib/js/test/test_array_append.js index 9b4e75af57..5226cb2ef7 100644 --- a/jscomp/test/test_array_append.js +++ b/lib/js/test/test_array_append.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var $$Array = require("../stdlib/array"); +var $$Array = require("../array"); var const_v = $$Array.append(/* int array */[ 1, diff --git a/jscomp/test/test_array_primitive.js b/lib/js/test/test_array_primitive.js similarity index 93% rename from jscomp/test/test_array_primitive.js rename to lib/js/test/test_array_primitive.js index 800a5f96be..cce7defbd7 100644 --- a/jscomp/test/test_array_primitive.js +++ b/lib/js/test/test_array_primitive.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); function caml_array_sub(x, offset, len) { var result = new Array(len); diff --git a/jscomp/test/test_bool_equal.js b/lib/js/test/test_bool_equal.js similarity index 94% rename from jscomp/test/test_bool_equal.js rename to lib/js/test/test_bool_equal.js index be24ec2ddc..684a4efb00 100644 --- a/jscomp/test/test_bool_equal.js +++ b/lib/js/test/test_bool_equal.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); function bool_equal(x, y) { if (x !== 0) { diff --git a/jscomp/test/test_bug.js b/lib/js/test/test_bug.js similarity index 96% rename from jscomp/test/test_bug.js rename to lib/js/test/test_bug.js index d5a22ebf47..3cdec98674 100644 --- a/jscomp/test/test_bug.js +++ b/lib/js/test/test_bug.js @@ -1,8 +1,8 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Bytes = require("../stdlib/bytes"); -var Caml_string = require("../runtime/caml_string"); +var Bytes = require("../bytes"); +var Caml_string = require("../caml_string"); function escaped(s) { var n = 0; diff --git a/jscomp/test/test_bytes.js b/lib/js/test/test_bytes.js similarity index 80% rename from jscomp/test/test_bytes.js rename to lib/js/test/test_bytes.js index d3503d219b..31ee8a6631 100644 --- a/jscomp/test/test_bytes.js +++ b/lib/js/test/test_bytes.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_string = require("../runtime/caml_string"); +var Caml_string = require("../caml_string"); var f = Caml_string.bytes_to_string diff --git a/jscomp/test/test_char.js b/lib/js/test/test_char.js similarity index 92% rename from jscomp/test/test_char.js rename to lib/js/test/test_char.js index af30121cf3..dc28c65ed9 100644 --- a/jscomp/test/test_char.js +++ b/lib/js/test/test_char.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); function f(x) { return x + 1 | 0; diff --git a/jscomp/test/test_closure.js b/lib/js/test/test_closure.js similarity index 73% rename from jscomp/test/test_closure.js rename to lib/js/test/test_closure.js index e502187578..dc77d23aa0 100644 --- a/jscomp/test/test_closure.js +++ b/lib/js/test/test_closure.js @@ -1,10 +1,10 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Curry = require("../runtime/curry"); -var Caml_array = require("../runtime/caml_array"); -var $$Array = require("../stdlib/array"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Curry = require("../curry"); +var Caml_array = require("../caml_array"); +var $$Array = require("../array"); var v = [0]; diff --git a/jscomp/test/test_common.js b/lib/js/test/test_common.js similarity index 79% rename from jscomp/test/test_common.js rename to lib/js/test/test_common.js index b9dfbddd31..e469ae1557 100644 --- a/jscomp/test/test_common.js +++ b/lib/js/test/test_common.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_exceptions = require("../runtime/caml_exceptions"); +var Caml_exceptions = require("../caml_exceptions"); var U = Caml_exceptions.create("Test_common.U"); diff --git a/jscomp/test/test_const_elim.js b/lib/js/test/test_const_elim.js similarity index 100% rename from jscomp/test/test_const_elim.js rename to lib/js/test/test_const_elim.js diff --git a/jscomp/test/test_const_propogate.js b/lib/js/test/test_const_propogate.js similarity index 100% rename from jscomp/test/test_const_propogate.js rename to lib/js/test/test_const_propogate.js diff --git a/jscomp/test/test_cps.js b/lib/js/test/test_cps.js similarity index 89% rename from jscomp/test/test_cps.js rename to lib/js/test/test_cps.js index 232fc62f1e..6e5298665b 100644 --- a/jscomp/test/test_cps.js +++ b/lib/js/test/test_cps.js @@ -1,8 +1,8 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../runtime/curry"); -var Caml_array = require("../runtime/caml_array"); +var Curry = require("../curry"); +var Caml_array = require("../caml_array"); function f(_n, _acc) { while(true) { diff --git a/jscomp/test/test_demo.js b/lib/js/test/test_demo.js similarity index 93% rename from jscomp/test/test_demo.js rename to lib/js/test/test_demo.js index 69fbb8a09a..d6d5794085 100644 --- a/jscomp/test/test_demo.js +++ b/lib/js/test/test_demo.js @@ -1,8 +1,8 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../runtime/curry"); -var List = require("../stdlib/list"); +var Curry = require("../curry"); +var List = require("../list"); function fib(n) { if (n === 2 || n === 1) { diff --git a/jscomp/test/test_dup_param.js b/lib/js/test/test_dup_param.js similarity index 100% rename from jscomp/test/test_dup_param.js rename to lib/js/test/test_dup_param.js diff --git a/jscomp/test/test_eq.js b/lib/js/test/test_eq.js similarity index 100% rename from jscomp/test/test_eq.js rename to lib/js/test/test_eq.js diff --git a/jscomp/test/test_exception.js b/lib/js/test/test_exception.js similarity index 82% rename from jscomp/test/test_exception.js rename to lib/js/test/test_exception.js index daf682f583..eabb3e1c1b 100644 --- a/jscomp/test/test_exception.js +++ b/lib/js/test/test_exception.js @@ -1,8 +1,8 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_exceptions = require("../runtime/caml_exceptions"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Caml_exceptions = require("../caml_exceptions"); var Test_common = require("./test_common"); var Local = Caml_exceptions.create("Test_exception.Local"); diff --git a/jscomp/test/test_exception_escape.js b/lib/js/test/test_exception_escape.js similarity index 83% rename from jscomp/test/test_exception_escape.js rename to lib/js/test/test_exception_escape.js index cb648a90b7..466b897910 100644 --- a/jscomp/test/test_exception_escape.js +++ b/lib/js/test/test_exception_escape.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_exceptions = require("../runtime/caml_exceptions"); +var Caml_exceptions = require("../caml_exceptions"); var A = Caml_exceptions.create("Test_exception_escape.N.A"); diff --git a/jscomp/test/test_export2.js b/lib/js/test/test_export2.js similarity index 74% rename from jscomp/test/test_export2.js rename to lib/js/test/test_export2.js index c6e61838d1..f7d5bd2ae7 100644 --- a/jscomp/test/test_export2.js +++ b/lib/js/test/test_export2.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_int32 = require("../runtime/caml_int32"); +var Caml_int32 = require("../caml_int32"); var f = Caml_int32.imul diff --git a/jscomp/test/test_external.js b/lib/js/test/test_external.js similarity index 84% rename from jscomp/test/test_external.js rename to lib/js/test/test_external.js index 538682f02f..5d6c591a69 100644 --- a/jscomp/test/test_external.js +++ b/lib/js/test/test_external.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../runtime/curry"); +var Curry = require("../curry"); var xx = document(); diff --git a/jscomp/test/test_external_unit.js b/lib/js/test/test_external_unit.js similarity index 100% rename from jscomp/test/test_external_unit.js rename to lib/js/test/test_external_unit.js diff --git a/jscomp/test/test_ffi.js b/lib/js/test/test_ffi.js similarity index 100% rename from jscomp/test/test_ffi.js rename to lib/js/test/test_ffi.js diff --git a/jscomp/test/test_fib.js b/lib/js/test/test_fib.js similarity index 97% rename from jscomp/test/test_fib.js rename to lib/js/test/test_fib.js index 7128e5837a..d2d3b2f2e7 100644 --- a/jscomp/test/test_fib.js +++ b/lib/js/test/test_fib.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../runtime/curry"); +var Curry = require("../curry"); function fib(n) { if (n === 0 || n === 1) { diff --git a/jscomp/test/test_filename.js b/lib/js/test/test_filename.js similarity index 69% rename from jscomp/test/test_filename.js rename to lib/js/test/test_filename.js index 995d6d47a3..83c4429a32 100644 --- a/jscomp/test/test_filename.js +++ b/lib/js/test/test_filename.js @@ -1,8 +1,8 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Filename = require("../stdlib/filename"); -var List = require("../stdlib/list"); +var Filename = require("../filename"); +var List = require("../list"); var u = Filename.chop_extension; diff --git a/jscomp/test/test_for_loop.js b/lib/js/test/test_for_loop.js similarity index 94% rename from jscomp/test/test_for_loop.js rename to lib/js/test/test_for_loop.js index 32f035c5b3..0d6bc9d4bc 100644 --- a/jscomp/test/test_for_loop.js +++ b/lib/js/test/test_for_loop.js @@ -1,9 +1,9 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_int32 = require("../runtime/caml_int32"); -var Curry = require("../runtime/curry"); -var $$Array = require("../stdlib/array"); +var Caml_int32 = require("../caml_int32"); +var Curry = require("../curry"); +var $$Array = require("../array"); function for_(x) { for(var i = 0 ,i_finish = (console.log("hi"), x.length); i <= i_finish; ++i){ diff --git a/jscomp/test/test_for_map.js b/lib/js/test/test_for_map.js similarity index 98% rename from jscomp/test/test_for_map.js rename to lib/js/test/test_for_map.js index 45da9d9dc1..d493cec88b 100644 --- a/jscomp/test/test_for_map.js +++ b/lib/js/test/test_for_map.js @@ -1,9 +1,9 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_obj = require("../runtime/caml_obj"); -var Curry = require("../runtime/curry"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Caml_obj = require("../caml_obj"); +var Curry = require("../curry"); function height(param) { if (param) { diff --git a/jscomp/test/test_for_map2.js b/lib/js/test/test_for_map2.js similarity index 100% rename from jscomp/test/test_for_map2.js rename to lib/js/test/test_for_map2.js diff --git a/jscomp/test/test_format.js b/lib/js/test/test_format.js similarity index 75% rename from jscomp/test/test_format.js rename to lib/js/test/test_format.js index 06c2589ff4..bb075d7f26 100644 --- a/jscomp/test/test_format.js +++ b/lib/js/test/test_format.js @@ -1,9 +1,9 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); -var Format = require("../stdlib/format"); +var Block = require("../block"); +var Curry = require("../curry"); +var Format = require("../format"); Curry._1(Format.fprintf(Format.std_formatter, /* Format */[ /* Int */Block.__(4, [ diff --git a/jscomp/test/test_formatter.js b/lib/js/test/test_formatter.js similarity index 91% rename from jscomp/test/test_formatter.js rename to lib/js/test/test_formatter.js index 4e99e46300..ad29dd8a04 100644 --- a/jscomp/test/test_formatter.js +++ b/lib/js/test/test_formatter.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Block = require("../runtime/block"); +var Block = require("../block"); function f() { return /* Format */[ diff --git a/jscomp/test/test_functor_dead_code.js b/lib/js/test/test_functor_dead_code.js similarity index 100% rename from jscomp/test/test_functor_dead_code.js rename to lib/js/test/test_functor_dead_code.js diff --git a/jscomp/test/test_generative_module.js b/lib/js/test/test_generative_module.js similarity index 100% rename from jscomp/test/test_generative_module.js rename to lib/js/test/test_generative_module.js diff --git a/jscomp/test/test_global_print.js b/lib/js/test/test_global_print.js similarity index 87% rename from jscomp/test/test_global_print.js rename to lib/js/test/test_global_print.js index 063c893acb..9a2d780062 100644 --- a/jscomp/test/test_global_print.js +++ b/lib/js/test/test_global_print.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Hashtbl = require("../stdlib/hashtbl"); +var Hashtbl = require("../hashtbl"); var List = /* module */[/* u */3]; diff --git a/jscomp/test/test_google_closure.js b/lib/js/test/test_google_closure.js similarity index 93% rename from jscomp/test/test_google_closure.js rename to lib/js/test/test_google_closure.js index 2f6cb934d1..1b2af49875 100644 --- a/jscomp/test/test_google_closure.js +++ b/lib/js/test/test_google_closure.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var $$Array = require("../stdlib/array"); +var $$Array = require("../array"); function f(a, b, _) { return a + b | 0; diff --git a/jscomp/test/test_include.js b/lib/js/test/test_include.js similarity index 97% rename from jscomp/test/test_include.js rename to lib/js/test/test_include.js index 853bebe284..0be99f117e 100644 --- a/jscomp/test/test_include.js +++ b/lib/js/test/test_include.js @@ -2,8 +2,8 @@ 'use strict'; var Test_order = require("./test_order"); -var $$String = require("../stdlib/string"); -var List = require("../stdlib/list"); +var $$String = require("../string"); +var List = require("../list"); function Make(U) { var compare = U[0]; diff --git a/jscomp/test/test_incomplete.js b/lib/js/test/test_incomplete.js similarity index 89% rename from jscomp/test/test_incomplete.js rename to lib/js/test/test_incomplete.js index 7440e89958..59a34f5a98 100644 --- a/jscomp/test/test_incomplete.js +++ b/lib/js/test/test_incomplete.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); function f(x) { if (x > 3 || x < 1) { diff --git a/jscomp/test/test_incr_ref.js b/lib/js/test/test_incr_ref.js similarity index 100% rename from jscomp/test/test_incr_ref.js rename to lib/js/test/test_incr_ref.js diff --git a/jscomp/test/test_int_map_find.js b/lib/js/test/test_int_map_find.js similarity index 93% rename from jscomp/test/test_int_map_find.js rename to lib/js/test/test_int_map_find.js index e4636da599..5e5bfe60f4 100644 --- a/jscomp/test/test_int_map_find.js +++ b/lib/js/test/test_int_map_find.js @@ -1,9 +1,9 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_obj = require("../runtime/caml_obj"); -var List = require("../stdlib/list"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Caml_obj = require("../caml_obj"); +var List = require("../list"); function height(param) { if (param) { diff --git a/jscomp/test/test_internalOO.js b/lib/js/test/test_internalOO.js similarity index 98% rename from jscomp/test/test_internalOO.js rename to lib/js/test/test_internalOO.js index 4371cfc3d7..d933545137 100644 --- a/jscomp/test/test_internalOO.js +++ b/lib/js/test/test_internalOO.js @@ -1,18 +1,18 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../runtime/caml_obj"); -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Obj = require("../stdlib/obj"); -var Caml_exceptions = require("../runtime/caml_exceptions"); -var Caml_oo = require("../runtime/caml_oo"); -var Caml_int32 = require("../runtime/caml_int32"); -var Sys = require("../stdlib/sys"); -var Curry = require("../runtime/curry"); -var Caml_array = require("../runtime/caml_array"); -var $$Array = require("../stdlib/array"); -var Caml_string = require("../runtime/caml_string"); -var List = require("../stdlib/list"); +var Caml_obj = require("../caml_obj"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Obj = require("../obj"); +var Caml_exceptions = require("../caml_exceptions"); +var Caml_oo = require("../caml_oo"); +var Caml_int32 = require("../caml_int32"); +var Sys = require("../sys"); +var Curry = require("../curry"); +var Caml_array = require("../caml_array"); +var $$Array = require("../array"); +var Caml_string = require("../caml_string"); +var List = require("../list"); function copy(o) { return Caml_exceptions.caml_set_oo_id(Caml_obj.caml_obj_dup(o)); diff --git a/jscomp/test/test_is_js.js b/lib/js/test/test_is_js.js similarity index 100% rename from jscomp/test/test_is_js.js rename to lib/js/test/test_is_js.js diff --git a/jscomp/test/test_js_ffi.js b/lib/js/test/test_js_ffi.js similarity index 94% rename from jscomp/test/test_js_ffi.js rename to lib/js/test/test_js_ffi.js index 2c1e2adc5b..0f95ce684b 100644 --- a/jscomp/test/test_js_ffi.js +++ b/lib/js/test/test_js_ffi.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var $$String = require("../stdlib/string"); +var $$String = require("../string"); function v() { t([$$String.compare]); diff --git a/jscomp/test/test_let.js b/lib/js/test/test_let.js similarity index 76% rename from jscomp/test/test_let.js rename to lib/js/test/test_let.js index f17b7729f9..3f7d871b46 100644 --- a/jscomp/test/test_let.js +++ b/lib/js/test/test_let.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Pervasives = require("../stdlib/pervasives"); +var Pervasives = require("../pervasives"); Pervasives.print_int(3); diff --git a/jscomp/test/test_list.js b/lib/js/test/test_list.js similarity index 99% rename from jscomp/test/test_list.js rename to lib/js/test/test_list.js index 4e46d8a10d..adf7ad74fa 100644 --- a/jscomp/test/test_list.js +++ b/lib/js/test/test_list.js @@ -1,11 +1,11 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_obj = require("../runtime/caml_obj"); -var Pervasives = require("../stdlib/pervasives"); -var Curry = require("../runtime/curry"); -var List = require("../stdlib/list"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Caml_obj = require("../caml_obj"); +var Pervasives = require("../pervasives"); +var Curry = require("../curry"); +var List = require("../list"); function length_aux(_len, _param) { while(true) { diff --git a/jscomp/test/test_literal.js b/lib/js/test/test_literal.js similarity index 91% rename from jscomp/test/test_literal.js rename to lib/js/test/test_literal.js index 31a27a4ad9..e4ac945ec9 100644 --- a/jscomp/test/test_literal.js +++ b/lib/js/test/test_literal.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_exceptions = require("../runtime/caml_exceptions"); +var Caml_exceptions = require("../caml_exceptions"); var Custom_inline = Caml_exceptions.create("Test_literal.Custom_inline"); diff --git a/jscomp/test/test_match_exception.js b/lib/js/test/test_match_exception.js similarity index 69% rename from jscomp/test/test_match_exception.js rename to lib/js/test/test_match_exception.js index 3f1b416b0f..d6e0a45d00 100644 --- a/jscomp/test/test_match_exception.js +++ b/lib/js/test/test_match_exception.js @@ -1,8 +1,8 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Curry = require("../runtime/curry"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Curry = require("../curry"); function f(g, x) { try { diff --git a/jscomp/test/test_nat64.js b/lib/js/test/test_nat64.js similarity index 100% rename from jscomp/test/test_nat64.js rename to lib/js/test/test_nat64.js diff --git a/jscomp/test/test_nested_let.js b/lib/js/test/test_nested_let.js similarity index 100% rename from jscomp/test/test_nested_let.js rename to lib/js/test/test_nested_let.js diff --git a/jscomp/test/test_nested_print.js b/lib/js/test/test_nested_print.js similarity index 85% rename from jscomp/test/test_nested_print.js rename to lib/js/test/test_nested_print.js index fa83fcf135..405a0b7aa3 100644 --- a/jscomp/test/test_nested_print.js +++ b/lib/js/test/test_nested_print.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../runtime/curry"); +var Curry = require("../curry"); function u(_, x) { return x + x | 0; diff --git a/jscomp/test/test_non_export.js b/lib/js/test/test_non_export.js similarity index 100% rename from jscomp/test/test_non_export.js rename to lib/js/test/test_non_export.js diff --git a/jscomp/test/test_nullary.js b/lib/js/test/test_nullary.js similarity index 100% rename from jscomp/test/test_nullary.js rename to lib/js/test/test_nullary.js diff --git a/jscomp/test/test_obj.js b/lib/js/test/test_obj.js similarity index 85% rename from jscomp/test/test_obj.js rename to lib/js/test/test_obj.js index 3d9568bd04..c3c17a32a1 100644 --- a/jscomp/test/test_obj.js +++ b/lib/js/test/test_obj.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../runtime/curry"); +var Curry = require("../curry"); function f(x) { if (x.tag === 248) { diff --git a/jscomp/test/test_obj_simple_ffi.js b/lib/js/test/test_obj_simple_ffi.js similarity index 100% rename from jscomp/test/test_obj_simple_ffi.js rename to lib/js/test/test_obj_simple_ffi.js diff --git a/jscomp/test/test_order.js b/lib/js/test/test_order.js similarity index 78% rename from jscomp/test/test_order.js rename to lib/js/test/test_order.js index 7661578185..58cbb6100f 100644 --- a/jscomp/test/test_order.js +++ b/lib/js/test/test_order.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../runtime/caml_obj"); +var Caml_obj = require("../caml_obj"); var compare = Caml_obj.caml_int_compare diff --git a/jscomp/test/test_order_tailcall.js b/lib/js/test/test_order_tailcall.js similarity index 100% rename from jscomp/test/test_order_tailcall.js rename to lib/js/test/test_order_tailcall.js diff --git a/jscomp/test/test_pack.js b/lib/js/test/test_pack.js similarity index 100% rename from jscomp/test/test_pack.js rename to lib/js/test/test_pack.js diff --git a/jscomp/test/test_per.js b/lib/js/test/test_per.js similarity index 96% rename from jscomp/test/test_per.js rename to lib/js/test/test_per.js index e431216143..b3424c20cf 100644 --- a/jscomp/test/test_per.js +++ b/lib/js/test/test_per.js @@ -1,14 +1,14 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_obj = require("../runtime/caml_obj"); -var Caml_io = require("../runtime/caml_io"); -var Caml_exceptions = require("../runtime/caml_exceptions"); -var Caml_format = require("../runtime/caml_format"); -var Curry = require("../runtime/curry"); -var CamlinternalFormatBasics = require("../stdlib/camlinternalFormatBasics"); -var Caml_string = require("../runtime/caml_string"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Caml_obj = require("../caml_obj"); +var Caml_io = require("../caml_io"); +var Caml_exceptions = require("../caml_exceptions"); +var Caml_format = require("../caml_format"); +var Curry = require("../curry"); +var CamlinternalFormatBasics = require("../camlinternalFormatBasics"); +var Caml_string = require("../caml_string"); function failwith(s) { throw [ diff --git a/jscomp/test/test_pervasive.js b/lib/js/test/test_pervasive.js similarity index 98% rename from jscomp/test/test_pervasive.js rename to lib/js/test/test_pervasive.js index 8fb0897b51..667de2e89e 100644 --- a/jscomp/test/test_pervasive.js +++ b/lib/js/test/test_pervasive.js @@ -1,8 +1,8 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Pervasives = require("../stdlib/pervasives"); -var List = require("../stdlib/list"); +var Pervasives = require("../pervasives"); +var List = require("../list"); var Pervasives$1 = /* module */[ /* length */List.length, diff --git a/jscomp/test/test_pervasives2.js b/lib/js/test/test_pervasives2.js similarity index 98% rename from jscomp/test/test_pervasives2.js rename to lib/js/test/test_pervasives2.js index c59e2313eb..34db221480 100644 --- a/jscomp/test/test_pervasives2.js +++ b/lib/js/test/test_pervasives2.js @@ -1,9 +1,9 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Pervasives = require("../stdlib/pervasives"); -var Stack = require("../stdlib/stack"); -var List = require("../stdlib/list"); +var Pervasives = require("../pervasives"); +var Stack = require("../stack"); +var List = require("../list"); var List$1 = /* module */[ /* length */List.length, diff --git a/jscomp/test/test_pervasives3.js b/lib/js/test/test_pervasives3.js similarity index 98% rename from jscomp/test/test_pervasives3.js rename to lib/js/test/test_pervasives3.js index 97d6502199..f586505477 100644 --- a/jscomp/test/test_pervasives3.js +++ b/lib/js/test/test_pervasives3.js @@ -1,8 +1,8 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Pervasives = require("../stdlib/pervasives"); -var List = require("../stdlib/list"); +var Pervasives = require("../pervasives"); +var List = require("../list"); var Pervasives$1 = /* module */[ /* invalid_arg */Pervasives.invalid_arg, diff --git a/jscomp/test/test_primitive.js b/lib/js/test/test_primitive.js similarity index 92% rename from jscomp/test/test_primitive.js rename to lib/js/test/test_primitive.js index d246ef8543..f02c014e4a 100644 --- a/jscomp/test/test_primitive.js +++ b/lib/js/test/test_primitive.js @@ -1,9 +1,9 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var CamlinternalLazy = require("../stdlib/camlinternalLazy"); -var Pervasives = require("../stdlib/pervasives"); -var Curry = require("../runtime/curry"); +var CamlinternalLazy = require("../camlinternalLazy"); +var Pervasives = require("../pervasives"); +var Curry = require("../curry"); function a4(prim) { return [ diff --git a/jscomp/test/test_ramification.js b/lib/js/test/test_ramification.js similarity index 100% rename from jscomp/test/test_ramification.js rename to lib/js/test/test_ramification.js diff --git a/jscomp/test/test_react.js b/lib/js/test/test_react.js similarity index 93% rename from jscomp/test/test_react.js rename to lib/js/test/test_react.js index 68a7743d59..20976df7fa 100644 --- a/jscomp/test/test_react.js +++ b/lib/js/test/test_react.js @@ -3,7 +3,7 @@ var ReactDom = require("react-dom"); var React = require("react"); -var Curry = require("../runtime/curry"); +var Curry = require("../curry"); Curry._1(console.log.bind(console), "hey"); diff --git a/jscomp/test/test_react_case.js b/lib/js/test/test_react_case.js similarity index 100% rename from jscomp/test/test_react_case.js rename to lib/js/test/test_react_case.js diff --git a/jscomp/test/test_runtime_encoding.js b/lib/js/test/test_runtime_encoding.js similarity index 100% rename from jscomp/test/test_runtime_encoding.js rename to lib/js/test/test_runtime_encoding.js diff --git a/jscomp/test/test_scope.js b/lib/js/test/test_scope.js similarity index 100% rename from jscomp/test/test_scope.js rename to lib/js/test/test_scope.js diff --git a/jscomp/test/test_seq.js b/lib/js/test/test_seq.js similarity index 83% rename from jscomp/test/test_seq.js rename to lib/js/test/test_seq.js index 7be3e3699c..3fcfc01748 100644 --- a/jscomp/test/test_seq.js +++ b/lib/js/test/test_seq.js @@ -1,12 +1,12 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_obj = require("../runtime/caml_obj"); -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_exceptions = require("../runtime/caml_exceptions"); -var Pervasives = require("../stdlib/pervasives"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); +var Caml_obj = require("../caml_obj"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Caml_exceptions = require("../caml_exceptions"); +var Pervasives = require("../pervasives"); +var Block = require("../block"); +var Curry = require("../curry"); var Bad = Caml_exceptions.create("Test_seq.Bad"); diff --git a/jscomp/test/test_set.js b/lib/js/test/test_set.js similarity index 99% rename from jscomp/test/test_set.js rename to lib/js/test/test_set.js index d89f160bb9..9da36c8c0b 100644 --- a/jscomp/test/test_set.js +++ b/lib/js/test/test_set.js @@ -1,9 +1,9 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Curry = require("../runtime/curry"); -var List = require("../stdlib/list"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Curry = require("../curry"); +var List = require("../list"); function Make(Ord) { var height = function (param) { diff --git a/jscomp/test/test_side_effect_functor.js b/lib/js/test/test_side_effect_functor.js similarity index 100% rename from jscomp/test/test_side_effect_functor.js rename to lib/js/test/test_side_effect_functor.js diff --git a/jscomp/test/test_simple_include.js b/lib/js/test/test_simple_include.js similarity index 97% rename from jscomp/test/test_simple_include.js rename to lib/js/test/test_simple_include.js index 6226c61e7f..e22ea0e549 100644 --- a/jscomp/test/test_simple_include.js +++ b/lib/js/test/test_simple_include.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var $$Array = require("../stdlib/array"); +var $$Array = require("../array"); var v = [32]; diff --git a/jscomp/test/test_simple_obj.js b/lib/js/test/test_simple_obj.js similarity index 94% rename from jscomp/test/test_simple_obj.js rename to lib/js/test/test_simple_obj.js index da2036806c..b838efbaff 100644 --- a/jscomp/test/test_simple_obj.js +++ b/lib/js/test/test_simple_obj.js @@ -1,9 +1,9 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Curry = require("../runtime/curry"); -var CamlinternalOO = require("../stdlib/camlinternalOO"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Curry = require("../curry"); +var CamlinternalOO = require("../camlinternalOO"); var shared = ["add"]; diff --git a/jscomp/test/test_simple_pattern_match.js b/lib/js/test/test_simple_pattern_match.js similarity index 100% rename from jscomp/test/test_simple_pattern_match.js rename to lib/js/test/test_simple_pattern_match.js diff --git a/jscomp/test/test_simple_ref.js b/lib/js/test/test_simple_ref.js similarity index 91% rename from jscomp/test/test_simple_ref.js rename to lib/js/test/test_simple_ref.js index 21b8d1681c..02e960e175 100644 --- a/jscomp/test/test_simple_ref.js +++ b/lib/js/test/test_simple_ref.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../runtime/curry"); +var Curry = require("../curry"); var v = [0]; diff --git a/jscomp/test/test_simple_tailcall.js b/lib/js/test/test_simple_tailcall.js similarity index 100% rename from jscomp/test/test_simple_tailcall.js rename to lib/js/test/test_simple_tailcall.js diff --git a/jscomp/test/test_small.js b/lib/js/test/test_small.js similarity index 100% rename from jscomp/test/test_small.js rename to lib/js/test/test_small.js diff --git a/jscomp/test/test_sprintf.js b/lib/js/test/test_sprintf.js similarity index 80% rename from jscomp/test/test_sprintf.js rename to lib/js/test/test_sprintf.js index 7661e83a1b..7d2543e6cd 100644 --- a/jscomp/test/test_sprintf.js +++ b/lib/js/test/test_sprintf.js @@ -1,9 +1,9 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); -var Printf = require("../stdlib/printf"); +var Block = require("../block"); +var Curry = require("../curry"); +var Printf = require("../printf"); console.error(Curry._2(Printf.sprintf(/* Format */[ /* Int */Block.__(4, [ diff --git a/jscomp/test/test_stack.js b/lib/js/test/test_stack.js similarity index 100% rename from jscomp/test/test_stack.js rename to lib/js/test/test_stack.js diff --git a/jscomp/test/test_static_catch_ident.js b/lib/js/test/test_static_catch_ident.js similarity index 82% rename from jscomp/test/test_static_catch_ident.js rename to lib/js/test/test_static_catch_ident.js index 4dd99e1bf7..c29384977e 100644 --- a/jscomp/test/test_static_catch_ident.js +++ b/lib/js/test/test_static_catch_ident.js @@ -1,8 +1,8 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_exceptions = require("../runtime/caml_exceptions"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Caml_exceptions = require("../caml_exceptions"); var Scan_failure = Caml_exceptions.create("Test_static_catch_ident.Scan_failure"); diff --git a/jscomp/test/test_string.js b/lib/js/test/test_string.js similarity index 91% rename from jscomp/test/test_string.js rename to lib/js/test/test_string.js index 367eeb8007..a38a6aa1d5 100644 --- a/jscomp/test/test_string.js +++ b/lib/js/test/test_string.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); function f(param) { switch (param) { diff --git a/jscomp/test/test_string_case.js b/lib/js/test/test_string_case.js similarity index 84% rename from jscomp/test/test_string_case.js rename to lib/js/test/test_string_case.js index 0afbcfed40..2d12e980d9 100644 --- a/jscomp/test/test_string_case.js +++ b/lib/js/test/test_string_case.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); function f(param) { switch (param) { diff --git a/jscomp/test/test_string_const.js b/lib/js/test/test_string_const.js similarity index 100% rename from jscomp/test/test_string_const.js rename to lib/js/test/test_string_const.js diff --git a/jscomp/test/test_string_map.js b/lib/js/test/test_string_map.js similarity index 94% rename from jscomp/test/test_string_map.js rename to lib/js/test/test_string_map.js index 7cd4cc66d8..6c7015ff00 100644 --- a/jscomp/test/test_string_map.js +++ b/lib/js/test/test_string_map.js @@ -1,9 +1,9 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Curry = require("../runtime/curry"); -var Caml_string = require("../runtime/caml_string"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Curry = require("../curry"); +var Caml_string = require("../caml_string"); function height(param) { if (param) { diff --git a/jscomp/test/test_string_switch.js b/lib/js/test/test_string_switch.js similarity index 100% rename from jscomp/test/test_string_switch.js rename to lib/js/test/test_string_switch.js diff --git a/jscomp/test/test_switch.js b/lib/js/test/test_switch.js similarity index 88% rename from jscomp/test/test_switch.js rename to lib/js/test/test_switch.js index 065210c766..053c5c3924 100644 --- a/jscomp/test/test_switch.js +++ b/lib/js/test/test_switch.js @@ -1,8 +1,8 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); +var Block = require("../block"); +var Curry = require("../curry"); function f(param) { if (typeof param === "number") { diff --git a/jscomp/test/test_trywith.js b/lib/js/test/test_trywith.js similarity index 90% rename from jscomp/test/test_trywith.js rename to lib/js/test/test_trywith.js index 70c98ee3f5..c319ac240d 100644 --- a/jscomp/test/test_trywith.js +++ b/lib/js/test/test_trywith.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); function u() { throw Caml_builtin_exceptions.not_found; diff --git a/jscomp/test/test_tuple.js b/lib/js/test/test_tuple.js similarity index 88% rename from jscomp/test/test_tuple.js rename to lib/js/test/test_tuple.js index 1963251394..a5076eb608 100644 --- a/jscomp/test/test_tuple.js +++ b/lib/js/test/test_tuple.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_int32 = require("../runtime/caml_int32"); +var Caml_int32 = require("../caml_int32"); var r = 0; diff --git a/jscomp/test/test_tuple_destructring.js b/lib/js/test/test_tuple_destructring.js similarity index 100% rename from jscomp/test/test_tuple_destructring.js rename to lib/js/test/test_tuple_destructring.js diff --git a/jscomp/test/test_type_based_arity.js b/lib/js/test/test_type_based_arity.js similarity index 96% rename from jscomp/test/test_type_based_arity.js rename to lib/js/test/test_type_based_arity.js index a5e34f977c..5da4d70439 100644 --- a/jscomp/test/test_type_based_arity.js +++ b/lib/js/test/test_type_based_arity.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Curry = require("../runtime/curry"); +var Curry = require("../curry"); function f0(g, x) { return Curry._1(g, x); diff --git a/jscomp/test/test_u.js b/lib/js/test/test_u.js similarity index 100% rename from jscomp/test/test_u.js rename to lib/js/test/test_u.js diff --git a/jscomp/test/test_unsupported_primitive.js b/lib/js/test/test_unsupported_primitive.js similarity index 87% rename from jscomp/test/test_unsupported_primitive.js rename to lib/js/test/test_unsupported_primitive.js index 72f291b028..9c42ae8bbc 100644 --- a/jscomp/test/test_unsupported_primitive.js +++ b/lib/js/test/test_unsupported_primitive.js @@ -1,7 +1,7 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); function to_buffer(buff, ofs, len, _, _$1) { if (ofs < 0 || len < 0 || ofs > (buff.length - len | 0)) { diff --git a/jscomp/test/test_while_closure.js b/lib/js/test/test_while_closure.js similarity index 76% rename from jscomp/test/test_while_closure.js rename to lib/js/test/test_while_closure.js index 7464c0f855..490190c34c 100644 --- a/jscomp/test/test_while_closure.js +++ b/lib/js/test/test_while_closure.js @@ -1,10 +1,10 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Curry = require("../runtime/curry"); -var Caml_array = require("../runtime/caml_array"); -var $$Array = require("../stdlib/array"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Curry = require("../curry"); +var Caml_array = require("../caml_array"); +var $$Array = require("../array"); var v = [0]; diff --git a/jscomp/test/test_while_side_effect.js b/lib/js/test/test_while_side_effect.js similarity index 100% rename from jscomp/test/test_while_side_effect.js rename to lib/js/test/test_while_side_effect.js diff --git a/jscomp/test/test_zero_nullable.js b/lib/js/test/test_zero_nullable.js similarity index 96% rename from jscomp/test/test_zero_nullable.js rename to lib/js/test/test_zero_nullable.js index af615d110b..363beb7b48 100644 --- a/jscomp/test/test_zero_nullable.js +++ b/lib/js/test/test_zero_nullable.js @@ -1,10 +1,10 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Js_primitive = require("../runtime/js_primitive"); +var Js_primitive = require("../js_primitive"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); +var Block = require("../block"); +var Curry = require("../curry"); var suites = [/* [] */0]; diff --git a/jscomp/test/testing.js b/lib/js/test/testing.js similarity index 90% rename from jscomp/test/testing.js rename to lib/js/test/testing.js index 0463a29b01..5536128158 100644 --- a/jscomp/test/testing.js +++ b/lib/js/test/testing.js @@ -1,14 +1,14 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_io = require("../runtime/caml_io"); -var Caml_obj = require("../runtime/caml_obj"); -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Pervasives = require("../stdlib/pervasives"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); -var Printf = require("../stdlib/printf"); -var Scanf = require("../stdlib/scanf"); +var Caml_io = require("../caml_io"); +var Caml_obj = require("../caml_obj"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Pervasives = require("../pervasives"); +var Block = require("../block"); +var Curry = require("../curry"); +var Printf = require("../printf"); +var Scanf = require("../scanf"); var all_tests_ok = [/* true */1]; diff --git a/jscomp/test/tfloat_record_test.js b/lib/js/test/tfloat_record_test.js similarity index 87% rename from jscomp/test/tfloat_record_test.js rename to lib/js/test/tfloat_record_test.js index 2e4d5345c8..2ebb7725c4 100644 --- a/jscomp/test/tfloat_record_test.js +++ b/lib/js/test/tfloat_record_test.js @@ -2,14 +2,14 @@ 'use strict'; var Float_array = require("./float_array"); -var Pervasives = require("../stdlib/pervasives"); +var Pervasives = require("../pervasives"); var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); var Mt_global = require("./mt_global"); -var Curry = require("../runtime/curry"); -var $$Array = require("../stdlib/array"); -var Buffer = require("../stdlib/buffer"); -var Format = require("../stdlib/format"); +var Curry = require("../curry"); +var $$Array = require("../array"); +var Buffer = require("../buffer"); +var Format = require("../format"); var buf = Buffer.create(50); diff --git a/jscomp/test/ticker.js b/lib/js/test/ticker.js similarity index 98% rename from jscomp/test/ticker.js rename to lib/js/test/ticker.js index 63ae717185..86d9fd2262 100644 --- a/jscomp/test/ticker.js +++ b/lib/js/test/ticker.js @@ -1,15 +1,15 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_obj = require("../runtime/caml_obj"); -var Pervasives = require("../stdlib/pervasives"); -var Caml_format = require("../runtime/caml_format"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); -var Printf = require("../stdlib/printf"); -var $$String = require("../stdlib/string"); -var List = require("../stdlib/list"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Caml_obj = require("../caml_obj"); +var Pervasives = require("../pervasives"); +var Caml_format = require("../caml_format"); +var Block = require("../block"); +var Curry = require("../curry"); +var Printf = require("../printf"); +var $$String = require("../string"); +var List = require("../list"); function split(delim, s) { var len = s.length; diff --git a/jscomp/test/to_string_test.js b/lib/js/test/to_string_test.js similarity index 90% rename from jscomp/test/to_string_test.js rename to lib/js/test/to_string_test.js index 451948e132..c5d0cb9c79 100644 --- a/jscomp/test/to_string_test.js +++ b/lib/js/test/to_string_test.js @@ -1,9 +1,9 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Pervasives = require("../stdlib/pervasives"); +var Pervasives = require("../pervasives"); var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); var ff = Pervasives.string_of_float diff --git a/jscomp/test/tscanf_test.js b/lib/js/test/tscanf_test.js similarity index 99% rename from jscomp/test/tscanf_test.js rename to lib/js/test/tscanf_test.js index 444c542e22..7d141580af 100644 --- a/jscomp/test/tscanf_test.js +++ b/lib/js/test/tscanf_test.js @@ -1,23 +1,23 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_int64 = require("../runtime/caml_int64"); -var Caml_obj = require("../runtime/caml_obj"); -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Bytes = require("../stdlib/bytes"); -var Pervasives = require("../stdlib/pervasives"); -var Caml_format = require("../runtime/caml_format"); +var Caml_int64 = require("../caml_int64"); +var Caml_obj = require("../caml_obj"); +var Caml_builtin_exceptions = require("../caml_builtin_exceptions"); +var Bytes = require("../bytes"); +var Pervasives = require("../pervasives"); +var Caml_format = require("../caml_format"); var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); var Testing = require("./testing"); var Mt_global = require("./mt_global"); -var Curry = require("../runtime/curry"); -var Scanf = require("../stdlib/scanf"); -var Printf = require("../stdlib/printf"); -var Buffer = require("../stdlib/buffer"); -var $$String = require("../stdlib/string"); -var List = require("../stdlib/list"); -var Caml_string = require("../runtime/caml_string"); +var Curry = require("../curry"); +var Scanf = require("../scanf"); +var Printf = require("../printf"); +var Buffer = require("../buffer"); +var $$String = require("../string"); +var List = require("../list"); +var Caml_string = require("../caml_string"); var suites = [/* [] */0]; diff --git a/jscomp/test/tuple_alloc.js b/lib/js/test/tuple_alloc.js similarity index 100% rename from jscomp/test/tuple_alloc.js rename to lib/js/test/tuple_alloc.js diff --git a/jscomp/test/typeof_test.js b/lib/js/test/typeof_test.js similarity index 93% rename from jscomp/test/typeof_test.js rename to lib/js/test/typeof_test.js index e7d2f88a4e..cc9aeeb2b1 100644 --- a/jscomp/test/typeof_test.js +++ b/lib/js/test/typeof_test.js @@ -2,7 +2,7 @@ 'use strict'; var Mt = require("./mt"); -var Block = require("../runtime/block"); +var Block = require("../block"); var suites_000 = /* tuple */[ "int_type", diff --git a/jscomp/test/undef_regression_test.js b/lib/js/test/undef_regression_test.js similarity index 100% rename from jscomp/test/undef_regression_test.js rename to lib/js/test/undef_regression_test.js diff --git a/jscomp/test/unitest_string.js b/lib/js/test/unitest_string.js similarity index 100% rename from jscomp/test/unitest_string.js rename to lib/js/test/unitest_string.js diff --git a/jscomp/test/unsafe_ppx_test.js b/lib/js/test/unsafe_ppx_test.js similarity index 94% rename from jscomp/test/unsafe_ppx_test.js rename to lib/js/test/unsafe_ppx_test.js index a6a49bba8d..7880db9ac5 100644 --- a/jscomp/test/unsafe_ppx_test.js +++ b/lib/js/test/unsafe_ppx_test.js @@ -1,10 +1,10 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Pervasives = require("../stdlib/pervasives"); +var Pervasives = require("../pervasives"); var Mt = require("./mt"); -var Block = require("../runtime/block"); -var Curry = require("../runtime/curry"); +var Block = require("../block"); +var Curry = require("../curry"); var Ffi_js = require("./ffi_js"); var x = ("\x01\x02\x03"); diff --git a/jscomp/runtime/typed_array.js b/lib/js/typed_array.js similarity index 100% rename from jscomp/runtime/typed_array.js rename to lib/js/typed_array.js diff --git a/jscomp/stdlib/unix.js b/lib/js/unix.js similarity index 99% rename from jscomp/stdlib/unix.js rename to lib/js/unix.js index e43979fdde..07ac52267b 100644 --- a/jscomp/stdlib/unix.js +++ b/lib/js/unix.js @@ -1,21 +1,21 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_io = require("../runtime/caml_io"); -var Caml_sys = require("../runtime/caml_sys"); -var Caml_exceptions = require("../runtime/caml_exceptions"); +var Caml_builtin_exceptions = require("./caml_builtin_exceptions"); +var Caml_io = require("./caml_io"); +var Caml_sys = require("./caml_sys"); +var Caml_exceptions = require("./caml_exceptions"); var Pervasives = require("./pervasives"); var Hashtbl = require("./hashtbl"); -var Caml_format = require("../runtime/caml_format"); +var Caml_format = require("./caml_format"); var Callback = require("./callback"); -var Block = require("../runtime/block"); +var Block = require("./block"); var Sys = require("./sys"); -var Curry = require("../runtime/curry"); +var Curry = require("./curry"); var Printf = require("./printf"); var $$Array = require("./array"); var Printexc = require("./printexc"); -var Caml_string = require("../runtime/caml_string"); +var Caml_string = require("./caml_string"); var List = require("./list"); var Unix_error = Caml_exceptions.create("Unix.Unix_error"); diff --git a/jscomp/stdlib/unixLabels.js b/lib/js/unixLabels.js similarity index 100% rename from jscomp/stdlib/unixLabels.js rename to lib/js/unixLabels.js diff --git a/jscomp/stdlib/weak.js b/lib/js/weak.js similarity index 97% rename from jscomp/stdlib/weak.js rename to lib/js/weak.js index 43c3cca9b7..a4e0d46cd7 100644 --- a/jscomp/stdlib/weak.js +++ b/lib/js/weak.js @@ -1,15 +1,15 @@ // GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE 'use strict'; -var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions"); -var Caml_obj = require("../runtime/caml_obj"); +var Caml_builtin_exceptions = require("./caml_builtin_exceptions"); +var Caml_obj = require("./caml_obj"); var Pervasives = require("./pervasives"); -var Caml_int32 = require("../runtime/caml_int32"); +var Caml_int32 = require("./caml_int32"); var Sys = require("./sys"); -var Curry = require("../runtime/curry"); -var Caml_array = require("../runtime/caml_array"); +var Curry = require("./curry"); +var Caml_array = require("./caml_array"); var $$Array = require("./array"); -var Caml_weak = require("../runtime/caml_weak"); +var Caml_weak = require("./caml_weak"); function length(x) { return x.length - 1 | 0; diff --git a/package.json b/package.json index d2be473bb5..e02a27b45b 100644 --- a/package.json +++ b/package.json @@ -14,10 +14,14 @@ "uglify-js": "^2.6.1" }, "scripts": { - "test": "node ./node_modules/mocha/bin/mocha './jscomp/test/**/*_test.js' ", - "wtest": "node ./node_modules/mocha/bin/mocha './jscomp/test/**/*_test.js' -R spec -w", - "cover": "node ./node_modules/istanbul/lib/cli.js cover --report html ./node_modules/.bin/_mocha -- jscomp/test/*test.js", - "coverage": "`npm bin`/istanbul cover ./node_modules/.bin/_mocha --report lcovonly -- './jscomp/test/**/*_test.js' -R spec", + "test": + "node ./node_modules/mocha/bin/mocha './lib/js/test/*_test.js' ", + "wtest": + "node ./node_modules/mocha/bin/mocha './lib/js/test/*_test.js' -R spec -w", + "cover": + "node ./node_modules/istanbul/lib/cli.js cover --report html ./node_modules/.bin/_mocha -- ./lib/js/test/*test.js", + "coverage": + "`npm bin`/istanbul cover ./node_modules/.bin/_mocha --report lcovonly -- './lib/js/test/*test.js' -R spec", "coveralls": "npm run-script coverage && node ./node_modules/.bin/coveralls < coverage/lcov.info" } }