Skip to content
This repository was archived by the owner on Dec 22, 2021. It is now read-only.

Commit eda5421

Browse files
authored
Fix some stale references to value types (#527)
Based on comments from WebAssembly/spec#1391.
1 parent 73af50a commit eda5421

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

document/core/appendix/index-types.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Category Constructor
1212
:ref:`Number type <syntax-numtype>` |I64| :math:`\hex{7E}` (-2 as |Bs7|)
1313
:ref:`Number type <syntax-numtype>` |F32| :math:`\hex{7D}` (-3 as |Bs7|)
1414
:ref:`Number type <syntax-numtype>` |F64| :math:`\hex{7C}` (-4 as |Bs7|)
15-
:ref:`Number type <syntax-vectype>` |V128| :math:`\hex{7B}` (-5 as |Bs7|)
15+
:ref:`Vector type <syntax-vectype>` |V128| :math:`\hex{7B}` (-5 as |Bs7|)
1616
(reserved) :math:`\hex{7A}` .. :math:`\hex{71}`
1717
:ref:`Reference type <syntax-reftype>` |FUNCREF| :math:`\hex{70}` (-16 as |Bs7|)
1818
:ref:`Reference type <syntax-reftype>` |EXTERNREF| :math:`\hex{6F}` (-17 as |Bs7|)

document/core/binary/conventions.rst

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,21 +63,20 @@ In order to distinguish symbols of the binary syntax from symbols of the abstrac
6363
(This is a shorthand for a side condition requiring multiple different variables to be equal.)
6464

6565
.. note::
66-
For example, the :ref:`binary grammar <binary-valtype>` for :ref:`value types <syntax-valtype>` is given as follows:
66+
For example, the :ref:`binary grammar <binary-numtype>` for :ref:`number types <syntax-numtype>` is given as follows:
6767

6868
.. math::
6969
\begin{array}{llcll@{\qquad\qquad}l}
70-
\production{value types} & \Bvaltype &::=&
70+
\production{number types} & \Bnumtype &::=&
7171
\hex{7F} &\Rightarrow& \I32 \\ &&|&
7272
\hex{7E} &\Rightarrow& \I64 \\ &&|&
7373
\hex{7D} &\Rightarrow& \F32 \\ &&|&
74-
\hex{7C} &\Rightarrow& \F64 \\ &&|&
75-
\hex{7B} &\Rightarrow& \V128 \\
74+
\hex{7C} &\Rightarrow& \F64 \\
7675
\end{array}
7776
7877
Consequently, the byte :math:`\hex{7F}` encodes the type |I32|,
7978
:math:`\hex{7E}` encodes the type |I64|, and so forth.
80-
No other byte value is allowed as the encoding of a value type.
79+
No other byte value is allowed as the encoding of a number type.
8180

8281
The :ref:`binary grammar <binary-limits>` for :ref:`limits <syntax-limits>` is defined as follows:
8382

document/core/exec/runtime.rst

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@ Runtime Structure
1010
.. index:: ! value, number, reference, constant, number type, vector type, reference type, ! host address, value type, integer, floating-point, vector number, ! default value
1111
pair: abstract syntax; value
1212
.. _syntax-num:
13+
.. _syntax-vecc:
1314
.. _syntax-ref:
1415
.. _syntax-ref.extern:
1516
.. _syntax-val:
1617

1718
Values
1819
~~~~~~
1920

20-
WebAssembly computations manipulate *values* of either the five basic :ref:`number types <syntax-numtype>`, i.e., :ref:`integers <syntax-int>` and :ref:`floating-point data <syntax-float>` of 32 or 64 bit width each and :ref:`vector data <syntax-vec>` of 128 bit width, or of :ref:`reference type <syntax-reftype>`.
21+
WebAssembly computations manipulate *values* of either the four basic :ref:`number types <syntax-numtype>`, i.e., :ref:`integers <syntax-int>` and :ref:`floating-point data <syntax-float>` of 32 or 64 bit width each, of :ref:`vectors <syntax-vecnum>` of 128 bit width, or of :ref:`reference type <syntax-reftype>`.
2122

2223
In most places of the semantics, values of different types can occur.
2324
In order to avoid ambiguities, values are therefore represented with an abstract syntax that makes their type explicit.
@@ -33,14 +34,15 @@ or *external references* pointing to an uninterpreted form of :ref:`extern addre
3334
\I32.\CONST~\i32 \\&&|&
3435
\I64.\CONST~\i64 \\&&|&
3536
\F32.\CONST~\f32 \\&&|&
36-
\F64.\CONST~\f64 \\ &&|&
37+
\F64.\CONST~\f64 \\
38+
\production{(vector)} & \vecc &::=&
3739
\V128.\CONST~\i128 \\
3840
\production{(reference)} & \reff &::=&
3941
\REFNULL~t \\&&|&
4042
\REFFUNCADDR~\funcaddr \\&&|&
4143
\REFEXTERNADDR~\externaddr \\
4244
\production{(value)} & \val &::=&
43-
\num ~|~ \reff \\
45+
\num ~|~ \vecc ~|~ \reff \\
4446
\end{array}
4547
4648
.. note::

document/core/intro/overview.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ This language is structured around the following concepts.
1313
.. _value:
1414

1515
**Values**
16-
WebAssembly provides only four basic *value types*.
16+
WebAssembly provides only four basic *number types*.
1717
These are integers and |IEEE754|_ numbers,
1818
each in 32 and 64 bit width.
1919
32 bit integers also serve as Booleans and as memory addresses.
@@ -23,8 +23,8 @@ This language is structured around the following concepts.
2323
Instead, integers are interpreted by respective operations
2424
as either unsigned or signed in two’s complement representation.
2525

26-
In addition to the basic value types above, there is a single 128 bit wide
27-
value type representing different types of packed data.
26+
In addition to these basic number types, there is a single 128 bit wide
27+
vector type representing different types of packed data.
2828
The supported representations are 4 32-bit, or 2 64-bit
2929
|IEEE754|_ numbers, or different widths of packed integer values
3030
specifically 2 64-bit integers, 4 32-bit integers, 8

document/core/text/conventions.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,15 @@ In order to distinguish symbols of the textual syntax from symbols of the abstra
6161
* A distinction is made between *lexical* and *syntactic* productions. For the latter, arbitrary :ref:`white space <text-space>` is allowed in any place where the grammar contains spaces. The productions defining :ref:`lexical syntax <text-lexical>` and the syntax of :Ref:`values <text-value>` are considered lexical, all others are syntactic.
6262

6363
.. note::
64-
For example, the :ref:`textual grammar <text-valtype>` for :ref:`value types <syntax-valtype>` is given as follows:
64+
For example, the :ref:`textual grammar <text-numtype>` for :ref:`number types <syntax-numtype>` is given as follows:
6565

6666
.. math::
6767
\begin{array}{llcll@{\qquad\qquad}l}
68-
\production{value types} & \Tvaltype &::=&
68+
\production{number types} & \Tnumtype &::=&
6969
\text{i32} &\Rightarrow& \I32 \\ &&|&
7070
\text{i64} &\Rightarrow& \I64 \\ &&|&
7171
\text{f32} &\Rightarrow& \F32 \\ &&|&
72-
\text{f64} &\Rightarrow& \F64 \\ &&|&
73-
\text{v128} &\Rightarrow& \V128 \\
72+
\text{f64} &\Rightarrow& \F64 \\
7473
\end{array}
7574
7675
The :ref:`textual grammar <text-limits>` for :ref:`limits <syntax-limits>` is defined as follows:

document/core/util/macros.def

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,7 +1067,7 @@
10671067
.. Values & Results, non-terminals
10681068

10691069
.. |num| mathdef:: \xref{exec/runtime}{syntax-num}{\X{num}}
1070-
.. |vecc| mathdef:: \xref{exec/runtime}{syntax-vecnum}{\X{vec}}
1070+
.. |vecc| mathdef:: \xref{exec/runtime}{syntax-vec}{\X{vec}}
10711071
.. |reff| mathdef:: \xref{exec/runtime}{syntax-ref}{\X{ref}}
10721072
.. |val| mathdef:: \xref{exec/runtime}{syntax-val}{\X{val}}
10731073
.. |result| mathdef:: \xref{exec/runtime}{syntax-result}{\X{result}}
@@ -1186,7 +1186,7 @@
11861186
.. |fsign| mathdef:: \xref{exec/numerics}{aux-fsign}{\F{fsign}}
11871187
.. |fbias| mathdef:: \xref{exec/numerics}{aux-fbias}{\F{fbias}}
11881188
.. |bytes| mathdef:: \xref{exec/numerics}{aux-bytes}{\F{bytes}}
1189-
.. |littleendian| mathdef:: \xref{exec/numerics}{aux-littleendian}{\F{little~endian}}
1189+
.. |littleendian| mathdef:: \xref{exec/numerics}{aux-littleendian}{\F{littleendian}}
11901190
.. |signed| mathdef:: \xref{exec/numerics}{aux-signed}{\F{signed}}
11911191
.. |bool| mathdef:: \xref{exec/numerics}{aux-bool}{\F{bool}}
11921192

0 commit comments

Comments
 (0)