Skip to content

provide a compatibility layer for ast cross compiler versions #2991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions jscomp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ COMMON_SRCS= bs_version\
COMMON_CMXS= $(addprefix common/, $(addsuffix .cmx, $(COMMON_SRCS)))
SYNTAX_SRCS= \
bs_syntaxerr\
ast_compatible\
ast_utf8_string\
ast_utf8_string_interp\
ast_derive_constructor \
Expand Down
22 changes: 22 additions & 0 deletions jscomp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,25 @@ so that we don't need bootstrap compiler, everytime we deliver a new feature.
## [test](./test)

The directory containing unit-test files, some unit tests are copied from OCaml distribution(4.02)

## compiler sourcetree

- ext
- common
- bsb
- depends
- core
- bspp
- outcome_printer
- stubs
- super_errors
- syntax
## tools (deprecatd code)
## xwatcher (dev tools)
## runtime
## build_tests
## bin
## cmd_tests
## ounit
## ounit_tests
## others (belt/stdlib/node bindings)
38 changes: 23 additions & 15 deletions jscomp/all.depend
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ ext/ext_filename.cmi :
ext/ext_modulename.cmi :
ext/ext_namespace.cmi :
common/bs_version.cmx : common/bs_version.cmi
common/js_config.cmx : common/js_config.cmi
common/js_config.cmx : ext/ext_string.cmx common/js_config.cmi
common/ext_log.cmx : common/js_config.cmx common/ext_log.cmi
common/bs_loc.cmx : common/bs_loc.cmi
common/bs_warnings.cmx : common/js_config.cmx common/bs_warnings.cmi
Expand All @@ -172,15 +172,18 @@ common/bs_warnings.cmi :
common/lam_methname.cmi :
common/ml_binary.cmi :
syntax/bs_syntaxerr.cmx : syntax/bs_syntaxerr.cmi
syntax/ast_compatible.cmx : ext/ext_list.cmx syntax/ast_compatible.cmi
syntax/ast_utf8_string.cmx : ext/ext_utf8.cmx ext/ext_char.cmx \
syntax/ast_utf8_string.cmi
syntax/ast_utf8_string_interp.cmx : ext/literals.cmx ext/ext_utf8.cmx \
ext/ext_string.cmx ext/ext_char.cmx common/bs_loc.cmx \
syntax/ast_utf8_string_interp.cmi
syntax/ast_compatible.cmx syntax/ast_utf8_string_interp.cmi
syntax/ast_derive_constructor.cmx :
syntax/ast_derive_util.cmx : ext/ext_list.cmx syntax/ast_derive_util.cmi
syntax/ast_derive_util.cmx : ext/ext_list.cmx syntax/ast_compatible.cmx \
syntax/ast_derive_util.cmi
syntax/ast_exp.cmx : syntax/ast_exp.cmi
syntax/ast_external_mk.cmx : syntax/ast_external_mk.cmi
syntax/ast_external_mk.cmx : syntax/ast_compatible.cmx \
syntax/ast_external_mk.cmi
syntax/ast_lift.cmx : syntax/ast_lift.cmi
syntax/ast_literal.cmx : syntax/ast_literal.cmi
syntax/ast_pat.cmx : syntax/ast_pat.cmi
Expand All @@ -198,7 +201,7 @@ syntax/ast_derive.cmx : ext/string_map.cmx ext/literals.cmx \
syntax/ast_structure.cmx syntax/ast_signature.cmx syntax/ast_payload.cmx \
syntax/ast_derive.cmi
syntax/ast_comb.cmx : ext/ext_list.cmx syntax/ast_literal.cmx \
syntax/ast_comb.cmi
syntax/ast_compatible.cmx syntax/ast_comb.cmi
syntax/ast_core_type.cmx : ext/ext_list.cmx syntax/bs_syntaxerr.cmx \
syntax/ast_comb.cmx syntax/ast_core_type.cmi
syntax/bs_ast_invariant.cmx : ext/literals.cmx ext/hash_set_poly.cmx \
Expand Down Expand Up @@ -227,20 +230,22 @@ syntax/ast_derive_abstract.cmx : syntax/external_process.cmx \
syntax/ast_derive_abstract.cmi
syntax/ast_derive_dyn.cmx : ext/ext_list.cmx syntax/bs_syntaxerr.cmx \
syntax/ast_structure.cmx syntax/ast_derive_util.cmx syntax/ast_derive.cmx \
syntax/ast_attributes.cmx syntax/ast_derive_dyn.cmi
syntax/ast_derive_projector.cmx : ext/ext_list.cmx \
syntax/ast_derive_util.cmx syntax/ast_derive.cmx syntax/ast_comb.cmx \
syntax/ast_compatible.cmx syntax/ast_attributes.cmx \
syntax/ast_derive_dyn.cmi
syntax/ast_derive_projector.cmx : ext/ext_string.cmx ext/ext_list.cmx \
syntax/ast_derive_util.cmx syntax/ast_derive.cmx \
syntax/ast_compatible.cmx syntax/ast_comb.cmx \
syntax/ast_derive_projector.cmi
syntax/ast_derive_js_mapper.cmx : ext/ext_list.cmx syntax/ast_polyvar.cmx \
syntax/ast_literal.cmx syntax/ast_derive_util.cmx syntax/ast_derive.cmx \
syntax/ast_core_type.cmx syntax/ast_comb.cmx \
syntax/ast_core_type.cmx syntax/ast_compatible.cmx syntax/ast_comb.cmx \
syntax/ast_derive_js_mapper.cmi
syntax/ast_util.cmx : ext/literals.cmx syntax/external_process.cmx \
ext/ext_string.cmx ext/ext_list.cmx syntax/bs_syntaxerr.cmx \
syntax/bs_ast_mapper.cmx syntax/ast_payload.cmx syntax/ast_pat.cmx \
syntax/ast_literal.cmx syntax/ast_external_mk.cmx syntax/ast_exp.cmx \
syntax/ast_core_type.cmx syntax/ast_comb.cmx syntax/ast_attributes.cmx \
syntax/ast_util.cmi
syntax/ast_core_type.cmx syntax/ast_compatible.cmx syntax/ast_comb.cmx \
syntax/ast_attributes.cmx syntax/ast_util.cmi
syntax/ast_tdcls.cmx : ext/ext_list.cmx syntax/bs_ast_mapper.cmx \
syntax/ast_structure.cmx syntax/ast_signature.cmx syntax/ast_payload.cmx \
syntax/ast_derive_abstract.cmx syntax/ast_derive.cmx \
Expand All @@ -253,12 +258,14 @@ syntax/ast_tuple_pattern_flatten.cmx : ext/ext_list.cmx \
syntax/ast_exp_apply.cmx : ext/literals.cmx ext/ext_list.cmx \
syntax/bs_ast_mapper.cmx syntax/bs_ast_invariant.cmx syntax/ast_util.cmx \
syntax/ast_tuple_pattern_flatten.cmx syntax/ast_literal.cmx \
syntax/ast_attributes.cmx syntax/ast_exp_apply.cmi
syntax/ast_compatible.cmx syntax/ast_attributes.cmx \
syntax/ast_exp_apply.cmi
syntax/ast_exp_extension.cmx : ext/literals.cmx ext/ext_string.cmx \
ext/ext_ref.cmx ext/ext_pervasives.cmx common/bs_version.cmx \
syntax/bs_ast_mapper.cmx syntax/ast_util.cmx syntax/ast_payload.cmx \
syntax/ast_literal.cmx syntax/ast_derive.cmx syntax/ast_core_type.cmx \
syntax/ast_comb.cmx syntax/ast_exp_extension.cmi
syntax/ast_compatible.cmx syntax/ast_comb.cmx \
syntax/ast_exp_extension.cmi
syntax/ast_core_type_class_type.cmx : ext/literals.cmx ext/ext_ref.cmx \
ext/ext_list.cmx syntax/bs_ast_mapper.cmx syntax/ast_util.cmx \
syntax/ast_literal.cmx syntax/ast_comb.cmx syntax/ast_attributes.cmx \
Expand All @@ -272,8 +279,9 @@ syntax/ppx_entry.cmx : ext/string_map.cmx ext/literals.cmx \
syntax/ast_literal.cmx syntax/ast_exp_extension.cmx \
syntax/ast_exp_apply.cmx syntax/ast_derive_projector.cmx \
syntax/ast_derive_js_mapper.cmx syntax/ast_core_type_class_type.cmx \
syntax/ast_attributes.cmx syntax/ppx_entry.cmi
syntax/ast_compatible.cmx syntax/ast_attributes.cmx syntax/ppx_entry.cmi
syntax/bs_syntaxerr.cmi :
syntax/ast_compatible.cmi :
syntax/ast_utf8_string.cmi :
syntax/ast_utf8_string_interp.cmi :
syntax/ast_derive_util.cmi :
Expand Down Expand Up @@ -435,7 +443,7 @@ core/lam_compile_main.cmi : core/j.cmx
core/js_implementation.cmi :
core/ocaml_batch_compile.cmi :
core/js_runtime_modules.cmx :
core/config_util.cmx : core/config_util.cmi
core/config_util.cmx : ext/ext_string.cmx core/config_util.cmi
core/js_packages_info.cmx : core/lam_module_ident.cmx ext/ext_sys.cmx \
ext/ext_string.cmx ext/ext_pervasives.cmx ext/ext_path.cmx \
ext/ext_namespace.cmx ext/ext_filename.cmx core/config_util.cmx \
Expand Down
2 changes: 2 additions & 0 deletions jscomp/bin/all_ounit_tests.d
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ bin/all_ounit_tests.ml : ./ounit_tests/ounit_union_find_tests.ml
bin/all_ounit_tests.ml : ./ounit_tests/ounit_utf8_test.ml
bin/all_ounit_tests.ml : ./ounit_tests/ounit_vec_test.ml
bin/all_ounit_tests.ml : ./stubs/bs_hash_stubs.ml
bin/all_ounit_tests.ml : ./syntax/ast_compatible.ml
bin/all_ounit_tests.ml : ./syntax/ast_compatible.mli
bin/all_ounit_tests.ml : ./syntax/ast_utf8_string.ml
bin/all_ounit_tests.ml : ./syntax/ast_utf8_string.mli
bin/all_ounit_tests.ml : ./syntax/ast_utf8_string_interp.ml
Expand Down
Loading