Skip to content
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.

Sign up for GitHub

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

more efficient int vector/ efficient partition support #1043

Merged
merged 4 commits into from
Dec 30, 2016
Merged

more efficient int vector/ efficient partition support #1043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c012d1
more efficient int vector implementation
bobzhang Dec 29, 2016
9224426
more efficient int vector with partition capability
bobzhang Dec 29, 2016
a6209eb
more tests
bobzhang Dec 29, 2016
9d1b3d2
add a layered topsort algorithm
bobzhang Dec 30, 2016
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
29 changes: 6 additions & 23 deletions docs/Manual.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ <h1><a href="https://github.com/bloomberg/bucklescript">BuckleScript</a> User Ma
<li><a href="#_installation">Installation</a>
<ul class="sectlevel2">
<li><a href="#_windows_installation">Windows Installation</a></li>
<li><a href="#_minimal_installation_from_npm">Minimal installation from NPM</a></li>
<li><a href="#__nix_installation">*nix installation</a></li>
<li><a href="#__strong_recommended_strong_installation_with_opam"><strong>Recommended</strong> installation with OPAM</a></li>
<li><a href="#_install_from_source">Install from source</a>
<ul class="sectlevel3">
Expand Down Expand Up @@ -846,34 +846,14 @@ <h2 id="_installation"><a class="anchor" href="#_installation"></a>Installation<
</div>
<div class="sect2">
<h3 id="_windows_installation"><a class="anchor" href="#_windows_installation"></a>Windows Installation</h3>
<div class="admonitionblock note">
<table>
<tr>
<td class="icon">
<div class="title">Note</div>
</td>
<td class="content">
<div class="title">WINDOWS prerequisite</div>
<div class="paragraph">
<p>BuckleScript works natively on Windows, currently users have to install
<a href="http://protz.github.io/ocaml-installer/">OCaml Cygwin</a> first,
make sure that <code>ocamlopt</code> is in <code>PATH</code>.</p>
</div>
<div class="listingblock">
<div class="content">
<pre class="pygments highlight"><code data-lang="sh">npm install bs-platform</code></pre>
</div>
</div>
<div class="paragraph">
<p>After installation, BuckleScript does not rely on Cygwin anymore.</p>
</div>
</td>
</tr>
</table>
</div>
</div>
<div class="sect2">
<h3 id="_minimal_installation_from_npm"><a class="anchor" href="#_minimal_installation_from_npm"></a>Minimal installation from NPM</h3>
<h3 id="__nix_installation"><a class="anchor" href="#__nix_installation"></a>*nix installation</h3>
<div class="ulist">
<div class="title">Prerequisites</div>
<ul>
Expand All @@ -883,6 +863,9 @@ <h3 id="_minimal_installation_from_npm"><a class="anchor" href="#_minimal_instal
<li>
<p><code>npm</code> (should be installed with Node)</p>
</li>
<li>
<p><a href="https://github.com/ninja-build/ninja/releases">ninja</a> (version &gt;= 1.7)</p>
</li>
</ul>
</div>
<div class="paragraph">
Expand All @@ -902,7 +885,7 @@ <h3 id="_minimal_installation_from_npm"><a class="anchor" href="#_minimal_instal
</div>
<div class="listingblock">
<div class="content">
<pre class="pygments highlight"><code data-lang="shh">npm install -g bs-platform</code></pre>
<pre class="pygments highlight"><code data-lang="sh">npm install -g bs-platform</code></pre>
</div>
</div>
</div>
Expand Down
4 changes: 4 additions & 0 deletions jscomp/.ocamlinit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#require "compiler-libs.common";;
#load "bs_hash.cma";;
#load "ext.cma";;
#directory "./ext";;
17 changes: 12 additions & 5 deletions jscomp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,16 @@ CAMLDEP=ocamldep.opt$(EXE)
COMPFLAGS= -g -w +6-40-30-23 -warn-error +a-40-30-23


.SUFFIXES: .mli .ml .cmi .cmx .mll .c .o
.SUFFIXES: .mli .ml .cmi .cmx .mll .c .o .cmo

print-% : ; @echo $* = $($*)

INCLUDES= -I +compiler-libs -I stubs -I ext -I common -I syntax -I depends -I core -I bsb -I ounit -I ounit_tests

.mli.cmi:
$(NATIVE) $(INCLUDES) $(COMPFLAGS) -c $<
.ml.cmo:
ocamlc.opt $(INCLUDES) $(COMPFLAGS) -c $<

.ml.cmx:
$(NATIVE) $(INCLUDES) $(COMPFLAGS) -c $<
Expand All @@ -44,7 +46,7 @@ ext/int_vec.ml: ext/vec.cppo.ml
ext/resize_array.ml: ext/vec.cppo.ml
cppo -D TYPE_FUNCTOR $< -o $@
ext/string_set.ml : ext/set.cppo.ml
cppo -D TYPE_STRING $< -o $@
cppo -D TYPE_STRING $< -o $@
ext/set_int.ml : ext/set.cppo.ml
cppo -D TYPE_INT $< -o $@
ext/ident_set.ml : ext/set.cppo.ml
Expand Down Expand Up @@ -134,6 +136,7 @@ OUNIT_TESTS_SRCS = ounit_tests_util \
ounit_ordered_hash_set_tests \
ounit_vec_test \
ounit_string_tests\
ounit_topsort_tests\
ounit_tests_main
OUNIT_TESTS_CMXS = $(addprefix ounit_tests/, $(addsuffix .cmx, $(OUNIT_TESTS_SRCS)))

Expand Down Expand Up @@ -173,7 +176,9 @@ EXT_SRCS = ext_util\
string_set\
set_int\
set_poly\
ext_scc ext_pp_scope\
ext_scc \
ext_topsort\
ext_pp_scope\
ext_io\
ident_hash_set\
hash_set_poly\
Expand All @@ -182,6 +187,7 @@ EXT_SRCS = ext_util\
ext_filename

EXT_CMXS=$(addprefix ext/, $(addsuffix .cmx, $(EXT_SRCS)))
EXT_CMOS=$(addprefix ext/, $(addsuffix .cmo, $(EXT_SRCS)))
COMMON_SRCS= bs_version js_config bs_pkg ext_log bs_loc bs_warnings lam_methname binary_cache
COMMON_CMXS= $(addprefix common/, $(addsuffix .cmx, $(COMMON_SRCS)))
SYNTAX_SRCS=ast_derive_constructor ast_derive_util ast_exp ast_external ast_lift \
Expand Down Expand Up @@ -226,7 +232,8 @@ MAINS_CMXS=$(addsuffix .cmx, $(MAIN_SRCS))

ounit.cmxa: $(OUNIT_CMXS)
ocamlopt.opt -a $^ -o $@

ext.cma: $(EXT_CMOS)
ocamlc.opt -a $^ -o $@
ext.cmxa: $(EXT_CMXS)
ocamlopt.opt -a $^ -o $@
common.cmxa:$(COMMON_CMXS)
Expand Down Expand Up @@ -370,7 +377,7 @@ bin/all_ounit_tests.ml:./bin/bspack.exe


bin/all_ounit_tests.exe: stubs/ext_basic_hash_stubs.c bin/all_ounit_tests.mli bin/all_ounit_tests.ml
ocamloptp -g -I bin -w -a unix.cmxa $^ -o $@
ocamloptp -P a -g -I bin -w -a unix.cmxa $^ -o $@

test:bin/all_ounit_tests.exe
$^ && ocamlprof bin/all_ounit_tests.ml > bin/all_ounit_tests.i.ml && rm ocamlprof.dump
Expand Down
16 changes: 11 additions & 5 deletions jscomp/all.depend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,11 @@ ext/int_map.cmx : ext/map_gen.cmx ext/ext_int.cmx ext/int_map.cmi
ext/literals.cmx : ext/literals.cmi
ext/string_map.cmx : ext/map_gen.cmx ext/string_map.cmi
ext/string_set.cmx : ext/set_gen.cmx ext/string_set.cmi
ext/set_int.cmx : ext/set_gen.cmx ext/ext_int.cmx
ext/set_int.cmx : ext/set_gen.cmx ext/ext_int.cmx ext/set_int.cmi
ext/set_poly.cmx : ext/set_gen.cmx ext/set_poly.cmi
ext/ext_scc.cmx : ext/int_vec_vec.cmx ext/int_vec.cmx ext/ext_scc.cmi
ext/ext_topsort.cmx : ext/set_int.cmx ext/resize_array.cmx ext/int_vec.cmx \
ext/ext_topsort.cmi
ext/ext_pp_scope.cmx : ext/string_map.cmx ext/int_map.cmx ext/ident_set.cmx \
ext/ext_pp_scope.cmi
ext/ext_io.cmx : ext/ext_pervasives.cmx ext/ext_io.cmi
Expand Down Expand Up @@ -108,8 +110,10 @@ ext/int_map.cmi : ext/map_gen.cmx
ext/literals.cmi :
ext/string_map.cmi : ext/map_gen.cmx
ext/string_set.cmi :
ext/set_int.cmi : ext/set_gen.cmx
ext/set_poly.cmi :
ext/ext_scc.cmi : ext/int_vec_vec.cmi ext/int_vec.cmi
ext/ext_topsort.cmi : ext/vec_gen.cmx ext/set_int.cmi ext/int_vec.cmi
ext/ext_pp_scope.cmi : ext/ident_set.cmi
ext/ext_io.cmi :
ext/ident_hash_set.cmi : ext/hash_set_gen.cmx
Expand Down Expand Up @@ -590,13 +594,15 @@ ounit_tests/ounit_json_tests.cmx : ext/string_map.cmx ounit/oUnit.cmx \
ounit_tests/ounit_map_tests.cmx : ounit/oUnit.cmx ext/int_map.cmx
ounit_tests/ounit_ordered_hash_set_tests.cmx : \
ext/ordered_hash_set_string.cmx ounit/oUnit.cmx ext/ext_util.cmx
ounit_tests/ounit_vec_test.cmx : ounit/oUnit.cmx ext/int_vec.cmx \
bsb/bsb_json.cmx
ounit_tests/ounit_vec_test.cmx : ext/set_int.cmx ounit/oUnit.cmx \
ext/int_vec.cmx bsb/bsb_json.cmx
ounit_tests/ounit_string_tests.cmx : ounit/oUnit.cmx ext/ext_string.cmx
ounit_tests/ounit_topsort_tests.cmx : ext/set_int.cmx ounit/oUnit.cmx \
ext/int_vec.cmx ext/ext_topsort.cmx
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_string_tests.cmx ounit_tests/ounit_scc_tests.cmx \
ounit_tests/ounit_path_tests.cmx \
ounit_tests/ounit_topsort_tests.cmx ounit_tests/ounit_string_tests.cmx \
ounit_tests/ounit_scc_tests.cmx ounit_tests/ounit_path_tests.cmx \
ounit_tests/ounit_ordered_hash_set_tests.cmx \
ounit_tests/ounit_map_tests.cmx ounit_tests/ounit_list_test.cmx \
ounit_tests/ounit_json_tests.cmx ounit_tests/ounit_hashtbl_tests.cmx \
Expand Down
4 changes: 4 additions & 0 deletions jscomp/bin/all_ounit_tests.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ bin/all_ounit_tests.ml : ext/set_gen.ml
bin/all_ounit_tests.ml : ext/ext_int.ml
bin/all_ounit_tests.ml : ext/ext_int.mli
bin/all_ounit_tests.ml : ext/set_int.ml
bin/all_ounit_tests.ml : ext/set_int.mli
bin/all_ounit_tests.ml : ext/set_poly.ml
bin/all_ounit_tests.ml : ext/set_poly.mli
bin/all_ounit_tests.ml : ounit_tests/ounit_bal_tree_tests.ml
Expand Down Expand Up @@ -71,6 +72,9 @@ bin/all_ounit_tests.ml : ext/ext_scc.ml
bin/all_ounit_tests.ml : ext/ext_scc.mli
bin/all_ounit_tests.ml : ounit_tests/ounit_scc_tests.ml
bin/all_ounit_tests.ml : ounit_tests/ounit_string_tests.ml
bin/all_ounit_tests.ml : ext/ext_topsort.ml
bin/all_ounit_tests.ml : ext/ext_topsort.mli
bin/all_ounit_tests.ml : ounit_tests/ounit_topsort_tests.ml
bin/all_ounit_tests.ml : ext/union_find.ml
bin/all_ounit_tests.ml : ext/union_find.mli
bin/all_ounit_tests.ml : ounit_tests/ounit_union_find_tests.ml
Expand Down
Loading