Skip to content

Commit e2931d4

Browse files
joshaberjoshaber
committed
Merge remote-tracking branch 'upstream/master' into else-on-same-line
Signed-Off-By: Josh Abernathy <joshaber@gmail.com>
2 parents 6c5c000 + f0891a4 commit e2931d4

File tree

376 files changed

+19097
-16758
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

376 files changed

+19097
-16758
lines changed

Diff for: ‎docs/Manual.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -5488,7 +5488,7 @@ <h3 id="_contributing_to_code_bsb_exe_code"><a class="anchor" href="#_contributi
54885488
</div>
54895489
<div class="listingblock">
54905490
<div class="content">
5491-
<pre class="pygments highlight"><code data-lang="sh">make bin/bsb.exe</code></pre>
5491+
<pre class="pygments highlight"><code data-lang="sh">make -C bin bsb.exe</code></pre>
54925492
</div>
54935493
</div>
54945494
<div class="paragraph">
@@ -5516,7 +5516,7 @@ <h3 id="_contributing_to_code_bsb_exe_code"><a class="anchor" href="#_contributi
55165516
<h3 id="_contributing_to_code_bsc_exe_code"><a class="anchor" href="#_contributing_to_code_bsc_exe_code"></a>Contributing to <code>bsc.exe</code></h3>
55175517
<div class="listingblock">
55185518
<div class="content">
5519-
<pre class="pygments highlight"><code data-lang="sh">make bin/bsc.exe <span class="tok-c"># build the compiler in dev mode</span></code></pre>
5519+
<pre class="pygments highlight"><code data-lang="sh">make -C bin bsc.exe <span class="tok-c"># build the compiler in dev mode</span></code></pre>
55205520
</div>
55215521
</div>
55225522
<div class="listingblock">

Diff for: ‎docs/api/Block.html

+76-73
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,93 @@
11
<!doctype html>
22
<html>
33
<head>
4+
<link rel="stylesheet" href="../api_static/tomorrow-night.css">
45

5-
<link rel="stylesheet" href="../api_static/tomorrow-night.css">
6+
<link rel="stylesheet" href="../api_static/style.css" type="text/css">
67

7-
<link rel="stylesheet" href="../api_static/style.css" type="text/css">
8+
<script src="../api_static//highlight.pack.js"></script>
89

9-
<script src="../api_static//highlight.pack.js"></script>
10+
<script src="../api_static//script.js"></script>
1011

11-
<script>hljs.initHighlightingOnLoad();</script><meta charset="utf-8">
12-
<link rel="Start" href="index.html">
12+
<script>hljs.initHighlightingOnLoad();</script><meta charset="utf-8">
1313
<link rel="next" href="Bs.html">
14-
<link rel="Up" href="index.html">
15-
<link title="Index of types" rel=Appendix href="index_types.html">
16-
<link title="Index of values" rel=Appendix href="index_values.html">
17-
<link title="Index of modules" rel=Appendix href="index_modules.html">
18-
<link title="Index of module types" rel=Appendix href="index_module_types.html">
19-
<link title="Block" rel="Chapter" href="Block.html">
20-
<link title="Bs" rel="Chapter" href="Bs.html">
21-
<link title="Bs_dyn" rel="Chapter" href="Bs_dyn.html">
22-
<link title="Bs_dyn_lib" rel="Chapter" href="Bs_dyn_lib.html">
23-
<link title="Bs_obj" rel="Chapter" href="Bs_obj.html">
24-
<link title="Bs_string" rel="Chapter" href="Bs_string.html">
25-
<link title="Caml_array" rel="Chapter" href="Caml_array.html">
26-
<link title="Caml_backtrace" rel="Chapter" href="Caml_backtrace.html">
27-
<link title="Caml_basic" rel="Chapter" href="Caml_basic.html">
28-
<link title="Caml_builtin_exceptions" rel="Chapter" href="Caml_builtin_exceptions.html">
29-
<link title="Caml_bytes" rel="Chapter" href="Caml_bytes.html">
30-
<link title="Caml_exceptions" rel="Chapter" href="Caml_exceptions.html">
31-
<link title="Caml_float" rel="Chapter" href="Caml_float.html">
32-
<link title="Caml_format" rel="Chapter" href="Caml_format.html">
33-
<link title="Caml_gc" rel="Chapter" href="Caml_gc.html">
34-
<link title="Caml_hash" rel="Chapter" href="Caml_hash.html">
35-
<link title="Caml_int32" rel="Chapter" href="Caml_int32.html">
36-
<link title="Caml_int64" rel="Chapter" href="Caml_int64.html">
37-
<link title="Caml_io" rel="Chapter" href="Caml_io.html">
38-
<link title="Caml_lexer" rel="Chapter" href="Caml_lexer.html">
39-
<link title="Caml_md5" rel="Chapter" href="Caml_md5.html">
40-
<link title="Caml_module" rel="Chapter" href="Caml_module.html">
41-
<link title="Caml_obj" rel="Chapter" href="Caml_obj.html">
42-
<link title="Caml_oo" rel="Chapter" href="Caml_oo.html">
43-
<link title="Caml_oo_curry" rel="Chapter" href="Caml_oo_curry.html">
44-
<link title="Caml_parser" rel="Chapter" href="Caml_parser.html">
45-
<link title="Caml_primitive" rel="Chapter" href="Caml_primitive.html">
46-
<link title="Caml_queue" rel="Chapter" href="Caml_queue.html">
47-
<link title="Caml_string" rel="Chapter" href="Caml_string.html">
48-
<link title="Caml_sys" rel="Chapter" href="Caml_sys.html">
49-
<link title="Caml_utils" rel="Chapter" href="Caml_utils.html">
50-
<link title="Caml_weak" rel="Chapter" href="Caml_weak.html">
51-
<link title="Curry" rel="Chapter" href="Curry.html">
52-
<link title="Js" rel="Chapter" href="Js.html">
53-
<link title="Js_array" rel="Chapter" href="Js_array.html">
54-
<link title="Js_boolean" rel="Chapter" href="Js_boolean.html">
55-
<link title="Js_date" rel="Chapter" href="Js_date.html">
56-
<link title="Js_dict" rel="Chapter" href="Js_dict.html">
57-
<link title="Js_float" rel="Chapter" href="Js_float.html">
58-
<link title="Js_global" rel="Chapter" href="Js_global.html">
59-
<link title="Js_int" rel="Chapter" href="Js_int.html">
60-
<link title="Js_int64" rel="Chapter" href="Js_int64.html">
61-
<link title="Js_json" rel="Chapter" href="Js_json.html">
62-
<link title="Js_math" rel="Chapter" href="Js_math.html">
63-
<link title="Js_nativeint" rel="Chapter" href="Js_nativeint.html">
64-
<link title="Js_null" rel="Chapter" href="Js_null.html">
65-
<link title="Js_null_undefined" rel="Chapter" href="Js_null_undefined.html">
66-
<link title="Js_obj" rel="Chapter" href="Js_obj.html">
67-
<link title="Js_primitive" rel="Chapter" href="Js_primitive.html">
68-
<link title="Js_re" rel="Chapter" href="Js_re.html">
69-
<link title="Js_string" rel="Chapter" href="Js_string.html">
70-
<link title="Js_types" rel="Chapter" href="Js_types.html">
71-
<link title="Js_undefined" rel="Chapter" href="Js_undefined.html">
72-
<link title="Js_unsafe" rel="Chapter" href="Js_unsafe.html">
73-
<link title="Node" rel="Chapter" href="Node.html">
74-
<link title="Node_buffer" rel="Chapter" href="Node_buffer.html">
75-
<link title="Node_child_process" rel="Chapter" href="Node_child_process.html">
76-
<link title="Node_fs" rel="Chapter" href="Node_fs.html">
77-
<link title="Node_module" rel="Chapter" href="Node_module.html">
78-
<link title="Node_path" rel="Chapter" href="Node_path.html">
79-
<link title="Node_process" rel="Chapter" href="Node_process.html">
80-
<link title="Typed_array" rel="Chapter" href="Typed_array.html"><title>Block</title>
14+
<title>Block</title>
8115
</head>
8216
<body>
17+
<nav class="module-index"><ul><li><a href="Block.html">Block</a></li>
18+
<li><a href="Bs.html">Bs</a></li>
19+
<li><a href="Bs_dyn.html">Bs_dyn</a></li>
20+
<li><a href="Bs_dyn_lib.html">Bs_dyn_lib</a></li>
21+
<li><a href="Bs_obj.html">Bs_obj</a></li>
22+
<li><a href="Bs_string.html">Bs_string</a></li>
23+
<li><a href="Caml_array.html">Caml_array</a></li>
24+
<li><a href="Caml_backtrace.html">Caml_backtrace</a></li>
25+
<li><a href="Caml_basic.html">Caml_basic</a></li>
26+
<li><a href="Caml_builtin_exceptions.html">Caml_builtin_exceptions</a></li>
27+
<li><a href="Caml_bytes.html">Caml_bytes</a></li>
28+
<li><a href="Caml_exceptions.html">Caml_exceptions</a></li>
29+
<li><a href="Caml_float.html">Caml_float</a></li>
30+
<li><a href="Caml_format.html">Caml_format</a></li>
31+
<li><a href="Caml_gc.html">Caml_gc</a></li>
32+
<li><a href="Caml_hash.html">Caml_hash</a></li>
33+
<li><a href="Caml_int32.html">Caml_int32</a></li>
34+
<li><a href="Caml_int64.html">Caml_int64</a></li>
35+
<li><a href="Caml_io.html">Caml_io</a></li>
36+
<li><a href="Caml_lexer.html">Caml_lexer</a></li>
37+
<li><a href="Caml_md5.html">Caml_md5</a></li>
38+
<li><a href="Caml_module.html">Caml_module</a></li>
39+
<li><a href="Caml_obj.html">Caml_obj</a></li>
40+
<li><a href="Caml_oo.html">Caml_oo</a></li>
41+
<li><a href="Caml_oo_curry.html">Caml_oo_curry</a></li>
42+
<li><a href="Caml_parser.html">Caml_parser</a></li>
43+
<li><a href="Caml_primitive.html">Caml_primitive</a></li>
44+
<li><a href="Caml_queue.html">Caml_queue</a></li>
45+
<li><a href="Caml_string.html">Caml_string</a></li>
46+
<li><a href="Caml_sys.html">Caml_sys</a></li>
47+
<li><a href="Caml_utils.html">Caml_utils</a></li>
48+
<li><a href="Caml_weak.html">Caml_weak</a></li>
49+
<li><a href="Curry.html">Curry</a></li>
50+
<li><a href="Js.html">Js</a></li>
51+
<li><a href="Js_array.html">Js_array</a></li>
52+
<li><a href="Js_boolean.html">Js_boolean</a></li>
53+
<li><a href="Js_cast.html">Js_cast</a></li>
54+
<li><a href="Js_date.html">Js_date</a></li>
55+
<li><a href="Js_dict.html">Js_dict</a></li>
56+
<li><a href="Js_float.html">Js_float</a></li>
57+
<li><a href="Js_global.html">Js_global</a></li>
58+
<li><a href="Js_int.html">Js_int</a></li>
59+
<li><a href="Js_int64.html">Js_int64</a></li>
60+
<li><a href="Js_json.html">Js_json</a></li>
61+
<li><a href="Js_math.html">Js_math</a></li>
62+
<li><a href="Js_nativeint.html">Js_nativeint</a></li>
63+
<li><a href="Js_null.html">Js_null</a></li>
64+
<li><a href="Js_null_undefined.html">Js_null_undefined</a></li>
65+
<li><a href="Js_obj.html">Js_obj</a></li>
66+
<li><a href="Js_primitive.html">Js_primitive</a></li>
67+
<li><a href="Js_re.html">Js_re</a></li>
68+
<li><a href="Js_string.html">Js_string</a></li>
69+
<li><a href="Js_typed_array.html">Js_typed_array</a></li>
70+
<li><a href="Js_types.html">Js_types</a></li>
71+
<li><a href="Js_undefined.html">Js_undefined</a></li>
72+
<li><a href="Js_unsafe.html">Js_unsafe</a></li>
73+
<li><a href="Node.html">Node</a></li>
74+
<li><a href="Node_buffer.html">Node_buffer</a></li>
75+
<li><a href="Node_child_process.html">Node_child_process</a></li>
76+
<li><a href="Node_fs.html">Node_fs</a></li>
77+
<li><a href="Node_module.html">Node_module</a></li>
78+
<li><a href="Node_path.html">Node_path</a></li>
79+
<li><a href="Node_process.html">Node_process</a></li></ul></nav>
8380
<div class="navbar">&nbsp;<a class="up" href="index.html" title="Index">Up</a>
8481
&nbsp;<a class="post" href="Bs.html" title="Bs">Next</a>
8582
</div>
8683
<h1>Module <a href="type_Block.html">Block</a></h1>
8784

88-
<pre><span class="keyword">module</span> Block: <code class="code">sig</code> <a href="Block.html">..</a> <code class="code">end</code></pre><hr width="100%">
85+
<pre><span class="keyword">module</span> Block: <code class="code">sig</code> <a href="Block.html">..</a> <code class="code">end</code></pre><div class="info module top">
86+
<div class="not-examples">
87+
</div>
88+
<div class="examples">
89+
</div>
90+
</div>
91+
<hr width="100%">
8992

9093
<pre><span id="VAL__"><span class="keyword">val</span> __</span> : <code class="type">int -> Obj.t -> Obj.t</code></pre></body></html>

0 commit comments

Comments
 (0)