Merge pull request #1107 from bloomberg/prepend_data_ffi

allow prepend int/string in positions

Author: bobzhang

docs/Manual.html

@@ -541,13 +541,14 @@ <h1><a href="https://github.com/bloomberg/bucklescript">BuckleScript</a> User Ma
 </ul>
 </li>
 <li><a href="#_splice_calling_convention_bs_splice">Splice calling convention: bs.splice</a></li>
-<li><a href="#_special_types_on_external_declarations_bs_string_bs_int_bs_ignore">Special types on external declarations: bs.string, bs.int, bs.ignore</a>
+<li><a href="#_special_types_on_external_declarations_bs_string_bs_int_bs_ignore_bs_as">Special types on external declarations: bs.string, bs.int, bs.ignore, bs.as</a>
 <ul class="sectlevel3">
 <li><a href="#_using_polymorphic_variant_to_model_enums_and_string_types">Using polymorphic variant to model enums and string types</a></li>
 <li><a href="#_using_polymorphic_variant_to_model_event_listener">Using polymorphic variant to model event listener</a></li>
 <li><a href="#_phantom_arguments_and_ad_hoc_polyrmophism">Phantom Arguments and ad-hoc polyrmophism</a></li>
 </ul>
 </li>
+<li><a href="#_fixed_arguments">Fixed Arguments</a></li>
 <li><a href="#_binding_to_nodejs_special_variables_bs_node">Binding to NodeJS special variables: bs.node</a></li>
 <li><a href="#_binding_to_callbacks_high_order_function">Binding to callbacks (high-order function)</a>
 <ul class="sectlevel3">
@@ -1717,7 +1718,7 @@ <h3 id="_splice_calling_convention_bs_splice"><a class="anchor" href="#_splice_c
 </div>
 </div>
 <div class="sect2">
-<h3 id="_special_types_on_external_declarations_bs_string_bs_int_bs_ignore"><a class="anchor" href="#_special_types_on_external_declarations_bs_string_bs_int_bs_ignore"></a>Special types on external declarations: bs.string, bs.int, bs.ignore</h3>
+<h3 id="_special_types_on_external_declarations_bs_string_bs_int_bs_ignore_bs_as"><a class="anchor" href="#_special_types_on_external_declarations_bs_string_bs_int_bs_ignore_bs_as"></a>Special types on external declarations: bs.string, bs.int, bs.ignore, bs.as</h3>
 <div class="sect3">
 <h4 id="_using_polymorphic_variant_to_model_enums_and_string_types"><a class="anchor" href="#_using_polymorphic_variant_to_model_enums_and_string_types"></a>Using polymorphic variant to model enums and string types</h4>
 <div class="paragraph">
@@ -1921,6 +1922,85 @@ <h4 id="_phantom_arguments_and_ad_hoc_polyrmophism"><a class="anchor" href="#_ph
 </div>
 </div>
 <div class="sect2">
+<h3 id="_fixed_arguments"><a class="anchor" href="#_fixed_arguments"></a>Fixed Arguments</h3>
+<div class="paragraph">
+<p>Contrary to the Phantom arguments, <code>_[@bs.as]</code> is introduced to attach the const
+data.</p>
+</div>
+<div class="paragraph">
+<p>For example:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="pygments highlight"><code data-lang="ocaml"><span class="tok-k">external</span> <span class="tok-n">process_on_exit</span> <span class="tok-o">:</span> <span class="tok-o">(_</span> <span class="tok-o">[@</span><span class="tok-n">bs</span><span class="tok-o">.</span><span class="tok-k">as</span> <span class="tok-s2">&quot;exit&quot;</span><span class="tok-o">])</span> <span class="tok-o">-&gt;</span> <span class="tok-o">(</span><span class="tok-kt">int</span> <span class="tok-o">-&gt;</span> <span class="tok-kt">unit</span><span class="tok-o">)</span> <span class="tok-o">-&gt;</span> <span class="tok-kt">unit</span> <span class="tok-o">=</span>
+  <span class="tok-s2">&quot;process.on&quot;</span> <span class="tok-o">[@@</span><span class="tok-n">bs</span><span class="tok-o">.</span><span class="tok-k">val</span><span class="tok-o">]</span>
+
+<span class="tok-k">let</span> <span class="tok-bp">()</span> <span class="tok-o">=</span>
+    <span class="tok-n">process_on_exit</span> <span class="tok-o">(</span><span class="tok-k">fun</span> <span class="tok-n">exit_code</span> <span class="tok-o">-&gt;</span>
+        <span class="tok-nn">Js</span><span class="tok-p">.</span><span class="tok-n">log</span><span class="tok-o">(</span> <span class="tok-s2">&quot;error code: &quot;</span> <span class="tok-o">^</span> <span class="tok-n">string_of_int</span> <span class="tok-n">exit_code</span> <span class="tok-o">))</span></code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Output</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="pygments highlight"><code data-lang="js"><span class="tok-nx">process</span><span class="tok-p">.</span><span class="tok-nx">on</span><span class="tok-p">(</span><span class="tok-s2">&quot;exit&quot;</span><span class="tok-p">,</span> <span class="tok-kd">function</span> <span class="tok-p">(</span><span class="tok-nx">exit_code</span><span class="tok-p">)</span> <span class="tok-p">{</span>
+      <span class="tok-nx">console</span><span class="tok-p">.</span><span class="tok-nx">log</span><span class="tok-p">(</span><span class="tok-s2">&quot;error code: &quot;</span> <span class="tok-o">+</span> <span class="tok-nx">exit_code</span><span class="tok-p">);</span>
+      <span class="tok-k">return</span> <span class="tok-cm">/* () */</span><span class="tok-mi">0</span><span class="tok-p">;</span>
+    <span class="tok-p">});</span></code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>It can also be used in combination with other attributes, for example:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="pygments highlight"><code data-lang="ocaml"><span class="tok-k">type</span> <span class="tok-n">process</span>
+
+<span class="tok-k">external</span> <span class="tok-n">on_exit</span> <span class="tok-o">:</span>  <span class="tok-o">(_</span> <span class="tok-o">[@</span><span class="tok-n">bs</span><span class="tok-o">.</span><span class="tok-k">as</span> <span class="tok-s2">&quot;exit&quot;</span><span class="tok-o">])</span> <span class="tok-o">-&gt;</span> <span class="tok-o">(</span><span class="tok-kt">int</span> <span class="tok-o">-&gt;</span> <span class="tok-kt">unit</span><span class="tok-o">)</span> <span class="tok-o">-&gt;</span> <span class="tok-kt">unit</span> <span class="tok-o">=</span>
+    <span class="tok-s2">&quot;on&quot;</span> <span class="tok-o">[@@</span><span class="tok-n">bs</span><span class="tok-o">.</span><span class="tok-n">send</span><span class="tok-o">.</span><span class="tok-n">pipe</span><span class="tok-o">:</span> <span class="tok-n">process</span><span class="tok-o">]</span>
+<span class="tok-k">let</span> <span class="tok-n">register</span> <span class="tok-o">(</span><span class="tok-n">p</span> <span class="tok-o">:</span> <span class="tok-n">process</span><span class="tok-o">)</span> <span class="tok-o">=</span>
+        <span class="tok-n">p</span> <span class="tok-o">|&gt;</span> <span class="tok-n">on_exit</span> <span class="tok-o">(</span><span class="tok-k">fun</span> <span class="tok-n">i</span> <span class="tok-o">-&gt;</span> <span class="tok-nn">Js</span><span class="tok-p">.</span><span class="tok-n">log</span> <span class="tok-n">i</span> <span class="tok-o">)</span></code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Output</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="pygments highlight"><code data-lang="js"><span class="tok-kd">function</span> <span class="tok-nx">register</span><span class="tok-p">(</span><span class="tok-nx">p</span><span class="tok-p">)</span> <span class="tok-p">{</span>
+  <span class="tok-k">return</span> <span class="tok-nx">p</span><span class="tok-p">.</span><span class="tok-nx">on</span><span class="tok-p">(</span><span class="tok-s2">&quot;exit&quot;</span><span class="tok-p">,</span> <span class="tok-kd">function</span> <span class="tok-p">(</span><span class="tok-nx">i</span><span class="tok-p">)</span> <span class="tok-p">{</span>
+              <span class="tok-nx">console</span><span class="tok-p">.</span><span class="tok-nx">log</span><span class="tok-p">(</span><span class="tok-nx">i</span><span class="tok-p">);</span>
+              <span class="tok-k">return</span> <span class="tok-cm">/* () */</span><span class="tok-mi">0</span><span class="tok-p">;</span>
+            <span class="tok-p">});</span>
+<span class="tok-p">}</span></code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Input</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="pygments highlight"><code data-lang="ocaml"><span class="tok-k">external</span> <span class="tok-n">io_config</span> <span class="tok-o">:</span>
+    <span class="tok-n">stdio</span><span class="tok-o">:(</span> <span class="tok-o">_</span> <span class="tok-o">[@</span><span class="tok-n">bs</span><span class="tok-o">.</span><span class="tok-k">as</span> <span class="tok-s2">&quot;inherit&quot;</span><span class="tok-o">])</span> <span class="tok-o">-&gt;</span> <span class="tok-n">cwd</span><span class="tok-o">:</span><span class="tok-kt">string</span> <span class="tok-o">-&gt;</span> <span class="tok-kt">unit</span> <span class="tok-o">-&gt;</span> <span class="tok-o">_</span>  <span class="tok-o">=</span> <span class="tok-s2">&quot;&quot;</span> <span class="tok-o">[@@</span><span class="tok-n">bs</span><span class="tok-o">.</span><span class="tok-n">obj</span><span class="tok-o">]</span>
+
+<span class="tok-k">let</span> <span class="tok-n">config</span> <span class="tok-o">=</span> <span class="tok-n">io_config</span> <span class="tok-o">~</span><span class="tok-n">cwd</span><span class="tok-o">:</span><span class="tok-s2">&quot;.&quot;</span> <span class="tok-bp">()</span></code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Output</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="pygments highlight"><code data-lang="js"><span class="tok-kd">var</span> <span class="tok-nx">config</span> <span class="tok-o">=</span> <span class="tok-p">{</span>
+  <span class="tok-nx">stdio</span><span class="tok-o">:</span> <span class="tok-s2">&quot;inherit&quot;</span><span class="tok-p">,</span>
+  <span class="tok-nx">cwd</span><span class="tok-o">:</span> <span class="tok-s2">&quot;.&quot;</span>
+<span class="tok-p">};</span></code></pre>
+</div>
+</div>
+</div>
+<div class="sect2">
 <h3 id="_binding_to_nodejs_special_variables_bs_node"><a class="anchor" href="#_binding_to_nodejs_special_variables_bs_node"></a>Binding to NodeJS special variables: bs.node</h3>
 <div class="paragraph">
 <p>NodeJS has several file local variables: <code><em>dirname</code>, <code></em>filename</code>, <code>module_</code>, and <code>require</code>,

jscomp/Makefile

@@ -212,8 +212,10 @@ SYNTAX_SRCS=ast_derive_constructor ast_derive_util ast_exp ast_external ast_lift
 	ast_derive ast_comb ast_attributes ast_core_type ast_derive_dyn\
 	 ast_derive_projector \
 	 ast_ffi_types\
-	ast_external_attributes \
-	ast_util ppx_entry
+	 ast_external_attributes\
+	 ast_util\
+	 ppx_entry
+# not a good name ast_util	 
 SYNTAX_CMXS=$(addprefix syntax/, $(addsuffix .cmx, $(SYNTAX_SRCS)))
 DEPENDS_SRCS= depends_post_process bs_exception ast_extract binary_ast  
 DEPENDS_CMXS=$(addprefix depends/, $(addsuffix .cmx, $(DEPENDS_SRCS)))

jscomp/all.depend

@@ -167,8 +167,8 @@ syntax/ast_derive.cmx : ext/string_map.cmx ext/literals.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_attributes.cmx : ext/ext_string.cmx syntax/ast_payload.cmx \
-    syntax/ast_attributes.cmi
+syntax/ast_attributes.cmx : ext/ext_string.cmx common/bs_warnings.cmx \
+    syntax/ast_payload.cmx syntax/ast_attributes.cmi
 syntax/ast_core_type.cmx : ext/ext_list.cmx syntax/ast_comb.cmx \
     syntax/ast_core_type.cmi
 syntax/ast_derive_dyn.cmx : syntax/ast_structure.cmx \
@@ -190,12 +190,12 @@ syntax/ast_util.cmx : ext/literals.cmx ext/ext_list.cmx \
     syntax/ast_core_type.cmx syntax/ast_comb.cmx syntax/ast_attributes.cmx \
     syntax/ast_util.cmi
 syntax/ppx_entry.cmx : ext/string_map.cmx ext/literals.cmx \
-    ext/ext_string.cmx ext/ext_ref.cmx ext/ext_list.cmx \
-    common/bs_warnings.cmx syntax/ast_util.cmx syntax/ast_structure.cmx \
-    syntax/ast_signature.cmx syntax/ast_payload.cmx syntax/ast_literal.cmx \
-    syntax/ast_external_attributes.cmx syntax/ast_derive_projector.cmx \
-    syntax/ast_derive_dyn.cmx syntax/ast_derive.cmx syntax/ast_comb.cmx \
-    syntax/ast_attributes.cmx syntax/ppx_entry.cmi
+    ext/ext_string.cmx ext/ext_ref.cmx ext/ext_list.cmx syntax/ast_util.cmx \
+    syntax/ast_structure.cmx syntax/ast_signature.cmx syntax/ast_payload.cmx \
+    syntax/ast_literal.cmx syntax/ast_external_attributes.cmx \
+    syntax/ast_derive_projector.cmx syntax/ast_derive_dyn.cmx \
+    syntax/ast_derive.cmx syntax/ast_comb.cmx syntax/ast_attributes.cmx \
+    syntax/ppx_entry.cmi
 syntax/ast_exp.cmi :
 syntax/ast_external.cmi :
 syntax/ast_lift.cmi :
@@ -487,7 +487,7 @@ core/lam_compile_external_call.cmx : core/lam_dispatch_primitive.cmx \
     core/lam_compile_env.cmx core/lam_compile_defs.cmx core/js_op.cmx \
     core/js_of_lam_variant.cmx core/js_of_lam_option.cmx core/js_exp_make.cmx \
     core/js_arr.cmx core/js_analyzer.cmx core/j.cmx ext/ext_list.cmx \
-    ext/ext_ident.cmx syntax/ast_ffi_types.cmx syntax/ast_core_type.cmx \
+    ext/ext_ident.cmx syntax/ast_ffi_types.cmx \
     core/lam_compile_external_call.cmi
 core/lam_compile_primitive.cmx : core/lam_util.cmx \
     core/lam_compile_external_call.cmx core/lam_compile_defs.cmx core/lam.cmx \

jscomp/bin/bsb.ml

@@ -7046,7 +7046,7 @@ type t =
 
 
 let magic_number = "BS_DEP_INFOS_20161116"
-let bsb_version = "20160119+dev"
+let bsb_version = "20160121+dev"
 
 let write (fname : string)  (x : t) = 
   let oc = open_out_bin fname in 

jscomp/bin/bsdep.d

@@ -47,6 +47,16 @@ bin/bsdep.ml : ext/string_map.ml
 bin/bsdep.ml : ext/string_map.mli
 bin/bsdep.ml : syntax/ast_payload.ml
 bin/bsdep.ml : syntax/ast_payload.mli
+bin/bsdep.ml : ext/ext_pervasives.ml
+bin/bsdep.ml : ext/ext_pervasives.mli
+bin/bsdep.ml : ext/literals.ml
+bin/bsdep.ml : ext/literals.mli
+bin/bsdep.ml : ext/ext_filename.ml
+bin/bsdep.ml : ext/ext_filename.mli
+bin/bsdep.ml : common/js_config.ml
+bin/bsdep.ml : common/js_config.mli
+bin/bsdep.ml : common/bs_warnings.ml
+bin/bsdep.ml : common/bs_warnings.mli
 bin/bsdep.ml : syntax/ast_attributes.ml
 bin/bsdep.ml : syntax/ast_attributes.mli
 bin/bsdep.ml : syntax/ast_literal.ml
@@ -59,8 +69,6 @@ bin/bsdep.ml : syntax/ast_signature.ml
 bin/bsdep.ml : syntax/ast_signature.mli
 bin/bsdep.ml : syntax/ast_structure.ml
 bin/bsdep.ml : syntax/ast_structure.mli
-bin/bsdep.ml : ext/literals.ml
-bin/bsdep.ml : ext/literals.mli
 bin/bsdep.ml : syntax/ast_derive.ml
 bin/bsdep.ml : syntax/ast_derive.mli
 bin/bsdep.ml : syntax/ast_derive_util.ml
@@ -70,18 +78,10 @@ bin/bsdep.ml : syntax/ast_derive_projector.ml
 bin/bsdep.ml : syntax/ast_derive_projector.mli
 bin/bsdep.ml : syntax/ast_core_type.ml
 bin/bsdep.ml : syntax/ast_core_type.mli
-bin/bsdep.ml : ext/ext_pervasives.ml
-bin/bsdep.ml : ext/ext_pervasives.mli
 bin/bsdep.ml : syntax/ast_ffi_types.ml
 bin/bsdep.ml : syntax/ast_ffi_types.mli
 bin/bsdep.ml : common/bs_loc.ml
 bin/bsdep.ml : common/bs_loc.mli
-bin/bsdep.ml : ext/ext_filename.ml
-bin/bsdep.ml : ext/ext_filename.mli
-bin/bsdep.ml : common/js_config.ml
-bin/bsdep.ml : common/js_config.mli
-bin/bsdep.ml : common/bs_warnings.ml
-bin/bsdep.ml : common/bs_warnings.mli
 bin/bsdep.ml : common/lam_methname.ml
 bin/bsdep.ml : common/lam_methname.mli
 bin/bsdep.ml : syntax/ast_external_attributes.ml