Merge 77732c5 into 37f185c

.istanbul.yml

@@ -0,0 +1,54 @@
+verbose: false
+instrumentation:
+    root: .
+    extensions:
+        - .js
+    default-excludes: false
+    excludes: [ '**/node_modules/**']
+    embed-source: false
+    variable: __coverage__
+    compact: true
+    preserve-comments: false
+    complete-copy: false
+    save-baseline: false
+    baseline-file: ./coverage/coverage-baseline.json
+    include-all-sources: false
+    include-pid: false
+    es-modules: false
+reporting:
+    print: summary
+    reports:
+        - lcov
+    dir: ./coverage
+    watermarks:
+        statements: [50, 80]
+        lines: [50, 80]
+        functions: [50, 80]
+        branches: [50, 80]
+    report-config:
+        clover: {file: clover.xml}
+        cobertura: {file: cobertura-coverage.xml}
+        json: {file: coverage-final.json}
+        json-summary: {file: coverage-summary.json}
+        lcovonly: {file: lcov.info}
+        teamcity: {file: null, blockName: Code Coverage Summary}
+        text: {file: null, maxCols: 0}
+        text-lcov: {file: lcov.info}
+        text-summary: {file: null}
+hooks:
+    hook-run-in-context: false
+    post-require-hook: null
+    handle-sigint: false
+check:
+    global:
+        statements: 0
+        lines: 0
+        branches: 0
+        functions: 0
+        excludes: []
+    each:
+        statements: 0
+        lines: 0
+        branches: 0
+        functions: 0
+        excludes: []

.travis.yml

@@ -9,5 +9,5 @@ node_js:
 # This delays notification
 
 # Not a very reliable service..  
-# script: npm run coveralls
+script: npm run coveralls
 

jscomp/Makefile

@@ -48,11 +48,15 @@ common/bs_version.ml: build_version.js ../package.json
 ### list files
 OUNIT_SRCS = oUnit oUnitDiff oUnitLogger oUnitTypes oUnitUtils oUnitChooser
 OUNIT_CMXS = $(addprefix ounit/, $(addsuffix .cmx, $(OUNIT_SRCS)))
-OUNIT_TESTS_SRCS =  ounit_array_tests ounit_list_test ounit_path_tests ounit_union_find_tests ounit_hash_set_tests ounit_scc_tests ounit_json_tests ounit_vec_test ounit_tests_main
+OUNIT_TESTS_SRCS =  ounit_array_tests ounit_list_test ounit_bal_tree_tests ounit_path_tests ounit_union_find_tests ounit_hash_set_tests ounit_scc_tests ounit_json_tests ounit_vec_test ounit_tests_main
 OUNIT_TESTS_CMXS = $(addprefix ounit_tests/, $(addsuffix .cmx, $(OUNIT_TESTS_SRCS)))
 
-EXT_SRCS = ext_array ext_bytes ext_char resize_array string_vec int_vec int_vec_vec ext_file_pp ext_format ext_hashtbl ext_list ext_map ext_marshal ext_option \
-	ext_pervasives ext_pp ext_ref ext_string ext_sys hash_set ordered_hash_set ordered_hash_map union_find ident_set int_map literals string_map \
+EXT_SRCS = ext_array ext_bytes ext_char resize_array string_vec int_vec int_vec_vec bal_tree bal_map\
+	ext_file_pp ext_format ext_hashtbl ext_list ext_map \
+	ext_marshal ext_option \
+	ext_pervasives ext_pp ext_ref ext_string ext_sys \
+	hash_set ordered_hash_set ordered_hash_map union_find \
+	ident_set int_map literals string_map \
 	string_set ext_scc ext_pp_scope ext_io ext_ident ext_filename
 
 EXT_CMXS=$(addprefix ext/, $(addsuffix .cmx, $(EXT_SRCS)))

jscomp/all.depend

@@ -1,3 +1,5 @@
+ext/bal_map.cmx : ext/bal_map.cmi
+ext/bal_tree.cmx : ext/bal_tree.cmi
 ext/ext_array.cmx : ext/ext_array.cmi
 ext/ext_bytes.cmx : ext/ext_bytes.cmi
 ext/ext_char.cmx : ext/ext_char.cmi
@@ -21,7 +23,7 @@ ext/ext_scc.cmx : ext/int_vec_vec.cmx ext/int_vec.cmx ext/ext_scc.cmi
 ext/ext_string.cmx : ext/ext_bytes.cmx ext/ext_string.cmi
 ext/ext_sys.cmx : ext/ext_sys.cmi
 ext/hash_set.cmx : ext/hash_set.cmi
-ext/ident_set.cmx : ext/ext_format.cmx ext/ident_set.cmi
+ext/ident_set.cmx : ext/ext_format.cmx ext/bal_tree.cmx ext/ident_set.cmi
 ext/int_map.cmx : ext/int_map.cmi
 ext/int_vec.cmx : ext/resize_array.cmx ext/int_vec.cmi
 ext/int_vec_vec.cmx : ext/resize_array.cmx ext/int_vec.cmx \
@@ -31,9 +33,11 @@ ext/ordered_hash_map.cmx : ext/ordered_hash_map.cmi
 ext/ordered_hash_set.cmx : ext/ordered_hash_set.cmi
 ext/resize_array.cmx : ext/ext_array.cmx ext/resize_array.cmi
 ext/string_map.cmx : ext/string_map.cmi
-ext/string_set.cmx : ext/string_set.cmi
+ext/string_set.cmx : ext/bal_tree.cmx ext/string_set.cmi
 ext/string_vec.cmx : ext/resize_array.cmx ext/string_vec.cmi
 ext/union_find.cmx : ext/union_find.cmi
+ext/bal_map.cmi :
+ext/bal_tree.cmi :
 ext/ext_array.cmi :
 ext/ext_bytes.cmi :
 ext/ext_char.cmi :
@@ -545,6 +549,7 @@ ounit/oUnitTypes.cmx :
 ounit/oUnitUtils.cmx : ounit/oUnitTypes.cmx
 ounit_tests/ounit_array_tests.cmx : ounit/oUnit.cmx ext/ext_string.cmx \
     ext/ext_array.cmx
+ounit_tests/ounit_bal_tree_tests.cmx : ounit/oUnit.cmx ext/bal_tree.cmx
 ounit_tests/ounit_hash_set_tests.cmx : ext/ordered_hash_set.cmx \
     ounit/oUnit.cmx ext/hash_set.cmx
 ounit_tests/ounit_json_tests.cmx : ext/string_map.cmx ounit/oUnit.cmx \
@@ -557,8 +562,9 @@ ounit_tests/ounit_tests_main.cmx : ext/resize_array.cmx \
     ounit_tests/ounit_vec_test.cmx ounit_tests/ounit_union_find_tests.cmx \
     ounit_tests/ounit_scc_tests.cmx ounit_tests/ounit_path_tests.cmx \
     ounit_tests/ounit_list_test.cmx ounit_tests/ounit_json_tests.cmx \
-    ounit_tests/ounit_hash_set_tests.cmx ounit_tests/ounit_array_tests.cmx \
-    ounit/oUnit.cmx ounit_tests/ounit_tests_main.cmi
+    ounit_tests/ounit_hash_set_tests.cmx ounit_tests/ounit_bal_tree_tests.cmx \
+    ounit_tests/ounit_array_tests.cmx ounit/oUnit.cmx \
+    ounit_tests/ounit_tests_main.cmi
 ounit_tests/ounit_union_find_tests.cmx : ext/union_find.cmx ounit/oUnit.cmx \
     ext/int_vec_vec.cmx ext/int_vec.cmx ext/ext_string.cmx
 ounit_tests/ounit_vec_test.cmx : ounit/oUnit.cmx ext/int_vec.cmx \

jscomp/bin/all_ounit_tests.d

@@ -11,6 +11,9 @@ bin/all_ounit_tests.ml : ext/ext_bytes.mli
 bin/all_ounit_tests.ml : ext/ext_string.ml
 bin/all_ounit_tests.ml : ext/ext_string.mli
 bin/all_ounit_tests.ml : ounit_tests/ounit_array_tests.ml
+bin/all_ounit_tests.ml : ext/bal_tree.ml
+bin/all_ounit_tests.ml : ext/bal_tree.mli
+bin/all_ounit_tests.ml : ounit_tests/ounit_bal_tree_tests.ml
 bin/all_ounit_tests.ml : ext/hash_set.ml
 bin/all_ounit_tests.ml : ext/hash_set.mli
 bin/all_ounit_tests.ml : ext/ordered_hash_set.ml