Skip to content

Commit e0947f0

Browse files
author
Dave Herman
committed
minor edits
1 parent bc21b83 commit e0947f0

File tree

2 files changed

+26
-14
lines changed

2 files changed

+26
-14
lines changed

‎html/index.html

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<div class=head>
3737
<h1>asm.js</h1>
3838

39-
<h2 class="no-num no-toc" id=working-draft-22-july-2014>Working Draft — 22 July 2014</h2>
39+
<h2 class="no-num no-toc" id=working-draft-23-july-2014>Working Draft — 23 July 2014</h2>
4040

4141
<dl>
4242
<dt>Latest version:
@@ -77,7 +77,12 @@ <h2 class="no-num no-toc" id=abstract>Abstract</h2>
7777
</p><h3 class="no-num no-toc" id=changelog>Changelog</h3>
7878

7979
<ul>
80-
<li><strong>22 July 2014</strong>
80+
<li><strong>23 July 2014</strong>
81+
<ul>
82+
<li>formatting cleanups
83+
</li><li>added variadic function types to the Global Types section
84+
</li></ul>
85+
</li><li><strong>22 July 2014</strong>
8186
<ul>
8287
<li>clarified formal structure with explicit validation rule names
8388
</li><li>moved function table validation from annotations section to validation section
@@ -643,6 +648,7 @@ <h3 id=global-types><span class=secno>2.2 </span>Global Types</h3>
643648
<li>value types τ;
644649
</li><li><a href=https://developer.mozilla.org/en-US/docs/JavaScript/Typed_arrays/ArrayBufferView><code>ArrayBufferView</code></a> types <code>Int<em>n</em>Array</code>, <code>Uint<em>n</em>Array</code>, and <code>Float<em>n</em>Array</code>;
645650
</li><li>function types ((σ, …) → τ) ∧ … ∧ ((σ′, …) → τ′);
651+
</li><li>variadic function types ((σ, σ<code>…</code>) → τ) ∧ … ∧ ((σ′, σ′<code>…</code>) → τ′);
646652
</li><li>function table types ((σ, …) → τ)[<em>n</em>];
647653
</li><li>the special type <code>fround</code> of <code>Math.fround</code>; and
648654
</li><li>the FFI function type <code>Function</code>.
@@ -1153,14 +1159,14 @@ <h3 id=validatestatement-s><span class=secno>6.5 </span><em>ValidateStatement</e
11531159
<p>Validating an <em>IfStatement</em> node
11541160

11551161
</p><div class=example>
1156-
<code>if (</code> <em>expr:Expression</em> <code>)</code> <em>stmt1:Statement</em> <code>else</code> <em>stmt2:Statement</em>
1162+
<code>if (</code> <em>expr:Expression</em> <code>)</code> <em>stmt<sub>1</sub>:Statement</em> <code>else</code> <em>stmt<sub>2</sub>:Statement</em>
11571163
</div>
11581164

11591165
<p>succeeds
11601166
if <a href=#validateexpression-e><em>ValidateExpression</em></a>
11611167
succeeds for <em>expr</em> with a subtype of <a href=#int-0><code>int</code></a>
11621168
and <a href=#validatestatement-s><em>ValidateStatement</em></a>
1163-
succeeds for <em>stmt1</em> and <em>stmt2</em>.
1169+
succeeds for <em>stmt<sub>1</sub></em> and <em>stmt<sub>2</sub></em>.
11641170

11651171
</p><p>Validating an <em>IfStatement</em> node
11661172

@@ -1418,22 +1424,22 @@ <h4>DefaultClause</h4>
14181424
<p>Validating an <em>Expression</em> node
14191425

14201426
</p><div class=example>
1421-
<em>expr1:AssignmentExpression</em> <code>,</code> … <code>,</code> <em>exprn:AssignmentExpression</em>
1427+
<em>expr<sub>1</sub>:AssignmentExpression</em> <code>,</code> … <code>,</code> <em>expr<sub>n</sub>:AssignmentExpression</em>
14221428
</div>
14231429

14241430
<p>succeeds with type τ if for every <em>i</em>
14251431
&lt; <em>n</em>, one of the following conditions holds:
14261432

14271433
</p><ul>
1428-
<li><em>expri</em> is a <em>CallExpression</em>
1434+
<li><em>expr<sub>i</sub></em> is a <em>CallExpression</em>
14291435
and <a href=#validatecall-e><em>ValidateCall</em></a> succeeds
14301436
with actual return type <a href=#void-0><code>void</code></a>; or
14311437
</li><li><a href=#validateexpression-e><em>ValidateExpression</em></a>
1432-
succeeds for <em>expri</em> with some type σ;
1438+
succeeds for <em>expr<sub>i</sub></em> with some type σ;
14331439
</li></ul>
14341440

14351441
<p>and <a href=#validateexpression-e><em>ValidateExpression</em></a>
1436-
succeeds for <em>exprn</em> with type τ.
1442+
succeeds for <em>expr<sub>n</sub></em> with type τ.
14371443

14381444
</p><h4 id=numericliteral><span class=secno>6.8.2 </span>NumericLiteral</h4>
14391445

‎html/index.src.html

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@ <h2 class="no-num no-toc">Status</h2>
8080
<h3 class="no-num no-toc">Changelog</h2>
8181

8282
<ul>
83+
<li><strong>23 July 2014</strong>
84+
<ul>
85+
<li>formatting cleanups
86+
<li>added variadic function types to the Global Types section
87+
</ul>
8388
<li><strong>22 July 2014</strong>
8489
<ul>
8590
<li>clarified formal structure with explicit validation rule names
@@ -561,6 +566,7 @@ <h3>Global Types</h3>
561566
<li>value types &tau;;
562567
<li><a href="https://developer.mozilla.org/en-US/docs/JavaScript/Typed_arrays/ArrayBufferView"><code>ArrayBufferView</code></a> types <code>Int<em>n</em>Array</code>, <code>Uint<em>n</em>Array</code>, and <code>Float<em>n</em>Array</code>;
563568
<li>function types ((&sigma;, &hellip;) &rarr; &tau;) &and; &hellip; &and; ((&sigma;&prime;, &hellip;) &rarr; &tau;&prime;);
569+
<li>variadic function types ((&sigma;, &sigma;<code>&hellip;</code>) &rarr; &tau;) &and; &hellip; &and; ((&sigma;&prime;, &sigma;&prime;<code>&hellip;</code>) &rarr; &tau;&prime;);
564570
<li>function table types ((&sigma;, &hellip;) &rarr; &tau;)[<em>n</em>];
565571
<li>the special type <code>fround</code> of <code>Math.fround</code>; and
566572
<li>the FFI function type <code>Function</code>.
@@ -1071,14 +1077,14 @@ <h4>IfStatement</h4>
10711077
<p>Validating an <em>IfStatement</em> node
10721078

10731079
<div class="example">
1074-
<code>if (</code> <em>expr:Expression</em> <code>)</code> <em>stmt1:Statement</em> <code>else</code> <em>stmt2:Statement</em>
1080+
<code>if (</code> <em>expr:Expression</em> <code>)</code> <em>stmt<sub>1</sub>:Statement</em> <code>else</code> <em>stmt<sub>2</sub>:Statement</em>
10751081
</div>
10761082

10771083
<p>succeeds
10781084
if <a href="#validateexpression-e"><em>ValidateExpression</em></a>
10791085
succeeds for <em>expr</em> with a subtype of <code>int</code>
10801086
and <a href="#validatestatement-s"><em>ValidateStatement</em></a>
1081-
succeeds for <em>stmt1</em> and <em>stmt2</em>.
1087+
succeeds for <em>stmt<sub>1</sub></em> and <em>stmt<sub>2</sub></em>.
10821088

10831089
<p>Validating an <em>IfStatement</em> node
10841090

@@ -1336,22 +1342,22 @@ <h4>Expression</h4>
13361342
<p>Validating an <em>Expression</em> node
13371343

13381344
<div class="example">
1339-
<em>expr1:AssignmentExpression</em> <code>,</code> &hellip; <code>,</code> <em>exprn:AssignmentExpression</em>
1345+
<em>expr<sub>1</sub>:AssignmentExpression</em> <code>,</code> &hellip; <code>,</code> <em>expr<sub>n</sub>:AssignmentExpression</em>
13401346
</div>
13411347

13421348
<p>succeeds with type &tau; if for every <em>i</em>
13431349
&lt; <em>n</em>, one of the following conditions holds:
13441350

13451351
<ul>
1346-
<li><em>expri</em> is a <em>CallExpression</em>
1352+
<li><em>expr<sub>i</sub></em> is a <em>CallExpression</em>
13471353
and <a href="#validatecall-e"><em>ValidateCall</em></a> succeeds
13481354
with actual return type <code>void</code>; or
13491355
<li><a href="#validateexpression-e"><em>ValidateExpression</em></a>
1350-
succeeds for <em>expri</em> with some type &sigma;;
1356+
succeeds for <em>expr<sub>i</sub></em> with some type &sigma;;
13511357
</ul>
13521358

13531359
<p>and <a href="#validateexpression-e"><em>ValidateExpression</em></a>
1354-
succeeds for <em>exprn</em> with type &tau;.
1360+
succeeds for <em>expr<sub>n</sub></em> with type &tau;.
13551361

13561362
<h4>NumericLiteral</h4>
13571363

0 commit comments

Comments
 (0)